mysociety / theyworkforyou

www/docs/images/mps/photo-status.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         array_push($out['none'], '<li>' . $row['person_id'] . ' (' . $row['party'] . ')' . ', ' . $row['constituency']);
     }
 }
-print '<h3>Missing completely ('.count($out['none']).')</h3> <ul>';
+print '<h3>Missing completely (' . count($out['none']) . ')</h3> <ul>';
 print join($out['none'], "\n");
 print '</ul>';
 print '<h3>Large and small</h3> <p>';

www/docs/departments/questions.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (!$dept) {
 } else {
-    $dept = strtolower(str_replace('_',' ',$dept));
+    $dept = strtolower(str_replace('_', ' ', $dept));
     $q = $db->query('select epobject.epobject_id from hansard,epobject
         where hansard.epobject_id=epobject.epobject_id and major=3 and section_id=0
         and hdate>(select max(hdate) from hansard where major=3) - interval 7 day
@@ -31,7 +31,7 @@ 
         order by body');
     print '<ul>';
     foreach ($q as $row) {
-        print '<li><a href="/wrans/?id=' . fix_gid_from_db($row['gid']). '">' . $row['body']. '</a>';
+        print '<li><a href="/wrans/?id=' . fix_gid_from_db($row['gid']) . '">' . $row['body'] . '</a>';
         print '</li>';
     }
     print '</ul>';

www/docs/departments/statements.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (!$dept) {
 } else {
-    $dept = strtolower(str_replace('_',' ',$dept));
+    $dept = strtolower(str_replace('_', ' ', $dept));
     $q = $db->query('select epobject.epobject_id from hansard,epobject
         where hansard.epobject_id=epobject.epobject_id and major=4 and section_id=0
         and hdate>(select max(hdate) from hansard where major=4) - interval 7 day
@@ -31,7 +31,7 @@ 
         order by body');
     print '<ul>';
     foreach ($q as $row) {
-        print '<li><a href="/wms/?id=' . fix_gid_from_db($row['gid']). '">' . $row['body']. '</a>';
+        print '<li><a href="/wms/?id=' . fix_gid_from_db($row['gid']) . '">' . $row['body'] . '</a>';
         print '</li>';
     }
     print '</ul>';

www/docs/random/index.php

Spacing +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
 $gid = fix_gid_from_db($gid);
 
 $URL = new \MySociety\TheyWorkForYou\Url('debates');
-$URL->insert( array( 'id' => $gid ) );
+$URL->insert(array('id' => $gid));
 header('Location: ' . $URL->generate());

www/docs/postcode/index.php

Spacing +6 added lines, -6 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");
 }
 
@@ -57,7 +57,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) {
@@ -65,7 +65,7 @@ 
     }
     try {
         $MEMBER = new MEMBER($args);
-    } catch (MySociety\TheyWorkForYou\MemberException $e){
+    } catch (MySociety\TheyWorkForYou\MemberException $e) {
         postcode_error($e->getMessage());
     }
     if ($MEMBER->person_id()) {
@@ -111,9 +111,9 @@ 
     foreach ($q as $row) {
         $house = $row['house'];
         $cons = $row['constituency'];
-        if ($house==3) {
+        if ($house == 3) {
             $mreg[] = $row;
-        } elseif ($house==4) {
+        } elseif ($house == 4) {
             if ($cons == $areas['SPC']) {
                 $mcon = $row;
             } elseif ($cons == $areas['SPE']) {
@@ -138,7 +138,7 @@ 
         $out .= $mcon['given_name'] . ' ' . $mcon['family_name'] . '</a>, ' . $mcon['constituency'] . '</li>';
     }
     $out .= '<li>Your <strong>' . $areas[$area_type] . ' ' . $rep_type . 's</strong> ';
-    if ($rep_type=='MLA') $out .= '(Members of the Legislative Assembly)';
+    if ($rep_type == 'MLA') $out .= '(Members of the Legislative Assembly)';
     $out .= ' ' . ($current ? 'are' : 'were') . ':';
     $out .= '<ul>';
     foreach ($mreg as $reg) {

Braces +9 added lines, -3 removed lines

@@ -89,7 +89,9 @@ 
     $mp = array();
     if ($q) {
         $mp = $q;
-        if ($mp['left_house'] != '9999-12-31') $mp['former'] = true;
+        if ($mp['left_house'] != '9999-12-31') {
+            $mp['former'] = true;
+        }
     }
 
     $a = array_values($areas);
@@ -128,7 +130,9 @@ 
     $out = '';
     $out .= '<p>That postcode has multiple results, please pick who you are interested in:</p>';
     $out .= '<ul><li>Your ';
-    if (isset($mp['former'])) $out .= 'former ';
+    if (isset($mp['former'])) {
+        $out .= 'former ';
+    }
     $out .= '<strong>MP</strong> (Member of Parliament) is <a href="/mp/?p=' . $mp['person_id'] . '">';
     $out .= $mp['given_name'] . ' ' . $mp['family_name'] . '</a>, ' . $mp['constituency'] . '</li>';
     if ($mcon) {
@@ -138,7 +142,9 @@ 
         $out .= $mcon['given_name'] . ' ' . $mcon['family_name'] . '</a>, ' . $mcon['constituency'] . '</li>';
     }
     $out .= '<li>Your <strong>' . $areas[$area_type] . ' ' . $rep_type . 's</strong> ';
-    if ($rep_type=='MLA') $out .= '(Members of the Legislative Assembly)';
+    if ($rep_type=='MLA') {
+        $out .= '(Members of the Legislative Assembly)';
+    }
     $out .= ' ' . ($current ? 'are' : 'were') . ':';
     $out .= '<ul>';
     foreach ($mreg as $reg) {

scripts/video-speed.php

Spacing +7 added lines, -7 removed lines

@@ -23,14 +23,14 @@ 
         $gid = $row['gid'];
         $atime = $row['atime'];
         $body = strip_tags($row['body']);
-        $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos+1) . ' group by video_timestamps.gid')->first();
+        $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos + 1) . ' group by video_timestamps.gid')->first();
         $next_atime = $qq['atime'];
         if (!$next_atime) continue;
         $duration = $next_atime - $atime;
-        if ($duration<=0) continue;
+        if ($duration <= 0) continue;
         $words = preg_split('/\W+/', $body, -1, PREG_SPLIT_NO_EMPTY);
         $num_words = count($words);
-        $speed = $num_words / ($duration/60);
+        $speed = $num_words / ($duration / 60);
         $total_speed += $speed;
         print "$gid, $num_words words, from $atime to $next_atime, duration $duration s, speed $speed wpm\n";
         $total += $duration;
@@ -38,12 +38,12 @@ 
         $num++;
     }
 
-    $total_min = $total/60;
+    $total_min = $total / 60;
 
     print "Person ID $spid\n";
-    print "Average length = " . ($total/$num) . "s\n";
-    print "Average speed = " . ($total_words/$total_min) . "wpm\n";
-    print "Average of speeds = " . ($total_speed/$num) . "wpm\n";
+    print "Average length = " . ($total / $num) . "s\n";
+    print "Average speed = " . ($total_words / $total_min) . "wpm\n";
+    print "Average of speeds = " . ($total_speed / $num) . "wpm\n";
     print "\n";
 }
 

Braces +6 added lines, -2 removed lines

@@ -25,9 +25,13 @@
         $body = strip_tags($row['body']);
         $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos+1) . ' group by video_timestamps.gid')->first();
         $next_atime = $qq['atime'];
-        if (!$next_atime) continue;
+        if (!$next_atime) {
+            continue;
+        }
         $duration = $next_atime - $atime;
-        if ($duration<=0) continue;
+        if ($duration<=0) {
+            continue;
+        }
         $words = preg_split('/\W+/', $body, -1, PREG_SPLIT_NO_EMPTY);
         $num_words = count($words);
         $speed = $num_words / ($duration/60);

www/includes/easyparliament/commentreportlist.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
         // available for editing, it's accurate.
         $this->_update_locked();
 
-        $data = $this->_get_data_by_recent ();
+        $data = $this->_get_data_by_recent();
 
         $this->render($data);
 
@@ -97,7 +97,7 @@ 
 
         $data = array();
         foreach ($q as $row) {
-            $data[] = array (
+            $data[] = array(
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],
@@ -108,7 +108,7 @@ 
             );
         }
         foreach ($r as $row) {
-            $data[] = array (
+            $data[] = array(
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],

www/includes/easyparliament/sidebars/calendar_future.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 list($firstyear, $firstmonth, $day) = explode('-', $min_future_date);
 list($finalyear, $finalmonth, $day) = explode('-', $max_future_date);
 
-$q =  $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
+$q = $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
     WHERE event_date >= :firstdate
     AND event_date <= :finaldate
     AND deleted = 0

www/includes/easyparliament/hansardlist.php

Spacing +219 added lines, -219 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,
@@ -141,17 +141,17 @@ 
         if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH))
             return false;
 
-        $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'search_video', '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', 'search_video', '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;
         }
 
@@ -172,7 +172,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.
 
@@ -181,7 +181,7 @@ 
             return $data;
         }
 
-        include (INCLUDESPATH."easyparliament/templates/$format/hansard_$view" . ".php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/hansard_$view" . ".php");
         return true;
 
     }
@@ -226,13 +226,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()
@@ -266,7 +266,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') {
 
@@ -275,11 +275,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']
                 )
             );
@@ -306,21 +306,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']
                 )
             );
@@ -347,7 +347,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();
@@ -413,8 +413,8 @@ 
             $wherearr['hansard.epobject_id='] = $prev_item_id;
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'speaker' => true
                 ),
@@ -429,7 +429,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'		=> "Previous $thing",
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
@@ -442,7 +442,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['prev'] = array (
+                    $nextprevdata['prev'] = array(
                         'body'		=> 'Previous speaker',
                         'url'		=> $prevdata[0]['commentsurl'],
                         'title'		=> $title
@@ -458,8 +458,8 @@ 
             $wherearr['hansard.epobject_id='] = $next_item_id;
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'speaker' => true
                 ),
@@ -473,7 +473,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'		=> "Next $thing",
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
@@ -486,7 +486,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['next'] = array (
+                    $nextprevdata['next'] = array(
                         'body'		=> 'Next speaker',
                         'url'		=> $nextdata[0]['commentsurl'],
                         'title'		=> $title
@@ -530,14 +530,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) {
 
@@ -561,7 +561,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 = 'Next day';
@@ -571,7 +571,7 @@ 
 
                 $title = format_date($q['hdate'], SHORTDATEFORMAT);
 
-                $nextprevdata[$nextorprev] = array (
+                $nextprevdata[$nextorprev] = array(
                     'hdate' => $q['hdate'],
                     'url' => $URL->generate(),
                     'body' => $body,
@@ -585,7 +585,7 @@ 
         $thing = $hansardmajors[$this->major]['plural'];
         $URL->insert(array('y'=>$year));
 
-        $nextprevdata['up'] = array (
+        $nextprevdata['up'] = array(
             'body' 	=> "All of $year's $thing",
             'title'	=> '',
             'url' 	=> $URL->generate()
@@ -606,19 +606,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;
         }
 
@@ -636,29 +636,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 {
@@ -666,10 +666,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));
             }
         }
@@ -683,9 +683,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]);
                 }
             }
 
@@ -718,7 +718,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;
         }
 
@@ -727,8 +727,8 @@ 
     }
 
     private function check_gid_change($gid, $from, $to) {
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'body' => true,
                 'speaker' => true,
                 'comment' => true,
@@ -752,10 +752,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);
 
@@ -769,13 +769,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
@@ -791,20 +791,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
@@ -815,10 +815,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);
                 }
             }
 
@@ -854,9 +854,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
@@ -889,7 +889,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;
         }
 
@@ -929,7 +929,7 @@ 
 
         $speeches = array();
         foreach ($q as $row) {
-            $speech = array (
+            $speech = array(
                 'subsection_id' => $row['subsection_id'],
                 'section_id' => $row['section_id'],
                 'htype' => $row['htype'],
@@ -946,7 +946,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;
         }
@@ -954,7 +954,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;
@@ -988,7 +988,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");
@@ -997,14 +997,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']) && $args['num']) {
-            $results_per_page = $args['num']+0;
+            $results_per_page = $args['num'] + 0;
         }
         else {
             $results_per_page = 20;
@@ -1032,16 +1032,16 @@ 
         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') $sort_order = 'newest';
-            if ($args['o']=='o') $sort_order = 'oldest';
-            elseif ($args['o']=='c') $sort_order = 'created';
-            elseif ($args['o']=='r') $sort_order = 'relevance';
+            if ($args['o'] == 'd') $sort_order = 'newest';
+            if ($args['o'] == 'o') $sort_order = 'oldest';
+            elseif ($args['o'] == 'c') $sort_order = 'created';
+            elseif ($args['o'] == 'r') $sort_order = 'relevance';
         }
 
         $data['searchdescription'] = $SEARCHENGINE->query_description_long();
@@ -1051,7 +1051,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,
@@ -1066,7 +1066,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();
@@ -1082,13 +1082,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;
                 }
@@ -1150,7 +1150,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");
@@ -1171,7 +1171,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'],
@@ -1182,7 +1182,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);
 
@@ -1228,14 +1228,14 @@ 
                     if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
                     if (isset($subsection['listurl'])) $listurl = $subsection['listurl'];
                     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
@@ -1478,7 +1478,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
@@ -1544,9 +1544,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()
@@ -1554,8 +1554,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
@@ -1650,14 +1650,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', 'video_status', 'colnum')
+        $fieldsarr = array(
+            'hansard' => array('epobject_id', 'htype', 'gid', 'hpos', 'section_id', 'subsection_id', 'hdate', 'htime', 'source_url', 'major', 'minor', 'video_status', 'colnum')
         );
 
         $params = array();
@@ -1669,23 +1669,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) {
@@ -1693,7 +1693,7 @@ 
             $wherearr2[] = "$key :where$i";
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
 
         if ($order != '') {
@@ -1711,7 +1711,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	hansard
                         $join
                         WHERE $where
@@ -1736,23 +1736,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]);
                 }
             }
@@ -1765,7 +1765,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
@@ -1843,7 +1843,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'],
@@ -1876,11 +1876,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']);
@@ -1891,7 +1891,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']
                 );
@@ -1964,7 +1964,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).
@@ -1993,7 +1993,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.
@@ -2006,10 +2006,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.
@@ -2025,7 +2025,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;
                 }
             }
 
@@ -2040,13 +2040,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']);
@@ -2054,7 +2054,7 @@ 
         }
 
         if (count($url_args) > 0) {
-            $LISTURL->insert( $url_args);
+            $LISTURL->insert($url_args);
         }
 
         return $LISTURL->generate($encode) . $fragment;
@@ -2117,10 +2117,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'],
@@ -2248,12 +2248,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']
                 );
             }
 
@@ -2263,7 +2263,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
         );
@@ -2277,7 +2277,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
@@ -2313,7 +2313,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);
@@ -2322,25 +2322,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'],
@@ -2350,7 +2350,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']);
@@ -2402,16 +2402,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'];
@@ -2420,7 +2420,7 @@ 
                 $nextprev['up']['url'] 		= $sectionrow['listurl'];
                 $nextprev['up']['title'] 	= $sectionrow['body'];
             }
-            $nextprev['up']['body']		= 'See the whole debate';
+            $nextprev['up']['body'] = 'See the whole debate';
         }
 
         // We can then access this from $PAGE and the templates.
@@ -2429,7 +2429,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,
@@ -2440,9 +2440,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']
                 ),
@@ -2450,15 +2450,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
@@ -2474,9 +2474,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'
@@ -2497,10 +2497,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;
 
@@ -2509,10 +2509,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);
@@ -2571,8 +2571,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)
@@ -2647,10 +2647,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'],
@@ -2663,9 +2663,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;
         }
 
@@ -2673,10 +2673,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.
@@ -2695,7 +2695,7 @@ 
             $data['rows'] = $speeches;
 
         } else {
-            $data['rows'] = array ();
+            $data['rows'] = array();
         }
 
         $data['info']['days'] = $days;
@@ -2712,13 +2712,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();
 
@@ -2747,18 +2747,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'];
@@ -2778,21 +2778,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
@@ -2802,10 +2802,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;
@@ -2821,7 +2821,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,
@@ -2840,7 +2840,7 @@ 
                 'more_url' => $more_url->generate()
             );
 
-            $data = array (
+            $data = array(
                 'gid' => $args['gid'],
                 'major' => $this->major,
                 'info' => array(),
@@ -2851,7 +2851,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).
@@ -2911,17 +2911,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'];
@@ -2949,7 +2949,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,
@@ -2969,7 +2969,7 @@ 
 
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -2978,7 +2978,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).
@@ -3032,17 +3032,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'];
@@ -3050,7 +3050,7 @@ 
 
 
             // This array will be added to $data, which is what gets returned.
-            $debate = array (
+            $debate = array(
                 'contentcount'	=> $contentcount,
                 'body'			=> $body,
                 'hdate'			=> $hdate,
@@ -3078,7 +3078,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,
@@ -3088,7 +3088,7 @@ 
             $data[] = $debate;
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3111,7 +3111,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.
@@ -3175,17 +3175,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'];
@@ -3211,25 +3211,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
         );
@@ -3246,7 +3246,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);
@@ -3254,7 +3254,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',
@@ -3288,13 +3288,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'],
@@ -3305,18 +3305,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
@@ -3324,8 +3324,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'];
@@ -3381,8 +3381,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)
@@ -3419,11 +3419,11 @@ 
             $session = $qq['session'];
             list($sitting, $part) = $this->_get_sitting($gid);
             $sitting_txt = make_ranking($sitting) . ' sitting';
-            if ($part>0) $sitting .= ", part $part";
+            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;
@@ -3432,7 +3432,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);
     }
 }

Braces +67 added lines, -36 removed lines

@@ -138,8 +138,9 @@ 
 
         global $PAGE;
 
-        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH))
-            return false;
+        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH)) {
+                    return false;
+        }
 
         $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'search_video', '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)) {
@@ -326,10 +327,11 @@ 
             );
 
             $subsectiondata = $this->_get_hansard_data($input);
-            if (count($subsectiondata) == 0)
-                $subsectiondata = null;
-            else
-                $subsectiondata = $subsectiondata[0];
+            if (count($subsectiondata) == 0) {
+                            $subsectiondata = null;
+            } else {
+                            $subsectiondata = $subsectiondata[0];
+            }
 
         } elseif ($itemdata['htype'] == '11') {
             // It's a subsection, so use the item itself.
@@ -1005,12 +1007,12 @@ 
         // Mainly for glossary term adding
         if (isset($args['num']) && $args['num']) {
             $results_per_page = $args['num']+0;
-        }
-        else {
+        } else {
             $results_per_page = 20;
         }
-        if ($results_per_page > 1000)
-            $results_per_page = 1000;
+        if ($results_per_page > 1000) {
+                    $results_per_page = 1000;
+        }
 
         $data['info']['results_per_page'] = $results_per_page;
 
@@ -1038,10 +1040,16 @@ 
         // Get the gids from Xapian
         $sort_order = 'date';
         if (isset($args['o'])) {
-            if ($args['o']=='d') $sort_order = 'newest';
-            if ($args['o']=='o') $sort_order = 'oldest';
-            elseif ($args['o']=='c') $sort_order = 'created';
-            elseif ($args['o']=='r') $sort_order = 'relevance';
+            if ($args['o']=='d') {
+                $sort_order = 'newest';
+            }
+            if ($args['o']=='o') {
+                $sort_order = 'oldest';
+            } elseif ($args['o']=='c') {
+                $sort_order = 'created';
+            } elseif ($args['o']=='r') {
+                $sort_order = 'relevance';
+            }
         }
 
         $data['searchdescription'] = $SEARCHENGINE->query_description_long();
@@ -1110,8 +1118,9 @@ 
                     in_array($itemdata['chamber'], array(
                         'Commons: Main Chamber', 'Lords: Main Chamber',
                         'Commons: Westminster Hall',
-                    )))
-                        continue;
+                    ))) {
+                                        continue;
+                }
 
                 list($cal_item, $cal_meta) = \MySociety\TheyWorkForYou\Utility\Calendar::meta($itemdata);
                 $body = $this->prepare_search_result_for_display($cal_item) . '.';
@@ -1224,10 +1233,17 @@ 
                     $section = $this->_get_section($itemdata);
                     $subsection = $this->_get_subsection($itemdata);
                     $body = $hansardmajors[$itemdata['major']]['title'] . ' — ';
-                    if (isset($section['body'])) $body .= $section['body'];
-                    if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
-                    if (isset($subsection['listurl'])) $listurl = $subsection['listurl'];
-                    else $listurl = '';
+                    if (isset($section['body'])) {
+                        $body .= $section['body'];
+                    }
+                    if (isset($subsection['body'])) {
+                        $body .= ': ' . $subsection['body'];
+                    }
+                    if (isset($subsection['listurl'])) {
+                        $listurl = $subsection['listurl'];
+                    } else {
+                        $listurl = '';
+                    }
                     $itemdata['parent'] = array (
                         'body' => $body,
                         'listurl' => $listurl
@@ -1552,7 +1568,8 @@ 
                     'url' => $YEARURL->generate()
                 );
 
-            } else { // action is 'year'.
+            } else {
+// action is 'year'.
 
                 $nextprev['prev'] = array ('body' => 'Previous year');
                 $nextprev['next'] = array ('body' => 'Next year');
@@ -1979,10 +1996,11 @@ 
         // );
 
         // $url_args is an array of other key/value pairs to be appended in the GET string.
-        if ($id_data['major'])
-            $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
-        else
-            $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        if ($id_data['major']) {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
+        } else {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        }
 
         $fragment = '';
 
@@ -2578,7 +2596,9 @@ 
             array(':gid_from_spid' => 'uk.org.publicwhip/spq/' . $fixed_spid)
         )->first();
         $gid = $q['mentioned_gid'];
-        if ($gid) return $gid;
+        if ($gid) {
+            return $gid;
+        }
         return null;
     }
     public function old_get_gid_from_spid($spid) {
@@ -2587,7 +2607,9 @@ 
             array(':gid_like' => 'uk.org.publicwhip/spwa/%.' . $spid . '.h')
         )->first();
         $gid = $q['gid'];
-        if ($gid) return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        if ($gid) {
+            return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        }
         return null;
     }
 }
@@ -2865,7 +2887,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday)) return $data;
+        if (!count($recentday)) {
+            return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -2991,8 +3015,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return array();
+        if (!count($recentday)) {
+                    return array();
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3124,8 +3149,9 @@ 
 
         // Get the most recent day on which we have wrans.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return $data;
+        if (!count($recentday)) {
+                    return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3405,7 +3431,9 @@ 
     }
 
     public function _get_data_by_recent_pbc_debates($args) {
-        if (!isset($args['num'])) $args['num'] = 20;
+        if (!isset($args['num'])) {
+            $args['num'] = 20;
+        }
         $q = $this->db->query('select gid, minor, hdate from hansard
             where htype=10 and major=6
             order by hdate desc limit ' . $args['num']);
@@ -3419,7 +3447,9 @@ 
             $session = $qq['session'];
             list($sitting, $part) = $this->_get_sitting($gid);
             $sitting_txt = make_ranking($sitting) . ' sitting';
-            if ($part>0) $sitting .= ", part $part";
+            if ($part>0) {
+                $sitting .= ", part $part";
+            }
             $data[$hdate][] = array(
                 'bill'=> $title,
                 'sitting' => $sitting_txt,
@@ -3431,8 +3461,9 @@ 
 
     # 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]);
+        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m)) {
+                    return array($m[1]+0, $m[2]);
+        }
         return array(0, 0);
     }
 }

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

@@ -430,7 +430,7 @@ 
                     // Linking to the prev (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
                     $nextprevdata['prev'] = array (
-                        'body'		=> "Previous $thing",
+                        'body'		=> "previous $thing",
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
                     );
@@ -474,7 +474,7 @@ 
                     // Linking to the next (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
                     $nextprevdata['next'] = array (
-                        'body'		=> "Next $thing",
+                        'body'		=> "next $thing",
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
                     );
@@ -510,7 +510,7 @@ 
             $URL->remove(array('id'));
             $things = $hansardmajors[$itemdata['major']]['title'];
             $nextprevdata['up'] = array(
-                'body'	=> "All $things on " . format_date($itemdata['hdate'], SHORTDATEFORMAT),
+                'body'	=> "all $things on " . format_date($itemdata['hdate'], SHORTDATEFORMAT),
                 'title'	=> '',
                 'url' 	=> $URL->generate()
             );
@@ -559,7 +559,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'] ) );
 
@@ -1391,7 +1391,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");
@@ -1711,7 +1711,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query ("select $fields
                         FROM 	hansard
                         $join
                         WHERE $where