mysociety / theyworkforyou

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/key.php

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

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
     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>';
         }
@@ -29,7 +29,7 @@ 
     $db = new ParlDB;
     $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) {
@@ -38,8 +38,8 @@ 
     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';
+        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>: ';
@@ -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(),

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

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

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

www/docs/api/api_getPerson.php

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();

Spacing +6 added lines, -6 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']);
@@ -30,7 +30,7 @@ 
     }
     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));
         $row['image'] = $image;
@@ -43,7 +43,7 @@ 
         # 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++) {
+        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;

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

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

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;

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');
 ?>
@@ -102,20 +102,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">
@@ -130,7 +130,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>';
     }
     $sidebar = api_sidebar();

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