mysociety / theyworkforyou

www/docs/mp/index.php

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

@@ -29,7 +29,7 @@ 
  */
 
 // Disable the old PAGE class.
-$new_style_template = TRUE;
+$new_style_template = true;
 
 // Include all the things this page needs.
 include_once '../../includes/easyparliament/init.php';
@@ -213,7 +213,7 @@ 
 // Basic name, title and description
 $member_name = ucfirst($MEMBER->full_name());
 $title = $member_name;
-$desc = "Read $member_name's contributions to Parliament, including speeches and questions";
+$desc = "read $member_name's contributions to Parliament, including speeches and questions";
 
 // Enhance description if this is a current member
 if ($MEMBER->current_member_anywhere()) {
@@ -262,7 +262,7 @@ 
 }
 
 $known_for = '';
-$current_offices_ignoring_committees = $MEMBER->offices('current', TRUE);
+$current_offices_ignoring_committees = $MEMBER->offices('current', true);
 if (count($current_offices_ignoring_committees) > 0) {
     $known_for = $current_offices_ignoring_committees[0];
 }
@@ -332,11 +332,11 @@ 
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
 
-$data['pre_2010_expenses'] = False;
+$data['pre_2010_expenses'] = false;
 $data['post_2010_expenses'] = $data['leave_date'] > '2010-05-05';
 
 if ($data['entry_date'] < '2010-05-05') {
-    $data['pre_2010_expenses'] = True;
+    $data['pre_2010_expenses'] = true;
     // Set the expenses URL if we know it
     if (isset($MEMBER->extra_info['expenses_url'])) {
         $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'];
@@ -556,7 +556,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect (&$MEMBER, $code = 301, $pagetype = null) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {

Spacing +28 added lines, -28 removed lines

@@ -139,7 +139,7 @@ 
     }
     if ($pid) {
         $URL = new \MySociety\TheyWorkForYou\Url('search');
-        $URL->insert( array('pid'=>$pid, 'pop'=>1) );
+        $URL->insert(array('pid'=>$pid, 'pop'=>1));
         header('Location: ' . $URL->generate('none'));
         exit;
     }
@@ -189,7 +189,7 @@ 
     } elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
     } else {
-        twfy_debug ('MP', "We don't have any way of telling what MP to display");
+        twfy_debug('MP', "We don't have any way of telling what MP to display");
         throw new MySociety\TheyWorkForYou\MemberException(gettext('Sorry, but we can’t tell which representative to display.'));
     }
     if (!isset($MEMBER) || !$MEMBER->valid) {
@@ -261,7 +261,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_SCOTLAND)) {
         $title .= ', former';
     }
-    $title .= ' MSP, '.$MEMBER->constituency();
+    $title .= ' MSP, ' . $MEMBER->constituency();
 }
 
 // Enhance title if this is a member of Welsh Parliament
@@ -275,7 +275,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_WALES)) {
         $title .= ', former';
     }
-    $title .= ' MS, '.$MEMBER->constituency();
+    $title .= ' MS, ' . $MEMBER->constituency();
 }
 
 $known_for = '';
@@ -346,7 +346,7 @@ 
 $data['eu_stance'] = $MEMBER->getEUStance();
 
 # People who are or were MPs and Lords potentially have voting records, except Sinn Fein MPs
-$data['has_voting_record'] = ( ($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS) );
+$data['has_voting_record'] = (($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS));
 # Everyone who is currently somewhere has email alert signup, apart from current Sinn Fein MPs who are not MLAs
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
@@ -390,11 +390,11 @@ 
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
         $policySummaries = $divisions->getMemberDivisionDetails(true);
 
-        $policyOptions = array( 'summaries' => $policySummaries);
+        $policyOptions = array('summaries' => $policySummaries);
 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
-        if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
+        if ($policy_set && array_key_exists($policy_set, $set_descriptions)) {
             $sets = array($policy_set);
             $data['og_image'] = $MEMBER->url(true) . "/policy_set_png?policy_set=" . $policy_set;
             $data['page_title'] = $set_descriptions[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
@@ -441,15 +441,15 @@ 
 
     case 'divisions':
         $policyID = get_http_var('policy');
-        if ( $policyID ) {
-            $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
+        if ($policyID) {
+            $policiesList = new MySociety\TheyWorkForYou\Policies($policyID);
         } else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions);
 
-        if ( $policyID ) {
+        if ($policyID) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
             $rel_agreements = $MEMBER->member_agreements($policyID, HOUSE_TYPE_COMMONS, $policiesList);
             $data['policyagreements'] = array($policyID => $rel_agreements);
@@ -520,15 +520,15 @@ 
     global $THEUSER;
     $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
     if (!validate_postcode($pc)) {
-        twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+        twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
         throw new MySociety\TheyWorkForYou\MemberException(sprintf(gettext('Sorry, %s isn’t a valid postcode'), _htmlentities($pc)));
     }
-    twfy_debug ('MP', "MP lookup by postcode");
+    twfy_debug('MP', "MP lookup by postcode");
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "connection_timed_out") {
         throw new MySociety\TheyWorkForYou\MemberException(gettext('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.'));
     } elseif ($constituency == "") {
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
         throw new MySociety\TheyWorkForYou\MemberException(sprintf(gettext('Sorry, %s isn’t a known postcode'), _htmlentities($pc)));
     } else {
         // Redirect to the canonical MP page, with a person id.
@@ -541,11 +541,11 @@ 
     }
 }
 
-function get_person_by_name($name, $const='') {
+function get_person_by_name($name, $const = '') {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('name' => $name, 'constituency' => $const));
     // Edge case, only attempt further detection if this isn't the Queen.
     if (($name !== 'elizabeth the second' && $name !== 'prince charles') || $const) {
-        twfy_debug ('MP', 'Redirecting for MP found by name/constituency');
+        twfy_debug('MP', 'Redirecting for MP found by name/constituency');
         member_redirect($MEMBER);
     }
     return $MEMBER;
@@ -582,7 +582,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect(&$MEMBER, $code = 301, $pagetype = NULL) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -601,7 +601,7 @@ 
         } else {
             $pagetype = '';
         }
-        header('Location: ' . $url . $pagetype, true, $code );
+        header('Location: ' . $url . $pagetype, true, $code);
         exit;
     }
 }
@@ -630,7 +630,7 @@ 
 function person_error_page($message) {
     global $this_page;
     $SEARCHURL = '';
-    switch($this_page) {
+    switch ($this_page) {
         case 'peer':
             $people = new MySociety\TheyWorkForYou\People\Peers();
             $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
@@ -677,7 +677,7 @@ 
  * Generate the summary of this person's held positions.
  */
 
-function person_summary_description ($MEMBER) {
+function person_summary_description($MEMBER) {
     $entered_house = $MEMBER->entered_house();
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
@@ -693,7 +693,7 @@ 
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
+        if ($house == HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
             # Same info is printed further down
             continue;
         }
@@ -766,7 +766,7 @@ 
  * @return string A HTML summary of this person's rebellion rate.
  */
 
-function person_rebellion_rate ($member) {
+function person_rebellion_rate($member) {
 
     // Rebellion string may be empty.
     $rebellion_string = '';
@@ -815,7 +815,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args = array (
+        $args = array(
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -830,7 +830,7 @@ 
     twfy_debug_timestamp();
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
-    $MOREURL->insert( array('pid'=>$person_id, 'pop'=>1) );
+    $MOREURL->insert(array('pid'=>$person_id, 'pop'=>1));
 
     $out['more_href'] = $MOREURL->generate() . '#n4';
     $out['more_text'] = sprintf(gettext('More of %s’s recent appearances'), ucfirst($member->full_name()));
@@ -990,7 +990,7 @@ 
         return;
     }
 
-    $reg = array( 'date' => '', 'data' => '<p>Nil</p>' );
+    $reg = array('date' => '', 'data' => '<p>Nil</p>');
     if (isset($extra_info['register_member_interests_date'])) {
         $reg['date'] = format_date($extra_info['register_member_interests_date'], SHORTDATEFORMAT);
     }
@@ -1084,8 +1084,8 @@ 
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] = array (
+    foreach ($mreg as $reg) {
+        $data['members'][] = array(
             'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
             'name' => $reg['given_name'] . ' ' . $reg['family_name']
         );
@@ -1154,7 +1154,7 @@ 
     # comparison which is Commons only
     $data['party_member_count'] = $party->getCurrentMemberCount(HOUSE_TYPE_COMMONS);
 
-    $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER, [
+    $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER, [
         'summaries' => $policySummaries,
     ]);
     $policy_diffs = $MEMBER->getPartyPolicyDiffs($partyCohort, $policiesList, $positions);

www/docs/api/api_functions.php

Spacing +14 added lines, -14 removed lines

@@ -138,7 +138,7 @@ 
 # Key-related functions
 
 function api_log_call($key) {
-    if ($key=='DOCS') {
+    if ($key == 'DOCS') {
         return;
     }
     $ip = $_SERVER['REMOTE_ADDR'];
@@ -215,7 +215,7 @@ 
 
 # 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);
@@ -224,7 +224,7 @@ 
         }
     }
     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);
@@ -243,7 +243,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) {
@@ -269,7 +269,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;
@@ -301,7 +301,7 @@ 
     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>";
@@ -322,13 +322,13 @@ 
     }
 }
 
-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;
@@ -337,16 +337,16 @@ 
                     $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);
+                $out .= "\n" . str_repeat(' ', $level * 2);
             }
             $out .= '}';
         }
@@ -354,8 +354,8 @@ 
         $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)) {

www/docs/api/api_getGeometry.php

Spacing +37 added lines, -37 removed lines

@@ -70,7 +70,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));
@@ -88,58 +88,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_getPerson.php

Spacing +4 added lines, -4 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']);
@@ -31,7 +31,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 . IMAGEPATH, $image));
         $row['image'] = $image;
@@ -58,7 +58,7 @@ 
     return $row;
 }
 
-function api_getPerson_id($id, $house='') {
+function api_getPerson_id($id, $house = '') {
     $db = new ParlDB;
     $params = array(
         ':person_id' => $id
@@ -80,7 +80,7 @@ 
     }
 }
 
-function _api_getPerson_output($q, $flatten=false) {
+function _api_getPerson_output($q, $flatten = false) {
     $output = array();
     $last_mod = 0;
     $house = null;

www/docs/api/api_getConstituencies.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
         and c_main.main_name and constituency.name like :constituency_name and constituency.from_date <= date(now())
         and date(now()) <= constituency.to_date
         order by name', array(
-        ':constituency_name' => '%' . $s .'%'
+        ':constituency_name' => '%' . $s . '%'
         ));
     $output = array();
     $done = array();
@@ -70,7 +70,7 @@ 
 function api_getConstituencies($date = 'now()') {
     $db = new ParlDB;
     $q = $db->query('select cons_id, name from constituency
-        where main_name and from_date <= date('.$date.') and date('.$date.') <= to_date
+        where main_name and from_date <= date('.$date . ') and date(' . $date . ') <= to_date
         order by name');
     $output = array();
     foreach ($q as $row) {
@@ -152,7 +152,7 @@ 
  */
 function _api_angle_between($a1, $a2) {
     if (abs($a1 - $a2) > M_PI) {
-        return 2*M_PI - abs($a1 - $a2);
+        return 2 * M_PI - abs($a1 - $a2);
     }
     return abs($a1 - $a2);
 }

www/docs/api/api_getAlerts.php

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/bills/2005-06/legislative-and-regulatory-reform/index.php

Spacing +31 added lines, -31 removed lines

@@ -2,10 +2,10 @@ 
 
 $this_page = 'bill_index';
 include_once '../../../../includes/easyparliament/init.php';
-$DATA->set_page_metadata($this_page, 'heading','Legislative and Regulatory Reform Bill');
+$DATA->set_page_metadata($this_page, 'heading', 'Legislative and Regulatory Reform Bill');
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
 ?>
 <ul>
 
@@ -45,7 +45,7 @@ 
     parse_bill('2006141.txt');
     $amendments = read_amendments('amendments.txt'); # The amendments, by number
     parse_amendments();
-    $out = $title."\n\n";
+    $out = $title . "\n\n";
     $out .= "Page,Line\n";
     foreach ($bill as $page_num => $page) {
         foreach ($page as $line_num => $line) {
@@ -59,7 +59,7 @@ 
 print '</ul>';
 $PAGE->block_end();
 $includes = array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'bills_intro'
     ),
@@ -77,7 +77,7 @@ 
     $intitle = true;
     $title = '';
     foreach ($f as $r) {
-        if ($line<1) {
+        if ($line < 1) {
             $line++;
             continue;
         }
@@ -96,7 +96,7 @@ 
             }
             continue;
         }
-        if (substr($r, 0, 8)=='Bill 141') {
+        if (substr($r, 0, 8) == 'Bill 141') {
             continue;
         }
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
@@ -143,7 +143,7 @@ 
         if ($r == "\n") {
             continue;
         }
-        if ($line<1) {
+        if ($line < 1) {
             $line++;
             continue;
         }
@@ -157,8 +157,8 @@ 
             $number = $m[1];
             $amendments[$number] = '';
         } elseif (preg_match('#To move the following Clause#', $r)) {
-            preg_match('#\n(.*?)$#', $amendments[$number-1], $m);
-            $amendments[$number-1] = preg_replace('#\n(.*?)$#', '', $amendments[$number-1]);
+            preg_match('#\n(.*?)$#', $amendments[$number - 1], $m);
+            $amendments[$number - 1] = preg_replace('#\n(.*?)$#', '', $amendments[$number - 1]);
             $amendments[$number] .= '*' . trim($m[1]) . "*\n$r";
         } else {
             $amendments[$number] .= $r;
@@ -182,9 +182,9 @@ 
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $from_text = $m[4]; $end_line = $m[5]; $insert = $m[6];
             unset($amendments[$num]);
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . '</del><ins title="'.$num.'">' . $insert . '</ins>';
-            for ($i=$line+1; $i<=$end_line; $i++) {
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . '</del><ins title="' . $num . '">' . $insert . '</ins>';
+            for ($i = $line + 1; $i <= $end_line; $i++) {
+                $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
             }
         }
         # Page  4, line 9 [Clause 6], leave out from `under' to `creating' and insert `this Part making provision'
@@ -201,10 +201,10 @@ 
             $insert = $m[7];
             unset($amendments[$num]);
             $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]) . '</del>';
-            for ($i=$from_line+1; $i<$to_line; $i++) {
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+            for ($i = $from_line + 1; $i < $to_line; $i++) {
+                $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
             }
-            $bill[$page][$to_line] = '<del title="'.$num.'">' . str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
+            $bill[$page][$to_line] = '<del title="' . $num . '">' . str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
         }
         # Page  3, line 13 [Clause 4], leave out from beginning to `confer' and insert `An order under this Part may not make provision to'
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], leave out from beginning to `(.*?)\' and insert `(.*?)\'#s', $amendment, $m)) {
@@ -225,9 +225,9 @@ 
             $page = $m[1]; $line = $m[3]; $clause = $m[2];
             $insert = isset($m[4]) ? $m[4] : null;
             unset($amendments[$num]);
-            $bill[$page][$line] = '<del title="'.$num.'">'.$bill[$page][$line].'</del>';
+            $bill[$page][$line] = '<del title="' . $num . '">' . $bill[$page][$line] . '</del>';
             if ($insert) {
-                $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
+                $bill[$page][$line] .= '<ins title="' . $num . '">' . $insert . '</ins>';
             }
         }
         # Page 8, line 24 [Clause 14], at end insert-- `...'
@@ -235,7 +235,7 @@ 
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $insert = $m[4];
             unset($amendments[$num]);
-            $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
+            $bill[$page][$line] .= '<ins title="' . $num . '">' . $insert . '</ins>';
         }
         # Title, line    1, leave out `reforming legislation' and insert `...'
         if (preg_match('#Title, line.*?, leave out `(.*?)\' and insert `(.*?)\'#s', $amendment, $m)) {
@@ -251,14 +251,14 @@ 
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
                     $startP = $subsubclause['startP'];
-                    if ($startP==$page && $subsubclause['startL']==$line) {
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
                         if ($startP == $subsubclause['endP']) {
                             unset($amendments[$num]);
-                            for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
-                                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+                            for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
+                                $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
                             }
                             if ($insert) {
-                                $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
+                                $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
                             }
                         }
                     }
@@ -274,21 +274,21 @@ 
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
                     $startP = $subsubclause['startP'];
-                    if ($startP==$page && $subsubclause['startL']==$line) {
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
                         if ($startP == $subsubclause['endP']) {
                             unset($amendments[$num]);
                             $finished = true;
                         }
                     }
                     if ($finished) {
-                        for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
-                            $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+                        for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
+                            $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
                         }
                     }
                 }
                 if ($finished) {
                     if ($insert) {
-                        $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
+                        $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
                     }
                     break;
                 }
@@ -300,19 +300,19 @@ 
             $finished = false;
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
-                    if ($subsubclause['startP']==$page && $subsubclause['startL']==$line) {
+                    if ($subsubclause['startP'] == $page && $subsubclause['startL'] == $line) {
                         unset($amendments[$num]);
                         $finished = true;
                     }
                     if ($finished) {
-                        for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
-                            if ($p>$subsubclause['startP']) {
+                        for ($p = $subsubclause['startP']; $p <= $subsubclause['endP']; $p++) {
+                            if ($p > $subsubclause['startP']) {
                                 $starti = 1;
                             } else {
                                 $starti = $subsubclause['startL'];
                             }
-                            for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
-                                $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
+                            for ($i = $starti; $i <= $subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
+                                $bill[$p][$i] = '<del title="' . $num . '">' . $bill[$p][$i] . '</del>';
                             }
                         }
                     }

www/docs/boundaries/index.php

Spacing +2 added lines, -2 removed lines

@@ -135,9 +135,9 @@
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
         foreach ($mreg as $k => $n) {
             print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) {
+            if ($k < count($mreg) - 2) {
                 print ', ';
-            } elseif ($k == count($mreg)-2) {
+            } elseif ($k == count($mreg) - 2) {
                 print ' and ';
             }
         }

www/docs/admin/featured.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 $out = '';
 if (get_http_var('preview')) {
     preview_featured();
-} else if ( get_http_var('confirm') ) {
+} else if (get_http_var('confirm')) {
     $out = update_featured();
 }
 
@@ -23,13 +23,13 @@ 
 print '</div>';
 
 function gid_to_url($gid) {
-    if ( !$gid ) {
+    if (!$gid) {
         return '';
     }
     global $hansardmajors;
     global $db;
 
-    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ))->first();
+    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid))->first();
     $url_gid = fix_gid_from_db($gid);
     $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
     $url->insert(array('id' => $url_gid));
@@ -43,7 +43,7 @@ 
     $related = $featured->get_related();
     $context = $featured->get_context();
 
-    if ( get_http_var('url') ) {
+    if (get_http_var('url')) {
         $url = get_http_var('url');
         $title = get_http_var('title');
         $context = get_http_var('context');
@@ -113,9 +113,9 @@ 
     $related_gid3 = $related3 ? get_gid_from_url($related3) : null;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== null ) {
+    if ($gid !== null) {
         $h = new MySociety\TheyWorkForYou\Homepage;
-        $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
+        $featured = $h->getFeaturedDebate($gid, $title, $context, array($related_gid1, $related_gid2, $related_gid3));
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
     } else {
@@ -157,7 +157,7 @@ 
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 
-    if ( $query['id'] ) {
+    if ($query['id']) {
         if (strpos($parts['path'], 'lords') !== false) {
             $gid = 'uk.org.publicwhip/lords/';
         } elseif (strpos($parts['path'], 'whall') !== false) {