mysociety / theyworkforyou

www/docs/api/api_getAlerts.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 function api_getAlerts_start_date($start_date) {
-  $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
-  $alert = new ALERT();
-  $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
-  api_output($data);
+    $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
+    $alert = new ALERT();
+    $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
+    api_output($data);
 }
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 function api_getAlerts_start_date($start_date) {
-  $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
+  $args = array('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
   $alert = new ALERT();
-  $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
+  $data = $alert->fetch_between($confirmed = 1, $deleted = 0, $args['start_date'], $args['end_date']);
   api_output($data);
 }
 

www/docs/api/api_getConstituency.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH . '../../commonlib/phplib/mapit.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/mapit.php';
 
 function api_getConstituency_front() {
 ?>
@@ -60,7 +60,7 @@ 
     $q = $db->query("select constituency, data_key, data_value from consinfo
                      where constituency = :constituency", array(':constituency' => $constituency));
     if ($q->rows()) {
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $data_key = $q->field($i, 'data_key');
             $output[$data_key] = $q->field($i, 'data_value');
         }

www/docs/api/api_getMPInfo.php

Spacing +1 added lines, -1 removed lines

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

www/docs/api/api_getMLAs.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_getMLAs_front() {
 ?>

www/docs/api/api_getMembers.php

Spacing +7 added lines, -7 removed lines

@@ -8,14 +8,14 @@ 
     $q = $db->query($sql, $params);
     $output = array();
     $last_mod = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $pid = $q->field($i, 'person_id');
         $row = array(
             'member_id' => $q->field($i, 'member_id'),
             'person_id' => $pid,
             'name' => html_entity_decode(member_full_name($q->field($i, 'house'), $q->field($i, 'title'),
                 $q->field($i, 'given_name'), $q->field($i, 'family_name'),
-                $q->field($i, 'lordofname') )),
+                $q->field($i, 'lordofname'))),
             'party' => isset($parties[$q->field($i, 'party')]) ? $parties[$q->field($i, 'party')] : $q->field($i, 'party'),
         );
         if ($q->field($i, 'house') != 2) {
@@ -31,8 +31,8 @@ 
     $pids = array_keys($output);
     if (count($pids)) {
         $q = $db->query('SELECT person, dept, position, from_date, to_date FROM moffice
-            WHERE to_date="9999-12-31" AND person IN (' . join(',', $pids) . ')');
-        for ($i=0; $i<$q->rows(); $i++) {
+            WHERE to_date="9999-12-31" AND person IN (' . join(',', $pids).')');
+        for ($i = 0; $i < $q->rows(); $i++) {
             $row = $q->row($i);
             $pid = $row['person'];
             unset($row['person']);
@@ -55,7 +55,7 @@ 
             AND p.start_date <= date(now()) and date(now()) <= p.end_date
         and party like :party and entered_house <= date(now()) and date(now()) <= left_house', array(
             ':house' => $house,
-            ':party' => '%' . $s . '%'
+            ':party' => '%'.$s.'%'
             ));
 }
 
@@ -74,13 +74,13 @@ 
 
     _api_getMembers_output($query, array(
         ':house' => $house,
-        ':name' => '%' . $s . '%'
+        ':name' => '%'.$s.'%'
         ));
 }
 
 function api_getMembers_date($house, $date) {
     if ($date = parse_date($date)) {
-        api_getMembers($house, '"' . $date['iso'] . '"');
+        api_getMembers($house, '"'.$date['iso'].'"');
     } else {
         api_error('Invalid date format');
     }

www/docs/api/api_getDebates.php

Spacing +1 added lines, -1 removed lines

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

www/docs/api/api_getMSP.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-include_once INCLUDESPATH . 'easyparliament/member.php';
-include_once dirname(__FILE__) . '/api_getPerson.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
+include_once dirname(__FILE__).'/api_getPerson.php';
 
 function api_getMSP_front() {
 ?>

www/docs/api/api_getMP.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-include_once INCLUDESPATH . 'easyparliament/member.php';
-include_once dirname(__FILE__) . '/api_getPerson.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
+include_once dirname(__FILE__).'/api_getPerson.php';
 
 function api_getMP_front() {
 ?>

www/docs/api/api_getGeometry.php

Spacing +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH . '../../commonlib/phplib/mapit.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/mapit.php';
 
 function api_getGeometry_front() {
 ?>
@@ -66,8 +66,8 @@ 
     return null;
 }
 
-function _api_cacheCheck($fn, $arg='') {
-    $cache = INCLUDESPATH . '../docs/api/cache/' . $fn;
+function _api_cacheCheck($fn, $arg = '') {
+    $cache = INCLUDESPATH.'../docs/api/cache/'.$fn;
     if (is_file($cache))
         return unserialize(file_get_contents($cache));
     $out = mapit_call($fn, $arg);
@@ -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 &amp; 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 &amp; 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),
     );
 }

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