mysociety / theyworkforyou

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

www/docs/api/api_getBoundary.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-include_once INCLUDESPATH . '../../commonlib/phplib/mapit.php';
-include_once dirname(__FILE__) . '/api_getGeometry.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/mapit.php';
+include_once dirname(__FILE__).'/api_getGeometry.php';
 
 function api_getBoundary_front() {
 ?>

www/docs/api/key.php

Spacing +11 added lines, -11 removed lines

@@ -2,7 +2,7 @@ 
 
 include_once '../../includes/easyparliament/init.php';
 include_once './api_functions.php';
-include_once INCLUDESPATH . '../../commonlib/phplib/auth.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/auth.php';
 
 $a = auth_ab64_encode(urandom_bytes(32));
 
@@ -21,15 +21,15 @@ 
     if (get_http_var('create_key') && get_http_var('reason')) {
         $estimated_usage = (int) get_http_var('estimated_usage');
         $commercial = get_http_var('commercial');
-        create_key($commercial, get_http_var('reason'),  $estimated_usage);
+        create_key($commercial, get_http_var('reason'), $estimated_usage);
         if ($commercial == '1' || $estimated_usage > 50000) {
             echo '<p><strong>It looks like your usage may fall outside of our free-of-charge bracket: if that\'s the case, this key might get blocked, so we\'d advise you to email us at <a href="enquiries@mysociety.org">enquiries@mysociety.org</a> to discuss licensing options.</strong></p>';
         }
     }
     $db = new ParlDB;
-    $q = $db->query('SELECT api_key, commercial, created, reason, estimated_usage FROM api_key WHERE user_id=' . $THEUSER->user_id());
+    $q = $db->query('SELECT api_key, commercial, created, reason, estimated_usage FROM api_key WHERE user_id='.$THEUSER->user_id());
     $keys = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $keys[] = array($q->field($i, 'api_key'), $q->field($i, 'commercial'), $q->field($i, 'created'), $q->field($i, 'reason'), $q->field($i, 'estimated_usage'));
     }
     if ($keys) {
@@ -37,19 +37,19 @@ 
     }
     foreach ($keys as $keyarr) {
         list($key, $commercial, $created, $reason, $estimated_usage) = $keyarr;
-        echo '<li><span style="font-size:200%">' . $key . '</span><br><span style="color: #666666;">';
-        if ($commercial==1) echo 'Commercial key,';
-        elseif ($commercial==-1) echo 'Key';
+        echo '<li><span style="font-size:200%">'.$key.'</span><br><span style="color: #666666;">';
+        if ($commercial == 1) echo 'Commercial key,';
+        elseif ($commercial == -1) echo 'Key';
         else echo 'Non-commercial key,';
         echo ' created ', $created, '; ', $reason, '; estimated usage ', $estimated_usage;
         echo '</span><br><em>Usage statistics</em>: ';
-        $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="' . $key . '" AND query_time > NOW() - interval 1 day');
+        $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="'.$key.'" AND query_time > NOW() - interval 1 day');
         $c = $q->field(0, 'count');
         echo "last 24 hours: $c, ";
-        $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="' . $key . '" AND query_time > NOW() - interval 1 week');
+        $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="'.$key.'" AND query_time > NOW() - interval 1 week');
         $c = $q->field(0, 'count');
         echo "last week: $c, ";
-        $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="' . $key . '" AND query_time > NOW() - interval 1 month');
+        $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="'.$key.'" AND query_time > NOW() - interval 1 month');
         $c = $q->field(0, 'count');
         echo "last month: $c";
         echo '</p>';
@@ -75,7 +75,7 @@ 
     global $THEUSER;
     $key = auth_ab64_encode(urandom_bytes(16));
     $db = new ParlDB;
-    if ($commercial=='') $commercial = 0;
+    if ($commercial == '') $commercial = 0;
     $db->query('INSERT INTO api_key (user_id, api_key, commercial, created, reason, estimated_usage) VALUES
         (:user_id, :key, :commercial, NOW(), :reason, :estimated_usage)', array(
         ':user_id' => $THEUSER->user_id(),

Braces +10 added lines, -4 removed lines

@@ -38,9 +38,13 @@ 
     foreach ($keys as $keyarr) {
         list($key, $commercial, $created, $reason, $estimated_usage) = $keyarr;
         echo '<li><span style="font-size:200%">' . $key . '</span><br><span style="color: #666666;">';
-        if ($commercial==1) echo 'Commercial key,';
-        elseif ($commercial==-1) echo 'Key';
-        else echo 'Non-commercial key,';
+        if ($commercial==1) {
+            echo 'Commercial key,';
+        } elseif ($commercial==-1) {
+            echo 'Key';
+        } else {
+            echo 'Non-commercial key,';
+        }
         echo ' created ', $created, '; ', $reason, '; estimated usage ', $estimated_usage;
         echo '</span><br><em>Usage statistics</em>: ';
         $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="' . $key . '" AND query_time > NOW() - interval 1 day');
@@ -75,7 +79,9 @@ 
     global $THEUSER;
     $key = auth_ab64_encode(urandom_bytes(16));
     $db = new ParlDB;
-    if ($commercial=='') $commercial = 0;
+    if ($commercial=='') {
+        $commercial = 0;
+    }
     $db->query('INSERT INTO api_key (user_id, api_key, commercial, created, reason, estimated_usage) VALUES
         (:user_id, :key, :commercial, NOW(), :reason, :estimated_usage)', array(
         ':user_id' => $THEUSER->user_id(),

www/docs/api/api_getCommittee.php

Spacing +8 added lines, -8 removed lines

@@ -57,16 +57,16 @@ 
     $name = preg_replace('#\s+Committee#', '', $name);
 
     $date = parse_date(get_http_var('date'));
-    if ($date) $date = '"' . $date['iso'] . '"';
+    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(
-            ':department' => '%' . $name . '%Committee',
+            ':department' => '%'.$name.'%Committee',
             ));
     if ($q->rows() > 1) {
         # More than one committee matches
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $output['committees'][] = array(
                 'name' => $q->field($i, 'dept')
             );
@@ -80,15 +80,15 @@ 
             and dept like :department
             and from_date <= $date and $date <= to_date
             and entered_house <= $date and $date <= left_house", array(
-                ':department' => '%' . $name . '%Committee',
+                ':department' => '%'.$name.'%Committee',
             ));
         if ($q->rows()) {
             $output = array();
             $output['committee'] = $q->field(0, 'dept');
-            for ($i=0; $i<$q->rows(); $i++) {
+            for ($i = 0; $i < $q->rows(); $i++) {
                 $member = array(
                     'person_id' => $q->field($i, 'person'),
-                    'name' => $q->field($i, 'given_name') . ' ' . $q->field($i, 'family_name'),
+                    'name' => $q->field($i, 'given_name').' '.$q->field($i, 'family_name'),
                 );
                 if ($q->field($i, 'position') == 'Chairman') {
                     $member['position'] = $q->field($i, 'position');
@@ -108,13 +108,13 @@ 
     $db = new ParlDB;
 
     $date = parse_date($date);
-    if ($date) $date = '"' . $date['iso'] . '"';
+    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");
     if ($q->rows()) {
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $output['committees'][] = array(
                 'name' => $q->field($i, 'dept')
             );

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_convertURL.php

Braces +9 added lines, -6 removed lines

@@ -75,22 +75,25 @@
     $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url = :url order by gid limit 1', array(
         ':url' => $url
         ));
-    if ($q->rows())
-        return api_converturl_url_output($q);
+    if ($q->rows()) {
+            return api_converturl_url_output($q);
+    }
 
     $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
         ':url' => $url_nohash . '%'
         ));
-    if ($q->rows())
-        return api_converturl_url_output($q);
+    if ($q->rows()) {
+            return api_converturl_url_output($q);
+    }
 
     $url_bound = str_replace('cmhansrd/cm', 'cmhansrd/vo', $url_nohash);
     if ($url_bound != $url_nohash) {
         $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
             ':url' => $url_bound . '%'
             ));
-        if ($q->rows())
-            return api_converturl_url_output($q);
+        if ($q->rows()) {
+                    return api_converturl_url_output($q);
+        }
     }
     api_error('Sorry, URL could not be converted');
 }

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,7 @@ 
     $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
     $fragment = '';
     if ($id_data['htype'] == '11' || $id_data['htype'] == '10') {
-        $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
+        $LISTURL->insert(array('id' => $id_data['gid']));
     } else {
         $parent_epobject_id = $id_data['subsection_id'];
         $parent_gid = '';
@@ -50,14 +50,14 @@ 
                     ':epobject_id' => $parent_epobject_id
                     ));
         if ($r->rows() > 0) {
-            $parent_gid = fix_gid_from_db( $r->field(0, 'gid') );
+            $parent_gid = fix_gid_from_db($r->field(0, 'gid'));
         }
         if ($parent_gid != '') {
-            $LISTURL->insert( array( 'id' => $parent_gid ) );
-            $fragment = '#g' . gid_to_anchor($id_data['gid']);
+            $LISTURL->insert(array('id' => $parent_gid));
+            $fragment = '#g'.gid_to_anchor($id_data['gid']);
         }
     }
-    return $LISTURL->generate('none') . $fragment;
+    return $LISTURL->generate('none').$fragment;
 }
 
 function api_converturl_url_output($q) {
@@ -65,7 +65,7 @@ 
     $url = get_listurl($q);
     $output = array(
         'gid' => $gid,
-        'url' => 'https://www.theyworkforyou.com' . $url
+        'url' => 'https://www.theyworkforyou.com'.$url
     );
     api_output($output);
 }
@@ -79,7 +79,7 @@ 
         return api_converturl_url_output($q);
 
     $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
-        ':url' => $url_nohash . '%'
+        ':url' => $url_nohash.'%'
         ));
     if ($q->rows())
         return api_converturl_url_output($q);
@@ -87,7 +87,7 @@ 
     $url_bound = str_replace('cmhansrd/cm', 'cmhansrd/vo', $url_nohash);
     if ($url_bound != $url_nohash) {
         $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
-            ':url' => $url_bound . '%'
+            ':url' => $url_bound.'%'
             ));
         if ($q->rows())
             return api_converturl_url_output($q);

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