mysociety / theyworkforyou

www/includes/easyparliament/member.php

Spacing +28 added lines, -28 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 class MEMBER {
 
@@ -143,12 +143,12 @@ 
                 );
             }
 
-            if ( $house==HOUSE_TYPE_ROYAL 					# The Monarch
-                || (!$this->house_disp && $house==HOUSE_TYPE_LONDON_ASSEMBLY) # London Assembly
-                || (!$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_LONDON_ASSEMBLY) # London Assembly
+                || (!$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;
@@ -203,13 +203,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.');
         }
@@ -248,7 +248,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.');
@@ -348,7 +348,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;
@@ -422,9 +422,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'];
@@ -432,7 +432,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);
@@ -440,7 +440,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')->first();
+        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:' . $this->person_id . '%" and confirmed and not deleted')->first();
         $this->extra_info['number_of_alerts'] = $q['c'];
 
         if (isset($this->extra_info['reading_ease'])) {
@@ -464,14 +464,14 @@ 
         $this->extra_info['pbc'] = array();
         foreach ($q as $row) {
             $bill_id = $row['bill_id'];
-            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor='.$bill_id.' and htype=10')->first();
+            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor=' . $bill_id . ' and htype=10')->first();
             $c = $c['c'];
             $title = $row['title'];
             $attending = $row['a'];
             $chairman = $row['c'];
             $this->extra_info['pbc'][$bill_id] = array(
                 'title' => $title, 'session' => $row['session'],
-                'attending'=>$attending, 'chairman'=>($chairman>0), 'outof' => $c
+                'attending'=>$attending, 'chairman'=>($chairman > 0), 'outof' => $c
             );
         }
 
@@ -486,7 +486,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);
     }
@@ -513,8 +513,8 @@ 
     }
 
     public function entered_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->entered_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->entered_house)) {
                 return $this->entered_house[$house];
             } else {
                 return null;
@@ -526,9 +526,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);
@@ -538,8 +538,8 @@ 
     }
 
     public function left_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->left_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->left_house)) {
                 return $this->left_house[$house];
             } else {
                 return null;
@@ -553,7 +553,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 {
@@ -671,7 +671,7 @@ 
             $name = $row['given_name'] . ' ' . $row['family_name'];
             if ($last_pid != $pid) {
                 $mships[] = array(
-                    'href' => WEBPATH . 'mp/?pid='.$pid,
+                    'href' => WEBPATH . 'mp/?pid=' . $pid,
                     'text' => $name
                 );
                 $last_pid = $pid;

classes/Utility/House.php

Spacing +5 added lines, -5 removed lines

@@ -50,35 +50,35 @@
 
     public static function getCountryDetails($house) {
         $details = array(
-            HOUSE_TYPE_COMMONS => array (
+            HOUSE_TYPE_COMMONS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '– in the House of Commons',
                 'cons_type' => 'WMC',
                 'assembly_name' => 'House of Commons',
             ),
-            HOUSE_TYPE_NI => array (
+            HOUSE_TYPE_NI => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '– in the Northern Ireland Assembly',
                 'cons_type' => 'NIE',
                 'assembly_name' => 'Northern Ireland Assembly',
             ),
-            HOUSE_TYPE_SCOTLAND => array (
+            HOUSE_TYPE_SCOTLAND => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '– in the Scottish Parliament',
                 'cons_type' => 'SPC',
                 'assembly_name' => 'Scottish Parliament',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '– in the House of Lords',
                 'cons_type' => '',
                 'assembly_name' => 'House of Lords',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'london-assembly',
                 'location' => '– in the London Assembly',

www/includes/easyparliament/metadata.php

Spacing +239 added lines, -239 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,122 +78,122 @@ 
 
 // 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_photos' => array (
+    'admin_photos' => array(
         'title'			=> 'Photo upload/attribution',
         'parent'		=> 'admin',
         'url'			=> 'admin/photos.php',
     ),
-    'admin_profile_message' => array (
+    'admin_profile_message' => array(
         'title'			=> 'Profile message banner',
         'parent'		=> 'admin',
         'url'			=> 'admin/profile-message.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',
     ),
-    'admin_wikipedia' => array (
+    'admin_wikipedia' => array(
         'title' => 'Wikipedia links',
         'parent' => 'admin',
         'url' => 'admin/wikipedia.php',
@@ -201,8 +201,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'
@@ -211,30 +211,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'			=> 'Plan and keys',
         'parent'		=> 'api_front',
         'url'			=> 'api/key'
@@ -245,69 +245,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"
         ),
@@ -316,8 +316,8 @@ 
         'url'			=> 'comments/recent/'
     ),
 
-    'contact' => array (
-        'menu'			=> array (
+    'contact' => array(
+        'menu'			=> array(
             'text'			=> 'Contact',
             'title'			=> '',
         ),
@@ -328,23 +328,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"
         ),
@@ -353,8 +353,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"
         ),
@@ -363,12 +363,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'			=> ''
         ),
@@ -376,13 +376,13 @@ 
         'title'			=> 'Recent Votes',
         'url'			=> 'divisions/'
     ),
-    'divisions_vote' => array (
+    'divisions_vote' => array(
         'parent'		=> 'divisions_recent',
         'title'			=> 'Vote',
         'url'			=> 'divisions/division.php',
         'session_vars'	=> array('vote'),
     ),
-    'epvote' => array (
+    'epvote' => array(
         'url'			=> 'vote/'
     ),
 
@@ -391,19 +391,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"
         ),
@@ -411,16 +411,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"
         ),
@@ -429,88 +429,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"
         ),
@@ -519,24 +519,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"
         ),
@@ -544,8 +544,8 @@ 
         'title'			=> '',
         'url'			=> 'peers/'
     ),
-'overview' => array (
-     'menu'			=> array (
+'overview' => array(
+     'menu'			=> array(
         'text'			=> 'Overview',
         'title'			=> "Overview of the UK Parliament"
     ),
@@ -554,50 +554,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)"
         ),
@@ -608,16 +608,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"
         ),
@@ -625,23 +625,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"
         ),
@@ -650,7 +650,7 @@ 
         'rss'			=> 'rss/ni.rss',
         'url'			=> 'ni/'
     ),
-    'nidebatesyear' => array (
+    'nidebatesyear' => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/'
     ),
@@ -658,7 +658,7 @@ 
     /* London Assembly */
 
     'london_home' => array(
-        'menu'          => array (
+        'menu'          => array(
             'text'      => 'London Assembly',
             'title'     => 'Scottish education, health, agriculture, justice, prisons and other devolved areas. Some tax-varying powers'
         ),
@@ -666,9 +666,9 @@ 
         'url'           => 'london-assembly/'
     ),
 
-    'london_assembly_members' => array (
+    'london_assembly_members' => array(
         'parent'        => 'london_home',
-        'menu'          => array (
+        'menu'          => array(
             'text'      => 'London Assembly Members',
             'title'     => "List of Members of the London Assembly)"
         ),
@@ -676,25 +676,25 @@ 
         'url'           => 'london-assembly-members/'
     ),
 
-    'london_assembly_member' => array (
+    'london_assembly_member' => array(
         'parent'        => 'london_assembly_members',
         'title'         => 'Find your London Assembly Member',
         'url'           => 'london-assembly-member/'
     ),
 
-    '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"
         ),
@@ -712,17 +712,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(
@@ -734,62 +734,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"
         ),
@@ -799,68 +799,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'			=> ''
         ),
@@ -869,21 +869,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'			=> ''
         ),
@@ -896,31 +896,31 @@ 
         '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'
@@ -935,29 +935,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"
                 ),
@@ -966,8 +966,8 @@ 
                 'title'                 => 'Join TheyWorkForYou',
                 'url'                   => 'user/'
         ),
-    'getinvolved' => array (
-        'menu'			=> array (
+    'getinvolved' => array(
+        'menu'			=> array(
             'text'			=> 'Get involved',
             'title'			=> "Contribute to TheyWorkForYou"
         ),
@@ -976,8 +976,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"
         ),
@@ -986,33 +986,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/'
     ),
@@ -1040,23 +1040,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"
         ),
@@ -1065,23 +1065,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'			=> ''
         ),
@@ -1090,22 +1090,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"
         ),
@@ -1118,13 +1118,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',
         ),
@@ -1141,8 +1141,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"
         ),
@@ -1151,8 +1151,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"
         ),
@@ -1160,8 +1160,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"
         ),
@@ -1170,8 +1170,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"
         ),
@@ -1187,38 +1187,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'
     )
 

classes/Member.php

Spacing +23 added lines, -23 removed lines

@@ -76,7 +76,7 @@ 
             $now = new \DateTime();
 
             $diff = $date_entered->diff($now);
-            if ( $diff->y == 0 && $diff->m <= 6 ) {
+            if ($diff->y == 0 && $diff->m <= 6) {
                 return TRUE;
             }
         }
@@ -97,7 +97,7 @@ 
 
         $entered_house = $this->entered_house($house);
 
-        if ( $entered_house ) {
+        if ($entered_house) {
             $date_entered = $entered_house['date'];
         }
 
@@ -117,7 +117,7 @@ 
 
         $left_house = $this->left_house($house);
 
-        if ( $left_house ) {
+        if ($left_house) {
             $date_left = $left_house['date'];
         }
 
@@ -145,9 +145,9 @@ 
 
         $is_lord = $this->house(HOUSE_TYPE_LORDS);
         if ($is_lord) {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
         } else {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, true);
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, true);
         }
 
         // We can determine if the image exists or not by testing if size is set
@@ -170,10 +170,10 @@ 
 
         usort(
             $departures,
-            function ($a, $b) {
-                if ( $a['date'] == $b['date'] ) {
+            function($a, $b) {
+                if ($a['date'] == $b['date']) {
                     return 0;
-                } else if ( $a['date'] < $b['date'] ) {
+                } else if ($a['date'] < $b['date']) {
                     return -1;
                 } else {
                     return 1;
@@ -211,7 +211,7 @@ 
             $office = $office['office'];
 
             foreach ($office as $row) {
-                if ( $officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row) ) {
+                if ($officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row)) {
                     $out[] = $officeObject;
                 }
             }
@@ -348,7 +348,7 @@ 
     private function entered_house_line($house, $house_name) {
         if (isset($this->entered_house[$house]['date'])) {
             $string = "<strong>Entered the $house_name ";
-            $string .= strlen($this->entered_house[$house]['date_pretty'])==HOUSE_TYPE_SCOTLAND ? 'in ' : 'on ';
+            $string .= strlen($this->entered_house[$house]['date_pretty']) == HOUSE_TYPE_SCOTLAND ? 'in ' : 'on ';
             $string .= $this->entered_house[$house]['date_pretty'] . '</strong>';
             if ($this->entered_house[$house]['reason']) {
                 $string .= ' &mdash; ' . $this->entered_house[$house]['reason'];
@@ -360,7 +360,7 @@ 
     private function left_house_line($house, $house_name) {
         if ($this->house($house) && !$this->current_member($house)) {
             $string = "<strong>Left the $house_name ";
-            $string .= strlen($this->left_house[$house]['date_pretty'])==4 ? 'in ' : 'on ';
+            $string .= strlen($this->left_house[$house]['date_pretty']) == 4 ? 'in ' : 'on ';
             $string .= $this->left_house[$house]['date_pretty'] . '</strong>';
             if ($this->left_house[$house]['reason']) {
                 $string .= ' &mdash; ' . $this->left_house[$house]['reason'];
@@ -373,19 +373,19 @@ 
         $policy_diffs = array();
         $party_positions = $party->getAllPolicyPositions($policiesList);
 
-        if ( !$party_positions ) {
+        if (!$party_positions) {
             return $policy_diffs;
         }
 
-        foreach ( $positions->positionsById as $policy_id => $details ) {
-            if ( $details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
+        foreach ($positions->positionsById as $policy_id => $details) {
+            if ($details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
                 $mp_score = $details['score'];
                 $party_score = $party_positions[$policy_id]['score'];
 
                 $score_diff = $this->calculatePolicyDiffScore($mp_score, $party_score);
 
                 // skip anything that isn't a yes vs no diff
-                if ( $only_diffs && $score_diff < 2 ) {
+                if ($only_diffs && $score_diff < 2) {
                     continue;
                 }
                 $policy_diffs[$policy_id] = $score_diff;
@@ -397,18 +397,18 @@ 
         return $policy_diffs;
     }
 
-    private function calculatePolicyDiffScore( $mp_score, $party_score ) {
+    private function calculatePolicyDiffScore($mp_score, $party_score) {
         $score_diff = abs($mp_score - $party_score);
         // if they are on opposite sides of mixture of for and against
         if (
-            ( $mp_score < 0.4 && $party_score > 0.6 ) ||
-            ( $mp_score > 0.6 && $party_score < 0.4 )
+            ($mp_score < 0.4 && $party_score > 0.6) ||
+            ($mp_score > 0.6 && $party_score < 0.4)
         ) {
             $score_diff += 2;
         // if on is mixture of for and against and one is for/against
         } else if (
-            ( $mp_score > 0.4 && $mp_score < 0.6 && ( $party_score > 0.6 || $party_score < 0.4 ) ) ||
-            ( $party_score > 0.4 && $party_score < 0.6 && ( $mp_score > 0.6 || $mp_score < 0.4 ) )
+            ($mp_score > 0.4 && $mp_score < 0.6 && ($party_score > 0.6 || $party_score < 0.4)) ||
+            ($party_score > 0.4 && $party_score < 0.6 && ($mp_score > 0.6 || $mp_score < 0.4))
         ) {
             $score_diff += 1;
         }
@@ -421,7 +421,7 @@ 
 
         $mreg = array();
         $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode);
-        if ( isset($constituencies[$type]) ) {
+        if (isset($constituencies[$type])) {
             $cons_name = $constituencies[$type];
             $query_base = "SELECT member.person_id, title, lordofname, given_name, family_name, constituency, house
                 FROM member, person_names
@@ -438,7 +438,7 @@ 
                     ':cons_name' => $cons_name
                 )
             );
-            if ( !$q->rows() && ($dissolution = Dissolution::db()) ) {
+            if (!$q->rows() && ($dissolution = Dissolution::db())) {
                 $q = $db->query("$query_base AND $dissolution[query]",
                     array(
                         ':house' => $house,
@@ -462,7 +462,7 @@ 
     }
 
     public static function getRepNameForHouse($house) {
-        switch ( $house ) {
+        switch ($house) {
             case HOUSE_TYPE_COMMONS:
                 $name = 'MP';
                 break;

tests/PageTest.php

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/member.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/member.xml');
     }
 
     private function fetch_page($vars)
@@ -21,14 +21,14 @@ 
 
     public function testQueenie()
     {
-        $page = $this->fetch_page( array( 'representative_type' => 'royal', 'n' => 'elizabeth_the_second' ) );
+        $page = $this->fetch_page(array('representative_type' => 'royal', 'n' => 'elizabeth_the_second'));
         $this->assertContains('Elizabeth the Second', $page);
         $this->assertContains('Coronated on 2 June 1953', $page);
     }
 
     public function testSittingMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertContains('Test Current-MP', $page);
         $this->assertRegexp('#<span class="person-header__about__position__constituency">\s*Test Westminster Constituency\s*</span>#', $page);
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Labour\s*MP\s*</span>#', $page);
@@ -36,7 +36,7 @@ 
 
 	public function testSittingMLA()
     {
-        $page = $this->fetch_page( array( 'pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla' ) );
+        $page = $this->fetch_page(array('pid' => 4, 'representative_type' => 'mla', 'url' => '/mp/4/test_current-mla'));
         $this->assertContains('Test Current-MLA', $page);
         $this->assertRegexp('#<span class="person-header__about__position__constituency">\s*Test Northern Ireland Constituency\s*</span>#', $page);
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Sinn Féin\s*MLA\s*</span>#', $page);
@@ -47,7 +47,7 @@ 
      */
     public function testSittingSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency'));
         $this->assertContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -56,7 +56,7 @@ 
      */
     public function testSittingNonSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertNotContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -65,7 +65,7 @@ 
      */
 	public function testSpeaker()
     {
-        $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
+        $page = $this->fetch_page(array('pid' => 13, 'url' => '/mp/13/test_speaker/buckingham'));
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Speaker\s*MP\s*</span>#', $page);
     }
 
@@ -75,25 +75,25 @@ 
         # makes sure it is empty in case there's something hanging
         # about in memcached
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
 
         $banner->set_text('This is a banner');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertContains('This is a banner', $page);
 
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
     }
 
     public function testNewMPMessage() {
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertNotContains('is a recently elected MP', $page);
         $this->db->query('UPDATE member SET entered_house = NOW() WHERE person_id = 17');
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertContains('is a recently elected MP', $page);
     }