mysociety / theyworkforyou

www/docs/api/api_convertURL.php

Spacing +8 added lines, -8 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,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);

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

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

www/docs/api/api_getPerson.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 function api_getPerson_front() {
 ?>
@@ -17,7 +17,7 @@ 
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party = FALSE) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);
@@ -26,13 +26,13 @@ 
     }
     if ($row['house'] == 1) {
         $URL = new URL('mp');
-        $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
+        $row['url'] = $URL->generate('none').make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
     if ($has_party && isset($parties[$row['party']]))
         $row['party'] = $parties[$row['party']];
-    list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
+    list($image, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
-        list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
+        list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR.'/images/', $image));
         $row['image'] = $image;
         $row['image_height'] = $height;
         $row['image_width'] = $width;
@@ -42,8 +42,8 @@ 
     if ($row['house'] == 1 && ($row['left_house'] == '9999-12-31' || (isset($dissolution[1]) && $row['left_house'] == $dissolution[1]))) {
         # Ministerialships and Select Committees
         $db = new ParlDB;
-        $q = $db->query('SELECT * FROM moffice WHERE to_date="9999-12-31" and person=' . $row['person_id'] . ' ORDER BY from_date DESC');
-        for ($i=0; $i<$q->rows(); $i++) {
+        $q = $db->query('SELECT * FROM moffice WHERE to_date="9999-12-31" and person='.$row['person_id'].' ORDER BY from_date DESC');
+        for ($i = 0; $i < $q->rows(); $i++) {
             $row['office'][] = $q->row($i);
         }
     }
@@ -55,7 +55,7 @@ 
     return $row;
 }
 
-function api_getPerson_id($id, $house='') {
+function api_getPerson_id($id, $house = '') {
     $db = new ParlDB;
     $params = array(
         ':person_id' => $id
@@ -77,10 +77,10 @@ 
     }
 }
 
-function _api_getPerson_output($q, $flatten=false) {
+function _api_getPerson_output($q, $flatten = false) {
     $output = array();
     $last_mod = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $out = _api_getPerson_row($q->row($i), $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
@@ -149,13 +149,13 @@ 
     $cons_params = array();
     $params = array(':house' => $house);
     foreach ($cons as $key => $constituency) {
-        $cons_params[] = ':constituency' . $key;
-        $params[':constituency' . $key] = $constituency;
+        $cons_params[] = ':constituency'.$key;
+        $params[':constituency'.$key] = $constituency;
     }
 
     $query_base = "SELECT member.*, p.title, p.given_name, p.family_name, p.lordofname
         FROM member, person_names p
-        WHERE constituency in (" . join(",", $cons_params) . ")
+        WHERE constituency in (" . join(",", $cons_params).")
             AND member.person_id = p.person_id AND p.type = 'name'
             AND p.start_date <= left_house AND left_house <= p.end_date
         AND house = :house";

Braces +18 added lines, -9 removed lines

@@ -28,8 +28,9 @@ 
         $URL = new URL('mp');
         $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
-    if ($has_party && isset($parties[$row['party']]))
-        $row['party'] = $parties[$row['party']];
+    if ($has_party && isset($parties[$row['party']])) {
+            $row['party'] = $parties[$row['party']];
+    }
     list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
@@ -49,7 +50,9 @@ 
     }
 
     foreach ($row as $k => $r) {
-        if (is_string($r)) $row[$k] = html_entity_decode($r);
+        if (is_string($r)) {
+            $row[$k] = html_entity_decode($r);
+        }
     }
 
     return $row;
@@ -85,8 +88,9 @@ 
         $out = _api_getPerson_row($q->row($i), $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
         $time = strtotime($q->field($i, 'lastupdate'));
-        if ($time > $last_mod)
-            $last_mod = $time;
+        if ($time > $last_mod) {
+                    $last_mod = $time;
+        }
     }
     # Only one MP, not an array
     if ($flatten && count($output) == 1 && $house == HOUSE_TYPE_COMMONS) {
@@ -134,13 +138,18 @@ 
 
     $cons = array();
     foreach ($constituencies as $constituency) {
-        if ($constituency == '') continue;
-        if ($constituency == 'Orkney ')
-            $constituency = 'Orkney & Shetland';
+        if ($constituency == '') {
+            continue;
+        }
+        if ($constituency == 'Orkney ') {
+                    $constituency = 'Orkney & Shetland';
+        }
 
         if ($house == HOUSE_TYPE_COMMONS) {
             $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-            if ($normalised) $constituency = $normalised;
+            if ($normalised) {
+                $constituency = $normalised;
+            }
         }
 
         $cons[] = $constituency;

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

@@ -17,7 +17,7 @@
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party=false) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);

Doc Comments +9 added lines

@@ -77,6 +77,9 @@ 
     }
 }
 
+/**
+ * @param MySociety\TheyWorkForYou\Db\Query $q
+ */
 function _api_getPerson_output($q, $flatten=false) {
     $output = array();
     $last_mod = 0;
@@ -95,10 +98,16 @@ 
     api_output($output, $last_mod);
 }
 
+/**
+ * @param integer $house
+ */
 function api_getPerson_constituency($constituency, $house) {
     _api_getPerson_constituency(array($constituency), $house);
 }
 
+/**
+ * @param integer $house
+ */
 function api_getPerson_postcode($pc, $house) {
     $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc);
     $types = array();

www/docs/api/api_getLord.php

Spacing +1 added lines, -1 removed lines

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

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/api_getMLA.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_getMLA_front() {
 ?>

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

www/docs/api/api_getWMS.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once dirname(__FILE__) . '/api_getHansard.php';
+include_once dirname(__FILE__).'/api_getHansard.php';
 
 function api_getWMS_front() {
 ?>
@@ -100,11 +100,11 @@ 
     _api_getHansard_year('WMS', $y);
 }
 function api_getWMS_search($s) {
-    _api_getHansard_search( array(
+    _api_getHansard_search(array(
         's' => $s,
         'pid' => get_http_var('person'),
         'type' => 'wms',
-    ) );
+    ));
 }
 function api_getWMS_person($pid) {
     _api_getHansard_search(array(

www/docs/api/api_getMPsInfo.php

Spacing +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@ 
     $db = new ParlDB;
     $last_mod = 0;
     $q = $db->query("select person_id, data_key, data_value, lastupdate from personinfo
-        where person_id in (" . $ids . ")");
+        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;
@@ -41,10 +41,10 @@ 
                 $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 . ")
+            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 +21 added lines, -11 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,16 +50,22 @@ 
         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);