Completed
Pull Request — master (#1323)
by Nick
84:26 queued 71:50
created
www/docs/mps/multiple.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,9 @@
 block discarded – undo
28 28
 
29 29
 function out($h1, $h2, $title) {
30 30
     global $out;
31
-    if (!isset($out[$h1][$h2])) return;
31
+    if (!isset($out[$h1][$h2])) {
32
+        return;
33
+    }
32 34
     print "<h3>$title</h3>\n<ul>\n";
33 35
     foreach ($out[$h1][$h2] as $m) {
34 36
         print '<li><a href="' . $m->url() . '">' . $m->full_name() . "</a></li>\n";
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     from member as m1, member as m2
13 13
     where m1.person_id = m2.person_id and m1.house != m2.house and m1.house < m2.house
14 14
         and m1.left_house='9999-12-31' and m2.left_house='9999-12-31'");
15
-for ($i=0; $i<$q->rows(); $i++) {
15
+for ($i = 0; $i < $q->rows(); $i++) {
16 16
     $pid = $q->field($i, 'person_id');
17 17
     $member = new MEMBER(array('person_id' => $pid));
18 18
     $h1 = $q->field($i, 'house1');
Please login to merge, or discard this patch.
www/docs/parliament/index.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
 $DATA->set_page_metadata($this_page, 'title', 'Parliament');
8 8
 $DATA->set_page_metadata($this_page, 'meta_description',
9
-             'What goes on in Parliament? Up-to-the-minute records on all MPs, debates, speeches and statements from the House of Commons, House of Lords, Scottish Parliament, and Northern Ireland Assembly.');
9
+                'What goes on in Parliament? Up-to-the-minute records on all MPs, debates, speeches and statements from the House of Commons, House of Lords, Scottish Parliament, and Northern Ireland Assembly.');
10 10
 $DATA->set_page_metadata($this_page, 'meta_keywords', 'parliament, uk parliament, parliamentary, house of commons, house commons, house of lords, house lords, house of parliament, parliment, houses parliament, parliament uk, member of parliament, welsh assembly, scottish parliament, the parliament, house of parliment, houses of parliment, parliment uk, uk parliment, houses of parliament, parliament houses, parliament of uk, parliament in uk, the house of parliament, scottish parliment, members of parliament, parliament members, scotish parliament, parliament scottish, the house of commons, british parliament, what is parliament, the house of lords, the scottish parliament, london parliament, parliament london, the houses of parliament, english parliament, northern ireland parliament, the british parliament, northern ireland assembly, history of parliament, parliament history, parliament of england, england parliament');
11 11
 
12 12
 $PAGE->supress_heading = true;
Please login to merge, or discard this patch.
www/docs/news/home_page_include.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,9 @@
 block discarded – undo
7 7
 
8 8
 $c = 0;
9 9
 foreach ($all_news as $id => $news_row) {
10
-    if ($c++ == 2) break;
10
+    if ($c++ == 2) {
11
+        break;
12
+    }
11 13
     list($title, $content, $date) = $news_row;
12 14
     $url = news_individual_link($date, $title);
13 15
     print "<h5><a href=\"$url\">" . $title . "</a></h5>";
Please login to merge, or discard this patch.
www/docs/news/rdf.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,9 @@  discard block
 block discarded – undo
25 25
 <?php
26 26
     $c = 0;
27 27
     foreach ($all_news as $id => $news_row) {
28
-        if ($c++ == 10) break;
28
+        if ($c++ == 10) {
29
+            break;
30
+        }
29 31
         list($title, $content, $date) = $news_row;
30 32
         $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
31 33
         print "<rdf:li rdf:resource=\"$url\" />\n";
@@ -39,7 +41,9 @@  discard block
 block discarded – undo
39 41
 <?php
40 42
     $c = 0;
41 43
     foreach ($all_news as $id => $news_row) {
42
-        if ($c++ == 10) break;
44
+        if ($c++ == 10) {
45
+            break;
46
+        }
43 47
         list($title, $content, $date) = $news_row;
44 48
         $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
45 49
         $excerpt = trim_characters(news_format_body($content), 0, 250);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     foreach ($all_news as $id => $news_row) {
28 28
         if ($c++ == 10) break;
29 29
         list($title, $content, $date) = $news_row;
30
-        $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
30
+        $url = "https://www.theyworkforyou.com" . news_individual_link($date, $title);
31 31
         print "<rdf:li rdf:resource=\"$url\" />\n";
32 32
     }
33 33
 ?>
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     foreach ($all_news as $id => $news_row) {
42 42
         if ($c++ == 10) break;
43 43
         list($title, $content, $date) = $news_row;
44
-        $url = "https://www.theyworkforyou.com".news_individual_link($date, $title);
44
+        $url = "https://www.theyworkforyou.com" . news_individual_link($date, $title);
45 45
         $excerpt = trim_characters(news_format_body($content), 0, 250);
46 46
         $date = str_replace(" ", "T", $date) . "+00:00";
47 47
 ?>
Please login to merge, or discard this patch.
www/docs/api/api_getAlerts.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 function api_getAlerts_start_date($start_date) {
4
-  $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
5
-  $alert = new ALERT();
6
-  $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
7
-  api_output($data);
4
+    $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
5
+    $alert = new ALERT();
6
+    $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
7
+    api_output($data);
8 8
 }
9 9
 
10 10
 ?>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 function api_getAlerts_start_date($start_date) {
4
-  $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
4
+  $args = array('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
5 5
   $alert = new ALERT();
6
-  $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
6
+  $data = $alert->fetch_between($confirmed = 1, $deleted = 0, $args['start_date'], $args['end_date']);
7 7
   api_output($data);
8 8
 }
9 9
 
Please login to merge, or discard this patch.
www/docs/api/api_getComments.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 }
25 25
 
26 26
 function api_getComments_start_date($start_date) {
27
-        $args = array (
27
+        $args = array(
28 28
             'start_date' => $start_date,
29 29
             'end_date' => get_http_var('end_date')
30 30
         );
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 }
34 34
 
35 35
 function api_getComments_search($s) {
36
-        $args = array (
36
+        $args = array(
37 37
             's' => $s,
38 38
             'p' => get_http_var('page'),
39 39
             'num' => get_http_var('num'),
Please login to merge, or discard this patch.
www/docs/api/index.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,17 +26,17 @@  discard block
 block discarded – undo
26 26
     $match = 0;
27 27
     foreach ($methods as $method => $data) {
28 28
         if (strtolower($q_method) == strtolower($method)) {
29
-      if (isset($data['superuser']) && $data['superuser']) {
29
+        if (isset($data['superuser']) && $data['superuser']) {
30 30
         $super_check = api_is_superuser_key($key);
31 31
         if (!$super_check) {
32 32
                 if (get_http_var('docs')) {
33
-                  api_front_page();
33
+                    api_front_page();
34 34
                 } else {
35
-                  api_error('Invalid API key.');
36
-                  exit;
37
-              }
35
+                    api_error('Invalid API key.');
36
+                    exit;
37
+                }
38 38
             }
39
-      }
39
+        }
40 40
 
41 41
             api_log_call($key);
42 42
             $match++;
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
             '". Possible functions are: ' .
74 74
             join(', ', array_keys($methods));
75 75
         if (get_http_var('output')) {
76
-          api_error($msg);
76
+            api_error($msg);
77 77
         } else {
78
-          api_front_page($msg);
78
+            api_front_page($msg);
79 79
         }
80 80
     } else {
81 81
         if (get_http_var('docs')) {
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             foreach ($data['parameters'] as $parameter) {
48 48
                 if ($q_param = trim(get_http_var($parameter))) {
49 49
                     $match++;
50
-                    include_once 'api_'. $method . '.php';
50
+                    include_once 'api_' . $method . '.php';
51 51
                     api_call_user_func_or_error('api_' . $method . '_' . $parameter, array($q_param), 'API call not yet functional', 'api');
52 52
                     break;
53 53
                 }
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
                     api_error('No parameter provided to function "' .
58 58
                     _htmlspecialchars($q_method) .
59 59
                         '". Possible choices are: ' .
60
-                        join(', ', $data['parameters']) );
60
+                        join(', ', $data['parameters']));
61 61
                 } else {
62
-                    include_once 'api_'. $method . '.php';
62
+                    include_once 'api_' . $method . '.php';
63 63
                     api_call_user_func_or_error('api_' . $method, array(), 'API call not yet functional', 'api');
64 64
                     break;
65 65
                 }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     $DATA->set_page_metadata($this_page, 'title', "$method function");
94 94
     $PAGE->page_start();
95 95
     $PAGE->stripe_start();
96
-    include_once 'api_'. $method . '.php';
96
+    include_once 'api_' . $method . '.php';
97 97
     print '<p align="center"><strong>https://www.theyworkforyou.com/api/' . $method . '</strong></p>';
98 98
     api_call_user_func_or_error('api_' . $method . '_front', array(), 'No documentation yet', 'html');
99 99
 ?>
@@ -102,20 +102,20 @@  discard block
 block discarded – undo
102 102
 <form method="get" action="?#output">
103 103
 <p>
104 104
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
105
-    print $parameter . ': <input type="text" name="'.$parameter.'" value="';
105
+    print $parameter . ': <input type="text" name="' . $parameter . '" value="';
106 106
     if ($val = get_http_var($parameter))
107 107
         print _htmlspecialchars($val);
108 108
     print '" size="30"><br>';
109 109
 }
110 110
 ?>
111 111
 Output:
112
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
112
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output') == 'js' || !get_http_var('output')) print ' checked'?>>
113 113
 <label for="output_js">JS</label>
114
-<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
114
+<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output') == 'xml') print ' checked'?>>
115 115
 <label for="output_xml">XML</label>
116
-<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output')=='php') print ' checked'?>>
116
+<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output') == 'php') print ' checked'?>>
117 117
 <label for="output_php">Serialised PHP</label>
118
-<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output')=='rabx') print ' checked'?>>
118
+<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output') == 'rabx') print ' checked'?>>
119 119
 <label for="output_rabx">RABX</label>
120 120
 
121 121
 <input type="submit" value="Go">
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
         }
131 131
         print '<h4><a name="output"></a>Output</h4>';
132 132
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';
133
-        print $method . '?' . join('&amp;', $qs) . '&amp;output='._htmlspecialchars(get_http_var('output')).'</strong></p>';
133
+        print $method . '?' . join('&amp;', $qs) . '&amp;output=' . _htmlspecialchars(get_http_var('output')) . '</strong></p>';
134 134
         print '<pre>' . _htmlspecialchars($explorer) . '</pre>';
135 135
     }
136 136
     $sidebar = api_sidebar();
Please login to merge, or discard this patch.
Braces   +23 added lines, -12 removed lines patch added patch discarded remove patch
@@ -8,7 +8,8 @@  discard block
 block discarded – undo
8 8
 if ($q_method = get_http_var('method')) {
9 9
     if (get_http_var('docs')) {
10 10
         $key = 'DOCS';
11
-    } else {
11
+    }
12
+    else {
12 13
         $key = get_http_var('key');
13 14
         if (!$key) {
14 15
             api_error('No API key provided. Please see https://www.theyworkforyou.com/api/key for more information.');
@@ -18,7 +19,8 @@  discard block
 block discarded – undo
18 19
         if (!$check) {
19 20
             api_error('Invalid API key.');
20 21
             exit;
21
-        } elseif ($check === 'disabled') {
22
+        }
23
+        elseif ($check === 'disabled') {
22 24
             api_error('Your API key has been disabled.');
23 25
             exit;
24 26
         }
@@ -31,7 +33,8 @@  discard block
 block discarded – undo
31 33
         if (!$super_check) {
32 34
                 if (get_http_var('docs')) {
33 35
                   api_front_page();
34
-                } else {
36
+                }
37
+                else {
35 38
                   api_error('Invalid API key.');
36 39
                   exit;
37 40
               }
@@ -58,7 +61,8 @@  discard block
 block discarded – undo
58 61
                     _htmlspecialchars($q_method) .
59 62
                         '". Possible choices are: ' .
60 63
                         join(', ', $data['parameters']) );
61
-                } else {
64
+                }
65
+                else {
62 66
                     include_once 'api_'. $method . '.php';
63 67
                     api_call_user_func_or_error('api_' . $method, array(), 'API call not yet functional', 'api');
64 68
                     break;
@@ -74,16 +78,19 @@  discard block
 block discarded – undo
74 78
             join(', ', array_keys($methods));
75 79
         if (get_http_var('output')) {
76 80
           api_error($msg);
77
-        } else {
81
+        }
82
+        else {
78 83
           api_front_page($msg);
79 84
         }
80
-    } else {
85
+    }
86
+    else {
81 87
         if (get_http_var('docs')) {
82 88
             $explorer = ob_get_clean();
83 89
             api_documentation_front($method, $explorer);
84 90
         }
85 91
     }
86
-} else {
92
+}
93
+else {
87 94
     api_front_page();
88 95
 }
89 96
 
@@ -103,13 +110,15 @@  discard block
 block discarded – undo
103 110
 <p>
104 111
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
105 112
     print $parameter . ': <input type="text" name="'.$parameter.'" value="';
106
-    if ($val = get_http_var($parameter))
107
-        print _htmlspecialchars($val);
113
+    if ($val = get_http_var($parameter)) {
114
+            print _htmlspecialchars($val);
115
+    }
108 116
     print '" size="30"><br>';
109 117
 }
110 118
 ?>
111 119
 Output:
112
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
120
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) {
121
+    print ' checked'?>>
113 122
 <label for="output_js">JS</label>
114 123
 <input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
115 124
 <label for="output_xml">XML</label>
@@ -124,9 +133,11 @@  discard block
 block discarded – undo
124 133
 <?php
125 134
     if ($explorer) {
126 135
         $qs = array();
136
+}
127 137
         foreach ($methods[$method]['parameters'] as $parameter) {
128
-            if (get_http_var($parameter))
129
-                $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
138
+            if (get_http_var($parameter)) {
139
+                            $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
140
+            }
130 141
         }
131 142
         print '<h4><a name="output"></a>Output</h4>';
132 143
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';
Please login to merge, or discard this patch.
www/docs/bills/2005-06/identity-cards/index.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2,12 +2,12 @@  discard block
 block discarded – undo
2 2
 
3 3
 $this_page = 'bill_index';
4 4
 include_once '../../../../includes/easyparliament/init.php';
5
-$DATA->set_page_metadata($this_page, 'heading','Identity Cards Act 2006');
5
+$DATA->set_page_metadata($this_page, 'heading', 'Identity Cards Act 2006');
6 6
 
7 7
 $PAGE->page_start();
8 8
 $PAGE->stripe_start();
9 9
 
10
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
10
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
11 11
 ?>
12 12
 <ul> <li>Back on 25th May 2005, a bill was introduced: the <a
13 13
 href="http://www.publications.parliament.uk/pa/cm200506/cmbills/009/2006009.htm">Identity
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 <?php
34 34
 $PAGE->block_end();
35
-$PAGE->block_start(array ('title'=>'House of Lords - Normal Run'));
35
+$PAGE->block_start(array('title'=>'House of Lords - Normal Run'));
36 36
 ?>
37 37
 
38 38
 <ul>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
 <?php
51 51
 $PAGE->block_end();
52
-$PAGE->block_start(array ('title'=>'Ping Pong'));
52
+$PAGE->block_start(array('title'=>'Ping Pong'));
53 53
 ?>
54 54
 
55 55
 <ul>
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 $PAGE->block_end();
95 95
 
96 96
     $includes = array(
97
-        array (
97
+        array(
98 98
             'type' => 'include',
99 99
             'content' => 'bills_intro'
100 100
         ),
Please login to merge, or discard this patch.
www/docs/divisions/division.php 3 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -43,11 +43,11 @@
 block discarded – undo
43 43
             $data['mp_vote']['with_majority'] = true;
44 44
         }
45 45
     } else {
46
-      if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
47
-          $data['before_mp'] = true;
48
-      } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
49
-          $data['after_mp'] = true;
50
-      }
46
+        if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
47
+            $data['before_mp'] = true;
48
+        } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
49
+            $data['after_mp'] = true;
50
+        }
51 51
     }
52 52
 }
53 53
 
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
     }
52 52
 }
53 53
 
54
-$data['debate_time_human'] = False;
54
+$data['debate_time_human'] = false;
55 55
 $data['debate_day_human'] = format_date($data['division']['date'], LONGDATEFORMAT);
56 56
 $data['col_country'] = 'UK';
57 57
 $data['location'] = 'in the House of Commons';
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,8 @@  discard block
 block discarded – undo
16 16
 if ($mp = get_http_var('p')) {
17 17
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('person_id' => $mp, 'house' => HOUSE_TYPE_COMMONS));
18 18
     $main_vote_mp = true;
19
-} else if ($THEUSER->postcode_is_set()) {
19
+}
20
+else if ($THEUSER->postcode_is_set()) {
20 21
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('postcode' => $THEUSER->postcode(), 'house' => HOUSE_TYPE_COMMONS));
21 22
 }
22 23
 
@@ -42,10 +43,12 @@  discard block
 block discarded – undo
42 43
         if ($data['mp_vote']['vote'] == $data['division']['vote']) {
43 44
             $data['mp_vote']['with_majority'] = true;
44 45
         }
45
-    } else {
46
+    }
47
+    else {
46 48
       if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
47 49
           $data['before_mp'] = true;
48
-      } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
50
+      }
51
+      else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
49 52
           $data['after_mp'] = true;
50 53
       }
51 54
     }
Please login to merge, or discard this patch.