mysociety / theyworkforyou

classes/SectionView/SectionView.php

Spacing +35 added lines, -35 removed lines

@@ -38,7 +38,7 @@ 
             $data = $this->addCommonData($data);
         } elseif ($date = get_http_var('d')) {
             $data = $this->display_day($date);
-            if ( !isset($data['template']) ) {
+            if (!isset($data['template'])) {
                 $data['template'] = 'section/day';
             }
             $data = $this->addCommonData($data);
@@ -46,7 +46,7 @@ 
             $data = $this->display_section_or_speech();
         } else {
             $data = $this->display_front();
-            if ( !isset($data['template']) ) {
+            if (!isset($data['template'])) {
                 $data['template'] = 'section/recent';
             }
             $data['search_sections'] = $this->getSearchSections();
@@ -68,10 +68,10 @@ 
         $data['recess_major'] = $this->getRecessMajor();
 
         $nextprev = $DATA->page_metadata($this_page, 'nextprev');
-        if ( isset($nextprev['next']['url']) ) {
+        if (isset($nextprev['next']['url'])) {
             $data['next'] = $nextprev['next'];
         }
-        if ( isset($nextprev['prev']['url']) ) {
+        if (isset($nextprev['prev']['url'])) {
             $data['prev'] = $nextprev['prev'];
         }
 
@@ -80,7 +80,7 @@ 
         if (!isset($data['title']) && $parent_page != '') {
             $data['title'] = $DATA->page_metadata($parent_page, 'title');
         }
-        if ( $parent_page ) {
+        if ($parent_page) {
             $data['parent_title'] = $DATA->page_metadata($parent_page, 'title');
         }
 
@@ -96,7 +96,7 @@ 
 
         $urls = array_merge($urls, $this->getViewUrls());
 
-        if ( isset($data['info']['page']) ) {
+        if (isset($data['info']['page'])) {
             $day = new \MySociety\TheyWorkForYou\Url($data['info']['page']);
             $urls['day'] = $day;
         }
@@ -140,7 +140,7 @@ 
             $DATA->set_page_metadata($this_page, 'title', $year);
         }
 
-        $args = array ( 'year' => $year );
+        $args = array('year' => $year);
         $data = $this->list->display('calendar', $args, 'none');
         return $data;
     }
@@ -148,7 +148,7 @@ 
     protected function display_column($date, $column) {
         global $this_page;
         $this_page = $this->page_base;
-        $args = array( 'date' => $date, 'column' => $column );
+        $args = array('date' => $date, 'column' => $column);
         $content = $this->list->display('column', $args, 'none');
 
         $data = array();
@@ -168,12 +168,12 @@ 
     protected function display_day($date) {
         global $this_page;
         $this_page = $this->page_base . 'day';
-        $args = array ( 'date' => get_http_var('d') );
+        $args = array('date' => get_http_var('d'));
         $data = $this->list->display('date', $args, 'none');
         list($year, $month, $day) = explode('-', $date);
-        $args = array( 'year' => $year, 'month' => $month, 'day' => $day);
+        $args = array('year' => $year, 'month' => $month, 'day' => $day);
         $calendar = $this->list->display('calendar', $args, 'none');
-        if ( isset($calendar['years']) ) {
+        if (isset($calendar['years'])) {
             $data['calendar'] = $calendar['years'];
         }
         return $data;
@@ -183,7 +183,7 @@ 
         global $DATA, $this_page, $THEUSER;
 
         # += as we *don't* want to override any already supplied argument
-        $args += array (
+        $args += array(
             'gid' => get_http_var('id'),
             's' => get_http_var('s'), // Search terms to be highlighted.
             'member_id' => get_http_var('m'), // Member's speeches to be highlighted.
@@ -200,14 +200,14 @@ 
             if ($this->major == 6) {
                 # Magically (as in I can't remember quite why), pbc_clause will
                 # contain the new URL without any change...
-                $URL->remove( array('id') );
+                $URL->remove(array('id'));
             } else {
-                $URL->insert( array('id'=>$e->getMessage()) );
+                $URL->insert(array('id'=>$e->getMessage()));
             }
             # put the search term back in so highlighting works.
             # NB: as we don't see the # part of the URL we lose this :(
-            if ( $args['s'] !== '' ) {
-                $URL->insert( array('s'=>$args['s']) );
+            if ($args['s'] !== '') {
+                $URL->insert(array('s'=>$args['s']));
             }
             redirect($URL->generate('none'), 301);
         }
@@ -284,7 +284,7 @@ 
         if (array_key_exists('text_heading', $data['info'])) {
             // avoid having Clause 1 etc as the alert text search string on PBC pages as it's
             // almost certainly not what the person wants
-            if ( $this->major == 6 ) {
+            if ($this->major == 6) {
                 $data['email_alert_text'] = $data['section_title'];
             } else {
                 $data['email_alert_text'] = $data['info']['text_heading'];
@@ -331,7 +331,7 @@ 
             $body = preg_replace('#<phrase class="honfriend" id="uk.org.publicwhip/member/(\d+)" name="([^"]*?)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?m=$1" title="Our page on $2 - \'$3\'">$4</a>', $body);
             $body = preg_replace('#<phrase class="honfriend" name="([^"]*?)" person_id="uk.org.publicwhip/person/(\d+)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?p=$2" title="Our page on $1 - \'$3\'">$4</a>', $body);
             $body = preg_replace_callback('#<phrase class="offrep" id="(.*?)/(\d+)-(\d+)-(\d+)\.(.*?)">(.*?)</phrase>#', function($matches) {
-                return '<a href="/search/?pop=1&s=date:' . $matches[2] . $matches[3] . $matches[4] . '+column:' . $matches[5] . '+section:' . $matches[1] .'">' . str_replace("Official Report", "Hansard", $matches[6]) . '</a>';
+                return '<a href="/search/?pop=1&s=date:' . $matches[2] . $matches[3] . $matches[4] . '+column:' . $matches[5] . '+section:' . $matches[1] . '">' . str_replace("Official Report", "Hansard", $matches[6]) . '</a>';
             }, $body);
             #$body = preg_replace('#<phrase class="offrep" id="((.*?)/(\d+)-(\d+)-(\d+)\.(.*?))">(.*?)</phrase>#e', "\"<a href='/search/?pop=1&amp;s=date:$3$4$5+column:$6+section:$2&amp;match=$1'>\" . str_replace('Official Report', 'Hansard', '$7') . '</a>'", $body);
             $bodies[] = $body;
@@ -364,7 +364,7 @@ 
         $data['section_title'] = '';
         $subsection_title = '';
         $rows = count($data['rows']);
-        for ($i=0; $i<$rows; $i++) {
+        for ($i = 0; $i < $rows; $i++) {
             $row = $data['rows'][$i];
             $htype = $row['htype'];
             // HPOS should be defined below if it's needed; otherwise default to 0
@@ -387,7 +387,7 @@ 
                 # Voting links
                 $data['rows'][$i]['voting_data'] = '';
                 if (isset($row['votes'])) {
-                    $data['rows'][$i]['voting_data'] = $this->generate_votes( $row['votes'], $row['epobject_id'], $row['gid'] );
+                    $data['rows'][$i]['voting_data'] = $this->generate_votes($row['votes'], $row['epobject_id'], $row['gid']);
                 }
 
                 # Annotation link
@@ -424,62 +424,62 @@ 
 
     private function getCountryDetails() {
         $details = array(
-            1 => array (
+            1 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in the House of Commons'
             ),
-            2 => array (
+            2 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in Westminster Hall'
             ),
-            3 => array (
+            3 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => 'written question &ndash; answered'
             ),
-            4 => array (
+            4 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => 'written statement &ndash; made'
             ),
-            5 => array (
+            5 => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '&ndash; in the Northern Ireland Assembly'
             ),
-            6 => array (
+            6 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in a Public Bill Committee'
             ),
-            7 => array (
+            7 => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '&ndash; in the Scottish Parliament'
             ),
-            8 => array (
+            8 => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '&ndash; Scottish Parliament written question &ndash; answered'
             ),
-            9 => array (
+            9 => array(
                 'country' => 'LONDON',
                 'assembly' => 'london-assembly',
                 'location' => 'Questions to the Mayor of London &ndash; answered'
             ),
-            10 => array (
+            10 => array(
                 'country' => 'WALES',
                 'assembly' => 'senedd',
                 'location' => '&ndash; in the Welsh Parliament'
             ),
-            11 => array (
+            11 => array(
                 'country' => 'WALES',
                 'assembly' => 'senedd',
                 'location' => '&ndash; Senedd Cymru'
             ),
-            101 => array (
+            101 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '&ndash; in the House of Lords'
@@ -512,7 +512,7 @@ 
         global $DATA, $this_page;
         $this_page = $this->page_base . 'front';
         $data = array();
-        if ( $this->index_template ) {
+        if ($this->index_template) {
             $data['template'] = $this->index_template;
         }
 
@@ -522,7 +522,7 @@ 
 
         $content['calendar'] = $class->display('calendar', array('months' => 1), 'none');
 
-        if ( $rssurl = $DATA->page_metadata($this_page, 'rss') ) {
+        if ($rssurl = $DATA->page_metadata($this_page, 'rss')) {
             $content['rssurl'] = $rssurl;
         }
 
@@ -537,7 +537,7 @@ 
     }
 
     //$totalcomments, $comment, $commenturl
-    function generate_commentteaser ($row) {
+    function generate_commentteaser($row) {
         // Returns HTML for the one fragment of comment and link for the sidebar.
         // $totalcomments is the number of comments this item has on it.
         // $comment is an array like:

classes/Utility/Postcode.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug ("TIME", "Postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
+            twfy_debug("TIME", "Postcode $postcode looked up last time, is " . (is_array($return_value) ? implode(', ', $return_value) : $return_value));
             return $return_value;
         }
 
@@ -82,9 +82,9 @@ 
             $name = explode('|', $name);
             if ($country == 'W') {
                 return array('WMC' => $name[0], 'WAC' => $name[1], 'WAE' => $name[2]);
-            } elseif ($country == 'S' || count($name)==3) {
+            } elseif ($country == 'S' || count($name) == 3) {
                 return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
-            } elseif ($country == 'N' || count($name)==2) {
+            } elseif ($country == 'N' || count($name) == 2) {
                 return array('WMC' => $name[0], 'NIE' => $name[1]);
             } else {
                 return array('WMC' => $name[0]);
@@ -118,7 +118,7 @@ 
 
         $r = json_decode($file, true);
         if (!$r) {
-            trigger_error("Postcode database is not working. Content:\n".$file.", request: ". $filename, E_USER_WARNING);
+            trigger_error("Postcode database is not working. Content:\n" . $file . ", request: " . $filename, E_USER_WARNING);
             return '';
         }
         if (isset($r['error']) || !isset($r['areas'])) {

Braces +6 added lines, -3 removed lines

@@ -52,7 +52,9 @@ 
             $ret = self::postcodeFetchFromMapit($postcode);
         }
 
-        if (is_string($ret)) return $ret;
+        if (is_string($ret)) {
+            return $ret;
+        }
 
         $last_postcode = $postcode;
         $last_postcode_value = $ret;
@@ -126,8 +128,9 @@ 
         }
         $areas = array();
         foreach ($r['areas'] as $row) {
-            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE', 'WAC', 'WAE')))
-                $areas[$row['type']] = $row['name'];
+            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE', 'WAC', 'WAE'))) {
+                            $areas[$row['type']] = $row['name'];
+            }
         }
 
         if (!isset($areas['WMC'])) {

www/includes/easyparliament/metadata.php

Spacing +257 added lines, -257 removed lines

@@ -65,10 +65,10 @@ 
 
 */
 
-$page = array (
+$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'			=> gettext('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,35 +211,35 @@ 
         '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'
     ),
-    'api_invoices'		=> array (
+    'api_invoices'		=> array(
         'title'			=> 'Invoices',
         'parent'		=> 'api_front',
         'url'			=> 'api/invoices'
@@ -250,69 +250,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"
         ),
@@ -321,8 +321,8 @@ 
         'url'			=> 'comments/recent/'
     ),
 
-    'contact' => array (
-        'menu'			=> array (
+    'contact' => array(
+        'menu'			=> array(
             'text'			=> gettext('Contact'),
             'title'			=> '',
         ),
@@ -333,23 +333,23 @@ 
         'title' => gettext('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"
         ),
@@ -358,8 +358,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"
         ),
@@ -368,12 +368,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'			=> ''
         ),
@@ -381,13 +381,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/'
     ),
 
@@ -396,19 +396,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"
         ),
@@ -416,16 +416,16 @@ 
         'url'			=> ''
     ),
         // Hansard landing page
-        'hansard_landing' => array (
+        'hansard_landing' => array(
                 'title'                 => 'Hansard',
                 'url'                   => 'search-hansard/',
         ),
-    'help' => array (
+    'help' => array(
         'title'			=> gettext('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"
         ),
@@ -434,77 +434,77 @@ 
         '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'			=> gettext('Link to us'),
         'heading'		=> gettext('How to link to us'),
         'url'			=> 'help/linktous/'
     ),
-    'api' => array (
+    'api' => array(
         'title'			=> gettext('API'),
         'heading'		=> gettext('API - Query the TheyWorkForYou database'),
         'url'			=> 'api/'
     ),
-    'data' => array (
+    'data' => array(
         'title'			=> gettext('Raw Data'),
         'heading'		=> gettext('Raw data (XML) - the data behind TheyWorkForYou and Public Whip'),
         'url'			=> 'http://parser.theyworkforyou.com'
     ),
-    'devmailinglist' => array (
+    'devmailinglist' => array(
         'title'			=> gettext('Developer mailing list'),
         'url'			=> 'https://groups.google.com/a/mysociety.org/forum/#!forum/theyworkforyou'
     ),
-    'code' => array (
+    'code' => array(
         'title'			=> gettext('Source code'),
         'heading'		=> gettext('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/'
     ),
-    '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,7 +644,7 @@ 
         'rss'			=> 'rss/ni.rss',
         'url'			=> 'ni/'
     ),
-    'nidebatesyear' => array (
+    'nidebatesyear' => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/'
     ),
@@ -652,7 +652,7 @@ 
     /* London Assembly */
 
     'london_home' => array(
-        'menu'          => array (
+        'menu'          => array(
             'text'      => 'London Assembly',
             'title'     => 'Members of the London Assembly, answers from the Mayor of London'
         ),
@@ -660,9 +660,9 @@ 
         'url'           => 'london/'
     ),
 
-    '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)"
         ),
@@ -670,48 +670,48 @@ 
         '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/'
     ),
 
-    'lmqs' => array (
+    'lmqs' => array(
         'parent'		=> 'london_home',
         'url'			=> 'london/',
-        'session_vars'	=> array ('id')
+        'session_vars'	=> array('id')
     ),
-    'lmqsday'  => array (
+    'lmqsday'  => array(
         'parent'		=> 'london_home',
         'url'			=> 'london/',
     ),
-    'lmqsfront' => array (
+    'lmqsfront' => array(
         'parent'		=> 'london_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Questions to the Mayor of London',
             'title'			=> "Questions to the Mayor of London"
         ),
         'title'			=> 'questions to the Mayor of London',
         'url'			=> 'london/',
     ),
-    'lmqsyear' => array (
+    'lmqsyear' => array(
         'parent'		=> 'london_home',
         'url'			=> 'london/',
     ),
 
-    'otheruseredit' => array (
+    'otheruseredit' => array(
         'pg'			=> 'editother',
         'title'			=> "Editing a user's data",
         'url'			=> 'user/'
     ),
-    'privacy' => array (
+    'privacy' => array(
         'title'			=> gettext('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"
         ),
@@ -729,17 +729,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(
@@ -751,57 +751,57 @@ 
         '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')
     ),
 
-    'sitenews'		=> array (
-        'menu'			=> array (
+    'sitenews'		=> array(
+        'menu'			=> array(
             'text'			=> 'TheyWorkForYou news',
             'title'			=> "News about changes to this website"
         ),
@@ -811,68 +811,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'			=> ''
         ),
@@ -881,21 +881,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'			=> ''
         ),
@@ -908,31 +908,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'
@@ -947,29 +947,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'                  => gettext('Join'),
                         'title'                 => gettext("Joining is free and allows you to manage your email alerts")
                 ),
@@ -978,8 +978,8 @@ 
                 'title'                 => gettext('Join TheyWorkForYou'),
                 'url'                   => 'user/'
         ),
-    'userlogin' => array (
-        'menu'			=> array (
+    'userlogin' => array(
+        'menu'			=> array(
             'text'			=> gettext('Sign in'),
             'title'			=> gettext("If you've already joined, sign in to your account")
         ),
@@ -988,33 +988,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/'
     ),
@@ -1028,22 +1028,22 @@ 
         'title' => 'Senedd Cymru / Welsh Parliament',
         'url' => 'senedd/'
     ),
-    'mss' => array (
+    'mss' => array(
         'parent' => 'wales_home',
-        'menu' => array (
+        'menu' => array(
             'text' => gettext('MSs'),
             'title' => gettext("List of Members of the Senedd (MSs)")
         ),
         'title' => '',
         'url' => 'mss/'
     ),
-    'ms' => array (
+    'ms' => array(
         'parent' => 'mss',
         'title' => gettext('Find your MS'),
         'url' => 'ms/'
     ),
-    'yourms' => array (
-        'menu'			=> array (
+    'yourms' => array(
+        'menu'			=> array(
             'text'		=> gettext('Your MSs'),
             'title'		=> gettext("Find out about your Members of the Welsh Parliament")
         ),
@@ -1053,9 +1053,9 @@ 
         'url'			=> 'ms/'
     ),
 
-    'seneddoverview' => array (
+    'seneddoverview' => array(
         'parent' => 'wales_home',
-        'menu' => array (
+        'menu' => array(
             'text' => gettext('Record'),
             'title' => gettext("Overview of the Senedd debates")
         ),
@@ -1063,23 +1063,23 @@ 
         'rss' => 'rss/senedd.rss',
         'url' => 'senedd/'
     ),
-    'senedddebate'  => array (
+    'senedddebate'  => array(
         'parent' => 'senedddebatesfront',
         'url' => 'senedd/',
-        'session_vars' => array ('id'),
+        'session_vars' => array('id'),
     ),
-    'senedddebates'  => array (
+    'senedddebates'  => array(
         'parent' => 'senedddebatesfront',
         'url' => 'senedd/',
-        'session_vars' => array ('id'),
+        'session_vars' => array('id'),
     ),
-    'senedddebatesday' => array (
+    'senedddebatesday' => array(
         'parent' => 'senedddebatesfront',
-        'session_vars' => array ('d'),
+        'session_vars' => array('d'),
         'url' => 'senedd/',
     ),
-    'senedddebatesfront' => array (
-        'menu' => array (
+    'senedddebatesfront' => array(
+        'menu' => array(
             'text' => 'Debates',
             'title' => gettext("Senedd debates")
         ),
@@ -1088,29 +1088,29 @@ 
         'rss' => 'rss/senedd.rss',
         'url' => 'senedd/'
     ),
-    'senedddebatesyear' => array (
+    'senedddebatesyear' => array(
         'parent' => 'senedddebatesfront',
         'url' => 'senedd/'
     ),
 
     /* 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"
         ),
@@ -1119,23 +1119,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'			=> ''
         ),
@@ -1144,22 +1144,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"
         ),
@@ -1172,13 +1172,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',
         ),
@@ -1195,8 +1195,8 @@ 
         'title' => 'Your representative',
         'url' => 'your/',
     ),
-    'yourmp' => array (
-        'menu'			=> array (
+    'yourmp' => array(
+        'menu'			=> array(
             'text'			=> gettext('Your MP'),
             'title'			=> gettext("Find out about your Member of Parliament")
         ),
@@ -1205,8 +1205,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"
         ),
@@ -1214,8 +1214,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"
         ),
@@ -1224,8 +1224,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"
         ),
@@ -1241,38 +1241,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.
 
-$section = array (
+$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'
     )