mysociety / theyworkforyou

www/docs/regmem/index.php

Doc Comments +4 added lines

@@ -205,6 +205,10 @@
     return 0;
 }
 
+/**
+ * @param string $file
+ * @param string $type
+ */
 function parse_file($file, $date, $type, &$out) {
     global $cats, $names;
     preg_match_all('#<regmem personid="uk.org.publicwhip/person/(.*?)" (?:memberid="(.*?)" )?membername="(.*?)" date="(.*?)">(.*?)</regmem>#s', $file, $mm, PREG_SET_ORDER);

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 rsort($files);
 
 if (!DEVSITE) {
-   header('Cache-Control: max-age=3600');
+    header('Cache-Control: max-age=3600');
 }
 
 $PAGE->page_start();

Spacing +22 added lines, -22 removed lines

@@ -2,7 +2,7 @@ 
 
 include_once '../../includes/easyparliament/init.php';
 
-$dir = RAWDATA . 'scrapedxml/regmem';
+$dir = RAWDATA.'scrapedxml/regmem';
 $dh = opendir($dir);
 $files = array();
 while ($file = readdir($dh)) {
@@ -103,26 +103,26 @@ 
             break;
         }
         $date_pre = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $_);
-        $date_post = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $files[$i+1]);
+        $date_post = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $files[$i + 1]);
         $pretty = format_date($date_pre, LONGDATEFORMAT);
         $oout = '';
         foreach ($data[$_] as $cat_type => $cat_data) {
-            $old = array_key_exists($cat_type, $data[$files[$i+1]]) ? $data[$files[$i+1]][$cat_type] : '';
+            $old = array_key_exists($cat_type, $data[$files[$i + 1]]) ? $data[$files[$i + 1]][$cat_type] : '';
             $new = $data[$_][$cat_type];
             if ($diff = clean_diff($old, $new)) {
-                $oout .= cat_heading($cat_type, $date_pre, $date_post) . $diff;
+                $oout .= cat_heading($cat_type, $date_pre, $date_post).$diff;
             }
         }
-        foreach ($data[$files[$i+1]] as $cat_type => $cat_data) {
+        foreach ($data[$files[$i + 1]] as $cat_type => $cat_data) {
             if (array_key_exists($cat_type, $data[$_])) {
                 continue;
             }
-            if ($diff = clean_diff($data[$files[$i+1]][$cat_type], '')) {
-                $oout .= cat_heading($cat_type, $date_pre, $date_post) . $diff;
+            if ($diff = clean_diff($data[$files[$i + 1]][$cat_type], '')) {
+                $oout .= cat_heading($cat_type, $date_pre, $date_post).$diff;
             }
         }
         if ($oout) {
-            $out .= span_row("<h2>$pretty - <a href=\"./?d=$date_pre#$p\">View full entry</a></h2>", true) . $oout;
+            $out .= span_row("<h2>$pretty - <a href=\"./?d=$date_pre#$p\">View full entry</a></h2>", true).$oout;
         }
     }
     $_ = $earliest;
@@ -148,14 +148,14 @@ 
     $new = 0;
     if ($f) {
         $f = "$dir/regmem$f.xml";
-        for ($i=0; $i<count($files); ++$i) {
+        for ($i = 0; $i < count($files); ++$i) {
             if ($files[$i] == $f) {
                 $new = $i;
                 break;
             }
         }
     }
-    $old = $new+1;
+    $old = $new + 1;
     $old = $files[$old];
     $old_iso = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $old);
     $old_pretty = format_date($old_iso, LONGDATEFORMAT);
@@ -187,7 +187,7 @@ 
             $out .= clean_diff($old, $new);
         }
         if ($out) {
-            print span_row('<h2>'.$names[$person_id].' - <a href="?p='.$person_id.'">Register history</a> | <a href="/mp/?pid='.$person_id.'">MP&rsquo;s page</a></h2>', true) . $out;
+            print span_row('<h2>'.$names[$person_id].' - <a href="?p='.$person_id.'">Register history</a> | <a href="/mp/?pid='.$person_id.'">MP&rsquo;s page</a></h2>', true).$out;
         }
     }
     print '</table>';
@@ -237,27 +237,27 @@ 
     }
     $c = 0; $year = 0;
     $view = ''; $compare = '';
-    for ($i=0; $i<count($files); ++$i) {
+    for ($i = 0; $i < count($files); ++$i) {
         preg_match('/(\d\d\d\d)-(\d\d-\d\d)/', $files[$i], $m);
         $y = $m[1]; $md = $m[2];
         if ($c++) {
             $view .= ' | ';
-            if ($i<count($files)-1) {
+            if ($i < count($files) - 1) {
                 $compare .= ' | ';
             }
         }
         if ($year != $y) {
             $year = $y;
             $view .= "<em>$year</em> ";
-            if ($i<count($files)-1) {
+            if ($i < count($files) - 1) {
                 $compare .= "<em>$year</em> ";
             }
         }
         $months = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
         preg_match('/(\d\d)-(\d\d)/', $md, $m);
-        $date = ($m[2]+0) . ' '. $months[$m[1]-1];
+        $date = ($m[2] + 0).' '.$months[$m[1] - 1];
         $view .= '<a href="./?d='.$y.'-'.$md.'">'.$date.'</a>';
-        if ($i<count($files)-1) {
+        if ($i < count($files) - 1) {
             $compare .= '<a href="?f='.$y.'-'.$md.'">'.$date.'</a>';
         }
     }
@@ -292,7 +292,7 @@ 
     $data = array();
     parse_file($d, $d_iso, 'only', $data);
     $this_page = 'regmem_date';
-    $DATA->set_page_metadata($this_page, 'heading', "The Register of Members' Interests, $d_pretty");;
+    $DATA->set_page_metadata($this_page, 'heading', "The Register of Members' Interests, $d_pretty"); ;
     $PAGE->stripe_start();
     print $link;
 ?>
@@ -310,9 +310,9 @@ 
         }
         if ($out) {
             print '<div class="block">';
-            print '<h2><a name="' . $person_id . '"></a>' . $names[$person_id] . ' - ';
-            print '<a href="?p=' . $person_id . '">Register history</a> | ';
-            print '<a href="/mp/?pid=' . $person_id . '">MP&rsquo;s page</a>';
+            print '<h2><a name="'.$person_id.'"></a>'.$names[$person_id].' - ';
+            print '<a href="?p='.$person_id.'">Register history</a> | ';
+            print '<a href="/mp/?pid='.$person_id.'">MP&rsquo;s page</a>';
             print '</h2> <div class="blockbody">';
             print "\n$out";
             print '</div></div>';
@@ -343,7 +343,7 @@ 
 
 function _clean($s) {
     $s = preg_replace("/&(pound|#163);/", "\xa3", $s);
-    $s = preg_replace("#</?(span|i|em)( [^>]*)?" . ">#i", '', $s);
+    $s = preg_replace("#</?(span|i|em)( [^>]*)?".">#i", '', $s);
     $s = utf8_encode($s);
     $s = preg_split("/\s*\n\s*/", $s);
     return $s;
@@ -359,7 +359,7 @@ 
     }
     $r = join("\n", $r); $r = $r ? '<td class="r"><ul>'.$r.'</ul></td>' : '<td>&nbsp;</td>';
     $a = join("\n", $a); $a = $a ? '<td class="a"><ul>'.$a.'</ul></td>' : '<td>&nbsp;</td>';
-    $diff = '<tr>' . $r . $a . '</tr>';
+    $diff = '<tr>'.$r.$a.'</tr>';
     $diff = preg_replace('#<item.*?>(.*?)</item>#', '<li>$1</li>', $diff);
     return $diff;
 }

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 +23 added lines, -23 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,13 +240,13 @@ 
     $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;
-    $out = "$totaliser[4] timestamped out of " . ($totaliser[0] + $totaliser[4]) . " ($percentage%)"
+    $percentage = round($totaliser[4] / ($totaliser[0] + $totaliser[4]) * 10000) / 100;
+    $out = "$totaliser[4] timestamped out of ".($totaliser[0] + $totaliser[4])." ($percentage%)"
 ?>
 
 <p style="margin-top:1em"><big>TheyWorkForYou has video of the House of Commons from the BBC, and
@@ -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) {
@@ -336,7 +336,7 @@ 
         } else {
             $url = '/debate/?id=';
         }
-        echo '<li><a href="', $url, fix_gid_from_db($gid) . '">' . $body . '</a>';
+        echo '<li><a href="', $url, fix_gid_from_db($gid).'">'.$body.'</a>';
     }
 
     echo '</ul></div>';
@@ -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++) {
-        $name = $q->field($i, 'firstname') . ' ' . $q->field($i, 'lastname');
+    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>';
@@ -376,9 +376,9 @@ 
 function video_quote($gid_actual, $parent_gid, $parent_body) {
     #echo '<h4>Press &ldquo;Play&rdquo;, then click &ldquo;Now!&rdquo; when you hear:</h4>';
     echo '<div id="video_quote">';
-    echo '<span class="video_name">' . $gid_actual['given_name'] . ' ' . $gid_actual['family_name'] . '</span> ';
+    echo '<span class="video_name">'.$gid_actual['given_name'].' '.$gid_actual['family_name'].'</span> ';
     echo $gid_actual['body_first'];
-    echo '<p align="right">&mdash; from debate entitled &ldquo;<a title="View entire debate" href="' . $parent_gid . '">' . $parent_body . '</a>&rdquo;</p>';
+    echo '<p align="right">&mdash; from debate entitled &ldquo;<a title="View entire debate" href="'.$parent_gid.'">'.$parent_body.'</a>&rdquo;</p>';
     echo '</div>';
 }
 
@@ -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,14 +470,14 @@ 
 
 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)
-        echo '<span class="video_name">' . $row['given_name'] . ' ' . $row['family_name'] . '</span> ';
+    if ($row['htype'] == 12)
+        echo '<span class="video_name">'.$row['given_name'].' '.$row['family_name'].'</span> ';
     echo $row['body'];
     echo '</li>';
 }

Braces +80 added lines, -33 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,8 +93,12 @@ 
 $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) {
@@ -134,14 +142,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
 
@@ -280,14 +294,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%">
@@ -354,18 +380,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 +416,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 +437,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 +470,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 +508,23 @@ 
 
 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/data.php

Doc Comments +8 added lines

@@ -95,6 +95,10 @@ 
     // Getting page and section metadata
     // $page/$section is a page name.
     // $key is the element of metadata you want to retrieve.
+
+    /**
+     * @param string $key
+     */
     public function page_metadata($page, $key) {
         return $this->_get_metadata(array("page"=>$page, "key"=>$key), "page");
     }
@@ -145,6 +149,10 @@ 
 ///////////////////////////////////////
 
     // Only accessed through page_metadata() or section_metadata()
+
+    /**
+     * @param string $type
+     */
     public function _get_metadata($args="", $type) {
         // $type is either 'page' or 'section'
         global $this_page, $this_section;

Spacing +9 added lines, -9 removed lines

@@ -75,7 +75,7 @@ 
 
     public function __construct() {
 
-        include_once METADATAPATH;	// defined in config.php
+        include_once METADATAPATH; // defined in config.php
 
     }
 
@@ -108,11 +108,11 @@ 
     // Setting page and section.
     // $page/$section, $key and $value should make sense...
     public function set_page_metadata($page, $key, $value) {
-        $this->_set_metadata(array("page"=>$page,"key"=>$key,"value"=>$value));
+        $this->_set_metadata(array("page"=>$page, "key"=>$key, "value"=>$value));
     }
 
     public function set_section_metadata($section, $key, $value) {
-        $this->_set_metadata(array("section"=>$section,"key"=>$key,"value"=>$value));
+        $this->_set_metadata(array("section"=>$section, "key"=>$key, "value"=>$value));
     }
 
 
@@ -131,7 +131,7 @@ 
     // Test for the presence of something.
     // eg $exists = $DATA->test_for_metadata("page", "about", "title")
     public function test_for_metadata($type, $item, $key) {
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
 
         if (isset($dataarray[$item][$key])) {
             return true;
@@ -145,7 +145,7 @@ 
 ///////////////////////////////////////
 
     // Only accessed through page_metadata() or section_metadata()
-    public function _get_metadata($args="", $type) {
+    public function _get_metadata($args = "", $type) {
         // $type is either 'page' or 'section'
         global $this_page, $this_section;
 
@@ -159,7 +159,7 @@ 
         }
 
         twfy_debug("DATA", "$type: $item, $key");
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
 
         if ($this->test_for_metadata($type, $item, $key)) {
             $return = $dataarray[$item][$key];
@@ -174,7 +174,7 @@ 
             $debugtext = "No metadata found for key '$key'";
         }
 
-        twfy_debug("DATA", "$debugtext, returning '" . (is_scalar($return) ? $return : gettype($return)) . "'.");
+        twfy_debug("DATA", "$debugtext, returning '".(is_scalar($return) ? $return : gettype($return))."'.");
 
         return $return;
     }
@@ -192,9 +192,9 @@ 
         $key = $args["key"];
         $value = $args["value"];
 
-        twfy_debug("DATA", "Setting: ".$type."[".$item."][".$key."] = '" . print_r($value, 1) . "'");
+        twfy_debug("DATA", "Setting: ".$type."[".$item."][".$key."] = '".print_r($value, 1)."'");
 
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
         $dataarray[$item][$key] = $value;
     }
 

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 +22 added lines, -22 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;
     }
@@ -94,13 +94,13 @@ 
                         deleted,
                         confirmed
                         FROM alerts
-                        WHERE confirmed =" . $confirmed .
-                        " AND deleted=" . $deleted .
+                        WHERE confirmed =" . $confirmed.
+                        " AND deleted=".$deleted.
                         ' ORDER BY email');
 
         $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
@@ -253,21 +253,21 @@ 
         // We prefix the registration token with the alert's id and '-'.
         // Not for any particularly good reason, but we do.
 
-        $urltoken = $this->alert_id . '-' . $this->registrationtoken;
+        $urltoken = $this->alert_id.'-'.$this->registrationtoken;
 
-        if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
-            $confirmurl = $details['confirm_base'] . $urltoken;
+        if (isset($details['confirm_base']) && $details['confirm_base'] !== '') {
+            $confirmurl = $details['confirm_base'].$urltoken;
         } else {
-            $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
+            $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()
@@ -311,7 +311,7 @@ 
             AND email = :email
             AND criteria = :criteria", array(
                 ':email' => $email,
-                ':criteria' => 'speaker:' . $pid
+                ':criteria' => 'speaker:'.$pid
             ));
         if ($q->rows() > 0) {
             return true;
@@ -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 +27 added lines, -12 removed lines

@@ -340,17 +340,20 @@ 
     }
 
     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
@@ -398,7 +401,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 +417,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 +428,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 +439,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 +462,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

Spacing +45 added lines, -45 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.
@@ -66,7 +66,7 @@ 
 
         } 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,7 +85,7 @@ 
         return true;
     }
 
-    public function render($data, $format='html', $template='comments') {
+    public function render($data, $format = 'html', $template = 'comments') {
         include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
     }
 
@@ -93,21 +93,21 @@ 
         // 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']];
                 }
             }
         }
@@ -249,7 +249,7 @@ 
         $data['comments'] = $comments;
         $data['results_per_page'] = $num;
         $data['page'] = $page;
-        $q = $this->db->query('SELECT COUNT(DISTINCT(epobject_id)) AS count FROM comments WHERE visible=1 AND user_id=' . $args['user_id']);
+        $q = $this->db->query('SELECT COUNT(DISTINCT(epobject_id)) AS count FROM comments WHERE visible=1 AND user_id='.$args['user_id']);
         $data['total_results'] = $q->field(0, 'count');
         return $data;
 
@@ -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,11 +405,11 @@ 
         $URL = new 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));
         }
-        $url = $URL->generate() . '#c' . $comment_id;
+        $url = $URL->generate().'#c'.$comment_id;
 
         return $url;
     }
@@ -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) {
@@ -524,7 +524,7 @@ 
         $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:

Spacing +290 added lines, -290 removed lines

@@ -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,7 +141,7 @@ 
         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?
@@ -151,7 +151,7 @@ 
 
         } 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 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();
@@ -365,7 +365,7 @@ 
         } 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)";
+            $where = "subsection_id = '".$itemdata['subsection_id']."' AND (htype != 10 AND htype != 11)";
         }
 
         // Find if there are next/previous debate items of our
@@ -378,9 +378,9 @@ 
         // Find the epobject_id of the previous item (if any):
         $q = $this->db->query("SELECT epobject_id
                         FROM 	hansard
-                        WHERE 	hdate = '" . $itemdata['hdate'] . "'
-                        AND 	hpos < '" . $itemdata['hpos'] . "'
-                        AND 	major = '" . $itemdata['major'] . "'
+                        WHERE 	hdate = '" . $itemdata['hdate']."'
+                        AND 	hpos < '" . $itemdata['hpos']."'
+                        AND 	major = '" . $itemdata['major']."'
                         AND 	$where
                         ORDER BY hpos DESC
                         LIMIT 1");
@@ -392,9 +392,9 @@ 
         // Find the epobject_id of the next item (if any):
         $q = $this->db->query("SELECT epobject_id
                         FROM 	hansard
-                        WHERE 	hdate = '" . $itemdata['hdate'] . "'
-                        AND 	hpos > '" . $itemdata['hpos'] . "'
-                        AND 	major = '" . $itemdata['major'] . "'
+                        WHERE 	hdate = '" . $itemdata['hdate']."'
+                        AND 	hpos > '" . $itemdata['hpos']."'
+                        AND 	major = '" . $itemdata['major']."'
                         AND 	$where
                         ORDER BY hpos ASC
                         LIMIT 1");
@@ -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
@@ -501,7 +501,7 @@ 
             $nextprevdata['up'] = array(
                 'body'	=> _htmlspecialchars($this->bill_title),
                 'title'	=> '',
-                'url'	=> $URL->generate() . $this->url,
+                'url'	=> $URL->generate().$this->url,
             );
         } elseif ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
             $URL = new URL($this->listpage);
@@ -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()
             );
@@ -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 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']
+                'gid=' => $this->gidprefix.$args['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));
+        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));
         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,
@@ -737,7 +737,7 @@ 
         );
         if (strstr($gid, $from)) {
             $check_gid = str_replace($from, $to, $gid);
-            $input['where'] = array('gid=' => $this->gidprefix . $check_gid);
+            $input['where'] = array('gid=' => $this->gidprefix.$check_gid);
             $itemdata = $this->_get_hansard_data($input);
             if (count($itemdata) > 0) {
                 throw new RedirectException($check_gid);
@@ -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 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,13 +963,13 @@ 
         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;
+                $speeches[$n]['parent']['body'] = $speeches[$n]['body_section'].' | '.$thing;
                 if ($speeches[$n]['subsection_id'] != $speeches[$n]['section_id']) {
-                    $speeches[$n]['parent']['body'] = $speeches[$n]['body_subsection'] .
-                        ' | ' . $speeches[$n]['parent']['body'];
+                    $speeches[$n]['parent']['body'] = $speeches[$n]['body_subsection'].
+                        ' | '.$speeches[$n]['parent']['body'];
                 }
             }
             $data['rows'] = $speeches;
@@ -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;
                 }
@@ -1127,9 +1127,9 @@ 
                         continue;
 
                 list($cal_item, $cal_meta) = \MySociety\TheyWorkForYou\Utility\Calendar::meta($itemdata);
-                $body = $this->prepare_search_result_for_display($cal_item) . '.';
+                $body = $this->prepare_search_result_for_display($cal_item).'.';
                 if (!empty($cal_meta)) {
-                    $body .= ' <span class="future_meta">' . join('; ', $cal_meta) . '</span>';
+                    $body .= ' <span class="future_meta">'.join('; ', $cal_meta).'</span>';
                 }
                 if ($itemdata['witnesses']) {
                     $body .= '<br><small>Witnesses: '
@@ -1144,9 +1144,9 @@ 
                 }
                 $itemdata['gid']            = $id;
                 $itemdata['relevance']      = $relevancy;
-                $itemdata['parent']['body'] = $title . ' &#8211; ' . $itemdata['chamber'];
+                $itemdata['parent']['body'] = $title.' &#8211; '.$itemdata['chamber'];
                 $itemdata['extract']        = $body;
-                $itemdata['listurl']        = '/calendar/?d=' . $itemdata['event_date'] . '#cal' . $itemdata['id'];
+                $itemdata['listurl']        = '/calendar/?d='.$itemdata['event_date'].'#cal'.$itemdata['id'];
                 $itemdata['major']          = 'F';
 
             } else {
@@ -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);
 
@@ -1215,15 +1215,15 @@ 
 #                        $itemdata['parent']['listurl'] = $section['listurl'];
                         if ($itemdata['section_id'] != $itemdata['subsection_id']) {
                             $subsection = $this->_get_subsection($itemdata);
-                            $itemdata['parent']['body'] .= ': ' . $subsection['body'];
+                            $itemdata['parent']['body'] .= ': '.$subsection['body'];
 #                            $itemdata['parent']['listurl'] = $subsection['listurl'];
                         }
                         if ($itemdata['major'] == 5) {
-                            $itemdata['parent']['body'] = 'Northern Ireland Assembly: ' . $itemdata['parent']['body'];
+                            $itemdata['parent']['body'] = 'Northern Ireland Assembly: '.$itemdata['parent']['body'];
                         } elseif ($itemdata['major'] == 6) {
-                            $itemdata['parent']['body'] = 'Public Bill Committee: ' . $itemdata['parent']['body'];
+                            $itemdata['parent']['body'] = 'Public Bill Committee: '.$itemdata['parent']['body'];
                         } elseif ($itemdata['major'] == 7) {
-                            $itemdata['parent']['body'] = 'Scottish Parliament: ' . $itemdata['parent']['body'];
+                            $itemdata['parent']['body'] = 'Scottish Parliament: '.$itemdata['parent']['body'];
                         }
 
                     } else {
@@ -1236,19 +1236,19 @@ 
                     // Wrans or WMS
                     $section = $this->_get_section($itemdata);
                     $subsection = $this->_get_subsection($itemdata);
-                    $body = $hansardmajors[$itemdata['major']]['title'] . ' &#8212; ';
+                    $body = $hansardmajors[$itemdata['major']]['title'].' &#8212; ';
                     if (isset($section['body'])) $body .= $section['body'];
-                    if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
+                    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);
@@ -1363,7 +1363,7 @@ 
 
             // A check to prevent anyone requestion 500000 months.
             if ($args['months'] > 12) {
-                $PAGE->error_message("Sorry, you can't view " . $args['months'] . " months.");
+                $PAGE->error_message("Sorry, you can't view ".$args['months']." months.");
                 return $data;
             }
 
@@ -1458,8 +1458,8 @@ 
             }
 
             $params = array(
-                ':firstdate' => $firstyear . '-' . $firstmonth . '-01',
-                ':finaldate' => $finalyear . '-' . $finalmonth . '-31');
+                ':firstdate' => $firstyear.'-'.$firstmonth.'-01',
+                ':finaldate' => $finalyear.'-'.$finalmonth.'-31');
 
             // Check there are some dates for this year/month.
             $q = $this->db->query("SELECT epobject_id
@@ -1484,13 +1484,13 @@ 
         $params = array();
 
         if ($finalyear > $firstyear || $finalmonth >= $firstmonth) {
-            $params[':finaldate'] = $finalyear . '-' . $finalmonth . '-31';
+            $params[':finaldate'] = $finalyear.'-'.$finalmonth.'-31';
             $where = 'AND hdate <= :finaldate';
         }
 
         $params[':major'] = $this->major;
-        $params[':firstdate'] = $firstyear . '-' . $firstmonth . '-01';
-        $q =  $this->db->query("SELECT 	DISTINCT(hdate) AS hdate
+        $params[':firstdate'] = $firstyear.'-'.$firstmonth.'-01';
+        $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,14 +1682,14 @@ 
         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) {
@@ -1698,7 +1698,7 @@ 
         }
         $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,17 +1782,17 @@ 
                 // 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
                         // don't have a subsection heading.
-                        $where = "section_id = '" . $item['epobject_id'] . "'
-                            AND subsection_id = '" . $item['epobject_id'] . "'";
+                        $where = "section_id = '".$item['epobject_id']."'
+                            AND subsection_id = '" . $item['epobject_id']."'";
 
                     } else {
                         // Subsection - get a count of items within this subsection.
-                        $where = "subsection_id = '" . $item['epobject_id'] . "'";
+                        $where = "subsection_id = '".$item['epobject_id']."'";
                     }
 
                     $r = $this->db->query("SELECT COUNT(*) AS count
@@ -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'],
@@ -1863,8 +1863,8 @@ 
                         # Another hack...
                         $COMMENTSURL->remove(array('id'));
                         $id = preg_replace('#^.*?_.*?_#', '', $item['gid']);
-                        $fragment = $this->url . $id;
-                        $item['commentsurl'] = $COMMENTSURL->generate() . $fragment;
+                        $fragment = $this->url.$id;
+                        $item['commentsurl'] = $COMMENTSURL->generate().$fragment;
                     } else {
                         $COMMENTSURL->insert(array('id' => $item['gid']));
                         $item['commentsurl'] = $COMMENTSURL->generate();
@@ -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).
@@ -1991,10 +1991,10 @@ 
             if ($this->major == 6) {
                 $id = preg_replace('#^.*?_.*?_#', '', $id_data['gid']);
                 global $DATA;
-                $DATA->set_page_metadata('pbc_clause', 'url', 'pbc/' . $this->url . $id);
+                $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;
                 }
             }
 
@@ -2041,24 +2041,24 @@ 
                         $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']);
+                $fragment = '#g'.gid_to_anchor($id_data['gid']);
             }
         }
 
         if (count($url_args) > 0) {
-            $LISTURL->insert( $url_args);
+            $LISTURL->insert($url_args);
         }
 
-        return $LISTURL->generate($encode) . $fragment;
+        return $LISTURL->generate($encode).$fragment;
     }
 
     private $major_to_house = array(
@@ -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'],
@@ -2160,7 +2160,7 @@ 
             }
         }
         if (count($members) != 1) {
-            throw new \Exception('Wanted one result, but got ' . count($members) . " for $person_id, $hdate, $major.");
+            throw new \Exception('Wanted one result, but got '.count($members)." for $person_id, $hdate, $major.");
         }
 
         return $members[0];
@@ -2168,13 +2168,13 @@ 
 
     private function _get_speaker_url($house) {
         $URL = new URL('mp'); # Default, house=1
-        if ($house==2) {
+        if ($house == 2) {
             $URL = new URL('peer');
-        } elseif ($house==3) {
+        } elseif ($house == 3) {
             $URL = new URL('mla');
-        } elseif ($house==4) {
+        } elseif ($house == 4) {
             $URL = new URL('msp');
-        } elseif ($house==0) {
+        } elseif ($house == 0) {
             $URL = new 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,11 +2626,11 @@ 
     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)
+            array(':gid_from_spid' => 'uk.org.publicwhip/spq/'.$fixed_spid)
         );
         $gid = $q->field(0, 'mentioned_gid');
         if ($gid) return $gid;
@@ -2639,7 +2639,7 @@ 
     public function old_get_gid_from_spid($spid) {
         $q = $this->db->query(
             "select gid from hansard where gid like :gid_like",
-            array(':gid_like' => 'uk.org.publicwhip/spwa/%.' . $spid . '.h')
+            array(':gid_like' => 'uk.org.publicwhip/spwa/%.'.$spid.'.h')
         );
         $gid = $q->field(0, 'gid');
         if ($gid) return str_replace('uk.org.publicwhip/spwa/', '', $gid);
@@ -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 \URL( $hansardmajors[$this->major]['page_all'] );
+            $more_url = new \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');
@@ -3008,12 +3008,12 @@ 
                                     h.person_id, h.hdate, h.htime
                             FROM    hansard h, epobject e
                             WHERE   h.epobject_id = e.epobject_id
-                            AND     h.subsection_id = '" . $item_data['epobject_id'] . "'
+                            AND     h.subsection_id = '" . $item_data['epobject_id']."'
                             ORDER BY hpos
                             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,
@@ -3138,12 +3138,12 @@ 
                                     h.person_id, h.hdate, h.htime
                             FROM    hansard h, epobject e
                             WHERE   h.epobject_id = e.epobject_id
-                            AND     h.subsection_id = '" . $item_data['epobject_id'] . "'
+                            AND     h.subsection_id = '" . $item_data['epobject_id']."'
                             ORDER BY hpos
                             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');
@@ -3261,7 +3261,7 @@ 
                 $r = $this->db->query("SELECT e.body
                             FROM	hansard h, epobject e
                             WHERE	h.epobject_id = e.epobject_id
-                            AND		h.epobject_id = '" . $q->field($row, 'section_id') . "'
+                            AND		h.epobject_id = '" . $q->field($row, 'section_id')."'
                             ");
                 $parentbody = $r->field(0, 'body');
             }
@@ -3271,30 +3271,30 @@ 
                                     h.person_id, h.hdate, h.htime
                             FROM	hansard h, epobject e
                             WHERE	h.epobject_id = e.epobject_id
-                            AND 	h.subsection_id = '" . $q->field($row, 'epobject_id') . "'
+                            AND 	h.subsection_id = '" . $q->field($row, 'epobject_id')."'
                             ORDER BY hpos
                             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,11 +3311,11 @@ 
     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);
-        $this->url = urlencode($session) . '/' . urlencode($title) . '/';
+        $this->url = urlencode($session).'/'.urlencode($title).'/';
     }
 
     public function _get_committee($bill_id) {
@@ -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,18 +3408,18 @@ 
             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)) {
             return array();
         }
         $q = $this->db->query('select minor,count(*) as c from hansard where major=6 and htype=12
-            and minor in (' . join(',', array_keys($bills)) . ')
+            and minor in (' . join(',', array_keys($bills)).')
             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;
@@ -3438,7 +3438,7 @@ 
         foreach ($bills as $id => $title) {
             $data[] = array(
                 'title' => $title,
-                'url' => "/pbc/" . urlencode($session) . '/' . urlencode(str_replace(' ', '_', $title)) . '/',
+                'url' => "/pbc/".urlencode($session).'/'.urlencode(str_replace(' ', '_', $title)).'/',
                 'contentcount' => isset($counts[$id]) ? $counts[$id] : '???',
                 # 'totalcomments' => isset($comments[$id]) ? $comments[$id] : '???',
             );
@@ -3446,8 +3446,8 @@ 
 
         $YEARURL = new 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)
@@ -3459,10 +3459,10 @@ 
         );
         $nextyear = $q->field(0, 'session');
         if ($prevyear) {
-            $nextprev['prev']['url'] = $YEARURL->generate() . $prevyear . '/';
+            $nextprev['prev']['url'] = $YEARURL->generate().$prevyear.'/';
         }
         if ($nextyear) {
-            $nextprev['next']['url'] = $YEARURL->generate() . $nextyear . '/';
+            $nextprev['next']['url'] = $YEARURL->generate().$nextyear.'/';
         }
         $DATA->set_page_metadata($this_page, 'nextprev', $nextprev);
 
@@ -3475,7 +3475,7 @@ 
             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);
@@ -3483,12 +3483,12 @@ 
             $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";
+            $sitting_txt = make_ranking($sitting).' sitting';
+            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 +68 added lines, -36 removed lines

@@ -138,8 +138,9 @@ 
 
         global $PAGE;
 
-        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH))
-            return false;
+        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH)) {
+                    return false;
+        }
 
         $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'search_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)) {
@@ -326,10 +327,11 @@ 
             );
 
             $subsectiondata = $this->_get_hansard_data($input);
-            if (count($subsectiondata) == 0)
-                $subsectiondata = null;
-            else
-                $subsectiondata = $subsectiondata[0];
+            if (count($subsectiondata) == 0) {
+                            $subsectiondata = null;
+            } else {
+                            $subsectiondata = $subsectiondata[0];
+            }
 
         } elseif ($itemdata['htype'] == '11') {
             // It's a subsection, so use the item itself.
@@ -1018,12 +1020,12 @@ 
         // Mainly for glossary term adding
         if (isset($args['num']) && $args['num']) {
             $results_per_page = $args['num']+0;
-        }
-        else {
+        } else {
             $results_per_page = 20;
         }
-        if ($results_per_page > 1000)
-            $results_per_page = 1000;
+        if ($results_per_page > 1000) {
+                    $results_per_page = 1000;
+        }
 
         $data['info']['results_per_page'] = $results_per_page;
 
@@ -1051,10 +1053,16 @@ 
         // Get the gids from Xapian
         $sort_order = 'date';
         if (isset($args['o'])) {
-            if ($args['o']=='d') $sort_order = 'newest';
-            if ($args['o']=='o') $sort_order = 'oldest';
-            elseif ($args['o']=='c') $sort_order = 'created';
-            elseif ($args['o']=='r') $sort_order = 'relevance';
+            if ($args['o']=='d') {
+                $sort_order = 'newest';
+            }
+            if ($args['o']=='o') {
+                $sort_order = 'oldest';
+            } elseif ($args['o']=='c') {
+                $sort_order = 'created';
+            } elseif ($args['o']=='r') {
+                $sort_order = 'relevance';
+            }
         }
 
         $data['searchdescription'] = $SEARCHENGINE->query_description_long();
@@ -1114,7 +1122,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 +1133,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) . '.';
@@ -1237,10 +1248,17 @@ 
                     $section = $this->_get_section($itemdata);
                     $subsection = $this->_get_subsection($itemdata);
                     $body = $hansardmajors[$itemdata['major']]['title'] . ' — ';
-                    if (isset($section['body'])) $body .= $section['body'];
-                    if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
-                    if (isset($subsection['listurl'])) $listurl = $subsection['listurl'];
-                    else $listurl = '';
+                    if (isset($section['body'])) {
+                        $body .= $section['body'];
+                    }
+                    if (isset($subsection['body'])) {
+                        $body .= ': ' . $subsection['body'];
+                    }
+                    if (isset($subsection['listurl'])) {
+                        $listurl = $subsection['listurl'];
+                    } else {
+                        $listurl = '';
+                    }
                     $itemdata['parent'] = array (
                         'body' => $body,
                         'listurl' => $listurl
@@ -1980,10 +1998,11 @@ 
         // );
 
         // $url_args is an array of other key/value pairs to be appended in the GET string.
-        if ($id_data['major'])
-            $LISTURL = new URL($hansardmajors[$id_data['major']]['page_all']);
-        else
-            $LISTURL = new URL('wrans');
+        if ($id_data['major']) {
+                    $LISTURL = new URL($hansardmajors[$id_data['major']]['page_all']);
+        } else {
+                    $LISTURL = new URL('wrans');
+        }
 
         $fragment = '';
 
@@ -2633,7 +2652,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 +2663,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;
     }
 }
@@ -2928,7 +2951,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;
@@ -3055,8 +3080,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;
@@ -3189,8 +3215,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;
@@ -3470,7 +3497,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 +3513,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 +3527,9 @@ 
 
     # Given a GID, parse out the sitting number and optional part from it
     public function _get_sitting($gid) {
-        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m))
-            return array($m[1]+0, $m[2]);
+        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m)) {
+                    return array($m[1]+0, $m[2]);
+        }
         return array(0, 0);
     }
 }

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

@@ -430,7 +430,7 @@ 
                     // Linking to the prev (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
                     $nextprevdata['prev'] = array (
-                        'body'		=> "Previous $thing",
+                        'body'		=> "previous $thing",
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
                     );
@@ -474,7 +474,7 @@ 
                     // Linking to the next (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
                     $nextprevdata['next'] = array (
-                        'body'		=> "Next $thing",
+                        'body'		=> "next $thing",
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
                     );
@@ -510,7 +510,7 @@ 
             $URL->remove(array('id'));
             $things = $hansardmajors[$itemdata['major']]['title'];
             $nextprevdata['up'] = array(
-                'body'	=> "All $things on " . format_date($itemdata['hdate'], SHORTDATEFORMAT),
+                'body'	=> "all $things on " . format_date($itemdata['hdate'], SHORTDATEFORMAT),
                 'title'	=> '',
                 'url' 	=> $URL->generate()
             );
@@ -559,7 +559,7 @@ 
 
             // The '!= NULL' bit is needed otherwise I was getting errors
             // when displaying the first day of debates.
-            if ($q->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

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;
                     }
                 }

Braces +99 added lines, -46 removed lines

@@ -40,8 +40,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) {
@@ -56,8 +57,12 @@ 
             }
         }
         $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);
@@ -111,7 +116,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,22 +131,37 @@ 
             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 {
@@ -148,8 +170,12 @@ 
                     $this->query = str_ireplace("$type:$value", $newv, $this->query);
                 } 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') {
@@ -254,7 +280,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;
@@ -333,8 +361,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 +371,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 +403,18 @@ 
                 $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 +494,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)) {
@@ -481,8 +514,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 +537,9 @@ 
             $hl = false;
             $matchword = $this->stem($extractword);
             foreach ($stemmed_words as $word) {
-                if ($word == '') continue;
+                if ($word == '') {
+                    continue;
+                }
                 if ($matchword == $word) {
                     $hl = true;
                     break;
@@ -565,17 +601,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 +627,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 +645,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 +663,9 @@ 
             }
         }
 
-        if ($pos == -1)
-            $pos = 0;
+        if ($pos == -1) {
+                    $pos = 0;
+        }
 
         return $pos;
     }

Spacing +36 added lines, -36 removed lines

@@ -46,7 +46,7 @@ 
             if (strstr(XAPIANDB, ":")) {
                 //ini_set('display_errors', 'On');
                 list ($xapian_host, $xapian_port) = explode(":", XAPIANDB);
-                twfy_debug("SEARCH", "Using Xapian remote backend: " . $xapian_host . " port " . $xapian_port);
+                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 {
@@ -92,12 +92,12 @@ 
         $this->prefixed = array();
 
         // Split words up into individual words, and quoted phrases
-        preg_match_all('/(' .
-            '"|' . # match either a quote, or...
-            '(?:(?<![' .$this->wordchars. '])-)?' . # optionally a - (exclude)
+        preg_match_all('/('.
+            '"|'.# match either a quote, or...
+            '(?:(?<!['.$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];
@@ -122,8 +122,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;
@@ -135,11 +135,11 @@ 
                     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);
+                        $newv = 'major:'.join(' major:', $newv);
                     } else {
                         $newv = "major:$newv";
                     }
@@ -179,15 +179,15 @@ 
         # 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);
         }
 
-        twfy_debug("SEARCH", "prefixed: " . var_export($this->prefixed, true));
+        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;
@@ -205,7 +205,7 @@ 
         # Now parse the parsed query back into a query string, yummy
 
         $qd = $query->get_description();
-        twfy_debug("SEARCH", "queryparser original description -- " . $qd);
+        twfy_debug("SEARCH", "queryparser original description -- ".$qd);
         $qd = substr($qd, 14, -1); # Strip Xapian::Query()
         $qd = preg_replace('#:\(.*?\)#', '', $qd); # Don't need pos or weight
         # Date range
@@ -256,11 +256,11 @@ 
                 $iter->next();
             }
             $used[] = $tt;
-            $qd = preg_replace('#' . preg_quote($mm, '#') . '#', $tt, $qd, 1);
+            $qd = preg_replace('#'.preg_quote($mm, '#').'#', $tt, $qd, 1);
         }
 
         # 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);
@@ -278,7 +278,7 @@ 
         $qd = preg_replace('#AND_NOT ([a-z0-9"]+)#', '-$1', $qd);
         preg_match_all('#AND_NOT \((.*?)\)#', $qd, $m);
         foreach ($m[1] as $mm) {
-            $mmn = '-' . join(' -', explode(' OR ', $mm));
+            $mmn = '-'.join(' -', explode(' OR ', $mm));
             $qd = str_replace("AND_NOT ($mm)", $mmn, $qd);
         }
 
@@ -297,9 +297,9 @@ 
         $this->query_desc = trim($qd);
 
         #print 'DEBUG: ' . $query->get_description();
-        twfy_debug("SEARCH", "words: " . var_export($this->words, true));
-        twfy_debug("SEARCH", "phrases: " . var_export($this->phrases, true));
-        twfy_debug("SEARCH", "queryparser description -- " . $this->query_desc);
+        twfy_debug("SEARCH", "words: ".var_export($this->words, true));
+        twfy_debug("SEARCH", "phrases: ".var_export($this->phrases, true));
+        twfy_debug("SEARCH", "queryparser description -- ".$this->query_desc);
 
         $this->valid = true;
     }
@@ -339,7 +339,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;
 
@@ -412,13 +412,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);
@@ -445,7 +445,7 @@ 
             $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() {
@@ -510,7 +510,7 @@ 
             if ($hl) {
                 $hlextract .= "<span class=\"hi\">$extractword</span>$endswithamp";
             } else {
-                $hlextract .= $extractword . $endswithamp;
+                $hlextract .= $extractword.$endswithamp;
             }
         }
         $body = preg_replace("#</span>\s+<span class=\"hi\">#", " ", $hlextract);
@@ -547,17 +547,17 @@ 
 
     // Find the position of the first of the search words/phrases in $body.
     public function position_of_first_word($body) {
-        $lcbody = ' ' . html_entity_decode(strtolower($body)) . ' '; // spaces to make regexp mapping easier
+        $lcbody = ' '.html_entity_decode(strtolower($body)).' '; // spaces to make regexp mapping easier
         $pos = -1;
 
         // 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] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                   if ( ($wordpos < $pos) || ($pos==-1) ) {
+                   if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -575,7 +575,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;
                 }
             }
@@ -585,10 +585,10 @@ 
 
         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 (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;
                     }
                 }
@@ -599,10 +599,10 @@ 
 
         foreach ($this->words as $word) {
             if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (preg_match('/('.$word.')/', $lcbody, $matches)) {
+                $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

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));
         }
 

www/includes/lib_filter.php

Doc Comments +8 added lines

@@ -294,6 +294,9 @@ 
 
         #####################################################################################
 
+        /**
+         * @param string $data
+         */
         function process_param_protocol($data) {
 
             $data = $this->validate_entities($data, 1);
@@ -407,6 +410,11 @@ 
         # ampersand) is allowed, else corrects it.
         #
 
+        /**
+         * @param integer $in_attribute
+         *
+         * @return string
+         */
         function validate_entities($data, $in_attribute) {
 
             #

Spacing +8 added lines, -8 removed lines

@@ -153,7 +153,7 @@ 
         function escape_comments($data) {
 
             $data = preg_replace_callback("/<!--(.*?)-->/s", function($matches) {
-                    return '<!--' . HtmlSpecialChars($this->StripSingle($matches[1])) . '-->';
+                    return '<!--'.HtmlSpecialChars($this->StripSingle($matches[1])).'-->';
                 }, $data);
 
             return $data;
@@ -207,7 +207,7 @@ 
                 }, $data);
 
             foreach (array_keys($this->tag_counts) as $tag) {
-                for ($i=0; $i<$this->tag_counts[$tag]; $i++) {
+                for ($i = 0; $i < $this->tag_counts[$tag]; $i++) {
                     $data .= "</$tag>";
                 }
             }
@@ -242,9 +242,9 @@ 
                 $ending = $matches[3];
                 if (in_array($name, array_keys($this->allowed))) {
                     $params = "";
-                    preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER);		# <foo a="b" />
-                    preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER);		# <foo a=b />
-                    preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER);	# <foo a="b />
+                    preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER); # <foo a="b" />
+                    preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER); # <foo a=b />
+                    preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER); # <foo a="b />
                     $matches = array_merge($matches_1, $matches_2, $matches_3);
 
                     foreach ($matches as $match) {
@@ -300,7 +300,7 @@ 
 
             if (preg_match("/^([^:]+)\:/si", $data, $matches)) {
                 if (!in_array($matches[1], $this->allowed_protocols)) {
-                    $data = '#'.substr($data, strlen($matches[1])+1);
+                    $data = '#'.substr($data, strlen($matches[1]) + 1);
                 }
             }
 
@@ -350,7 +350,7 @@ 
             # if there are less than 5, just allow it as-is
             #
 
-            if (strlen($data_notags)<5) {
+            if (strlen($data_notags) < 5) {
                 return $data;
             }
 
@@ -560,7 +560,7 @@ 
         # inside strings. within general text, we decode hex/dec entities.
         #
 
-        function decode_entities($data, $in_attribute=1) {
+        function decode_entities($data, $in_attribute = 1) {
 
             $data = preg_replace_callback('!(&)#(\d+);?!', array($this, 'decode_dec_entity'), $data);
             $data = preg_replace_callback('!(&)#x([0-9a-f]+);?!i', array($this, 'decode_hex_entity'), $data);

Braces +3 added lines, -1 removed lines

@@ -322,7 +322,9 @@
                 while (1) {
                     $len = strlen($data);
                     $data = preg_replace("/<({$tags})(\s[^>]*)?(><\\/\\1>|\\/>)/", '', $data);
-                    if ($len == strlen($data)) break;
+                    if ($len == strlen($data)) {
+                        break;
+                    }
                 }
             }