mysociety / theyworkforyou

www/docs/api/api_getAlerts.php

Indentation +4 added lines, -4 removed lines

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

Spacing +2 added lines, -2 removed lines

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

www/docs/api/api_getHansard.php

Braces +3 added lines, -1 removed lines

@@ -66,7 +66,9 @@
     if ($o == 'p') {
         $data = \MySociety\TheyWorkForYou\Utility\Search::searchByUsage($search);
         $out = array();
-        if (!isset($data['speakers'])) $data['speakers'] = array();
+        if (!isset($data['speakers'])) {
+            $data['speakers'] = array();
+        }
         foreach ($data['speakers'] as $pid => $s) {
             $out[$pid] = array(
                 'house' => $s['house'],

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
 
 function api_getHansard_front() {
 ?>
@@ -29,10 +29,10 @@ 
 }
 
 function api_getHansard_search($s) {
-    _api_getHansard_search( array(
+    _api_getHansard_search(array(
         's' => $s,
         'pid' => get_http_var('person')
-    ) );
+    ));
 }
 function api_getHansard_person($pid) {
     _api_getHansard_search(array(
@@ -41,7 +41,7 @@ 
 }
 
 function _api_getHansard_date($type, $d) {
-    $args = array ('date' => $d);
+    $args = array('date' => $d);
     $LIST = _api_getListObject($type);
     $LIST->display('date', $args, 'api');
 }
@@ -56,7 +56,7 @@ 
     $type = isset($array['type']) ? $array['type'] : '';
     $search = filter_user_input($search, 'strict');
     if ($pid) {
-        $search .= ($search?' ':'') . 'speaker:' . $pid;
+        $search .= ($search ? ' ' : '') . 'speaker:' . $pid;
     }
     if ($type) {
         $search .= " section:" . $type;
@@ -91,12 +91,12 @@ 
     }
 #    $query_desc_short = $SEARCHENGINE->query_description_short();
     $pagenum = get_http_var('page');
-    $args = array (
+    $args = array(
         's' => $search,
         'p' => $pagenum,
         'num' => get_http_var('num'),
         'pop' => 1,
-        'o' => ($o=='d' || $o=='r') ? $o : 'd',
+        'o' => ($o == 'd' || $o == 'r') ? $o : 'd',
     );
     $LIST = new HANSARDLIST();
     $data = $LIST->display('search', $args, 'none');

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/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 \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,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_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/api/api_functions.php

Indentation +10 added lines, -10 removed lines

@@ -146,18 +146,18 @@ 
 }
 
 function api_is_superuser_key($key) {
-  $db = new ParlDB;
-  $q = $db->query('SELECT api_key.user_id, users.status
+    $db = new ParlDB;
+    $q = $db->query('SELECT api_key.user_id, users.status
                FROM   api_key, users
                WHERE  users.user_id = api_key.user_id
                AND    api_key.api_key = :key', array(
                 ':key' => $key
                 ));
-  if (!$q->rows())
+    if (!$q->rows())
     return false;
-  if ($q->field(0, 'status') == 'Superuser')
+    if ($q->field(0, 'status') == 'Superuser')
     return true;
-  else
+    else
     return false;
 }
 
@@ -335,12 +335,12 @@ 
     // we only want to convert to iso if it's an actual API call
     // so skip this if it's a documentation page
     if (!get_http_var('docs')) {
-      // and then catch any errors in the conversion and just ignore
-      // them and return the unconverted results
-      $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
-      if ($converted_out !== FALSE) {
+        // and then catch any errors in the conversion and just ignore
+        // them and return the unconverted results
+        $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
+        if ($converted_out !== FALSE) {
         $out = $converted_out;
-      }
+        }
     }
 
     return $out;

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

@@ -338,7 +338,7 @@
       // and then catch any errors in the conversion and just ignore
       // them and return the unconverted results
       $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
-      if ($converted_out !== FALSE) {
+      if ($converted_out !== false) {
         $out = $converted_out;
       }
     }

Spacing +15 added lines, -15 removed lines

@@ -132,7 +132,7 @@ 
 # Key-related functions
 
 function api_log_call($key) {
-    if ($key=='DOCS') return;
+    if ($key == 'DOCS') return;
     $ip = $_SERVER['REMOTE_ADDR'];
     $query = !empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
     $query = preg_replace('#key=[A-Za-z0-9]+&?#', '', $query);
@@ -197,14 +197,14 @@ 
 
 # Output functions
 
-function api_output($arr, $last_mod=null) {
+function api_output($arr, $last_mod = null) {
     $output = get_http_var('output');
     if (!get_http_var('docs')) {
         $cond = api_header($output, $last_mod);
         if ($cond) return;
     }
     if ($output == 'xml') {
-        $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
+        $out = '<?xml version="1.0" encoding="utf-8"?>' . "\n";
         $out .= '<twfy>' . api_output_xml($arr) . '</twfy>';
     } elseif ($output == 'php') {
         $out = api_output_php($arr);
@@ -222,7 +222,7 @@ 
     print $out;
 }
 
-function api_header($o, $last_mod=null) {
+function api_header($o, $last_mod = null) {
     if ($last_mod && array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
         $t = cond_parse_http_date($_SERVER['HTTP_IF_MODIFIED_SINCE']);
         if (isset($t) && $t >= $last_mod) {
@@ -248,7 +248,7 @@ 
     }
     #$type = 'text/plain';
     header("Content-Type: $type; charset=$charset");
-    if ($last_mod>0)
+    if ($last_mod > 0)
         header('Last-Modified: ' . date('r', $last_mod));
     return false;
 }
@@ -271,11 +271,11 @@ 
 }
 
 $api_xml_arr = 0;
-function api_output_xml($v, $k=null) {
+function api_output_xml($v, $k = null) {
     global $api_xml_arr;
     $verbose = get_http_var('verbose') ? "\n" : '';
     if (is_array($v)) {
-        if (count($v) && array_keys($v) === range(0, count($v)-1)) {
+        if (count($v) && array_keys($v) === range(0, count($v) - 1)) {
             $elt = 'match';
             $api_xml_arr++;
             $out = "<$elt>";
@@ -296,36 +296,36 @@ 
     }
 }
 
-function api_output_js($v, $level=0) {
+function api_output_js($v, $level = 0) {
     $verbose = get_http_var('verbose') ? "\n" : '';
     $out = '';
     if (is_array($v)) {
         # PHP arrays are both JS arrays and objects
-        if (count($v) && array_keys($v) === range(0, count($v)-1)) {
-            $out = '[' . join(",$verbose" , array_map('api_output_js', $v)) . ']';
+        if (count($v) && array_keys($v) === range(0, count($v) - 1)) {
+            $out = '[' . join(",$verbose", array_map('api_output_js', $v)) . ']';
         } else {
             $out = '{' . $verbose;
             $b = false;
             foreach ($v as $k => $vv) {
                 if ($b) $out .= ",$verbose";
                 if ($verbose) {
-                    $out .= str_repeat(' ', ($level+1)*2);
+                    $out .= str_repeat(' ', ($level + 1) * 2);
                     $out .= '"' . $k . '" : ';
                 } else {
                     $out .= '"' . $k . '":';
                 }
-                $out .= api_output_js($vv, $level+1);
+                $out .= api_output_js($vv, $level + 1);
                 $b = true;
             }
-            if ($verbose) $out .= "\n" . str_repeat(' ', $level*2);
+            if ($verbose) $out .= "\n" . str_repeat(' ', $level * 2);
             $out .= '}';
         }
     } elseif (is_null($v)) {
         $out = "null";
     } elseif (is_string($v)) {
         $out = '"' . str_replace(
-            array("\\",'"',"\n","\t","\r", "‶", "″", "“", "”"),
-            array("\\\\",'\"','\n','\t','\r', '\"', '\"', '\"', '\"'), $v) . '"';
+            array("\\", '"', "\n", "\t", "\r", "‶", "″", "“", "”"),
+            array("\\\\", '\"', '\n', '\t', '\r', '\"', '\"', '\"', '\"'), $v) . '"';
     } elseif (is_bool($v)) {
         $out = $v ? 'true' : 'false';
     } elseif (is_int($v) || is_float($v)) {

Braces +49 added lines, -29 removed lines

@@ -132,7 +132,9 @@ 
 # Key-related functions
 
 function api_log_call($key) {
-    if ($key=='DOCS') return;
+    if ($key=='DOCS') {
+        return;
+    }
     $ip = $_SERVER['REMOTE_ADDR'];
     $query = !empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
     $query = preg_replace('#key=[A-Za-z0-9]+&?#', '', $query);
@@ -153,23 +155,27 @@ 
                AND    api_key.api_key = :key', array(
                 ':key' => $key
                 ));
-  if (!$q->rows())
-    return false;
-  if ($q->field(0, 'status') == 'Superuser')
-    return true;
-  else
-    return false;
-}
+  if (!$q->rows()) {
+      return false;
+  }
+  if ($q->field(0, 'status') == 'Superuser') {
+      return true;
+  } else {
+      return false;
+  }
+  }
 
 function api_check_key($key) {
     $db = new ParlDB;
     $q = $db->query('SELECT user_id, disabled FROM api_key WHERE api_key = :key', array(
         ':key' => $key
         ));
-    if (!$q->rows())
-        return false;
-    if ($q->field(0, 'disabled'))
-        return 'disabled';
+    if (!$q->rows()) {
+            return false;
+    }
+    if ($q->field(0, 'disabled')) {
+            return 'disabled';
+    }
     return true;
 }
 
@@ -201,7 +207,9 @@ 
     $output = get_http_var('output');
     if (!get_http_var('docs')) {
         $cond = api_header($output, $last_mod);
-        if ($cond) return;
+        if ($cond) {
+            return;
+        }
     }
     if ($output == 'xml') {
         $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
@@ -212,7 +220,8 @@ 
         $out = api_output_rabx($arr);
     } elseif ($output == 'json') {
         $out = json_encode($arr, JSON_PRETTY_PRINT);
-    } else { # JS
+    } else {
+# JS
         $out = api_output_js($arr);
         $callback = get_http_var('callback');
         if (preg_match('#^[A-Za-z0-9._[\]]+$#', $callback)) {
@@ -248,8 +257,9 @@ 
     }
     #$type = 'text/plain';
     header("Content-Type: $type; charset=$charset");
-    if ($last_mod>0)
-        header('Last-Modified: ' . date('r', $last_mod));
+    if ($last_mod>0) {
+            header('Last-Modified: ' . date('r', $last_mod));
+    }
     return false;
 }
 
@@ -259,14 +269,18 @@ 
 
 function api_output_php($arr) {
     $out = serialize($arr);
-    if (get_http_var('verbose')) $out = str_replace(';', ";\n", $out);
+    if (get_http_var('verbose')) {
+        $out = str_replace(';', ";\n", $out);
+    }
     return $out;
 }
 
 function api_output_rabx($arr) {
     $out = '';
     rabx_wire_wr($arr, $out);
-    if (get_http_var('verbose')) $out = str_replace(',', ",\n", $out);
+    if (get_http_var('verbose')) {
+        $out = str_replace(',', ",\n", $out);
+    }
     return $out;
 }
 
@@ -307,7 +321,9 @@ 
             $out = '{' . $verbose;
             $b = false;
             foreach ($v as $k => $vv) {
-                if ($b) $out .= ",$verbose";
+                if ($b) {
+                    $out .= ",$verbose";
+                }
                 if ($verbose) {
                     $out .= str_repeat(' ', ($level+1)*2);
                     $out .= '"' . $k . '" : ';
@@ -317,7 +333,9 @@ 
                 $out .= api_output_js($vv, $level+1);
                 $b = true;
             }
-            if ($verbose) $out .= "\n" . str_repeat(' ', $level*2);
+            if ($verbose) {
+                $out .= "\n" . str_repeat(' ', $level*2);
+            }
             $out .= '}';
         }
     } elseif (is_null($v)) {
@@ -349,13 +367,14 @@ 
 # Call an API function
 
 function api_call_user_func_or_error($function, $params, $error, $type) {
-    if (function_exists($function))
-        call_user_func_array($function, $params);
-    elseif ($type == 'api')
-        api_error($error);
-    else
-        print "<p style='color:#cc0000'>$error</p>";
-}
+    if (function_exists($function)) {
+            call_user_func_array($function, $params);
+    } elseif ($type == 'api') {
+            api_error($error);
+    } else {
+            print "<p style='color:#cc0000'>$error</p>";
+    }
+    }
 
 # Used for testing for conditional responses
 
@@ -405,8 +424,9 @@ 
         $H = $ma[4];
         $M = $ma[5];
         $S = $ma[6];
-    } else
-        return null;
+    } else {
+            return null;
+    }
 
     return gmmktime($H, $M, $S, $m, $d, $Y);
 }