mysociety / theyworkforyou

www/docs/regmem/index.php

Spacing +21 added lines, -21 removed lines

@@ -67,7 +67,7 @@ 
         $file = _load_file($_);
         $date = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $_);
         $data[$_] = array();
-        if (preg_match('#<regmem personid="uk.org.publicwhip/person/'.$p.'" (?:memberid="(.*?)" )?membername="(.*?)" date="(.*?)">(.*?)</regmem>#s', $file, $m)) {
+        if (preg_match('#<regmem personid="uk.org.publicwhip/person/' . $p . '" (?:memberid="(.*?)" )?membername="(.*?)" date="(.*?)">(.*?)</regmem>#s', $file, $m)) {
             $earliest = $_;
             if (!$name) {
                 $name = $m[2];
@@ -103,21 +103,21 @@ 
             break;
         }
         $date_pre = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $_);
-        $date_post = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $files[$i+1]);
+        $date_post = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $files[$i + 1]);
         $pretty = format_date($date_pre, LONGDATEFORMAT);
         $oout = '';
         foreach ($data[$_] as $cat_type => $cat_data) {
-            $old = array_key_exists($cat_type, $data[$files[$i+1]]) ? $data[$files[$i+1]][$cat_type] : '';
+            $old = array_key_exists($cat_type, $data[$files[$i + 1]]) ? $data[$files[$i + 1]][$cat_type] : '';
             $new = $data[$_][$cat_type];
             if ($diff = clean_diff($old, $new)) {
                 $oout .= cat_heading($cat_type, $date_pre, $date_post) . $diff;
             }
         }
-        foreach ($data[$files[$i+1]] as $cat_type => $cat_data) {
+        foreach ($data[$files[$i + 1]] as $cat_type => $cat_data) {
             if (array_key_exists($cat_type, $data[$_])) {
                 continue;
             }
-            if ($diff = clean_diff($data[$files[$i+1]][$cat_type], '')) {
+            if ($diff = clean_diff($data[$files[$i + 1]][$cat_type], '')) {
                 $oout .= cat_heading($cat_type, $date_pre, $date_post) . $diff;
             }
         }
@@ -149,14 +149,14 @@ 
     if ($f) {
         $f = "$dir/regmem$f.xml";
         $count = count($files);
-        for ($i=0; $i<$count; ++$i) {
+        for ($i = 0; $i < $count; ++$i) {
             if ($files[$i] == $f) {
                 $new = $i;
                 break;
             }
         }
     }
-    $old = $new+1;
+    $old = $new + 1;
     $old = $files[$old];
     $old_iso = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $old);
     $old_pretty = format_date($old_iso, LONGDATEFORMAT);
@@ -166,7 +166,7 @@ 
     $old = _load_file($old);
     $new = _load_file($new);
 
-    $DATA->set_page_metadata($this_page, 'heading', 'Changes from '.$old_pretty.' to '.$new_pretty);
+    $DATA->set_page_metadata($this_page, 'heading', 'Changes from ' . $old_pretty . ' to ' . $new_pretty);
     $PAGE->stripe_start();
     print $link;
     $data = array();
@@ -188,7 +188,7 @@ 
             $out .= clean_diff($old, $new);
         }
         if ($out) {
-            print span_row('<h2>'.$names[$person_id].' - <a href="?p='.$person_id.'">Register history</a> | <a href="/mp/?pid='.$person_id.'">MP&rsquo;s page</a></h2>', true) . $out;
+            print span_row('<h2>' . $names[$person_id] . ' - <a href="?p=' . $person_id . '">Register history</a> | <a href="/mp/?pid=' . $person_id . '">MP&rsquo;s page</a></h2>', true) . $out;
         }
     }
     print '</table>';
@@ -245,28 +245,28 @@ 
     $c = 0; $year = 0;
     $view = ''; $compare = '';
     $count = count($files);
-    for ($i=0; $i<$count; ++$i) {
+    for ($i = 0; $i < $count; ++$i) {
         preg_match('/(\d\d\d\d)-(\d\d-\d\d)/', $files[$i], $m);
         $y = $m[1]; $md = $m[2];
         if ($c++) {
             $view .= ' | ';
-            if ($i < $count-1) {
+            if ($i < $count - 1) {
                 $compare .= ' | ';
             }
         }
         if ($year != $y) {
             $year = $y;
             $view .= "<em>$year</em> ";
-            if ($i < $count-1) {
+            if ($i < $count - 1) {
                 $compare .= "<em>$year</em> ";
             }
         }
         $months = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
         preg_match('/(\d\d)-(\d\d)/', $md, $m);
-        $date = ($m[2]+0) . ' '. $months[$m[1]-1];
-        $view .= '<a href="./?d='.$y.'-'.$md.'">'.$date.'</a>';
-        if ($i < $count-1) {
-            $compare .= '<a href="?f='.$y.'-'.$md.'">'.$date.'</a>';
+        $date = ($m[2] + 0) . ' ' . $months[$m[1] - 1];
+        $view .= '<a href="./?d=' . $y . '-' . $md . '">' . $date . '</a>';
+        if ($i < $count - 1) {
+            $compare .= '<a href="?f=' . $y . '-' . $md . '">' . $date . '</a>';
         }
     }
 ?>
@@ -282,7 +282,7 @@ 
 <?php
     uasort($names, 'by_name');
     foreach ($names as $_ => $value) {
-        print '<li><a href="?p='.$_.'">'.$value.'</a>';
+        print '<li><a href="?p=' . $_ . '">' . $value . '</a>';
     }
     print '</ul>';
 
@@ -300,7 +300,7 @@ 
     $data = array();
     parse_file($d, $d_iso, 'only', $data);
     $this_page = 'regmem_date';
-    $DATA->set_page_metadata($this_page, 'heading', "The Register of Members' Interests, $d_pretty");;
+    $DATA->set_page_metadata($this_page, 'heading', "The Register of Members' Interests, $d_pretty"); ;
     $PAGE->stripe_start();
     print $link;
 ?>
@@ -314,7 +314,7 @@ 
         foreach ($v as $cat_type => $vv) {
             $out .= cat_heading($cat_type, $d_iso, $d_iso, false);
             $d = (array_key_exists('only', $data[$person_id][$cat_type]) ? $data[$person_id][$cat_type]['only'] : '');
-            $out .= prettify($d)."\n";
+            $out .= prettify($d) . "\n";
         }
         if ($out) {
             print '<div class="block">';
@@ -364,8 +364,8 @@ 
     if (!count($r) && !count($a)) {
         return '';
     }
-    $r = join("\n", $r); $r = $r ? '<td class="r"><ul>'.$r.'</ul></td>' : '<td>&nbsp;</td>';
-    $a = join("\n", $a); $a = $a ? '<td class="a"><ul>'.$a.'</ul></td>' : '<td>&nbsp;</td>';
+    $r = join("\n", $r); $r = $r ? '<td class="r"><ul>' . $r . '</ul></td>' : '<td>&nbsp;</td>';
+    $a = join("\n", $a); $a = $a ? '<td class="a"><ul>' . $a . '</ul></td>' : '<td>&nbsp;</td>';
     $diff = '<tr>' . $r . $a . '</tr>';
     $diff = preg_replace('#<item.*?>(.*?)</item>#', '<li>$1</li>', $diff);
     return $diff;

www/docs/admin/report.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 // where rid is a report_id and cid is a comment_id.
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreport.php");
+include_once (INCLUDESPATH . "easyparliament/commentreport.php");
 
 $this_page = "admin_commentreport";
 
@@ -177,8 +177,8 @@ 
     global $this_page;
 
 #	$commentermail = preg_replace("/\n/", "<br>\n", get_template_contents('comment_deleted') );
-    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted') );
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld') );
+    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted'));
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld'));
 
     ?>
         <p><strong>You've chosen to delete this comment.</strong> You can now send an email to both the person who posted the comment, and the person who made the report. Uncheck a box to prevent an email from being sent. The comment will not be deleted until you click the button below.</p>
@@ -211,7 +211,7 @@ 
 
     global $this_page;
 
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined') );
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined'));
 
     ?>
         <p><strong>You have chosen not to delete this comment.</strong> You can now send an email to the person who made the report (uncheck the box to send no email). The report will not be resolved until you click the button below.</p>
@@ -243,7 +243,7 @@ 
         $upheld = false;
     }
 
-    $success = $REPORT->resolve ($upheld, $COMMENT);
+    $success = $REPORT->resolve($upheld, $COMMENT);
 
     if ($success) {
 
@@ -261,7 +261,7 @@ 
                 // The reporting user was logged in at the time,
                 // so get their email address.
                 $USER = new USER;
-                $USER->init( $REPORT->user_id() );
+                $USER->init($REPORT->user_id());
                 $email = $USER->email();
             } else {
                 // Non-logged-in user; they should have left their address.
@@ -269,10 +269,10 @@ 
             }
 
             // Prepare the data needed for either email.
-            $data = array (
+            $data = array(
                 'to' 			=> $email
             );
-            $merge = array (
+            $merge = array(
                 'REPORTBODY' 	=> strip_tags($REPORT->body())
             );
 
@@ -306,12 +306,12 @@ 
             // Remove the anchor for their now deleted comment.
             $addcommentsurl = 'https://' . DOMAIN . preg_replace("/#.*$/", '#addcomment', $COMMENT->url());
 
-            $data = array (
+            $data = array(
                 'to' => $USER->email(),
                 'template' => 'comment_deleted_blank',
                 'subject' => 'One of your comments has been deleted',
             );
-            $merge = array (
+            $merge = array(
                 'REPLYBODY' => get_http_var('commentermail'),
 #				'DELETEDREASON'	=> get_http_var('deletedreason'),
                 'ADDCOMMENTURL'	=> $addcommentsurl,

www/includes/easyparliament/commentreport.php

Spacing +26 added lines, -26 removed lines

@@ -27,12 +27,12 @@ 
     public $firstname = '';
     public $lastname = '';
     public $body = '';
-    public $reported = null;	// datetime
-    public $resolved = null; 	// datetime
-    public $resolvedby = ''; 	// user_id
-    public $locked = null; 	// datetime
-    public $lockedby = '';		// user_id
-    public $upheld = ''; 		// boolean
+    public $reported = null; // datetime
+    public $resolved = null; // datetime
+    public $resolvedby = ''; // user_id
+    public $locked = null; // datetime
+    public $lockedby = ''; // user_id
+    public $upheld = ''; // boolean
 
     // If the user was logged in, this will be set:
     public $user_id = '';
@@ -40,7 +40,7 @@ 
     public $email = '';
 
 
-    public function __construct($report_id='') {
+    public function __construct($report_id = '') {
         // Pass it a report id and it gets and sets this report's data.
 
         $this->db = new ParlDB;
@@ -161,7 +161,7 @@ 
         global $THEUSER, $PAGE;
 
         if (!$THEUSER->is_able_to('reportcomment')) {
-            $PAGE->error_message ("Sorry, you are not allowed to post reports.");
+            $PAGE->error_message("Sorry, you are not allowed to post reports.");
             return false;
         }
 
@@ -229,19 +229,19 @@ 
 
         if ($q->success()) {
             // Inserted OK, so set up this object's variables.
-            $this->report_id 	= $q->insert_id();
-            $this->comment_id 	= $COMMENT->comment_id();
-            $this->body			= $body;
-            $this->reported		= $time;
+            $this->report_id = $q->insert_id();
+            $this->comment_id = $COMMENT->comment_id();
+            $this->body = $body;
+            $this->reported = $time;
 
             if ($THEUSER->isloggedin()) {
-                $this->user_id		= $THEUSER->user_id();
+                $this->user_id = $THEUSER->user_id();
                 $this->firstname	= $THEUSER->firstname();
                 $this->lastname		= $THEUSER->lastname();
             } else {
-                $this->email		= $reportdata['email'];
-                $this->firstname 	= $reportdata['firstname'];
-                $this->lastname		= $reportdata['lastname'];
+                $this->email = $reportdata['email'];
+                $this->firstname = $reportdata['firstname'];
+                $this->lastname = $reportdata['lastname'];
             }
 
 
@@ -273,11 +273,11 @@ 
                 $email = $this->email();
             }
 
-            $data = array (
+            $data = array(
                 'to' 			=> $email,
                 'template' 		=> 'report_acknowledge'
             );
-            $merge = array (
+            $merge = array(
                 'COMMENTURL' 	=> "https://" . DOMAIN . $COMMENT->url(),
                 'REPORTBODY' 	=> strip_tags($this->body())
             );
@@ -299,7 +299,7 @@ 
         $data = array();
 
         if (is_numeric($this->report_id)) {
-            $data = array (
+            $data = array(
                 'report_id' 	=> $this->report_id(),
                 'comment_id' 	=> $this->comment_id(),
                 'user_id' 		=> $this->user_id(),
@@ -336,7 +336,7 @@ 
         if ($THEUSER->is_able_to('deletecomment')) {
             $time = gmdate("Y-m-d H:i:s");
 
-            $q = $this->db->query ("UPDATE commentreports
+            $q = $this->db->query("UPDATE commentreports
                             SET		locked = '$time',
                                     lockedby = '" . $THEUSER->user_id() . "'
                             WHERE	report_id = '" . $this->report_id . "'
@@ -347,11 +347,11 @@ 
                 $this->lockedby = $THEUSER->user_id();
                 return true;
             } else {
-                $PAGE->error_message ("Sorry, we were unable to lock this report.");
+                $PAGE->error_message("Sorry, we were unable to lock this report.");
                 return false;
             }
         } else {
-            $PAGE->error_message ("You are not authorised to delete annotations.");
+            $PAGE->error_message("You are not authorised to delete annotations.");
             return false;
         }
     }
@@ -360,7 +360,7 @@ 
     public function unlock() {
         // Unlock a comment so it can be examined by someone else.
 
-        $q = $this->db->query ("UPDATE commentreports
+        $q = $this->db->query("UPDATE commentreports
                         SET		locked = NULL,
                                 lockedby = NULL
                         WHERE	report_id = '" . $this->report_id . "'
@@ -434,16 +434,16 @@ 
 
                     return true;
                 } else {
-                    $PAGE->error_message ("Sorry, we couldn't resolve this report.");
+                    $PAGE->error_message("Sorry, we couldn't resolve this report.");
                     return false;
                 }
             } else {
-                $PAGE->error_message ("This report has already been resolved (on " . $this->resolved . ")");
+                $PAGE->error_message("This report has already been resolved (on " . $this->resolved . ")");
                 return false;
             }
 
         } else {
-            $PAGE->error_message ("You are not authorised to resolve reports.");
+            $PAGE->error_message("You are not authorised to resolve reports.");
             return false;
         }
     }

www/docs/section.php

Spacing +2 added lines, -2 removed lines

@@ -26,14 +26,14 @@
 if (isset($THEUSER) && $THEUSER->postcode_is_set()) {
     try {
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('postcode' => $THEUSER->postcode(), 'house' => \MySociety\TheyWorkForYou\Utility\House::majorToHouse($view->major)[0]));
-    } catch ( MySociety\TheyWorkForYou\MemberException $e ) {
+    } catch (MySociety\TheyWorkForYou\MemberException $e) {
         $MEMBER = null;
     }
 }
 
 $data = $view->display();
 if ($data) {
-    if ( !empty($data['template']) ) {
+    if (!empty($data['template'])) {
         $template = $data['template'];
     } else {
         $template = 'section/section';

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

@@ -13,7 +13,7 @@
 }
 
 $type = ucfirst(get_http_var('type'));
-$class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
+$class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
 if (!$type || !class_exists($class_name)) {
     $PAGE->error_message("No type specified", true);
     exit;

www/docs/rss/index.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
 
 $pc = get_http_var('pc');
 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
@@ -15,7 +15,7 @@ 
             $errors['pc'] = "Sorry, we couldn't check your postcode right now. Please use the 'All Mps' link above to browse MPs";
     } elseif ($constituency == "") {
         $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode";
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
     } else {
         $MEMBER = new MEMBER(array('constituency' => $constituency));
         if ($MEMBER->person_id()) {
@@ -29,5 +29,5 @@ 
     }
 } else {
     $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a valid postcode";
-    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.");
 }

www/includes/utility.php

Indentation +33 added lines, -33 removed lines

@@ -69,11 +69,11 @@ 
     # Ignore errors we've asked to ignore
     if (error_reporting()==0) return;
 
-   // define an assoc array of error string
-   // in reality the only entries we should
-   // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
-   // E_USER_WARNING and E_USER_NOTICE
-   # Commented out are ones that a user function cannot handle.
+    // define an assoc array of error string
+    // in reality the only entries we should
+    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
+    // E_USER_WARNING and E_USER_NOTICE
+    # Commented out are ones that a user function cannot handle.
     $errortype = array (
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
@@ -202,8 +202,8 @@ 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
 function adodb_backtrace($print=true)
 {
-  $s = '';
-  if (PHPVERSION() >= 4.3) {
+    $s = '';
+    if (PHPVERSION() >= 4.3) {
 
     $MAXSTRLEN = 64;
 
@@ -211,33 +211,33 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
-      $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
-      $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+        for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+        $tabs -= 1;
+        if (isset($arr['class'])) $s .= $arr['class'].'.';
+        $args = array();
+        if (isset($arr['args'])) foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
     elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
     elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
     elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
     else {
-      $v = (string) @$v;
-      $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
-      $args[] = $str;
+        $v = (string) @$v;
+        $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
+        if (strlen($v) > $MAXSTRLEN) $str .= '...';
+        $args[] = $str;
     }
-      }
+        }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
-      //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
-      //            " file: <a href=\"file:/%s\">%s</a></font>",
-      //        $arr['line'],$arr['file'],$arr['file']);
-      $s .= "\n";
+        $s .= $arr['function'].'('.implode(', ',$args).')';
+        //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
+        //            " file: <a href=\"file:/%s\">%s</a></font>",
+        //        $arr['line'],$arr['file'],$arr['file']);
+        $s .= "\n";
     }
     if ($print) print $s;
-  }
+    }
 
-  return $s;
+    return $s;
 }
 
 // Returns the unixtime in microseconds.
@@ -538,14 +538,14 @@ 
     //$tbl["»"] = "&raquo;";
     //$tbl["«"] = "&laquo;";
 
-  // lib_filter will replace unmatched < and > with entities so
-  // we abuse strtr's only replace once behaviour to not double
-  // encode them. May not be robust.
-  // This does mean if anyone actually wants to put &gt; or &lt;
-  // in a comment they can't but that's a lot less likely than
-  // < or > for less than and greater than.
-  $tbl['&lt;'] = "&lt;";
-  $tbl['&gt;'] = "&gt;";
+    // lib_filter will replace unmatched < and > with entities so
+    // we abuse strtr's only replace once behaviour to not double
+    // encode them. May not be robust.
+    // This does mean if anyone actually wants to put &gt; or &lt;
+    // in a comment they can't but that's a lot less likely than
+    // < or > for less than and greater than.
+    $tbl['&lt;'] = "&lt;";
+    $tbl['&gt;'] = "&gt;";
 
     // Don't want to encode these things
     unset ($tbl["<"]);
@@ -1063,7 +1063,7 @@ 
 
     $return = '<h4>';
     if (isset($daytext[$major])) {
-     $return .= $daytext[$major] . ' ';
+        $return .= $daytext[$major] . ' ';
     }
 
     $return .= '<a href="';

Spacing +69 added lines, -69 removed lines

@@ -12,7 +12,7 @@ 
 
 # Pass it a brief header word and some debug text and it'll be output.
 # If TEXT is an array, call the user function, assuming it's a class.
-function twfy_debug($header, $text="") {
+function twfy_debug($header, $text = "") {
 
     // We set ?DEBUGTAG=n in the URL.
     // (DEBUGTAG is set in config.php).
@@ -29,10 +29,10 @@ 
     if ($debug_level != '') {
 
         // Set which level shows which types of debug info.
-        $levels = array (
-            1 => array ('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
-            2 => array ('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
-            3 => array ('SQLRESULT')
+        $levels = array(
+            1 => array('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
+            2 => array('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
+            3 => array('SQLRESULT')
             // Higher than this: 'DATA', etc.
         );
 
@@ -46,11 +46,11 @@ 
         }
 
         for ($n = 1; $n <= $max_level_to_show; $n++) {
-            $allowed_headers = array_merge ($allowed_headers, $levels[$n] );
+            $allowed_headers = array_merge($allowed_headers, $levels[$n]);
         }
 
         // If we can show this header, then, er, show it.
-        if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
+        if (in_array($header, $allowed_headers) || $debug_level >= 4) {
             if (is_array($text)) $text = call_user_func($text);
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
@@ -67,14 +67,14 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting() == 0) return;
 
    // define an assoc array of error string
    // in reality the only entries we should
    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
    // E_USER_WARNING and E_USER_NOTICE
    # Commented out are ones that a user function cannot handle.
-    $errortype = array (
+    $errortype = array(
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
         #E_PARSE            => "Parsing Error",
@@ -133,11 +133,11 @@ 
         $source = file($filename);
         $err .= "\nSource:\n\n";
         // Show the line, plus prev and next, with line numbers.
-        $err .= $linenum-2 . " " . $source[$linenum-3];
-        $err .= $linenum-1 . " " . $source[$linenum-2];
-        $err .= $linenum . " " . $source[$linenum-1];
-        $err .= $linenum+1 . " " . $source[$linenum];
-        $err .= $linenum+2 . " " . $source[$linenum+1];
+        $err .= $linenum - 2 . " " . $source[$linenum - 3];
+        $err .= $linenum - 1 . " " . $source[$linenum - 2];
+        $err .= $linenum . " " . $source[$linenum - 1];
+        $err .= $linenum + 1 . " " . $source[$linenum];
+        $err .= $linenum + 2 . " " . $source[$linenum + 1];
     }
 
 
@@ -181,8 +181,8 @@ 
             header('HTTP/1.0 500 Internal Server Error');
             print "<p>Oops, sorry, an error has occurred!</p>\n";
         }
-        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect')===false && strpos($errmsg, 'mysql_connect')===false) {
-            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n".  "X-Mailer: PHP/" . phpversion() );
+        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect') === false && strpos($errmsg, 'mysql_connect') === false) {
+            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n" . "X-Mailer: PHP/" . phpversion());
         }
     }
 
@@ -200,7 +200,7 @@ 
 }
 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
-function adodb_backtrace($print=true)
+function adodb_backtrace($print = true)
 {
   $s = '';
   if (PHPVERSION() >= 4.3) {
@@ -209,26 +209,26 @@ 
 
     $traceArr = debug_backtrace();
     array_shift($traceArr);
-    $tabs = sizeof($traceArr)-1;
+    $tabs = sizeof($traceArr) - 1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+      for ($i = 0; $i < $tabs; $i++) $s .= ' &nbsp; ';
       $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
+      if (isset($arr['class'])) $s .= $arr['class'] . '.';
       $args = array();
       if (isset($arr['args'])) foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
+    elseif (is_array($v)) $args[] = 'Array[' . sizeof($v) . ']';
+    elseif (is_object($v)) $args[] = 'Object:' . get_class($v);
     elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
     else {
       $v = (string) @$v;
-      $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
+      $str = _htmlspecialchars(substr($v, 0, $MAXSTRLEN));
       if (strlen($v) > $MAXSTRLEN) $str .= '...';
       $args[] = $str;
     }
       }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
+      $s .= $arr['function'] . '(' . implode(', ', $args) . ')';
       //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
       //            " file: <a href=\"file:/%s\">%s</a></font>",
       //        $arr['line'],$arr['file'],$arr['file']);
@@ -243,7 +243,7 @@ 
 // Returns the unixtime in microseconds.
 function getmicrotime() {
     $mtime = microtime();
-    $mtime = explode(" ",$mtime);
+    $mtime = explode(" ", $mtime);
     $mtime = $mtime[1] + $mtime[0];
 
     return $mtime;
@@ -256,7 +256,7 @@ 
     global $timestamp_last, $timestamp_start;
     $t = getmicrotime();
     twfy_debug("TIME", sprintf("%f msecs since start; %f msecs since last; %s",
-            ($t - $timestamp_start)*1000.0, ($t - $timestamp_last)*1000.0, $label));
+            ($t - $timestamp_start) * 1000.0, ($t - $timestamp_last) * 1000.0, $label));
     $timestamp_last = $t;
 }
 
@@ -291,9 +291,9 @@ 
         list($string, $year, $month, $day) = $matches;
         if ($year < 1902) { # gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
-                return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months_short[$month + 0] . " $year";
             } else {
-                return ($day+0) . ' ' . $format_date_months[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months[$month + 0] . " $year";
             }
         }
 
@@ -334,16 +334,16 @@ 
     $in_seconds = strtotime($datetime);
     $now = time();
 
-    $diff   =  $now - $in_seconds;
-    $months =  floor($diff/2419200);
+    $diff   = $now - $in_seconds;
+    $months = floor($diff / 2419200);
     $diff   -= $months * 2419200;
-    $weeks  =  floor($diff/604800);
-    $diff   -= $weeks*604800;
-    $days   =  floor($diff/86400);
+    $weeks  = floor($diff / 604800);
+    $diff   -= $weeks * 604800;
+    $days   = floor($diff / 86400);
     $diff   -= $days * 86400;
-    $hours  =  floor($diff/3600);
+    $hours  = floor($diff / 3600);
     $diff   -= $hours * 3600;
-    $minutes = floor($diff/60);
+    $minutes = floor($diff / 60);
     $diff   -= $minutes * 60;
     $seconds = $diff;
 
@@ -357,27 +357,27 @@ 
         $relative_date = '';
         if ($weeks > 0) {
             // Weeks and days
-            $relative_date .= ($relative_date?', ':'').$weeks.' week'.($weeks>1?'s':'');
-            $relative_date .= $days>0?($relative_date?', ':'').$days.' day'.($days>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
+            $relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
         } elseif ($days > 0) {
             // days and hours
-            $relative_date .= ($relative_date?', ':'').$days.' day'.($days>1?'s':'');
-            $relative_date .= $hours>0?($relative_date?', ':'').$hours.' hour'.($hours>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
+            $relative_date .= $hours > 0 ? ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
         } elseif ($hours > 0) {
             // hours and minutes
-            $relative_date .= ($relative_date?', ':'').$hours.' hour'.($hours>1?'s':'');
-            $relative_date .= $minutes>0?($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
+            $relative_date .= $minutes > 0 ? ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
         } elseif ($minutes > 0) {
             // minutes only
-            $relative_date .= ($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
         } else {
             // seconds only
-            $relative_date .= ($relative_date?', ':'').$seconds.' second'.($seconds>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $seconds . ' second' . ($seconds > 1 ? 's' : '');
         }
     }
 
     // Return relative date and add proper verbiage
-    return $relative_date.' ago';
+    return $relative_date . ' ago';
 
 }
 
@@ -426,10 +426,10 @@ 
         $text = substr($text, $start);
 
         // Word boundary.
-        if (preg_match ("/.+?\b(.*)/", $text, $matches)) {
+        if (preg_match("/.+?\b(.*)/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the start.
-            $text = preg_replace ("/^\s/", '', $text);
+            $text = preg_replace("/^\s/", '', $text);
         }
         $text = '...' . $text;
     }
@@ -441,10 +441,10 @@ 
         $text = substr($text, 0, $length - 3);
 
         // Word boundary.
-        if (preg_match ("/(.*)\s.+/", $text, $matches)) {
+        if (preg_match("/(.*)\s.+/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the end.
-            $text = preg_replace ("/\s$/", '', $text);
+            $text = preg_replace("/\s$/", '', $text);
         }
         // We don't want to use the HTML entity for an ellipsis (&#8230;), because then
         // it screws up when we subsequently use htmlentities() to print the returned
@@ -476,11 +476,11 @@ 
 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
-        $filter->allowed = array ();
+        $filter->allowed = array();
     } else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
-        $filter->allowed = array (
+        $filter->allowed = array(
             'a' => array('href'),
             'strong' => array(),
             'em' => array(),
@@ -593,7 +593,7 @@ 
 
     // $gid will be like 'uk.org.publicwhip/debate/2003-02-28.475.3'.
 
-    $newgid = substr($gid, strrpos($gid, '/')+1 );
+    $newgid = substr($gid, strrpos($gid, '/') + 1);
     return $newgid;
 }
 
@@ -604,7 +604,7 @@ 
     // will be like 2003-11-20.966.0
     // This function returns 966.0
 
-    return substr( $gid, (strpos($gid, '.') + 1) );
+    return substr($gid, (strpos($gid, '.') + 1));
 }
 
 function preg_replacement_quote($s) {
@@ -648,7 +648,7 @@ 
     global $PAGE;
 
     if (!isset($data['to']) || $data['to'] == '') {
-        $PAGE->error_message ("We need an email address to send to.");
+        $PAGE->error_message("We need an email address to send to.");
         return false;
     }
 
@@ -691,7 +691,7 @@ 
         if (isset($data['subject'])) {
             $subject = trim($data['subject']);
         } else {
-            $subject = trim( substr($firstline, 8) );
+            $subject = trim(substr($firstline, 8));
         }
 
         // Either way, remove this subject line from the template.
@@ -700,7 +700,7 @@ 
     } elseif (isset($data['subject'])) {
         $subject = $data['subject'];
     } else {
-        $PAGE->error_message ("We don't have a subject line for the email, so it wasn't sent.");
+        $PAGE->error_message("We don't have a subject line for the email, so it wasn't sent.");
         return false;
     }
 
@@ -710,7 +710,7 @@ 
     $replace = array();
 
     foreach ($merge as $key => $val) {
-        $search[] = '/{'.$key.'}/';
+        $search[] = '/{' . $key . '}/';
         $replace[] = preg_replacement_quote($val);
     }
 
@@ -728,7 +728,7 @@ 
     }
 
     // Send it!
-    $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces, $htmltext);
+    $success = send_email($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces, $htmltext);
 
     return $success;
 
@@ -743,7 +743,7 @@ 
     return $envelope_sender;
 }
 
-function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false, $html='') {
+function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false, $html = '') {
     // Use this rather than PHP's mail() direct, so we can make alterations
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
@@ -789,7 +789,7 @@ 
 // http://www.iamcal.com/publish/article.php?id=13
 
 // Call this with a key name to get a GET or POST variable.
-function get_http_var($name, $default='', $allow_array=false) {
+function get_http_var($name, $default = '', $allow_array = false) {
     $val = $default;
     if (array_key_exists($name, $_POST)) {
         $val = $_POST[$name];
@@ -804,7 +804,7 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
-function get_cookie_var($name, $default='') {
+function get_cookie_var($name, $default = '') {
     if (array_key_exists($name, $_COOKIE)) {
         return $_COOKIE[$name];
     }
@@ -815,7 +815,7 @@ 
 // Pass it an array of key names that should not be generated as
 // hidden form variables. It then outputs hidden form variables
 // based on the session_vars for this page.
-function hidden_form_vars ($omit = array()) {
+function hidden_form_vars($omit = array()) {
     global $DATA, $this_page;
 
     $session_vars = $DATA->page_metadata($this_page, "session_vars");
@@ -828,7 +828,7 @@ 
 }
 
 // Deprecated. Use hidden_form_vars, above, instead.
-function hidden_vars ($omit = array()) {
+function hidden_vars($omit = array()) {
     global $DATA;
 
     foreach ($args as $key => $val) {
@@ -871,7 +871,7 @@ 
 function entities_to_numbers($string) {
     $string = str_replace(
         array('&Ouml;', '&acirc;', '&uacute;', '&aacute;', '&iacute;', '&ocirc;', '&eacute;'),
-        array('&#214;', '&#226;',  '&#250;',   '&#225;',   '&#237;',   '&#244;',  '&#233;'  ),
+        array('&#214;', '&#226;', '&#250;', '&#225;', '&#237;', '&#244;', '&#233;'),
         $string
     );
     return $string;
@@ -888,9 +888,9 @@ 
         }
     }
 
-    $s   = array(' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
-    $s2  = array(" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
-    $r   = array('_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o');
+    $s   = array(' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
+    $s2  = array(" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
+    $r   = array('_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o');
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -1048,8 +1048,8 @@ 
                 }
                 $out .= '<li>' . $body . '<ul>';
             } else {
-                $LISTURL->insert( array( 'id' => $gid ) );
-                $out .= '<li><a href="'.$LISTURL->generate().'">';
+                $LISTURL->insert(array('id' => $gid));
+                $out .= '<li><a href="' . $LISTURL->generate() . '">';
                 $out .= $body . '</a>';
             }
         }
@@ -1118,7 +1118,7 @@ 
     return $return;
 }
 
-function redirect($url, $code=302) {
+function redirect($url, $code = 302) {
     if (defined('TESTING')) {
         print "Location: $url";
     } else {

Braces +126 added lines, -76 removed lines

@@ -51,7 +51,9 @@ 
 
         // If we can show this header, then, er, show it.
         if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
-            if (is_array($text)) $text = call_user_func($text);
+            if (is_array($text)) {
+                $text = call_user_func($text);
+            }
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
     }
@@ -67,7 +69,9 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting()==0) {
+        return;
+    }
 
    // define an assoc array of error string
    // in reality the only entries we should
@@ -211,19 +215,29 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+      for ($i=0; $i < $tabs; $i++) {
+          $s .= ' &nbsp; ';
+      }
       $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
+      if (isset($arr['class'])) {
+          $s .= $arr['class'].'.';
+      }
       $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+      if (isset($arr['args'])) {
+          foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
-    elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
-    else {
+      } elseif (is_array($v)) {
+        $args[] = 'Array['.sizeof($v).']';
+    } elseif (is_object($v)) {
+        $args[] = 'Object:'.get_class($v);
+    } elseif (is_bool($v)) {
+        $args[] = $v ? 'true' : 'false';
+    } else {
       $v = (string) @$v;
       $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
+      if (strlen($v) > $MAXSTRLEN) {
+          $str .= '...';
+      }
       $args[] = $str;
     }
       }
@@ -234,7 +248,9 @@ 
       //        $arr['line'],$arr['file'],$arr['file']);
       $s .= "\n";
     }
-    if ($print) print $s;
+    if ($print) {
+        print $s;
+    }
   }
 
   return $s;
@@ -289,7 +305,8 @@ 
 
     if (preg_match("/^(\d\d\d\d)-(\d\d?)-(\d\d?)$/", $date, $matches)) {
         list($string, $year, $month, $day) = $matches;
-        if ($year < 1902) { # gmdate fns only go back to Dec. 1901
+        if ($year < 1902) {
+# gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
                 return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
             } else {
@@ -748,7 +765,9 @@ 
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
 
-    if (!$from) $from = CONTACTEMAIL;
+    if (!$from) {
+        $from = CONTACTEMAIL;
+    }
 
     $mail = new PHPMailer(true);
     $mail->isSMTP();
@@ -843,17 +862,21 @@ 
     $rank = $rank + 0;
 
     # 11th, 12th, 13th use "th" not "st", "nd", "rd"
-    if (floor(($rank % 100) / 10) == 1)
-        return $rank . "th";
+    if (floor(($rank % 100) / 10) == 1) {
+            return $rank . "th";
+    }
     # 1st
-    if ($rank % 10 == 1)
-        return $rank . "st";
+    if ($rank % 10 == 1) {
+            return $rank . "st";
+    }
     # 2nd
-    if ($rank % 10 == 2)
-        return $rank . "nd";
+    if ($rank % 10 == 2) {
+            return $rank . "nd";
+    }
     # 3rd
-    if ($rank % 10 == 3)
-        return $rank . "rd";
+    if ($rank % 10 == 3) {
+            return $rank . "rd";
+    }
     # Everything else use th
 
     return $rank . "th";
@@ -861,8 +884,9 @@ 
 
 function make_plural($word, $number)
 {
-    if ($number == 1)
-        return $word;
+    if ($number == 1) {
+            return $word;
+    }
     return $word . "s";
 }
 
@@ -896,8 +920,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== null)
-    {
+    if ($pid !== null) {
         $out .= $pid . '/';
     }
 
@@ -905,8 +928,7 @@ 
     $out .= urlencode(str_replace($s2, $r, str_replace($s, $r, $name)));
 
     // If there is a constituency, inject that too
-    if ($const && $house == HOUSE_TYPE_COMMONS)
-    {
+    if ($const && $house == HOUSE_TYPE_COMMONS) {
         $out .= '/' . urlencode(str_replace($s2, $r, str_replace($s, $r, strtolower($const))));
     }
 
@@ -918,10 +940,16 @@ 
     switch ($house) {
         case HOUSE_TYPE_LORDS:
             $s = '';
-            if (!$family_name) $s = 'the ';
+            if (!$family_name) {
+                $s = 'the ';
+            }
             $s .= $title;
-            if ($family_name) $s .= ' ' . $family_name;
-            if ($lordofname) $s .= ' of ' . $lordofname;
+            if ($family_name) {
+                $s .= ' ' . $family_name;
+            }
+            if ($lordofname) {
+                $s .= ' of ' . $lordofname;
+            }
             return $s;
 
         case HOUSE_TYPE_ROYAL:
@@ -939,14 +967,18 @@ 
 }
 
 function by_peer_name($a, $b) {
-    if (!$a['family_name'] && !$b['family_name'])
-        return strcmp($a['lordofname'], $b['lordofname']);
-    if (!$a['family_name'])
-        return strcmp($a['lordofname'], $b['family_name']);
-    if (!$b['family_name'])
-        return strcmp($a['family_name'], $b['lordofname']);
-    if (strcmp($a['family_name'], $b['family_name']))
-        return strcmp($a['family_name'], $b['family_name']);
+    if (!$a['family_name'] && !$b['family_name']) {
+            return strcmp($a['lordofname'], $b['lordofname']);
+    }
+    if (!$a['family_name']) {
+            return strcmp($a['lordofname'], $b['family_name']);
+    }
+    if (!$b['family_name']) {
+            return strcmp($a['family_name'], $b['lordofname']);
+    }
+    if (strcmp($a['family_name'], $b['family_name'])) {
+            return strcmp($a['family_name'], $b['family_name']);
+    }
     return strcmp($a['lordofname'], $b['lordofname']);
 }
 
@@ -973,12 +1005,17 @@ 
         'Lords in Waiting (HM Household)' => 'Government Whip',
         'Baronesses in Waiting, HM Household' => 'Government Whip',
     );
-    if ($pos) { # Government post, or Chairman of Select Committee
+    if ($pos) {
+# Government post, or Chairman of Select Committee
         $pretty = $pos;
-        if ($dept && $dept != 'No Department') $pretty .= ", $dept";
-        if (array_key_exists($pretty, $lookup))
-            $pretty = $lookup[$pretty];
-    } else { # Member of Select Committee
+        if ($dept && $dept != 'No Department') {
+            $pretty .= ", $dept";
+        }
+        if (array_key_exists($pretty, $lookup)) {
+                    $pretty = $lookup[$pretty];
+        }
+    } else {
+# Member of Select Committee
         $pretty = "Member, $dept";
     }
     return $pretty;
@@ -996,13 +1033,16 @@ 
     }
 
     // single date?
-    if (isset($data['date'])) $one_date = true;
+    if (isset($data['date'])) {
+        $one_date = true;
+    }
 
     // remove empty entries, so they don't produce errors
     foreach (array_keys($hansardmajors) as $major) {
         if (array_key_exists($major, $data)) {
-            if (count($data[$major]) == 0)
-                unset($data[$major]);
+            if (count($data[$major]) == 0) {
+                            unset($data[$major]);
+            }
         }
     }
 
@@ -1011,22 +1051,29 @@ 
     if (!$one_date) {
         $todaystime = gmmktime(0, 0, 0, date('m'), date('d'), date('Y'));
         foreach ($data as $major => $array) {
-            if (!in_array('timestamp', $array)) $daytext[$major] = "The most recent ";
-            elseif ($todaystime - $array['timestamp'] == 86400) $daytext[$major] = "Yesterday&rsquo;s";
-            elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
-            else $daytext[$major] = "The most recent ";
+            if (!in_array('timestamp', $array)) {
+                $daytext[$major] = "The most recent ";
+            } elseif ($todaystime - $array['timestamp'] == 86400) {
+                $daytext[$major] = "Yesterday&rsquo;s";
+            } elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) {
+                $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
+            } else {
+                $daytext[$major] = "The most recent ";
+            }
         }
     }
 
     //build html
     foreach ($printed_majors as $p_major) {
-        if (!array_key_exists($p_major, $data))
-            continue;
+        if (!array_key_exists($p_major, $data)) {
+                    continue;
+        }
 
-        if ($one_date)
-            $date = $data['date'];
-        else
-            $date = $data[$p_major]['hdate'];
+        if ($one_date) {
+                    $date = $data['date'];
+        } else {
+                    $date = $data[$p_major]['hdate'];
+        }
         $q = $db->query('SELECT section_id, body, gid
                 FROM hansard, epobject
                 WHERE hansard.epobject_id = epobject.epobject_id '
@@ -1078,14 +1125,16 @@ 
     }
 
     $return .= '<a href="';
-    if (isset($data[$major]['listurl']))
-        $return .= $data[$major]['listurl'];
-    else {
+    if (isset($data[$major]['listurl'])) {
+            $return .= $data[$major]['listurl'];
+    } else {
         $LISTURL->reset();
         $return .= $LISTURL->generate();
     }
     $return .= '">' . $hansardmajors[$major]['title'] . '</a>';
-    if (isset($daytext[$major])) $return;
+    if (isset($daytext[$major])) {
+        $return;
+    }
     $return .= '</h4>';
 
     return $return;
@@ -1093,22 +1142,23 @@ 
 
 function score_to_strongly($dmpscore) {
     $dmpdesc = "unknown about";
-    if ($dmpscore > 0.95 && $dmpscore <= 1.0)
-        $dmpdesc = "consistently voted against";
-    elseif ($dmpscore > 0.85)
-        $dmpdesc = "almost always voted against";
-    elseif ($dmpscore > 0.6)
-        $dmpdesc = "generally voted against";
-    elseif ($dmpscore > 0.4)
-        $dmpdesc = "voted a mixture of for and against";
-    elseif ($dmpscore > 0.15)
-        $dmpdesc = "generally voted for";
-    elseif ($dmpscore > 0.05)
-        $dmpdesc = "almost always voted for";
-    elseif ($dmpscore >= 0.0)
-        $dmpdesc = "consistently voted for";
-    elseif ($dmpscore == -1)
-        $dmpdesc = "has never voted in a major vote about";
+    if ($dmpscore > 0.95 && $dmpscore <= 1.0) {
+            $dmpdesc = "consistently voted against";
+    } elseif ($dmpscore > 0.85) {
+            $dmpdesc = "almost always voted against";
+    } elseif ($dmpscore > 0.6) {
+            $dmpdesc = "generally voted against";
+    } elseif ($dmpscore > 0.4) {
+            $dmpdesc = "voted a mixture of for and against";
+    } elseif ($dmpscore > 0.15) {
+            $dmpdesc = "generally voted for";
+    } elseif ($dmpscore > 0.05) {
+            $dmpdesc = "almost always voted for";
+    } elseif ($dmpscore >= 0.0) {
+            $dmpdesc = "consistently voted for";
+    } elseif ($dmpscore == -1) {
+            $dmpdesc = "has never voted in a major vote about";
+    }
     return $dmpdesc;
 }
 

classes/AlertView/Simple.php

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
     public function display() {
         $data = array();
         $data['recent_election'] = false;
-        if ( $this->user->loggedin() ) {
+        if ($this->user->loggedin()) {
             $data['user_signed_in'] = true;
         }
 
@@ -17,21 +17,21 @@ 
             $data['postcode'] = trim(get_http_var('postcode'));
 
             $result = $this->createAlertForPostCode($data['email'], $data['postcode']);
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update')) {
             $result = $this->getNewMP(get_http_var('update'));
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update-alert')) {
-            $success = $this->replaceAlert( get_http_var('confirmation') );
+            $success = $this->replaceAlert(get_http_var('confirmation'));
             $data['confirmation_received'] = $success;
         } elseif (get_http_var('confirmed')) {
-            $success = $this->confirmAlert( get_http_var('confirmed') );
+            $success = $this->confirmAlert(get_http_var('confirmed'));
             $data['confirmation_received'] = $success;
         } else {
             $data['email'] = $this->user->email() ? $this->user->email() : '';
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
-            if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
+            if ($this->isEmailSignedUpForPostCode($data['email'], $data['postcode'])) {
                 $data['already_signed_up'] = true;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
@@ -66,13 +66,13 @@ 
     }
 
     private function createAlertForPostCode($email, $postcode) {
-        if ( !$this->validateDetails($email, $postcode) ) {
+        if (!$this->validateDetails($email, $postcode)) {
             return array('invalid-postcode-or-email' => true);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
-        } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (\MySociety\TheyWorkForYou\MemberException $e) {
             return array('bad-constituency' => true);
         }
 
@@ -89,7 +89,7 @@ 
 
         switch ($result) {
             case self::ALERT_EXISTS:
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
@@ -102,7 +102,7 @@ 
                 $data['error'] = true;
                 break;
             default: // alert created
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     $data['confirmation_sent'] = true;
                 } else {
                     $data['signedup_no_confirm'] = true;
@@ -116,8 +116,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $old_mp_id ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $old_mp_id));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -141,7 +141,7 @@ 
                 'pid' => $new_mp->person_id,
                 'pc' => '',
             );
-            if ( $other_criteria ) {
+            if ($other_criteria) {
                 $details['keyword'] = $other_criteria;
             }
 
@@ -158,11 +158,11 @@ 
     private function isEmailSignedUpForPostCode($email, $postcode) {
         $is_signed_up = false;
 
-        if ( $email && $postcode ) {
+        if ($email && $postcode) {
             try {
                 $person = $this->getPersonFromPostcode($postcode);
                 $is_signed_up = $this->alert->fetch_by_mp($email, $person->person_id);
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $is_signed_up = false;
             }
         }
@@ -178,10 +178,10 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $criteria ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $criteria));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
-        if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
+        if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = array(
                 'already_signed_up' => true,
                 'old_mp' => $old_mp->full_name(),

classes/SectionView/DebatesView.php

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
         $DEBATELIST = new \DEBATELIST;
         $debates = array();
         $debates['data'] = $DEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $debates['calendar'] = $DEBATELIST->display('calendar', $args, 'none');
         $debates['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -26,7 +26,7 @@ 
 
         $WHALLLIST = new \WHALLLIST;
         $whall['data'] = $WHALLLIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $whall['calendar'] = $WHALLLIST->display('calendar', $args, 'none');
         $whall['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -36,7 +36,7 @@ 
 
         $LORDSDEBATELIST = new \LORDSDEBATELIST;
         $lords['data'] = $LORDSDEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $lords['calendar'] = $LORDSDEBATELIST->display('calendar', $args, 'none');
 
         $lords['rssurl'] = $DATA->page_metadata($this_page, 'rss');
@@ -55,9 +55,9 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'debates', 'title' => 'House of Commons' ),
-            array( 'section' => 'lords', 'title' => 'House of Lords' ),
-            array( 'section' => 'whall', 'title' => 'Westminster Hall' )
+            array('section' => 'debates', 'title' => 'House of Commons'),
+            array('section' => 'lords', 'title' => 'House of Lords'),
+            array('section' => 'whall', 'title' => 'Westminster Hall')
         );
     }
 }

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 +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,
@@ -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;
@@ -2135,10 +2135,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'],
@@ -2266,12 +2266,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']
                 );
             }
 
@@ -2281,7 +2281,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
         );
@@ -2295,7 +2295,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
@@ -2331,7 +2331,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);
@@ -2340,25 +2340,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'],
@@ -2368,7 +2368,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']);
@@ -2420,16 +2420,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'];
@@ -2438,7 +2438,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.
@@ -2447,7 +2447,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,
@@ -2458,9 +2458,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']
                 ),
@@ -2468,15 +2468,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
@@ -2492,9 +2492,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'
@@ -2515,10 +2515,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;
 
@@ -2527,10 +2527,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);
@@ -2610,8 +2610,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)
@@ -2690,10 +2690,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'],
@@ -2706,9 +2706,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;
         }
 
@@ -2716,10 +2716,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.
@@ -2738,7 +2738,7 @@ 
             $data['rows'] = $speeches;
 
         } else {
-            $data['rows'] = array ();
+            $data['rows'] = array();
         }
 
         $data['info']['days'] = $days;
@@ -2755,13 +2755,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();
 
@@ -2790,18 +2790,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'];
@@ -2822,7 +2822,7 @@ 
                             )->first();
                 $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;
@@ -2834,14 +2834,14 @@ 
                                 )
                             )->first();
                 $parentbody = $r['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
@@ -2851,10 +2851,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;
@@ -2870,7 +2870,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,
@@ -2889,7 +2889,7 @@ 
                 'more_url' => $more_url->generate()
             );
 
-            $data = array (
+            $data = array(
                 'gid' => $args['gid'],
                 'major' => $this->major,
                 'info' => array(),
@@ -2900,7 +2900,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).
@@ -2962,17 +2962,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'];
@@ -3000,7 +3000,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,
@@ -3020,7 +3020,7 @@ 
 
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3029,7 +3029,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).
@@ -3084,17 +3084,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'];
@@ -3102,7 +3102,7 @@ 
 
 
             // This array will be added to $data, which is what gets returned.
-            $debate = array (
+            $debate = array(
                 'contentcount'	=> $contentcount,
                 'body'			=> $body,
                 'hdate'			=> $hdate,
@@ -3130,7 +3130,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,
@@ -3140,7 +3140,7 @@ 
             $data[] = $debate;
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3163,7 +3163,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.
@@ -3228,17 +3228,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'];
@@ -3264,25 +3264,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
         );
@@ -3299,7 +3299,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);
@@ -3307,7 +3307,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',
@@ -3341,13 +3341,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'],
@@ -3358,18 +3358,18 @@ 
         $data['rows'] = array();
         if (count($sections) > 0) {
             $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
@@ -3377,8 +3377,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'];
@@ -3434,8 +3434,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)
@@ -3472,13 +3472,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;
@@ -3487,7 +3487,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);
     }