mysociety / theyworkforyou

www/docs/api/api_convertURL.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     $LISTURL = new 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,10 +50,10 @@ 
                     ':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 ) );
+            $LISTURL->insert(array('id' => $parent_gid));
             $fragment = '#g' . gid_to_anchor($id_data['gid']);
         }
     }

Braces +11 added lines, -7 removed lines

@@ -41,7 +41,8 @@ 
     $fragment = '';
     if ($id_data['htype'] == '11' || $id_data['htype'] == '10') {
         $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
-    } else {
+    }
+    else {
         $parent_epobject_id = $id_data['subsection_id'];
         $parent_gid = '';
         $r = $db->query("SELECT gid
@@ -75,22 +76,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');
 }

www/docs/api/api_getMembers.php

Spacing +3 added lines, -3 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) {
@@ -32,7 +32,7 @@ 
     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++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $row = $q->row($i);
             $pid = $row['person'];
             unset($row['person']);

Braces +2 added lines, -1 removed lines

@@ -81,7 +81,8 @@
 function api_getMembers_date($house, $date) {
     if ($date = parse_date($date)) {
         api_getMembers($house, '"' . $date['iso'] . '"');
-    } else {
+    }
+    else {
         api_error('Invalid date format');
     }
 }

www/docs/api/api_getMPInfo.php

Braces +4 added lines, -2 removed lines

@@ -27,10 +27,12 @@
     if ($output) {
         if ($output[0]) {
             api_output($output[0][$id], $output[1]);
-        } else {
+        }
+        else {
             api_error('Unknown field');
         }
-    } else {
+    }
+    else {
         api_error('Unknown person ID');
     }
 }

www/docs/api/api_getGeometry.php

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

Braces +15 added lines, -8 removed lines

@@ -38,13 +38,18 @@ 
 
 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);
 
@@ -54,7 +59,8 @@ 
         if ($name == $area['name']) {
             if (isset($ni_geometry[$area_id])) {
                 $out = $ni_geometry[$area_id];
-            } else {
+            }
+            else {
                 $out = mapit_call('area/geometry', $area_id);
             }
             $out['name'] = $name;
@@ -68,8 +74,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_getConstituency.php

Spacing +1 added lines, -1 removed lines

@@ -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_getDebates.php

Braces +18 added lines, -9 removed lines

@@ -106,25 +106,31 @@ 
     if ($t == 'commons') {
         $list = 'DEBATE';
         $type = 'debates';
-    } elseif ($t == 'lords') {
+    }
+    elseif ($t == 'lords') {
         $list = 'LORDSDEBATE';
         $type = 'lords';
-    } elseif ($t == 'westminsterhall') {
+    }
+    elseif ($t == 'westminsterhall') {
         $list = 'WHALL';
         $type = 'whall';
-    } elseif ($t == 'scotland') {
+    }
+    elseif ($t == 'scotland') {
         $list = 'SP';
         $type = 'sp';
-    } elseif ($t == 'northernireland') {
+    }
+    elseif ($t == 'northernireland') {
         $list = 'NI';
         $type = 'ni';
-    } else {
+    }
+    else {
         api_error('Unknown type');
         return;
     }
     if ($d = get_http_var('date')) {
         _api_getHansard_date($list, $d);
-    } elseif (get_http_var('search') || get_http_var('person')) {
+    }
+    elseif (get_http_var('search') || get_http_var('person')) {
         $s = get_http_var('search');
         $pid = get_http_var('person');
         _api_getHansard_search(array(
@@ -132,11 +138,14 @@ 
             'pid' => $pid,
             'type' => $type,
         ));
-    } elseif ($gid = get_http_var('gid')) {
+    }
+    elseif ($gid = get_http_var('gid')) {
         _api_getHansard_gid($list, $gid);
-    } elseif ($y = get_http_var('year')) {
+    }
+    elseif ($y = get_http_var('year')) {
         _api_getHansard_year($list, $y);
-    } else {
+    }
+    else {
         api_error('That is not a valid search.');
     }
 }

www/docs/api/api_getMPsInfo.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         where person_id in (" . $ids . ")");
     if ($q->rows()) {
         $output = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $data_key = $q->field($i, 'data_key');
             if (count($fields) && !in_array($data_key, $fields))
                 continue;
@@ -44,7 +44,7 @@ 
             where memberinfo.member_id=member.member_id and person_id in (" . $ids . ")
             order by person_id,member_id");
         if ($q->rows()) {
-            for ($i=0; $i<$q->rows(); $i++) {
+            for ($i = 0; $i < $q->rows(); $i++) {
                 $data_key = $q->field($i, 'data_key');
                 if (count($fields) && !in_array($data_key, $fields))
                     continue;

Braces +27 added lines, -14 removed lines

@@ -20,7 +20,9 @@ 
     $ids = preg_split('#\s*,\s*#', $ids, -1, PREG_SPLIT_NO_EMPTY);
     $safe_ids = array(0);
     foreach ($ids as $id) {
-        if (ctype_digit($id)) $safe_ids[] = $id;
+        if (ctype_digit($id)) {
+            $safe_ids[] = $id;
+        }
     }
     $ids = join(',', $safe_ids);
 
@@ -32,13 +34,15 @@ 
         $output = array();
         for ($i=0; $i<$q->rows(); $i++) {
             $data_key = $q->field($i, 'data_key');
-            if (count($fields) && !in_array($data_key, $fields))
-                continue;
+            if (count($fields) && !in_array($data_key, $fields)) {
+                            continue;
+            }
             $pid = $q->field($i, 'person_id');
             $output[$pid][$data_key] = $q->field($i, 'data_value');
             $time = strtotime($q->field($i, 'lastupdate'));
-            if ($time > $last_mod)
-                $last_mod = $time;
+            if ($time > $last_mod) {
+                            $last_mod = $time;
+            }
         }
         $q = $db->query("select memberinfo.*, person_id from memberinfo, member
             where memberinfo.member_id=member.member_id and person_id in (" . $ids . ")
@@ -46,21 +50,28 @@ 
         if ($q->rows()) {
             for ($i=0; $i<$q->rows(); $i++) {
                 $data_key = $q->field($i, 'data_key');
-                if (count($fields) && !in_array($data_key, $fields))
-                    continue;
+                if (count($fields) && !in_array($data_key, $fields)) {
+                                    continue;
+                }
                 $mid = $q->field($i, 'member_id');
                 $pid = $q->field($i, 'person_id');
-                if (!isset($output[$pid]['by_member_id'])) $output[$pid]['by_member_id'] = array();
-                if (!isset($output[$pid]['by_member_id'][$mid])) $output[$pid]['by_member_id'][$mid] = array();
+                if (!isset($output[$pid]['by_member_id'])) {
+                    $output[$pid]['by_member_id'] = array();
+                }
+                if (!isset($output[$pid]['by_member_id'][$mid])) {
+                    $output[$pid]['by_member_id'][$mid] = array();
+                }
                 $output[$pid]['by_member_id'][$mid][$data_key] = $q->field($i, 'data_value');
                 $time = strtotime($q->field($i, 'lastupdate'));
-                if ($time > $last_mod)
-                    $last_mod = $time;
+                if ($time > $last_mod) {
+                                    $last_mod = $time;
+                }
             }
         }
         ksort($output);
         return array($output, $last_mod);
-    } else {
+    }
+    else {
         return null;
     }
 }
@@ -70,10 +81,12 @@ 
     if ($output) {
         if ($output[0]) {
             api_output($output[0], $output[1]);
-        } else {
+        }
+        else {
             api_error('Unknown field');
         }
-    } else {
+    }
+    else {
         api_error('Unknown person ID');
     }
 }

www/docs/api/api_getCommittee.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
             ));
     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')
             );
@@ -85,7 +85,7 @@ 
         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'),
@@ -114,7 +114,7 @@ 
         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 +20 added lines, -8 removed lines

@@ -57,8 +57,12 @@ 
     $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(
@@ -72,7 +76,8 @@ 
             );
         }
         api_output($output);
-    } elseif ($q->rows()) {
+    }
+    elseif ($q->rows()) {
         # One committee
         $q = $db->query("select * from moffice, member, person_names pn
             where moffice.person = member.person_id
@@ -96,10 +101,12 @@ 
                 $output['members'][] = $member;
             }
             api_output($output);
-        } else {
+        }
+        else {
             api_error('That committee has no members...?');
         }
-    } else {
+    }
+    else {
         api_error('That name was not recognised');
     }
 }
@@ -108,8 +115,12 @@ 
     $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");
@@ -120,7 +131,8 @@ 
             );
         }
         api_output($output);
-    } else {
+    }
+    else {
         api_error('No committees found');
     }
 }

www/docs/mps/index.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/people.php";
+include_once INCLUDESPATH . "easyparliament/people.php";
 
 if (get_http_var('msp')) {
     $type = 'MSPs';
@@ -18,7 +18,7 @@ 
 $args = $people->getArgs();
 $people->setMetaData($args);
 $data = $people->getData($args);
-if ( isset($args['f']) && $args['f'] == 'csv' ) {
+if (isset($args['f']) && $args['f'] == 'csv') {
     $people->sendAsCSV($data);
 } else {
     MySociety\TheyWorkForYou\Renderer::output("people/index", $data);

Braces +8 added lines, -4 removed lines

@@ -5,11 +5,14 @@ 
 
 if (get_http_var('msp')) {
     $type = 'MSPs';
-} elseif (get_http_var('mla')) {
+}
+elseif (get_http_var('mla')) {
     $type = 'MLAs';
-} elseif (get_http_var('peer')) {
+}
+elseif (get_http_var('peer')) {
     $type = 'Peers';
-} else {
+}
+else {
     $type = 'MPs';
 }
 
@@ -20,6 +23,7 @@ 
 $data = $people->getData($args);
 if ( isset($args['f']) && $args['f'] == 'csv' ) {
     $people->sendAsCSV($data);
-} else {
+}
+else {
     MySociety\TheyWorkForYou\Renderer::output("people/index", $data);
 }