mysociety / theyworkforyou

www/docs/api/api_getHansard.php

Braces +3 added lines, -1 removed lines

@@ -66,7 +66,9 @@
     if ($o == 'p') {
         $data = \MySociety\TheyWorkForYou\Utility\Search::searchByUsage($search);
         $out = array();
-        if (!isset($data['speakers'])) $data['speakers'] = array();
+        if (!isset($data['speakers'])) {
+            $data['speakers'] = array();
+        }
         foreach ($data['speakers'] as $pid => $s) {
             $out[$pid] = array(
                 'house' => $s['house'],

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
 
 function api_getHansard_front() {
 ?>
@@ -29,10 +29,10 @@ 
 }
 
 function api_getHansard_search($s) {
-    _api_getHansard_search( array(
+    _api_getHansard_search(array(
         's' => $s,
         'pid' => get_http_var('person')
-    ) );
+    ));
 }
 function api_getHansard_person($pid) {
     _api_getHansard_search(array(
@@ -41,7 +41,7 @@ 
 }
 
 function _api_getHansard_date($type, $d) {
-    $args = array ('date' => $d);
+    $args = array('date' => $d);
     $LIST = _api_getListObject($type);
     $LIST->display('date', $args, 'api');
 }
@@ -56,7 +56,7 @@ 
     $type = isset($array['type']) ? $array['type'] : '';
     $search = filter_user_input($search, 'strict');
     if ($pid) {
-        $search .= ($search?' ':'') . 'speaker:' . $pid;
+        $search .= ($search ? ' ' : '') . 'speaker:' . $pid;
     }
     if ($type) {
         $search .= " section:" . $type;
@@ -91,12 +91,12 @@ 
     }
 #    $query_desc_short = $SEARCHENGINE->query_description_short();
     $pagenum = get_http_var('page');
-    $args = array (
+    $args = array(
         's' => $search,
         'p' => $pagenum,
         'num' => get_http_var('num'),
         'pop' => 1,
-        'o' => ($o=='d' || $o=='r') ? $o : 'd',
+        'o' => ($o == 'd' || $o == 'r') ? $o : 'd',
     );
     $LIST = new HANSARDLIST();
     $data = $LIST->display('search', $args, 'none');

www/docs/api/api_getGeometry.php

Braces +12 added lines, -7 removed lines

@@ -38,13 +38,17 @@ 
 
 function api_getGeometry_name($name) {
     $out = _api_getGeometry_name($name);
-    if ($out) api_output($out);
-    else api_error('Name not recognised');
-}
+    if ($out) {
+        api_output($out);
+    } else {
+        api_error('Name not recognised');
+    }
+    }
 
 function _api_getGeometry_name($name) {
-    if (!defined('OPTION_MAPIT_URL') || !OPTION_MAPIT_URL)
-        return null;
+    if (!defined('OPTION_MAPIT_URL') || !OPTION_MAPIT_URL) {
+            return null;
+    }
 
     $name = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($name);
 
@@ -68,8 +72,9 @@ 
 
 function _api_cacheCheck($fn, $arg='') {
     $cache = INCLUDESPATH . '../docs/api/cache/' . $fn;
-    if (is_file($cache))
-        return unserialize(file_get_contents($cache));
+    if (is_file($cache)) {
+            return unserialize(file_get_contents($cache));
+    }
     $out = mapit_call($fn, $arg);
     $fp = fopen($cache, 'w');
     if ($fp) {

Spacing +37 added lines, -37 removed lines

@@ -66,7 +66,7 @@ 
     return null;
 }
 
-function _api_cacheCheck($fn, $arg='') {
+function _api_cacheCheck($fn, $arg = '') {
     $cache = INCLUDESPATH . '../docs/api/cache/' . $fn;
     if (is_file($cache))
         return unserialize(file_get_contents($cache));
@@ -83,58 +83,58 @@ 
 function _api_ni_centroids() {
     return array(
         # East Londonderry
-        66129 => array('centre_lat' => 54.980766, 'centre_lon' => -6.904907 ),
-        14276 => array('centre_lat' => 54.980766, 'centre_lon' => -6.904907 ),
+        66129 => array('centre_lat' => 54.980766, 'centre_lon' => -6.904907),
+        14276 => array('centre_lat' => 54.980766, 'centre_lon' => -6.904907),
         # Foyle
-        66131 => array('centre_lat' => 54.933453, 'centre_lon' => -7.267456 ),
-        14273 => array('centre_lat' => 54.933453, 'centre_lon' => -7.267456 ),
+        66131 => array('centre_lat' => 54.933453, 'centre_lon' => -7.267456),
+        14273 => array('centre_lat' => 54.933453, 'centre_lon' => -7.267456),
         # West Tyrone
-        66141 => array('centre_lat' => 54.619797, 'centre_lon' => -7.410278 ),
-        14292 => array('centre_lat' => 54.619797, 'centre_lon' => -7.410278 ),
+        66141 => array('centre_lat' => 54.619797, 'centre_lon' => -7.410278),
+        14292 => array('centre_lat' => 54.619797, 'centre_lon' => -7.410278),
         # Fermanagh & South Tyrone
-        14296 => array('centre_lat' => 54.354958, 'centre_lon' => -7.443237 ),
-        66130 => array('centre_lat' => 54.354958, 'centre_lon' => -7.443237 ),
+        14296 => array('centre_lat' => 54.354958, 'centre_lon' => -7.443237),
+        66130 => array('centre_lat' => 54.354958, 'centre_lon' => -7.443237),
         # Newry & Armagh
-        14303 => array('centre_lat' => 54.297295, 'centre_lon' => -6.613770 ),
-        66134 => array('centre_lat' => 54.297295, 'centre_lon' => -6.613770 ),
+        14303 => array('centre_lat' => 54.297295, 'centre_lon' => -6.613770),
+        66134 => array('centre_lat' => 54.297295, 'centre_lon' => -6.613770),
         # Upper Bann
-        14300 => array('centre_lat' => 54.399750, 'centre_lon' => -6.350098 ),
-        66140 => array('centre_lat' => 54.399750, 'centre_lon' => -6.350098 ),
+        14300 => array('centre_lat' => 54.399750, 'centre_lon' => -6.350098),
+        66140 => array('centre_lat' => 54.399750, 'centre_lon' => -6.350098),
         # South Down
-        14306 => array('centre_lat' => 54.213860, 'centre_lon' => -6.152344 ),
-        66138 => array('centre_lat' => 54.213860, 'centre_lon' => -6.152344 ),
+        14306 => array('centre_lat' => 54.213860, 'centre_lon' => -6.152344),
+        66138 => array('centre_lat' => 54.213860, 'centre_lon' => -6.152344),
         # Lagan Valley
-        14309 => array('centre_lat' => 54.441296, 'centre_lon' => -6.108398 ),
-        66132 => array('centre_lat' => 54.441296, 'centre_lon' => -6.108398 ),
+        14309 => array('centre_lat' => 54.441296, 'centre_lon' => -6.108398),
+        66132 => array('centre_lat' => 54.441296, 'centre_lon' => -6.108398),
         # Strangford
-        14312 => array('centre_lat' => 54.514706, 'centre_lon' => -5.751343 ),
-        66139 => array('centre_lat' => 54.514706, 'centre_lon' => -5.751343 ),
+        14312 => array('centre_lat' => 54.514706, 'centre_lon' => -5.751343),
+        66139 => array('centre_lat' => 54.514706, 'centre_lon' => -5.751343),
         # North Down
-        14325 => array('centre_lat' => 54.651592, 'centre_lon' => -5.718384 ),
-        66136 => array('centre_lat' => 54.651592, 'centre_lon' => -5.718384 ),
+        14325 => array('centre_lat' => 54.651592, 'centre_lon' => -5.718384),
+        66136 => array('centre_lat' => 54.651592, 'centre_lon' => -5.718384),
         # South Antrim
-        14318 => array('centre_lat' => 54.699234, 'centre_lon' => -6.102905 ),
-        66137 => array('centre_lat' => 54.699234, 'centre_lon' => -6.102905 ),
+        14318 => array('centre_lat' => 54.699234, 'centre_lon' => -6.102905),
+        66137 => array('centre_lat' => 54.699234, 'centre_lon' => -6.102905),
         # East Antrim
-        66128 => array('centre_lat' => 54.832336, 'centre_lon' => -5.883179 ),
-        14284 => array('centre_lat' => 54.832336, 'centre_lon' => -5.883179 ),
+        66128 => array('centre_lat' => 54.832336, 'centre_lon' => -5.883179),
+        14284 => array('centre_lat' => 54.832336, 'centre_lon' => -5.883179),
         # North Antrim
-        66135 => array('centre_lat' => 54.993374, 'centre_lon' => -6.328125 ),
-        14280 => array('centre_lat' => 54.993374, 'centre_lon' => -6.328125 ),
+        66135 => array('centre_lat' => 54.993374, 'centre_lon' => -6.328125),
+        14280 => array('centre_lat' => 54.993374, 'centre_lon' => -6.328125),
         # Mid Ulster
-        66133 => array('centre_lat' => 54.721447, 'centre_lon' => -6.795044 ),
-        14288 => array('centre_lat' => 54.721447, 'centre_lon' => -6.795044 ),
+        66133 => array('centre_lat' => 54.721447, 'centre_lon' => -6.795044),
+        14288 => array('centre_lat' => 54.721447, 'centre_lon' => -6.795044),
         # Belfast North
-        14321 => array('centre_lat' => 54.618607, 'centre_lon' => -5.917511 ),
-        66125 => array('centre_lat' => 54.618607, 'centre_lon' => -5.917511 ),
+        14321 => array('centre_lat' => 54.618607, 'centre_lon' => -5.917511),
+        66125 => array('centre_lat' => 54.618607, 'centre_lon' => -5.917511),
         # Belfast East
-        14329 => array('centre_lat' => 54.598324, 'centre_lon' => -5.892792 ),
-        66124 => array('centre_lat' => 54.598324, 'centre_lon' => -5.892792 ),
+        14329 => array('centre_lat' => 54.598324, 'centre_lon' => -5.892792),
+        66124 => array('centre_lat' => 54.598324, 'centre_lon' => -5.892792),
         # Belfast South
-        14331 => array('centre_lat' => 54.582409, 'centre_lon' => -5.925064 ),
-        66126 => array('centre_lat' => 54.582409, 'centre_lon' => -5.925064 ),
+        14331 => array('centre_lat' => 54.582409, 'centre_lon' => -5.925064),
+        66126 => array('centre_lat' => 54.582409, 'centre_lon' => -5.925064),
         # Belfast West
-        14315 => array('centre_lat' => 54.606277, 'centre_lon' => -5.956650 ),
-        66127 => array('centre_lat' => 54.606277, 'centre_lon' => -5.956650 ),
+        14315 => array('centre_lat' => 54.606277, 'centre_lon' => -5.956650),
+        66127 => array('centre_lat' => 54.606277, 'centre_lon' => -5.956650),
     );
 }

www/docs/api/api_getCommittee.php

Braces +10 added lines, -4 removed lines

@@ -57,8 +57,11 @@ 
     $name = preg_replace('#\s+Committee#', '', $name);
 
     $date = parse_date(get_http_var('date'));
-    if ($date) $date = '"' . $date['iso'] . '"';
-    else $date = 'date(now())';
+    if ($date) {
+        $date = '"' . $date['iso'] . '"';
+    } else {
+        $date = 'date(now())';
+    }
     $q = $db->query("select distinct(dept) from moffice
         where dept like :department
         and from_date <= $date and $date <= to_date", array(
@@ -108,8 +111,11 @@ 
     $db = new ParlDB;
 
     $date = parse_date($date);
-    if ($date) $date = '"' . $date['iso'] . '"';
-    else $date = 'date(now())';
+    if ($date) {
+        $date = '"' . $date['iso'] . '"';
+    } else {
+        $date = 'date(now())';
+    }
     $q = $db->query("select distinct(dept) from moffice
         where source = 'chgpages/selctee'
         and from_date <= $date and $date <= to_date");

www/docs/api/api_getComments.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 }
 
 function api_getComments_start_date($start_date) {
-        $args = array (
+        $args = array(
             'start_date' => $start_date,
             'end_date' => get_http_var('end_date')
         );
@@ -33,7 +33,7 @@ 
 }
 
 function api_getComments_search($s) {
-        $args = array (
+        $args = array(
             's' => $s,
             'p' => get_http_var('page'),
             'num' => get_http_var('num'),

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')) {

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/';

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
             foreach ($data['parameters'] as $parameter) {
                 if ($q_param = trim(get_http_var($parameter))) {
                     $match++;
-                    include_once 'api_'. $method . '.php';
+                    include_once 'api_' . $method . '.php';
                     api_call_user_func_or_error('api_' . $method . '_' . $parameter, array($q_param), 'API call not yet functional', 'api');
                     break;
                 }
@@ -57,9 +57,9 @@ 
                     api_error('No parameter provided to function "' .
                     _htmlspecialchars($q_method) .
                         '". Possible choices are: ' .
-                        join(', ', $data['parameters']) );
+                        join(', ', $data['parameters']));
                 } else {
-                    include_once 'api_'. $method . '.php';
+                    include_once 'api_' . $method . '.php';
                     api_call_user_func_or_error('api_' . $method, array(), 'API call not yet functional', 'api');
                     break;
                 }
@@ -93,7 +93,7 @@ 
     $DATA->set_page_metadata($this_page, 'title', "$method function");
     $PAGE->page_start();
     $PAGE->stripe_start();
-    include_once 'api_'. $method . '.php';
+    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');
     if ($method != 'getQuota') {
@@ -112,20 +112,20 @@ 
 <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">
@@ -140,7 +140,7 @@ 
         }
         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 $method . '?' . join('&amp;', $qs) . '&amp;output=' . _htmlspecialchars(get_http_var('output')) . '</strong></p>';
         print '<pre>' . _htmlspecialchars($explorer) . '</pre>';
     }
 }

www/docs/glossary/index.php

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');
 }

Spacing +9 added lines, -9 removed lines

@@ -7,7 +7,7 @@ 
 }
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 $args = array(
     'sort'				=> "regexp_replace",
@@ -48,12 +48,12 @@ 
 }
 
 if ($term) {
-    $DATA->set_page_metadata($this_page, 'title', $term['title'].': Glossary item');
+    $DATA->set_page_metadata($this_page, 'title', $term['title'] . ': Glossary item');
     $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'	=> ''
     )

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

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";

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>
 
@@ -45,7 +45,7 @@ 
     parse_bill('2006141.txt');
     $amendments = read_amendments('amendments.txt'); # The amendments, by number
     parse_amendments();
-    $out = $title."\n\n";
+    $out = $title . "\n\n";
     $out .= "Page,Line\n";
     foreach ($bill as $page_num => $page) {
         foreach ($page as $line_num => $line) {
@@ -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,8 +155,8 @@ 
             $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]);
+            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'
@@ -199,10 +199,10 @@ 
             $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>';
+            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)) {
@@ -223,15 +223,15 @@ 
             $page = $m[1]; $line = $m[3]; $clause = $m[2];
             $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>';
+            $bill[$page][$line] = '<del title="' . $num . '">' . $bill[$page][$line] . '</del>';
+            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)) {
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $insert = $m[4];
             unset($amendments[$num]);
-            $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
+            $bill[$page][$line] .= '<ins title="' . $num . '">' . $insert . '</ins>';
         }
         # Title, line    1, leave out `reforming legislation' and insert `...'
         if (preg_match('#Title, line.*?, leave out `(.*?)\' and insert `(.*?)\'#s', $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>';
                             }
                         }
                     }

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'
         ),

scripts/alertmpchanged.php

Indentation +15 added lines, -15 removed lines

@@ -22,26 +22,26 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
+    if ($argv[$k] == '--nomail')
+        $nomail = true;
+    if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
+        $onlyemail = $m[1];
+    if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
+        $fromemail = $m[1];
+    if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
+        $toemail = $m[1];
 }
 
 if (DEVSITE)
-  $nomail = true;
+    $nomail = true;
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
 if ($nomail) mlog("NOT SENDING EMAIL\n");
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
-	mlog("Can't have both from/to and only!\n");
-	exit;
+    mlog("Can't have both from/to and only!\n");
+    exit;
 }
 
 $active = 0;
@@ -66,8 +66,8 @@ 
 $members = array();
 $start_time = time();
 foreach ($alertdata as $alertitem) {
-	$active++;
-	$email = $alertitem['email'];
+    $active++;
+    $email = $alertitem['email'];
     if ($onlyemail && $email != $onlyemail) continue;
     if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
     if ($fromemail && !$fromflag) continue;
@@ -143,9 +143,9 @@ 
 
 $sss = "Active alerts: $active\nEmail lookups: $registered registered, $unregistered unregistered\nQuery lookups: $queries\nSent emails: $sentemails\n";
 if ($globalsuccess) {
-      $sss .= 'Everything went swimmingly, in ';
+        $sss .= 'Everything went swimmingly, in ';
 } else {
-      $sss .= 'Something went wrong! Total time: ';
+        $sss .= 'Something went wrong! Total time: ';
 }
 $sss .= (getmicrotime()-$global_start)."\n\n";
 mlog($sss);

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

@@ -155,7 +155,7 @@
     global $globalsuccess, $sentemails, $nomail, $start_time;
 
     $sentemails++;
-    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    mlog("send $sentemails : Sending email to $current[email] ... ");
     $d = array('to' => $current['email'], 'template' => $template);
     $m = array(
         'DATA' => join("\n", $data),

Spacing +13 added lines, -13 removed lines

@@ -21,7 +21,7 @@ 
 $fromflag = false;
 $toemail = '';
 $template = 'alert_new_mp';
-for ($k=1; $k<$argc; $k++) {
+for ($k = 1; $k < $argc; $k++) {
 	if ($argv[$k] == '--nomail')
 		$nomail = true;
 	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
@@ -91,9 +91,9 @@ 
     // skip if they didn't lose their westminster seat in the most recent election
     if ($member->left_house(1)['date'] != $END_DATE) continue;
 
-    if ( !isset($cons[$member->constituency]) ) {
+    if (!isset($cons[$member->constituency])) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
-        if ( !$cons_member ) {
+        if (!$cons_member) {
             continue;
         }
         $cons[$member->constituency] = $cons_member;
@@ -102,7 +102,7 @@ 
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
+    if ($cons_member->person_id == $member->person_id) continue;
     if (!$cons_member->current_member_anywhere()) continue;
 
     if ($email != $current['email']) {
@@ -122,7 +122,7 @@ 
             $user_id = 0;
             $unregistered++;
         }
-        mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
+        mlog("\nEMAIL: $email, uid $user_id; memory usage : " . memory_get_usage() . "\n");
     }
 
     $lh = $member->left_house();
@@ -147,7 +147,7 @@ 
 } else {
       $sss .= 'Something went wrong! Total time: ';
 }
-$sss .= (getmicrotime()-$global_start)."\n\n";
+$sss .= (getmicrotime() - $global_start) . "\n\n";
 mlog($sss);
 mlog(date('r') . "\n");
 
@@ -160,18 +160,18 @@ 
     $m = array(
         'DATA' => join("\n", $data),
         'CHANGE' => join("\n", $change),
-        'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
-        'MPS' => count($data)==1 ? 'This MP' : 'These MPs',
-        'MPS2' => count($data)==1 ? 'MP' : 'MPs',
-        'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
-        'ALERTS2' => count($data)==1 ? 'alert' : 'alerts',
-        'LINKS' => count($data)==1 ? 'link' : 'links',
+        'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are',
+        'MPS' => count($data) == 1 ? 'This MP' : 'These MPs',
+        'MPS2' => count($data) == 1 ? 'MP' : 'MPs',
+        'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts',
+        'ALERTS2' => count($data) == 1 ? 'alert' : 'alerts',
+        'LINKS' => count($data) == 1 ? 'link' : 'links',
     );
     if (!$nomail) {
         $success = send_template_email($d, $m, true);
         mlog("sent ... ");
         # sleep if time between sending mails is less than a certain number of seconds on average
-        if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than
+        if (((time() - $start_time) / $sentemails) < 0.5) { # number of seconds per mail not to be quicker than
             mlog("pausing ... ");
             sleep(1);
         }

Braces +48 added lines, -22 removed lines

@@ -22,23 +22,30 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
-}
-
-if (DEVSITE)
+	if ($argv[$k] == '--nomail') {
+			$nomail = true;
+	}
+	if (preg_match('#^--only=(.*)$#', $argv[$k], $m)) {
+			$onlyemail = $m[1];
+	}
+	if (preg_match('#^--from=(.*)$#', $argv[$k], $m)) {
+			$fromemail = $m[1];
+	}
+	if (preg_match('#^--to=(.*)$#', $argv[$k], $m)) {
+			$toemail = $m[1];
+	}
+	}
+
+if (DEVSITE) {
   $nomail = true;
+}
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
-if ($nomail) mlog("NOT SENDING EMAIL\n");
+if ($nomail) {
+    mlog("NOT SENDING EMAIL\n");
+}
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
 	mlog("Can't have both from/to and only!\n");
 	exit;
@@ -68,14 +75,24 @@ 
 foreach ($alertdata as $alertitem) {
 	$active++;
 	$email = $alertitem['email'];
-    if ($onlyemail && $email != $onlyemail) continue;
-    if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
-    if ($fromemail && !$fromflag) continue;
-    if ($toemail && strtolower($email) >= $toemail) continue;
+    if ($onlyemail && $email != $onlyemail) {
+        continue;
+    }
+    if ($fromemail && strtolower($email) == $fromemail) {
+        $fromflag = true;
+    }
+    if ($fromemail && !$fromflag) {
+        continue;
+    }
+    if ($toemail && strtolower($email) >= $toemail) {
+        continue;
+    }
     $criteria_raw = $alertitem['criteria'];
 
     // we only care about alerts for people speaking
-    if (!strstr($criteria_raw, 'speaker:')) continue;
+    if (!strstr($criteria_raw, 'speaker:')) {
+        continue;
+    }
 
     preg_match('#speaker:(\d+)#', $criteria_raw, $m);
     $person_id = $m[1];
@@ -86,10 +103,14 @@ 
     $member = $members[$person_id];
 
     // if they're still elected then don't send the email
-    if ($member->current_member_anywhere()) continue;
+    if ($member->current_member_anywhere()) {
+        continue;
+    }
 
     // skip if they didn't lose their westminster seat in the most recent election
-    if ($member->left_house(1)['date'] != $END_DATE) continue;
+    if ($member->left_house(1)['date'] != $END_DATE) {
+        continue;
+    }
 
     if ( !isset($cons[$member->constituency]) ) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
@@ -102,8 +123,12 @@ 
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
-    if (!$cons_member->current_member_anywhere()) continue;
+    if ( $cons_member->person_id == $member->person_id ) {
+        continue;
+    }
+    if (!$cons_member->current_member_anywhere()) {
+        continue;
+    }
 
     if ($email != $current['email']) {
         if ($email_text && $change_text) {
@@ -171,7 +196,8 @@ 
         $success = send_template_email($d, $m, true);
         mlog("sent ... ");
         # sleep if time between sending mails is less than a certain number of seconds on average
-        if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than
+        if (((time() - $start_time) / $sentemails) < 0.5 ) {
+# number of seconds per mail not to be quicker than
             mlog("pausing ... ");
             sleep(1);
         }