mysociety / theyworkforyou

www/docs/video/index.php

Doc Comments +6 added lines

@@ -342,6 +342,9 @@ 
     echo '</ul></div>';
 }
 
+/**
+ * @param integer $limit
+ */
 function display_league($limit, $q = '') {
     global $THEUSER;
     $db = new ParlDB;
@@ -468,6 +471,9 @@ 
     echo '</ol>';
 }
 
+/**
+ * @param integer $count
+ */
 function disp_speech($row, $count) {
     echo '<li';
     if ($row['htype']==13) echo ' class="unspoken"';

Spacing +17 added lines, -17 removed lines

@@ -54,7 +54,7 @@ 
 $parent_body = $q->field(0, 'parent_body');
 $parent_epid = $q->field(0, 'subsection_id');
 
-if (!($video_status&1) || ($video_status&8)) {
+if (!($video_status & 1) || ($video_status & 8)) {
     $PAGE->error_message('That GID does not appear to have any video. Please visit the <a href="/video/">video front page</a>.', true, 404);
     exit;
 }
@@ -87,7 +87,7 @@ 
 $gids_previous = array();
 $gids_following = array();
 $gid_actual = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $row = $q->row($i);
     if ($row['adate']) $row['hdate'] = $row['adate'];
     if ($row['atime']) $row['htime'] = $row['atime'];
@@ -179,7 +179,7 @@ 
 <?php
     $hidden_int = (isset($_COOKIE['hideVideoInt']) && $_COOKIE['hideVideoInt']);
     echo '<table id="video_table" border="0" cellspacing="0" cellpadding="5"><tr valign="top"><td width="50%">';
-    if ($gid_actual['video_status']&4) {
+    if ($gid_actual['video_status'] & 4) {
         $q = $db->query("select timediff(current_timestamp,max(whenstamped)) as ws from video_timestamps where gid='$q_gid' and (user_id is null or user_id != -1) and deleted=0");
         $max = $q->field(0, 'ws');
         echo '<p class="informational">Thanks, but this speech has <strong>already been stamped</strong>';
@@ -240,12 +240,12 @@ 
     $q = $db->query('select video_status&4 as checked,count(*) as c from hansard
     where major=1 and video_status>0 and video_status<8 and video_status!=2 and htype in (12,13) group by video_status&4');
     $totaliser = array(0=>0, 4=>0);
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $status = $q->field($i, 'checked');
         $count = $q->field($i, 'c');
         $totaliser[$status] = $count;
     }
-    $percentage = round($totaliser[4] / ($totaliser[0]+$totaliser[4]) * 10000) / 100;
+    $percentage = round($totaliser[4] / ($totaliser[0] + $totaliser[4]) * 10000) / 100;
     $out = "$totaliser[4] timestamped out of " . ($totaliser[0] + $totaliser[4]) . " ($percentage%)"
 ?>
 
@@ -301,7 +301,7 @@ 
         and hdate=(select max(hdate) from hansard where major=1)
     group by video_status&4');
     $totaliser = array(0=>0, 4=>0);
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $status = $q->field($i, 'checked');
         $count = $q->field($i, 'c');
         $totaliser[$status] = $count;
@@ -328,7 +328,7 @@ 
     where (user_id != -1 or user_id is null) and video_timestamps.deleted=0
         and video_timestamps.gid = hansard.gid and hansard.subsection_id = epobject.epobject_id
     order by whenstamped desc limit 20');
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $gid = $q->field($i, 'gid');
         $body = $q->field($i, 'body');
         if ($q->field($i, 'major') == 101) {
@@ -348,18 +348,18 @@ 
     $q = $db->query('select firstname,lastname,video_timestamps.user_id,count(*) as c
         from video_timestamps left join users on video_timestamps.user_id=users.user_id
         where video_timestamps.deleted=0 and (video_timestamps.user_id is null or video_timestamps.user_id!=-1) '
-        . $q . ' group by user_id order by c desc' . ($THEUSER->user_id() ? '' : " limit $limit") );
+        . $q . ' group by user_id order by c desc' . ($THEUSER->user_id() ? '' : " limit $limit"));
     $out = ''; $rank = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $name = $q->field($i, 'firstname') . ' ' . $q->field($i, 'lastname');
         $user_id = $q->field($i, 'user_id');
         #if ($user_id == -1) continue; # $name = 'CaptionerBot';
         if ($user_id == 0) $name = 'Anonymous';
         $count = $q->field($i, 'c');
         if ($THEUSER->user_id() == $user_id) {
-            $rank = $i+1;
+            $rank = $i + 1;
         }
-        if ($i>=$limit) continue;
+        if ($i >= $limit) continue;
         $out .= '<li>';
         if ($THEUSER->user_id() == $user_id)
             $out .= '<strong>';
@@ -412,7 +412,7 @@ 
 <?php	} ?>
 <li>If the video suddenly <strong>jumps</strong> a couple of hours, or otherwise appears broken, <a href="mailto:<?=str_replace('@', '&#64;', CONTACTEMAIL) ?>?subject=Video%20<?=$file?>%20for%20ID%20<?=$gid_safe?>%20broken">let us know</a>.
 <li>If the speech you're looking for is <strong>beyond the end</strong> of the video,
-<a href="/video/?gid=<?=$gid_safe?>&amp;file=<?=$file+1?>&amp;start=1<?=$pid_url?>">move on to the next video chunk</a>.
+<a href="/video/?gid=<?=$gid_safe?>&amp;file=<?=$file + 1?>&amp;start=1<?=$pid_url?>">move on to the next video chunk</a>.
 <li>If you're right at the start of a day, it's quite possible the start of the video
 will be the end of the previous programme on BBC Parliament, skip ahead some minutes
 to check :)
@@ -443,7 +443,7 @@ 
 <a href="/user/login/?ret=/video/">Log in</a> |
 <?php	} ?>
 <a href="mailto:<?=str_replace('@', '&#64;', CONTACTEMAIL) ?>?subject=Video%20<?=$file?>%20for%20ID%20<?=$gid_safe?>%20broken">Broken video</a> |
-<a href="/video/?gid=<?=$gid_safe?>&amp;file=<?=$file+1?>&amp;start=1<?=$pid_url?>" title="Loads the next video chunk">Speech past end of video</a>
+<a href="/video/?gid=<?=$gid_safe?>&amp;file=<?=$file + 1?>&amp;start=1<?=$pid_url?>" title="Loads the next video chunk">Speech past end of video</a>
 </p>
 
 <p align="right"><small><!-- <b>Credits:</b> Video from <a href='http://www.bbc.co.uk/parliament/'>BBC Parliament</a> and mySociety. -->
@@ -470,13 +470,13 @@ 
 
 function disp_speech($row, $count) {
     echo '<li';
-    if ($row['htype']==13) echo ' class="unspoken"';
-    elseif ($row['htype']<12) echo ' class="heading"';
-    if (!($count%2)) echo ' style="background-color: #F5FDEA;"';
+    if ($row['htype'] == 13) echo ' class="unspoken"';
+    elseif ($row['htype'] < 12) echo ' class="heading"';
+    if (!($count % 2)) echo ' style="background-color: #F5FDEA;"';
     else echo ' style="background-color: #E8FDCB;"';
     echo '>';
     if ($count) echo "<em>$count earlier:</em> ";
-    if ($row['htype']==12)
+    if ($row['htype'] == 12)
         echo '<span class="video_name">' . $row['given_name'] . ' ' . $row['family_name'] . '</span> ';
     echo $row['body'];
     echo '</li>';

Braces +96 added lines, -40 removed lines

@@ -47,8 +47,12 @@ 
 $htime = $q->field(0, 'htime');
 $atime = $q->field(0, 'atime');
 $adate = $q->field(0, 'adate');
-if ($atime) $htime = $atime;
-if ($adate) $hdate = $adate;
+if ($atime) {
+    $htime = $atime;
+}
+if ($adate) {
+    $hdate = $adate;
+}
 $parent_gid = str_replace('uk.org.publicwhip/debate/', '/debates/?id=', $q->field(0, 'parent_gid'));
 $parent_gid = str_replace('uk.org.publicwhip/lords/', '/lords/?gid=', $parent_gid);
 $parent_body = $q->field(0, 'parent_body');
@@ -89,14 +93,20 @@ 
 $gid_actual = array();
 for ($i=0; $i<$q->rows(); $i++) {
     $row = $q->row($i);
-    if ($row['adate']) $row['hdate'] = $row['adate'];
-    if ($row['atime']) $row['htime'] = $row['atime'];
+    if ($row['adate']) {
+        $row['hdate'] = $row['adate'];
+    }
+    if ($row['atime']) {
+        $row['htime'] = $row['atime'];
+    }
     if ($row['hpos'] < $hpos) {
         $gids_previous[] = $row;
-    } elseif ($row['hpos'] > $hpos) {
+    }
+    elseif ($row['hpos'] > $hpos) {
         $gids_following[] = $row;
 
-    } else {
+    }
+    else {
         $gid_actual = $row;
     }
 }
@@ -134,14 +144,20 @@ 
 }
 $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $hdate, $htime);
 
-if (!$start)
+if (!$start) {
     $start = $video['offset'] - $offset;
-if ($start < 0) $start = 0;
+}
+if ($start < 0) {
+    $start = 0;
+}
 
-if (get_http_var('barcamp'))
+if (get_http_var('barcamp')) {
     $video['id'] -= 4000;
+}
 
-if (!$file) $file = $video['id'];
+if (!$file) {
+    $file = $video['id'];
+}
 
 # Start displaying
 
@@ -186,7 +202,8 @@ 
         if ($max < '00:15:00') {
             echo ' <strong>within the last 15 minutes</strong>, so it\'s possible you and someone
 else are timestamping the same debate at the same time';
-        } elseif ($from == 'next') {
+        }
+        elseif ($from == 'next') {
             echo ' (probably by someone coming by at random when you\'ve been clicking Next)';
         }
         echo '. You can <a href="/video/next.php?action=nextneeded&amp;gid=',
@@ -219,7 +236,8 @@ 
     echo '</div>';
     if (get_http_var('from') == 'next' && $hidden_int) {
         previous_speeches($surrounding_speeches, $gids_previous);
-    } else {
+    }
+    else {
         iframe_search($gid_safe, $file);
     }
     echo '</td>';
@@ -264,7 +282,8 @@ 
 <p id="video_attract"><?php
     if ($totaliser[0]) {
         echo '<a href="next.php?action=random">Give me a random speech that needs timestamping</a>';
-    } else {
+    }
+    else {
         echo 'Wow, everything that can currently be timestamped appears to have been, thanks!';
     }
 ?></p>
@@ -280,14 +299,26 @@ 
     global $THEUSER;
     if ($THEUSER->user_id() && ($rank_today || $rank_week || $rank_overall)) {
         echo '<p align="center"><big>You are ';
-        if ($rank_today) echo make_ranking($rank_today), ' today, ';
-        if ($rank_week) echo make_ranking($rank_week), ' last 4 weeks, ';
-        if ($rank_overall) echo make_ranking($rank_overall), ' overall';
+        if ($rank_today) {
+            echo make_ranking($rank_today), ' today, ';
+        }
+        if ($rank_week) {
+            echo make_ranking($rank_week), ' last 4 weeks, ';
+        }
+        if ($rank_overall) {
+            echo make_ranking($rank_overall), ' overall';
+        }
         echo '</big></p>';
     }
-    if ($out_today) echo "<h3>Top timestampers (today)</h3> <ol>$out_today</ol>";
-    if ($out_week) echo "<h3>Top timestampers (last 4 weeks)</h3> <ol>$out_week</ol>";
-    if ($out_overall) echo "<h3>Top timestampers (overall)</h3> <ol>$out_overall</ol>";
+    if ($out_today) {
+        echo "<h3>Top timestampers (today)</h3> <ol>$out_today</ol>";
+    }
+    if ($out_week) {
+        echo "<h3>Top timestampers (last 4 weeks)</h3> <ol>$out_week</ol>";
+    }
+    if ($out_overall) {
+        echo "<h3>Top timestampers (overall)</h3> <ol>$out_overall</ol>";
+    }
     echo '</div>';
 ?>
 <div style="float: right; width: 50%">
@@ -310,7 +341,8 @@ 
     if ($total_possible == 0) {
         $percentage = 0;
         $out = 'Nothing possible to timestamp on most recent day';
-    } else {
+    }
+    else {
         $percentage = round($totaliser[4] / $total_possible * 10000) / 100;
         $out = "$totaliser[4] timestamped out of $total_possible ($percentage%)";
     }
@@ -333,7 +365,8 @@ 
         $body = $q->field($i, 'body');
         if ($q->field($i, 'major') == 101) {
             $url = '/lords/?gid=';
-        } else {
+        }
+        else {
             $url = '/debate/?id=';
         }
         echo '<li><a href="', $url, fix_gid_from_db($gid) . '">' . $body . '</a>';
@@ -354,18 +387,24 @@ 
         $name = $q->field($i, 'firstname') . ' ' . $q->field($i, 'lastname');
         $user_id = $q->field($i, 'user_id');
         #if ($user_id == -1) continue; # $name = 'CaptionerBot';
-        if ($user_id == 0) $name = 'Anonymous';
+        if ($user_id == 0) {
+            $name = 'Anonymous';
+        }
         $count = $q->field($i, 'c');
         if ($THEUSER->user_id() == $user_id) {
             $rank = $i+1;
         }
-        if ($i>=$limit) continue;
+        if ($i>=$limit) {
+            continue;
+        }
         $out .= '<li>';
-        if ($THEUSER->user_id() == $user_id)
-            $out .= '<strong>';
+        if ($THEUSER->user_id() == $user_id) {
+                    $out .= '<strong>';
+        }
         $out .= "$name : $count";
-        if ($THEUSER->user_id() == $user_id)
-            $out .= '</strong>';
+        if ($THEUSER->user_id() == $user_id) {
+                    $out .= '</strong>';
+        }
         #if ($user_id == -1) {
         #	echo ' <small>(initial run program that tries to guess timestamp from captions, wildly variable)</small>';
         #}
@@ -384,8 +423,10 @@ 
 
 function basic_instructions($pid) {
     $pid_url = '';
-    if ($pid) $pid_url = "&amp;pid=$pid";
-?>
+    if ($pid) {
+        $pid_url = "&amp;pid=$pid";
+    }
+    ?>
 <ol style="font-size: 150%;">
 <li>Have a quick scan of the speech under the video, then press &ldquo;Play&rdquo;.
 <li>When you hear the start of that speech, press &ldquo;Now!&rdquo;.
@@ -403,8 +444,10 @@ 
 function basic_hints($gid_safe, $file, $pid) {
     global $THEUSER;
     $pid_url = '';
-    if ($pid) $pid_url = "&amp;pid=$pid";
-?>
+    if ($pid) {
+        $pid_url = "&amp;pid=$pid";
+    }
+    ?>
 
 <ul>
 <?php	if (!$THEUSER->loggedin()) { ?>
@@ -434,8 +477,10 @@ 
 function advanced_hints($gid_safe, $file, $pid) {
     global $THEUSER;
     $pid_url = '';
-    if ($pid) $pid_url = "&amp;pid=$pid";
-?>
+    if ($pid) {
+        $pid_url = "&amp;pid=$pid";
+    }
+    ?>
 
 <p align="center">Actions:
 <a href="/video/next.php?action=random">Skip</a> |
@@ -470,14 +515,25 @@ 
 
 function disp_speech($row, $count) {
     echo '<li';
-    if ($row['htype']==13) echo ' class="unspoken"';
-    elseif ($row['htype']<12) echo ' class="heading"';
-    if (!($count%2)) echo ' style="background-color: #F5FDEA;"';
-    else echo ' style="background-color: #E8FDCB;"';
+    if ($row['htype']==13) {
+        echo ' class="unspoken"';
+    }
+    elseif ($row['htype']<12) {
+        echo ' class="heading"';
+    }
+    if (!($count%2)) {
+        echo ' style="background-color: #F5FDEA;"';
+    }
+    else {
+        echo ' style="background-color: #E8FDCB;"';
+    }
     echo '>';
-    if ($count) echo "<em>$count earlier:</em> ";
-    if ($row['htype']==12)
-        echo '<span class="video_name">' . $row['given_name'] . ' ' . $row['family_name'] . '</span> ';
+    if ($count) {
+        echo "<em>$count earlier:</em> ";
+    }
+    if ($row['htype']==12) {
+            echo '<span class="video_name">' . $row['given_name'] . ' ' . $row['family_name'] . '</span> ';
+    }
     echo $row['body'];
     echo '</li>';
 }

www/includes/easyparliament/alert.php

Doc Comments +11 added lines

@@ -51,6 +51,10 @@ 
 
 // FUNCTION: fetch_between
 
+    /**
+     * @param integer $confirmed
+     * @param integer $deleted
+     */
     public function fetch_between($confirmed, $deleted, $start_date, $end_date) {
       // Return summary data on all the alerts that were created between $start_date
       // and $end_date (inclusive) and whose confirmed and deleted values match the booleans
@@ -79,6 +83,10 @@ 
 
 // FUNCTION: fetch
 
+    /**
+     * @param integer $confirmed
+     * @param integer $deleted
+     */
     public function fetch($confirmed, $deleted) {
         // Pass it an alert id and it will fetch data about alerts from the db
         // and put it all in the appropriate variables.
@@ -320,6 +328,9 @@ 
         }
     }
 
+    /**
+     * @param string $email
+     */
     public function email_exists($email) {
         // Returns true if there's a user with this email address.
 

Indentation +5 added lines, -5 removed lines

@@ -52,9 +52,9 @@ 
 // FUNCTION: fetch_between
 
     public function fetch_between($confirmed, $deleted, $start_date, $end_date) {
-      // Return summary data on all the alerts that were created between $start_date
-      // and $end_date (inclusive) and whose confirmed and deleted values match the booleans
-      // passed in $confirmed and $deleted
+        // Return summary data on all the alerts that were created between $start_date
+        // and $end_date (inclusive) and whose confirmed and deleted values match the booleans
+        // passed in $confirmed and $deleted
         $q = $this->db->query("SELECT   criteria, count(*) as cnt
             FROM     alerts
             WHERE    confirmed = :confirmed
@@ -69,8 +69,8 @@ 
             ));
         $data = array();
     for ($row=0; $row<$q->rows(); $row++) {
-      $contents = array('criteria' => $q->field($row, 'criteria'), 'count' => $q->field($row, 'cnt'));
-          $data[] = $contents;
+        $contents = array('criteria' => $q->field($row, 'criteria'), 'count' => $q->field($row, 'cnt'));
+            $data[] = $contents;
     }
     $data = array ('alerts' => $data);
 

Spacing +16 added lines, -16 removed lines

@@ -41,7 +41,7 @@ 
     public $token_checked = null;
     private $alert_id = "";
     public $email = "";
-    public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $criteria = ""; // Sets the terms that are used to produce the search results.
 
     private $db;
 
@@ -68,11 +68,11 @@ 
             ':end_date' => $end_date
             ));
         $data = array();
-    for ($row=0; $row<$q->rows(); $row++) {
+    for ($row = 0; $row < $q->rows(); $row++) {
       $contents = array('criteria' => $q->field($row, 'criteria'), 'count' => $q->field($row, 'cnt'));
           $data[] = $contents;
     }
-    $data = array ('alerts' => $data);
+    $data = array('alerts' => $data);
 
     return $data;
     }
@@ -100,7 +100,7 @@ 
 
         $data = array();
 
-            for ($row=0; $row<$q->rows(); $row++) {
+            for ($row = 0; $row < $q->rows(); $row++) {
                 $contents = array(
                 'alert_id' 	=> $q->field($row, 'alert_id'),
                 'email' 	=> $q->field($row, 'email'),
@@ -112,13 +112,13 @@ 
                 $data[] = $contents;
             }
             $info = "Alert";
-            $data = array ('info' => $info, 'data' => $data);
+            $data = array('info' => $info, 'data' => $data);
 
 
             return $data;
     }
 
-    public function add($details, $confirmation_email=false, $instantly_confirm=true) {
+    public function add($details, $confirmation_email = false, $instantly_confirm = true) {
 
         // Adds a new alert's info into the database.
         // Then calls another function to send them a confirmation email.
@@ -182,7 +182,7 @@ 
             // This gives a code for their email address which is then joined
             // to the timestamp so as to provide a unique ID for each alert.
 
-            $token = substr( password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16 );
+            $token = substr(password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16);
 
             // Full stops don't work well at the end of URLs in emails,
             // so replace them. We won't be doing anything clever with the hash
@@ -255,19 +255,19 @@ 
 
         $urltoken = $this->alert_id . '-' . $this->registrationtoken;
 
-        if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
+        if (isset($details['confirm_base']) && $details['confirm_base'] !== '') {
             $confirmurl = $details['confirm_base'] . $urltoken;
         } else {
             $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
         }
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME' 	=> 'THEY WORK FOR YOU',
             'LASTNAME' 		=> ' ALERT CONFIRMATION',
             'CONFIRMURL'	=> $confirmurl,
@@ -283,7 +283,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup'
         );
@@ -291,7 +291,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME' 	=> 'THEY WORK FOR YOU',
             'LASTNAME' 		=> ' ALERT ALREADY SIGNED UP',
             'CRITERIA'	=> $this->criteria_pretty()
@@ -442,17 +442,17 @@ 
     public function email() { return $this->email; }
     public function criteria() { return $this->criteria; }
     public function criteria_pretty($html = false) {
-        $criteria = explode(' ',$this->criteria);
+        $criteria = explode(' ', $this->criteria);
         $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($this->criteria));
         $words = array();
         foreach ($criteria as $c) {
-            if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $words[] = $c;
             }
         }
         $criteria = '';
-        if (count($words)) $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
-        if ($spokenby) $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        if (count($words)) $criteria .= ($html ? '<li>' : '* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html ? '</li>' : '') . "\n";
+        if ($spokenby) $criteria .= ($html ? '<li>' : '* ') . "Things by " . implode(' or ', $spokenby) . ($html ? '</li>' : '') . "\n";
         return $criteria;
     }
 

Braces +53 added lines, -25 removed lines

@@ -149,7 +149,8 @@ 
                         ':criteria' => $criteria
                     ));
                 return 1;
-            } else {
+            }
+            else {
                 return -2;
             }
         }
@@ -210,11 +211,13 @@ 
                     if ($success) {
                         // Email sent OK
                         return 1;
-                    } else {
+                    }
+                    else {
                         // Couldn't send the email.
                         return -1;
                     }
-                } elseif ($instantly_confirm) {
+                }
+                elseif ($instantly_confirm) {
                     // No confirmation email needed.
                     $s = $this->db->query("UPDATE alerts
                         SET confirmed = '1'
@@ -224,12 +227,14 @@ 
                         ));
                     return 1;
                 }
-            } else {
+            }
+            else {
                 // Couldn't add the registration token to the DB.
                 return -1;
             }
 
-        } else {
+        }
+        else {
             // Couldn't add the user's data to the DB.
             return -1;
         }
@@ -257,7 +262,8 @@ 
 
         if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
             $confirmurl = $details['confirm_base'] . $urltoken;
-        } else {
+        }
+        else {
             $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
         }
 
@@ -277,7 +283,8 @@ 
         $success = send_template_email($data, $merge);
         if ($success) {
             return true;
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -300,7 +307,8 @@ 
         $success = send_template_email($data, $merge);
         if ($success) {
             return true;
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -315,7 +323,8 @@ 
             ));
         if ($q->rows() > 0) {
             return true;
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -330,27 +339,32 @@ 
                 ));
             if ($q->rows() > 0) {
                 return true;
-            } else {
+            }
+            else {
                 return false;
             }
-        } else {
+        }
+        else {
             return false;
         }
 
     }
 
     public function check_token($token) {
-        if (!is_null($this->token_checked))
-            return $this->token_checked;
+        if (!is_null($this->token_checked)) {
+                    return $this->token_checked;
+        }
 
         $arg = strstr($token, '::') ? '::' : '-';
         $token_parts = explode($arg, $token);
-        if (count($token_parts) != 2)
-            return false;
+        if (count($token_parts) != 2) {
+                    return false;
+        }
 
         list($alert_id, $registrationtoken) = $token_parts;
-        if (!is_numeric($alert_id) || !$registrationtoken)
-            return false;
+        if (!is_numeric($alert_id) || !$registrationtoken) {
+                    return false;
+        }
 
         $q = $this->db->query("SELECT alert_id, email, criteria
                         FROM alerts
@@ -362,7 +376,8 @@ 
                         ));
         if (!$q->rows()) {
             $this->token_checked = false;
-        } else {
+        }
+        else {
             $this->token_checked = array(
                 'id' => $q->field(0, 'alert_id'),
                 'email' => $q->field(0, 'email'),
@@ -384,7 +399,8 @@ 
 
         if (!$q->rows()) {
             return false;
-        } else {
+        }
+        else {
             return array(
                 'id' => $q->field(0, 'alert_id'),
                 'email' => $q->field(0, 'email'),
@@ -398,7 +414,9 @@ 
     // If all goes well the alert will be confirmed.
     // The alert will be active when scripts run each day to send the actual emails.
     public function confirm($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $this->criteria = $alert['criteria'];
         $this->email = $alert['email'];
         $r = $this->db->query("UPDATE alerts SET confirmed = 1, deleted = 0 WHERE alert_id = :alert_id", array(
@@ -412,7 +430,9 @@ 
     // and the deletion page has passed the token from the URL to here.
     // If all goes well the alert will be flagged as deleted.
     public function delete($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("UPDATE alerts SET deleted = 1 WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -421,7 +441,9 @@ 
     }
 
     public function suspend($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("UPDATE alerts SET deleted = 2 WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -430,7 +452,9 @@ 
     }
 
     public function resume($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("UPDATE alerts SET deleted = 0 WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -451,8 +475,12 @@ 
             }
         }
         $criteria = '';
-        if (count($words)) $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
-        if ($spokenby) $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        if (count($words)) {
+            $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
+        }
+        if ($spokenby) {
+            $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        }
         return $criteria;
     }
 

www/includes/easyparliament/commentlist.php

Doc Comments +3 added lines

@@ -44,6 +44,9 @@
     }
 
 
+    /**
+     * @param string $view
+     */
     public function display ($view, $args=array(), $format='html') {
         // $view is what we're viewing by:
         //	'ep' is all the comments attached to an epobject.

Indentation +2 added lines, -2 removed lines

@@ -318,7 +318,7 @@ 
         return $data;
     }
 
-  public function _get_data_by_dates($args) {
+    public function _get_data_by_dates($args) {
     // $args should contain start_date and end_date
 
         twfy_debug (get_class($this), "getting data by recent");
@@ -338,7 +338,7 @@ 
         $commentsdata = $this->_get_comment_data($input);
         $data['comments'] = $commentsdata;
         return $data;
-  }
+    }
 
     public function _get_data_by_search($args) {
         // $args should contain 'num', indicating how many to get.

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

@@ -542,11 +542,11 @@
         }
         if ($limit != '') {
             # Can't use parameter as >1 argument
-            $limit = "LIMIT $limit";
+            $limit = "limit $limit";
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query ("select $fields
                         FROM 	comments
                         $join
                         WHERE $where

Braces +22 added lines, -11 removed lines

@@ -66,7 +66,8 @@ 
             // Get all the dta that's to be rendered.
             $data = $this->$function($args);
 
-        } else {
+        }
+        else {
             // Don't have a valid $view;
             $PAGE->error_message ("You haven't specified a view type.");
             return false;
@@ -74,11 +75,14 @@ 
 
         if ($view == 'user') {
             $template = 'comments_user';
-        } elseif ($view == 'recent' or $view == 'dates') {
+        }
+        elseif ($view == 'recent' or $view == 'dates') {
             $template = 'comments_recent';
-        } elseif ($view == 'search') {
+        }
+        elseif ($view == 'search') {
             $template = 'comments_search';
-        } else {
+        }
+        else {
             $template = 'comments';
         }
 
@@ -149,13 +153,15 @@ 
 
         if (isset($args['num']) && is_numeric($args['num'])) {
             $num = $args['num'];
-        } else {
+        }
+        else {
             $num = 10;
         }
 
         if (isset($args['page']) && is_numeric($args['page']) && $args['page']>1) {
             $page = $args['page'];
-        } else {
+        }
+        else {
             $page = 1;
         }
 
@@ -270,13 +276,15 @@ 
 
         if (isset($args['num']) && is_numeric($args['num'])) {
             $num = $args['num'];
-        } else {
+        }
+        else {
             $num = 25;
         }
 
         if (isset($args['page']) && is_numeric($args['page'])) {
             $page = $args['page'];
-        } else {
+        }
+        else {
             $page = 1;
         }
 
@@ -310,7 +318,8 @@ 
             $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0,'lordofname'));
             $q = 'SELECT COUNT(*) AS count FROM comments,hansard WHERE visible=1 AND comments.epobject_id = hansard.epobject_id and hansard.person_id = :pid';
             $params[':pid'] = $args['pid'];
-        } else {
+        }
+        else {
             $q = 'SELECT COUNT(*) AS count FROM comments WHERE visible=1';
         }
         $q = $this->db->query($q, $params);
@@ -350,13 +359,15 @@ 
 
         if (isset($args['num']) && is_numeric($args['num'])) {
             $num = $args['num'];
-        } else {
+        }
+        else {
             $num = 10;
         }
 
         if (isset($args['page']) && is_numeric($args['page'])) {
             $page = $args['page'];
-        } else {
+        }
+        else {
             $page = 1;
         }
 

Spacing +46 added lines, -46 removed lines

@@ -42,7 +42,7 @@ 
     }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is what we're viewing by:
         //	'ep' is all the comments attached to an epobject.
         //	'user' is all the comments written by a user.
@@ -60,13 +60,13 @@ 
 
         if ($view == 'ep' || $view == 'user' || $view == 'recent' || $view == 'search' || $view == 'dates') {
             // What function do we call for this view?
-            $function = '_get_data_by_'.$view;
+            $function = '_get_data_by_' . $view;
             // Get all the dta 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;
         }
 
@@ -85,29 +85,29 @@ 
         return true;
     }
 
-    public function render($data, $format='html', $template='comments') {
-        include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
+    public function render($data, $format = 'html', $template = 'comments') {
+        include (INCLUDESPATH . "easyparliament/templates/$format/$template.php");
     }
 
     public function _get_data_by_ep($args) {
         // Get all the data attached to an epobject.
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by epobject");
+        twfy_debug(get_class($this), "getting data by epobject");
 
         // What we return.
         $data = array();
         if (!is_numeric($args['epobject_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid epobject id");
+            $PAGE->error_message("Sorry, we don't have a valid epobject id");
             return $data;
         }
 
         // For getting the data.
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
-            'where' => array (
+            'where' => array(
                 'comments.epobject_id=' => $args['epobject_id'],
                 #'visible=' => '1'
             ),
@@ -135,13 +135,13 @@ 
         // comments by things in $args?
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by user");
+        twfy_debug(get_class($this), "getting data by user");
 
         // What we return.
         $data = array();
 
         if (!is_numeric($args['user_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid user id");
+            $PAGE->error_message("Sorry, we don't have a valid user id");
             return $data;
         }
 
@@ -151,13 +151,13 @@ 
             $num = 10;
         }
 
-        if (isset($args['page']) && is_numeric($args['page']) && $args['page']>1) {
+        if (isset($args['page']) && is_numeric($args['page']) && $args['page'] > 1) {
             $page = $args['page'];
         } else {
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
         // We're getting the most recent comments posted to epobjects.
         // We're grouping them by epobject so we can just link to each hansard thing once.
@@ -193,10 +193,10 @@ 
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // All the basic stuff...
-                $comments[$n] = array (
+                $comments[$n] = array(
                     'comment_id'		=> $q->field($n, 'comment_id'),
                     'posted'			=> $q->field($n, 'posted'),
                     'total_comments'	=> $q->field($n, 'total_comments'),
@@ -208,7 +208,7 @@ 
                 );
 
                 // Add the URL...
-                $urldata = array (
+                $urldata = array(
                     'major' 		=> $q->field($n, 'major'),
                     'gid'			=> $q->field($n, 'gid'),
                     'comment_id'	=> $q->field($n, 'comment_id'),
@@ -234,14 +234,14 @@ 
 
                 $commentbodies = array();
 
-                for ($n=0; $n<$r->rows(); $n++) {
-                    $commentbodies[ $r->field($n, 'comment_id') ] = $r->field($n, 'body');
+                for ($n = 0; $n < $r->rows(); $n++) {
+                    $commentbodies[$r->field($n, 'comment_id')] = $r->field($n, 'body');
                 }
 
                 // This does rely on both this and the previous query returning
                 // stuff in the same order...
                 foreach ($comments as $n => $commentdata) {
-                    $comments[$n]['body'] = $commentbodies[ $comments[$n]['comment_id'] ];
+                    $comments[$n]['body'] = $commentbodies[$comments[$n]['comment_id']];
                 }
             }
         }
@@ -261,7 +261,7 @@ 
         // $args should contain 'num', indicating how many to get.
         // and perhaps pid too, for a particular person
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
 
         // What we return.
         $data = array();
@@ -278,7 +278,7 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
         $where = array(
             'visible=' => '1'
@@ -286,8 +286,8 @@ 
         if (isset($args['pid']) && is_numeric($args['pid'])) {
             $where['person_id='] = $args['pid'];
         }
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -305,7 +305,7 @@ 
             $data['pid'] = $args['pid'];
             $q = 'SELECT title, given_name, family_name, lordofname, house FROM member m, person_names p WHERE m.person_id=p.person_id AND p.type="name" AND left_house="9999-12-31" AND m.person_id = :pid';
             $q = $this->db->query($q, array(':pid' => $args['pid']));
-            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0,'lordofname'));
+            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0, 'lordofname'));
             $q = 'SELECT COUNT(*) AS count FROM comments,hansard WHERE visible=1 AND comments.epobject_id = hansard.epobject_id and hansard.person_id = :pid';
             $params[':pid'] = $args['pid'];
         } else {
@@ -319,15 +319,15 @@ 
   public function _get_data_by_dates($args) {
     // $args should contain start_date and end_date
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
         $data = array();
         $where = array(
             'visible=' => '1',
             'date(posted)>=' => $args['start_date'],
             'date(posted)<=' => $args['end_date']
         );
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -341,7 +341,7 @@ 
     public function _get_data_by_search($args) {
         // $args should contain 'num', indicating how many to get.
 
-        twfy_debug (get_class($this), "getting data by search");
+        twfy_debug(get_class($this), "getting data by search");
 
         // What we return.
         $data = array();
@@ -358,13 +358,13 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user'=> true
             ),
-            'where'  => array (
+            'where'  => array(
                 'comments.body LIKE' => "%$args[s]%"
             ),
             'order' => 'posted DESC',
@@ -391,7 +391,7 @@ 
         // It returns the URL for the comment.
 
         $major 		= $urldata['major'];
-        $gid 		= $urldata['gid'];
+        $gid = $urldata['gid'];
         $comment_id = $urldata['comment_id'];
         $user_id = isset($urldata['user_id']) ? $urldata['user_id'] : false;
 
@@ -405,7 +405,7 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url($page);
 
         $gid = fix_gid_from_db($gid); // In includes/utility.php
-        $URL->insert(array('id' => $gid ));
+        $URL->insert(array('id' => $gid));
         if ($user_id) {
             $URL->insert(array('u' => $user_id));
         }
@@ -483,9 +483,9 @@ 
         $limit = isset($input['limit']) ? $input['limit'] : '';
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr = array (
-            'comments' => array ('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
-            'hansard' => array ('major', 'gid')
+        $fieldsarr = array(
+            'comments' => array('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
+            'hansard' => array('major', 'gid')
         );
 
         // Yes, we need the gid of a comment's associated hansard object
@@ -496,7 +496,7 @@ 
 
         // Add on the stuff for getting a user's details.
         if (isset($amount['user']) && $amount['user'] == true) {
-            $fieldsarr['users'] = array ('firstname', 'lastname', 'user_id');
+            $fieldsarr['users'] = array('firstname', 'lastname', 'user_id');
             // Like doing "FROM comments, users" but it's easier to add
             // an "INNER JOIN..." automatically to the query.
             $join .= ' INNER JOIN users ON comments.user_id = users.user_id ';
@@ -507,7 +507,7 @@ 
             $fieldsarr['epobject'] = array('body');
         }
 
-        $fieldsarr2 = array ();
+        $fieldsarr2 = array();
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -518,13 +518,13 @@ 
                 if ($table == 'epobject' && $field == 'body') {
                     $field .= ' AS hbody';
                 }
-                $fieldsarr2[] = $table.'.'.$field;
+                $fieldsarr2[] = $table . '.' . $field;
             }
         }
         $fields = implode(', ', $fieldsarr2);
 
 
-        $wherearr2 = array ();
+        $wherearr2 = array();
         $params = array();
         $i = 0;
         // Construct the $where clause.
@@ -533,7 +533,7 @@ 
             $params[":where$i"] = $val;
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
         if ($order != '') {
             $order = "ORDER BY $order";
@@ -544,7 +544,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	comments
                         $join
                         WHERE $where
@@ -553,7 +553,7 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data = array ();
+        $data = array();
 
         if ($q->rows() > 0) {
 
@@ -563,7 +563,7 @@ 
             // We'll generate permalinks for each comment.
             // Assuming every comment is from the same major...
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // Put each row returned into its own array in $data.
                 foreach ($fieldsarr as $table => $tablesfields) {

www/includes/easyparliament/hansardlist.php

Doc Comments +13 added lines

@@ -114,6 +114,9 @@ 
 
 
 
+    /**
+     * @param string $view
+     */
     public function display ($view, $args=array(), $format='html') {
 
         // $view is what we're viewing by:
@@ -726,6 +729,10 @@ 
 
     }
 
+    /**
+     * @param string $from
+     * @param string $to
+     */
     private function check_gid_change($gid, $from, $to) {
         $input = array (
             'amount' => array (
@@ -1610,6 +1617,9 @@ 
 
     }
 
+    /**
+     * @param string $spid
+     */
     public function _get_mentions($spid) {
         $result = array();
         $q = $this->db->query("select gid, type, date, url, mentioned_gid
@@ -2622,6 +2632,9 @@ 
     public $commentspage = 'spwrans';
     public $gidprefix = 'uk.org.publicwhip/spwa/';
 
+    /**
+     * @return string
+     */
     public function get_gid_from_spid($spid) {
         // Fix the common errors of S.0 instead of S.O and leading
         // zeros in the numbers:

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

@@ -430,7 +430,7 @@ 
                     // Linking to the prev (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
                     $nextprevdata['prev'] = array (
-                        'body'		=> "Previous $thing",
+                        'body'		=> "previous $thing",
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
                     );
@@ -474,7 +474,7 @@ 
                     // Linking to the next (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
                     $nextprevdata['next'] = array (
-                        'body'		=> "Next $thing",
+                        'body'		=> "next $thing",
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
                     );
@@ -510,7 +510,7 @@ 
             $URL->remove(array('id'));
             $things = $hansardmajors[$itemdata['major']]['title'];
             $nextprevdata['up'] = array(
-                'body'	=> "All $things on " . format_date($itemdata['hdate'], SHORTDATEFORMAT),
+                'body'	=> "all $things on " . format_date($itemdata['hdate'], SHORTDATEFORMAT),
                 'title'	=> '',
                 'url' 	=> $URL->generate()
             );
@@ -559,7 +559,7 @@ 
 
             // The '!= NULL' bit is needed otherwise I was getting errors
             // when displaying the first day of debates.
-            if ($q->rows() > 0 && $q->field(0, 'hdate') != NULL) {
+            if ($q->rows() > 0 && $q->field(0, 'hdate') != null) {
 
                 $URL->insert( array( 'd'=>$q->field(0, 'hdate') ) );
 
@@ -1403,7 +1403,7 @@ 
                             WHERE	major = :major",
                 array(':major' => $this->major));
 
-            if ($q->field(0, 'hdate') != NULL) {
+            if ($q->field(0, 'hdate') != null) {
                 $recentdate = $q->field(0, 'hdate');
             } else {
                 $PAGE->error_message("Couldn't find the most recent date");
@@ -1724,7 +1724,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query ("select $fields
                         FROM 	hansard
                         $join
                         WHERE $where

Spacing +246 added lines, -246 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/searchengine.php";
-include_once INCLUDESPATH."easyparliament/searchlog.php";
+include_once INCLUDESPATH . "easyparliament/searchengine.php";
+include_once INCLUDESPATH . "easyparliament/searchlog.php";
 
 /*
 
@@ -53,7 +53,7 @@ 
 class HANSARDLIST {
     // This will be used to cache information about speakers on this page
     // so we don't have to keep fetching the same data from the DB.
-    public $speakers = array ();
+    public $speakers = array();
     /*
     $this->speakers[ $person_id ] = array (
         "name" => $name,
@@ -66,7 +66,7 @@ 
 
     // This will be used to cache mappings from epobject_id to gid,
     // so we don't have to continually fetch the same data in get_hansard_data().
-    public $epobjectid_to_gid = array ();
+    public $epobjectid_to_gid = array();
     /*
     $this->epobjectid_to_gid[ $epobject_id ] => $gid;
     */
@@ -114,7 +114,7 @@ 
 
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
 
         // $view is what we're viewing by:
         // 	'gid' is the gid of a hansard object,
@@ -141,17 +141,17 @@ 
         if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH))
             return false;
 
-        $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'search_min', 'search_video', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid');
+        $validviews = array('calendar', 'date', 'gid', 'person', 'search', 'search_min', 'search_video', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid');
         if (in_array($view, $validviews)) {
 
             // What function do we call for this view?
-            $function = '_get_data_by_'.$view;
+            $function = '_get_data_by_' . $view;
             // Get all the data that's to be rendered.
             $data = $this->$function($args);
 
         } else {
             // Don't have a valid $view.
-            $PAGE->error_message ("You haven't specified a view type.");
+            $PAGE->error_message("You haven't specified a view type.");
             return false;
         }
 
@@ -172,7 +172,7 @@ 
 
 
 
-    public function render($view, $data, $format='html') {
+    public function render($view, $data, $format = 'html') {
         // Once we have the data that's to be rendered,
         // include the template.
 
@@ -181,7 +181,7 @@ 
             return $data;
         }
 
-        include (INCLUDESPATH."easyparliament/templates/$format/hansard_$view" . ".php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/hansard_$view" . ".php");
         return true;
 
     }
@@ -226,13 +226,13 @@ 
             $hdate = $q->field(0, 'hdate');
             if ($hdate) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
-                $URL->insert( array('d'=>$hdate) );
+                $URL->insert(array('d'=>$hdate));
 
                 // Work out a timestamp which is handy for comparing to now.
                 list($year, $month, $date) = explode('-', $hdate);
-                $timestamp = gmmktime (0, 0, 0, $month, $date, $year);
+                $timestamp = gmmktime(0, 0, 0, $month, $date, $year);
 
-                $data = array (
+                $data = array(
                     'hdate'		=> $hdate,
                     'timestamp'	=> $timestamp,
                     'listurl'	=> $URL->generate()
@@ -266,7 +266,7 @@ 
         // Pass it an array of data about an item and it will return an
         // array of data about the item's section heading.
 
-        twfy_debug (get_class($this), "getting an item's section");
+        twfy_debug(get_class($this), "getting an item's section");
 
         if ($itemdata['htype'] != '10') {
 
@@ -275,11 +275,11 @@ 
             // so get the section info above this item.
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true
                 ),
-                'where' => array (
+                'where' => array(
                     'hansard.epobject_id=' => $itemdata['section_id']
                 )
             );
@@ -306,21 +306,21 @@ 
         // Pass it an array of data about an item and it will return an
         // array of data about the item's subsection heading.
 
-        twfy_debug (get_class($this), "getting an item's subsection");
+        twfy_debug(get_class($this), "getting an item's subsection");
 
         // What we return.
-        $subsectiondata = array ();
+        $subsectiondata = array();
 
         if ($itemdata['htype'] == '12' || $itemdata['htype'] == '13') {
             // This item is a speech or procedural, so get the
             // subsection info above this item.
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true
                 ),
-                'where' => array (
+                'where' => array(
                     'hansard.epobject_id=' => $itemdata['subsection_id']
                 )
             );
@@ -347,7 +347,7 @@ 
         // Pass it an array of item info, of a section/subsection, and this will return
         // data for the next/prev items.
 
-        twfy_debug (get_class($this), "getting next/prev items");
+        twfy_debug(get_class($this), "getting next/prev items");
 
         // What we return.
         $nextprevdata = array();
@@ -413,8 +413,8 @@ 
             $wherearr['hansard.epobject_id='] = $prev_item_id;
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'speaker' => true
                 ),
@@ -429,7 +429,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the prev (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['prev'] = array (
+                    $nextprevdata['prev'] = array(
                         'body'		=> "Previous $thing",
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
@@ -442,7 +442,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['prev'] = array (
+                    $nextprevdata['prev'] = array(
                         'body'		=> 'Previous speaker',
                         'url'		=> $prevdata[0]['commentsurl'],
                         'title'		=> $title
@@ -458,8 +458,8 @@ 
             $wherearr['hansard.epobject_id='] = $next_item_id;
 
             // For getting hansard data.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'speaker' => true
                 ),
@@ -473,7 +473,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the next (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['next'] = array (
+                    $nextprevdata['next'] = array(
                         'body'		=> "Next $thing",
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
@@ -486,7 +486,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['next'] = array (
+                    $nextprevdata['next'] = array(
                         'body'		=> 'Next speaker',
                         'url'		=> $nextdata[0]['commentsurl'],
                         'title'		=> $title
@@ -530,14 +530,14 @@ 
         // containing the next/prev dates that contain items from
         // $this->major of hansard object.
 
-        twfy_debug (get_class($this), "getting next/prev dates");
+        twfy_debug(get_class($this), "getting next/prev dates");
 
         // What we return.
-        $nextprevdata = array ();
+        $nextprevdata = array();
 
         $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
 
-        $looper = array ("next", "prev");
+        $looper = array("next", "prev");
 
         foreach ($looper as $n => $nextorprev) {
 
@@ -561,7 +561,7 @@ 
             // when displaying the first day of debates.
             if ($q->rows() > 0 && $q->field(0, 'hdate') != NULL) {
 
-                $URL->insert( array( 'd'=>$q->field(0, 'hdate') ) );
+                $URL->insert(array('d'=>$q->field(0, 'hdate')));
 
                 if ($nextorprev == 'next') {
                     $body = 'Next day';
@@ -571,7 +571,7 @@ 
 
                 $title = format_date($q->field(0, 'hdate'), SHORTDATEFORMAT);
 
-                $nextprevdata[$nextorprev] = array (
+                $nextprevdata[$nextorprev] = array(
                     'hdate'		=> $q->field(0, 'hdate'),
                     'url'	 	=> $URL->generate(),
                     'body'		=> $body,
@@ -585,7 +585,7 @@ 
         $thing = $hansardmajors[$this->major]['plural'];
         $URL->insert(array('y'=>$year));
 
-        $nextprevdata['up'] = array (
+        $nextprevdata['up'] = array(
             'body' 	=> "All of $year's $thing",
             'title'	=> '',
             'url' 	=> $URL->generate()
@@ -606,19 +606,19 @@ 
         if (isset($args['date'])) {
             $date = $args['date'];
         } else {
-            $PAGE->error_message ("Sorry, we don't have a date.");
+            $PAGE->error_message("Sorry, we don't have a date.");
             return false;
         }
 
         if (!preg_match("/^(\d\d\d\d)-(\d{1,2})-(\d{1,2})$/", $date, $matches)) {
-            $PAGE->error_message ("Sorry, '" . _htmlentities($date) . "' isn't of the right format (YYYY-MM-DD).");
+            $PAGE->error_message("Sorry, '" . _htmlentities($date) . "' isn't of the right format (YYYY-MM-DD).");
             return false;
         }
 
         list(, $year, $month, $day) = $matches;
 
         if (!checkdate($month, $day, $year)) {
-            $PAGE->error_message ("Sorry, '" . _htmlentities($date) . "' isn't a valid date.");
+            $PAGE->error_message("Sorry, '" . _htmlentities($date) . "' isn't a valid date.");
             return false;
         }
 
@@ -636,29 +636,29 @@ 
         global $PAGE;
 
         if (!isset($args['gid']) && $args['gid'] == '') {
-            $PAGE->error_message ("Sorry, we don't have an item gid.");
+            $PAGE->error_message("Sorry, we don't have an item gid.");
             return false;
         }
 
 
         // Get all the data just for this epobject_id.
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'body' => true,
                 'speaker' => true,
                 'comment' => true,
                 'votes' => true
             ),
-            'where' => array (
+            'where' => array(
                 // Need to add the 'uk.org.publicwhip/debate/' or whatever on before
                 // looking in the DB.
                 'gid=' => $this->gidprefix . $args['gid']
             )
         );
 
-        twfy_debug (get_class($this), "looking for redirected gid");
+        twfy_debug(get_class($this), "looking for redirected gid");
         $gid = $this->gidprefix . $args['gid'];
-        $q = $this->db->query ("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
+        $q = $this->db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
         if ($q->rows() == 0) {
             $itemdata = $this->_get_hansard_data($input);
         } else {
@@ -666,10 +666,10 @@ 
                 $gid = $q->field(0, 'gid_to');
                 $q = $this->db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
             } while ($q->rows() > 0);
-            twfy_debug (get_class($this), "found redirected gid $gid" );
+            twfy_debug(get_class($this), "found redirected gid $gid");
             $input['where'] = array('gid=' => $gid);
             $itemdata = $this->_get_hansard_data($input);
-            if (count($itemdata) > 0 ) {
+            if (count($itemdata) > 0) {
                 throw new RedirectException(fix_gid_from_db($gid));
             }
         }
@@ -683,9 +683,9 @@ 
             $this->check_gid_change($args['gid'], 'a', '');
 
             if (substr($args['gid'], -1) == 'L') {
-                $letts = array('a','b','c','d','e');
-                for ($i=0; $i<4; $i++) {
-                    $this->check_gid_change($args['gid'], $letts[$i], $letts[$i+1]);
+                $letts = array('a', 'b', 'c', 'd', 'e');
+                for ($i = 0; $i < 4; $i++) {
+                    $this->check_gid_change($args['gid'], $letts[$i], $letts[$i + 1]);
                 }
             }
 
@@ -718,7 +718,7 @@ 
             #	$u = $q->field(0, 'source_url');
             #	$u = '<br><a href="'. $u . '">' . $u . '</a>';
             #}
-            $PAGE->error_message ("Sorry, there is no Hansard object with a gid of '" . _htmlentities($args['gid']) . "'.");
+            $PAGE->error_message("Sorry, there is no Hansard object with a gid of '" . _htmlentities($args['gid']) . "'.");
             return false;
         }
 
@@ -727,8 +727,8 @@ 
     }
 
     private function check_gid_change($gid, $from, $to) {
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'body' => true,
                 'speaker' => true,
                 'comment' => true,
@@ -752,10 +752,10 @@ 
 
         global $DATA, $this_page;
 
-        twfy_debug (get_class($this), "getting data by date");
+        twfy_debug(get_class($this), "getting data by date");
 
         // Where we'll put all the data we want to render.
-        $data = array ();
+        $data = array();
 
         $date = $this->_validate_date($args);
 
@@ -769,13 +769,13 @@ 
 
             // Get all the sections for this date.
             // Then for each of those we'll get the subsections and rows.
-            $input = array (
-                'amount' => array (
+            $input = array(
+                'amount' => array(
                     'body' => true,
                     'comment' => true,
                     'excerpt' => true
                 ),
-                'where' => array (
+                'where' => array(
                     'hdate=' => "$date",
                     'htype=' => '10',
                     'major=' => $this->major
@@ -791,20 +791,20 @@ 
                 $data['rows'] = array();
 
                 $num_sections = count($sections);
-                for ($n=0; $n<$num_sections; $n++) {
+                for ($n = 0; $n < $num_sections; $n++) {
                     // For each section on this date, get the subsections within it.
 
                     // Get all the section data.
                     $sectionrow = $this->_get_section($sections[$n]);
 
                     // Get the subsections within the section.
-                    $input = array (
-                        'amount' => array (
+                    $input = array(
+                        'amount' => array(
                             'body' => true,
                             'comment' => true,
                             'excerpt' => true
                         ),
-                        'where' => array (
+                        'where' => array(
                             'section_id='	=> $sections[$n]['epobject_id'],
                             'htype='		=> '11',
                             'major='		=> $this->major
@@ -815,10 +815,10 @@ 
                     $rows = $this->_get_hansard_data($input);
 
                     // Put the section at the top of the rows array.
-                    array_unshift ($rows, $sectionrow);
+                    array_unshift($rows, $sectionrow);
 
                     // Add the section heading and the subsections to the full list.
-                    $data['rows'] = array_merge ($data['rows'], $rows);
+                    $data['rows'] = array_merge($data['rows'], $rows);
                 }
             }
 
@@ -854,9 +854,9 @@ 
             $major = '';
         }
 
-        $data = array ();
+        $data = array();
 
-        $q = $this->db->query ("SELECT DISTINCT(hdate)
+        $q = $this->db->query("SELECT DISTINCT(hdate)
                         FROM 	hansard
                         $major
                         ORDER BY hdate DESC
@@ -867,7 +867,7 @@ 
 
             $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
                 $rowdata = array();
 
                 $rowdata['body'] = format_date($q->field($n, 'hdate'), SHORTDATEFORMAT);
@@ -896,7 +896,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;
         }
 
@@ -936,8 +936,8 @@ 
 
         $speeches = array();
         if ($q->rows() > 0) {
-            for ($n=0; $n<$q->rows(); $n++) {
-                $speech = array (
+            for ($n = 0; $n < $q->rows(); $n++) {
+                $speech = array(
                     'subsection_id'	=> $q->field($n, 'subsection_id'),
                     'section_id'	=> $q->field($n, 'section_id'),
                     'htype'		=> $q->field($n, 'htype'),
@@ -952,9 +952,9 @@ 
                     'gid'		=> fix_gid_from_db($q->field($n, 'gid')),
                 );
                 // Cache parent id to speed up _get_listurl
-                $this->epobjectid_to_gid[$q->field($n, 'subsection_id') ] = fix_gid_from_db( $q->field($n, 'gid_subsection') );
+                $this->epobjectid_to_gid[$q->field($n, 'subsection_id')] = fix_gid_from_db($q->field($n, 'gid_subsection'));
 
-                $url_args = array ('p'=>$q->field($n, 'person_id'));
+                $url_args = array('p'=>$q->field($n, 'person_id'));
                 $speech['listurl'] = $this->_get_listurl($speech, $url_args);
                 $speeches[] = $speech;
             }
@@ -963,7 +963,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;
@@ -1001,7 +1001,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");
@@ -1010,14 +1010,14 @@ 
         }
 
         // What we'll return.
-        $data = array ();
+        $data = array();
 
         $data['info']['s'] = $args['s'];
 
         // Allows us to specify how many results we want
         // Mainly for glossary term adding
         if (isset($args['num']) && $args['num']) {
-            $results_per_page = $args['num']+0;
+            $results_per_page = $args['num'] + 0;
         }
         else {
             $results_per_page = 20;
@@ -1045,16 +1045,16 @@ 
         global $SEARCHENGINE;
 
         // For Xapian's equivalent of an SQL LIMIT clause.
-        $first_result = ($page-1) * $results_per_page;
+        $first_result = ($page - 1) * $results_per_page;
         $data['info']['first_result'] = $first_result + 1; // Take account of LIMIT's 0 base.
 
         // Get the gids from Xapian
         $sort_order = 'date';
         if (isset($args['o'])) {
-            if ($args['o']=='d') $sort_order = 'newest';
-            if ($args['o']=='o') $sort_order = 'oldest';
-            elseif ($args['o']=='c') $sort_order = 'created';
-            elseif ($args['o']=='r') $sort_order = 'relevance';
+            if ($args['o'] == 'd') $sort_order = 'newest';
+            if ($args['o'] == 'o') $sort_order = 'oldest';
+            elseif ($args['o'] == 'c') $sort_order = 'created';
+            elseif ($args['o'] == 'r') $sort_order = 'relevance';
         }
 
         $data['searchdescription'] = $SEARCHENGINE->query_description_long();
@@ -1064,7 +1064,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,
@@ -1079,7 +1079,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();
@@ -1095,13 +1095,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;
                 }
@@ -1163,7 +1163,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");
@@ -1177,14 +1177,14 @@ 
 
                 $itemdata = $q->row(0);
                 $itemdata['collapsed']  = $collapsed;
-                $itemdata['gid']        = fix_gid_from_db( $q->field(0, 'gid') );
+                $itemdata['gid']        = fix_gid_from_db($q->field(0, 'gid'));
                 $itemdata['relevance']  = $relevancy;
                 $itemdata['extract']    = $this->prepare_search_result_for_display($q->field(0, 'body'));
 
                 //////////////////////////
                 // 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'],
@@ -1195,7 +1195,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);
 
@@ -1241,14 +1241,14 @@ 
                     if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
                     if (isset($subsection['listurl'])) $listurl = $subsection['listurl'];
                     else $listurl = '';
-                    $itemdata['parent'] = array (
+                    $itemdata['parent'] = array(
                         'body' => $body,
                         'listurl' => $listurl
                     );
                     if ($itemdata['htype'] == 11) {
                         # Search result was a subsection heading; fetch the first entry
                         # from the wrans/wms to show under the heading
-                        $input = array (
+                        $input = array(
                             'amount' => array(
                                 'body' => true,
                                 'speaker' => true
@@ -1303,7 +1303,7 @@ 
         }
 
         // Trim it to length and position, adding ellipses.
-        $extract = trim_characters ($extract, $startpos, $length_of_extract);
+        $extract = trim_characters($extract, $startpos, $length_of_extract);
 
         // Highlight search words
         $extract = $SEARCHENGINE->highlight($extract);
@@ -1490,7 +1490,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
@@ -1503,7 +1503,7 @@ 
             // We put the data in this array. See top of function for the structure.
             $years = array();
 
-            for ($row=0; $row<$q->rows(); $row++) {
+            for ($row = 0; $row < $q->rows(); $row++) {
 
                 list($year, $month, $day) = explode('-', $q->field($row, 'hdate'));
 
@@ -1557,9 +1557,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()
@@ -1567,8 +1567,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
@@ -1616,7 +1616,7 @@ 
             from mentions where gid like 'uk.org.publicwhip/spq/$spid'
             order by date, type");
         $nrows = $q->rows();
-        for ($i=0; $i < $nrows; $i++) {
+        for ($i = 0; $i < $nrows; $i++) {
             $result[$i] = $q->row($i);
         }
         return $result;
@@ -1663,14 +1663,14 @@ 
         // $input['limit'] as a string for the $limit clause, eg '21,20'.
 
         $amount 		= isset($input['amount']) ? $input['amount'] : array();
-        $wherearr 		= isset($input['where']) ? $input['where'] : array();
+        $wherearr = isset($input['where']) ? $input['where'] : array();
         $order 			= isset($input['order']) ? $input['order'] : '';
         $limit 			= isset($input['limit']) ? $input['limit'] : '';
 
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr = array (
-            'hansard' => array ('epobject_id', 'htype', 'gid', 'hpos', 'section_id', 'subsection_id', 'hdate', 'htime', 'source_url', 'major', 'minor', 'video_status', 'colnum')
+        $fieldsarr = array(
+            'hansard' => array('epobject_id', 'htype', 'gid', 'hpos', 'section_id', 'subsection_id', 'hdate', 'htime', 'source_url', 'major', 'minor', 'video_status', 'colnum')
         );
 
         $params = array();
@@ -1682,23 +1682,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) {
@@ -1706,7 +1706,7 @@ 
             $wherearr2[] = "$key :where$i";
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
 
         if ($order != '') {
@@ -1724,7 +1724,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	hansard
                         $join
                         WHERE $where
@@ -1733,11 +1733,11 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data = array ();
+        $data = array();
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // Where we'll store the data for this item before adding
                 // it to $data.
@@ -1753,23 +1753,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]);
                     }
                 }
@@ -1782,7 +1782,7 @@ 
                 // Get the number of items within a section or subsection.
                 // It could be that we can do this in the main query?
                 // Not sure.
-                if ( ($this->major && $hansardmajors[$this->major]['type']=='debate') && ($item['htype'] == '10' || $item['htype'] == '11') ) {
+                if (($this->major && $hansardmajors[$this->major]['type'] == 'debate') && ($item['htype'] == '10' || $item['htype'] == '11')) {
 
                     if ($item['htype'] == '10') {
                         // Section - get a count of items within this section that
@@ -1843,7 +1843,7 @@ 
                 // 'commentsurl' is the URL of the item on its own page, with comments.
 
                 // All the things we need to work out a listurl!
-                $item_data = array (
+                $item_data = array(
                     'major'			=> $this->major,
                     'minor' 		=> $item['minor'],
                     'htype' 		=> $item['htype'],
@@ -1876,11 +1876,11 @@ 
                     $item['htype'] == '12') {
                     // Debate speech or written answers (not questions).
 
-                    $item['votes'] = $this->_get_votes( $item['epobject_id'] );
+                    $item['votes'] = $this->_get_votes($item['epobject_id']);
                 }
 
                 // Get the speaker for this item, if applicable.
-                if ( (isset($amount['speaker']) && $amount['speaker'] == true) &&
+                if ((isset($amount['speaker']) && $amount['speaker'] == true) &&
                     $item['person_id'] != '') {
 
                     $item['speaker'] = $this->_get_speaker($item['person_id'], $item['hdate'], $item['htime'], $item['major']);
@@ -1891,7 +1891,7 @@ 
                 if (isset($amount['comment']) && $amount['comment'] == true) {
 
                     // All the things we need to get the comment data.
-                    $item_data = array (
+                    $item_data = array(
                         'htype' => $item['htype'],
                         'epobject_id' => $item['epobject_id']
                     );
@@ -1965,7 +1965,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).
@@ -1994,7 +1994,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.
@@ -2007,10 +2007,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.
@@ -2023,10 +2023,10 @@ 
                 if ($r->rows() > 0) {
                     // Remove the "uk.org.publicwhip/blah/" from the gid:
                     // (In includes/utility.php)
-                    $parent_gid = fix_gid_from_db( $r->field(0, 'gid') );
+                    $parent_gid = fix_gid_from_db($r->field(0, '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;
                 }
             }
 
@@ -2036,18 +2036,18 @@ 
                     if (isset($this->bill_lookup[$minor])) {
                         list($title, $session) = $this->bill_lookup[$minor];
                     } else {
-                        $qq = $this->db->query('select title, session from bills where id='.$minor);
+                        $qq = $this->db->query('select title, session from bills where id=' . $minor);
                         $title = $qq->field(0, 'title');
                         $session = $qq->field(0, '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']);
@@ -2055,7 +2055,7 @@ 
         }
 
         if (count($url_args) > 0) {
-            $LISTURL->insert( $url_args);
+            $LISTURL->insert($url_args);
         }
 
         return $LISTURL->generate($encode) . $fragment;
@@ -2118,10 +2118,10 @@ 
         $member = $this->_get_speaker_alone($q->data, $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'],
@@ -2168,13 +2168,13 @@ 
 
     private function _get_speaker_url($house) {
         $URL = new \MySociety\TheyWorkForYou\Url('mp'); # Default, house=1
-        if ($house==2) {
+        if ($house == 2) {
             $URL = new \MySociety\TheyWorkForYou\Url('peer');
-        } elseif ($house==3) {
+        } elseif ($house == 3) {
             $URL = new \MySociety\TheyWorkForYou\Url('mla');
-        } elseif ($house==4) {
+        } elseif ($house == 4) {
             $URL = new \MySociety\TheyWorkForYou\Url('msp');
-        } elseif ($house==0) {
+        } elseif ($house == 0) {
             $URL = new \MySociety\TheyWorkForYou\Url('royal');
         }
         return $URL;
@@ -2190,7 +2190,7 @@ 
         if (!$rows) {
             return $offices;
         }
-        for ($row=0; $row<$rows; $row++) {
+        for ($row = 0; $row < $rows; $row++) {
             $dept = $q->field($row, 'dept');
             $pos = $q->field($row, 'position');
             $source = $q->field($row, 'source');
@@ -2249,12 +2249,12 @@ 
                     array(':epobject_id' => $item_data['epobject_id']));
 
                 // Add this comment to the data structure.
-                $comment = array (
+                $comment = array(
                     'comment_id' => $q->field(0, 'comment_id'),
                     'user_id'	=> $q->field(0, 'user_id'),
                     'body'		=> $q->field(0, 'body'),
                     'posted'	=> $q->field(0, 'posted'),
-                    'username'	=> $q->field(0, 'firstname') .' '. $q->field(0, 'lastname')
+                    'username'	=> $q->field(0, 'firstname') . ' ' . $q->field(0, 'lastname')
                 );
             }
 
@@ -2264,7 +2264,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
         );
@@ -2278,7 +2278,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
@@ -2362,7 +2362,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);
@@ -2371,25 +2371,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')) {
+        if (isset($itemdata['major']) && $hansardmajors[$itemdata['major']]['type'] == 'other' and ($itemdata['htype'] == '12' or $itemdata['htype'] == '13')) {
             // 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'],
@@ -2399,7 +2399,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']);
@@ -2451,16 +2451,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'];
@@ -2469,7 +2469,7 @@ 
                 $nextprev['up']['url'] 		= $sectionrow['listurl'];
                 $nextprev['up']['title'] 	= $sectionrow['body'];
             }
-            $nextprev['up']['body']		= 'See the whole debate';
+            $nextprev['up']['body'] = 'See the whole debate';
         }
 
         // We can then access this from $PAGE and the templates.
@@ -2478,7 +2478,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,
@@ -2491,9 +2491,9 @@ 
 
             # $sectionrow['trackback'] = $this->_get_trackback_data($sectionrow);
 
-            $input = array (
+            $input = array(
                 'amount' => $amount,
-                'where' => array (
+                'where' => array(
                     'section_id=' => $itemdata['epobject_id'],
                     'subsection_id=' => $itemdata['epobject_id']
                 ),
@@ -2501,15 +2501,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
@@ -2527,9 +2527,9 @@ 
 
             # $subsectionrow['trackback'] = $this->_get_trackback_data($subsectionrow);
 
-            $input = array (
+            $input = array(
                 'amount' => $amount,
-                'where' => array (
+                'where' => array(
                     'subsection_id=' => $itemdata['epobject_id']
                 ),
                 'order' => 'hpos ASC'
@@ -2552,10 +2552,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;
 
@@ -2564,10 +2564,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);
@@ -2626,8 +2626,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)
@@ -2702,14 +2702,14 @@ 
                         ", array(':major' => $this->major));
 
         // What we return.
-        $data = array ();
+        $data = array();
         $speeches = array();
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
-                $speech = array (
+                $speech = array(
                     'subsection_id'	=> $q->field($n, 'subsection_id'),
                     'section_id'	=> $q->field($n, 'section_id'),
                     'htype'			=> $q->field($n, 'htype'),
@@ -2722,11 +2722,11 @@ 
 
                 // Remove the "uk.org.publicwhip/blah/" from the gid:
                 // (In includes/utility.php)
-                $speech['gid'] = fix_gid_from_db( $q->field($n, 'gid') );
+                $speech['gid'] = fix_gid_from_db($q->field($n, 'gid'));
 
                 $speech['listurl'] = $this->_get_listurl($speech);
 
-                $speech['speaker'] = $this->_get_speaker($q->field($n, 'person_id'), $q->field($n, 'hdate'), $q->field($n, 'htime'), $this->major );
+                $speech['speaker'] = $this->_get_speaker($q->field($n, 'person_id'), $q->field($n, 'hdate'), $q->field($n, 'htime'), $this->major);
 
                 $speeches[] = $speech;
             }
@@ -2736,10 +2736,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.
@@ -2758,7 +2758,7 @@ 
             $data['rows'] = $speeches;
 
         } else {
-            $data['rows'] = array ();
+            $data['rows'] = array();
         }
 
         $data['info']['days'] = $days;
@@ -2775,13 +2775,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();
 
@@ -2807,21 +2807,21 @@ 
 
         $q = $this->db->query($query, $params);
 
-        if ( $q->rows ) {
+        if ($q->rows) {
 
             // This array just used for getting further data about this debate.
-            $item_data = array (
+            $item_data = array(
                 'major'         => $this->major,
                 'minor'         => $q->field(0, 'minor'),
-                'gid'           => fix_gid_from_db( $q->field(0, 'gid') ),
+                'gid'           => fix_gid_from_db($q->field(0, 'gid')),
                 'htype'         => $q->field(0, 'htype'),
                 'section_id'    => $q->field(0, 'section_id'),
                 'subsection_id' => $q->field(0, 'subsection_id'),
                 'epobject_id'   => $q->field(0, '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->field(0, 'body');
             $hdate         = $q->field(0, 'hdate');
@@ -2841,21 +2841,21 @@ 
                                     ':subsection_id' => $item_data['subsection_id'],
                                 )
                             );
-                $section_body  = $r->field(0, 'sec_body');
+                $section_body = $r->field(0, 'sec_body');
                 $subsection_body = $r->field(0, 'sub_body');
-                if ( $section_body && $subsection_body ) {
+                if ($section_body && $subsection_body) {
                     $parentbody = "$section_body : $subsection_body";
                 } else {
                     $parentbody = "$section_body$subsection_body";
                 }
-            } else if ( $item_data['htype'] == 10 ) {
+            } else if ($item_data['htype'] == 10) {
                 $parentbody = $body;
             }
 
             // Get the question for this item.
-            if ( $item_data['htype'] == 12 ) {
+            if ($item_data['htype'] == 12) {
                 $childbody = $body;
-                $speaker = $this->_get_speaker($q->field(0, 'person_id'), $q->field(0, 'hdate'), $q->field(0, 'htime'), $this->major );
+                $speaker = $this->_get_speaker($q->field(0, 'person_id'), $q->field(0, 'hdate'), $q->field(0, 'htime'), $this->major);
             } else {
                 $r = $this->db->query("SELECT e.body, e.title,
                                         h.person_id, h.hdate, h.htime
@@ -2865,10 +2865,10 @@ 
                                 ORDER BY hpos
                                 LIMIT 1
                                 ",
-                                array( ':object_id' => $item_data['epobject_id'] )
+                                array(':object_id' => $item_data['epobject_id'])
                 );
                 $childbody = $r->field(0, 'body');
-                $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, 'htime'), $this->major );
+                $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, 'htime'), $this->major);
             }
 
             $contentcount = 0;
@@ -2884,7 +2884,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,
@@ -2903,7 +2903,7 @@ 
                 'more_url' => $more_url->generate()
             );
 
-            $data = array (
+            $data = array(
                 'gid' => $args['gid'],
                 'major' => $this->major,
                 'info' => array(),
@@ -2914,7 +2914,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).
@@ -2972,20 +2972,20 @@ 
 
         $q = $this->db->query($query, $params);
 
-        for ($row=0; $row<$q->rows; $row++) {
+        for ($row = 0; $row < $q->rows; $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( $q->field($row, 'gid') ),
+                'gid'           => fix_gid_from_db($q->field($row, 'gid')),
                 'htype'         => $q->field($row, 'htype'),
                 'section_id'    => $q->field($row, 'section_id'),
                 'subsection_id' => $q->field($row, 'subsection_id'),
                 'epobject_id'   => $q->field($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  = $q->field($row, 'count');
             $body          = $q->field($row, 'body');
@@ -3013,7 +3013,7 @@ 
                             LIMIT 1
                             ");
             $childbody = $r->field(0, 'body');
-            $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, 'htime'), $this->major );
+            $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, 'htime'), $this->major);
 
             $data[] = array(
                 'contentcount'  => $contentcount,
@@ -3033,7 +3033,7 @@ 
 
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3042,7 +3042,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).
@@ -3094,28 +3094,28 @@ 
                         LIMIT :limit", $params);
 
 
-        for ($row=0; $row<$q->rows; $row++) {
+        for ($row = 0; $row < $q->rows; $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( $q->field($row, 'gid') ),
+                'gid'			=> fix_gid_from_db($q->field($row, 'gid')),
                 'htype'			=> $q->field($row, 'htype'),
                 'section_id'	=> $q->field($row, 'section_id'),
                 'subsection_id'	=> $q->field($row, 'subsection_id'),
                 'epobject_id'	=> $q->field($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	= $q->field($row, 'count');
+            $contentcount = $q->field($row, 'count');
             $body 			= $q->field($row, 'body');
             $hdate			= $q->field($row, 'hdate');
 
 
             // This array will be added to $data, which is what gets returned.
-            $debate = array (
+            $debate = array(
                 'contentcount'	=> $contentcount,
                 'body'			=> $body,
                 'hdate'			=> $hdate,
@@ -3143,7 +3143,7 @@ 
                             LIMIT 1
                             ");
             $childbody = $r->field(0, 'body');
-            $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, 'htime'), $this->major );
+            $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, 'htime'), $this->major);
 
             $debate['child'] = array(
                 'body' => $childbody,
@@ -3153,7 +3153,7 @@ 
             $data[] = $debate;
         }
 
-        $data = array (
+        $data = array(
             'info' => array(),
             'data' => $data
         );
@@ -3176,7 +3176,7 @@ 
         return $q->field(0, '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.
@@ -3238,19 +3238,19 @@ 
 
         $q = $this->db->query($query, $params);
 
-        for ($row=0; $row<$q->rows; $row++) {
+        for ($row = 0; $row < $q->rows; $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( $q->field($row, 'gid') ),
+                'gid'			=> fix_gid_from_db($q->field($row, 'gid')),
                 'htype'			=> $q->field($row, 'htype'),
                 'section_id'	=> $q->field($row, 'section_id'),
                 'subsection_id'	=> $q->field($row, 'subsection_id'),
                 'epobject_id'	=> $q->field($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 			= $q->field($row, 'body');
             $hdate			= $q->field($row, 'hdate');
@@ -3276,25 +3276,25 @@ 
                             LIMIT 1
                             ");
             $childbody = $r->field(0, 'body');
-            $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, 'htime'), $this->major );
+            $speaker = $this->_get_speaker($r->field(0, 'person_id'), $r->field(0, 'hdate'), $r->field(0, '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
         );
@@ -3311,7 +3311,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);
@@ -3319,7 +3319,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',
@@ -3332,7 +3332,7 @@ 
                 where bill_id = :bill_id group by person_id',
             array(':bill_id' => $bill_id));
         $comm = array('sittings' => $sittings, 'chairmen' => array(), 'members' => array());
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $person_id = $q->field($i, 'person_id');
             $mp = new MEMBER(array('person_id'=>$person_id));
             $attending = $q->field($i, 'attending');
@@ -3353,13 +3353,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'],
@@ -3370,18 +3370,18 @@ 
         if (count($sections) > 0) {
             $data['rows'] = array();
             $num_sections = count($sections);
-            for ($n=0; $n<$num_sections; $n++) {
+            for ($n = 0; $n < $num_sections; $n++) {
                 $sectionrow = $sections[$n];
                 list($sitting, $part) = $this->_get_sitting($sectionrow['gid']);
                 $sectionrow['sitting'] = $sitting;
                 $sectionrow['part'] = $part;
-                $input = array (
-                    'amount' => array (
+                $input = array(
+                    'amount' => array(
                         'body' => true,
                         'comment' => true,
                         'excerpt' => true
                     ),
-                    'where' => array (
+                    'where' => array(
                         'section_id='	=> $sectionrow['epobject_id'],
                         'htype='	=> '11',
                         'major='	=> $this->major
@@ -3389,8 +3389,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'];
@@ -3408,7 +3408,7 @@ 
             array(':session' => $session)
         );
         $bills = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $bills[$q->field($i, 'id')] = $q->field($i, 'title');
         }
         if (!count($bills)) {
@@ -3419,7 +3419,7 @@ 
             group by minor');
         $counts = array();
         # $comments = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $minor = $q->field($i, 'minor');
             $counts[$minor] = $q->field($i, 'c');
             # $comments[$minor] = 0;
@@ -3446,8 +3446,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)
@@ -3475,20 +3475,20 @@ 
             where htype=10 and major=6
             order by hdate desc limit ' . $args['num']);
         $data = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $minor = $q->field($i, 'minor');
             $gid = $q->field($i, 'gid');
             $hdate = format_date($q->field($i, 'hdate'), LONGDATEFORMAT);
-            $qq = $this->db->query('select title, session from bills where id='.$minor);
+            $qq = $this->db->query('select title, session from bills where id=' . $minor);
             $title = $qq->field(0, 'title');
             $session = $qq->field(0, 'session');
             list($sitting, $part) = $this->_get_sitting($gid);
             $sitting_txt = make_ranking($sitting) . ' sitting';
-            if ($part>0) $sitting .= ", part $part";
+            if ($part > 0) $sitting .= ", part $part";
             $data[$hdate][] = array(
                 'bill'=> $title,
                 'sitting' => $sitting_txt,
-                'url' => "/pbc/$session/" . urlencode(str_replace(' ','_',$title)) . '/#sitting' . $sitting,
+                'url' => "/pbc/$session/" . urlencode(str_replace(' ', '_', $title)) . '/#sitting' . $sitting,
             );
         }
         return $data;
@@ -3497,7 +3497,7 @@ 
     # Given a GID, parse out the sitting number and optional part from it
     public function _get_sitting($gid) {
         if (preg_match('#_(\d\d)-(\d)_#', $gid, $m))
-            return array($m[1]+0, $m[2]);
+            return array($m[1] + 0, $m[2]);
         return array(0, 0);
     }
 }

Braces +231 added lines, -113 removed lines

@@ -138,8 +138,9 @@ 
 
         global $PAGE;
 
-        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH))
-            return false;
+        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH)) {
+                    return false;
+        }
 
         $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'search_min', 'search_video', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid');
         if (in_array($view, $validviews)) {
@@ -149,7 +150,8 @@ 
             // Get all the data that's to be rendered.
             $data = $this->$function($args);
 
-        } else {
+        }
+        else {
             // Don't have a valid $view.
             $PAGE->error_message ("You haven't specified a view type.");
             return false;
@@ -290,7 +292,8 @@ 
                 $sectiondata = $sectiondata[0];
             }
 
-        } else {
+        }
+        else {
             // This item *is* a section, so just return that.
 
             $sectiondata = $itemdata;
@@ -326,12 +329,15 @@ 
             );
 
             $subsectiondata = $this->_get_hansard_data($input);
-            if (count($subsectiondata) == 0)
-                $subsectiondata = null;
-            else
-                $subsectiondata = $subsectiondata[0];
+            if (count($subsectiondata) == 0) {
+                            $subsectiondata = null;
+            }
+            else {
+                            $subsectiondata = $subsectiondata[0];
+            }
 
-        } elseif ($itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '11') {
             // It's a subsection, so use the item itself.
             $subsectiondata = $itemdata;
         }
@@ -359,10 +365,12 @@ 
             // Debate subsection or section - get the next one.
             if ($hansardmajors[$itemdata['major']]['type'] == 'other' && $hansardmajors[$itemdata['major']]['location'] == 'UK') {
                 $where = 'htype = 11';
-            } else {
+            }
+            else {
                 $where = "(htype = 10 OR htype = 11)";
             }
-        } else {
+        }
+        else {
             // Anything else in debates - get the next element that isn't
             // a subsection or section, and is within THIS subsection.
             $where = "subsection_id = '" . $itemdata['subsection_id'] . "' AND (htype != 10 AND htype != 11)";
@@ -434,12 +442,14 @@ 
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
                     );
-                } else {
+                }
+                else {
                     // Linking to the prev speaker.
 
                     if (isset($prevdata[0]['speaker']) && count($prevdata[0]['speaker']) > 0) {
                         $title = $prevdata[0]['speaker']['name'];
-                    } else {
+                    }
+                    else {
                         $title = '';
                     }
                     $nextprevdata['prev'] = array (
@@ -478,12 +488,14 @@ 
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
                     );
-                } else {
+                }
+                else {
                     // Linking to the next speaker.
 
                     if (isset($nextdata[0]['speaker']) && count($nextdata[0]['speaker']) > 0) {
                         $title = $nextdata[0]['speaker']['name'];
-                    } else {
+                    }
+                    else {
                         $title = '';
                     }
                     $nextprevdata['next'] = array (
@@ -503,7 +515,8 @@ 
                 'title'	=> '',
                 'url'	=> $URL->generate() . $this->url,
             );
-        } elseif ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
             $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
             // Create URL for this (sub)section's date.
             $URL->insert(array('d' => $itemdata['hdate']));
@@ -514,7 +527,8 @@ 
                 'title'	=> '',
                 'url' 	=> $URL->generate()
             );
-        } else {
+        }
+        else {
             // We'll be setting $nextprevdata['up'] within $this->get_data_by_gid()
             // because we need to know the name and url of the parent item, which
             // we don't have here. Life sucks.
@@ -550,7 +564,8 @@ 
                             FROM 	hansard
                             WHERE 	major = :major
                             AND		hdate > :date", $params);
-            } else {
+            }
+            else {
                 $q = $this->db->query("SELECT MAX(hdate) AS hdate
                             FROM 	hansard
                             WHERE 	major = :major
@@ -565,7 +580,8 @@ 
 
                 if ($nextorprev == 'next') {
                     $body = 'Next day';
-                } else {
+                }
+                else {
                     $body = 'Previous day';
                 }
 
@@ -605,7 +621,8 @@ 
 
         if (isset($args['date'])) {
             $date = $args['date'];
-        } else {
+        }
+        else {
             $PAGE->error_message ("Sorry, we don't have a date.");
             return false;
         }
@@ -661,7 +678,8 @@ 
         $q = $this->db->query ("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
         if ($q->rows() == 0) {
             $itemdata = $this->_get_hansard_data($input);
-        } else {
+        }
+        else {
             do {
                 $gid = $q->field(0, 'gid_to');
                 $q = $this->db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
@@ -841,7 +859,8 @@ 
         if (isset($args['days']) && is_numeric($args['days'])) {
             $limit = 'LIMIT :limit';
             $params[':limit'] = $args['days'];
-        } else {
+        }
+        else {
             $limit = '';
         }
 
@@ -850,7 +869,8 @@ 
 
             $major = 'WHERE major = :major';
             $params[':major'] = $this->major;
-        } else {
+        }
+        else {
             $major = '';
         }
 
@@ -908,7 +928,8 @@ 
         if (isset($this->major)) {
             $majorwhere = "AND hansard.major = :hansard_major ";
             $params[':hansard_major'] = $this->major;
-        } else {
+        }
+        else {
             // We're getting results for all debates/wrans/etc.
             $majorwhere = '';
         }
@@ -973,7 +994,8 @@ 
                 }
             }
             $data['rows'] = $speeches;
-        } else {
+        }
+        else {
             $data['rows'] = array();
         }
         return $data;
@@ -1000,10 +1022,12 @@ 
             // $args['s'] should have been tidied up by the time we get here.
             // eg, by doing filter_user_input($s, 'strict');
             $searchstring = $args['s'];
-        } else {
+        }
+        else {
             if ( isset($args['exceptions']) ) {
                 throw new \Exception('No search string provided.');
-            } else {
+            }
+            else {
                 $PAGE->error_message("No search string");
                 return false;
             }
@@ -1022,22 +1046,25 @@ 
         else {
             $results_per_page = 20;
         }
-        if ($results_per_page > 1000)
-            $results_per_page = 1000;
+        if ($results_per_page > 1000) {
+                    $results_per_page = 1000;
+        }
 
         $data['info']['results_per_page'] = $results_per_page;
 
         // What page are we on?
         if (isset($args['p']) && is_numeric($args['p'])) {
             $page = $args['p'];
-        } else {
+        }
+        else {
             $page = 1;
         }
         $data['info']['page'] = $page;
 
         if (isset($args['e'])) {
             $encode = 'url';
-        } else {
+        }
+        else {
             $encode = 'html';
         }
 
@@ -1051,10 +1078,18 @@ 
         // Get the gids from Xapian
         $sort_order = 'date';
         if (isset($args['o'])) {
-            if ($args['o']=='d') $sort_order = 'newest';
-            if ($args['o']=='o') $sort_order = 'oldest';
-            elseif ($args['o']=='c') $sort_order = 'created';
-            elseif ($args['o']=='r') $sort_order = 'relevance';
+            if ($args['o']=='d') {
+                $sort_order = 'newest';
+            }
+            if ($args['o']=='o') {
+                $sort_order = 'oldest';
+            }
+            elseif ($args['o']=='c') {
+                $sort_order = 'created';
+            }
+            elseif ($args['o']=='r') {
+                $sort_order = 'relevance';
+            }
         }
 
         $data['searchdescription'] = $SEARCHENGINE->query_description_long();
@@ -1114,7 +1149,9 @@ 
                     FROM future
                     LEFT JOIN future_people ON id=calendar_id AND witness=0
                     WHERE id = $id AND deleted=0");
-                if ($q->rows() == 0) continue;
+                if ($q->rows() == 0) {
+                    continue;
+                }
 
                 $itemdata = $q->row(0);
 
@@ -1123,8 +1160,9 @@ 
                     in_array($itemdata['chamber'], array(
                         'Commons: Main Chamber', 'Lords: Main Chamber',
                         'Commons: Westminster Hall',
-                    )))
-                        continue;
+                    ))) {
+                                        continue;
+                }
 
                 list($cal_item, $cal_meta) = \MySociety\TheyWorkForYou\Utility\Calendar::meta($itemdata);
                 $body = $this->prepare_search_result_for_display($cal_item) . '.';
@@ -1139,7 +1177,8 @@ 
 
                 if ($itemdata['event_date'] >= date('Y-m-d')) {
                     $title = 'Upcoming Business';
-                } else {
+                }
+                else {
                     $title = 'Previous Business';
                 }
                 $itemdata['gid']            = $id;
@@ -1149,7 +1188,8 @@ 
                 $itemdata['listurl']        = '/calendar/?d=' . $itemdata['event_date'] . '#cal' . $itemdata['id'];
                 $itemdata['major']          = 'F';
 
-            } else {
+            }
+            else {
 
                 // Get the data for the gid from the database
                 $q = $this->db->query("SELECT hansard.gid, hansard.hdate,
@@ -1165,7 +1205,8 @@ 
                 if ($q->rows() > 1) {
                     if ( $isset($args['exceptions']) ) {
                         throw new \Exception("Got more than one row getting data for $gid.");
-                    } else {
+                    }
+                    else {
                         $PAGE->error_message("Got more than one row getting data for $gid");
                     }
                 }
@@ -1220,27 +1261,39 @@ 
                         }
                         if ($itemdata['major'] == 5) {
                             $itemdata['parent']['body'] = 'Northern Ireland Assembly: ' . $itemdata['parent']['body'];
-                        } elseif ($itemdata['major'] == 6) {
+                        }
+                        elseif ($itemdata['major'] == 6) {
                             $itemdata['parent']['body'] = 'Public Bill Committee: ' . $itemdata['parent']['body'];
-                        } elseif ($itemdata['major'] == 7) {
+                        }
+                        elseif ($itemdata['major'] == 7) {
                             $itemdata['parent']['body'] = 'Scottish Parliament: ' . $itemdata['parent']['body'];
                         }
 
-                    } else {
+                    }
+                    else {
                         // It's a section, so it will be its own title.
                         $itemdata['parent']['body'] = $itemdata['body'];
                         $itemdata['body'] = '';
                     }
 
-                } else {
+                }
+                else {
                     // Wrans or WMS
                     $section = $this->_get_section($itemdata);
                     $subsection = $this->_get_subsection($itemdata);
                     $body = $hansardmajors[$itemdata['major']]['title'] . ' — ';
-                    if (isset($section['body'])) $body .= $section['body'];
-                    if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
-                    if (isset($subsection['listurl'])) $listurl = $subsection['listurl'];
-                    else $listurl = '';
+                    if (isset($section['body'])) {
+                        $body .= $section['body'];
+                    }
+                    if (isset($subsection['body'])) {
+                        $body .= ': ' . $subsection['body'];
+                    }
+                    if (isset($subsection['listurl'])) {
+                        $listurl = $subsection['listurl'];
+                    }
+                    else {
+                        $listurl = '';
+                    }
                     $itemdata['parent'] = array (
                         'body' => $body,
                         'listurl' => $listurl
@@ -1268,7 +1321,8 @@ 
                                 $itemdata['speaker'] = $this->_get_speaker($itemdata['person_id'], $itemdata['hdate'], $itemdata['htime'], $itemdata['major']);
                             }
                         }
-                    } elseif ($itemdata['htype'] == 10) {
+                    }
+                    elseif ($itemdata['htype'] == 10) {
                         $itemdata['body'] = '';
                         $itemdata['extract'] = '';
                     }
@@ -1367,17 +1421,20 @@ 
                 return $data;
             }
 
-        } elseif (isset($args['year']) && is_numeric($args['year'])) {
+        }
+        elseif (isset($args['year']) && is_numeric($args['year'])) {
 
             if (isset($args['month']) && is_numeric($args['month'])) {
                 // A particular month.
                 $action = 'month';
-            } else {
+            }
+            else {
                 // A single year.
                 $action = 'year';
             }
 
-        } else {
+        }
+        else {
             // The year to date so far.
             $action = 'recentyear';
         }
@@ -1405,7 +1462,8 @@ 
 
             if ($q->field(0, 'hdate') != NULL) {
                 $recentdate = $q->field(0, 'hdate');
-            } else {
+            }
+            else {
                 $PAGE->error_message("Couldn't find the most recent date");
                 return $data;
             }
@@ -1433,7 +1491,8 @@ 
                     $firstmonth = 12 + $firstmonth; // ()
                 };
 
-            } else {
+            }
+            else {
                 // $action == 'recentyear'
 
                 // Get the most recent year's results.
@@ -1443,7 +1502,8 @@ 
 
 
 
-        } else {
+        }
+        else {
             // $action == 'year' or 'month'.
 
             $firstyear = $args['year'];
@@ -1452,7 +1512,8 @@ 
             if ($action == 'month') {
                 $firstmonth = intval($args['month']);
                 $finalmonth = intval($args['month']);
-            } else {
+            }
+            else {
                 $firstmonth = 1;
                 $finalmonth = 12;
             }
@@ -1524,7 +1585,8 @@ 
 
                 if (!isset($years[$y])) {
                     $years[$y] = array(1=>array(), 2=>array(), 3=>array(), 4=>array(), 5=>array(), 6=>array(), 7=>array(), 8=>array(), 9=>array(), 10=>array(), 11=>array(), 12=>array());
-                } else {
+                }
+                else {
 
                     // This year is set. Check it has all the months...
 
@@ -1565,7 +1627,9 @@ 
                     'url' => $YEARURL->generate()
                 );
 
-            } else { // action is 'year'.
+            }
+            else {
+// action is 'year'.
 
                 $nextprev['prev'] = array ('body' => 'Previous year');
                 $nextprev['next'] = array ('body' => 'Next year');
@@ -1684,7 +1748,8 @@ 
             ) {
             $fieldsarr['epobject'] = array ('body');
             $join = 'LEFT OUTER JOIN epobject ON hansard.epobject_id = epobject.epobject_id';
-        } else {
+        }
+        else {
             $join = '';
         }
 
@@ -1712,14 +1777,16 @@ 
         if ($order != '') {
             # You can't use parameters for order by clauses
             $order_by_clause = "ORDER BY $order";
-        } else {
+        }
+        else {
             $order_by_clause = '';
         }
 
         if ($limit != '') {
             $params[':limit'] = $limit;
             $limit = "LIMIT :limit";
-        } else {
+        }
+        else {
             $limit = '';
         }
 
@@ -1790,7 +1857,8 @@ 
                         $where = "section_id = '" . $item['epobject_id'] . "'
                             AND subsection_id = '" . $item['epobject_id'] . "'";
 
-                    } else {
+                    }
+                    else {
                         // Subsection - get a count of items within this subsection.
                         $where = "subsection_id = '" . $item['epobject_id'] . "'";
                     }
@@ -1803,7 +1871,8 @@ 
 
                     if ($r->rows() > 0) {
                         $item['contentcount'] = $r->field(0, 'count');
-                    } else {
+                    }
+                    else {
                         $item['contentcount'] = '0';
                     }
                 }
@@ -1820,7 +1889,8 @@ 
                     if ($item['htype'] == '10') {
                         $where = 'hansard.section_id = :epobject_id
                             AND hansard.subsection_id = :epobject_id';
-                    } elseif ($item['htype'] == '11') {
+                    }
+                    elseif ($item['htype'] == '11') {
                         $where = 'hansard.subsection_id = :epobject_id';
                     }
 
@@ -1865,7 +1935,8 @@ 
                         $id = preg_replace('#^.*?_.*?_#', '', $item['gid']);
                         $fragment = $this->url . $id;
                         $item['commentsurl'] = $COMMENTSURL->generate() . $fragment;
-                    } else {
+                    }
+                    else {
                         $COMMENTSURL->insert(array('id' => $item['gid']));
                         $item['commentsurl'] = $COMMENTSURL->generate();
                     }
@@ -1927,7 +1998,8 @@ 
 
         if ($q->rows() > 0) {
             $votes['user']['yes'] = $q->field(0, 'totalvotes');
-        } else {
+        }
+        else {
             $votes['user']['yes'] = '0';
         }
 
@@ -1940,7 +2012,8 @@ 
 
         if ($q->rows() > 0) {
             $votes['user']['no'] = $q->field(0, 'totalvotes');
-        } else {
+        }
+        else {
             $votes['user']['no'] = '0';
         }
 
@@ -1956,7 +2029,8 @@ 
         if ($q->rows() > 0) {
             $votes['anon']['yes'] = $q->field(0, 'yes_votes');
             $votes['anon']['no'] = $q->field(0, 'no_votes');
-        } else {
+        }
+        else {
             $votes['anon']['yes'] = '0';
             $votes['anon']['no'] = '0';
         }
@@ -1980,10 +2054,12 @@ 
         // );
 
         // $url_args is an array of other key/value pairs to be appended in the GET string.
-        if ($id_data['major'])
-            $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
-        else
-            $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        if ($id_data['major']) {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
+        }
+        else {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        }
 
         $fragment = '';
 
@@ -1993,10 +2069,12 @@ 
                 global $DATA;
                 $DATA->set_page_metadata('pbc_clause', 'url', 'pbc/' . $this->url . $id);
                 $LISTURL->remove(array('id'));
-            } else {
+            }
+            else {
                 $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
             }
-        } else {
+        }
+        else {
             // A debate speech or question/answer, etc.
             // We need to get the gid of the parent (sub)section for this item.
             // We use this with the gid of the item itself as an #anchor.
@@ -2012,7 +2090,8 @@ 
 
                 $parent_gid = $this->epobjectid_to_gid[ $parent_epobject_id ];
 
-            } else {
+            }
+            else {
                 // We haven't cached the gid, so fetch from db.
 
                 $r = $this->db->query("SELECT gid
@@ -2035,7 +2114,8 @@ 
                 if ($id_data['major'] == 6) {
                     if (isset($this->bill_lookup[$minor])) {
                         list($title, $session) = $this->bill_lookup[$minor];
-                    } else {
+                    }
+                    else {
                         $qq = $this->db->query('select title, session from bills where id='.$minor);
                         $title = $qq->field(0, 'title');
                         $session = $qq->field(0, 'session');
@@ -2046,7 +2126,8 @@ 
                     global $DATA;
                     $DATA->set_page_metadata('pbc_clause', 'url', "pbc/$url/$parent_gid");
                     $LISTURL->remove(array('id'));
-                } else {
+                }
+                else {
                     $LISTURL->insert( array( 'id' => $parent_gid ) );
                 }
                 // Use a truncated form of this item's gid for the anchor.
@@ -2088,9 +2169,11 @@ 
         # Note identical code to this in search/index.pl
         if ($person_id == 10170 && $hdate == '2014-09-08') {
             $hdate = '2014-09-07';
-        } elseif ($person_id == 11068 && substr($hdate, 0, 7) == '2008-09') {
+        }
+        elseif ($person_id == 11068 && substr($hdate, 0, 7) == '2008-09') {
             $hdate = '2008-08-13';
-        } elseif ($person_id == 25394 && $hdate == '2016-07-01') {
+        }
+        elseif ($person_id == 25394 && $hdate == '2016-07-01') {
             $hdate = '2016-06-16';
         }
 
@@ -2155,7 +2238,8 @@ 
             # Couple of special cases for the election of the NI Speaker
             if ($person_id == 13799 && $hdate == '2007-05-08') {
                 $members = array($members[$htime < '11:00' ? 0 : 1]);
-            } elseif ($person_id == 13831 && $hdate == '2015-01-12') {
+            }
+            elseif ($person_id == 13831 && $hdate == '2015-01-12') {
                 $members = array($members[$htime < '13:00' ? 0 : 1]);
             }
         }
@@ -2170,11 +2254,14 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url('mp'); # Default, house=1
         if ($house==2) {
             $URL = new \MySociety\TheyWorkForYou\Url('peer');
-        } elseif ($house==3) {
+        }
+        elseif ($house==3) {
             $URL = new \MySociety\TheyWorkForYou\Url('mla');
-        } elseif ($house==4) {
+        }
+        elseif ($house==4) {
             $URL = new \MySociety\TheyWorkForYou\Url('msp');
-        } elseif ($house==0) {
+        }
+        elseif ($house==0) {
             $URL = new \MySociety\TheyWorkForYou\Url('royal');
         }
         return $URL;
@@ -2293,7 +2380,8 @@ 
                 $where .= " AND section_id = :epobject_id";
             }
 
-        } else {
+        }
+        else {
             // Just getting a count of the comments on this item.
             $from = "comments";
             $where = 'epobject_id = :epobject_id';
@@ -2413,7 +2501,8 @@ 
             $this->htype = $itemdata['htype'];
             if ($this->htype >= 12) {
                 $this_page = $this->commentspage;
-            } else {
+            }
+            else {
                 $this_page = $this->listpage;
             }
         }
@@ -2454,18 +2543,21 @@ 
             $nextprev = $this->_get_nextprev_items( $sectionrow );
             $data['info']['text_heading'] = $itemdata['body'];
 
-        } elseif ($itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '11') {
             $nextprev = $this->_get_nextprev_items( $subsectionrow );
             $data['info']['text_heading'] = $itemdata['body'];
 
-        } else {
+        }
+        else {
             // Ordinary lowly item.
             $nextprev = $this->_get_nextprev_items( $itemdata );
 
             if (isset($subsectionrow['gid'])) {
                 $nextprev['up']['url'] 		= $subsectionrow['listurl'];
                 $nextprev['up']['title'] 	= $subsectionrow['body'];
-            } else {
+            }
+            else {
                 $nextprev['up']['url'] 		= $sectionrow['listurl'];
                 $nextprev['up']['title'] 	= $sectionrow['body'];
             }
@@ -2522,7 +2614,8 @@ 
                     throw new RedirectException($data['subrows'][0]['gid']);
                 }
             }
-        } elseif ($itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '11') {
             // This item is a subsection, so we're displaying everything within it.
 
             # $subsectionrow['trackback'] = $this->_get_trackback_data($subsectionrow);
@@ -2538,7 +2631,8 @@ 
             $data['rows'] = $this->_get_hansard_data($input);
 
 
-        } elseif ($itemdata['htype'] == '12' || $itemdata['htype'] == '13') {
+        }
+        elseif ($itemdata['htype'] == '12' || $itemdata['htype'] == '13') {
             // Debate speech or procedural, so we're just displaying this one item.
 
             # $itemdata['trackback'] = $this->_get_trackback_data($itemdata);
@@ -2633,7 +2727,9 @@ 
             array(':gid_from_spid' => 'uk.org.publicwhip/spq/' . $fixed_spid)
         );
         $gid = $q->field(0, 'mentioned_gid');
-        if ($gid) return $gid;
+        if ($gid) {
+            return $gid;
+        }
         return null;
     }
     public function old_get_gid_from_spid($spid) {
@@ -2642,7 +2738,9 @@ 
             array(':gid_like' => 'uk.org.publicwhip/spwa/%.' . $spid . '.h')
         );
         $gid = $q->field(0, 'gid');
-        if ($gid) return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        if ($gid) {
+            return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        }
         return null;
     }
 }
@@ -2668,14 +2766,16 @@ 
         // The most voted on things during how many recent days?
         if (isset($args['days']) && is_numeric($args['days'])) {
             $days = $args['days'];
-        } else {
+        }
+        else {
             $days = 7;
         }
 
         // How many results?
         if (isset($args['num']) && is_numeric($args['num'])) {
             $items_to_list = $args['num'];
-        } else {
+        }
+        else {
             $items_to_list = 5;
         }
 
@@ -2757,7 +2857,8 @@ 
 
             $data['rows'] = $speeches;
 
-        } else {
+        }
+        else {
             $data['rows'] = array ();
         }
 
@@ -2845,10 +2946,12 @@ 
                 $subsection_body = $r->field(0, 'sub_body');
                 if ( $section_body && $subsection_body ) {
                     $parentbody = "$section_body : $subsection_body";
-                } else {
+                }
+                else {
                     $parentbody = "$section_body$subsection_body";
                 }
-            } else if ( $item_data['htype'] == 10 ) {
+            }
+            else if ( $item_data['htype'] == 10 ) {
                 $parentbody = $body;
             }
 
@@ -2856,7 +2959,8 @@ 
             if ( $item_data['htype'] == 12 ) {
                 $childbody = $body;
                 $speaker = $this->_get_speaker($q->field(0, 'person_id'), $q->field(0, 'hdate'), $q->field(0, 'htime'), $this->major );
-            } else {
+            }
+            else {
                 $r = $this->db->query("SELECT e.body, e.title,
                                         h.person_id, h.hdate, h.htime
                                 FROM    hansard h, epobject e
@@ -2928,7 +3032,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday)) return $data;
+        if (!count($recentday)) {
+            return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -2940,7 +3046,8 @@ 
         if ($args['num'] == 1) {
             $datewhere = "h.hdate = :hdate";
             $params[':hdate'] = $recentday['hdate'];
-        } else {
+        }
+        else {
             $firstdate = gmdate('Y-m-d', $recentday['timestamp'] - (86400 * $args['days']));
             $datewhere = "h.hdate >= :firstdate
                         AND h.hdate <= :hdate";
@@ -3055,8 +3162,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return array();
+        if (!count($recentday)) {
+                    return array();
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3068,7 +3176,8 @@ 
         $params = array(':recentdate' => $recentday['hdate']);
         if ($args['num'] == 1) {
             $datewhere = "h.hdate = :recentdate";
-        } else {
+        }
+        else {
             $params[':firstdate'] = gmdate('Y-m-d', $recentday['timestamp'] - (86400 * $args['days']));
             $datewhere = "h.hdate >= :firstdate AND	h.hdate <= :recentdate";
         }
@@ -3189,8 +3298,9 @@ 
 
         // Get the most recent day on which we have wrans.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return $data;
+        if (!count($recentday)) {
+                    return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3202,7 +3312,8 @@ 
         if ($args['num'] == 1) {
             $datewhere = "h.hdate = :datewhere";
             $params[':datewhere'] = $recentday['hdate'];
-        } else {
+        }
+        else {
             $firstdate = gmdate('Y-m-d', $recentday['timestamp'] - (86400 * $args['days']));
             $datewhere = "h.hdate >= :firstdate AND h.hdate <= :hdate";
             $params[':firstdate'] = $firstdate;
@@ -3213,7 +3324,8 @@ 
         // Get a random selection of subsections in wrans.
         if ($hansardmajors[$this->major]['location'] == 'Scotland') {
             $htype = 'htype = 10 and section_id = 0';
-        } else {
+        }
+        else {
             $htype = 'htype = 11 and section_id != 0';
         }
 
@@ -3343,7 +3455,8 @@ 
             );
             if ($chairman) {
                 $comm['chairmen'][$person_id] = $arr;
-            } else {
+            }
+            else {
                 $comm['members'][$person_id] = $arr;
             }
         }
@@ -3470,7 +3583,9 @@ 
     }
 
     public function _get_data_by_recent_pbc_debates($args) {
-        if (!isset($args['num'])) $args['num'] = 20;
+        if (!isset($args['num'])) {
+            $args['num'] = 20;
+        }
         $q = $this->db->query('select gid, minor, hdate from hansard
             where htype=10 and major=6
             order by hdate desc limit ' . $args['num']);
@@ -3484,7 +3599,9 @@ 
             $session = $qq->field(0, 'session');
             list($sitting, $part) = $this->_get_sitting($gid);
             $sitting_txt = make_ranking($sitting) . ' sitting';
-            if ($part>0) $sitting .= ", part $part";
+            if ($part>0) {
+                $sitting .= ", part $part";
+            }
             $data[$hdate][] = array(
                 'bill'=> $title,
                 'sitting' => $sitting_txt,
@@ -3496,8 +3613,9 @@ 
 
     # Given a GID, parse out the sitting number and optional part from it
     public function _get_sitting($gid) {
-        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m))
-            return array($m[1]+0, $m[2]);
+        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m)) {
+                    return array($m[1]+0, $m[2]);
+        }
         return array(0, 0);
     }
 }

www/includes/easyparliament/searchengine.php

Doc Comments +13 added lines

@@ -307,6 +307,9 @@ 
         $this->valid = true;
     }
 
+    /**
+     * @param boolean $long
+     */
     public function query_description_internal($long) {
         if (!defined('XAPIANDB') || !XAPIANDB) {
             return '';
@@ -341,6 +344,11 @@ 
     }
 
     // Perform partial query to get a count of number of matches
+
+    /**
+     * @param integer $first_result
+     * @param integer $results_per_page
+     */
     public function run_count($first_result, $results_per_page, $sort_order='relevance') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
@@ -420,6 +428,11 @@ 
     }
 
     // Perform the full search...
+
+    /**
+     * @param integer $first_result
+     * @param integer $results_per_page
+     */
     public function run_search($first_result, $results_per_page, $sort_order='relevance') {
         $start = getmicrotime();
 

Indentation +2 added lines, -2 removed lines

@@ -333,7 +333,7 @@ 
     }
 
     public function get_spelling_correction() {
-         if (!defined('XAPIANDB') || !XAPIANDB)
+            if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
         $qd = $this->queryparser->get_corrected_query_string();
@@ -559,7 +559,7 @@ 
             {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
-                   if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if ( ($wordpos < $pos) || ($pos==-1) ) {
                         $pos = $wordpos;
                     }
                 }

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

@@ -25,7 +25,7 @@ 
 
 */
 
-if (defined('XAPIANDB') AND XAPIANDB != '') {
+if (defined('XAPIANDB') and XAPIANDB != '') {
     if (file_exists('/usr/share/php/xapian.php')) {
         include_once '/usr/share/php/xapian.php';
     } else {
@@ -263,15 +263,15 @@ 
         for ($n=0; $n<$merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
-            $qd = str_replace("(S$from_id OR S$to_id)", "S$to_id", $qd);
-            $qd = str_replace("S$from_id OR S$to_id", "S$to_id", $qd);
+            $qd = str_replace("(S$from_id OR S$to_id)", "s$to_id", $qd);
+            $qd = str_replace("s$from_id OR S$to_id", "s$to_id", $qd);
         }
 
         preg_match_all('#S(\d+)#', $qd, $m);
         foreach ($m[1] as $mm) {
             $member = new MEMBER(array('person_id' => $mm));
             $name = $member->full_name();
-            $qd = str_replace("S$mm", "speaker:$name", $qd);
+            $qd = str_replace("s$mm", "speaker:$name", $qd);
         }
 
         # Simplify display of excluded words

Spacing +31 added lines, -31 removed lines

@@ -96,10 +96,10 @@ 
         // Split words up into individual words, and quoted phrases
         preg_match_all('/(' .
             '"|' . # match either a quote, or...
-            '(?:(?<![' .$this->wordchars. '])-)?' . # optionally a - (exclude)
+            '(?:(?<![' . $this->wordchars . '])-)?' . # optionally a - (exclude)
             # if at start of word (i.e. not preceded by a word character, in
             # which case it is probably a hyphenated-word)
-            '['.$this->wordchars.']+' . # followed by a string of word-characters
+            '[' . $this->wordchars . ']+' . # followed by a string of word-characters
             ')/', $this->query, $all_words);
         if ($all_words) {
             $all_words = $all_words[0];
@@ -124,8 +124,8 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 1);
-                $value = strtolower(join(":", array_slice($items,1)));
+                if (substr($type, 0, 1) == '-') $type = substr($type, 1);
+                $value = strtolower(join(":", array_slice($items, 1)));
                 if ($type == 'section') {
                     $newv = $value;
                     if ($value == 'debates' || $value == 'debate') $newv = 1;
@@ -137,8 +137,8 @@ 
                     elseif ($value == 'pbc' || $value == 'standing') $newv = 6;
                     elseif ($value == 'sp') $newv = 7;
                     elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
+                    elseif ($value == 'uk') $newv = array(1, 2, 3, 4, 6, 101);
+                    elseif ($value == 'scotland') $newv = array(7, 8);
                     elseif ($value == 'future') $newv = 'F';
                     if (is_array($newv)) {
                         $newv = 'major:' . join(' major:', $newv);
@@ -172,7 +172,7 @@ 
             $this->query .= " $from..$to";
         } elseif ($from) {
             $this->query = str_ireplace("from:$from", '', $this->query);
-            $this->query .= " $from..".date('Ymd');
+            $this->query .= " $from.." . date('Ymd');
         } elseif ($to) {
             $this->query = str_ireplace("to:$to", '', $this->query);
             $this->query .= " 19990101..$to";
@@ -181,7 +181,7 @@ 
         # Merged people
         $db = new ParlDB;
         $merged = $db->query('SELECT * FROM gidredirect WHERE gid_from LIKE :gid_from', array(':gid_from' => "uk.org.publicwhip/person/%"));
-        for ($n=0; $n<$merged->rows(); $n++) {
+        for ($n = 0; $n < $merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
             $this->query = preg_replace("#speaker:($from_id|$to_id)#i", "(speaker:$from_id OR speaker:$to_id)", $this->query);
@@ -189,7 +189,7 @@ 
 
         twfy_debug("SEARCH", "prefixed: " . var_export($this->prefixed, true));
 
-        twfy_debug("SEARCH", "query -- ". $this->query);
+        twfy_debug("SEARCH", "query -- " . $this->query);
         $flags = XapianQueryParser::FLAG_BOOLEAN | XapianQueryParser::FLAG_LOVEHATE |
             XapianQueryParser::FLAG_WILDCARD | XapianQueryParser::FLAG_SPELLING_CORRECTION;
         $flags = $flags | XapianQueryParser::FLAG_PHRASE;
@@ -218,7 +218,7 @@ 
         foreach ($m[1] as $phrase) {
             $phrase_new = preg_replace('# PHRASE \d+#', '', $phrase);
             #$this->phrases[] = preg_split('#\s+#', $phrase_new);
-            $qd = str_replace("($phrase)", '"'.$phrase_new.'"', $qd);
+            $qd = str_replace("($phrase)", '"' . $phrase_new . '"', $qd);
         }
         preg_match_all('#\(([^(]*? NEAR [^(]*?)\)#', $qd, $m);
         foreach ($m[1] as $mm) {
@@ -262,7 +262,7 @@ 
         }
 
         # Speakers
-        for ($n=0; $n<$merged->rows(); $n++) {
+        for ($n = 0; $n < $merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
             $qd = str_replace("(S$from_id OR S$to_id)", "S$to_id", $qd);
@@ -341,7 +341,7 @@ 
     }
 
     // Perform partial query to get a count of number of matches
-    public function run_count($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_count($first_result, $results_per_page, $sort_order = 'relevance') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
@@ -414,13 +414,13 @@ 
         #}
 
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Search count took $duration seconds.");
+        twfy_debug("SEARCH", "Search count took $duration seconds.");
 
         return $count;
     }
 
     // Perform the full search...
-    public function run_search($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_search($first_result, $results_per_page, $sort_order = 'relevance') {
         $start = getmicrotime();
 
         #$matches = $this->enquire->get_mset($first_result, $results_per_page);
@@ -441,13 +441,13 @@ 
                 array_push($this->created, join('', unpack('N', $doc->get_value(2)))); # XXX Needs fixing
             }
             twfy_debug("SEARCH", "gid: $gid relevancy: $relevancy% weight: $weight");
-            array_push($this->gids, "uk.org.publicwhip/".$gid);
+            array_push($this->gids, "uk.org.publicwhip/" . $gid);
             array_push($this->collapsed, $collapsed);
             array_push($this->relevances, $relevancy);
             $iter->next();
         }
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Run search took $duration seconds.");
+        twfy_debug("SEARCH", "Run search took $duration seconds.");
     }
     // ... use these to get the results
     public function get_gids() {
@@ -488,7 +488,7 @@ 
         $body = str_replace($this->specialchars, $this->specialchars_upper, $body);
         $body = mb_convert_encoding($body, "UTF-8", "HTML-ENTITIES");
         $body = str_replace($this->specialchars_upper, $this->specialchars, $body);
-        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|['.$this->wordcharsnodigit.']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
         $hlextract = "";
         foreach ($splitextract as $extractword) {
             if (preg_match('/^<[^>]*>$/', $extractword)) {
@@ -536,7 +536,7 @@ 
         */
 
         foreach ($this->phrases as $phrase) {
-            $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
             array_push($findwords, "/\b($phrasematch)\b(?!(?>[^<>]*>))/i");
             $replacewords[] = "<span class=\"hi\">\\1</span>";
         }
@@ -554,12 +554,12 @@ 
 
         // look for phrases
         foreach ($this->phrases as $phrase) {
-            $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
-            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
+            if (preg_match('/([^' . $this->wordchars . ']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
             {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                   if ( ($wordpos < $pos) || ($pos==-1) ) {
+                   if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -567,7 +567,7 @@ 
         }
         if ($pos != -1) return $pos;
 
-        $splitextract = preg_split('/([0-9,.]+|['.$this->wordcharsnodigit.']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/([0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         foreach ($splitextract as $extractword) {
             $extractword = preg_replace('/&$/', '', $extractword);
@@ -577,7 +577,7 @@ 
             foreach ($stemmed_words as $word) {
                 if ($word == '') continue;
                 $matchword = $this->stem($extractword);
-                if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
+                if ($matchword == $word && ($wordpos < $pos || $pos == -1)) {
                     $pos = $wordpos;
                 }
             }
@@ -586,11 +586,11 @@ 
         if ($pos != -1) return $pos;
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/([^'.$this->wordchars.']' . $word . '[^'.$this->wordchars. '])/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
+            if (preg_match('/([^' . $this->wordchars . ']' . $word . '[^' . $this->wordchars . '])/', $lcbody, $matches)) {
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -600,11 +600,11 @@ 
         if ($pos != -1) return $pos;
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
             if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }

Braces +150 added lines, -67 removed lines

@@ -30,7 +30,8 @@ 
 if (defined('XAPIANDB') AND XAPIANDB != '') {
     if (file_exists('/usr/share/php/xapian.php')) {
         include_once '/usr/share/php/xapian.php';
-    } else {
+    }
+    else {
         twfy_debug('SEARCH', '/usr/share/php/xapian.php does not exist');
     }
 }
@@ -40,8 +41,9 @@ 
     public $error;
 
     public function __construct($query) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return null;
+        }
 
         global $xapiandb, $PAGE, $hansardmajors, $parties;
         if (!$xapiandb) {
@@ -51,13 +53,18 @@ 
                 twfy_debug("SEARCH", "Using Xapian remote backend: " . $xapian_host . " port " . $xapian_port);
                 $xapiandb_remote = remote_open($xapian_host, intval($xapian_port));
                 $xapiandb = new XapianDatabase($xapiandb_remote);
-            } else {
+            }
+            else {
                 $xapiandb = new XapianDatabase(XAPIANDB);
             }
         }
         $this->query = $query;
-        if (!isset($this->stemmer)) $this->stemmer = new XapianStem('english');
-        if (!isset($this->enquire)) $this->enquire = new XapianEnquire($xapiandb);
+        if (!isset($this->stemmer)) {
+            $this->stemmer = new XapianStem('english');
+        }
+        if (!isset($this->enquire)) {
+            $this->enquire = new XapianEnquire($xapiandb);
+        }
         if (!isset($this->queryparser)) {
             $this->queryparser = new XapianQueryParser();
             $this->datevaluerange = new XapianDateValueRangeProcessor(1);
@@ -103,7 +110,8 @@ 
             ')/', $this->query, $all_words);
         if ($all_words) {
             $all_words = $all_words[0];
-        } else {
+        }
+        else {
             $all_words = array();
         }
         $in_quote = false;
@@ -111,7 +119,9 @@ 
         foreach ($all_words as $word) {
             if ($word == '"') {
                 $in_quote = !$in_quote;
-                if ($in_quote) array_push($this->phrases, array());
+                if ($in_quote) {
+                    array_push($this->phrases, array());
+                }
                 if (!$in_quote && !count($this->phrases[count($this->phrases) - 1])) {
                     array_pop($this->phrases);
                 }
@@ -124,45 +134,84 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 1);
+                if (substr($type, 0, 1)=='-') {
+                    $type = substr($type, 1);
+                }
                 $value = strtolower(join(":", array_slice($items,1)));
                 if ($type == 'section') {
                     $newv = $value;
-                    if ($value == 'debates' || $value == 'debate') $newv = 1;
-                    elseif ($value == 'whall' || $value == 'westminster' || $value == 'westminhall') $newv = 2;
-                    elseif ($value == 'wrans' || $value == 'wran') $newv = 3;
-                    elseif ($value == 'wms' || $value == 'statements' || $value == 'statement') $newv = 4;
-                    elseif ($value == 'lordsdebates' || $value == 'lords') $newv = 101;
-                    elseif ($value == 'ni' || $value == 'nidebates') $newv = 5;
-                    elseif ($value == 'pbc' || $value == 'standing') $newv = 6;
-                    elseif ($value == 'sp') $newv = 7;
-                    elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
-                    elseif ($value == 'future') $newv = 'F';
+                    if ($value == 'debates' || $value == 'debate') {
+                        $newv = 1;
+                    }
+                    elseif ($value == 'whall' || $value == 'westminster' || $value == 'westminhall') {
+                        $newv = 2;
+                    }
+                    elseif ($value == 'wrans' || $value == 'wran') {
+                        $newv = 3;
+                    }
+                    elseif ($value == 'wms' || $value == 'statements' || $value == 'statement') {
+                        $newv = 4;
+                    }
+                    elseif ($value == 'lordsdebates' || $value == 'lords') {
+                        $newv = 101;
+                    }
+                    elseif ($value == 'ni' || $value == 'nidebates') {
+                        $newv = 5;
+                    }
+                    elseif ($value == 'pbc' || $value == 'standing') {
+                        $newv = 6;
+                    }
+                    elseif ($value == 'sp') {
+                        $newv = 7;
+                    }
+                    elseif ($value == 'spwrans' || $value == 'spwran') {
+                        $newv = 8;
+                    }
+                    elseif ($value == 'uk') {
+                        $newv = array(1,2,3,4,6,101);
+                    }
+                    elseif ($value == 'scotland') {
+                        $newv = array(7,8);
+                    }
+                    elseif ($value == 'future') {
+                        $newv = 'F';
+                    }
                     if (is_array($newv)) {
                         $newv = 'major:' . join(' major:', $newv);
-                    } else {
+                    }
+                    else {
                         $newv = "major:$newv";
                     }
                     $this->query = str_ireplace("$type:$value", $newv, $this->query);
-                } elseif ($type == 'groupby') {
+                }
+                elseif ($type == 'groupby') {
                     $newv = $value;
-                    if ($value == 'debates' || $value == 'debate') $newv = 'debate';
-                    if ($value == 'speech' || $value == 'speeches') $newv = 'speech';
+                    if ($value == 'debates' || $value == 'debate') {
+                        $newv = 'debate';
+                    }
+                    if ($value == 'speech' || $value == 'speeches') {
+                        $newv = 'speech';
+                    }
                     $this->query = str_ireplace("$type:$value", '', $this->query);
                     array_push($this->prefixed, array($type, $newv));
-                } elseif ($type == 'from') {
+                }
+                elseif ($type == 'from') {
                     $from = $value;
-                } elseif ($type == 'to') {
+                }
+                elseif ($type == 'to') {
                     $to = $value;
                 }
-            } elseif (strpos($word, '-') !== false) {
-            } elseif ($in_quote) {
+            }
+            elseif (strpos($word, '-') !== false) {
+            }
+            elseif ($in_quote) {
                 array_push($this->phrases[count($this->phrases) - 1], strtolower($word));
-            } elseif (strpos($word, '..') !== false) {
-            } elseif ($word == 'OR' || $word == 'AND' || $word == 'XOR' || $word == 'NEAR') {
-            } else {
+            }
+            elseif (strpos($word, '..') !== false) {
+            }
+            elseif ($word == 'OR' || $word == 'AND' || $word == 'XOR' || $word == 'NEAR') {
+            }
+            else {
                 array_push($this->words, strtolower($word));
             }
         }
@@ -170,10 +219,12 @@ 
             $this->query = str_ireplace("from:$from", '', $this->query);
             $this->query = str_ireplace("to:$to", '', $this->query);
             $this->query .= " $from..$to";
-        } elseif ($from) {
+        }
+        elseif ($from) {
             $this->query = str_ireplace("from:$from", '', $this->query);
             $this->query .= " $from..".date('Ymd');
-        } elseif ($to) {
+        }
+        elseif ($to) {
             $this->query = str_ireplace("to:$to", '', $this->query);
             $this->query .= " 19990101..$to";
         }
@@ -240,7 +291,8 @@ 
         $qd = preg_replace('#\bG(.*?)\b#', 'department:$1', $qd); # XXX Lookup to show proper name of dept
         if (strstr($qd, 'M1 OR M2 OR M3 OR M4 OR M6 OR M101')) {
             $qd = str_replace('M1 OR M2 OR M3 OR M4 OR M6 OR M101', 'section:uk', $qd);
-        } elseif (strstr($qd, 'M7 OR M8')) {
+        }
+        elseif (strstr($qd, 'M7 OR M8')) {
             $qd = str_replace('M7 OR M8', 'section:scotland', $qd);
         }
         $qd = preg_replace('#\bM(\d+)\b#e', '"in the \'" . (isset($hansardmajors[$1]["title"]) ? $hansardmajors[$1]["title"] . "\'" : "$1")', $qd);
@@ -254,7 +306,9 @@ 
             $end = $this->queryparser->unstem_end($mm);
             while (!$iter->equals($end)) {
                 $tt = $iter->get_term();
-                if (!in_array($tt, $used)) break;
+                if (!in_array($tt, $used)) {
+                    break;
+                }
                 $iter->next();
             }
             $used[] = $tt;
@@ -288,9 +342,11 @@ 
             if ($items[0] == 'groupby') {
                 if ($items[1] == 'debate') {
                     $qd .= ' grouped by debate';
-                } elseif ($items[1] == 'speech') {
+                }
+                elseif ($items[1] == 'speech') {
                     $qd .= ' showing all speeches';
-                } else {
+                }
+                else {
                     $PAGE->error_message("Unknown group by '$items[1]' ignored");
                 }
             }
@@ -333,8 +389,9 @@ 
     }
 
     public function get_spelling_correction() {
-         if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+         if (!defined('XAPIANDB') || !XAPIANDB) {
+                     return null;
+         }
 
         $qd = $this->queryparser->get_corrected_query_string();
         return $qd;
@@ -342,8 +399,9 @@ 
 
     // Perform partial query to get a count of number of matches
     public function run_count($first_result, $results_per_page, $sort_order='relevance') {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return null;
+        }
 
         $start = getmicrotime();
 
@@ -373,16 +431,19 @@ 
                 $collapsed = true;
                 if ($items[1] == 'speech')
                     ; // no collapse key
-                elseif ($items[1] == 'debate')
-                    $this->enquire->set_collapse_key(3);
-                else
-                    $PAGE->error_message("Unknown group by '$items[1]' ignored");
+                elseif ($items[1] == 'debate') {
+                                    $this->enquire->set_collapse_key(3);
+                }
+                else {
+                                    $PAGE->error_message("Unknown group by '$items[1]' ignored");
+                }
             }
         }
 
         // default to grouping by subdebate, i.e. by page
-        if (!$collapsed)
-            $this->enquire->set_collapse_key(3);
+        if (!$collapsed) {
+                    $this->enquire->set_collapse_key(3);
+        }
 
         /*
         XXX Helping to debug possible Xapian bug
@@ -462,8 +523,9 @@ 
 
     // Puts HTML highlighting round all the matching words in the text
     public function highlight($body) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return $body;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return $body;
+        }
 
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         if (is_array($body)) {
@@ -472,7 +534,8 @@ 
             }
 
             return $body;
-        } else {
+        }
+        else {
             return $this->highlight_internal($body, $stemmed_words);
         }
     }
@@ -481,8 +544,9 @@ 
     private $specialchars_upper = array('<', '>', '"', '&');
 
     public function highlight_internal($body, $stemmed_words) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return $body;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return $body;
+        }
 
         # Does html_entity_decode without the htmlspecialchars
         $body = str_replace($this->specialchars, $this->specialchars_upper, $body);
@@ -503,7 +567,9 @@ 
             $hl = false;
             $matchword = $this->stem($extractword);
             foreach ($stemmed_words as $word) {
-                if ($word == '') continue;
+                if ($word == '') {
+                    continue;
+                }
                 if ($matchword == $word) {
                     $hl = true;
                     break;
@@ -511,7 +577,8 @@ 
             }
             if ($hl) {
                 $hlextract .= "<span class=\"hi\">$extractword</span>$endswithamp";
-            } else {
+            }
+            else {
                 $hlextract .= $extractword . $endswithamp;
             }
         }
@@ -555,8 +622,7 @@ 
         // look for phrases
         foreach ($this->phrases as $phrase) {
             $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
-            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
-            {
+            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches)) {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
                    if ( ($wordpos < $pos) || ($pos==-1) ) {
@@ -565,17 +631,25 @@ 
                 }
             }
         }
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         $splitextract = preg_split('/([0-9,.]+|['.$this->wordcharsnodigit.']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         foreach ($splitextract as $extractword) {
             $extractword = preg_replace('/&$/', '', $extractword);
-            if (!$extractword) continue;
+            if (!$extractword) {
+                continue;
+            }
             $wordpos = strpos($lcbody, $extractword);
-            if (!$wordpos) continue;
+            if (!$wordpos) {
+                continue;
+            }
             foreach ($stemmed_words as $word) {
-                if ($word == '') continue;
+                if ($word == '') {
+                    continue;
+                }
                 $matchword = $this->stem($extractword);
                 if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
                     $pos = $wordpos;
@@ -583,10 +657,14 @@ 
             }
         }
         // only look for earlier words if phrases weren't found
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) {
+                $word = '(?:'.$word.'|'.number_format($word).')';
+            }
             if (preg_match('/([^'.$this->wordchars.']' . $word . '[^'.$this->wordchars. '])/', $lcbody, $matches)) {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
@@ -597,10 +675,14 @@ 
             }
         }
         // only look for something containing the word (ie. something stemmed, but doesn't work all the time) if no whole word was found
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) {
+                $word = '(?:'.$word.'|'.number_format($word).')';
+            }
             if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
@@ -611,8 +693,9 @@ 
             }
         }
 
-        if ($pos == -1)
-            $pos = 0;
+        if ($pos == -1) {
+                    $pos = 0;
+        }
 
         return $pos;
     }

www/includes/easyparliament/searchlog.php

Doc Comments +3 added lines

@@ -99,6 +99,9 @@
         return $popular_searches;
     }
 
+    /**
+     * @param integer $row
+     */
     public function _db_row_to_array($q, $row) {
         $query = $q->field($row, 'query_string');
         $this->SEARCHURL->insert(array('s'=>$query, 'pop'=>1));

Spacing +7 added lines, -7 removed lines

@@ -69,14 +69,14 @@ 
     // Select popular queries
     public function popular_recent($count, $max_chars = null) {
 
-        $q =  $this->db->query("SELECT *, count(*) AS c FROM search_query_log
+        $q = $this->db->query("SELECT *, count(*) AS c FROM search_query_log
                 WHERE count_hits != 0 AND query_string != 'twat'
            AND query_string != 'suffragettes' AND page_number=1
                 AND query_time > date_sub(NOW(), INTERVAL 1 DAY)
                 GROUP BY query_string ORDER BY c desc LIMIT $count;");
 
         $popular_searches = array();
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             array_push($popular_searches, $this->_db_row_to_array($q, $row));
         }
 
@@ -122,7 +122,7 @@ 
         $rowarray['query'] = $query;
         $rowarray['visible_name'] = $visible_name;
         $rowarray['url'] = $url;
-        $rowarray['display'] = '<a href="' . $url . '">' . ($htmlescape ? _htmlentities($visible_name) : $visible_name). '</a>';
+        $rowarray['display'] = '<a href="' . $url . '">' . ($htmlescape ? _htmlentities($visible_name) : $visible_name) . '</a>';
 
         return $rowarray;
     }
@@ -132,7 +132,7 @@ 
         $q = $this->db->query("SELECT query_string, page_number, count_hits, ip_address, query_time
                 FROM search_query_log ORDER BY query_time desc LIMIT $count");
         $searches_array = array();
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             array_push($searches_array, $this->_db_row_to_array($q, $row));
         }
 
@@ -141,13 +141,13 @@ 
 
     public function admin_popular_searches($count) {
 
-        $q =  $this->db->query("SELECT *, count(*) AS c FROM search_query_log
+        $q = $this->db->query("SELECT *, count(*) AS c FROM search_query_log
                 WHERE count_hits != 0 AND query_string NOT LIKE '%speaker:%'
                 AND query_time > date_sub(NOW(), INTERVAL 30 DAY)
                 GROUP BY query_string ORDER BY c desc LIMIT $count;");
 
         $popular_searches = array();
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             array_push($popular_searches, $this->_db_row_to_array($q, $row));
         }
 
@@ -163,7 +163,7 @@ 
                 FROM search_query_log GROUP BY query_string HAVING count_hits = 0
                 ORDER BY count_ips DESC, max_time DESC");
         $searches_array = array();
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             array_push($searches_array, $this->_db_row_to_array($q, $row));
         }
 

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
     public function add($searchlogdata) {
 
         $ip = getenv('REMOTE_ADDR');
-        if (preg_match('#66\.249\.(6[4-9]|[78]\d|9[0-5])\.#', $ip)) { # Googlebot
+        if (preg_match('#66\.249\.(6[4-9]|[78]\d|9[0-5])\.#', $ip)) {
+# Googlebot
             return;
         }
         if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match('#simplepie|bot#i', $_SERVER['HTTP_USER_AGENT'])) {

www/includes/technorati.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
   public $xPermalink;
 }
 
+/**
+ * @param string $url
+ */
 function technorati($url) {
   global $arItems, $itemCount;
 

Indentation +41 added lines, -41 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-  /*
+    /*
 
   mysql> load data infile '/home/stefan/whitelabel.org/wp/convertedtitles' ignore into table titles;
   */
@@ -24,21 +24,21 @@ 
 }
 
 class xItem {
-  public $xTitle;
-  public $xLink;
-  public $xPermalink;
+    public $xTitle;
+    public $xLink;
+    public $xPermalink;
 }
 
 function technorati($url) {
-  global $arItems, $itemCount;
+    global $arItems, $itemCount;
 
 # array of technorati links
-  $arItems = array();
+    $arItems = array();
 
-  $itemCount = 0;
+    $itemCount = 0;
 
 # right. now get the technorati links.
-  doCosmos($url);
+    doCosmos($url);
 }
 
 ## functions/classes bits and pieces  from elsewhere below
@@ -50,16 +50,16 @@ 
 
 function doCosmos($urlstring) {
 
-  $techRati = "http://api.technorati.com/cosmos?format=xml&url=$urlstring&key=7e64960cc7e9b1cb4315e56a6544fce7" ;
+    $techRati = "http://api.technorati.com/cosmos?format=xml&url=$urlstring&key=7e64960cc7e9b1cb4315e56a6544fce7" ;
 
-  /* No caching for now */
+    /* No caching for now */
 #generate cachefilename
 //  preg_match ("/\d{7}/", $urlstring, $nums) ;
 
 //  $cacheFilename= $nums[0];
 
-  // cache for 30 mins only
-  //  if (!file_exists("cache/{$cacheFilename}.xml")||  (time() - filemtime("cache/{$cacheFilename}.xml") > 1800)||filesize ("cache/{$cacheFilename}.xml")==0 ) {
+    // cache for 30 mins only
+    //  if (!file_exists("cache/{$cacheFilename}.xml")||  (time() - filemtime("cache/{$cacheFilename}.xml") > 1800)||filesize ("cache/{$cacheFilename}.xml")==0 ) {
 
 #echo "cache miss!";
 
@@ -71,13 +71,13 @@ 
     //    fwrite($cachefp, $contents);
     //    fclose($cachefp);
 
-  $xml_parser = xml_parser_create();
-  xml_set_element_handler($xml_parser, "start1Element", "end1Element");
-  xml_set_character_data_handler($xml_parser, "character1Data");
-  //character1Data = fopen("cache/$cacheFilename.xml", "r")
-  #  $fp = fopen($a, "r")
-  #  or die("Error reading XML data.");
-  #while ($data = fread($fp, 16384)) {
+    $xml_parser = xml_parser_create();
+    xml_set_element_handler($xml_parser, "start1Element", "end1Element");
+    xml_set_character_data_handler($xml_parser, "character1Data");
+    //character1Data = fopen("cache/$cacheFilename.xml", "r")
+    #  $fp = fopen($a, "r")
+    #  or die("Error reading XML data.");
+    #while ($data = fread($fp, 16384)) {
     // Parse each 4KB chunk with the XML parser created above
     xml_parse($xml_parser, $contents, TRUE);
 
@@ -85,52 +85,52 @@ 
 
 #  }
 #  fclose($fp);
-  xml_parser_free($xml_parser);
+    xml_parser_free($xml_parser);
 
 #echo "parsing complete";
 #  global $arItems;
 #  global $itemCount;
-  // write out the items
+    // write out the items
 
 #echo count($arItems);
 
 }
 
 function start1Element($parser, $tagName, $attrs) {
-  global $curTag;
-  $curTag .= "^$tagName";
-  // 	echo $counter." ".$curTag."<br> ";
+    global $curTag;
+    $curTag .= "^$tagName";
+    // 	echo $counter." ".$curTag."<br> ";
 }
 
 function end1Element($parser, $tagName) {
-  global $curTag;
-  $caret_pos = strrpos($curTag,'^');
-  $curTag = substr($curTag,0,$caret_pos);
-  // 	echo $counter." ".$curTag."<br> ";
+    global $curTag;
+    $caret_pos = strrpos($curTag,'^');
+    $curTag = substr($curTag,0,$caret_pos);
+    // 	echo $counter." ".$curTag."<br> ";
 }
 
 function character1Data($parser, $data) {
-  global $itemCount, $curTag, $arItems;
-  $titleKey = "^TAPI^DOCUMENT^ITEM^WEBLOG^NAME";
-  $permalinkKey = "^TAPI^DOCUMENT^ITEM^NEARESTPERMALINK";
-  $linkKey = "^TAPI^DOCUMENT^ITEM^WEBLOG^URL";
-  $createdKey = "^TAPI^DOCUMENT^ITEM^LINKCREATED";
-  if ($curTag == $titleKey) {
+    global $itemCount, $curTag, $arItems;
+    $titleKey = "^TAPI^DOCUMENT^ITEM^WEBLOG^NAME";
+    $permalinkKey = "^TAPI^DOCUMENT^ITEM^NEARESTPERMALINK";
+    $linkKey = "^TAPI^DOCUMENT^ITEM^WEBLOG^URL";
+    $createdKey = "^TAPI^DOCUMENT^ITEM^LINKCREATED";
+    if ($curTag == $titleKey) {
     // make new xItem
 
     $arItems[$itemCount] = new xItem();
     // set new item object's properties
     $arItems[$itemCount]->xTitle = $data;
-  }
-  elseif ($curTag == $permalinkKey) {
+    }
+    elseif ($curTag == $permalinkKey) {
     $arItems[$itemCount]->xPermalink = $data;
     #    $itemCount++;
-  }
-  elseif ($curTag == $linkKey) {
+    }
+    elseif ($curTag == $linkKey) {
     $arItems[$itemCount]->xLink = $data;
     #$itemCount++;
-  } elseif ($curTag == $createdKey) {
-      $arItems[$itemCount]->xCreated = $data;
-      $itemCount++;
+    } elseif ($curTag == $createdKey) {
+        $arItems[$itemCount]->xCreated = $data;
+        $itemCount++;
     }
 }

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

@@ -79,7 +79,7 @@
   #  or die("Error reading XML data.");
   #while ($data = fread($fp, 16384)) {
     // Parse each 4KB chunk with the XML parser created above
-    xml_parse($xml_parser, $contents, TRUE);
+    xml_parse($xml_parser, $contents, true);
 
 #echo "reading...";
 

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
         if ($string == 'hour' && $ago > 23) { $ago /= 24; $string = 'day'; }
         if ($string == 'day' && $ago > 13) { $ago /= 7; $string = 'week'; }
         $ago = round($ago); if ($ago != 1) $string .= 's';
-        $body .= '<li><a href="' . $item->xLink . '">' . $item->xTitle . '</a> ('.$ago.' '.$string.' ago)</li>';
+        $body .= '<li><a href="' . $item->xLink . '">' . $item->xTitle . '</a> (' . $ago . ' ' . $string . ' ago)</li>';
     }
     if ($body) {
         $body = "<ul>$body</ul>";
@@ -50,7 +50,7 @@ 
 
 function doCosmos($urlstring) {
 
-  $techRati = "http://api.technorati.com/cosmos?format=xml&url=$urlstring&key=7e64960cc7e9b1cb4315e56a6544fce7" ;
+  $techRati = "http://api.technorati.com/cosmos?format=xml&url=$urlstring&key=7e64960cc7e9b1cb4315e56a6544fce7";
 
   /* No caching for now */
 #generate cachefilename
@@ -65,7 +65,7 @@ 
 
     $a = file($techRati);
     if (!$a) return false;
-    set_time_limit (10);
+    set_time_limit(10);
     $contents = implode('', $a);
     //    $cachefp = fopen("cache/{$cacheFilename}.xml", "w");
     //    fwrite($cachefp, $contents);
@@ -104,8 +104,8 @@ 
 
 function end1Element($parser, $tagName) {
   global $curTag;
-  $caret_pos = strrpos($curTag,'^');
-  $curTag = substr($curTag,0,$caret_pos);
+  $caret_pos = strrpos($curTag, '^');
+  $curTag = substr($curTag, 0, $caret_pos);
   // 	echo $counter." ".$curTag."<br> ";
 }
 

Braces +8 added lines, -3 removed lines

@@ -14,7 +14,9 @@ 
         if ($string == 'minute' && $ago > 59) { $ago /= 60; $string = 'hour'; }
         if ($string == 'hour' && $ago > 23) { $ago /= 24; $string = 'day'; }
         if ($string == 'day' && $ago > 13) { $ago /= 7; $string = 'week'; }
-        $ago = round($ago); if ($ago != 1) $string .= 's';
+        $ago = round($ago); if ($ago != 1) {
+            $string .= 's';
+        }
         $body .= '<li><a href="' . $item->xLink . '">' . $item->xTitle . '</a> ('.$ago.' '.$string.' ago)</li>';
     }
     if ($body) {
@@ -64,7 +66,9 @@ 
 #echo "cache miss!";
 
     $a = file($techRati);
-    if (!$a) return false;
+    if (!$a) {
+        return false;
+    }
     set_time_limit (10);
     $contents = implode('', $a);
     //    $cachefp = fopen("cache/{$cacheFilename}.xml", "w");
@@ -129,7 +133,8 @@ 
   elseif ($curTag == $linkKey) {
     $arItems[$itemCount]->xLink = $data;
     #$itemCount++;
-  } elseif ($curTag == $createdKey) {
+  }
+  elseif ($curTag == $createdKey) {
       $arItems[$itemCount]->xCreated = $data;
       $itemCount++;
     }

classes/Member.php

Doc Comments +12 added lines

@@ -207,6 +207,10 @@ 
 
     }
 
+    /**
+     * @param string|null $include_only
+     * @param boolean $ignore_committees
+     */
     private function getOfficeObject($include_only, $ignore_committees, $row) {
         if (!$this->includeOffice($include_only, $row['to_date'])) {
             return null;
@@ -338,6 +342,10 @@ 
         return $output;
     }
 
+    /**
+     * @param integer $house
+     * @param string $house_name
+     */
     private function entered_house_line($house, $house_name) {
         if (isset($this->entered_house[$house]['date'])) {
             $string = "<strong>Entered the $house_name ";
@@ -350,6 +358,10 @@ 
         }
     }
 
+    /**
+     * @param integer $house
+     * @param string $house_name
+     */
     private function left_house_line($house, $house_name) {
         if ($this->house($house) && !$this->current_member($house)) {
             $string = "<strong>Left the $house_name ";

Indentation +35 added lines, -35 removed lines

@@ -133,12 +133,12 @@ 
     }
 
     /**
-    * Image
-    *
-    * Return a URL for the member's image.
-    *
-    * @return string The URL of the member's image.
-    */
+     * Image
+     *
+     * Return a URL for the member's image.
+     *
+     * @return string The URL of the member's image.
+     */
 
     public function image() {
 
@@ -207,15 +207,15 @@ 
     }
 
     /**
-    * Offices
-    *
-    * Return an array of Office objects held (or previously held) by the member.
-    *
-    * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
-    * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
-    *
-    * @return array An array of Office objects.
-    */
+     * Offices
+     *
+     * Return an array of Office objects held (or previously held) by the member.
+     *
+     * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
+     * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
+     *
+     * @return array An array of Office objects.
+     */
 
     public function offices($include_only = NULL, $ignore_committees = FALSE) {
 
@@ -269,12 +269,12 @@ 
     }
 
     /**
-    * Get Other Parties String
-    *
-    * Return a readable list of party changes for this member.
-    *
-    * @return string|null A readable list of the party changes for this member.
-    */
+     * Get Other Parties String
+     *
+     * Return a readable list of party changes for this member.
+     *
+     * @return string|null A readable list of the party changes for this member.
+     */
 
     public function getOtherPartiesString() {
 
@@ -302,12 +302,12 @@ 
     }
 
     /**
-    * Get Other Constituencies String
-    *
-    * Return a readable list of other constituencies for this member.
-    *
-    * @return string|null A readable list of the other constituencies for this member.
-    */
+     * Get Other Constituencies String
+     *
+     * Return a readable list of other constituencies for this member.
+     *
+     * @return string|null A readable list of the other constituencies for this member.
+     */
 
     public function getOtherConstituenciesString() {
 
@@ -320,14 +320,14 @@ 
     }
 
     /**
-    * Get Entered/Left Strings
-    *
-    * Return an array of readable strings covering when people entered or left
-    * various houses. Returns an array since it's possible for a member to have
-    * done several of these things.
-    *
-    * @return array An array of strings of when this member entered or left houses.
-    */
+     * Get Entered/Left Strings
+     *
+     * Return an array of readable strings covering when people entered or left
+     * various houses. Returns an array since it's possible for a member to have
+     * done several of these things.
+     *
+     * @return array An array of strings of when this member entered or left houses.
+     */
     public function getEnterLeaveStrings() {
         $output = array();
 

Switch Indentation +14 added lines, -14 removed lines

@@ -488,20 +488,20 @@
 
     public static function getRepNameForHouse($house) {
         switch ( $house ) {
-        case 1:
-            $name = 'MP';
-            break;
-        case 2:
-            $name = 'Peer';
-            break;
-        case 3:
-            $name = 'MLA';
-            break;
-        case 4:
-            $name = 'MSP';
-            break;
-        default:
-            $name = '';
+            case 1:
+                $name = 'MP';
+                break;
+            case 2:
+                $name = 'Peer';
+                break;
+            case 3:
+                $name = 'MLA';
+                break;
+            case 4:
+                $name = 'MSP';
+                break;
+            default:
+                $name = '';
         }
         return $name;
     }

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

@@ -39,13 +39,13 @@ 
 
             foreach ($house_types as $house_type) {
 
-                if (in_array($house_type, $left_house) AND
-                    $left_house[$house_type]['reason'] AND
+                if (in_array($house_type, $left_house) and
+                    $left_house[$house_type]['reason'] and
                     $left_house[$house_type]['reason'] == 'Died'
                 ) {
 
                     // This member has left a house because of death.
-                    return TRUE;
+                    return true;
                 }
 
             }
@@ -54,7 +54,7 @@ 
 
         // If we get this far the member hasn't left a house due to death, and
         // is presumably alive.
-        return FALSE;
+        return false;
 
     }
 
@@ -76,11 +76,11 @@ 
 
             $diff = $date_entered->diff($now);
             if ( $diff->y == 0 && $diff->m <= 6 ) {
-                return TRUE;
+                return true;
             }
         }
 
-        return FALSE;
+        return false;
     }
 
     /*
@@ -129,7 +129,7 @@ 
             return $this->extra_info()['eu_ref_stance'];
         }
 
-        return FALSE;
+        return false;
     }
 
     /**
@@ -150,10 +150,10 @@ 
         }
 
         // We can determine if the image exists or not by testing if size is set
-        if ($size !== NULL) {
-            $exists = TRUE;
+        if ($size !== null) {
+            $exists = true;
         } else {
-            $exists = FALSE;
+            $exists = false;
         }
 
         return array(
@@ -217,7 +217,7 @@ 
     * @return array An array of Office objects.
     */
 
-    public function offices($include_only = NULL, $ignore_committees = FALSE) {
+    public function offices($include_only = null, $ignore_committees = false) {
 
         $out = array();
 
@@ -253,16 +253,16 @@ 
     }
 
     private function includeOffice($include_only, $to_date) {
-        $include_office = TRUE;
+        $include_office = true;
 
         // If we should only include previous offices, and the to date is in the future, suppress this office.
-        if ($include_only == 'previous' AND $to_date == '9999-12-31') {
-            $include_office = FALSE;
+        if ($include_only == 'previous' and $to_date == '9999-12-31') {
+            $include_office = false;
         }
 
         // If we should only include previous offices, and the to date is in the past, suppress this office.
-        if ($include_only == 'current' AND $to_date != '9999-12-31') {
-            $include_office = FALSE;
+        if ($include_only == 'current' and $to_date != '9999-12-31') {
+            $include_office = false;
         }
 
         return $include_office;
@@ -287,7 +287,7 @@ 
             $output .= join('; ', $other_parties);
             return $output;
         } else {
-            return NULL;
+            return null;
         }
 
     }
@@ -314,7 +314,7 @@ 
         if ($this->other_constituencies) {
             return 'Also represented ' . join('; ', array_keys($this->other_constituencies));
         } else {
-            return NULL;
+            return null;
         }
 
     }

Spacing +25 added lines, -25 removed lines

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

Braces +12 added lines, -6 removed lines

@@ -145,14 +145,16 @@ 
         $is_lord = $this->house(HOUSE_TYPE_LORDS);
         if ($is_lord) {
             list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
-        } else {
+        }
+        else {
             list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, true);
         }
 
         // We can determine if the image exists or not by testing if size is set
         if ($size !== NULL) {
             $exists = TRUE;
-        } else {
+        }
+        else {
             $exists = FALSE;
         }
 
@@ -174,7 +176,8 @@ 
             $last_cons = $this->constituency;
             $last_party = $this->party;
             $last_house = $this->house_disp;
-        } else {
+        }
+        else {
             $max_date = null;
             foreach ( array_keys($this->left_house) as $house ) {
                 if ($this->left_house[$house]['date'] > $max_date ) {
@@ -286,7 +289,8 @@ 
             }
             $output .= join('; ', $other_parties);
             return $output;
-        } else {
+        }
+        else {
             return NULL;
         }
 
@@ -313,7 +317,8 @@ 
 
         if ($this->other_constituencies) {
             return 'Also represented ' . join('; ', array_keys($this->other_constituencies));
-        } else {
+        }
+        else {
             return NULL;
         }
 
@@ -428,7 +433,8 @@ 
         ) {
             $score_diff += 2;
         // if on is mixture of for and against and one is for/against
-        } else if (
+        }
+        else if (
             ( $mp_score > 0.4 && $mp_score < 0.6 && ( $party_score > 0.6 || $party_score < 0.4 ) ) ||
             ( $party_score > 0.4 && $party_score < 0.6 && ( $mp_score > 0.6 || $mp_score < 0.4 ) )
         ) {

www/docs/mp/index.php

Doc Comments +14 added lines

@@ -590,6 +590,7 @@ 
  * Member Redirect
  *
  * Redirect to the canonical page for a member.
+ * @param MySociety\TheyWorkForYou\Member $MEMBER
  */
 
 function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
@@ -1056,6 +1057,12 @@ 
 
 }
 
+/**
+ * @param string $blurb
+ * @param string $type
+ * @param string $inwhat
+ * @param string $afterstuff
+ */
 function display_stats_line($category, $blurb, $type, $inwhat, $afterstuff, $extra_info, $minister = false, $Lminister = false) {
     $return = false;
     if (isset($extra_info[$category]))
@@ -1065,6 +1072,10 @@ 
     return $return;
 }
 
+/**
+ * @param integer $house
+ * @param boolean $minister
+ */
 function display_stats_line_house($house, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff) {
     if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category =='comments_on_speeches' ||
         $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category =='Lcomments_on_speeches') {
@@ -1163,6 +1174,9 @@ 
     return $reg;
 }
 
+/**
+ * @param string $area_type
+ */
 function regional_list($pc, $area_type, $rep_type) {
     $constituencies = MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($pc);
     if ($constituencies == 'CONNECTION_TIMED_OUT') {

Indentation +20 added lines, -20 removed lines

@@ -255,8 +255,8 @@ 
 // Finally, if this is a Votes page, replace the page description with
 // something more descriptive of the actual data on the page.
 if ($pagetype == 'votes') {
-  $title = "Voting record - " . $title;
-  $desc = 'See how ' . $member_name . ' voted on topics like Employment, Social Issues, Foreign Policy, and more.';
+    $title = "Voting record - " . $title;
+    $desc = 'See how ' . $member_name . ' voted on topics like Employment, Social Issues, Foreign Policy, and more.';
 }
 
 // Set page metadata
@@ -359,19 +359,19 @@ 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
         if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
-          $data['key_votes_segments'] = array(
-              array(
-                  'key' => $policy_set,
-                  'title' => $set_descriptions[$policy_set],
-                  'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
-                      $policiesList->limitToSet($policy_set), $MEMBER, $policyOptions
-                  )
-              )
-          );
-          $data['og_image'] = $MEMBER->url(true) . "/policy_set_png?policy_set=" . $policy_set;
-          $data['page_title'] = $policiesList->getSetDescriptions()[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
-          $data['meta_description'] = 'See how ' . $data['full_name'] . ' voted on ' . $policiesList->getSetDescriptions()[$policy_set];
-          $data['single_policy_page'] = true;
+            $data['key_votes_segments'] = array(
+                array(
+                    'key' => $policy_set,
+                    'title' => $set_descriptions[$policy_set],
+                    'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
+                        $policiesList->limitToSet($policy_set), $MEMBER, $policyOptions
+                    )
+                )
+            );
+            $data['og_image'] = $MEMBER->url(true) . "/policy_set_png?policy_set=" . $policy_set;
+            $data['page_title'] = $policiesList->getSetDescriptions()[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
+            $data['meta_description'] = 'See how ' . $data['full_name'] . ' voted on ' . $policiesList->getSetDescriptions()[$policy_set];
+            $data['single_policy_page'] = true;
         } else {
             $data['single_policy_page'] = false;
             $data['key_votes_segments'] = array(
@@ -519,11 +519,11 @@ 
 
         // Generate voting segments
         $data['segment'] = array(
-          'key'   => $policy_set,
-          'title' => $policiesList->getSetDescriptions()[$policy_set],
-          'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
-              $policiesList->limitToSet($policy_set), $MEMBER
-          )
+            'key'   => $policy_set,
+            'title' => $policiesList->getSetDescriptions()[$policy_set],
+            'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
+                $policiesList->limitToSet($policy_set), $MEMBER
+            )
         );
 
         MySociety\TheyWorkForYou\Renderer::output('mp/votes_svg', $data, true);

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

@@ -29,7 +29,7 @@ 
  */
 
 // Disable the old PAGE class.
-$new_style_template = TRUE;
+$new_style_template = true;
 
 // Include all the things this page needs.
 include_once '../../includes/easyparliament/init.php';
@@ -176,7 +176,7 @@ 
 // Basic name, title and description
 $member_name = ucfirst($MEMBER->full_name());
 $title = $member_name;
-$desc = "Read $member_name's contributions to Parliament, including speeches and questions";
+$desc = "read $member_name's contributions to Parliament, including speeches and questions";
 
 // Enhance description if this is a current member
 if ($MEMBER->current_member_anywhere())
@@ -244,8 +244,8 @@ 
 
 $position = implode('; ', $positions);
 
-$current_offices = $MEMBER->offices('current', TRUE);
-$former_offices = $MEMBER->offices('previous', TRUE);
+$current_offices = $MEMBER->offices('current', true);
+$former_offices = $MEMBER->offices('previous', true);
 
 // If this person has named non-committee offices, they override the default
 if (count($current_offices) > 0) {
@@ -315,11 +315,11 @@ 
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
 
-$data['pre_2010_expenses'] = False;
+$data['pre_2010_expenses'] = false;
 $data['post_2010_expenses'] = $data['leave_date'] > '2010-05-05';
 
 if ($data['entry_date'] < '2010-05-05') {
-    $data['pre_2010_expenses'] = True;
+    $data['pre_2010_expenses'] = true;
     // Set the expenses URL if we know it
     if (isset($MEMBER->extra_info['expenses_url'])) {
         $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'];
@@ -685,7 +685,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect (&$MEMBER, $code = 301, $pagetype = null) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -1171,8 +1171,8 @@ 
     $return = false;
     if (isset($extra_info[$category]))
         $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
-    if (isset($extra_info["L$category"]))
-        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    if (isset($extra_info["l$category"]))
+        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "l$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
     return $return;
 }
 

Switch Indentation +20 added lines, -20 removed lines

@@ -731,26 +731,26 @@
 function person_error_page($message) {
     global $this_page;
     switch($this_page) {
-    case 'mla':
-        $rep = 'MLA';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
-        break;
-    case 'msp':
-        $rep = 'MSP';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
-        break;
-    case 'peer':
-        $rep = 'Lord';
-        $SEARCHURL = '';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
-        break;
-    default:
-        $rep = 'MP';
-        $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
-        $SEARCHURL = $SEARCHURL->generate();
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
+        case 'mla':
+            $rep = 'MLA';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
+            break;
+        case 'msp':
+            $rep = 'MSP';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
+            break;
+        case 'peer':
+            $rep = 'Lord';
+            $SEARCHURL = '';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
+            break;
+        default:
+            $rep = 'MP';
+            $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
+            $SEARCHURL = $SEARCHURL->generate();
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
     }
 
     $data = array(

Spacing +53 added lines, -53 removed lines

@@ -118,7 +118,7 @@ 
     }
     if ($pid) {
         $URL = new \MySociety\TheyWorkForYou\Url('search');
-        $URL->insert( array('pid'=>$pid, 'pop'=>1) );
+        $URL->insert(array('pid'=>$pid, 'pop'=>1));
         header('Location: ' . $URL->generate('none'));
         exit;
     }
@@ -149,7 +149,7 @@ 
     } elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
     } else {
-        twfy_debug ('MP', "We don't have any way of telling what MP to display");
+        twfy_debug('MP', "We don't have any way of telling what MP to display");
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, but we can’t tell which representative to display.');
     }
     if (!isset($MEMBER) || !$MEMBER->valid) {
@@ -216,7 +216,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_SCOTLAND)) {
         $title .= ', former';
     }
-    $title .= ' MSP, '.$MEMBER->constituency();
+    $title .= ' MSP, ' . $MEMBER->constituency();
 }
 
 $positions = array();
@@ -310,7 +310,7 @@ 
 $data['eu_stance'] = $MEMBER->getEUStance();
 
 # People who are or were MPs and Lords potentially have voting records, except Sinn Fein MPs
-$data['has_voting_record'] = ( ($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS) );
+$data['has_voting_record'] = (($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS));
 # Everyone who is currently somewhere has email alert signup, apart from current Sinn Fein MPs who are not MLAs
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
@@ -336,9 +336,9 @@ 
 
 $data['this_page'] = $this_page;
 $data['current_assembly'] = 'westminster';
-if ( $this_page == 'msp' || $this_page == 'yourmsp' ) {
+if ($this_page == 'msp' || $this_page == 'yourmsp') {
     $data['current_assembly'] = 'scotland';
-} else if ( $this_page == 'mla' || $this_page == 'yourmla' ) {
+} else if ($this_page == 'mla' || $this_page == 'yourmla') {
     $data['current_assembly'] = 'ni';
 }
 
@@ -354,11 +354,11 @@ 
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
         $policySummaries = $divisions->getMemberDivisionDetails();
 
-        $policyOptions = array( 'summaries' => $policySummaries);
+        $policyOptions = array('summaries' => $policySummaries);
 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
-        if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
+        if ($policy_set && array_key_exists($policy_set, $set_descriptions)) {
           $data['key_votes_segments'] = array(
               array(
                   'key' => $policy_set,
@@ -476,7 +476,7 @@ 
 
     case 'recent':
         $policiesList = new MySociety\TheyWorkForYou\Policies;
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
         $data['divisions'] = $divisions->getRecentMemberDivisions();
@@ -487,15 +487,15 @@ 
 
     case 'divisions':
         $policyID = get_http_var('policy');
-        if ( $policyID ) {
-            $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
+        if ($policyID) {
+            $policiesList = new MySociety\TheyWorkForYou\Policies($policyID);
         } else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
-        if ( $policyID ) {
+        if ($policyID) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
         } else {
             $data['policydivisions'] = $divisions->getAllMemberDivisionsByPolicy();
@@ -572,7 +572,7 @@ 
 
         // generate party policy diffs
         $party = new MySociety\TheyWorkForYou\Party($MEMBER->party());
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $party_positions = $party->getAllPolicyPositions($policiesList);
         $policy_diffs = $MEMBER->getPartyPolicyDiffs($party, $policiesList, $positions, true);
 
@@ -626,16 +626,16 @@ 
     global $THEUSER;
     $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
     if (!validate_postcode($pc)) {
-        twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
-        throw new MySociety\TheyWorkForYou\MemberException('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.");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
     }
-    twfy_debug ('MP', "MP lookup by postcode");
+    twfy_debug('MP', "MP lookup by postcode");
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "connection_timed_out") {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
     } elseif ($constituency == "") {
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a known postcode');
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
     } else {
         // Redirect to the canonical MP page, with a person id.
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
@@ -647,11 +647,11 @@ 
     }
 }
 
-function get_person_by_name($name, $const='') {
+function get_person_by_name($name, $const = '') {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('name' => $name, 'constituency' => $const));
     // Edge case, only attempt further detection if this isn't the Queen.
     if ($name !== 'elizabeth the second' || $const) {
-        twfy_debug ('MP', 'Redirecting for MP found by name/constituency');
+        twfy_debug('MP', 'Redirecting for MP found by name/constituency');
         member_redirect($MEMBER);
     }
     return $MEMBER;
@@ -685,7 +685,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect(&$MEMBER, $code = 301, $pagetype = NULL) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -702,7 +702,7 @@ 
         } else {
             $pagetype = '';
         }
-        header('Location: ' . $url . $pagetype, true, $code );
+        header('Location: ' . $url . $pagetype, true, $code);
         exit;
     }
 }
@@ -730,7 +730,7 @@ 
 
 function person_error_page($message) {
     global $this_page;
-    switch($this_page) {
+    switch ($this_page) {
     case 'mla':
         $rep = 'MLA';
         $SEARCHURL = '/postcode/';
@@ -768,7 +768,7 @@ 
  * Generate the summary of this person's held positions.
  */
 
-function person_summary_description ($MEMBER) {
+function person_summary_description($MEMBER) {
     $entered_house = $MEMBER->entered_house();
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
@@ -779,7 +779,7 @@ 
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
+        if ($house == HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
             continue; # Same info is printed further down
 
         if (!$current_member[$house]) $desc .= 'Former ';
@@ -800,17 +800,17 @@ 
                 $desc .= $last['from'] . ' ';
             }
         }
-        if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
+        if ($house == HOUSE_TYPE_COMMONS || $house == HOUSE_TYPE_NI || $house == HOUSE_TYPE_SCOTLAND) {
             $desc .= ' ';
-            if ($house==HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
-            if ($house==HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
-            if ($house==HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            if ($house == HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
+            if ($house == HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
+            if ($house == HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
             if ($party_br) {
                 $desc .= " ($party_br)";
             }
             $desc .= ' for ' . $left_house[$house]['constituency'];
         }
-        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
+        if ($house == HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
         $desc .= ', ';
     }
     $desc = preg_replace('#, $#', '', $desc);
@@ -827,7 +827,7 @@ 
  * @return string A HTML summary of this person's rebellion rate.
  */
 
-function person_rebellion_rate ($member) {
+function person_rebellion_rate($member) {
 
     // Rebellion string may be empty.
     $rebellion_string = '';
@@ -866,7 +866,7 @@ 
     // benefit unfortunately.
     twfy_debug_timestamp();
 
-    $person_id= $member->person_id();
+    $person_id = $member->person_id();
 
     $memcache = new MySociety\TheyWorkForYou\Memcache;
     $recent = $memcache->get('recent_appear:' . $person_id);
@@ -877,7 +877,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args = array (
+        $args = array(
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -892,7 +892,7 @@ 
     twfy_debug_timestamp();
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
-    $MOREURL->insert( array('pid'=>$person_id, 'pop'=>1) );
+    $MOREURL->insert(array('pid'=>$person_id, 'pop'=>1));
 
     $out['more_href'] = $MOREURL->generate() . '#n4';
     $out['more_text'] = 'More of ' . ucfirst($member->full_name()) . '&rsquo;s recent appearances';
@@ -1101,7 +1101,7 @@ 
         }
     }
 
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
         $wtt_displayed = display_writetothem_numbers($year, $extra_info);
         if ($wtt_displayed) {
             $out[] = $wtt_displayed;
@@ -1131,23 +1131,23 @@ 
         }
         */
 
-        if (display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info)) {
-            $out[] = display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info);
+        if (display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid=' . $member->person_id() . '">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info)) {
+            $out[] = display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid=' . $member->person_id() . '">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info);
         }
         if (display_stats_line('reading_age', 'This MP&rsquo;s speeches, in Hansard, are readable by an average ', '', ' year old, going by the <a href="https://en.wikipedia.org/wiki/Flesch-Kincaid_Readability_Test">Flesch-Kincaid Grade Level</a> score', '', $extra_info)) {
             $out[] = display_stats_line('reading_age', 'This MP&rsquo;s speeches, in Hansard, are readable by an average ', '', ' year old, going by the <a href="https://en.wikipedia.org/wiki/Flesch-Kincaid_Readability_Test">Flesch-Kincaid Grade Level</a> score', '', $extra_info);
         }
     }
 
-    if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts']>0 || $has_email_alerts)) {
-        $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts']==1?'person is':'people are') . ' tracking ';
+    if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts'] > 0 || $has_email_alerts)) {
+        $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts'] == 1 ? 'person is' : 'people are') . ' tracking ';
         if ($member->house_disp == HOUSE_TYPE_COMMONS) $line .= 'this MP';
         elseif ($member->house_disp == HOUSE_TYPE_LORDS) $line .= 'this peer';
         elseif ($member->house_disp == HOUSE_TYPE_NI) $line .= 'this MLA';
         elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) $line .= 'this MSP';
         elseif ($member->house_disp == HOUSE_TYPE_ROYAL) $line .= $member->full_name();
         if ($has_email_alerts) {
-            $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
+            $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid=' . $member->person_id() . '">email me updates on ' . $member->full_name() . '&rsquo;s activity</a>';
         }
 
         $out[] = $line;
@@ -1177,25 +1177,25 @@ 
 }
 
 function display_stats_line_house($house, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff) {
-    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category =='comments_on_speeches' ||
-        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category =='Lcomments_on_speeches') {
-        if ($extra_info[$category]==0) {
+    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category == 'comments_on_speeches' ||
+        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category == 'Lcomments_on_speeches') {
+        if ($extra_info[$category] == 0) {
             $blurb = preg_replace('#<a.*?>#', '', $blurb);
             $inwhat = preg_replace('#<\/a>#', '', $inwhat);
         }
     }
-    if ($house==HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
+    if ($house == HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
     $line = $blurb;
     $line .= '<strong>' . $extra_info[$category];
     if ($type) $line .= ' ' . make_plural($type, $extra_info[$category]);
     $line .= '</strong>';
     $line .= $inwhat;
-    if ($minister===2) {
+    if ($minister === 2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
     } elseif ($minister)
         $line .= ' &#8212; Ministers do not ask written questions';
     else {
-        $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
+        $type = ($house == HOUSE_TYPE_COMMONS ? 'MP' : ($house == HOUSE_TYPE_LORDS ? 'Lord' : 'MLA'));
         if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
             $line .= ' &#8212; ';
             $q = $extra_info[$category . '_quintile'];
@@ -1240,7 +1240,7 @@ 
         if ($a == 'very high') $a = 'a very high';
         $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"] = $a;
 
-        return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);
+        return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/' . $year . '/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during " . $year . ", according to constituents", "", $extra_info);
     }
 
 }
@@ -1248,7 +1248,7 @@ 
 function get_all_writetothem_strings($member, $wtt_stats_years) {
     $extra_info = $member->extra_info();
     $strings = array();
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
 
         if (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
             $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
@@ -1264,7 +1264,7 @@ 
         return;
     }
 
-    $reg = array( 'date' => '', 'data' => '<p>Nil</p>' );
+    $reg = array('date' => '', 'data' => '<p>Nil</p>');
     if (isset($extra_info['register_member_interests_date'])) {
         $reg['date'] = format_date($extra_info['register_member_interests_date'], SHORTDATEFORMAT);
     }
@@ -1299,7 +1299,7 @@ 
             $dissolution['params']);
     }
     $mcon = array(); $mreg = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $pid = $q->field($i, 'person_id');
         $cons = $q->field($i, 'constituency');
@@ -1337,8 +1337,8 @@ 
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] = array (
+    foreach ($mreg as $reg) {
+        $data['members'][] = array(
             'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
             'name' => $reg['given_name'] . ' ' . $reg['family_name']
         );

Braces +236 added lines, -104 removed lines

@@ -43,7 +43,8 @@ 
 // Ensure that page type is set
 if (get_http_var('pagetype')) {
     $pagetype = get_http_var('pagetype');
-} else {
+}
+else {
     $pagetype = 'profile';
 }
 if ($pagetype == 'profile') {
@@ -62,16 +63,36 @@ 
 $constituency = strtolower(str_replace('_', ' ', get_http_var('c')));
 
 // Fix for names with non-ASCII characters
-if ($name == 'sion simon') $name = 'si\xf4n simon';
-if ($name == 'sian james') $name = 'si\xe2n james';
-if ($name == 'lembit opik') $name = 'lembit \xf6pik';
-if ($name == 'bairbre de brun') $name = 'bairbre de br\xfan';
-if ($name == 'daithi mckay') $name = 'daith\xed mckay';
-if ($name == 'caral ni chuilin') $name = 'car\xe1l n\xed chuil\xedn';
-if ($name == 'caledon du pre') $name = 'caledon du pr\xe9';
-if ($name == 'sean etchingham') $name = 'se\xe1n etchingham';
-if ($name == 'john tinne') $name = 'john tinn\xe9';
-if ($name == 'renee short') $name = 'ren\xe9e short';
+if ($name == 'sion simon') {
+    $name = 'si\xf4n simon';
+}
+if ($name == 'sian james') {
+    $name = 'si\xe2n james';
+}
+if ($name == 'lembit opik') {
+    $name = 'lembit \xf6pik';
+}
+if ($name == 'bairbre de brun') {
+    $name = 'bairbre de br\xfan';
+}
+if ($name == 'daithi mckay') {
+    $name = 'daith\xed mckay';
+}
+if ($name == 'caral ni chuilin') {
+    $name = 'car\xe1l n\xed chuil\xedn';
+}
+if ($name == 'caledon du pre') {
+    $name = 'caledon du pr\xe9';
+}
+if ($name == 'sean etchingham') {
+    $name = 'se\xe1n etchingham';
+}
+if ($name == 'john tinne') {
+    $name = 'john tinn\xe9';
+}
+if ($name == 'renee short') {
+    $name = 'ren\xe9e short';
+}
 
 // Fix for common misspellings, name changes etc
 $name_fix = array(
@@ -97,13 +118,16 @@ 
         if ($constituency == $name_fix[$name][1]) {
             $name = $name_fix[$name][0];
         }
-    } else {
+    }
+    else {
         $name = $name_fix[$name];
     }
 }
 
 // Fixes for Ynys Mon, and a Unicode URL
-if ($constituency == 'ynys mon') $constituency = "ynys m\xf4n";
+if ($constituency == 'ynys mon') {
+    $constituency = "ynys m\xf4n";
+}
 if (preg_match("#^ynys m\xc3\xb4n#i", $constituency)) {
     $constituency = "ynys m\xf4n";
 }
@@ -126,29 +150,46 @@ 
 
 /////////////////////////////////////////////////////////
 // DETERMINE TYPE OF REPRESENTITIVE
-if (get_http_var('peer')) $this_page = 'peer';
-elseif (get_http_var('royal')) $this_page = 'royal';
-elseif (get_http_var('mla')) $this_page = 'mla';
-elseif (get_http_var('msp')) $this_page = 'msp';
-else $this_page = 'mp';
+if (get_http_var('peer')) {
+    $this_page = 'peer';
+}
+elseif (get_http_var('royal')) {
+    $this_page = 'royal';
+}
+elseif (get_http_var('mla')) {
+    $this_page = 'mla';
+}
+elseif (get_http_var('msp')) {
+    $this_page = 'msp';
+}
+else {
+    $this_page = 'mp';
+}
 
 try {
     if (is_numeric($pid)) {
         $MEMBER = get_person_by_id($pid);
-    } elseif (is_numeric(get_http_var('m'))) {
+    }
+    elseif (is_numeric(get_http_var('m'))) {
         get_person_by_member_id(get_http_var('m'));
-    } elseif (get_http_var('pc')) {
+    }
+    elseif (get_http_var('pc')) {
         get_person_by_postcode(get_http_var('pc'));
-    } elseif ($name) {
+    }
+    elseif ($name) {
         $MEMBER = get_person_by_name($name, $constituency);
-    } elseif ($constituency) {
+    }
+    elseif ($constituency) {
         get_mp_by_constituency($constituency);
-    } elseif (($this_page == 'msp' || $this_page == 'mla') && $THEUSER->postcode_is_set()) {
+    }
+    elseif (($this_page == 'msp' || $this_page == 'mla') && $THEUSER->postcode_is_set()) {
         get_regional_by_user_postcode($THEUSER->postcode(), $this_page);
         exit;
-    } elseif ($THEUSER->postcode_is_set()) {
+    }
+    elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
-    } else {
+    }
+    else {
         twfy_debug ('MP', "We don't have any way of telling what MP to display");
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, but we can’t tell which representative to display.');
     }
@@ -179,8 +220,9 @@ 
 $desc = "Read $member_name's contributions to Parliament, including speeches and questions";
 
 // Enhance description if this is a current member
-if ($MEMBER->current_member_anywhere())
+if ($MEMBER->current_member_anywhere()) {
     $desc .= ', investigate their voting record, and get email alerts on their activity';
+}
 
 // Enhance title if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
@@ -188,28 +230,34 @@ 
         $title .= ', former';
     }
     $title .= ' MP';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
     if ($MEMBER->house(HOUSE_TYPE_COMMONS) || $MEMBER->house(HOUSE_TYPE_LORDS)) {
         $desc = str_replace('Parliament', 'Parliament and the Northern Ireland Assembly', $desc);
-    } else {
+    }
+    else {
         $desc = str_replace('Parliament', 'the Northern Ireland Assembly', $desc);
     }
     if (!$MEMBER->current_member(HOUSE_TYPE_NI)) {
         $title .= ', former';
     }
     $title .= ' MLA';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of Scottish Parliament
 if ($MEMBER->house(HOUSE_TYPE_SCOTLAND)) {
     if ($MEMBER->house(HOUSE_TYPE_COMMONS) || $MEMBER->house(HOUSE_TYPE_LORDS)) {
         $desc = str_replace('Parliament', 'the UK and Scottish Parliaments', $desc);
-    } else {
+    }
+    else {
         $desc = str_replace('Parliament', 'the Scottish Parliament', $desc);
     }
     $desc = str_replace(', and get email alerts on their activity', '', $desc);
@@ -224,14 +272,18 @@ 
 // Position if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_COMMONS) ? 'MP' : 'Former MP';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
 // Position if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_NI) ? 'MLA' : 'Former MLA';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
@@ -265,8 +317,9 @@ 
 
 // Build the RSS link and add it to page data.
 $feedurl = $DATA->page_metadata('mp_rss', 'url') . $MEMBER->person_id() . '.rdf';
-if (file_exists(BASEDIR . '/' . $feedurl))
+if (file_exists(BASEDIR . '/' . $feedurl)) {
     $DATA->set_page_metadata($this_page, 'rss', $feedurl);
+}
 
 // Prepare data for the template
 $data['full_name'] = $MEMBER->full_name();
@@ -323,7 +376,8 @@ 
     // Set the expenses URL if we know it
     if (isset($MEMBER->extra_info['expenses_url'])) {
         $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'];
-    } else {
+    }
+    else {
         $data['expenses_url_2004'] = 'http://mpsallowances.parliament.uk/mpslordsandoffices/hocallowances/allowances%2Dby%2Dmp/';
     }
 }
@@ -338,7 +392,8 @@ 
 $data['current_assembly'] = 'westminster';
 if ( $this_page == 'msp' || $this_page == 'yourmsp' ) {
     $data['current_assembly'] = 'scotland';
-} else if ( $this_page == 'mla' || $this_page == 'yourmla' ) {
+}
+else if ( $this_page == 'mla' || $this_page == 'yourmla' ) {
     $data['current_assembly'] = 'ni';
 }
 
@@ -372,7 +427,8 @@ 
           $data['page_title'] = $policiesList->getSetDescriptions()[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
           $data['meta_description'] = 'See how ' . $data['full_name'] . ' voted on ' . $policiesList->getSetDescriptions()[$policy_set];
           $data['single_policy_page'] = true;
-        } else {
+        }
+        else {
             $data['single_policy_page'] = false;
             $data['key_votes_segments'] = array(
                 array(
@@ -489,7 +545,8 @@ 
         $policyID = get_http_var('policy');
         if ( $policyID ) {
             $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
-        } else {
+        }
+        else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
         $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
@@ -497,7 +554,8 @@ 
 
         if ( $policyID ) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
-        } else {
+        }
+        else {
             $data['policydivisions'] = $divisions->getAllMemberDivisionsByPolicy();
         }
 
@@ -633,10 +691,12 @@ 
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "connection_timed_out") {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
-    } elseif ($constituency == "") {
+    }
+    elseif ($constituency == "") {
         twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a known postcode');
-    } else {
+    }
+    else {
         // Redirect to the canonical MP page, with a person id.
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
         if ($MEMBER->person_id()) {
@@ -667,9 +727,11 @@ 
     $this_page = "your$page";
     if ($page == 'msp' && \MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsScottish($pc)) {
         regional_list($pc, 'SPC', $page);
-    } elseif ($page == 'mla' && \MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($pc)) {
+    }
+    elseif ($page == 'mla' && \MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($pc)) {
         regional_list($pc, 'NIE', $page);
-    } else {
+    }
+    else {
         throw new MySociety\TheyWorkForYou\MemberException('Your set postcode is not in the right region.');
     }
 }
@@ -692,14 +754,17 @@ 
         $url = $MEMBER->url();
         $params = array();
         foreach ($_GET as $key => $value) {
-            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid')
-                $params[] = "$key=$value";
+            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid') {
+                            $params[] = "$key=$value";
+            }
+        }
+        if (count($params)) {
+                    $url .= '?' . join('&', $params);
         }
-        if (count($params))
-            $url .= '?' . join('&', $params);
         if ($pagetype) {
             $pagetype = '/' . $pagetype;
-        } else {
+        }
+        else {
             $pagetype = '';
         }
         header('Location: ' . $url . $pagetype, true, $code );
@@ -773,16 +838,21 @@ 
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
 
-    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) { # Royal short-circuit
+    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) {
+# Royal short-circuit
         return '<strong>Acceded on ' . $entered_house[HOUSE_TYPE_ROYAL]['date_pretty']
             . '<br>Coronated on 2 June 1953</strong></li>';
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
-            continue; # Same info is printed further down
+        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
+                    continue;
+        }
+        # Same info is printed further down
 
-        if (!$current_member[$house]) $desc .= 'Former ';
+        if (!$current_member[$house]) {
+            $desc .= 'Former ';
+        }
 
         $party = $left_house[$house]['party'];
         $party_br = '';
@@ -790,8 +860,9 @@ 
             $party_br = $m[2];
             $party = $m[1];
         }
-        if ($party != 'unknown')
-            $desc .= _htmlentities($party);
+        if ($party != 'unknown') {
+                    $desc .= _htmlentities($party);
+        }
         if ($party == 'Speaker' || $party == 'Deputy Speaker') {
             $desc .= ', and ';
             # XXX: Might go horribly wrong if something odd happens
@@ -802,15 +873,23 @@ 
         }
         if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
             $desc .= ' ';
-            if ($house==HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
-            if ($house==HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
-            if ($house==HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            if ($house==HOUSE_TYPE_COMMONS) {
+                $desc .= '<abbr title="Member of Parliament">MP</abbr>';
+            }
+            if ($house==HOUSE_TYPE_NI) {
+                $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
+            }
+            if ($house==HOUSE_TYPE_SCOTLAND) {
+                $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            }
             if ($party_br) {
                 $desc .= " ($party_br)";
             }
             $desc .= ' for ' . $left_house[$house]['constituency'];
         }
-        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
+        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') {
+            $desc .= ' Peer';
+        }
         $desc .= ', ';
     }
     $desc = preg_replace('#, $#', '', $desc);
@@ -841,7 +920,8 @@ 
         if (isset($member->extra_info['public_whip_rebelrank'])) {
             if ($member->extra_info['public_whip_data_date'] == 'complete') {
                 $rebellion_string .= ' in their last parliament.';
-            } else {
+            }
+            else {
                 $rebellion_string .= ' in the current parliament.';
             }
         }
@@ -1021,7 +1101,8 @@ 
 function constituency_previous_mps($member) {
     if ($member->house(HOUSE_TYPE_COMMONS)) {
         return $member->previous_mps();
-    } else {
+    }
+    else {
         return array();
     }
 }
@@ -1029,7 +1110,8 @@ 
 function constituency_future_mps($member) {
     if ($member->house(HOUSE_TYPE_COMMONS)) {
         return $member->future_mps();
-    } else {
+    }
+    else {
         return array();
     }
 }
@@ -1073,10 +1155,13 @@ 
     # Find latest entered house
     $entered_house = null;
     foreach ($member->entered_house() as $h => $eh) {
-        if (!$entered_house || $eh['date'] > $entered_house) $entered_house = $eh['date'];
+        if (!$entered_house || $eh['date'] > $entered_house) {
+            $entered_house = $eh['date'];
+        }
+    }
+    if ($entered_house > $year_ago) {
+            $since_text = 'since joining Parliament';
     }
-    if ($entered_house > $year_ago)
-        $since_text = 'since joining Parliament';
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
     $section = 'section:debates section:whall section:lords section:ni';
@@ -1089,10 +1174,12 @@ 
         $MOREURL->insert(array('pid'=>$member->person_id(), 's'=>'section:wrans', 'pop'=>1));
         // We assume that if they've answered a question, they're a minister
         $minister = 0; $Lminister = false;
-        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0)
-            $minister = 1;
-        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0)
-            $Lminister = true;
+        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0) {
+                    $minister = 1;
+        }
+        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0) {
+                    $Lminister = true;
+        }
         if ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
             $minister = 2;
         }
@@ -1112,7 +1199,8 @@ 
     $after_stuff = ' <small>(From Public Whip)</small>';
     if ($member->party() == 'SNP') {
         $after_stuff .= '<br><em>Note SNP MPs do not vote on legislation not affecting Scotland.</em>';
-    } elseif ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
+    }
+    elseif ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
         $after_stuff .= '<br><em>Speakers and deputy speakers cannot vote except to break a tie.</em>';
     }
     if ($member->party() != 'Sinn Féin') {
@@ -1141,11 +1229,21 @@ 
 
     if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts']>0 || $has_email_alerts)) {
         $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts']==1?'person is':'people are') . ' tracking ';
-        if ($member->house_disp == HOUSE_TYPE_COMMONS) $line .= 'this MP';
-        elseif ($member->house_disp == HOUSE_TYPE_LORDS) $line .= 'this peer';
-        elseif ($member->house_disp == HOUSE_TYPE_NI) $line .= 'this MLA';
-        elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) $line .= 'this MSP';
-        elseif ($member->house_disp == HOUSE_TYPE_ROYAL) $line .= $member->full_name();
+        if ($member->house_disp == HOUSE_TYPE_COMMONS) {
+            $line .= 'this MP';
+        }
+        elseif ($member->house_disp == HOUSE_TYPE_LORDS) {
+            $line .= 'this peer';
+        }
+        elseif ($member->house_disp == HOUSE_TYPE_NI) {
+            $line .= 'this MLA';
+        }
+        elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) {
+            $line .= 'this MSP';
+        }
+        elseif ($member->house_disp == HOUSE_TYPE_ROYAL) {
+            $line .= $member->full_name();
+        }
         if ($has_email_alerts) {
             $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
         }
@@ -1169,10 +1267,12 @@ 
 
 function display_stats_line($category, $blurb, $type, $inwhat, $afterstuff, $extra_info, $minister = false, $Lminister = false) {
     $return = false;
-    if (isset($extra_info[$category]))
-        $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
-    if (isset($extra_info["L$category"]))
-        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    if (isset($extra_info[$category])) {
+            $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
+    }
+    if (isset($extra_info["L$category"])) {
+            $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    }
     return $return;
 }
 
@@ -1184,16 +1284,22 @@ 
             $inwhat = preg_replace('#<\/a>#', '', $inwhat);
         }
     }
-    if ($house==HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
+    if ($house==HOUSE_TYPE_LORDS) {
+        $inwhat = str_replace('MP', 'Lord', $inwhat);
+    }
     $line = $blurb;
     $line .= '<strong>' . $extra_info[$category];
-    if ($type) $line .= ' ' . make_plural($type, $extra_info[$category]);
+    if ($type) {
+        $line .= ' ' . make_plural($type, $extra_info[$category]);
+    }
     $line .= '</strong>';
     $line .= $inwhat;
     if ($minister===2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
-    } elseif ($minister)
-        $line .= ' &#8212; Ministers do not ask written questions';
+    }
+    elseif ($minister) {
+            $line .= ' &#8212; Ministers do not ask written questions';
+    }
     else {
         $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
         if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
@@ -1201,20 +1307,26 @@ 
             $q = $extra_info[$category . '_quintile'];
             if ($q == 0) {
                 $line .= 'well above average';
-            } elseif ($q == 1) {
+            }
+            elseif ($q == 1) {
                 $line .= 'above average';
-            } elseif ($q == 2) {
+            }
+            elseif ($q == 2) {
                 $line .= 'average';
-            } elseif ($q == 3) {
+            }
+            elseif ($q == 3) {
                 $line .= 'below average';
-            } elseif ($q == 4) {
+            }
+            elseif ($q == 4) {
                 $line .= 'well below average';
-            } else {
+            }
+            else {
                 $line .= '[Impossible quintile!]';
             }
             $line .= ' amongst ';
             $line .= $type . 's';
-        } elseif (!get_http_var('rem') && isset($extra_info[$category . '_rank'])) {
+        }
+        elseif (!get_http_var('rem') && isset($extra_info[$category . '_rank'])) {
             $line .= ' &#8212; ';
             #if (isset($extra_info[$category . '_rank_joint']))
             #   print 'joint ';
@@ -1229,15 +1341,26 @@ 
 function display_writetothem_numbers($year, $extra_info) {
     if (isset($extra_info["writetothem_responsiveness_notes_$year"])) {
         return '<li>Responsiveness to messages sent via <a href="https://www.writetothem.com/stats/' . $year . '/mps">WriteToThem.com</a> in ' . $year . ': ' . $extra_info["writetothem_responsiveness_notes_$year"] . '.</li>';
-    } elseif (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
+    }
+    elseif (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
         $mean = $extra_info["writetothem_responsiveness_mean_$year"];
 
         $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
-        if ($a == 'very low') $a = 'a very low';
-        if ($a == 'low') $a = 'a low';
-        if ($a == 'medium') $a = 'a medium';
-        if ($a == 'high') $a = 'a high';
-        if ($a == 'very high') $a = 'a very high';
+        if ($a == 'very low') {
+            $a = 'a very low';
+        }
+        if ($a == 'low') {
+            $a = 'a low';
+        }
+        if ($a == 'medium') {
+            $a = 'a medium';
+        }
+        if ($a == 'high') {
+            $a = 'a high';
+        }
+        if ($a == 'very high') {
+            $a = 'a very high';
+        }
         $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"] = $a;
 
         return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);
@@ -1278,9 +1401,11 @@ 
     $constituencies = MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($pc);
     if ($constituencies == 'CONNECTION_TIMED_OUT') {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn&rsquo;t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
-    } elseif (!$constituencies) {
+    }
+    elseif (!$constituencies) {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . htmlentities($pc) . ' isn&rsquo;t a known postcode');
-    } elseif (!isset($constituencies[$area_type])) {
+    }
+    elseif (!isset($constituencies[$area_type])) {
         throw new MySociety\TheyWorkForYou\MemberException(htmlentities($pc) . ' does not appear to be a valid postcode');
     }
     global $PAGE;
@@ -1305,15 +1430,19 @@ 
         $cons = $q->field($i, 'constituency');
         if ($house == HOUSE_TYPE_COMMONS) {
             continue;
-        } elseif ($house == HOUSE_TYPE_NI) {
+        }
+        elseif ($house == HOUSE_TYPE_NI) {
             $mreg[] = $q->row($i);
-        } elseif ($house == HOUSE_TYPE_SCOTLAND) {
+        }
+        elseif ($house == HOUSE_TYPE_SCOTLAND) {
             if ($cons == $constituencies['SPC']) {
                 $mcon = $q->row($i);
-            } elseif ($cons == $constituencies['SPE']) {
+            }
+            elseif ($cons == $constituencies['SPE']) {
                 $mreg[] = $q->row($i);
             }
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Odd result returned!' . $house);
         }
     }
@@ -1323,16 +1452,19 @@ 
             $data['members_statement'] .= '<p>Your <strong>constituency MSP</strong> is <a href="/msp/?p=' . $mcon['person_id'] . '">';
             $data['members_statement'] .= $mcon['given_name'] . ' ' . $mcon['family_name'] . '</a>, MSP for ' . $mcon['constituency'];
             $data['members_statement'] .= '.</p> <p>Your <strong>' . $constituencies['SPE'] . ' region MSPs</strong> are:</p>';
-        } else {
+        }
+        else {
             $data['members_statement'] = '<p>You had one constituency MSP (Member of the Scottish Parliament) and multiple region MSPs.</p>';
             $data['members_statement'] .= '<p>Your <strong>constituency MSP</strong> was <a href="/msp/?p=' . $mcon['person_id'] . '">';
             $data['members_statement'] .= $mcon['given_name'] . ' ' . $mcon['family_name'] . '</a>, MSP for ' . $mcon['constituency'];
             $data['members_statement'] .= '.</p> <p>Your <strong>' . $constituencies['SPE'] . ' region MSPs</strong> were:</p>';
         }
-    } else {
+    }
+    else {
         if ($current) {
             $data['members_statement'] = '<p>You have multiple MLAs (Members of the Legislative Assembly) who represent you in ' . $constituencies['NIE'] . '. They are:</p>';
-        } else {
+        }
+        else {
             $data['members_statement'] = '<p>You had multiple MLAs (Members of the Legislative Assembly) who represented you in ' . $constituencies['NIE'] . '. They were:</p>';
         }
     }