mysociety / theyworkforyou

www/docs/postcode/index.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 
 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
 if (!validate_postcode($pc)) {
-    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+    twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
     postcode_error("Sorry, " . _htmlentities($pc) . " isn't a valid postcode");
 }
 
@@ -60,7 +60,7 @@ 
     exit;
 }
 
-function fetch_mp($pc, $constituencies, $house=null) {
+function fetch_mp($pc, $constituencies, $house = null) {
     global $THEUSER;
     $args = array('constituency' => $constituencies['WMC']);
     if ($house) {
@@ -68,7 +68,7 @@ 
     }
     try {
         $MEMBER = new MEMBER($args);
-    } catch (MySociety\TheyWorkForYou\MemberException $e){
+    } catch (MySociety\TheyWorkForYou\MemberException $e) {
         postcode_error($e->getMessage());
     }
     if ($MEMBER->person_id()) {

www/includes/easyparliament/page.php

Spacing +33 added lines, -33 removed lines

@@ -19,7 +19,7 @@ 
     public $within_stripe_sidebar = false;
 
     public function page_start() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->checkForAdmin();
             $this->displayHeader();
         }
@@ -32,7 +32,7 @@ 
 
         $data = $h->data;
         $data = array_merge($u->data, $data);
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
         $data['banner_text'] = '';
@@ -52,7 +52,7 @@ 
                 $THISPAGE = new \MySociety\TheyWorkForYou\Url($this_page);
 
                 $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
+                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none')));
 
                 $text = "<a href=\"" . $LOGINURL->generate() . '">' . gettext('You’d better sign in!') . '</a>';
             } else {
@@ -67,7 +67,7 @@ 
     }
 
     public function page_end() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->page_start();
         }
 
@@ -101,7 +101,7 @@ 
         }
     }
 
-    public function stripe_start($type='side', $id='', $extra_class = '') {
+    public function stripe_start($type = 'side', $id = '', $extra_class = '') {
         // $type is one of:
         //  'full' - a full width div
         //  'side' - a white stripe with a coloured sidebar.
@@ -134,7 +134,7 @@ 
     }
 
 
-    public function stripe_end ($contents = array(), $extra = '') {
+    public function stripe_end($contents = array(), $extra = '') {
         // $contents is an array containing 0 or more hashes.
         // Each hash has two values, 'type' and 'content'.
         // 'Type' could be one of these:
@@ -237,7 +237,7 @@ 
     public function include_sidebar_template($sidebarname) {
         global $this_page, $DATA;
 
-            $sidebarpath = INCLUDESPATH.'easyparliament/sidebars/'.$sidebarname.'.php';
+            $sidebarpath = INCLUDESPATH . 'easyparliament/sidebars/' . $sidebarname . '.php';
 
             if (file_exists($sidebarpath)) {
                 include $sidebarpath;
@@ -245,7 +245,7 @@ 
     }
 
 
-    public function block_start($data=array()) {
+    public function block_start($data = array()) {
         // Starts a 'block' div, used mostly on the home page,
         // on the MP page, and in the sidebars.
         // $data is a hash like this:
@@ -392,7 +392,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message = array (
+            $message = array(
                 'text' => $message
             );
         }
@@ -400,13 +400,13 @@ 
         // if the page has started then we're most likely in an old school page
         // so we should just print out the error, otherwise stick it in the error
         // global which will then be displayed by the header template
-        if ( $this->page_started() ) {
+        if ($this->page_started()) {
             $this->message($message, 'error');
         } else {
-            if ( !isset($page_errors) ) {
+            if (!isset($page_errors)) {
                 $page_errors = array();
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -423,7 +423,7 @@ 
     }
 
 
-    public function message($message, $class='') {
+    public function message($message, $class = '') {
         // Generates a very simple but common page content.
         // Used for when a user logs out, or votes, or any simple thing
         // where there's a little message and probably a link elsewhere.
@@ -513,7 +513,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -568,7 +568,7 @@ 
 
         if (isset($nextprev['up'])) {
 
-            $uplink = '<span class="up"><a href="' .  $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
+            $uplink = '<span class="up"><a href="' . $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
             if (get_http_var('s')) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this_page);
                 $uplink .= '<br><a href="' . $URL->generate() . '">' . gettext('Remove highlighting') . '</a>';
@@ -583,7 +583,7 @@ 
             $next = $nextprev['next'];
 
             if (isset($next['url'])) {
-                $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
+                $nextlink = '<a href="' . $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
             } else {
                 $nextlink = $next['body'] . ' &raquo;';
             }
@@ -600,7 +600,7 @@ 
     }
 
 
-    public function search_form($value='') {
+    public function search_form($value = '') {
         global $SEARCHENGINE;
         // Search box on the search page.
         // If $value is set then it will be displayed in the form.
@@ -630,7 +630,7 @@ 
             }
 
         echo '<div class="mainsearchbox">';
-        if ($wtt<2) {
+        if ($wtt < 2) {
                 echo '<form action="', $URL->generate(), '" method="get">';
                 if (get_http_var('o')) {
                     echo '<input type="hidden" name="o" value="', _htmlentities(get_http_var('o')), '">';
@@ -663,16 +663,16 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>' . gettext('Sorted by relevance') . '</strong>';
                 } else {
                 printf(gettext("<a href='%s'>Sort by relevance</a>"), $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
+                if ($ordering == 'd') {
                 print '<strong>' . gettext('Sorted by date:') . ' ' . gettext('newest') . '</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">' . gettext('oldest') . '</a>';
-                } elseif ($ordering=='o') {
+                } elseif ($ordering == 'o') {
                 print '<strong>' . gettext('Sorted by date:') . '</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">' . gettext('newest') . '</a> / <strong>' . gettext('oldest') . '</strong>';
                 } else {
                 print gettext("Sort by date:") . ' ';
@@ -685,7 +685,7 @@ 
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>' . gettext('Use by person') . '</strong>';
             } else {
                 printf('<a href="%s">', $orderUrl->generate('html', array('o'=>'p')));
@@ -706,7 +706,7 @@ 
         echo '</form> </div>';
     }
 
-    public function login_form ($errors = array()) {
+    public function login_form($errors = array()) {
         // Used for /user/login/ and /user/prompt/
         // $errors is a hash of potential errors from a previous log in attempt.
         ?>
@@ -809,7 +809,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
     // Print out a nice list of lettered links to glossary pages
 
-        $letters = array ();
+        $letters = array();
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -840,14 +840,14 @@ 
                     <div class="letters">
                         <ul>
     <?php
-        for ($n=0; $n<13; $n++) {
+        for ($n = 0; $n < 13; $n++) {
             print $letters[$n];
         }
         ?>
                         </ul>
                         <ul>
     <?php
-        for ($n=13; $n<26; $n++) {
+        for ($n = 13; $n < 26; $n++) {
             print $letters[$n];
         }
         ?>
@@ -866,12 +866,12 @@ 
 
         // add some extra controls for the administrators
         if ($this_page == "admin_glossary") {
-            print "<a id=\"gl".$term['glossary_id']."\"></a>";
+            print "<a id=\"gl" . $term['glossary_id'] . "\"></a>";
             print "<h3>" . $term['title'] . "</h3>";
             $URL = new \MySociety\TheyWorkForYou\Url('admin_glossary');
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
-            $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
+            $admin_links = "<br><small><a href=\"" . $delete_url . "\">delete</a></small>";
         } else {
             $admin_links = "";
         }
@@ -892,9 +892,9 @@ 
             // Add a direct search link for current glossary item
             $URL = new \MySociety\TheyWorkForYou\Url('search');
             // remember to quote the term for phrase matching in search
-            $URL->insert(array('s' => '"'.$term['title'].'"'));
+            $URL->insert(array('s' => '"' . $term['title'] . '"'));
             $search_url = $URL->generate();
-            printf ("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
+            printf("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
         }
     }
 
@@ -969,7 +969,7 @@ 
 
             // Generate all the page links.
             $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-            $URL->insert( array('wtt' => get_http_var('wtt')) );
+            $URL->insert(array('wtt' => get_http_var('wtt')));
             if (isset($pagedata['s'])) {
                 # XXX: Should be taken out in *one* place, not here + search_form etc.
                 $value = $pagedata['s'];
@@ -1107,7 +1107,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
+                $tabledata['rows'][] = array(
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1189,7 +1189,7 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
+        $pages = array('admin_home',
                 'admin_comments', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',

www/includes/easyparliament/hansardlist.php

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

@@ -561,7 +561,7 @@ 
 
             // The '!= NULL' bit is needed otherwise I was getting errors
             // when displaying the first day of debates.
-            if ($q && $q['hdate'] != NULL) {
+            if ($q && $q['hdate'] != null) {
 
                 $URL->insert( array( 'd' => $q['hdate'] ) );
 
@@ -1410,7 +1410,7 @@ 
                             WHERE	major = :major",
                 array(':major' => $this->major))->first();
 
-            if ($q && $q['hdate'] != NULL) {
+            if ($q && $q['hdate'] != null) {
                 $recentdate = $q['hdate'];
             } else {
                 $PAGE->error_message("Couldn't find the most recent date");
@@ -1725,7 +1725,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query ("select $fields
                         FROM 	hansard
                         $join
                         WHERE $where

Spacing +220 added lines, -220 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/searchengine.php";
-include_once INCLUDESPATH."easyparliament/searchlog.php";
+include_once INCLUDESPATH . "easyparliament/searchengine.php";
+include_once INCLUDESPATH . "easyparliament/searchlog.php";
 
 /*
 
@@ -53,7 +53,7 @@ 
 class HANSARDLIST {
     // This will be used to cache information about speakers on this page
     // so we don't have to keep fetching the same data from the DB.
-    public $speakers = array ();
+    public $speakers = array();
     /*
     $this->speakers[ $person_id ] = array (
         "name" => $name,
@@ -66,7 +66,7 @@ 
 
     // This will be used to cache mappings from epobject_id to gid,
     // so we don't have to continually fetch the same data in get_hansard_data().
-    public $epobjectid_to_gid = array ();
+    public $epobjectid_to_gid = array();
     /*
     $this->epobjectid_to_gid[ $epobject_id ] => $gid;
     */
@@ -114,7 +114,7 @@ 
 
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
 
         // $view is what we're viewing by:
         // 	'gid' is the gid of a hansard object,
@@ -142,17 +142,17 @@ 
             return false;
         }
 
-        $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid');
+        $validviews = array('calendar', 'date', 'gid', 'person', 'search', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid');
         if (in_array($view, $validviews)) {
 
             // What function do we call for this view?
-            $function = '_get_data_by_'.$view;
+            $function = '_get_data_by_' . $view;
             // Get all the data that's to be rendered.
             $data = $this->$function($args);
 
         } else {
             // Don't have a valid $view.
-            $PAGE->error_message ("You haven't specified a view type.");
+            $PAGE->error_message("You haven't specified a view type.");
             return false;
         }
 
@@ -173,7 +173,7 @@ 
 
 
 
-    public function render($view, $data, $format='html') {
+    public function render($view, $data, $format = 'html') {
         // Once we have the data that's to be rendered,
         // include the template.
 
@@ -182,7 +182,7 @@ 
             return $data;
         }
 
-        include (INCLUDESPATH."easyparliament/templates/$format/hansard_$view" . ".php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/hansard_$view" . ".php");
         return true;
 
     }
@@ -227,13 +227,13 @@ 
             $hdate = $q['hdate'];
             if ($hdate) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
-                $URL->insert( array('d'=>$hdate) );
+                $URL->insert(array('d'=>$hdate));
 
                 // Work out a timestamp which is handy for comparing to now.
                 list($year, $month, $date) = explode('-', $hdate);
-                $timestamp = gmmktime (0, 0, 0, $month, $date, $year);
+                $timestamp = gmmktime(0, 0, 0, $month, $date, $year);
 
-                $data = array (
+                $data = array(
                     'hdate'		=> $hdate,
                     'timestamp'	=> $timestamp,
                     'listurl'	=> $URL->generate()
@@ -267,7 +267,7 @@ 
         // Pass it an array of data about an item and it will return an
         // array of data about the item's section heading.
 
-        twfy_debug (get_class($this), "getting an item's section");
+        twfy_debug(get_class($this), "getting an item's section");
 
         if ($itemdata['htype'] != '10') {
 
@@ -276,11 +276,11 @@ 
             // so get the section info above this item.
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true
                 ),
-                'where' => array (
+                'where' => array(
                     'hansard.epobject_id=' => $itemdata['section_id']
                 )
             );
@@ -307,21 +307,21 @@ 
         // Pass it an array of data about an item and it will return an
         // array of data about the item's subsection heading.
 
-        twfy_debug (get_class($this), "getting an item's subsection");
+        twfy_debug(get_class($this), "getting an item's subsection");
 
         // What we return.
-        $subsectiondata = array ();
+        $subsectiondata = array();
 
         if ($itemdata['htype'] == '12' || $itemdata['htype'] == '13' || $itemdata['htype'] == '14') {
             // This item is a speech or procedural, so get the
             // subsection info above this item.
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true
                 ),
-                'where' => array (
+                'where' => array(
                     'hansard.epobject_id=' => $itemdata['subsection_id']
                 )
             );
@@ -349,7 +349,7 @@ 
         // Pass it an array of item info, of a section/subsection, and this will return
         // data for the next/prev items.
 
-        twfy_debug (get_class($this), "getting next/prev items");
+        twfy_debug(get_class($this), "getting next/prev items");
 
         // What we return.
         $nextprevdata = array();
@@ -415,8 +415,8 @@ 
             $wherearr['hansard.epobject_id='] = $prev_item_id;
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'speaker' => true
                 ),
@@ -431,7 +431,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the prev (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['prev'] = array (
+                    $nextprevdata['prev'] = array(
                         'body'		=> sprintf(gettext("Previous %s"), $thing),
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
@@ -444,7 +444,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['prev'] = array (
+                    $nextprevdata['prev'] = array(
                         'body'		=> gettext('Previous speaker'),
                         'url'		=> $prevdata[0]['commentsurl'],
                         'title'		=> $title
@@ -460,8 +460,8 @@ 
             $wherearr['hansard.epobject_id='] = $next_item_id;
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'speaker' => true
                 ),
@@ -475,7 +475,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the next (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['next'] = array (
+                    $nextprevdata['next'] = array(
                         'body'		=> sprintf(gettext("Next %s"), $thing),
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
@@ -488,7 +488,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['next'] = array (
+                    $nextprevdata['next'] = array(
                         'body'		=> gettext('Next speaker'),
                         'url'		=> $nextdata[0]['commentsurl'],
                         'title'		=> $title
@@ -532,14 +532,14 @@ 
         // containing the next/prev dates that contain items from
         // $this->major of hansard object.
 
-        twfy_debug (get_class($this), "getting next/prev dates");
+        twfy_debug(get_class($this), "getting next/prev dates");
 
         // What we return.
-        $nextprevdata = array ();
+        $nextprevdata = array();
 
         $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
 
-        $looper = array ("next", "prev");
+        $looper = array("next", "prev");
 
         foreach ($looper as $n => $nextorprev) {
 
@@ -563,7 +563,7 @@ 
             // when displaying the first day of debates.
             if ($q && $q['hdate'] != NULL) {
 
-                $URL->insert( array( 'd' => $q['hdate'] ) );
+                $URL->insert(array('d' => $q['hdate']));
 
                 if ($nextorprev == 'next') {
                     $body = gettext('Next day');
@@ -573,7 +573,7 @@ 
 
                 $title = format_date($q['hdate'], SHORTDATEFORMAT);
 
-                $nextprevdata[$nextorprev] = array (
+                $nextprevdata[$nextorprev] = array(
                     'hdate' => $q['hdate'],
                     'url' => $URL->generate(),
                     'body' => $body,
@@ -587,7 +587,7 @@ 
         $thing = $hansardmajors[$this->major]['plural'];
         $URL->insert(array('y'=>$year));
 
-        $nextprevdata['up'] = array (
+        $nextprevdata['up'] = array(
             'body' 	=> sprintf(gettext("All of %s’s %s"), $year, $thing),
             'title'	=> '',
             'url' 	=> $URL->generate()
@@ -608,19 +608,19 @@ 
         if (isset($args['date'])) {
             $date = $args['date'];
         } else {
-            $PAGE->error_message ("Sorry, we don't have a date.");
+            $PAGE->error_message("Sorry, we don't have a date.");
             return false;
         }
 
         if (!preg_match("/^(\d\d\d\d)-(\d{1,2})-(\d{1,2})$/", $date, $matches)) {
-            $PAGE->error_message ("Sorry, '" . _htmlentities($date) . "' isn't of the right format (YYYY-MM-DD).");
+            $PAGE->error_message("Sorry, '" . _htmlentities($date) . "' isn't of the right format (YYYY-MM-DD).");
             return false;
         }
 
         list(, $year, $month, $day) = $matches;
 
         if (!checkdate($month, $day, $year)) {
-            $PAGE->error_message ("Sorry, '" . _htmlentities($date) . "' isn't a valid date.");
+            $PAGE->error_message("Sorry, '" . _htmlentities($date) . "' isn't a valid date.");
             return false;
         }
 
@@ -638,29 +638,29 @@ 
         global $PAGE;
 
         if (!isset($args['gid']) && $args['gid'] == '') {
-            $PAGE->error_message ("Sorry, we don't have an item gid.");
+            $PAGE->error_message("Sorry, we don't have an item gid.");
             return false;
         }
 
 
         // Get all the data just for this epobject_id.
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'body' => true,
                 'speaker' => true,
                 'comment' => true,
                 'votes' => true
             ),
-            'where' => array (
+            'where' => array(
                 // Need to add the 'uk.org.publicwhip/debate/' or whatever on before
                 // looking in the DB.
                 'gid=' => $this->gidprefix . $args['gid']
             )
         );
 
-        twfy_debug (get_class($this), "looking for redirected gid");
+        twfy_debug(get_class($this), "looking for redirected gid");
         $gid = $this->gidprefix . $args['gid'];
-        $q = $this->db->query ("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid))->first();
+        $q = $this->db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid))->first();
         if (!$q) {
             $itemdata = $this->_get_hansard_data($input);
         } else {
@@ -668,10 +668,10 @@ 
                 $gid = $q['gid_to'];
                 $q = $this->db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid))->first();
             } while ($q);
-            twfy_debug (get_class($this), "found redirected gid $gid" );
+            twfy_debug(get_class($this), "found redirected gid $gid");
             $input['where'] = array('gid=' => $gid);
             $itemdata = $this->_get_hansard_data($input);
-            if (count($itemdata) > 0 ) {
+            if (count($itemdata) > 0) {
                 throw new RedirectException(fix_gid_from_db($gid));
             }
         }
@@ -685,9 +685,9 @@ 
             $this->check_gid_change($args['gid'], 'a', '');
 
             if (substr($args['gid'], -1) == 'L') {
-                $letts = array('a','b','c','d','e');
-                for ($i=0; $i<4; $i++) {
-                    $this->check_gid_change($args['gid'], $letts[$i], $letts[$i+1]);
+                $letts = array('a', 'b', 'c', 'd', 'e');
+                for ($i = 0; $i < 4; $i++) {
+                    $this->check_gid_change($args['gid'], $letts[$i], $letts[$i + 1]);
                 }
             }
 
@@ -720,7 +720,7 @@ 
             #	$u = $q['source_url'];
             #	$u = '<br><a href="'. $u . '">' . $u . '</a>';
             #}
-            $PAGE->error_message ("Sorry, there is no Hansard object with a gid of '" . _htmlentities($args['gid']) . "'.");
+            $PAGE->error_message("Sorry, there is no Hansard object with a gid of '" . _htmlentities($args['gid']) . "'.");
             return false;
         }
 
@@ -729,8 +729,8 @@ 
     }
 
     private function check_gid_change($gid, $from, $to) {
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'body' => true,
                 'speaker' => true,
                 'comment' => true,
@@ -754,10 +754,10 @@ 
 
         global $DATA, $this_page;
 
-        twfy_debug (get_class($this), "getting data by date");
+        twfy_debug(get_class($this), "getting data by date");
 
         // Where we'll put all the data we want to render.
-        $data = array ();
+        $data = array();
 
         $date = $this->_validate_date($args);
 
@@ -771,13 +771,13 @@ 
 
             // Get all the sections for this date.
             // Then for each of those we'll get the subsections and rows.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'comment' => true,
                     'excerpt' => true
                 ),
-                'where' => array (
+                'where' => array(
                     'hdate=' => "$date",
                     'htype=' => '10',
                     'major=' => $this->major
@@ -793,20 +793,20 @@ 
                 $data['rows'] = array();
 
                 $num_sections = count($sections);
-                for ($n=0; $n<$num_sections; $n++) {
+                for ($n = 0; $n < $num_sections; $n++) {
                     // For each section on this date, get the subsections within it.
 
                     // Get all the section data.
                     $sectionrow = $this->_get_section($sections[$n]);
 
                     // Get the subsections within the section.
-                    $input = array (
-                        'amount' => array (
+                    $input = array(
+                        'amount' => array(
                             'body' => true,
                             'comment' => true,
                             'excerpt' => true
                         ),
-                        'where' => array (
+                        'where' => array(
                             'section_id='	=> $sections[$n]['epobject_id'],
                             'htype='		=> '11',
                             'major='		=> $this->major
@@ -817,10 +817,10 @@ 
                     $rows = $this->_get_hansard_data($input);
 
                     // Put the section at the top of the rows array.
-                    array_unshift ($rows, $sectionrow);
+                    array_unshift($rows, $sectionrow);
 
                     // Add the section heading and the subsections to the full list.
-                    $data['rows'] = array_merge ($data['rows'], $rows);
+                    $data['rows'] = array_merge($data['rows'], $rows);
                 }
             }
 
@@ -856,9 +856,9 @@ 
             $major = '';
         }
 
-        $data = array ();
+        $data = array();
 
-        $q = $this->db->query ("SELECT DISTINCT(hdate)
+        $q = $this->db->query("SELECT DISTINCT(hdate)
                         FROM 	hansard
                         $major
                         ORDER BY hdate DESC
@@ -891,7 +891,7 @@ 
         $data = array();
 
         if (!isset($args['person_id'])) {
-            $PAGE->error_message ("Sorry, we need a valid person ID.");
+            $PAGE->error_message("Sorry, we need a valid person ID.");
             return $data;
         }
 
@@ -931,7 +931,7 @@ 
 
         $speeches = array();
         foreach ($q as $row) {
-            $speech = array (
+            $speech = array(
                 'subsection_id' => $row['subsection_id'],
                 'section_id' => $row['section_id'],
                 'htype' => $row['htype'],
@@ -948,7 +948,7 @@ 
             // Cache parent id to speed up _get_listurl
             $this->epobjectid_to_gid[$row['subsection_id']] = fix_gid_from_db($row['gid_subsection']);
 
-            $url_args = array ('p' => $row['person_id']);
+            $url_args = array('p' => $row['person_id']);
             $speech['listurl'] = $this->_get_listurl($speech, $url_args);
             $speeches[] = $speech;
         }
@@ -956,7 +956,7 @@ 
         if (count($speeches) > 0) {
             // Get the subsection texts.
             $num_speeches = count($speeches);
-            for ($n=0; $n<$num_speeches; $n++) {
+            for ($n = 0; $n < $num_speeches; $n++) {
                 $thing = $hansardmajors[$speeches[$n]['major']]['title'];
                 // Add the parent's body on...
                 $speeches[$n]['parent']['body'] = $speeches[$n]['body_section'] . ' | ' . $thing;
@@ -987,7 +987,7 @@ 
             // eg, by doing filter_user_input($s, 'strict');
             $searchstring = $args['s'];
         } else {
-            if ( isset($args['exceptions']) ) {
+            if (isset($args['exceptions'])) {
                 throw new \Exception('No search string provided.');
             } else {
                 $PAGE->error_message("No search string");
@@ -996,14 +996,14 @@ 
         }
 
         // What we'll return.
-        $data = array ();
+        $data = array();
 
         $data['info']['s'] = $args['s'];
 
         // Allows us to specify how many results we want
         // Mainly for glossary term adding
         if (isset($args['num']) && is_numeric($args['num'])) {
-            $results_per_page = (int)$args['num'];
+            $results_per_page = (int) $args['num'];
         } else {
             $results_per_page = 20;
         }
@@ -1031,20 +1031,20 @@ 
         global $SEARCHENGINE;
 
         // For Xapian's equivalent of an SQL LIMIT clause.
-        $first_result = ($page-1) * $results_per_page;
+        $first_result = ($page - 1) * $results_per_page;
         $data['info']['first_result'] = $first_result + 1; // Take account of LIMIT's 0 base.
 
         // Get the gids from Xapian
         $sort_order = 'date';
         if (isset($args['o'])) {
-            if ($args['o']=='d') {
+            if ($args['o'] == 'd') {
                 $sort_order = 'newest';
             }
-            if ($args['o']=='o') {
+            if ($args['o'] == 'o') {
                 $sort_order = 'oldest';
-            } elseif ($args['o']=='c') {
+            } elseif ($args['o'] == 'c') {
                 $sort_order = 'created';
-            } elseif ($args['o']=='r') {
+            } elseif ($args['o'] == 'r') {
                 $sort_order = 'relevance';
             }
         }
@@ -1056,7 +1056,7 @@ 
 
         // Log this query so we can improve them - if it wasn't a "popular
         // query" link
-        if (! isset($args['pop']) or $args['pop'] != 1) {
+        if (!isset($args['pop']) or $args['pop'] != 1) {
             global $SEARCHLOG;
             $SEARCHLOG->add(
             array('query' => $searchstring,
@@ -1071,7 +1071,7 @@ 
 
         $SEARCHENGINE->run_search($first_result, $results_per_page, $sort_order);
         $gids = $SEARCHENGINE->get_gids();
-        if ($sort_order=='created') {
+        if ($sort_order == 'created') {
             $createds = $SEARCHENGINE->get_createds();
         }
         $relevances = $SEARCHENGINE->get_relevances();
@@ -1087,13 +1087,13 @@ 
 
         // Cycle through each result, munge the data, get more, and put it all in $data.
         $num_gids = count($gids);
-        for ($n=0; $n<$num_gids; $n++) {
+        for ($n = 0; $n < $num_gids; $n++) {
             $gid = $gids[$n];
             $relevancy = $relevances[$n];
             $collapsed = $SEARCHENGINE->collapsed[$n];
-            if ($sort_order=='created') {
+            if ($sort_order == 'created') {
                 #$created = substr($createds[$n], 0, strpos($createds[$n], ':'));
-                if ($createds[$n]<$args['threshold']) {
+                if ($createds[$n] < $args['threshold']) {
                     $data['info']['total_results'] = $n;
                     break;
                 }
@@ -1162,7 +1162,7 @@ 
                 , array(':gid' => $gid));
 
                 if ($q->rows() > 1) {
-                    if ( $isset($args['exceptions']) ) {
+                    if ($isset($args['exceptions'])) {
                         throw new \Exception("Got more than one row getting data for $gid.");
                     } else {
                         $PAGE->error_message("Got more than one row getting data for $gid");
@@ -1183,7 +1183,7 @@ 
                 //////////////////////////
                 // 2. Create the URL to link to this bit of text.
 
-                $id_data = array (
+                $id_data = array(
                     'major'            => $itemdata['major'],
                     'minor'            => $itemdata['minor'],
                     'htype'         => $itemdata['htype'],
@@ -1194,7 +1194,7 @@ 
 
                 // We append the query onto the end of the URL as variable 's'
                 // so we can highlight them on the debate/wrans list page.
-                $url_args = array ('s' => $searchstring);
+                $url_args = array('s' => $searchstring);
 
                 $itemdata['listurl'] = $this->_get_listurl($id_data, $url_args, $encode);
 
@@ -1247,14 +1247,14 @@ 
                     } else {
                         $listurl = '';
                     }
-                    $itemdata['parent'] = array (
+                    $itemdata['parent'] = array(
                         'body' => $body,
                         'listurl' => $listurl
                     );
                     if ($itemdata['htype'] == 11) {
                         # Search result was a subsection heading; fetch the first entry
                         # from the wrans/wms to show under the heading
-                        $input = array (
+                        $input = array(
                             'amount' => array(
                                 'body' => true,
                                 'speaker' => true
@@ -1313,7 +1313,7 @@ 
         $extract = trim_characters(html_entity_decode($extract), $startpos, $length_of_extract);
 
         // Highlight search words
-        $extract = mb_encode_numericentity( htmlentities($extract, ENT_QUOTES, 'UTF-8'), [0x80, 0x10FFFF, 0, ~0], 'UTF-8');
+        $extract = mb_encode_numericentity(htmlentities($extract, ENT_QUOTES, 'UTF-8'), [0x80, 0x10FFFF, 0, ~0], 'UTF-8');
         $extract = $SEARCHENGINE->highlight($extract);
 
         return $extract;
@@ -1498,7 +1498,7 @@ 
 
         $params[':major'] = $this->major;
         $params[':firstdate'] = $firstyear . '-' . $firstmonth . '-01';
-        $q =  $this->db->query("SELECT 	DISTINCT(hdate) AS hdate
+        $q = $this->db->query("SELECT 	DISTINCT(hdate) AS hdate
                         FROM		hansard
                         WHERE		major = :major
                         AND			hdate >= :firstdate
@@ -1564,9 +1564,9 @@ 
             if ($action == 'recentyear') {
                 // Assuming there will be a previous year!
 
-                $YEARURL->insert(array('y'=> $firstyear-1));
+                $YEARURL->insert(array('y'=> $firstyear - 1));
 
-                $nextprev['prev'] = array (
+                $nextprev['prev'] = array(
                     'body' => 'Previous year',
                     'title' => $firstyear - 1,
                     'url' => $YEARURL->generate()
@@ -1575,8 +1575,8 @@ 
             } else {
                 // action is 'year'.
 
-                $nextprev['prev'] = array ('body' => 'Previous year');
-                $nextprev['next'] = array ('body' => 'Next year');
+                $nextprev['prev'] = array('body' => 'Previous year');
+                $nextprev['next'] = array('body' => 'Next year');
 
                 $q = $this->db->query("SELECT DATE_FORMAT(hdate, '%Y') AS year
                             FROM hansard WHERE major = :major
@@ -1665,14 +1665,14 @@ 
         // $input['limit'] as a string for the $limit clause, eg '21,20'.
 
         $amount 		= isset($input['amount']) ? $input['amount'] : array();
-        $wherearr 		= isset($input['where']) ? $input['where'] : array();
+        $wherearr = isset($input['where']) ? $input['where'] : array();
         $order 			= isset($input['order']) ? $input['order'] : '';
         $limit 			= isset($input['limit']) ? $input['limit'] : '';
 
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr = array (
-            'hansard' => array ('epobject_id', 'htype', 'gid', 'hpos', 'section_id', 'subsection_id', 'hdate', 'htime', 'source_url', 'major', 'minor', 'colnum')
+        $fieldsarr = array(
+            'hansard' => array('epobject_id', 'htype', 'gid', 'hpos', 'section_id', 'subsection_id', 'hdate', 'htime', 'source_url', 'major', 'minor', 'colnum')
         );
 
         $params = array();
@@ -1684,23 +1684,23 @@ 
         if ((isset($amount['body']) && $amount['body'] == true) ||
             (isset($amount['comment']) && $amount['comment'] == true)
             ) {
-            $fieldsarr['epobject'] = array ('body');
+            $fieldsarr['epobject'] = array('body');
             $join = 'LEFT OUTER JOIN epobject ON hansard.epobject_id = epobject.epobject_id';
         } else {
             $join = '';
         }
 
 
-        $fieldsarr2 = array ();
+        $fieldsarr2 = array();
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
-                $fieldsarr2[] = $table.'.'.$field;
+                $fieldsarr2[] = $table . '.' . $field;
             }
         }
         $fields = implode(', ', $fieldsarr2);
 
-        $wherearr2 = array ();
+        $wherearr2 = array();
         // Construct the $where clause.
         $i = 0;
         foreach ($wherearr as $key => $val) {
@@ -1708,7 +1708,7 @@ 
             $wherearr2[] = "$key :where$i";
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
 
         if ($order != '') {
@@ -1726,7 +1726,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	hansard
                         $join
                         WHERE $where
@@ -1751,23 +1751,23 @@ 
             if (isset($item['gid'])) {
                 // Remove the "uk.org.publicwhip/blah/" from the gid:
                 // (In includes/utility.php)
-                $item['gid'] = fix_gid_from_db( $item['gid'] );
+                $item['gid'] = fix_gid_from_db($item['gid']);
             }
 
             // Add mentions if (a) it's a question in the written
             // answer section or (b) it's in the official reports
             // and the body text ends in a bracketed SPID.
-            if (($this->major && $hansardmajors[$this->major]['page']=='spwrans') && ($item['htype'] == '12' && $item['minor'] == '1')) {
+            if (($this->major && $hansardmajors[$this->major]['page'] == 'spwrans') && ($item['htype'] == '12' && $item['minor'] == '1')) {
                 // Get out the SPID:
-                if ( preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $item['gid'], $m) ) {
+                if (preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $item['gid'], $m)) {
                     $item['mentions'] = $this->_get_mentions($m[1]);
                 }
             }
 
             // The second case (b):
-            if (($this->major && $hansardmajors[$this->major]['page']=='spdebates') && isset($item['body'])) {
-                $stripped_body = preg_replace('/<[^>]+>/ms','',$item['body']);
-                if ( preg_match('/\((S\d+\w+-\d+)\)/ms',$stripped_body,$m) ) {
+            if (($this->major && $hansardmajors[$this->major]['page'] == 'spdebates') && isset($item['body'])) {
+                $stripped_body = preg_replace('/<[^>]+>/ms', '', $item['body']);
+                if (preg_match('/\((S\d+\w+-\d+)\)/ms', $stripped_body, $m)) {
                     $item['mentions'] = $this->_get_mentions($m[1]);
                 }
             }
@@ -1780,7 +1780,7 @@ 
             // Get the number of items within a section or subsection.
             // It could be that we can do this in the main query?
             // Not sure.
-            if ( ($this->major && $hansardmajors[$this->major]['type']=='debate') && ($item['htype'] == '10' || $item['htype'] == '11') ) {
+            if (($this->major && $hansardmajors[$this->major]['type'] == 'debate') && ($item['htype'] == '10' || $item['htype'] == '11')) {
 
                 if ($item['htype'] == '10') {
                     // Section - get a count of items within this section that
@@ -1858,7 +1858,7 @@ 
             // 'commentsurl' is the URL of the item on its own page, with comments.
 
             // All the things we need to work out a listurl!
-            $item_data = array (
+            $item_data = array(
                 'major'			=> $this->major,
                 'minor' 		=> $item['minor'],
                 'htype' 		=> $item['htype'],
@@ -1891,11 +1891,11 @@ 
                 $item['htype'] == '12') {
                 // Debate speech or written answers (not questions).
 
-                $item['votes'] = $this->_get_votes( $item['epobject_id'] );
+                $item['votes'] = $this->_get_votes($item['epobject_id']);
             }
 
             // Get the speaker for this item, if applicable.
-            if ( (isset($amount['speaker']) && $amount['speaker'] == true) &&
+            if ((isset($amount['speaker']) && $amount['speaker'] == true) &&
                 $item['person_id'] != '') {
 
                 $item['speaker'] = $this->_get_speaker($item['person_id'], $item['hdate'], $item['htime'], $item['major']);
@@ -1906,7 +1906,7 @@ 
             if (isset($amount['comment']) && $amount['comment'] == true) {
 
                 // All the things we need to get the comment data.
-                $item_data = array (
+                $item_data = array(
                     'htype' => $item['htype'],
                     'epobject_id' => $item['epobject_id']
                 );
@@ -1979,7 +1979,7 @@ 
     }
 
 
-    public function _get_listurl ($id_data, $url_args=array(), $encode='html') {
+    public function _get_listurl($id_data, $url_args = array(), $encode = 'html') {
         global $hansardmajors;
         // Generates an item's listurl - this is the 'contextual' url
         // for an item, in the full list view with an anchor (if appropriate).
@@ -2009,7 +2009,7 @@ 
                 $DATA->set_page_metadata('pbc_clause', 'url', 'pbc/' . $this->url . $id);
                 $LISTURL->remove(array('id'));
             } else {
-                $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
+                $LISTURL->insert(array('id' => $id_data['gid']));
             }
         } else {
             // A debate speech or question/answer, etc.
@@ -2022,10 +2022,10 @@ 
             // Find the gid of this item's (sub)section.
             $parent_gid = '';
 
-            if (isset($this->epobjectid_to_gid[ $parent_epobject_id ])) {
+            if (isset($this->epobjectid_to_gid[$parent_epobject_id])) {
                 // We've previously cached the gid for this epobject_id, so use that.
 
-                $parent_gid = $this->epobjectid_to_gid[ $parent_epobject_id ];
+                $parent_gid = $this->epobjectid_to_gid[$parent_epobject_id];
 
             } else {
                 // We haven't cached the gid, so fetch from db.
@@ -2041,7 +2041,7 @@ 
                     $parent_gid = fix_gid_from_db($r['gid']);
 
                     // Cache it for if we need it again:
-                    $this->epobjectid_to_gid[ $parent_epobject_id ] = $parent_gid;
+                    $this->epobjectid_to_gid[$parent_epobject_id] = $parent_gid;
                 }
             }
 
@@ -2056,13 +2056,13 @@ 
                         $session = $qq['session'];
                         $this->bill_lookup[$minor] = array($title, $session);
                     }
-                    $url = "$session/" . urlencode(str_replace(' ','_',$title));
+                    $url = "$session/" . urlencode(str_replace(' ', '_', $title));
                     $parent_gid = preg_replace('#^.*?_.*?_#', '', $parent_gid);
                     global $DATA;
                     $DATA->set_page_metadata('pbc_clause', 'url', "pbc/$url/$parent_gid");
                     $LISTURL->remove(array('id'));
                 } else {
-                    $LISTURL->insert( array( 'id' => $parent_gid ) );
+                    $LISTURL->insert(array('id' => $parent_gid));
                 }
                 // Use a truncated form of this item's gid for the anchor.
                 $fragment = '#g' . gid_to_anchor($id_data['gid']);
@@ -2070,7 +2070,7 @@ 
         }
 
         if (count($url_args) > 0) {
-            $LISTURL->insert( $url_args);
+            $LISTURL->insert($url_args);
         }
 
         return $LISTURL->generate($encode) . $fragment;
@@ -2133,10 +2133,10 @@ 
         $member = $this->_get_speaker_alone($q, $person_id, $hdate, $htime, $major);
 
         $URL = $this->_get_speaker_url($member['house']);
-        $URL->insert( array ('p' => $person_id) );
+        $URL->insert(array('p' => $person_id));
 
         $name = member_full_name($member['house'], $member['title'], $member['given_name'], $member['family_name'], $member['lordofname']);
-        $speaker = array (
+        $speaker = array(
             'member_id' => $member['member_id'],
             "name" => $name,
             'house' => $member['house'],
@@ -2264,12 +2264,12 @@ 
                     array(':epobject_id' => $item_data['epobject_id']))->first();
 
                 // Add this comment to the data structure.
-                $comment = array (
+                $comment = array(
                     'comment_id' => $q['comment_id'],
                     'user_id'	=> $q['user_id'],
                     'body'		=> $q['body'],
                     'posted'	=> $q['posted'],
-                    'username'	=> $q['firstname'] .' '. $q['lastname']
+                    'username'	=> $q['firstname'] . ' ' . $q['lastname']
                 );
             }
 
@@ -2279,7 +2279,7 @@ 
         // or subsection itself, only the items within them. So
         // we don't get the most recent comment. Because there isn't one.
 
-        $return = array (
+        $return = array(
             'totalcomments' => $totalcomments,
             'comment' => $comment
         );
@@ -2293,7 +2293,7 @@ 
         // What it says on the tin.
         // $item_data must have 'htype' and 'epobject_id' elements. TODO: Check for major==4
 
-        if (($hansardmajors[$this->major]['type']=='debate') &&
+        if (($hansardmajors[$this->major]['type'] == 'debate') &&
             ($item_data['htype'] == '10' || $item_data['htype'] == '11')
             ) {
             // We'll be getting a count of the comments on all items
@@ -2329,7 +2329,7 @@ 
         // Then depending on what htype it is, we get the data for other items too.
         global $DATA, $this_page, $hansardmajors;
 
-        twfy_debug (get_class($this), "getting data by gid");
+        twfy_debug(get_class($this), "getting data by gid");
 
         // Get the information about the item this URL refers to.
         $itemdata = $this->_get_item($args);
@@ -2338,25 +2338,25 @@ 
         }
 
         // If part of a Written Answer (just question or just answer), select the whole thing
-        if (isset($itemdata['major']) && $hansardmajors[$itemdata['major']]['type']=='other' and ($itemdata['htype'] == '12' or $itemdata['htype'] == '13' or $itemdata['htype'] == '14')) {
+        if (isset($itemdata['major']) && $hansardmajors[$itemdata['major']]['type'] == 'other' and ($itemdata['htype'] == '12' or $itemdata['htype'] == '13' or $itemdata['htype'] == '14')) {
             // find the gid of the subheading which holds this part
-            $input = array (
+            $input = array(
                 'amount' => array('gid' => true),
-                'where' => array (
+                'where' => array(
                     'epobject_id=' => $itemdata['subsection_id'],
                 ),
             );
             $parent = $this->_get_hansard_data($input);
             // display that item, i.e. the whole of the Written Answer
-            twfy_debug (get_class($this), "instead of " . $args['gid'] . " selecting subheading gid " . $parent[0]['gid'] . " to get whole wrans");
+            twfy_debug(get_class($this), "instead of " . $args['gid'] . " selecting subheading gid " . $parent[0]['gid'] . " to get whole wrans");
             $args['gid'] = $parent[0]['gid'];
             $this->_get_item($args);
             throw new RedirectException($args['gid']);
         }
 
         # If a WMS main heading, go to next gid
-        if (isset($itemdata['major']) && $itemdata['major']==4 && $itemdata['htype'] == '10') {
-            $input = array (
+        if (isset($itemdata['major']) && $itemdata['major'] == 4 && $itemdata['htype'] == '10') {
+            $input = array(
                 'amount' => array('gid' => true),
                 'where' => array(
                     'section_id=' => $itemdata['epobject_id'],
@@ -2366,7 +2366,7 @@ 
             );
             $next = $this->_get_hansard_data($input);
             if (!empty($next)) {
-                twfy_debug (get_class($this), 'instead of ' . $args['gid'] . ' moving to ' . $next[0]['gid']);
+                twfy_debug(get_class($this), 'instead of ' . $args['gid'] . ' moving to ' . $next[0]['gid']);
                 $args['gid'] = $next[0]['gid'];
                 $this->_get_item($args);
                 throw new RedirectException($args['gid']);
@@ -2418,16 +2418,16 @@ 
         // Get the nextprev links for this item, to link to next/prev pages.
         // Duh.
         if ($itemdata['htype'] == '10') {
-            $nextprev = $this->_get_nextprev_items( $sectionrow );
+            $nextprev = $this->_get_nextprev_items($sectionrow);
             $data['info']['text_heading'] = $itemdata['body'];
 
         } elseif ($itemdata['htype'] == '11') {
-            $nextprev = $this->_get_nextprev_items( $subsectionrow );
+            $nextprev = $this->_get_nextprev_items($subsectionrow);
             $data['info']['text_heading'] = $itemdata['body'];
 
         } else {
             // Ordinary lowly item.
-            $nextprev = $this->_get_nextprev_items( $itemdata );
+            $nextprev = $this->_get_nextprev_items($itemdata);
 
             if (isset($subsectionrow['gid'])) {
                 $nextprev['up']['url'] 		= $subsectionrow['listurl'];
@@ -2436,7 +2436,7 @@ 
                 $nextprev['up']['url'] 		= $sectionrow['listurl'];
                 $nextprev['up']['title'] 	= $sectionrow['body'];
             }
-            $nextprev['up']['body']		= gettext('See the whole debate');
+            $nextprev['up']['body'] = gettext('See the whole debate');
         }
 
         // We can then access this from $PAGE and the templates.
@@ -2445,7 +2445,7 @@ 
         // Now get all the non-heading rows.
 
         // What data do we want for each item?
-        $amount = array (
+        $amount = array(
             'body' => true,
             'speaker' => true,
             'comment' => true,
@@ -2456,9 +2456,9 @@ 
             // This item is a section, so we're displaying all the items within
             // it that aren't within a subsection.
 
-            $input = array (
+            $input = array(
                 'amount' => $amount,
-                'where' => array (
+                'where' => array(
                     'section_id=' => $itemdata['epobject_id'],
                     'subsection_id=' => $itemdata['epobject_id']
                 ),
@@ -2466,15 +2466,15 @@ 
             );
 
             $data['rows'] = $this->_get_hansard_data($input);
-            if (!count($data['rows']) || (count($data['rows'])==1 && strstr($data['rows'][0]['body'], 'was asked'))) {
+            if (!count($data['rows']) || (count($data['rows']) == 1 && strstr($data['rows'][0]['body'], 'was asked'))) {
 
-                $input = array (
-                    'amount' => array (
+                $input = array(
+                    'amount' => array(
                         'body' => true,
                         'comment' => true,
                         'excerpt' => true
                     ),
-                    'where' => array (
+                    'where' => array(
                         'section_id='	=> $sectionrow['epobject_id'],
                         'htype='		=> '11',
                         'major='		=> $this->major
@@ -2490,9 +2490,9 @@ 
         } elseif ($itemdata['htype'] == '11') {
             // This item is a subsection, so we're displaying everything within it.
 
-            $input = array (
+            $input = array(
                 'amount' => $amount,
-                'where' => array (
+                'where' => array(
                     'subsection_id=' => $itemdata['epobject_id']
                 ),
                 'order' => 'hpos ASC'
@@ -2513,10 +2513,10 @@ 
             $subsectionrow['gid'] != $sectionrow['gid']) {
             // If we're looking at a section, there may not be a subsection.
             // And if the subsectionrow and sectionrow aren't the same.
-            array_unshift ($data['rows'], $subsectionrow);
+            array_unshift($data['rows'], $subsectionrow);
         }
 
-        array_unshift ($data['rows'], $sectionrow);
+        array_unshift($data['rows'], $sectionrow);
 
         return $data;
 
@@ -2525,10 +2525,10 @@ 
     public function _get_data_by_column($args) {
         global $this_page;
 
-        twfy_debug (get_class($this), "getting data by column");
+        twfy_debug(get_class($this), "getting data by column");
 
-        $input = array( 'amount' => array('body'=>true, 'comment'=>true, 'speaker'=>true),
-        'where' => array( 'hdate='=>$args['date'], 'major=' => $this->major, 'gid LIKE ' =>'%.'.$args['column'].'.%' ),
+        $input = array('amount' => array('body'=>true, 'comment'=>true, 'speaker'=>true),
+        'where' => array('hdate='=>$args['date'], 'major=' => $this->major, 'gid LIKE ' =>'%.' . $args['column'] . '.%'),
         'order' => 'hpos'
         );
         $data = $this->_get_hansard_data($input);
@@ -2608,8 +2608,8 @@ 
     public function get_gid_from_spid($spid) {
         // Fix the common errors of S.0 instead of S.O and leading
         // zeros in the numbers:
-        $fixed_spid = preg_replace('/(S[0-9]+)0-([0-9]+)/','${1}O-${2}',$spid);
-        $fixed_spid = preg_replace('/(S[0-9]+\w+)-0*([0-9]+)/','${1}-${2}',$fixed_spid);
+        $fixed_spid = preg_replace('/(S[0-9]+)0-([0-9]+)/', '${1}O-${2}', $spid);
+        $fixed_spid = preg_replace('/(S[0-9]+\w+)-0*([0-9]+)/', '${1}-${2}', $fixed_spid);
         $q = $this->db->query(
             "select mentioned_gid from mentions where gid = :gid_from_spid and (type = 4 or type = 6)",
             array(':gid_from_spid' => 'uk.org.publicwhip/spq/' . $fixed_spid)
@@ -2688,10 +2688,10 @@ 
                         ", array(':major' => $this->major));
 
         // What we return.
-        $data = array ();
+        $data = array();
         $speeches = array();
         foreach ($q as $row) {
-            $speech = array (
+            $speech = array(
                 'subsection_id' => $row['subsection_id'],
                 'section_id' => $row['section_id'],
                 'htype' => $row['htype'],
@@ -2704,9 +2704,9 @@ 
 
             // Remove the "uk.org.publicwhip/blah/" from the gid:
             // (In includes/utility.php)
-            $speech['gid'] = fix_gid_from_db( $row['gid'] );
+            $speech['gid'] = fix_gid_from_db($row['gid']);
             $speech['listurl'] = $this->_get_listurl($speech);
-            $speech['speaker'] = $this->_get_speaker($row['person_id'], $row['hdate'], $row['htime'], $this->major );
+            $speech['speaker'] = $this->_get_speaker($row['person_id'], $row['hdate'], $row['htime'], $this->major);
             $speeches[] = $speech;
         }
 
@@ -2714,10 +2714,10 @@ 
             // Get the subsection texts.
 
             $num_speeches = count($speeches);
-            for ($n=0; $n<$num_speeches; $n++) {
+            for ($n = 0; $n < $num_speeches; $n++) {
                 //if ($this->major == 1) {
                     // Debate.
-                    $parent = $this->_get_subsection ($speeches[$n]);
+                    $parent = $this->_get_subsection($speeches[$n]);
 
                 //} elseif ($this->major == 3) {
                     // Wrans.
@@ -2736,7 +2736,7 @@ 
             $data['rows'] = $speeches;
 
         } else {
-            $data['rows'] = array ();
+            $data['rows'] = array();
         }
 
         $data['info']['days'] = $days;
@@ -2753,13 +2753,13 @@ 
     }
 
 
-    public function biggest_debates($args=array()) {
+    public function biggest_debates($args = array()) {
         // So we can just get the data back for special formatting
         // on the front page, without doing the whole display() thing.
         return $this->_get_data_by_biggest_debates($args);
     }
 
-    public function _get_data_by_featured_gid($args=array()) {
+    public function _get_data_by_featured_gid($args = array()) {
         $params = array();
         $data = array();
 
@@ -2788,18 +2788,18 @@ 
         if ($q) {
 
             // This array just used for getting further data about this debate.
-            $item_data = array (
+            $item_data = array(
                 'major'         => $this->major,
                 'minor'         => $q['minor'],
-                'gid'           => fix_gid_from_db( $q['gid'] ),
+                'gid'           => fix_gid_from_db($q['gid']),
                 'htype'         => $q['htype'],
                 'section_id'    => $q['section_id'],
                 'subsection_id' => $q['subsection_id'],
                 'epobject_id'   => $q['epobject_id']
             );
 
-            $list_url      = $this->_get_listurl( $item_data );
-            $totalcomments = $this->_get_comment_count_for_epobject( $item_data );
+            $list_url      = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $body          = $q['body'];
             $hdate         = $q['hdate'];
@@ -2819,21 +2819,21 @@ 
                                     ':subsection_id' => $item_data['subsection_id'],
                                 )
                             )->first();
-                $section_body  = $r['sec_body'];
+                $section_body = $r['sec_body'];
                 $subsection_body = $r['sub_body'];
-                if ( $section_body && $subsection_body ) {
+                if ($section_body && $subsection_body) {
                     $parentbody = "$section_body : $subsection_body";
                 } else {
                     $parentbody = "$section_body$subsection_body";
                 }
-            } else if ( $item_data['htype'] == 10 ) {
+            } else if ($item_data['htype'] == 10) {
                 $parentbody = $body;
             }
 
             // Get the question for this item.
-            if ( $item_data['htype'] == 12 ) {
+            if ($item_data['htype'] == 12) {
                 $childbody = $body;
-                $speaker = $this->_get_speaker($q['person_id'], $q['hdate'], $q['htime'], $this->major );
+                $speaker = $this->_get_speaker($q['person_id'], $q['hdate'], $q['htime'], $this->major);
             } else {
                 $r = $this->db->query("SELECT e.body, e.title,
                                         h.person_id, h.hdate, h.htime
@@ -2843,10 +2843,10 @@ 
                                 ORDER BY hpos
                                 LIMIT 1
                                 ",
-                                array( ':object_id' => $item_data['epobject_id'] )
+                                array(':object_id' => $item_data['epobject_id'])
                 )->first();
                 $childbody = $r['body'];
-                $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major );
+                $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
             }
 
             $contentcount = 0;
@@ -2862,7 +2862,7 @@ 
             }
 
             global $hansardmajors;
-            $more_url = new \MySociety\TheyWorkForYou\Url( $hansardmajors[$this->major]['page_all'] );
+            $more_url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$this->major]['page_all']);
             $details = array(
                 'body'          => $body,
                 'contentcount'  => $contentcount,
@@ -2881,7 +2881,7 @@ 
                 'more_url' => $more_url->generate()
             );
 
-            $data = array (
+            $data = array(
                 'gid' => $args['gid'],
                 'major' => $this->major,
                 'info' => array(),
@@ -2892,7 +2892,7 @@ 
         return $data;
 
     }
-    public function _get_data_by_recent_debates($args=array()) {
+    public function _get_data_by_recent_debates($args = array()) {
         // Returns an array of some random recent debates from a set number of
         // recent days (that's recent days starting from the most recent day
         // that had any debates on).
@@ -2954,17 +2954,17 @@ 
         foreach ($q as $row) {
 
             // This array just used for getting further data about this debate.
-            $item_data = array (
+            $item_data = array(
                 'major' => $this->major,
-                'gid' => fix_gid_from_db( $row['gid'] ),
+                'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
                 'section_id' => $row['section_id'],
                 'subsection_id' => $row['subsection_id'],
                 'epobject_id' => $row['epobject_id']
             );
 
-            $list_url      = $this->_get_listurl( $item_data );
-            $totalcomments = $this->_get_comment_count_for_epobject( $item_data );
+            $list_url      = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $contentcount  = $row['count'];
             $body          = $row['body'];
@@ -2992,7 +2992,7 @@ 
                             LIMIT 1
                             ")->first();
             $childbody = $r['body'];
-            $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major );
+            $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
 
             $data[] = array(
                 'contentcount'  => $contentcount,
@@ -3012,7 +3012,7 @@ 
 
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3021,7 +3021,7 @@ 
 
     }
 
-    public function _get_data_by_biggest_debates($args=array()) {
+    public function _get_data_by_biggest_debates($args = array()) {
         // Returns an array of the debates with most speeches in from
         // a set number of recent days (that's recent days starting from the
         // most recent day that had any debates on).
@@ -3076,17 +3076,17 @@ 
         foreach ($q as $row) {
 
             // This array just used for getting further data about this debate.
-            $item_data = array (
+            $item_data = array(
                 'major' => $this->major,
-                'gid' => fix_gid_from_db( $row['gid'] ),
+                'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
                 'section_id' => $row['section_id'],
                 'subsection_id' => $row['subsection_id'],
                 'epobject_id' => $row['epobject_id']
             );
 
-            $list_url 		= $this->_get_listurl( $item_data );
-            $totalcomments	= $this->_get_comment_count_for_epobject( $item_data );
+            $list_url = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $contentcount = $row['count'];
             $body = $row['body'];
@@ -3094,7 +3094,7 @@ 
 
 
             // This array will be added to $data, which is what gets returned.
-            $debate = array (
+            $debate = array(
                 'contentcount'	=> $contentcount,
                 'body'			=> $body,
                 'hdate'			=> $hdate,
@@ -3122,7 +3122,7 @@ 
                             LIMIT 1
                             ")->first();
             $childbody = $r['body'];
-            $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major );
+            $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
 
             $debate['child'] = array(
                 'body' => $childbody,
@@ -3132,7 +3132,7 @@ 
             $data[] = $debate;
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3155,7 +3155,7 @@ 
         return $q->first()['count'];
     }
 
-    public function _get_data_by_recent_wrans ($args=array()) {
+    public function _get_data_by_recent_wrans($args = array()) {
         global $hansardmajors;
 
         // $args['days'] is the number of days back to look for biggest debates.
@@ -3220,17 +3220,17 @@ 
 
         foreach ($q as $row) {
             // This array just used for getting further data about this debate.
-            $item_data = array (
+            $item_data = array(
                 'major' => $this->major,
-                'gid' => fix_gid_from_db( $row['gid'] ),
+                'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
                 'section_id' => $row['section_id'],
                 'subsection_id' => $row['subsection_id'],
                 'epobject_id' => $row['epobject_id']
             );
 
-            $list_url 		= $this->_get_listurl( $item_data );
-            $totalcomments	= $this->_get_comment_count_for_epobject( $item_data );
+            $list_url = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $body = $row['body'];
             $hdate = $row['hdate'];
@@ -3256,25 +3256,25 @@ 
                             LIMIT 1
                             ")->first();
             $childbody = $r['body'];
-            $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major );
+            $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
 
-            $data[] = array (
+            $data[] = array(
                 'body'			=> $body,
                 'hdate'			=> $hdate,
                 'list_url'		=> $list_url,
                 'totalcomments'	=> $totalcomments,
-                'child'			=> array (
+                'child'			=> array(
                     'body'		=> $childbody,
                     'speaker'	=> $speaker
                 ),
-                'parent'		=> array (
+                'parent'		=> array(
                     'body'		=> $parentbody
                 )
             );
 
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3291,7 +3291,7 @@ 
     public $commentspage = 'pbc_speech';
     public $gidprefix = 'uk.org.publicwhip/standing/';
 
-    public function __construct($session='', $title='') {
+    public function __construct($session = '', $title = '') {
         parent::__construct();
         $this->bill_title = $title;
         $title = str_replace(' ', '_', $title);
@@ -3299,7 +3299,7 @@ 
     }
 
     public function _get_committee($bill_id) {
-        include_once INCLUDESPATH."easyparliament/member.php";
+        include_once INCLUDESPATH . "easyparliament/member.php";
         $q = $this->db->query(
             'select count(*) as c from hansard
                 where major=6 and minor=:bill_id and htype=10',
@@ -3333,13 +3333,13 @@ 
     public function _get_data_by_bill($args) {
         global $DATA, $this_page;
         $data = array();
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'body' => true,
                 'comment' => true,
                 'excerpt' => true
             ),
-            'where' => array (
+            'where' => array(
                 'htype=' => '10',
                 'major=' => $this->major,
                 'minor=' => $args['id'],
@@ -3350,18 +3350,18 @@ 
         if (count($sections) > 0) {
             $data['rows'] = array();
             $num_sections = count($sections);
-            for ($n=0; $n<$num_sections; $n++) {
+            for ($n = 0; $n < $num_sections; $n++) {
                 $sectionrow = $sections[$n];
                 list($sitting, $part) = $this->_get_sitting($sectionrow['gid']);
                 $sectionrow['sitting'] = $sitting;
                 $sectionrow['part'] = $part;
-                $input = array (
-                    'amount' => array (
+                $input = array(
+                    'amount' => array(
                         'body' => true,
                         'comment' => true,
                         'excerpt' => true
                     ),
-                    'where' => array (
+                    'where' => array(
                         'section_id='	=> $sectionrow['epobject_id'],
                         'htype='	=> '11',
                         'major='	=> $this->major
@@ -3369,8 +3369,8 @@ 
                     'order' => 'hpos'
                 );
                 $rows = $this->_get_hansard_data($input);
-                array_unshift ($rows, $sectionrow);
-                $data['rows'] = array_merge ($data['rows'], $rows);
+                array_unshift($rows, $sectionrow);
+                $data['rows'] = array_merge($data['rows'], $rows);
             }
         }
         $data['info']['bill'] = $args['title'];
@@ -3426,8 +3426,8 @@ 
 
         $YEARURL = new \MySociety\TheyWorkForYou\Url('pbc_session');
         $nextprev = array();
-        $nextprev['prev'] = array ('body' => 'Previous session', 'title'=>'');
-        $nextprev['next'] = array ('body' => 'Next session', 'title'=>'');
+        $nextprev['prev'] = array('body' => 'Previous session', 'title'=>'');
+        $nextprev['next'] = array('body' => 'Next session', 'title'=>'');
         $q = $this->db->query(
             "SELECT session FROM bills WHERE session < :session ORDER BY session DESC LIMIT 1",
             array(':session' => $session)
@@ -3464,13 +3464,13 @@ 
             $session = $qq['session'];
             list($sitting, $part) = $this->_get_sitting($gid);
             $sitting_txt = make_ranking($sitting) . ' sitting';
-            if ($part>0) {
+            if ($part > 0) {
                 $sitting .= ", part $part";
             }
             $data[$hdate][] = array(
                 'bill'=> $title,
                 'sitting' => $sitting_txt,
-                'url' => "/pbc/$session/" . urlencode(str_replace(' ','_',$title)) . '/#sitting' . $sitting,
+                'url' => "/pbc/$session/" . urlencode(str_replace(' ', '_', $title)) . '/#sitting' . $sitting,
             );
         }
         return $data;
@@ -3479,7 +3479,7 @@ 
     # Given a GID, parse out the sitting number and optional part from it
     public function _get_sitting($gid) {
         if (preg_match('#_(\d\d)-(\d)_#', $gid, $m)) {
-            return array($m[1]+0, $m[2]);
+            return array($m[1] + 0, $m[2]);
         }
         return array(0, 0);
     }

www/includes/easyparliament/alert.php

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
     public $token_checked = null;
     private $alert_id = "";
     public $email = "";
-    public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $criteria = ""; // Sets the terms that are used to produce the search results.
 
     private $db;
 
@@ -72,7 +72,7 @@ 
             $contents = array('criteria' => $row['criteria'], 'count' => $row['cnt']);
             $data[] = $contents;
         }
-        $data = array ('alerts' => $data);
+        $data = array('alerts' => $data);
         return $data;
     }
 
@@ -100,12 +100,12 @@ 
 
         $data = $q->fetchAll();
         $info = "Alert";
-        $data = array ('info' => $info, 'data' => $data);
+        $data = array('info' => $info, 'data' => $data);
 
         return $data;
     }
 
-    public function add($details, $confirmation_email=false, $instantly_confirm=true) {
+    public function add($details, $confirmation_email = false, $instantly_confirm = true) {
 
         // Adds a new alert's info into the database.
         // Then calls another function to send them a confirmation email.
@@ -170,7 +170,7 @@ 
             // This gives a code for their email address which is then joined
             // to the timestamp so as to provide a unique ID for each alert.
 
-            $token = substr( password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16 );
+            $token = substr(password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16);
 
             // Full stops don't work well at the end of URLs in emails, so
             // replace them. And double slash would be treated as single and
@@ -244,19 +244,19 @@ 
 
         $urltoken = $this->alert_id . '-' . $this->registrationtoken;
 
-        if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
+        if (isset($details['confirm_base']) && $details['confirm_base'] !== '') {
             $confirmurl = $details['confirm_base'] . $urltoken;
         } else {
             $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
         }
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'CONFIRMURL'	=> $confirmurl,
             'CRITERIA'	=> $this->criteria_pretty()
         );
@@ -270,7 +270,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup'
         );
@@ -278,7 +278,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge = array (
+        $merge = array(
             'CRITERIA'	=> $this->criteria_pretty()
         );
 
@@ -449,20 +449,20 @@ 
     public function email() { return $this->email; }
     public function criteria() { return $this->criteria; }
     public function criteria_pretty($html = false) {
-        $criteria = explode(' ',$this->criteria);
+        $criteria = explode(' ', $this->criteria);
         $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($this->criteria));
         $words = array();
         foreach ($criteria as $c) {
-            if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $words[] = $c;
             }
         }
         $criteria = '';
         if (count($words)) {
-            $criteria .= ($html?'<li>':'* ') . sprintf(gettext('Mentions of [%s]'), implode(' ', $words)) . ($html?'</li>':'') . "\n";
+            $criteria .= ($html ? '<li>' : '* ') . sprintf(gettext('Mentions of [%s]'), implode(' ', $words)) . ($html ? '</li>' : '') . "\n";
         }
         if ($spokenby) {
-            $criteria .= ($html?'<li>':'* ') . sprintf(gettext("Things by %s"), implode(' or ', $spokenby)) . ($html?'</li>':'') . "\n";
+            $criteria .= ($html ? '<li>' : '* ') . sprintf(gettext("Things by %s"), implode(' or ', $spokenby)) . ($html ? '</li>' : '') . "\n";
         }
         return $criteria;
     }

www/includes/easyparliament/templates/html/homepage/recent-votes.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( count($divisions) > 0 ) { ?>
+<?php if (count($divisions) > 0) { ?>
     <h2 style="position: relative;">
         <?= gettext('Recent Votes') ?>
         <div class="meta excerpt__category"><a href="/divisions/"><?= gettext('Show all recent votes') ?></a></div>

www/includes/easyparliament/templates/html/alert/index.php

Indentation +10 added lines, -10 removed lines

@@ -116,24 +116,24 @@ 
       <?php } ?>
 
       <?php
-          if(
-              $members ||
+            if(
+                $members ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
-          ) {
-              /* We need to disambiguate the user's instructions */
-              $member_options = false;
-      ?>
+            ) {
+                /* We need to disambiguate the user's instructions */
+                $member_options = false;
+        ?>
         <div class="alert-section alert-section--disambiguation">
             <div class="alert-section__primary">
 
               <?php if ($members) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3>
                 <ul>
                   <?php
                     foreach ($members as $row) {
-                  ?>
+                    ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -154,7 +154,7 @@ 
               <?php } ?>
 
               <?php if (isset($constituencies) && count($constituencies) > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3><?= sprintf(gettext('Sign up for alerts when MPs for constituencies matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3>
                 <ul>
                 <?php foreach ($constituencies as $constituency => $member) { ?>
@@ -203,7 +203,7 @@ 
                             are mentioned in the same debate.') ?>
                           <?php if (isset($member_alertsearch)) {
                                 printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…'));
-                          } ?>
+                            } ?>
                         </em>
                       <?php } ?>
                     </li>

Spacing +19 added lines, -19 removed lines

@@ -1,7 +1,7 @@ 
 <div class="full-page">
     <div class="full-page__row">
 
-      <?php if ( $message ) { ?>
+      <?php if ($message) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
                 <h3><?= $message['title'] ?></h3>
@@ -12,10 +12,10 @@ 
         </div>
       <?php } ?>
 
-      <?php if ( $results ) { ?>
+      <?php if ($results) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
-              <?php if ( $results == 'alert-confirmed' ) { ?>
+              <?php if ($results == 'alert-confirmed') { ?>
                 <h3><?= gettext('Your alert has been confirmed') ?></h3>
                 <p>
                     <?= gettext('You will now receive email alerts for the following criteria:') ?>
@@ -44,31 +44,31 @@ 
                 </div>
                 </noscript>
 
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
+              <?php } elseif ($results == 'alert-suspended') { ?>
                 <h3><?= gettext('Alert suspended') ?></h3>
                 <p>
                     <?= gettext('You can reactivate the alert at any time, from the sidebar below.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
+              <?php } elseif ($results == 'alert-resumed') { ?>
                 <h3><?= gettext('Alert resumed') ?></h3>
                 <p>
                     <?= gettext('You will now receive email alerts on any day when there are entries in Hansard that match your criteria.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
+              <?php } elseif ($results == 'alert-deleted') { ?>
                 <h3><?= gettext('Alert deleted') ?></h3>
                 <p>
                     <?= gettext('You will no longer receive this alert.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'all-alerts-deleted' ) { ?>
+              <?php } elseif ($results == 'all-alerts-deleted') { ?>
                 <h3><?= gettext('All alerts deleted') ?></h3>
                 <p>
                     <?= gettext('You will no longer receive any alerts.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3><?= gettext('Hmmm, something’s not right') ?></h3>
                 <p>
                     <?= gettext('The link you followed to reach this page appears to be incomplete.') ?>
@@ -80,31 +80,31 @@ 
                     <?= sprintf(gettext('If you still get this message, please do <a href="mailto:%s">email us</a> and let us know, and we’ll help out!'), str_replace('@', '&#64;', CONTACTEMAIL)) ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-added' ) { ?>
+              <?php } elseif ($results == 'alert-added') { ?>
                 <h3><?= gettext('Your alert has been added') ?></h3>
                 <p>
                     <?= sprintf(gettext('You will now receive email alerts on any day when %s in parliament.'), _htmlspecialchars($criteria)) ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
+              <?php } elseif ($results == 'alert-confirmation') { ?>
                 <h3><?= gettext('We’re nearly done…') ?></h3>
                 <p>
                     <?= gettext('You should receive an email shortly which will contain a link. You will need to follow that link to confirm your email address and receive future alerts. Thanks.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
+              <?php } elseif ($results == 'alert-exists') { ?>
                 <h3><?= gettext('You’re already subscribed to that!') ?></h3>
                 <p>
                     <?= gettext('It’s good to know you’re keen though.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
+              <?php } elseif ($results == 'alert-already-signed') { ?>
                 <h3><?= gettext('We’re nearly done') ?></h3>
                 <p>
                     <?= gettext('You should receive an email shortly which will contain a link. You will need to follow that link to confirm your email address and receive future alerts. Thanks.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3><?= gettext('Alert could not be created') ?></h3>
                 <p>
                     <?= sprintf(gettext('Sorry, we were unable to create that alert. Please <a href="mailto:%s">let us know</a>. Thanks.'), str_replace('@', '&#64;', CONTACTEMAIL)) ?>
@@ -116,7 +116,7 @@ 
       <?php } ?>
 
       <?php
-          if(
+          if (
               $members ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
@@ -172,7 +172,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                if ( $member_options ) { ?>
+                if ($member_options) { ?>
                 <h3><?= gettext('Sign up for alerts for topics') ?></h3>
                 <?php } else { ?>
                 <h3><?= gettext('Great! Can you just confirm what you mean?') ?></h3>
@@ -186,7 +186,7 @@ 
                             <?= sprintf(gettext('Receive alerts when %s'), _htmlspecialchars($alertsearch_pretty)) ?>
                             <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>">
                         </form>
-                      <?php if ( isset($mistakes['multiple']) ) { ?>
+                      <?php if (isset($mistakes['multiple'])) { ?>
                         <em class="error"><?= gettext('
                             You have used a comma in your search term –
                             are you sure this is what you want? You cannot
@@ -195,7 +195,7 @@ 
                             for each individual term.') ?>
                         </em>
                       <?php } ?>
-                      <?php if ( isset($mistakes['postcode_and']) ) { ?>
+                      <?php if (isset($mistakes['postcode_and'])) { ?>
                         <em class="error"><?= gettext('
                             You have used a postcode and something else in your
                             search term – are you sure this is what you
@@ -253,11 +253,11 @@ 
             <div class="alert-section__secondary">
               <?php if ($email_verified) { ?>
 
-                  <?php if ( $alerts ) { ?>
+                  <?php if ($alerts) { ?>
                     <?php include('_list.php'); ?>
                   <?php } ?>
 
-                  <?php if ( $current_mp ) { ?>
+                  <?php if ($current_mp) { ?>
                     <h3><?= gettext('Your MP alert') ?></h3>
                     <ul class="alerts-manage__list">
                         <li>

www/includes/easyparliament/templates/html/alert/_list.php

Spacing +3 added lines, -3 removed lines

@@ -1,14 +1,14 @@
 <h3><?= gettext('Your current email alerts') ?></h3>
 
 <ul class="alerts-manage__list">
-  <?php foreach ( $alerts as $alert ) { ?>
+  <?php foreach ($alerts as $alert) { ?>
     <li>
         <?= sprintf(gettext('When %s'), _htmlspecialchars($alert['criteria'])) ?>.
         <form action="<?= $actionurl ?>" method="POST">
             <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-          <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
+          <?php if ($alert['status'] == 'unconfirmed') { ?>
             <input type="submit" class="button small" name="action" value="<?= gettext('Confirm') ?>">
-          <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+          <?php } elseif ($alert['status'] == 'suspended') { ?>
             <input type="submit" class="button small" name="action" value="<?= gettext('Resume') ?>">
           <?php } else { ?>
             <input type="submit" class="button button--secondary small" name="action" value="<?= gettext('Suspend') ?>">

www/includes/easyparliament/templates/html/search/form_main.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
             <input type="text" name="q" value="<?= _htmlentities($search_keyword) ?>" class="form-control">
             <input type="submit" class="button" value="<?= gettext('Search') ?>">
         </p>
-      <?php if (isset($warnings) ) { ?>
+      <?php if (isset($warnings)) { ?>
         <p class="error">
             <?= $warnings ?>
         </p>
@@ -18,7 +18,7 @@ 
         <p>
             <ul class="search-result-display-options">
                 <li><a href="#options" class="search-options-toggle js-toggle-search-options"><?= gettext('Advanced search') ?></a></li>
-              <?php if ( $is_adv ) { ?>
+              <?php if ($is_adv) { ?>
                 <?= $search_phrase ? '<li>' . gettext('Exactly:') . ' ' . _htmlentities($search_phrase) . '</li>' : '' ?>
                 <?= $search_exclude ? '<li>' . gettext('Excluding:') . ' ' . _htmlentities($search_exclude) . '</li>' : '' ?>
                 <?= $search_from ? '<li>' . gettext('From:') . ' ' . _htmlentities($search_from) . '</li>' : '' ?>

www/includes/easyparliament/templates/html/search/person.php

Spacing +2 added lines, -2 removed lines

@@ -2,12 +2,12 @@
     <img src="<?= $member->image()['url'] ?>" alt="">
     <h3 class="search-result__title"><a href="<?= $member->url() ?>"><?= $member->full_name() ?></a></h3>
     <?php $latest_membership = $member->getMostRecentMembership(); ?>
-    <?php if ( $latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL ) { ?>
+    <?php if ($latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL) { ?>
         <p class="search-result__description">
             <?= $latest_membership['current'] ? '' : 'Former' ?>
             <?= $latest_membership['party'] == 'Bishop' ? '' : $latest_membership['party'] ?>
             <?= $latest_membership['rep_name'] ?>
-            <?php if ( $latest_membership['constituency'] ) { ?>
+            <?php if ($latest_membership['constituency']) { ?>
                 <?= sprintf(gettext('for %s'), $latest_membership['constituency']) ?>
             <?php } ?>
             (<?= format_date($latest_membership['start_date'], SHORTDATEFORMAT) ?> – <?= $latest_membership['current'] ? gettext('current') : format_date($latest_membership['end_date'], SHORTDATEFORMAT); ?>)