mysociety / theyworkforyou

www/docs/api/index.php

Indentation +8 added lines, -8 removed lines

@@ -26,17 +26,17 @@ 
     $match = 0;
     foreach ($methods as $method => $data) {
         if (strtolower($q_method) == strtolower($method)) {
-      if (isset($data['superuser']) && $data['superuser']) {
+        if (isset($data['superuser']) && $data['superuser']) {
         $super_check = api_is_superuser_key($key);
         if (!$super_check) {
                 if (get_http_var('docs')) {
-                  api_front_page();
+                    api_front_page();
                 } else {
-                  api_error('Invalid API key.');
-                  exit;
-              }
+                    api_error('Invalid API key.');
+                    exit;
+                }
             }
-      }
+        }
 
             api_log_call($key);
             $match++;
@@ -73,9 +73,9 @@ 
             '". Possible functions are: ' .
             join(', ', array_keys($methods));
         if (get_http_var('output')) {
-          api_error($msg);
+            api_error($msg);
         } else {
-          api_front_page($msg);
+            api_front_page($msg);
         }
     } else {
         if (get_http_var('docs')) {

Spacing +21 added lines, -21 removed lines

@@ -47,20 +47,20 @@ 
             foreach ($data['parameters'] as $parameter) {
                 if ($q_param = trim(get_http_var($parameter))) {
                     $match++;
-                    include_once 'api_'. $method . '.php';
-                    api_call_user_func_or_error('api_' . $method . '_' . $parameter, array($q_param), 'API call not yet functional', 'api');
+                    include_once 'api_'.$method.'.php';
+                    api_call_user_func_or_error('api_'.$method.'_'.$parameter, array($q_param), 'API call not yet functional', 'api');
                     break;
                 }
             }
             if ($match == 1 && (get_http_var('output') || !get_http_var('docs'))) {
                 if ($data['required']) {
-                    api_error('No parameter provided to function "' .
-                    _htmlspecialchars($q_method) .
-                        '". Possible choices are: ' .
-                        join(', ', $data['parameters']) );
+                    api_error('No parameter provided to function "'.
+                    _htmlspecialchars($q_method).
+                        '". Possible choices are: '.
+                        join(', ', $data['parameters']));
                 } else {
-                    include_once 'api_'. $method . '.php';
-                    api_call_user_func_or_error('api_' . $method, array(), 'API call not yet functional', 'api');
+                    include_once 'api_'.$method.'.php';
+                    api_call_user_func_or_error('api_'.$method, array(), 'API call not yet functional', 'api');
                     break;
                 }
             }
@@ -69,8 +69,8 @@ 
     }
     if (!$match) {
         api_log_call($key);
-        $msg = 'Unknown function "' . _htmlspecialchars($q_method) .
-            '". Possible functions are: ' .
+        $msg = 'Unknown function "'._htmlspecialchars($q_method).
+            '". Possible functions are: '.
             join(', ', array_keys($methods));
         if (get_http_var('output')) {
           api_error($msg);
@@ -93,29 +93,29 @@ 
     $DATA->set_page_metadata($this_page, 'title', "$method function");
     $PAGE->page_start();
     $PAGE->stripe_start();
-    include_once 'api_'. $method . '.php';
-    print '<p align="center"><strong>https://www.theyworkforyou.com/api/' . $method . '</strong></p>';
-    api_call_user_func_or_error('api_' . $method . '_front', array(), 'No documentation yet', 'html');
+    include_once 'api_'.$method.'.php';
+    print '<p align="center"><strong>https://www.theyworkforyou.com/api/'.$method.'</strong></p>';
+    api_call_user_func_or_error('api_'.$method.'_front', array(), 'No documentation yet', 'html');
 ?>
 <h4>Explorer</h4>
 <p>Try out this function without writing any code!</p>
 <form method="get" action="?#output">
 <p>
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
-    print $parameter . ': <input type="text" name="'.$parameter.'" value="';
+    print $parameter.': <input type="text" name="'.$parameter.'" value="';
     if ($val = get_http_var($parameter))
         print _htmlspecialchars($val);
     print '" size="30"><br>';
 }
 ?>
 Output:
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output') == 'js' || !get_http_var('output')) print ' checked'?>>
 <label for="output_js">JS</label>
-<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
+<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output') == 'xml') print ' checked'?>>
 <label for="output_xml">XML</label>
-<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output')=='php') print ' checked'?>>
+<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output') == 'php') print ' checked'?>>
 <label for="output_php">Serialised PHP</label>
-<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output')=='rabx') print ' checked'?>>
+<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output') == 'rabx') print ' checked'?>>
 <label for="output_rabx">RABX</label>
 
 <input type="submit" value="Go">
@@ -126,12 +126,12 @@ 
         $qs = array();
         foreach ($methods[$method]['parameters'] as $parameter) {
             if (get_http_var($parameter))
-                $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
+                $qs[] = _htmlspecialchars(rawurlencode($parameter).'='.urlencode(get_http_var($parameter)));
         }
         print '<h4><a name="output"></a>Output</h4>';
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';
-        print $method . '?' . join('&amp;', $qs) . '&amp;output='._htmlspecialchars(get_http_var('output')).'</strong></p>';
-        print '<pre>' . _htmlspecialchars($explorer) . '</pre>';
+        print $method.'?'.join('&amp;', $qs).'&amp;output='._htmlspecialchars(get_http_var('output')).'</strong></p>';
+        print '<pre>'._htmlspecialchars($explorer).'</pre>';
     }
     $sidebar = api_sidebar();
     $PAGE->stripe_end(array($sidebar));

Braces +9 added lines, -5 removed lines

@@ -103,13 +103,15 @@ 
 <p>
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
     print $parameter . ': <input type="text" name="'.$parameter.'" value="';
-    if ($val = get_http_var($parameter))
-        print _htmlspecialchars($val);
+    if ($val = get_http_var($parameter)) {
+            print _htmlspecialchars($val);
+    }
     print '" size="30"><br>';
 }
 ?>
 Output:
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) {
+    print ' checked'?>>
 <label for="output_js">JS</label>
 <input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
 <label for="output_xml">XML</label>
@@ -124,9 +126,11 @@ 
 <?php
     if ($explorer) {
         $qs = array();
+}
         foreach ($methods[$method]['parameters'] as $parameter) {
-            if (get_http_var($parameter))
-                $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
+            if (get_http_var($parameter)) {
+                            $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
+            }
         }
         print '<h4><a name="output"></a>Output</h4>';
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';

www/docs/api/api_getMPs.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include_once dirname(__FILE__) . '/api_getMembers.php';
+include_once dirname(__FILE__).'/api_getMembers.php';
 
 function api_getMPs_front() {
 ?>

www/docs/index-election.php

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 $this_page = "home";
 
 include_once '../includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH."easyparliament/member.php";
 
 $PAGE->page_start();
 
@@ -27,10 +27,10 @@ 
 
 if (count($debatesdata) > 0 && count($wransdata) > 0 && count($whalldata) > 0 && count($wmsdata) > 0) {
     // Links to Debates and Wrans.
-    $debatestext = '<a href="' . $debatesdata['listurl'] . '">Debates</a>';
-    $wranstext = '<a href="' . $wransdata['listurl'] . '">Written Answers</a>';
-    $whalltext = '<a href="' . $whalldata['listurl'] . '">Westminster Hall debates</a>';
-    $wmstext = '<a href="' . $wmsdata['listurl'] . '">Written Ministerial Statements</a>';
+    $debatestext = '<a href="'.$debatesdata['listurl'].'">Debates</a>';
+    $wranstext = '<a href="'.$wransdata['listurl'].'">Written Answers</a>';
+    $whalltext = '<a href="'.$whalldata['listurl'].'">Westminster Hall debates</a>';
+    $wmstext = '<a href="'.$wmsdata['listurl'].'">Written Ministerial Statements</a>';
 
     // Now we work out whether the debates/wrans are from yesterday or another day...
     // And create the appropriate text ($daytext) to display accordingly.
@@ -45,7 +45,7 @@ 
 
         } elseif ($todaystime - $debatesdata['timestamp'] <= (6 * 86400)) {
             // Less than a week ago, so like "last Tuesday's".
-            $daytext = gmdate('l', $debatesdata['timestamp']) . "'s";
+            $daytext = gmdate('l', $debatesdata['timestamp'])."'s";
 
         } else {
 
@@ -72,7 +72,7 @@ 
 $HANSARDURL = new URL('hansard');
 $MPURL = new URL('yourmp');
 
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
+$PAGE->block_start(array('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
 ?>
                         <ol>
 
@@ -89,7 +89,7 @@ 
     } else {
         $CHANGEURL = new URL('userchangepc');
     }
-    $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
+    $MEMBER = new MEMBER(array('postcode'=>$THEUSER->postcode(), 'house'=>1));
     $mpname = $MEMBER->full_name();
     ?>
       <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 @@ 
 //$PAGE->block_end();
 
 $PAGE->stripe_end(array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'whatisthissite'
     ),
-    array (
+    array(
         'type' => 'include',
         'content' => 'sitenews_recent'
     )

www/docs/glossary/index.php

Spacing +7 added lines, -7 removed lines

@@ -52,8 +52,8 @@ 
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
 }
 else {
-    $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
-    $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
+    $DATA->set_page_metadata($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
+    $DATA->set_page_metadata($this_page, 'heading', 'Glossary index');
 }
 
 $PAGE->page_start();
@@ -72,13 +72,13 @@ 
     $URL->update(array("gl" => $GLOSSARY->next_term['glossary_id']));
     $next_link = $URL->generate('url');
 
-    $nextprev = array (
-        'next'	=> array (
+    $nextprev = array(
+        'next'	=> array(
             'url'	=> $next_link,
             'title'	=> 'Next term',
             'body'	=> $GLOSSARY->next_term['title']
         ),
-        'prev'	=> array (
+        'prev'	=> array(
             'url'	=> $previous_link,
             'title'	=> 'Previous term',
             'body'	=> $GLOSSARY->previous_term['title']
@@ -111,8 +111,8 @@ 
     }
 }
 
-$PAGE->stripe_end(array (
-    array (
+$PAGE->stripe_end(array(
+    array(
         'type'		=> 'nextprev',
         'content'	=> ''
     )

Braces +2 added lines, -4 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 if (isset($term) && $term) {
     $this_page = 'glossary_item';
-}
-else {
+} else {
     $this_page = "glossary";
 }
 
@@ -50,8 +49,7 @@ 
 if ($term) {
     $DATA->set_page_metadata($this_page, 'title', $term['title'].': Glossary item');
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
-}
-else {
+} else {
     $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
     $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
 }

www/docs/bills/2005-06/legislative-and-regulatory-reform/index.php

Spacing +31 added lines, -31 removed lines

@@ -2,10 +2,10 @@ 
 
 $this_page = 'bill_index';
 include_once '../../../../includes/easyparliament/init.php';
-$DATA->set_page_metadata($this_page, 'heading','Legislative and Regulatory Reform Bill');
+$DATA->set_page_metadata($this_page, 'heading', 'Legislative and Regulatory Reform Bill');
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
 ?>
 <ul>
 
@@ -59,7 +59,7 @@ 
 print '</ul>';
 $PAGE->block_end();
 $includes = array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'bills_intro'
     ),
@@ -77,7 +77,7 @@ 
     $intitle = true;
     $title = '';
     foreach ($f as $r) {
-        if ($line<1) {
+        if ($line < 1) {
             $line++;
             continue;
         }
@@ -96,7 +96,7 @@ 
             }
             continue;
         }
-        if (substr($r, 0, 8)=='Bill 141') continue;
+        if (substr($r, 0, 8) == 'Bill 141') continue;
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
             if ($line != $m[1]) {
                 print "ERROR! $line $m[1] $r";
@@ -141,7 +141,7 @@ 
         if ($r == "\n") {
             continue;
         }
-        if ($line<1) {
+        if ($line < 1) {
             $line++;
             continue;
         }
@@ -155,9 +155,9 @@ 
             $number = $m[1];
             $amendments[$number] = '';
         } elseif (preg_match('#To move the following Clause#', $r)) {
-            preg_match('#\n(.*?)$#', $amendments[$number-1], $m);
-            $amendments[$number-1] = preg_replace('#\n(.*?)$#', '', $amendments[$number-1]);
-            $amendments[$number] .= '*' . trim($m[1]) . "*\n$r";
+            preg_match('#\n(.*?)$#', $amendments[$number - 1], $m);
+            $amendments[$number - 1] = preg_replace('#\n(.*?)$#', '', $amendments[$number - 1]);
+            $amendments[$number] .= '*'.trim($m[1])."*\n$r";
         } else {
             $amendments[$number] .= $r;
         }
@@ -180,9 +180,9 @@ 
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $from_text = $m[4]; $end_line = $m[5]; $insert = $m[6];
             unset($amendments[$num]);
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . '</del><ins title="'.$num.'">' . $insert . '</ins>';
-            for ($i=$line+1; $i<=$end_line; $i++) {
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]).'</del><ins title="'.$num.'">'.$insert.'</ins>';
+            for ($i = $line + 1; $i <= $end_line; $i++) {
+                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
             }
         }
         # Page  4, line 9 [Clause 6], leave out from `under' to `creating' and insert `this Part making provision'
@@ -198,25 +198,25 @@ 
             $from_text = $m[4]; $to_text = $m[5]; $to_line = $m[6];
             $insert = $m[7];
             unset($amendments[$num]);
-            $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]) . '</del>';
-            for ($i=$from_line+1; $i<$to_line; $i++) {
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+            $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]).'</del>';
+            for ($i = $from_line + 1; $i < $to_line; $i++) {
+                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
             }
-            $bill[$page][$to_line] = '<del title="'.$num.'">' . str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
+            $bill[$page][$to_line] = '<del title="'.$num.'">'.str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
         }
         # Page  3, line 13 [Clause 4], leave out from beginning to `confer' and insert `An order under this Part may not make provision to'
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], leave out from beginning to `(.*?)\' and insert `(.*?)\'#s', $amendment, $m)) {
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $to_text = $m[4]; $insert = $m[5];
             unset($amendments[$num]);
-            $bill[$page][$line] = "<ins title='$num'>$insert</ins><del title='$num'>" . str_replace($to_text, "</del> $to_text", $bill[$page][$line]);
+            $bill[$page][$line] = "<ins title='$num'>$insert</ins><del title='$num'>".str_replace($to_text, "</del> $to_text", $bill[$page][$line]);
         }
         # Page   19, line 2 [Clause 34], leave out from `under' to the end of the line and insert `...'
         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)) {
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $from_text = $m[4]; $insert = $m[5];
             unset($amendments[$num]);
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . "</del><ins title='$num'>$insert</ins>";
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line])."</del><ins title='$num'>$insert</ins>";
         }
         # Page   4 [Clause 7], leave out line 26 and insert `An order under this Part may not make provision to--'
         if (preg_match('#Page\s+(\d+) \[Clause (\d+)\], leave out line (\d+)(?: and insert `(.*?)\')?#', $amendment, $m)) {
@@ -247,14 +247,14 @@ 
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
                     $startP = $subsubclause['startP'];
-                    if ($startP==$page && $subsubclause['startL']==$line) {
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
                         if ($startP == $subsubclause['endP']) {
                             unset($amendments[$num]);
-                            for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
-                                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+                            for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
+                                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
                             }
                             if ($insert) {
-                                $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
+                                $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
                             }
                         }
                     }
@@ -270,21 +270,21 @@ 
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
                     $startP = $subsubclause['startP'];
-                    if ($startP==$page && $subsubclause['startL']==$line) {
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
                         if ($startP == $subsubclause['endP']) {
                             unset($amendments[$num]);
                             $finished = true;
                         }
                     }
                     if ($finished) {
-                        for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
-                            $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+                        for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
+                            $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
                         }
                     }
                 }
                 if ($finished) {
                     if ($insert) {
-                        $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
+                        $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
                     }
                     break;
                 }
@@ -296,16 +296,16 @@ 
             $finished = false;
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
-                    if ($subsubclause['startP']==$page && $subsubclause['startL']==$line) {
+                    if ($subsubclause['startP'] == $page && $subsubclause['startL'] == $line) {
                         unset($amendments[$num]);
                         $finished = true;
                     }
                     if ($finished) {
-                        for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
-                            if ($p>$subsubclause['startP']) $starti = 1;
+                        for ($p = $subsubclause['startP']; $p <= $subsubclause['endP']; $p++) {
+                            if ($p > $subsubclause['startP']) $starti = 1;
                             else $starti = $subsubclause['startL'];
-                            for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
-                                $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
+                            for ($i = $starti; $i <= $subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
+                                $bill[$p][$i] = '<del title="'.$num.'">'.$bill[$p][$i].'</del>';
                             }
                         }
                     }

Braces +14 added lines, -5 removed lines

@@ -96,7 +96,9 @@ 
             }
             continue;
         }
-        if (substr($r, 0, 8)=='Bill 141') continue;
+        if (substr($r, 0, 8)=='Bill 141') {
+            continue;
+        }
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
             if ($line != $m[1]) {
                 print "ERROR! $line $m[1] $r";
@@ -224,7 +226,9 @@ 
             $insert = isset($m[4]) ? $m[4] : null;
             unset($amendments[$num]);
             $bill[$page][$line] = '<del title="'.$num.'">'.$bill[$page][$line].'</del>';
-            if ($insert) $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
+            if ($insert) {
+                $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
+            }
         }
         # Page 8, line 24 [Clause 14], at end insert-- `...'
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], (?:at end|after subsection \(\d+\)) insert--\s+`(.*?)\'#s', $amendment, $m)) {
@@ -302,8 +306,11 @@ 
                     }
                     if ($finished) {
                         for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
-                            if ($p>$subsubclause['startP']) $starti = 1;
-                            else $starti = $subsubclause['startL'];
+                            if ($p>$subsubclause['startP']) {
+                                $starti = 1;
+                            } else {
+                                $starti = $subsubclause['startL'];
+                            }
                             for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
                                 $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
                             }
@@ -321,7 +328,9 @@ 
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
                     if ($subsubclause['endP'] > $page) { $page = $subsubclause['endP']; $line = 0; }
-                    if ($subsubclause['endL'] > $line) $line = $subsubclause['endL'];
+                    if ($subsubclause['endL'] > $line) {
+                        $line = $subsubclause['endL'];
+                    }
                 }
             }
             $bill[$page][$line] .= "<ins title='$num'>$amendment</ins>\n\n";

www/docs/bills/2005-06/identity-cards/index.php

Spacing +5 added lines, -5 removed lines

@@ -2,12 +2,12 @@ 
 
 $this_page = 'bill_index';
 include_once '../../../../includes/easyparliament/init.php';
-$DATA->set_page_metadata($this_page, 'heading','Identity Cards Act 2006');
+$DATA->set_page_metadata($this_page, 'heading', 'Identity Cards Act 2006');
 
 $PAGE->page_start();
 $PAGE->stripe_start();
 
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
 ?>
 <ul> <li>Back on 25th May 2005, a bill was introduced: the <a
 href="http://www.publications.parliament.uk/pa/cm200506/cmbills/009/2006009.htm">Identity
@@ -32,7 +32,7 @@ 
 
 <?php
 $PAGE->block_end();
-$PAGE->block_start(array ('title'=>'House of Lords - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Lords - Normal Run'));
 ?>
 
 <ul>
@@ -49,7 +49,7 @@ 
 
 <?php
 $PAGE->block_end();
-$PAGE->block_start(array ('title'=>'Ping Pong'));
+$PAGE->block_start(array('title'=>'Ping Pong'));
 ?>
 
 <ul>
@@ -94,7 +94,7 @@ 
 $PAGE->block_end();
 
     $includes = array(
-        array (
+        array(
             'type' => 'include',
             'content' => 'bills_intro'
         ),

www/docs/boundaries/index.php

Spacing +10 added lines, -10 removed lines

@@ -2,7 +2,7 @@ 
 
 $this_page = 'boundaries';
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . '../../commonlib/phplib/mapit.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/mapit.php';
 
 $PAGE->page_start();
 ?>
@@ -66,16 +66,16 @@ 
     $db = new ParlDB;
     # Just left politicians
     $q = $db->query("SELECT person_id, first_name, last_name, constituency, house FROM member
-        WHERE constituency IN ('" . join("','", $a) . "')
+        WHERE constituency IN ('" . join("','", $a)."')
         AND ( ( house = 3 and left_house = '2011-03-24' ) or ( house = 4 and left_house = '2011-03-23') )");
     $mreg = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $cons = $q->field($i, 'constituency');
         $house = $q->field($i, 'house');
         if (($house == 4 && $cons == $current['SPC']) || ($house == 3 && $cons == $current['NIE'])) {
-            $name = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
+            $name = $q->field($i, 'first_name').' '.$q->field($i, 'last_name');
         } elseif ($house == 4 && $cons == $current['SPE']) {
-            $mreg[] = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
+            $mreg[] = $q->field($i, 'first_name').' '.$q->field($i, 'last_name');
         }
     }
 
@@ -129,17 +129,17 @@ 
     }
 
     if ($country == 'S') {
-        $mp_url = '/msp/' . make_member_url($name, '', 4);
+        $mp_url = '/msp/'.make_member_url($name, '', 4);
 ?>
 <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
         foreach ($mreg as $k => $n) {
-            print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) print ', ';
-            elseif ($k == count($mreg)-2) print ' and ';
+            print "<a href='/msp/".make_member_url($n, '', 4)."'>$n</a>";
+            if ($k < count($mreg) - 2) print ', ';
+            elseif ($k == count($mreg) - 2) print ' and ';
         }
         echo '.</li>';
     } elseif ($country == 'N') {
-        $mp_url = '/mla/' . make_member_url($name, '', 3);
+        $mp_url = '/mla/'.make_member_url($name, '', 3);
 ?>
 <li>You were in the <strong><?=$current['NIE']?></strong> constituency; your constituency MLA was <a href='<?=$mp_url?>'><?=$name?></a>.</li>
 <?php

Braces +5 added lines, -2 removed lines

@@ -134,8 +134,11 @@
 <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
         foreach ($mreg as $k => $n) {
             print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) print ', ';
-            elseif ($k == count($mreg)-2) print ' and ';
+            if ($k < count($mreg)-2) {
+                print ', ';
+            } elseif ($k == count($mreg)-2) {
+                print ' and ';
+            }
         }
         echo '.</li>';
     } elseif ($country == 'N') {

www/docs/divisions/division.php

Indentation +5 added lines, -5 removed lines

@@ -43,11 +43,11 @@
             $data['mp_vote']['with_majority'] = true;
         }
     } else {
-      if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
-          $data['before_mp'] = true;
-      } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
-          $data['after_mp'] = true;
-      }
+        if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
+            $data['before_mp'] = true;
+        } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
+            $data['after_mp'] = true;
+        }
     }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $this_page = 'divisions_vote';
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     }
 }
 
-$data['debate_time_human'] = False;
+$data['debate_time_human'] = false;
 $data['debate_day_human'] = format_date($data['division']['date'], LONGDATEFORMAT);
 $data['col_country'] = 'UK';
 $data['location'] = 'in the House of Commons';

www/docs/divisions/index.php

Indentation +5 added lines, -5 removed lines

@@ -10,12 +10,12 @@
 }
 
 if (isset($MEMBER)) {
-  $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
-  $data = array('divisions' => $divisions->getRecentMemberDivisions(30, 'Parliament'));
-  $data['mp_name'] = ucfirst($MEMBER->full_name());
+    $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
+    $data = array('divisions' => $divisions->getRecentMemberDivisions(30, 'Parliament'));
+    $data['mp_name'] = ucfirst($MEMBER->full_name());
 } else {
-  $divisions = new MySociety\TheyWorkForYou\Divisions();
-  $data = $divisions->getRecentDivisions(30);
+    $divisions = new MySociety\TheyWorkForYou\Divisions();
+    $data = $divisions->getRecentDivisions(30);
 }
 
 $data['last_updated'] = MySociety\TheyWorkForYou\Divisions::getMostRecentDivisionDate()['latest'];

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $this_page = 'divisions_recent';