mysociety / theyworkforyou

www/includes/easyparliament/member.php

Doc Comments +7 added lines

@@ -489,6 +489,10 @@ 
     public function house_text($house) {
         return $this->houses_pretty[$house];
     }
+
+    /**
+     * @return string
+     */
     public function constituency() { return $this->constituency; }
     public function party() { return $this->party; }
     public function party_text($party = null) {
@@ -607,6 +611,9 @@ 
         }
     }
 
+    /**
+     * @param string $direction
+     */
     private function _previous_future_mps_query($direction) {
         $entered_house = $this->entered_house(HOUSE_TYPE_COMMONS);
         if (is_null($entered_house)) return '';

Indentation +2 added lines, -2 removed lines

@@ -362,7 +362,7 @@ 
         $this->extra_info = array();
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
-                              array(':person_id' => $this->person_id));
+                                array(':person_id' => $this->person_id));
         for ($row=0; $row<$q->rows(); $row++) {
             $this->extra_info['office'][] = $q->row($row);
         }
@@ -450,7 +450,7 @@ 
         $q = $this->db->query('select bill_id,session,title,sum(attending) as a,sum(chairman) as c
             from pbc_members, bills
             where bill_id = bills.id and person_id = ' . $this->person_id()
-             . ' group by bill_id order by session desc');
+                . ' group by bill_id order by session desc');
         $this->extra_info['pbc'] = array();
         for ($i=0; $i<$q->rows(); $i++) {
             $bill_id = $q->field($i, 'bill_id');

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 class MEMBER {
 
@@ -112,15 +112,15 @@ 
 
         $this->house_disp = 0;
         $last_party = null;
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             $house          = $q->field($row, 'house');
             if (!in_array($house, $this->houses)) $this->houses[] = $house;
             $const          = $q->field($row, 'constituency');
-            $party		= $q->field($row, 'party');
-            $entered_house	= $q->field($row, 'entered_house');
-            $left_house	= $q->field($row, 'left_house');
-            $entered_reason	= $q->field($row, 'entered_reason');
-            $left_reason	= $q->field($row, 'left_reason');
+            $party = $q->field($row, 'party');
+            $entered_house = $q->field($row, 'entered_house');
+            $left_house = $q->field($row, 'left_house');
+            $entered_reason = $q->field($row, 'entered_reason');
+            $left_reason = $q->field($row, 'left_reason');
 
             if (!isset($this->entered_house[$house]) || $entered_house < $this->entered_house[$house]['date']) {
                 $this->entered_house[$house] = array(
@@ -140,22 +140,22 @@ 
                 );
             }
 
-            if ( $house==HOUSE_TYPE_ROYAL 					# The Monarch
-                || (!$this->house_disp && $house==HOUSE_TYPE_SCOTLAND)	# MSPs and
-                || (!$this->house_disp && $house==HOUSE_TYPE_NI)	# MLAs have lowest priority
-                || ($this->house_disp!=HOUSE_TYPE_LORDS && $house==HOUSE_TYPE_LORDS)	# Lords have highest priority
-                || (!$this->house_disp && $house==HOUSE_TYPE_COMMONS) # MPs
+            if ($house == HOUSE_TYPE_ROYAL 					# The Monarch
+                || (!$this->house_disp && $house == HOUSE_TYPE_SCOTLAND)	# MSPs and
+                || (!$this->house_disp && $house == HOUSE_TYPE_NI)	# MLAs have lowest priority
+                || ($this->house_disp != HOUSE_TYPE_LORDS && $house == HOUSE_TYPE_LORDS)	# Lords have highest priority
+                || (!$this->house_disp && $house == HOUSE_TYPE_COMMONS) # MPs
             ) {
                 $this->house_disp = $house;
                 $this->constituency = $const;
                 $this->party = $party;
 
-                $this->member_id	= $q->field($row, 'member_id');
-                $this->title		= $q->field($row, 'title');
+                $this->member_id = $q->field($row, 'member_id');
+                $this->title = $q->field($row, 'title');
                 $this->given_name = $q->field($row, 'given_name');
                 $this->family_name = $q->field($row, 'family_name');
                 $this->lordofname = $q->field($row, 'lordofname');
-                $this->person_id	= $q->field($row, 'person_id');
+                $this->person_id = $q->field($row, 'person_id');
             }
 
             if (($last_party && $party && $party != $last_party) || $left_reason == 'changed_party') {
@@ -199,13 +199,13 @@ 
         }
     }
 
-    public function postcode_to_person_id($postcode, $house=null) {
-        twfy_debug ('MP', "postcode_to_person_id converting postcode to person");
+    public function postcode_to_person_id($postcode, $house = null) {
+        twfy_debug('MP', "postcode_to_person_id converting postcode to person");
         $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($postcode));
         return $this->constituency_to_person_id($constituency, $house);
     }
 
-    public function constituency_to_person_id($constituency, $house=null) {
+    public function constituency_to_person_id($constituency, $house = null) {
         if ($constituency == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no constituency was found.');
         }
@@ -244,7 +244,7 @@ 
         }
     }
 
-    public function name_to_person_id($name, $const='') {
+    public function name_to_person_id($name, $const = '') {
         global $this_page;
         if ($name == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no name was found.');
@@ -294,7 +294,7 @@ 
 
         # More than one person ID matching the given name
         $person_ids = array();
-        for ($i=0; $i<$q->rows; ++$i) {
+        for ($i = 0; $i < $q->rows; ++$i) {
             $pid = $q->field($i, 'person_id');
             $person_ids[$pid] = 1;
         }
@@ -324,7 +324,7 @@ 
         $q = $this->db->query($q, $params);
         if ($q->rows > 1) {
             $person_ids = array();
-            for ($i=0; $i<$q->rows(); ++$i) {
+            for ($i = 0; $i < $q->rows(); ++$i) {
                 $person_ids[$q->field($i, 'person_id')] = $q->field($i, 'constituency');
             }
             throw new MySociety\TheyWorkForYou\MemberMultipleException($person_ids);
@@ -342,7 +342,7 @@ 
         global $THEUSER;
         if (is_object($THEUSER) && $THEUSER->postcode_is_set() && $this->current_member(1)) {
             $pc = $THEUSER->postcode();
-            twfy_debug ('MP', "set_users_mp converting postcode to person");
+            twfy_debug('MP', "set_users_mp converting postcode to person");
             $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
             if ($constituency == strtolower($this->constituency())) {
                 $this->the_users_mp = true;
@@ -363,7 +363,7 @@ 
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
                               array(':person_id' => $this->person_id));
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             $this->extra_info['office'][] = $q->row($row);
         }
 
@@ -418,9 +418,9 @@ 
 
         if (isset($this->extra_info['public_whip_attendrank'])) {
             $prefix = ($this->house(HOUSE_TYPE_LORDS) ? 'L' : '');
-            $this->extra_info[$prefix.'public_whip_division_attendance_rank'] = $this->extra_info['public_whip_attendrank'];
-            $this->extra_info[$prefix.'public_whip_division_attendance_rank_outof'] = $this->extra_info['public_whip_attendrank_outof'];
-            $this->extra_info[$prefix.'public_whip_division_attendance_quintile'] = floor($this->extra_info['public_whip_attendrank'] / ($this->extra_info['public_whip_attendrank_outof']+1) * 5);
+            $this->extra_info[$prefix . 'public_whip_division_attendance_rank'] = $this->extra_info['public_whip_attendrank'];
+            $this->extra_info[$prefix . 'public_whip_division_attendance_rank_outof'] = $this->extra_info['public_whip_attendrank_outof'];
+            $this->extra_info[$prefix . 'public_whip_division_attendance_quintile'] = floor($this->extra_info['public_whip_attendrank'] / ($this->extra_info['public_whip_attendrank_outof'] + 1) * 5);
         }
         if ($this->house(HOUSE_TYPE_LORDS) && isset($this->extra_info['public_whip_division_attendance'])) {
             $this->extra_info['Lpublic_whip_division_attendance'] = $this->extra_info['public_whip_division_attendance'];
@@ -428,7 +428,7 @@ 
         }
 
         if ($display && array_key_exists('register_member_interests_html', $this->extra_info) && ($this->extra_info['register_member_interests_html'] != '')) {
-            $args = array (
+            $args = array(
                 "sort" => "regexp_replace"
             );
             $GLOSSARY = new GLOSSARY($args);
@@ -436,7 +436,7 @@ 
         $GLOSSARY->glossarise($this->extra_info['register_member_interests_html']);
         }
 
-        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:'.$this->person_id.'%" and confirmed and not deleted');
+        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:' . $this->person_id . '%" and confirmed and not deleted');
         $this->extra_info['number_of_alerts'] = $q->field(0, 'c');
 
         if (isset($this->extra_info['reading_ease'])) {
@@ -452,16 +452,16 @@ 
             where bill_id = bills.id and person_id = ' . $this->person_id()
              . ' group by bill_id order by session desc');
         $this->extra_info['pbc'] = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $bill_id = $q->field($i, 'bill_id');
-            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor='.$bill_id.' and htype=10');
+            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor=' . $bill_id . ' and htype=10');
             $c = $c->field(0, 'c');
             $title = $q->field($i, 'title');
             $attending = $q->field($i, 'a');
             $chairman = $q->field($i, 'c');
             $this->extra_info['pbc'][$bill_id] = array(
                 'title' => $title, 'session' => $q->field($i, 'session'),
-                'attending'=>$attending, 'chairman'=>($chairman>0), 'outof' => $c
+                'attending'=>$attending, 'chairman'=>($chairman > 0), 'outof' => $c
             );
         }
 
@@ -476,7 +476,7 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND))
+        if ($no_mp_title && ($this->house_disp == HOUSE_TYPE_COMMONS || $this->house_disp == HOUSE_TYPE_NI || $this->house_disp == HOUSE_TYPE_SCOTLAND))
             $title = '';
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
     }
@@ -509,9 +509,9 @@ 
     public function entered_house_text($entered_house) {
         if (!$entered_house) return '';
         list($year, $month, $day) = explode('-', $entered_house);
-        if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
+        if ($month == 1 && $day == 1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             return $year;
         } elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
@@ -531,7 +531,7 @@ 
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
         } else {
@@ -633,7 +633,7 @@ 
             $name = $q->field($r, 'given_name') . ' ' . $q->field($r, 'family_name');
             if ($last_pid != $pid) {
                 $mships[] = array(
-                    'href' => WEBPATH . 'mp/?pid='.$pid,
+                    'href' => WEBPATH . 'mp/?pid=' . $pid,
                     'text' => $name
                 );
                 $last_pid = $pid;

Braces +116 added lines, -60 removed lines

@@ -71,15 +71,19 @@ 
         $person_id = '';
         if (isset($args['member_id']) && is_numeric($args['member_id'])) {
             $person_id = $this->member_id_to_person_id($args['member_id']);
-        } elseif (isset($args['name'])) {
+        }
+        elseif (isset($args['name'])) {
             $con = isset($args['constituency']) ? $args['constituency'] : '';
             $person_id = $this->name_to_person_id($args['name'], $con);
-        } elseif (isset($args['constituency'])) {
+        }
+        elseif (isset($args['constituency'])) {
             $still_in_office = isset($args['still_in_office']) ? $args['still_in_office'] : false;
             $person_id = $this->constituency_to_person_id($args['constituency'], $house, $still_in_office);
-        } elseif (isset($args['postcode'])) {
+        }
+        elseif (isset($args['postcode'])) {
             $person_id = $this->postcode_to_person_id($args['postcode'], $house);
-        } elseif (isset($args['person_id']) && is_numeric($args['person_id'])) {
+        }
+        elseif (isset($args['person_id']) && is_numeric($args['person_id'])) {
             $person_id = $args['person_id'];
             $q = $this->db->query("SELECT gid_to FROM gidredirect
                     WHERE gid_from = :gid_from",
@@ -114,7 +118,9 @@ 
         $last_party = null;
         for ($row=0; $row<$q->rows(); $row++) {
             $house          = $q->field($row, 'house');
-            if (!in_array($house, $this->houses)) $this->houses[] = $house;
+            if (!in_array($house, $this->houses)) {
+                $this->houses[] = $house;
+            }
             $const          = $q->field($row, 'constituency');
             $party		= $q->field($row, 'party');
             $entered_house	= $q->field($row, 'entered_house');
@@ -194,7 +200,8 @@ 
         }
         if ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no member with a member ID of "' . _htmlentities($member_id) . '".');
         }
     }
@@ -215,7 +222,9 @@ 
         }
 
         $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-        if ($normalised) $constituency = $normalised;
+        if ($normalised) {
+            $constituency = $normalised;
+        }
 
         $params = array();
 
@@ -239,7 +248,8 @@ 
 
         if ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no current member for the "' . _htmlentities(ucwords($constituency)) . '" constituency.');
         }
     }
@@ -254,10 +264,12 @@ 
         $q = "SELECT person_id FROM person_names WHERE type = 'name' ";
         if ($this_page == 'peer') {
             $success = preg_match('#^(.*?) (.*?) of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
+            }
+            if (!$success) {
+                            $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -265,10 +277,12 @@ 
             $params[':family_name'] = $m[2];
             $params[':lordofname'] = $m[3];
             $q .= "AND title = :title AND family_name = :family_name AND lordofname = :lordofname";
-        } elseif ($this_page == 'msp' || $this_page == 'mla' || strstr($this_page, 'mp')) {
+        }
+        elseif ($this_page == 'msp' || $this_page == 'mla' || strstr($this_page, 'mp')) {
             $success = preg_match('#^(.*?) (.*?) (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -288,7 +302,8 @@ 
         $q = $this->db->query($q, $params);
         if (!$q->rows) {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, we could not find anyone with that name.');
-        } elseif ($q->rows == 1) {
+        }
+        elseif ($q->rows == 1) {
             return $q->field(0, 'person_id');
         }
 
@@ -303,13 +318,17 @@ 
         $params = array();
         if ($this_page == 'peer') {
             $params[':house'] = HOUSE_TYPE_LORDS;
-        } elseif ($this_page == 'msp') {
+        }
+        elseif ($this_page == 'msp') {
             $params[':house'] = HOUSE_TYPE_SCOTLAND;
-        } elseif ($this_page == 'mla') {
+        }
+        elseif ($this_page == 'mla') {
             $params[':house'] = HOUSE_TYPE_NI;
-        } elseif ($this_page == 'royal') {
+        }
+        elseif ($this_page == 'royal') {
             $params[':house'] = HOUSE_TYPE_ROYAL;
-        } else {
+        }
+        else {
             $params[':house'] = HOUSE_TYPE_COMMONS;
         }
 
@@ -328,11 +347,14 @@ 
                 $person_ids[$q->field($i, 'person_id')] = $q->field($i, 'constituency');
             }
             throw new MySociety\TheyWorkForYou\MemberMultipleException($person_ids);
-        } elseif ($q->rows > 0) {
+        }
+        elseif ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } elseif ($const) {
+        }
+        elseif ($const) {
             return $this->name_to_person_id($name);
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no current member with that name.');
         }
     }
@@ -403,16 +425,21 @@ 
         if (array_key_exists('public_whip_rebellions', $this->extra_info)) {
             $rebellions = $this->extra_info['public_whip_rebellions'];
             $rebel_desc = "<unknown>";
-            if ($rebellions == 0)
-                $rebel_desc = "never";
-            elseif ($rebellions <= 1)
-                $rebel_desc = "hardly ever";
-            elseif ($rebellions <= 3)
-                $rebel_desc = "occasionally";
-            elseif ($rebellions <= 5)
-                $rebel_desc = "sometimes";
-            elseif ($rebellions > 5)
-                $rebel_desc = "quite often";
+            if ($rebellions == 0) {
+                            $rebel_desc = "never";
+            }
+            elseif ($rebellions <= 1) {
+                            $rebel_desc = "hardly ever";
+            }
+            elseif ($rebellions <= 3) {
+                            $rebel_desc = "occasionally";
+            }
+            elseif ($rebellions <= 5) {
+                            $rebel_desc = "sometimes";
+            }
+            elseif ($rebellions > 5) {
+                            $rebel_desc = "quite often";
+            }
             $this->extra_info['public_whip_rebel_description'] = $rebel_desc;
         }
 
@@ -476,8 +503,9 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND))
-            $title = '';
+        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND)) {
+                    $title = '';
+        }
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
     }
     public function houses() {
@@ -493,48 +521,62 @@ 
     public function party() { return $this->party; }
     public function party_text($party = null) {
         global $parties;
-        if (!$party)
-            $party = $this->party;
+        if (!$party) {
+                    $party = $this->party;
+        }
         if (isset($parties[$party])) {
             return $parties[$party];
-        } else {
+        }
+        else {
             return $party;
         }
     }
 
     public function entered_house($house = 0) {
-        if ($house) return array_key_exists($house, $this->entered_house) ? $this->entered_house[$house] : null;
+        if ($house) {
+            return array_key_exists($house, $this->entered_house) ? $this->entered_house[$house] : null;
+        }
         return $this->entered_house;
     }
     public function entered_house_text($entered_house) {
-        if (!$entered_house) return '';
+        if (!$entered_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $entered_house);
         if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        }
+        elseif ($month==0 && $day==0) {
             return $year;
-        } elseif (checkdate($month, $day, $year) && $year != '9999') {
+        }
+        elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
-        } else {
+        }
+        else {
             return "n/a";
         }
     }
 
     public function left_house($house = null) {
-        if (!is_null($house))
-            return array_key_exists($house, $this->left_house) ? $this->left_house[$house] : null;
+        if (!is_null($house)) {
+                    return array_key_exists($house, $this->left_house) ? $this->left_house[$house] : null;
+        }
         return $this->left_house;
     }
 
     public function left_house_text($left_house) {
-        if (!$left_house) return '';
+        if (!$left_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        }
+        elseif ($month==0 && $day==0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
-        } else {
+        }
+        else {
             return "n/a";
         }
     }
@@ -543,7 +585,8 @@ 
     public function entered_reason_text($entered_reason) {
         if (isset($this->reasons[$entered_reason])) {
             return $this->reasons[$entered_reason];
-        } else {
+        }
+        else {
             return $entered_reason;
         }
     }
@@ -557,13 +600,16 @@ 
                 $max = $q->field(0, 'max');
                 if ($max == $left_house) {
                     return $left_reason[0];
-                } else {
+                }
+                else {
                     return $left_reason[1];
                 }
-            } else {
+            }
+            else {
                 return $left_reason;
             }
-        } else {
+        }
+        else {
             return $left_reason;
         }
     }
@@ -576,7 +622,9 @@ 
             $lh = $this->left_house($h);
             $current[$h] = ($lh['date'] == '9999-12-31');
         }
-        if ($house) return $current[$house];
+        if ($house) {
+            return $current[$house];
+        }
         return $current;
     }
 
@@ -586,13 +634,17 @@ 
         $house = $this->house_disp;
         if ($house == HOUSE_TYPE_COMMONS) {
             $URL = new \MySociety\TheyWorkForYou\Url('mp');
-        } elseif ($house == HOUSE_TYPE_LORDS) {
+        }
+        elseif ($house == HOUSE_TYPE_LORDS) {
             $URL = new \MySociety\TheyWorkForYou\Url('peer');
-        } elseif ($house == HOUSE_TYPE_NI) {
+        }
+        elseif ($house == HOUSE_TYPE_NI) {
             $URL = new \MySociety\TheyWorkForYou\Url('mla');
-        } elseif ($house == HOUSE_TYPE_SCOTLAND) {
+        }
+        elseif ($house == HOUSE_TYPE_SCOTLAND) {
             $URL = new \MySociety\TheyWorkForYou\Url('msp');
-        } elseif ($house == HOUSE_TYPE_ROYAL) {
+        }
+        elseif ($house == HOUSE_TYPE_ROYAL) {
             $URL = new \MySociety\TheyWorkForYou\Url('royal');
         }
         $member_url = make_member_url($this->full_name(true), $this->constituency(), $house, $this->person_id());
@@ -602,17 +654,21 @@ 
                 $protocol = 'http://';
             }
             return $protocol . DOMAIN . $URL->generate('none') . $member_url;
-        } else {
+        }
+        else {
             return $URL->generate('none') . $member_url;
         }
     }
 
     private function _previous_future_mps_query($direction) {
         $entered_house = $this->entered_house(HOUSE_TYPE_COMMONS);
-        if (is_null($entered_house)) return '';
+        if (is_null($entered_house)) {
+            return '';
+        }
         if ($direction == '>') {
             $order = '';
-        } else {
+        }
+        else {
             $order = 'DESC';
         }
         $q = $this->db->query('SELECT *

classes/FacebookLogin.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
         return $this->fb;
     }
 
+    /**
+     * @return string
+     */
     public function getLoginURL() {
         $helper = $this->getFacebookObject()->getRedirectLoginHelper();
         $permissions = ['email'];

Indentation +24 added lines, -24 removed lines

@@ -13,11 +13,11 @@ 
 
     public function getFacebookObject() {
         if (!isset($this->fb)) {
-          $this->fb = new \Facebook\Facebook([
+            $this->fb = new \Facebook\Facebook([
             'app_id' => FACEBOOK_APP_ID,
             'app_secret' => FACEBOOK_APP_SECRET,
             'default_graph_version' => 'v2.2',
-          ]);
+            ]);
         }
 
         return $this->fb;
@@ -30,46 +30,46 @@ 
     }
 
     public function handleFacebookRedirect() {
-      $helper = $this->getFacebookObject()->getRedirectLoginHelper();
+        $helper = $this->getFacebookObject()->getRedirectLoginHelper();
 
-      $data = array('login_url' => $this->getLoginURL());
+        $data = array('login_url' => $this->getLoginURL());
 
-      try {
+        try {
         $accessToken = $helper->getAccessToken();
-      } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+        } catch(\Facebook\Exceptions\FacebookResponseException $e) {
         $data['error'] = 'Graph returned an error: ' . $e->getMessage();
         return $data;
-      } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+        } catch(\Facebook\Exceptions\FacebookSDKException $e) {
         $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
         return $data;
-      }
+        }
 
-      $token = $this->checkAccessToken($accessToken);
+        $token = $this->checkAccessToken($accessToken);
 
-      if ($token) {
-          return array('token' => $token);
-      } else {
-          $data['error'] = 'Problem getting Facebook token';
-          return $data;
-      }
+        if ($token) {
+            return array('token' => $token);
+        } else {
+            $data['error'] = 'Problem getting Facebook token';
+            return $data;
+        }
     }
 
 
     private function checkAccessToken($accessToken) {
-      if (!isset($accessToken)) {
-          return False;
-      }
+        if (!isset($accessToken)) {
+            return False;
+        }
 
-      if (! $accessToken->isLongLived()) {
+        if (! $accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
-          $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
+            $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+            return False;
+        }
         }
-      }
 
-      return $accessToken;
+        return $accessToken;
     }
 
     public function loginUser($accessToken) {
@@ -158,7 +158,7 @@ 
             'optin' => $THEUSER->optin(),
             'emailpublic' => False,
             'password' => '',
-         );
+            );
 
         $THEUSER->update_self_no_confirm($details);
     }

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

@@ -57,7 +57,7 @@ 
 
     private function checkAccessToken($accessToken) {
       if (!isset($accessToken)) {
-          return False;
+          return false;
       }
 
       if (! $accessToken->isLongLived()) {
@@ -65,7 +65,7 @@ 
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+          return false;
         }
       }
 
@@ -86,7 +86,7 @@ 
         $expires = intval($accessToken->getExpiresAt()->format('U'));
         twfy_debug("THEUSER", "Facebook access token expires at " . $expires);
 
-        $success = False;
+        $success = false;
         if ($user_id) {
             twfy_debug("THEUSER", "Faceook user exists in the database: " . $user_id);
             $success = $THEUSER->init($user_id);
@@ -112,7 +112,7 @@ 
             return $logged_in;
         }
 
-        return False;
+        return false;
     }
 
     public function createUser($accessToken, $user) {
@@ -128,9 +128,9 @@ 
             'url' => '',
             'status' => '',
             'password' => '',
-            'optin' => False,
-            'emailpublic' => False,
-            'mp_alert' => False,
+            'optin' => false,
+            'emailpublic' => false,
+            'mp_alert' => false,
             'facebook_id' => $user['id']
         );
         $added = $THEUSER->add($details, false);
@@ -156,7 +156,7 @@ 
             'postcode' => $THEUSER->postcode(),
             'url' => $THEUSER->url(),
             'optin' => $THEUSER->optin(),
-            'emailpublic' => False,
+            'emailpublic' => false,
             'password' => '',
          );
 

Spacing +3 added lines, -3 removed lines

@@ -36,10 +36,10 @@ 
 
       try {
         $accessToken = $helper->getAccessToken();
-      } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+      } catch (\Facebook\Exceptions\FacebookResponseException $e) {
         $data['error'] = 'Graph returned an error: ' . $e->getMessage();
         return $data;
-      } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+      } catch (\Facebook\Exceptions\FacebookSDKException $e) {
         $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
         return $data;
       }
@@ -60,7 +60,7 @@ 
           return False;
       }
 
-      if (! $accessToken->isLongLived()) {
+      if (!$accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
 
       if ($token) {
           return array('token' => $token);
-      } else {
+      }
+      else {
           $data['error'] = 'Problem getting Facebook token';
           return $data;
       }
@@ -95,7 +96,8 @@ 
                 $THEUSER->add_facebook_id($user['id']);
             }
             twfy_debug("THEUSER", "inited user has id : " . $THEUSER->user_id());
-        } else {
+        }
+        else {
             twfy_debug("THEUSER", "Faceook user does not exist in the database");
             $success = $this->createUser($accessToken, $user);
         }

classes/Model/Featured.php

Doc Comments +8 added lines

@@ -52,6 +52,11 @@ 
         $this->_set('featured_related', $related);
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     private function _get($key) {
         $text = NULL;
 
@@ -72,6 +77,9 @@ 
         return $text;
     }
 
+    /**
+     * @param string $key
+     */
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
             $value = NULL;

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q->rows) {
             $text = $q->field(0, 'value');
-            if ( trim($text) == '' ) {
+            if (trim($text) == '') {
                 $text = NULL;
             }
         }
@@ -73,7 +73,7 @@ 
     }
 
     private function _set($key, $value) {
-        if ( trim($value) == '' ) {
+        if (trim($value) == '') {
             $value = NULL;
         }
         $check_q = $this->db->query(
@@ -82,7 +82,7 @@ 
                 ':key' => $key
             )
         );
-        if ( $check_q->rows ) {
+        if ($check_q->rows) {
             $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key",
                 array(
                     ':key' => $key,
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ( $set_q->success() ) {
+        if ($set_q->success()) {
             return true;
         }
         return false;

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

@@ -53,7 +53,7 @@ 
     }
 
     private function _get($key) {
-        $text = NULL;
+        $text = null;
 
         $q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",
@@ -65,7 +65,7 @@ 
         if ($q->rows) {
             $text = $q->field(0, 'value');
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
         }
 
@@ -74,7 +74,7 @@ 
 
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
-            $value = NULL;
+            $value = null;
         }
         $check_q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",

Braces +2 added lines, -1 removed lines

@@ -89,7 +89,8 @@
                     ':value' => $value
                 )
             );
-        } else {
+        }
+        else {
             $set_q = $this->db->query("INSERT INTO editorial (item, value ) VALUES (:key, :value)",
                 array(
                     ':key' => $key,

www/includes/test/utility_test.php

Indentation +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 
 class UtilityTest extends UnitTestCase{
 
-  public function testVerpEnvelopeSenderCanCreateStandardSender() {
+    public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
     $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
-  }
+    }
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -3,18 +3,18 @@
  * SimpleTest tests for the functions in utility.php
  * $Id: utility_test.php,v 1.3 2009-06-25 12:23:58 louise Exp $
  */
-error_reporting (E_ALL);
+error_reporting(E_ALL);
 ini_set("display_errors", 1);
 include_once dirname(__FILE__) . '/../../../conf/general';
 include_once '../utility.php';
 include_once 'simpletest/unit_tester.php';
 include_once 'simpletest/reporter.php';
 
-class UtilityTest extends UnitTestCase{
+class UtilityTest extends UnitTestCase {
 
   public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
-    $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
+    $expected_sender = 'twfy+aperson=a.nother.dom@' +EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
   }
 

www/includes/easyparliament/metadata.php

Indentation +3 added lines, -3 removed lines

@@ -530,7 +530,7 @@ 
         'url'			=> 'peer/'
     ),
     'peers' => array (
-         'menu'			=> array (
+            'menu'			=> array (
             'text'			=> 'Lords',
             'title'			=> "List of all Lords"
         ),
@@ -539,7 +539,7 @@ 
         'url'			=> 'peers/'
     ),
 'overview' => array (
-     'menu'			=> array (
+        'menu'			=> array (
         'text'			=> 'Overview',
         'title'			=> "Overview of the UK Parliament"
     ),
@@ -591,7 +591,7 @@ 
         'url'			=> 'rss/mp/'
     ),
     'mps' => array (
-         'menu'			=> array (
+            'menu'			=> array (
             'text'			=> 'MPs',
             'title'			=> "List of all Members of Parliament (MPs)"
         ),

Spacing +235 added lines, -235 removed lines

@@ -65,10 +65,10 @@ 
 
 */
 
-$this->page = array (
+$this->page = array(
 
 // Things used on EVERY page, unless overridden for a page:
-    'default' => array (
+    'default' => array(
         'parent'	=> '',
         'session_vars' => array('super_debug'),
         'sitetitle'		=> 'TheyWorkForYou',
@@ -78,117 +78,117 @@ 
 
 // KEEP THE PAGES IN ALPHABETICAL ORDER! TA.
 
-    'about' => array (
+    'about' => array(
         'title'			=> 'About us',
         'url'			=> 'about/'
     ),
-    'parliaments' => array (
+    'parliaments' => array(
         'title' 	=> 'Parliaments and assemblies',
         'url'       => 'parliaments/'
     ),
 
-    'alert_stats' => array (
+    'alert_stats' => array(
         'title'			=> 'Email alerts statistics',
         'parent'		=> 'admin',
         'url'			=> 'admin/alert_stats.php',
     ),
-    'admin_badusers' => array (
+    'admin_badusers' => array(
         'title'			=> 'Bad users',
         'parent'		=> 'admin',
         'url'			=> 'admin/badusers.php'
     ),
-    'admin_home' => array (
+    'admin_home' => array(
         'title'			=> 'Home',
         'parent'		=> 'admin',
         'url'			=> 'admin/'
     ),
-    'admin_comments' => array (
+    'admin_comments' => array(
         'title'			=> 'Recent comments',
         'parent'		=> 'admin',
         'url'			=> 'admin/comments.php'
     ),
-    'admin_commentreport' => array (
+    'admin_commentreport' => array(
         'title'			=> 'Processing a comment report',
         'parent'		=> 'admin',
         'url'			=> 'admin/report.php',
-        'session_vars'	=> array ('rid', 'cid')
+        'session_vars'	=> array('rid', 'cid')
     ),
-    'admin_commentreports' => array (
+    'admin_commentreports' => array(
         'title'			=> 'Outstanding comment reports',
         'parent'		=> 'admin',
         'url'			=> 'admin/reports.php'
     ),
-    'admin_failedsearches' => array (
+    'admin_failedsearches' => array(
         'title'			=> 'Failed searches',
         'parent'		=> 'admin',
         'url'			=> 'admin/failedsearches.php'
     ),
-    'admin_glossary' => array (
+    'admin_glossary' => array(
         'title'			=> 'Manage glossary entries',
         'parent'		=> 'admin',
         'url'			=> 'admin/glossary.php'
     ),
-    'admin_glossary_pending' => array (
+    'admin_glossary_pending' => array(
         'title'			=> 'Review pending glossary entries',
         'parent'		=> 'admin',
         'url'			=> 'admin/glossary_pending.php'
     ),
-    'admin_searchlogs' => array (
+    'admin_searchlogs' => array(
         'title'			=> 'Recent searches',
         'parent'		=> 'admin',
         'url'			=> 'admin/searchlogs.php'
     ),
-    'admin_popularsearches' => array (
+    'admin_popularsearches' => array(
         'title'			=> 'Popular searches in last 30 days (first 1000)',
         'parent'		=> 'admin',
         'url'			=> 'admin/popularsearches.php'
     ),
-    'admin_statistics' => array (
+    'admin_statistics' => array(
         'title'			=> 'General statistics',
         'parent'		=> 'admin',
         'url'			=> 'admin/statistics.php'
     ),
-    'admin_reportstats' => array (
+    'admin_reportstats' => array(
         'title'			=> 'Reporting statistics',
         'parent'		=> 'admin',
         'url'			=> 'admin/reporting_stats.php'
     ),
-    'admin_trackbacks' => array (
+    'admin_trackbacks' => array(
         'title'			=> 'Recent trackbacks',
         'parent'		=> 'admin',
         'url'			=> 'admin/trackbacks.php'
     ),
-    'admin_photos' => array (
+    'admin_photos' => array(
         'title'			=> 'Photo upload/attribution',
         'parent'		=> 'admin',
         'url'			=> 'admin/photos.php',
     ),
-    'admin_mpurls' => array (
+    'admin_mpurls' => array(
         'title'			=> 'MP Websites',
         'parent'		=> 'admin',
         'url'			=> 'admin/websites.php',
     ),
-    'admin_policies' => array (
+    'admin_policies' => array(
         'title'			=> 'MP Policy details',
         'parent'		=> 'admin',
         'url'			=> 'admin/policies.php',
     ),
-    'admin_banner' => array (
+    'admin_banner' => array(
         'title'			=> 'Edit Banner',
         'parent'		=> 'admin',
         'url'			=> 'admin/banner.php',
     ),
-    'admin_featured' => array (
+    'admin_featured' => array(
         'title'			=> 'Featured debates',
         'parent'		=> 'admin',
         'url'			=> 'admin/featured.php',
     ),
-    'admin_topics' => array (
+    'admin_topics' => array(
         'title'			=> 'Topics',
         'parent'		=> 'admin',
         'url'			=> 'admin/topics.php',
     ),
-    'admin_edittopics' => array (
+    'admin_edittopics' => array(
         'title'			=> 'Edit Topic',
         'parent'		=> 'admin_topics',
         'url'			=> 'admin/edittopic.php',
@@ -196,8 +196,8 @@ 
 
 // Added by Richard Allan for email alert functions
 
-    'alert' => array (
-        'menu'			=> array (
+    'alert' => array(
+        'menu'			=> array(
             'text'			=> 'Email Alerts',
             'title'			=> "Set up alerts for updates on an MP or Peer by email",
             'sidebar'		=> 'alert'
@@ -206,30 +206,30 @@ 
         'title'			=> 'TheyWorkForYou Email Alerts',
         'url'			=> 'alert/',
     ),
-    'alertwelcome' => array (
+    'alertwelcome' => array(
         'title'			=> 'Email Alerts',
         'url'			=> 'alert/',
     ),
 
 // End of ALERTS additions
 
-    'api_front'		=> array (
-        'menu'			=> array (
+    'api_front'		=> array(
+        'menu'			=> array(
             'text'			=> 'API',
             'title'			=> 'Access our data'
         ),
         'title'			=> 'TheyWorkForYou API',
         'url'			=> 'api/'
     ),
-    'api_doc_front'		=> array (
-        'menu'			=> array (
+    'api_doc_front'		=> array(
+        'menu'			=> array(
             'text'			=> 'API',
             'title'			=> 'Access our data'
         ),
         'parent'		=> 'api_front',
         'url'			=> 'api/'
     ),
-    'api_key'		=> array (
+    'api_key'		=> array(
         'title'			=> 'API Keys',
         'parent'		=> 'api_front',
         'url'			=> 'api/key'
@@ -240,69 +240,69 @@ 
         'url' => 'boundaries/',
     ),
 
-    'calendar_summary' => array (
-        'menu'			=> array (
+    'calendar_summary' => array(
+        'menu'			=> array(
             'text'			=> 'Upcoming',
             'title'			=> '',
         ),
         'parent'		=> 'hansard',
         'url'			=> 'calendar/'
     ),
-    'calendar_future_head' => array (
+    'calendar_future_head' => array(
         'parent'		=> 'calendar_summary',
         'title'			=> 'Upcoming business',
         'url'			=> 'calendar/'
     ),
-    'calendar_future' => array (
+    'calendar_future' => array(
         'parent'		=> 'calendar_future_head',
         'url'			=> 'calendar/'
     ),
-    'calendar_today_head' => array (
+    'calendar_today_head' => array(
         'parent'		=> 'calendar_summary',
         'title'			=> 'Today’s business',
         'url'			=> 'calendar/'
     ),
-    'calendar_today' => array (
+    'calendar_today' => array(
         'parent'		=> 'calendar_today_head',
         'url'			=> 'calendar/'
     ),
-    'calendar_past_head' => array (
+    'calendar_past_head' => array(
         'parent'		=> 'calendar_summary',
         'title'			=> 'Previous business',
         'url'			=> 'calendar/'
     ),
-    'calendar_past' => array (
+    'calendar_past' => array(
         'parent'		=> 'calendar_past_head',
         'url'			=> 'calendar/'
     ),
 
-    'cards' => array (
+    'cards' => array(
         'title'			=> 'MP Stats Cards',
         'url'			=> 'cards/'
     ),
 
-    'campaign_foi' => array (
+    'campaign_foi' => array(
         'title'			=> 'Freedom of Information (Parliament) Order 2009',
         'url'			=> 'foiorder2009/'
     ),
-    'campaign' => array (
+    'campaign' => array(
         'title'			=> '', #Free Our Bills!',
         'url'			=> 'freeourbills/'
     ),
-    'campaign_edm' => array (
+    'campaign_edm' => array(
         'title'			=> 'Early Day Motion',
         'parent'		=> 'campaign',
         'url'			=> 'freeourbills/'
     ),
 
-    'commentreport' => array (
+    'commentreport' => array(
         'title'			=> 'Reporting a comment',
         'url'			=> 'report/',
-        'session_vars'	=> array ('id')
+        'session_vars'	=> array('id')
     ),
 
-    'comments_recent' => array (
-        'menu'			=> array (
+    'comments_recent' => array(
+        'menu'			=> array(
             'text'			=> 'Recent comments',
             'title'			=> "Recently posted comments"
         ),
@@ -311,8 +311,8 @@ 
         'url'			=> 'comments/recent/'
     ),
 
-    'contact' => array (
-        'menu'			=> array (
+    'contact' => array(
+        'menu'			=> array(
             'text'			=> 'Contact',
             'title'			=> '',
         ),
@@ -323,23 +323,23 @@ 
         'title' => 'News',
         'url' => 'https://www.mysociety.org/category/projects/theyworkforyou/'
     ),
-    'debate'  => array (
+    'debate'  => array(
         'parent'		=> 'debatesfront',
         'url'			=> 'debates/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'debates'  => array (
+    'debates'  => array(
         'parent'		=> 'debatesfront',
         'url'			=> 'debates/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'debatesday' => array (
+    'debatesday' => array(
         'parent'		=> 'debatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'debates/',
     ),
-    'alldebatesfront' => array (
-        'menu'			=> array (
+    'alldebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> "Debates in the House of Commons, Westminster Hall, and the House of Lords"
         ),
@@ -348,8 +348,8 @@ 
         'rss'			=> 'rss/debates.rss',
         'url'			=> 'debates/'
     ),
-    'debatesfront' => array (
-        'menu'			=> array (
+    'debatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Commons debates',
             'title'			=> "Debates in the House of Commons"
         ),
@@ -358,12 +358,12 @@ 
         'rss'			=> 'rss/debates.rss',
         'url'			=> 'debates/'
     ),
-    'debatesyear' => array (
+    'debatesyear' => array(
         'parent'		=> 'debatesfront',
         'url'			=> 'debates/'
     ),
-    'divisions_recent' => array (
-        'menu'			=> array (
+    'divisions_recent' => array(
+        'menu'			=> array(
             'text'			=> 'Recent Votes',
             'title'			=> ''
         ),
@@ -371,12 +371,12 @@ 
         'title'			=> 'Recent Votes',
         'url'			=> 'divisions/'
     ),
-    'divisions_vote' => array (
+    'divisions_vote' => array(
         'parent'		=> 'divisions_recent',
         'title'			=> 'Vote',
         'url'			=> 'divisions/division.php'
     ),
-    'epvote' => array (
+    'epvote' => array(
         'url'			=> 'vote/'
     ),
 
@@ -385,19 +385,19 @@ 
         'title'			=> 'TheyWorkForYou Google gadget',
     ),
 
-    'glossary' => array (
+    'glossary' => array(
         'heading'		=> 'Glossary',
         'parent'		=> 'help_us_out',
         'url'			=> 'glossary/'
     ),
-    'glossary_item' => array (
+    'glossary_item' => array(
         'heading'		=> 'Glossary heading',
         'parent'		=> 'help_us_out',
         'url'			=> 'glossary/',
-        'session_vars'	=> array ('g')
+        'session_vars'	=> array('g')
     ),
-    'hansard' => array (
-        'menu'			=> array (
+    'hansard' => array(
+        'menu'			=> array(
             'text'			=> 'UK Parliament',
             'title'			=> "Houses of Parliament debates, Written Answers, Statements, Westminster Hall debates, and Bill Committees"
         ),
@@ -405,16 +405,16 @@ 
         'url'			=> ''
     ),
         // Hansard landing page
-        'hansard_landing' => array (
+        'hansard_landing' => array(
                 'title'                 => 'Hansard',
                 'url'                   => 'search-hansard/',
         ),
-    'help' => array (
+    'help' => array(
         'title'			=> 'Help - Frequently Asked Questions',
         'url'			=> 'help/'
     ),
-    'help_us_out' => array (
-        'menu'			=> array (
+    'help_us_out' => array(
+        'menu'			=> array(
             'text'			=> 'Glossary',
             'title'			=> "Parliament's jargon explained"
         ),
@@ -423,88 +423,88 @@ 
         'url'			=> 'addterm/',
         'sidebar'		=> 'glossary_add'
     ),
-    'home' => array (
+    'home' => array(
         'title'			=> "UK Parliament",
         'rss'			=> 'news/index.rdf',
         'url'			=> ''
     ),
-    'houserules' => array (
+    'houserules' => array(
         'title'			=> 'House rules',
         'url'			=> 'houserules/'
     ),
 
-    'linktous' => array (
+    'linktous' => array(
         'title'			=> 'Link to us',
         'heading'		=> 'How to link to us',
         'url'			=> 'help/linktous/'
     ),
-    'api' => array (
+    'api' => array(
         'title'			=> 'API',
         'heading'		=> 'API - Query the TheyWorkForYou database',
         'url'			=> 'api/'
     ),
-    'data' => array (
+    'data' => array(
         'title'			=> 'Raw Data',
         'heading'		=> 'Raw data (XML) - the data behind TheyWorkForYou and Public Whip',
         'url'			=> 'http://parser.theyworkforyou.com'
     ),
-    'pombola' => array (
+    'pombola' => array(
         'title'			=> 'Pombola',
         'heading'		=> 'mySociety\'s platform for running a Parliamentary monitoring site like this',
         'url'			=> 'https://www.mysociety.org/projects/parliamentarymonitoring/pombola'
     ),
-    'devmailinglist' => array (
+    'devmailinglist' => array(
         'title'			=> 'Developer mailing list',
         'heading'		=> 'Developer mailing list',
         'url'			=> 'https://groups.google.com/a/mysociety.org/forum/#!forum/theyworkforyou'
     ),
-    'code' => array (
+    'code' => array(
         'title'			=> 'Source code',
         'heading'		=> 'TheyWorkForYou Source code',
         'url'			=> 'https://github.com/mysociety/theyworkforyou'
     ),
-    'irc' => array (
+    'irc' => array(
         'title'			=> 'IRC chat channel',
         'heading'		=> 'IRC chat channel',
         'url'			=> 'http://www.irc.mysociety.org/'
     ),
-    'newzealand' => array (
+    'newzealand' => array(
         'title'			=> 'New Zealand',
         'heading'		=> 'They Work For You - New Zealand',
         'url'			=> 'http://www.theyworkforyou.co.nz/'
     ),
-    'australia' => array (
+    'australia' => array(
         'title'			=> 'Australia',
         'heading'		=> 'Open Australia',
         'url'			=> 'http://www.openaustralia.org/'
     ),
-    'ireland' => array (
+    'ireland' => array(
         'title'			=> 'Ireland',
         'heading'		=> 'TheyWorkForYou for the Houses of the Oireachtas',
         'url'			=> 'http://www.kildarestreet.com/'
     ),
-    'mzalendo' => array (
+    'mzalendo' => array(
         'title'			=> 'Mzalendo',
         'heading'		=> 'Keeping an eye on the Kenyan Parliament',
         'url'			=> 'http://info.mzalendo.com/'
     ),
-    'lordsdebate'  => array (
+    'lordsdebate'  => array(
         'parent'		=> 'lordsdebatesfront',
         'url'			=> 'lords/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'lordsdebates'  => array (
+    'lordsdebates'  => array(
         'parent'		=> 'lordsdebatesfront',
         'url'			=> 'lords/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'lordsdebatesday' => array (
+    'lordsdebatesday' => array(
         'parent'		=> 'lordsdebatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'lords/',
     ),
-    'lordsdebatesfront' => array (
-        'menu'			=> array (
+    'lordsdebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Lords debates',
             'title'			=> "House of Lords debates"
         ),
@@ -513,24 +513,24 @@ 
         'rss'			=> 'rss/lords.rss',
         'url'			=> 'lords/'
     ),
-    'lordsdebatesyear' => array (
+    'lordsdebatesyear' => array(
         'parent'		=> 'lordsdebatesfront',
         'url'			=> 'lords/'
     ),
 
         // Parliament landing page
-        'parliament_landing' => array (
+        'parliament_landing' => array(
                 'title'                 => 'Parliament',
                 'url'                   => 'parliament/',
         ),
 
-    'peer' => array (
+    'peer' => array(
         'parent'		=> 'peers',
         'title'			=> 'Peer',
         'url'			=> 'peer/'
     ),
-    'peers' => array (
-         'menu'			=> array (
+    'peers' => array(
+         'menu'			=> array(
             'text'			=> 'Lords',
             'title'			=> "List of all Lords"
         ),
@@ -538,8 +538,8 @@ 
         'title'			=> '',
         'url'			=> 'peers/'
     ),
-'overview' => array (
-     'menu'			=> array (
+'overview' => array(
+     'menu'			=> array(
         'text'			=> 'Overview',
         'title'			=> "Overview of the UK Parliament"
     ),
@@ -548,50 +548,50 @@ 
     'rss'			=> 'news/index.rdf',
     'url'			=> ''
 ),
-    'mla' => array (
+    'mla' => array(
         'parent'		=> 'mlas',
         'title'			=> 'Find your MLA',
         'url'			=> 'mla/'
     ),
-    'mlas' => array (
+    'mlas' => array(
         'parent'		=> 'ni_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'MLAs',
             'title'			=> "List of all Members of the Northern Ireland Assembly (MLAs)"
         ),
         'title'			=> '',
         'url'			=> 'mlas/'
     ),
-    'msps' => array (
+    'msps' => array(
         'parent'		=> 'sp_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'MSPs',
             'title'			=> "List of Members of the Scottish Parliament (MSPs)"
         ),
         'title'			=> '',
         'url'			=> 'msps/'
     ),
-    'msp' => array (
+    'msp' => array(
         'parent'		=> 'msps',
         'title'			=> 'Find your MSP',
         'url'			=> 'msp/'
     ),
     /* Not 'Your MP', whose name is 'yourmp'... */
-    'mp' => array (
+    'mp' => array(
         'parent'			=> 'mps',
         'title'			=> 'Find your MP',
         'url'			=> 'mp/'
     ),
-    'emailfriend' => array (
+    'emailfriend' => array(
         'title'			=> 'Send this page to a friend',
         'url'			=> 'email/'
     ),
     // The directory MPs' RSS feeds are stored in.
-    'mp_rss' => array (
+    'mp_rss' => array(
         'url'			=> 'rss/mp/'
     ),
-    'mps' => array (
-         'menu'			=> array (
+    'mps' => array(
+         'menu'			=> array(
             'text'			=> 'MPs',
             'title'			=> "List of all Members of Parliament (MPs)"
         ),
@@ -602,16 +602,16 @@ 
 
     /* Northern Ireland Assembly */
     'ni_home' => array(
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Northern Ireland Assembly',
             'title'			=> 'Full authority over <em>transferred matters</em>, which include agriculture, education, employment, the environment and health'
         ),
         'title'			=> 'Northern Ireland Assembly',
         'url'			=> 'ni/'
     ),
-    'nioverview' => array (
+    'nioverview' => array(
         'parent'		=> 'ni_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> "Overview of the Northern Ireland Assembly debates"
         ),
@@ -619,23 +619,23 @@ 
         'rss'			=> 'rss/ni.rss',
         'url'			=> 'ni/'
     ),
-    'nidebate'  => array (
+    'nidebate'  => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'nidebates'  => array (
+    'nidebates'  => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'nidebatesday' => array (
+    'nidebatesday' => array(
         'parent'		=> 'nidebatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'ni/',
     ),
-    'nidebatesfront' => array (
-        'menu'			=> array (
+    'nidebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> "Northern Ireland Assembly debates"
         ),
@@ -644,24 +644,24 @@ 
         'rss'			=> 'rss/ni.rss',
         'url'			=> 'ni/'
     ),
-    'nidebatesyear' => array (
+    'nidebatesyear' => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/'
     ),
 
-    'otheruseredit' => array (
+    'otheruseredit' => array(
         'pg'			=> 'editother',
         'title'			=> "Editing a user's data",
         'url'			=> 'user/'
     ),
-    'privacy' => array (
+    'privacy' => array(
         'title'			=> 'Privacy Policy',
         'url'			=> 'privacy/'
     ),
 
     /* Public bill committees */
-    'pbc_front' => array (
-        'menu'			=> array (
+    'pbc_front' => array(
+        'menu'			=> array(
             'text'			=> 'Bill Committees',
             'title'			=> "Public Bill Committees (formerly Standing Committees) debates"
         ),
@@ -679,17 +679,17 @@ 
         'title' => '',
         'url' => 'pbc/',
         'parent' => 'pbc_front',
-        'session_vars'	=> array ('bill'),
+        'session_vars'	=> array('bill'),
     ),
     'pbc_clause' => array(
         'parent'		=> 'pbc_front',
         'url'			=> 'pbc/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
     'pbc_speech' => array(
         'parent'		=> 'pbc_front',
         'url'			=> 'pbc/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
 
     'people' => array(
@@ -701,62 +701,62 @@ 
         'url'			=> '',
     ),
 
-    'raw' => array (
+    'raw' => array(
         'title'			=> 'Raw data',
         'url'			=> 'raw/'
     ),
 
-    'regmem' => array (
+    'regmem' => array(
         'title'			=> 'Changes to the Register of Members\' Interests',
         'url'			=> 'regmem/'
     ),
 
-    'regmem_date' => array (
+    'regmem_date' => array(
         'url'			=> 'regmem/',
         'parent'		=> 'regmem'
     ),
 
-    'regmem_mp' => array (
+    'regmem_mp' => array(
         'url'			=> 'regmem/',
         'parent'		=> 'regmem'
     ),
 
-    'regmem_diff' => array (
+    'regmem_diff' => array(
         'url'			=> 'regmem/',
         'parent'		=> 'regmem'
     ),
 
-    'royal' => array (
+    'royal' => array(
         'parent'        => 'hansard',
         'title'         => 'Royal',
         'url'           => 'royal/',
     ),
 
-    'topic' => array (
+    'topic' => array(
         'parent'        => 'topics',
         'url'           => 'topic/topic.php',
     ),
 
-    'topics' => array (
+    'topics' => array(
         'title'        => 'Topics',
         'url'          => 'topic/',
     ),
 
-    'search'		=> array (
+    'search'		=> array(
         'sidebar'		=> 'search',
         'url'			=> 'search/',
         'robots'		=> 'noindex, nofollow',
         'heading'		=> '',
-        'session_vars'	=> array ('q', 's', 'pid', 'o', 'pop')
+        'session_vars'	=> array('q', 's', 'pid', 'o', 'pop')
     ),
-    'search_help'		=> array (
+    'search_help'		=> array(
         'sidebar'		=> 'search',
         'title'			=> 'Help with searching',
         'url'			=> 'search/'
     ),
 
-    'sitenews'		=> array (
-        'menu'			=> array (
+    'sitenews'		=> array(
+        'menu'			=> array(
             'text'			=> 'TheyWorkForYou news',
             'title'			=> "News about changes to this website"
         ),
@@ -766,68 +766,68 @@ 
         'title'			=> 'TheyWorkForYou news',
         'url'			=> 'news/'
     ),
-    'sitenews_archive'		=> array (
+    'sitenews_archive'		=> array(
         'parent'		=> 'sitenews',
         'rss'			=> 'news/index.rdf',
         'sidebar'		=> 'sitenews',
         'title'			=> 'Archive',
         'url'			=> 'news/archives/'
     ),
-    'sitenews_atom' 	=> array (
+    'sitenews_atom' 	=> array(
         'url'			=> 'news/atom.xml'
     ),
-    'sitenews_date'	=> array (
+    'sitenews_date'	=> array(
         'parent'		=> 'sitenews',
         'rss'			=> 'news/index.rdf',
         'sidebar'		=> 'sitenews'
     ),
-    'sitenews_individual'	=> array (
+    'sitenews_individual'	=> array(
         'parent'		=> 'sitenews',
         'rss'			=> 'news/index.rdf',
         'sidebar'		=> 'sitenews',
     ),
-    'sitenews_rss1' 	=> array (
+    'sitenews_rss1' 	=> array(
         'url'			=> 'news/index.rdf'
     ),
-    'sitenews_rss2' 	=> array (
+    'sitenews_rss2' 	=> array(
         'url'			=> 'news/index.xml'
     ),
 
     /* Scottish Parliament */
     'sp_home' => array(
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Scottish Parliament',
             'title'			=> 'Scottish education, health, agriculture, justice, prisons and other devolved areas. Some tax-varying powers'
         ),
         'title'			=> 'Scottish Parliament',
         'url'			=> 'scotland/'
     ),
-    'spoverview' => array (
+    'spoverview' => array(
         'parent'		=> 'sp_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Overview',
             'title'			=> "Overview of the Scottish Parliament"
         ),
         'title'			=> '',
         'url'			=> 'scotland/'
     ),
-    'spdebate'  => array (
+    'spdebate'  => array(
         'parent'		=> 'spdebatesfront',
         'url'			=> 'sp/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'spdebates'  => array (
+    'spdebates'  => array(
         'parent'		=> 'spdebatesfront',
         'url'			=> 'sp/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'spdebatesday' => array (
+    'spdebatesday' => array(
         'parent'		=> 'spdebatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'sp/',
     ),
-    'spdebatesfront' => array (
-        'menu'			=> array (
+    'spdebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> ''
         ),
@@ -836,21 +836,21 @@ 
         'url'			=> 'sp/'
     ),
 
-    'spdebatesyear' => array (
+    'spdebatesyear' => array(
         'parent'		=> 'spdebatesfront',
         'url'			=> 'sp/'
     ),
-    'spwrans'  => array (
+    'spwrans'  => array(
         'parent'		=> 'spwransfront',
         'url'			=> 'spwrans/',
         #'session_vars'	=> array ('id'),
     ),
-    'spwransday'  => array (
+    'spwransday'  => array(
         'parent'		=> 'spwransfront',
         'url'			=> 'spwrans/'
     ),
-    'spwransfront'  => array (
-        'menu'			=> array (
+    'spwransfront'  => array(
+        'menu'			=> array(
             'text'			=> 'Written Answers',
             'title'			=> ''
         ),
@@ -863,38 +863,38 @@ 
         'title'			=> 'For questions asked by ',
         'url'			=> 'spwrans/'
     ),
-    'spwransyear' => array (
+    'spwransyear' => array(
         'parent'		=> 'spwransfront',
         'url'			=> 'spwrans/'
     ),
 
     // Topic pages
 
-    'topic' => array (
+    'topic' => array(
         'url'           => 'topic/',
         'title'         => 'Topics'
     ),
 
-    'topicbenefits' => array (
+    'topicbenefits' => array(
         'url'           => 'topic/benefits',
         'parent'        => 'topic',
         'title'         => 'Benefits'
     ),
 
-    'topiccrimestats' => array (
+    'topiccrimestats' => array(
         'url'           => 'topic/crime-stats',
         'parent'        => 'topic',
         'title'         => 'Crime Statistics'
     ),
 
-    'topicnhs' => array (
+    'topicnhs' => array(
         'url'           => 'topic/nhs',
         'parent'        => 'topic',
         'title'         => 'NHS'
     ),
 
     // The URL 3rd parties need to ping something here.
-    'trackback' => array (
+    'trackback' => array(
         'url'			=> 'trackback/'
     ),
 
@@ -907,29 +907,29 @@ 
         'url'			=> 'user/alerts/',
         'parent'		=> 'userviewself'
     ),
-    'userchangepc' => array (
+    'userchangepc' => array(
         'title'			=> 'Change your postcode',
         'url'			=> 'user/changepc/'
     ),
-    'userconfirm' => array (
+    'userconfirm' => array(
         'url'			=> 'user/confirm/'
     ),
-    'userconfirmed' => array (
+    'userconfirmed' => array(
         'sidebar'		=> 'userconfirmed',
         'title'			=> 'Welcome to TheyWorkForYou!',
         'url'			=> 'user/confirm/'
     ),
-    'userconfirmfailed' => array (
+    'userconfirmfailed' => array(
         'title'			=> 'Oops!',
         'url'			=> 'user/confirm/'
     ),
-    'useredit' => array (
+    'useredit' => array(
         'pg'			=> 'edit',
         'title'			=> 'Edit your details',
         'url'			=> 'user/'
     ),
-    'userjoin' => array (
-                'menu'                  => array (
+    'userjoin' => array(
+                'menu'                  => array(
                         'text'                  => 'Join',
                         'title'                 => "Joining is free and allows you to annotate speeches"
                 ),
@@ -938,8 +938,8 @@ 
                 'title'                 => 'Join TheyWorkForYou',
                 'url'                   => 'user/'
         ),
-    'getinvolved' => array (
-        'menu'			=> array (
+    'getinvolved' => array(
+        'menu'			=> array(
             'text'			=> 'Get involved',
             'title'			=> "Contribute to TheyWorkForYou"
         ),
@@ -948,8 +948,8 @@ 
         'title'			=> 'Contribute to TheyWorkForYou',
         'url'			=> 'getinvolved/'
     ),
-    'userlogin' => array (
-        'menu'			=> array (
+    'userlogin' => array(
+        'menu'			=> array(
             'text'			=> 'Sign in',
             'title'			=> "If you've already joined , sign in to add annotations"
         ),
@@ -958,33 +958,33 @@ 
         'url'			=> 'user/login/'
     ),
 
-    'userlogout' => array (
-        'menu'			=> array (
+    'userlogout' => array(
+        'menu'			=> array(
             'text'			=> 'Sign out',
             'title'			=> "Sign out"
         ),
         'url'			=> 'user/logout/'
     ),
-    'userpassword' => array (
+    'userpassword' => array(
         'title'			=> 'Change password',
         'url'			=> 'user/password/'
     ),
-    'userprompt' => array (
+    'userprompt' => array(
         'title'			=> 'Please sign in',
         'url'			=> 'user/prompt/'
     ),
-    'userview' => array (
+    'userview' => array(
         'session_vars'	=> array('u'),
         'url'			=> 'user/'
     ),
-    'userviewself' => array (
-        'menu'			=> array (
+    'userviewself' => array(
+        'menu'			=> array(
             'text'			=> 'Your details',
             'title'			=> "View and edit your details"
         ),
         'url'			=> 'user/'
     ),
-    'userwelcome' => array (
+    'userwelcome' => array(
         'title'			=> 'Welcome!',
         'url'			=> 'user/'
     ),
@@ -1012,23 +1012,23 @@ 
     ),
 
     /* Westminster Hall */
-    'whall'  => array (
+    'whall'  => array(
         'parent'		=> 'whallfront',
         'url'			=> 'whall/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'whalls'  => array (
+    'whalls'  => array(
         'parent'		=> 'whallfront',
         'url'			=> 'whall/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'whallday' => array (
+    'whallday' => array(
         'parent'		=> 'whallfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'whall/',
     ),
-    'whallfront' => array (
-        'menu'			=> array (
+    'whallfront' => array(
+        'menu'			=> array(
             'text'			=> 'Westminster Hall',
             'title'			=> "Westminster Hall debates"
         ),
@@ -1037,23 +1037,23 @@ 
         'rss'			=> 'rss/whall.rss',
         'url'			=> 'whall/'
     ),
-    'whallyear' => array (
+    'whallyear' => array(
         'parent'		=> 'whallfront',
         'url'			=> 'whall/'
     ),
 
-    'wms' => array (
+    'wms' => array(
         'parent'		=> 'wranswmsfront',
         'url'			=> 'wms/',
         'session_vars'	=> array('id')
     ),
-    'wmsday' => array (
+    'wmsday' => array(
         'parent'		=> 'wmsfront',
         'session_vars'	=> array('d'),
         'url'			=> 'wms/'
     ),
-    'wmsfront' => array (
-        'menu'			=> array (
+    'wmsfront' => array(
+        'menu'			=> array(
             'text'			=> 'Written Ministerial Statements',
             'title'			=> ''
         ),
@@ -1062,22 +1062,22 @@ 
         'rss'			=> 'rss/wms.rss',
         'url'			=> 'wms/'
     ),
-    'wmsyear' => array (
+    'wmsyear' => array(
         'parent'		=> 'wmsfront',
         'url'			=> 'wms/'
     ),
 
-    'wrans'  => array (
+    'wrans'  => array(
         'parent'		=> 'wranswmsfront',
         'url'			=> 'wrans/',
-        'session_vars'	=> array ('id')
+        'session_vars'	=> array('id')
     ),
-    'wransday'  => array (
+    'wransday'  => array(
         'parent'		=> 'wransfront',
         'url'			=> 'wrans/'
     ),
-    'wransfront'  => array (
-        'menu'			=> array (
+    'wransfront'  => array(
+        'menu'			=> array(
             'text'			=> 'Written Answers',
             'title'			=> "Written Answers"
         ),
@@ -1090,13 +1090,13 @@ 
         'title'			=> 'For questions asked by ',
         'url'			=> 'wrans/'
     ),
-    'wransyear' => array (
+    'wransyear' => array(
         'parent'		=> 'wransfront',
         'url'			=> 'wrans/'
     ),
 
-    'wranswmsfront'  => array (
-        'menu'			=> array (
+    'wranswmsfront'  => array(
+        'menu'			=> array(
             'text'			=> 'Written Answers',
             'title'			=> 'Written Answers and Statements',
         ),
@@ -1113,8 +1113,8 @@ 
         'title' => 'Your representative',
         'url' => 'your/',
     ),
-    'yourmp' => array (
-        'menu'			=> array (
+    'yourmp' => array(
+        'menu'			=> array(
             'text'			=> 'Your MP',
             'title'			=> "Find out about your Member of Parliament"
         ),
@@ -1123,8 +1123,8 @@ 
         'url'			=> 'mp/',
         'parent'			=> 'mps',
     ),
-    'yourmp_recent' => array (
-        'menu'			=> array (
+    'yourmp_recent' => array(
+        'menu'			=> array(
             'text'			=> 'Recent appearances',
             'title'			=> "Recent speeches and written answers by this MP"
         ),
@@ -1132,8 +1132,8 @@ 
         'title'			=> "Your MP's recent appearances in parliament",
         'url'			=> 'mp/?recent=1'
     ),
-    'yourmsp' => array (
-        'menu'			=> array (
+    'yourmsp' => array(
+        'menu'			=> array(
             'text'			=> 'Your MSPs',
             'title'			=> "Find out about your Members of the Scottish Parliament"
         ),
@@ -1142,8 +1142,8 @@ 
         'title'			=> 'Your MSPs',
         'url'			=> 'msp/'
     ),
-    'yourmla' => array (
-        'menu'			=> array (
+    'yourmla' => array(
+        'menu'			=> array(
             'text'			=> 'Your MLAs',
             'title'			=> "Find out about your Members of the Legislative Assembly"
         ),
@@ -1159,38 +1159,38 @@ 
 // The text displayed on the page itself will also be this,
 // UNLESS the section has a 'heading', in which case that's used instead.
 
-$this->section = array (
+$this->section = array(
 
 
-    'about' => array (
+    'about' => array(
         'title' 	=> 'About Us'
     ),
-    'admin' => array (
+    'admin' => array(
         'title'		=> 'Admin'
     ),
-    'debates' => array (
+    'debates' => array(
         'title' 	=> 'Debates',
         'heading'	=> 'House of Commons Debates'
     ),
-    'help_us_out' => array (
+    'help_us_out' => array(
         'title' 	=> 'Help Us Out'
     ),
-    'hansard' => array (
+    'hansard' => array(
         'title' 	=> 'Hansard'
     ),
-    'home' => array (
+    'home' => array(
         'title' 	=> 'Home'
     ),
-    'mp' => array (
+    'mp' => array(
         'title' 	=> 'Your MP'
     ),
-    'search' => array (
+    'search' => array(
         'title' 	=> 'Search'
     ),
-    'sitenews' => array (
+    'sitenews' => array(
         'title' 	=> 'TheyWorkForYou news'
     ),
-    'wrans' => array (
+    'wrans' => array(
         'title' 	=> 'Written Answers'
     )
 

www/includes/easyparliament/templates/html/mp/error.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
             <p><?= $error ?></p>
 
-        <?php if ( $rep_search_url ) { ?>
+        <?php if ($rep_search_url) { ?>
         </div>
 
         <div class="full-page__unit">

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
         <div class="full-page__unit">
         <p>Or <a href="<?= $all_mps_url ?>">browse all <?= $rep_name ?>s</a>?</p>
         </div>
-        <?php } else { ?>
+        <?php }
+else { ?>
         <p>Why not <a href="<?= $all_mps_url ?>">browse all <?= $rep_name ?>s</a>?</p>
         </div>
         <?php } ?>

www/includes/easyparliament/templates/html/mp/votes.php

Indentation +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
                               <?php foreach ($segment['votes']->positions as $key_vote) {
 
                                 if (isset($policy_last_update[$key_vote['policy_id']]) && $policy_last_update[$key_vote['policy_id']] > $most_recent) {
-                                  $most_recent = $policy_last_update[$key_vote['policy_id']];
+                                    $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
@@ -81,7 +81,7 @@ 
 
                                 include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

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

@@ -42,7 +42,7 @@ 
 
                 <?php if ($has_voting_record): ?>
 
-                    <?php $displayed_votes = FALSE; ?>
+                    <?php $displayed_votes = false; ?>
 
                     <?php foreach ($key_votes_segments as $segment): ?>
 
@@ -94,7 +94,7 @@ 
                                 <small>Last updated: <?= format_date($most_recent, LONGDATEFORMAT) ?></small>
                             </div>
 
-                            <?php $displayed_votes = TRUE; ?>
+                            <?php $displayed_votes = true; ?>
 
                         <?php endif; ?>
 

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                                   $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
-                                if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+                                if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
                                     $description = ucfirst($key_vote['desc']);
                                 } else {
                                     $description = sprintf(

Braces +7 added lines, -3 removed lines

@@ -65,7 +65,8 @@ 
 
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
                                     $description = ucfirst($key_vote['desc']);
-                                } else {
+                                }
+                                else {
                                     $description = sprintf(
                                         'We don’t have enough information to calculate %s’s position on %s.',
                                         $full_name,
@@ -110,13 +111,16 @@ 
 
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <div class="panel">
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
                         </div>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 <?php endif; ?>
 

www/includes/easyparliament/templates/html/mp/recent.php

Indentation +4 added lines, -4 removed lines

@@ -38,11 +38,11 @@ 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                            $displayed_votes = TRUE;
 
-                          if ($current_date != $division['date']) {
+                            if ($current_date != $division['date']) {
                             if ($current_date != '' ) {
-                              print('</ul></div>');
+                                print('</ul></div>');
                             }
                             $current_date = $division['date'];
                             $sidebar_links[] = $division['date'];
@@ -51,7 +51,7 @@ 
                             <h2><?= strftime('%e %b %Y', strtotime($division['date'])) ?></h2>
                              <ul class="vote-descriptions policy-votes">
                           <?php }
-                          include('_division_description.php');
+                            include('_division_description.php');
                         }
                         echo('</div>');
                     }

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

@@ -30,15 +30,15 @@
 
                 <?php
 
-                $displayed_votes = FALSE;
-                $show_all = TRUE;
+                $displayed_votes = false;
+                $show_all = true;
                 $current_date = '';
                 $sidebar_links = array();
 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                          $displayed_votes = true;
 
                           if ($current_date != $division['date']) {
                             if ($current_date != '' ) {

Spacing +3 added lines, -3 removed lines

@@ -35,13 +35,13 @@ 
                 $current_date = '';
                 $sidebar_links = array();
 
-                if ( isset($divisions) && $divisions ) {
+                if (isset($divisions) && $divisions) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
                           $displayed_votes = TRUE;
 
                           if ($current_date != $division['date']) {
-                            if ($current_date != '' ) {
+                            if ($current_date != '') {
                               print('</ul></div>');
                             }
                             $current_date = $division['date'];
@@ -67,7 +67,7 @@ 
 
             <div class="sidebar__unit in-page-nav">
                 <ul data-magellan-expedition="fixed">
-                  <?php foreach($sidebar_links as $date) { ?>
+                  <?php foreach ($sidebar_links as $date) { ?>
                     <li data-magellan-arrival="<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                         <a href="#<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                             <?= strftime('%e %b %Y', strtotime($date)) ?>

www/includes/easyparliament/templates/html/mp/profile.php

Indentation +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -119,7 +119,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -148,7 +148,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>

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

@@ -105,7 +105,7 @@
                         <ul class="vote-descriptions">
                           <?php foreach ($sorted_diffs as $policy_id => $score) {
 
-                            $key_vote = NULL;
+                            $key_vote = null;
                             $description = sprintf(
                                 '%s <b>%s</b> %s, while most %s MPs <b>%s</b>.',
                                 $full_name,

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
                 </div>
               <?php endif; ?>
 
-                <?php if ( !$current_member[HOUSE_TYPE_COMMONS] ) { ?>
+                <?php if (!$current_member[HOUSE_TYPE_COMMONS]) { ?>
                     <?php if (count($policyPositions->positions) > 0) { ?>
                     <div class="panel">
                         <a name="votes"></a>
@@ -124,7 +124,7 @@ 
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
 
-                    <?php elseif (count($policyPositions->positions) > 0 ): ?>
+                    <?php elseif (count($policyPositions->positions) > 0): ?>
                         <?php if (count($party_positions) && $party_member_count > 1) { ?>
                         <p>
                         <?= $full_name ?> is a <?= $party ?> MP, and on the <b>vast majority</b> of issues votes the <b>same way</b> as other <?= $party ?> MPs.
@@ -152,7 +152,7 @@ 
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
-                    <?php elseif (count($policyPositions->positions) == 0 ): ?>
+                    <?php elseif (count($policyPositions->positions) == 0): ?>
 
                         <p>No votes to display.</p>
 

Braces +9 added lines, -4 removed lines

@@ -86,7 +86,8 @@ 
 
                     </div>
                     <?php } ?>
-                <?php } else if (count($policyPositions->positions) > 0 || count($sorted_diffs) > 0): ?>
+                <?php }
+else if (count($policyPositions->positions) > 0 || count($sorted_diffs) > 0): ?>
                 <div class="panel">
                     <a name="votes"></a>
                     <h2 data-magellan-destination="votes"><?= $full_name ?>&rsquo;s voting in Parliament</h2>
@@ -190,11 +191,14 @@ 
                         <?= $recent_appearances['additional_links'] ?>
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <p>No recent appearances to display.</p>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 </div>
                 <?php endif; ?>
@@ -265,7 +269,8 @@ 
                         <p>
                             <?php if ($eu_stance == 'Leave' || $eu_stance == 'Remain') { ?>
                                 <strong><?= $full_name ?></strong> campaigned to <?= $eu_stance == 'Leave' ? 'leave' : 'remain in' ?> the European Union
-                            <?php } else { ?>
+                            <?php }
+else { ?>
                                 We don't know whether <strong><?= $full_name ?></strong> campaigned to leave, or stay in the European Union
                             <?php } ?>
                             <small>Source: <a href="http://www.bbc.co.uk/news/uk-politics-eu-referendum-35616946">BBC</a></small>