Failed Conditions
Pull Request — master (#1326)
by Nick
26:02 queued 20:44
created
www/docs/api/api_getMPs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once dirname(__FILE__) . '/api_getMembers.php';
3
+include_once dirname(__FILE__).'/api_getMembers.php';
4 4
 
5 5
 function api_getMPs_front() {
6 6
 ?>
Please login to merge, or discard this patch.
www/docs/index-election.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 $this_page = "home";
4 4
 
5 5
 include_once '../includes/easyparliament/init.php';
6
-include_once INCLUDESPATH . "easyparliament/member.php";
6
+include_once INCLUDESPATH."easyparliament/member.php";
7 7
 
8 8
 $PAGE->page_start();
9 9
 
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 
28 28
 if (count($debatesdata) > 0 && count($wransdata) > 0 && count($whalldata) > 0 && count($wmsdata) > 0) {
29 29
     // Links to Debates and Wrans.
30
-    $debatestext = '<a href="' . $debatesdata['listurl'] . '">Debates</a>';
31
-    $wranstext = '<a href="' . $wransdata['listurl'] . '">Written Answers</a>';
32
-    $whalltext = '<a href="' . $whalldata['listurl'] . '">Westminster Hall debates</a>';
33
-    $wmstext = '<a href="' . $wmsdata['listurl'] . '">Written Ministerial Statements</a>';
30
+    $debatestext = '<a href="'.$debatesdata['listurl'].'">Debates</a>';
31
+    $wranstext = '<a href="'.$wransdata['listurl'].'">Written Answers</a>';
32
+    $whalltext = '<a href="'.$whalldata['listurl'].'">Westminster Hall debates</a>';
33
+    $wmstext = '<a href="'.$wmsdata['listurl'].'">Written Ministerial Statements</a>';
34 34
 
35 35
     // Now we work out whether the debates/wrans are from yesterday or another day...
36 36
     // And create the appropriate text ($daytext) to display accordingly.
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
         } elseif ($todaystime - $debatesdata['timestamp'] <= (6 * 86400)) {
47 47
             // Less than a week ago, so like "last Tuesday's".
48
-            $daytext = gmdate('l', $debatesdata['timestamp']) . "'s";
48
+            $daytext = gmdate('l', $debatesdata['timestamp'])."'s";
49 49
 
50 50
         } else {
51 51
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 $HANSARDURL = new URL('hansard');
73 73
 $MPURL = new URL('yourmp');
74 74
 
75
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
75
+$PAGE->block_start(array('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
76 76
 ?>
77 77
                         <ol>
78 78
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     } else {
90 90
         $CHANGEURL = new URL('userchangepc');
91 91
     }
92
-    $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
92
+    $MEMBER = new MEMBER(array('postcode'=>$THEUSER->postcode(), 'house'=>1));
93 93
     $mpname = $MEMBER->full_name();
94 94
     ?>
95 95
       <p><a href="<?php echo $MPURL->generate(); ?>"><strong>Find out more about how <?php echo $mpname; ?>, your ex-MP, represented you over the last parliament</strong></a><br>
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
 //$PAGE->block_end();
186 186
 
187 187
 $PAGE->stripe_end(array(
188
-    array (
188
+    array(
189 189
         'type' => 'include',
190 190
         'content' => 'whatisthissite'
191 191
     ),
192
-    array (
192
+    array(
193 193
         'type' => 'include',
194 194
         'content' => 'sitenews_recent'
195 195
     )
Please login to merge, or discard this patch.
www/docs/glossary/index.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
53 53
 }
54 54
 else {
55
-    $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
56
-    $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
55
+    $DATA->set_page_metadata($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
56
+    $DATA->set_page_metadata($this_page, 'heading', 'Glossary index');
57 57
 }
58 58
 
59 59
 $PAGE->page_start();
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
72 72
     $URL->update(array("gl" => $GLOSSARY->next_term['glossary_id']));
73 73
     $next_link = $URL->generate('url');
74 74
 
75
-    $nextprev = array (
76
-        'next'	=> array (
75
+    $nextprev = array(
76
+        'next'	=> array(
77 77
             'url'	=> $next_link,
78 78
             'title'	=> 'Next term',
79 79
             'body'	=> $GLOSSARY->next_term['title']
80 80
         ),
81
-        'prev'	=> array (
81
+        'prev'	=> array(
82 82
             'url'	=> $previous_link,
83 83
             'title'	=> 'Previous term',
84 84
             'body'	=> $GLOSSARY->previous_term['title']
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
     }
112 112
 }
113 113
 
114
-$PAGE->stripe_end(array (
115
-    array (
114
+$PAGE->stripe_end(array(
115
+    array(
116 116
         'type'		=> 'nextprev',
117 117
         'content'	=> ''
118 118
     )
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,8 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if (isset($term) && $term) {
3 3
     $this_page = 'glossary_item';
4
-}
5
-else {
4
+} else {
6 5
     $this_page = "glossary";
7 6
 }
8 7
 
@@ -50,8 +49,7 @@  discard block
 block discarded – undo
50 49
 if ($term) {
51 50
     $DATA->set_page_metadata($this_page, 'title', $term['title'].': Glossary item');
52 51
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
53
-}
54
-else {
52
+} else {
55 53
     $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
56 54
     $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
57 55
 }
Please login to merge, or discard this patch.
www/docs/bills/2005-06/legislative-and-regulatory-reform/index.php 2 patches
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@  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','Legislative and Regulatory Reform Bill');
5
+$DATA->set_page_metadata($this_page, 'heading', 'Legislative and Regulatory Reform Bill');
6 6
 $PAGE->page_start();
7 7
 $PAGE->stripe_start();
8
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
8
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
9 9
 ?>
10 10
 <ul>
11 11
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 print '</ul>';
60 60
 $PAGE->block_end();
61 61
 $includes = array(
62
-    array (
62
+    array(
63 63
         'type' => 'include',
64 64
         'content' => 'bills_intro'
65 65
     ),
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     $intitle = true;
78 78
     $title = '';
79 79
     foreach ($f as $r) {
80
-        if ($line<1) {
80
+        if ($line < 1) {
81 81
             $line++;
82 82
             continue;
83 83
         }
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             }
97 97
             continue;
98 98
         }
99
-        if (substr($r, 0, 8)=='Bill 141') continue;
99
+        if (substr($r, 0, 8) == 'Bill 141') continue;
100 100
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
101 101
             if ($line != $m[1]) {
102 102
                 print "ERROR! $line $m[1] $r";
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
         if ($r == "\n") {
142 142
             continue;
143 143
         }
144
-        if ($line<1) {
144
+        if ($line < 1) {
145 145
             $line++;
146 146
             continue;
147 147
         }
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
             $number = $m[1];
156 156
             $amendments[$number] = '';
157 157
         } elseif (preg_match('#To move the following Clause#', $r)) {
158
-            preg_match('#\n(.*?)$#', $amendments[$number-1], $m);
159
-            $amendments[$number-1] = preg_replace('#\n(.*?)$#', '', $amendments[$number-1]);
160
-            $amendments[$number] .= '*' . trim($m[1]) . "*\n$r";
158
+            preg_match('#\n(.*?)$#', $amendments[$number - 1], $m);
159
+            $amendments[$number - 1] = preg_replace('#\n(.*?)$#', '', $amendments[$number - 1]);
160
+            $amendments[$number] .= '*'.trim($m[1])."*\n$r";
161 161
         } else {
162 162
             $amendments[$number] .= $r;
163 163
         }
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
181 181
             $from_text = $m[4]; $end_line = $m[5]; $insert = $m[6];
182 182
             unset($amendments[$num]);
183
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . '</del><ins title="'.$num.'">' . $insert . '</ins>';
184
-            for ($i=$line+1; $i<=$end_line; $i++) {
185
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
183
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]).'</del><ins title="'.$num.'">'.$insert.'</ins>';
184
+            for ($i = $line + 1; $i <= $end_line; $i++) {
185
+                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
186 186
             }
187 187
         }
188 188
         # Page  4, line 9 [Clause 6], leave out from `under' to `creating' and insert `this Part making provision'
@@ -198,25 +198,25 @@  discard block
 block discarded – undo
198 198
             $from_text = $m[4]; $to_text = $m[5]; $to_line = $m[6];
199 199
             $insert = $m[7];
200 200
             unset($amendments[$num]);
201
-            $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]) . '</del>';
202
-            for ($i=$from_line+1; $i<$to_line; $i++) {
203
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
201
+            $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]).'</del>';
202
+            for ($i = $from_line + 1; $i < $to_line; $i++) {
203
+                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
204 204
             }
205
-            $bill[$page][$to_line] = '<del title="'.$num.'">' . str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
205
+            $bill[$page][$to_line] = '<del title="'.$num.'">'.str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
206 206
         }
207 207
         # Page  3, line 13 [Clause 4], leave out from beginning to `confer' and insert `An order under this Part may not make provision to'
208 208
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], leave out from beginning to `(.*?)\' and insert `(.*?)\'#s', $amendment, $m)) {
209 209
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
210 210
             $to_text = $m[4]; $insert = $m[5];
211 211
             unset($amendments[$num]);
212
-            $bill[$page][$line] = "<ins title='$num'>$insert</ins><del title='$num'>" . str_replace($to_text, "</del> $to_text", $bill[$page][$line]);
212
+            $bill[$page][$line] = "<ins title='$num'>$insert</ins><del title='$num'>".str_replace($to_text, "</del> $to_text", $bill[$page][$line]);
213 213
         }
214 214
         # Page   19, line 2 [Clause 34], leave out from `under' to the end of the line and insert `...'
215 215
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], leave out from `(.*?)\' to the end of the line and insert\s+`(.*?)\'#s', $amendment, $m)) {
216 216
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
217 217
             $from_text = $m[4]; $insert = $m[5];
218 218
             unset($amendments[$num]);
219
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . "</del><ins title='$num'>$insert</ins>";
219
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line])."</del><ins title='$num'>$insert</ins>";
220 220
         }
221 221
         # Page   4 [Clause 7], leave out line 26 and insert `An order under this Part may not make provision to--'
222 222
         if (preg_match('#Page\s+(\d+) \[Clause (\d+)\], leave out line (\d+)(?: and insert `(.*?)\')?#', $amendment, $m)) {
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
247 247
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
248 248
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
249 249
                     $startP = $subsubclause['startP'];
250
-                    if ($startP==$page && $subsubclause['startL']==$line) {
250
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
251 251
                         if ($startP == $subsubclause['endP']) {
252 252
                             unset($amendments[$num]);
253
-                            for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
254
-                                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
253
+                            for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
254
+                                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
255 255
                             }
256 256
                             if ($insert) {
257
-                                $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
257
+                                $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
258 258
                             }
259 259
                         }
260 260
                     }
@@ -270,21 +270,21 @@  discard block
 block discarded – undo
270 270
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
271 271
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
272 272
                     $startP = $subsubclause['startP'];
273
-                    if ($startP==$page && $subsubclause['startL']==$line) {
273
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
274 274
                         if ($startP == $subsubclause['endP']) {
275 275
                             unset($amendments[$num]);
276 276
                             $finished = true;
277 277
                         }
278 278
                     }
279 279
                     if ($finished) {
280
-                        for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
281
-                            $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
280
+                        for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
281
+                            $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
282 282
                         }
283 283
                     }
284 284
                 }
285 285
                 if ($finished) {
286 286
                     if ($insert) {
287
-                        $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
287
+                        $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
288 288
                     }
289 289
                     break;
290 290
                 }
@@ -296,16 +296,16 @@  discard block
 block discarded – undo
296 296
             $finished = false;
297 297
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
298 298
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
299
-                    if ($subsubclause['startP']==$page && $subsubclause['startL']==$line) {
299
+                    if ($subsubclause['startP'] == $page && $subsubclause['startL'] == $line) {
300 300
                         unset($amendments[$num]);
301 301
                         $finished = true;
302 302
                     }
303 303
                     if ($finished) {
304
-                        for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
305
-                            if ($p>$subsubclause['startP']) $starti = 1;
304
+                        for ($p = $subsubclause['startP']; $p <= $subsubclause['endP']; $p++) {
305
+                            if ($p > $subsubclause['startP']) $starti = 1;
306 306
                             else $starti = $subsubclause['startL'];
307
-                            for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
308
-                                $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
307
+                            for ($i = $starti; $i <= $subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
308
+                                $bill[$p][$i] = '<del title="'.$num.'">'.$bill[$p][$i].'</del>';
309 309
                             }
310 310
                         }
311 311
                     }
Please login to merge, or discard this patch.
Braces   +14 added lines, -5 removed lines patch added patch discarded remove patch
@@ -96,7 +96,9 @@  discard block
 block discarded – undo
96 96
             }
97 97
             continue;
98 98
         }
99
-        if (substr($r, 0, 8)=='Bill 141') continue;
99
+        if (substr($r, 0, 8)=='Bill 141') {
100
+            continue;
101
+        }
100 102
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
101 103
             if ($line != $m[1]) {
102 104
                 print "ERROR! $line $m[1] $r";
@@ -224,7 +226,9 @@  discard block
 block discarded – undo
224 226
             $insert = isset($m[4]) ? $m[4] : null;
225 227
             unset($amendments[$num]);
226 228
             $bill[$page][$line] = '<del title="'.$num.'">'.$bill[$page][$line].'</del>';
227
-            if ($insert) $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
229
+            if ($insert) {
230
+                $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
231
+            }
228 232
         }
229 233
         # Page 8, line 24 [Clause 14], at end insert-- `...'
230 234
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], (?:at end|after subsection \(\d+\)) insert--\s+`(.*?)\'#s', $amendment, $m)) {
@@ -302,8 +306,11 @@  discard block
 block discarded – undo
302 306
                     }
303 307
                     if ($finished) {
304 308
                         for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
305
-                            if ($p>$subsubclause['startP']) $starti = 1;
306
-                            else $starti = $subsubclause['startL'];
309
+                            if ($p>$subsubclause['startP']) {
310
+                                $starti = 1;
311
+                            } else {
312
+                                $starti = $subsubclause['startL'];
313
+                            }
307 314
                             for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
308 315
                                 $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
309 316
                             }
@@ -321,7 +328,9 @@  discard block
 block discarded – undo
321 328
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
322 329
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
323 330
                     if ($subsubclause['endP'] > $page) { $page = $subsubclause['endP']; $line = 0; }
324
-                    if ($subsubclause['endL'] > $line) $line = $subsubclause['endL'];
331
+                    if ($subsubclause['endL'] > $line) {
332
+                        $line = $subsubclause['endL'];
333
+                    }
325 334
                 }
326 335
             }
327 336
             $bill[$page][$line] .= "<ins title='$num'>$amendment</ins>\n\n";
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/boundaries/index.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 $this_page = 'boundaries';
4 4
 include_once '../../includes/easyparliament/init.php';
5
-include_once INCLUDESPATH . '../../commonlib/phplib/mapit.php';
5
+include_once INCLUDESPATH.'../../commonlib/phplib/mapit.php';
6 6
 
7 7
 $PAGE->page_start();
8 8
 ?>
@@ -66,16 +66,16 @@  discard block
 block discarded – undo
66 66
     $db = new ParlDB;
67 67
     # Just left politicians
68 68
     $q = $db->query("SELECT person_id, first_name, last_name, constituency, house FROM member
69
-        WHERE constituency IN ('" . join("','", $a) . "')
69
+        WHERE constituency IN ('" . join("','", $a)."')
70 70
         AND ( ( house = 3 and left_house = '2011-03-24' ) or ( house = 4 and left_house = '2011-03-23') )");
71 71
     $mreg = array();
72
-    for ($i=0; $i<$q->rows(); $i++) {
72
+    for ($i = 0; $i < $q->rows(); $i++) {
73 73
         $cons = $q->field($i, 'constituency');
74 74
         $house = $q->field($i, 'house');
75 75
         if (($house == 4 && $cons == $current['SPC']) || ($house == 3 && $cons == $current['NIE'])) {
76
-            $name = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
76
+            $name = $q->field($i, 'first_name').' '.$q->field($i, 'last_name');
77 77
         } elseif ($house == 4 && $cons == $current['SPE']) {
78
-            $mreg[] = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
78
+            $mreg[] = $q->field($i, 'first_name').' '.$q->field($i, 'last_name');
79 79
         }
80 80
     }
81 81
 
@@ -129,17 +129,17 @@  discard block
 block discarded – undo
129 129
     }
130 130
 
131 131
     if ($country == 'S') {
132
-        $mp_url = '/msp/' . make_member_url($name, '', 4);
132
+        $mp_url = '/msp/'.make_member_url($name, '', 4);
133 133
 ?>
134 134
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
135 135
         foreach ($mreg as $k => $n) {
136
-            print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
137
-            if ($k < count($mreg)-2) print ', ';
138
-            elseif ($k == count($mreg)-2) print ' and ';
136
+            print "<a href='/msp/".make_member_url($n, '', 4)."'>$n</a>";
137
+            if ($k < count($mreg) - 2) print ', ';
138
+            elseif ($k == count($mreg) - 2) print ' and ';
139 139
         }
140 140
         echo '.</li>';
141 141
     } elseif ($country == 'N') {
142
-        $mp_url = '/mla/' . make_member_url($name, '', 3);
142
+        $mp_url = '/mla/'.make_member_url($name, '', 3);
143 143
 ?>
144 144
 <li>You were in the <strong><?=$current['NIE']?></strong> constituency; your constituency MLA was <a href='<?=$mp_url?>'><?=$name?></a>.</li>
145 145
 <?php
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -134,8 +134,11 @@
 block discarded – undo
134 134
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
135 135
         foreach ($mreg as $k => $n) {
136 136
             print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
137
-            if ($k < count($mreg)-2) print ', ';
138
-            elseif ($k == count($mreg)-2) print ' and ';
137
+            if ($k < count($mreg)-2) {
138
+                print ', ';
139
+            } elseif ($k == count($mreg)-2) {
140
+                print ' and ';
141
+            }
139 142
         }
140 143
         echo '.</li>';
141 144
     } elseif ($country == 'N') {
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 include_once '../../includes/easyparliament/init.php';
4
-include_once INCLUDESPATH . 'easyparliament/member.php';
4
+include_once INCLUDESPATH.'easyparliament/member.php';
5 5
 
6 6
 $this_page = 'divisions_vote';
7 7
 
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.
www/docs/divisions/index.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,12 +10,12 @@
 block discarded – undo
10 10
 }
11 11
 
12 12
 if (isset($MEMBER)) {
13
-  $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
14
-  $data = array('divisions' => $divisions->getRecentMemberDivisions(30, 'Parliament'));
15
-  $data['mp_name'] = ucfirst($MEMBER->full_name());
13
+    $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
14
+    $data = array('divisions' => $divisions->getRecentMemberDivisions(30, 'Parliament'));
15
+    $data['mp_name'] = ucfirst($MEMBER->full_name());
16 16
 } else {
17
-  $divisions = new MySociety\TheyWorkForYou\Divisions();
18
-  $data = $divisions->getRecentDivisions(30);
17
+    $divisions = new MySociety\TheyWorkForYou\Divisions();
18
+    $data = $divisions->getRecentDivisions(30);
19 19
 }
20 20
 
21 21
 $data['last_updated'] = MySociety\TheyWorkForYou\Divisions::getMostRecentDivisionDate()['latest'];
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 include_once '../../includes/easyparliament/init.php';
4
-include_once INCLUDESPATH . 'easyparliament/member.php';
4
+include_once INCLUDESPATH.'easyparliament/member.php';
5 5
 
6 6
 $this_page = 'divisions_recent';
7 7
 
Please login to merge, or discard this patch.
www/docs/wikipedia/index.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     $ip = '194.60.38.10';
14 14
 
15 15
 $this_page = 'wikipedia';
16
-$DATA->set_page_metadata($this_page, 'title', 'Latest 100 changes to Wikipedia by non-logged-in computers in ' . $site[$ip]);
16
+$DATA->set_page_metadata($this_page, 'title', 'Latest 100 changes to Wikipedia by non-logged-in computers in '.$site[$ip]);
17 17
 $PAGE->page_start();
18 18
 $PAGE->stripe_start();
19 19
 ?>
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 preg_match_all('#<li>.*? \(<a[^>]*>hist</a>\) \(<a href=".*?title=(.*?)&.*?oldid=(.*?)"[^>]*>diff</a>\)  <a[^>]*>(.*?)</a> .*?</li>#', $file, $m, PREG_SET_ORDER);
52 52
 foreach ($m as $row) {
53 53
     $file = file_get_contents("cache/$row[1].$row[2]");
54
-    $file = str_replace(array("\xe2\x86\x90","\xe2\x86\x92"), array('&larr;', '&rarr;'), $file);
54
+    $file = str_replace(array("\xe2\x86\x90", "\xe2\x86\x92"), array('&larr;', '&rarr;'), $file);
55 55
     print "<h3>$row[3]</h3>";
56 56
     if (preg_match('#<table.*?</table>#s', $file, $m))
57 57
         print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
Please login to merge, or discard this patch.
Braces   +13 added lines, -10 removed lines patch added patch discarded remove patch
@@ -9,8 +9,9 @@  discard block
 block discarded – undo
9 9
     '212.35.252.2' => 'Liberal Democrats',
10 10
 );
11 11
 $ip = get_http_var('ip');
12
-if (!array_key_exists($ip, $site))
12
+if (!array_key_exists($ip, $site)) {
13 13
     $ip = '194.60.38.10';
14
+}
14 15
 
15 16
 $this_page = 'wikipedia';
16 17
 $DATA->set_page_metadata($this_page, 'title', 'Latest 100 changes to Wikipedia by non-logged-in computers in ' . $site[$ip]);
@@ -28,10 +29,11 @@  discard block
 block discarded – undo
28 29
 <p align="center"><?php
29 30
 $out = array();
30 31
 foreach ($site as $k => $v) {
31
-    if ($k == $ip)
32
-        $o = "<strong>$v</strong>";
33
-    else
34
-        $o = "<a href=\"./?ip=$k\">$v</a>";
32
+    if ($k == $ip) {
33
+            $o = "<strong>$v</strong>";
34
+    } else {
35
+            $o = "<a href=\"./?ip=$k\">$v</a>";
36
+    }
35 37
     $out[] = $o;
36 38
 }
37 39
 print join(' | ', $out);
@@ -53,11 +55,12 @@  discard block
 block discarded – undo
53 55
     $file = file_get_contents("cache/$row[1].$row[2]");
54 56
     $file = str_replace(array("\xe2\x86\x90","\xe2\x86\x92"), array('&larr;', '&rarr;'), $file);
55 57
     print "<h3>$row[3]</h3>";
56
-    if (preg_match('#<table.*?</table>#s', $file, $m))
57
-        print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
58
-    elseif (preg_match('#<div class="firstrevisionheader.*?</div>#s', $file, $m))
59
-        print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
60
-}
58
+    if (preg_match('#<table.*?</table>#s', $file, $m)) {
59
+            print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
60
+    } elseif (preg_match('#<div class="firstrevisionheader.*?</div>#s', $file, $m)) {
61
+            print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
62
+    }
63
+    }
61 64
 
62 65
 $PAGE->stripe_end();
63 66
 $PAGE->page_end();
Please login to merge, or discard this patch.