mysociety / theyworkforyou

www/includes/easyparliament/templates/html/section/pbc_bill.php

Spacing +11 added lines, -11 removed lines

@@ -24,9 +24,9 @@ 
             <ul class="business-list">
             <?php
                 $first = 0;
-                foreach ( $content['rows'] as $row ) {
-                    if ( $row['htype'] == 10 ) {
-                        if ( !$first ) {
+                foreach ($content['rows'] as $row) {
+                    if ($row['htype'] == 10) {
+                        if (!$first) {
                             print '</li>';
                             $first = 1;
                         } ?>
@@ -37,16 +37,16 @@ 
                                 </h3>
                             </a>
                             <p class="business-list__meta">
-                                <?php if ( isset($row['sitting']) ) { ?>
+                                <?php if (isset($row['sitting'])) { ?>
                                     <?= make_ranking($row['sitting']) ?> sitting &middot;
                                 <?php } ?>
-                                <?= format_date($row['hdate'], LONGERDATEFORMAT ) ?>
-                                <?php if ( $row['contentcount'] > 0 ) { ?>
+                                <?= format_date($row['hdate'], LONGERDATEFORMAT) ?>
+                                <?php if ($row['contentcount'] > 0) { ?>
                                 &middot; <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
                                 <?php } ?>
                             </p>
                             <p class="business-list__excerpt">
-                                <?= trim_characters($row['excerpt'], 0, 200 ) ?>
+                                <?= trim_characters($row['excerpt'], 0, 200) ?>
                             </p>
                     <?php } else { ?>
                     <ul>
@@ -61,7 +61,7 @@ 
                                     <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
                                 </p>
                             <?php } ?>
-                            <?php if ( isset($row['excerpt']) ) { ?>
+                            <?php if (isset($row['excerpt'])) { ?>
                                 <p class="business-list__excerpt">
                                     <?= trim_characters($row['excerpt'], 0, 200) ?>
                                 </p>
@@ -73,7 +73,7 @@ 
             </ul>
         </div>
 
-        <?php if ( isset($content['info']['committee']) ) {
+        <?php if (isset($content['info']['committee'])) {
             $committee = $content['info']['committee'];
         ?>
         <div class="business-section__secondary">
@@ -85,13 +85,13 @@ 
 
             <p><strong>Chairpersons</strong></p>
             <ul>
-            <?php foreach( $committee['chairmen'] as $chair ) { ?>
+            <?php foreach ($committee['chairmen'] as $chair) { ?>
                 <li><?= $chair['name'] ?> (<?= $chair['attending'] ?>)</li>
             <?php } ?>
             </ul>
             <p><strong>Members</strong></p>
             <ul>
-            <?php foreach( $committee['members'] as $chair ) { ?>
+            <?php foreach ($committee['members'] as $chair) { ?>
                 <li><?= $chair['name'] ?> (<?= $chair['attending'] ?>)</li>
             <?php } ?>
             </ul>

www/includes/easyparliament/templates/html/section/_business_list_item.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <a href="<?= $item['list_url'] ?>" class="business-list__title">
     <h3>
-      <?php if ( isset( $item['parent'] ) ) { ?>
+      <?php if (isset($item['parent'])) { ?>
         <?= $item['parent']['body'] ?>
         <br><?= $item['body'] ?>
       <?php } else { ?>
@@ -9,14 +9,14 @@ 
     </h3>
     <span class="business-list__meta">
       <?= format_date($item['hdate'], LONGERDATEFORMAT) ?>
-      <?=  isset($item['contentcount']) ? '&middot; ' . $item['contentcount'] . ( $item['contentcount'] == 1 ? ' speech' : ' speeches' ) : '' ?>
+      <?=  isset($item['contentcount']) ? '&middot; ' . $item['contentcount'] . ($item['contentcount'] == 1 ? ' speech' : ' speeches') : '' ?>
     </span>
 </a>
-<?php if ( isset( $item['child'] ) ) { ?>
+<?php if (isset($item['child'])) { ?>
 <p class="business-list__excerpt">
-  <?php if ( isset($item['child']['speaker']) && count($item['child']['speaker']) > 0 ) { ?>
+  <?php if (isset($item['child']['speaker']) && count($item['child']['speaker']) > 0) { ?>
     <a href="<?= $item['child']['speaker']['url'] ?>"><?= $item['child']['speaker']['name'] ?></a>
   <?php } ?>
-  <?= strip_tags(trim_characters( $item['child']['body'], 0, 200 )) ?>
+  <?= strip_tags(trim_characters($item['child']['body'], 0, 200)) ?>
 </p>
 <?php } ?>

www/includes/easyparliament/templates/html/hansard_search_video.php

Spacing +6 added lines, -6 removed lines

@@ -33,17 +33,17 @@
 
         echo '&#8220;' . $row['extract'] . "&#8221;</dd>\n";
         echo '<dd><em><small>This speech is ';
-        if ($row['hpos']-$want['hpos']>0) {
-            echo ($row['hpos']-$want['hpos']) . ' later than';
+        if ($row['hpos'] - $want['hpos'] > 0) {
+            echo ($row['hpos'] - $want['hpos']) . ' later than';
         } else {
-            echo ($want['hpos']-$row['hpos']) . ' earlier than';
+            echo ($want['hpos'] - $row['hpos']) . ' earlier than';
         }
         echo ' the one you want &ndash; ';
-        if ($row['video_status']&8 || !($row['video_status']&1)) {
+        if ($row['video_status'] & 8 || !($row['video_status'] & 1)) {
             echo ' it doesn\'t have any video';
-        } elseif ($row['video_status']&4) {
+        } elseif ($row['video_status'] & 4) {
             echo ' it has already been matched';
-        } elseif ($row['video_status']&1) {
+        } elseif ($row['video_status'] & 1) {
             # Only for Commons currently
             echo ' if you prefer, <a target="_top" onclick="t = parent.document[\'video\'].currentTime(); this.href += t;" href="/video/?gid=debate/' . $row['gid'] . '&amp;file=' . $want['file'] . '&amp;start=">switch to matching this speech instead</a>';
         }

www/includes/easyparliament/templates/html/glossary.php

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
         $USERURL->insert(array('u'=>$comment['user_id']));
         ?>
         <div class="comment">
-            <p><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) .' '. _htmlentities($comment['lastname']); ?></strong></a><br>
+            <p><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) . ' ' . _htmlentities($comment['lastname']); ?></strong></a><br>
 <?php
         // Make URLs into links and do <br>s.
         $body = prepare_comment_for_display($comment['body']); // In utility.php
@@ -105,7 +105,7 @@ 
         }
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && !$comment['modflagged']

www/includes/easyparliament/templates/api/comments.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
         // COMMENT REPORTING LINK.
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && $THEUSER->user_id() != $comment['user_id']
@@ -117,7 +117,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
         ?>
-                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) .' '. _htmlentities($comment['lastname']); ?></strong></a><br>
+                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) . ' ' . _htmlentities($comment['lastname']); ?></strong></a><br>
                     <small>Posted on <?php echo $date;
 
         if (isset($comment['url'])) {
@@ -125,7 +125,7 @@ 
 
         } else {
             // There won't be a URL when we're just previewing a comment.
-            print ' '.$time;
+            print ' ' . $time;
         }
         ?> <?php echo $reporthtml; ?></small></p>
 

www/includes/easyparliament/sidebars/mps.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     'body'=>''));
 ?>
 <p>
-    Vacher Dods charge <a href="http://www.dodonline.co.uk/engine.asp?showPage=article&id=2564"> 95 pounds </a> for this list of MPs names. We think democracy should be free. Click <?php echo '<a href="'.$csvurl.'">here</a>'; ?> to download a CSV (Comma Separated Values) file that you can load into Excel.
+    Vacher Dods charge <a href="http://www.dodonline.co.uk/engine.asp?showPage=article&id=2564"> 95 pounds </a> for this list of MPs names. We think democracy should be free. Click <?php echo '<a href="' . $csvurl . '">here</a>'; ?> to download a CSV (Comma Separated Values) file that you can load into Excel.
 </p>
 <?php
 $this->block_end();

www/includes/easyparliament/sidebars/calendar_future.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 list($firstyear, $firstmonth, $day) = explode('-', $min_future_date);
 list($finalyear, $finalmonth, $day) = explode('-', $max_future_date);
 
-$q =  $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
+$q = $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
     WHERE event_date >= :firstdate
     AND event_date <= :finaldate
     AND deleted = 0
@@ -45,7 +45,7 @@ 
 
 if ($q->rows() > 0) {
     $years = array();
-    for ($row=0; $row<$q->rows(); $row++) {
+    for ($row = 0; $row < $q->rows(); $row++) {
         list($year, $month, $day) = explode('-', $q->field($row, 'event_date'));
         $month = intval($month);
         $years[$year][$month][] = intval($day);

www/includes/easyparliament/commentreportlist.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
         // available for editing, it's accurate.
         $this->_update_locked();
 
-        $data = $this->_get_data_by_recent ();
+        $data = $this->_get_data_by_recent();
 
         $this->render($data);
 
@@ -99,11 +99,11 @@ 
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
-                $data[] = array (
-                    'report_id'		=> $q->field($n,'report_id'),
-                    'comment_id' 	=> $q->field($n,'comment_id'),
+                $data[] = array(
+                    'report_id'		=> $q->field($n, 'report_id'),
+                    'comment_id' 	=> $q->field($n, 'comment_id'),
                     'firstname'		=> $q->field($n, 'firstname'),
                     'lastname'		=> $q->field($n, 'lastname'),
                     'body'			=> $q->field($n, 'body'),
@@ -114,10 +114,10 @@ 
 
         }
         if ($r->rows() > 0) {
-            for ($n=0; $n<$r->rows(); $n++) {
-                $data[] = array (
-                    'report_id'		=> $r->field($n,'report_id'),
-                    'comment_id' 	=> $r->field($n,'comment_id'),
+            for ($n = 0; $n < $r->rows(); $n++) {
+                $data[] = array(
+                    'report_id'		=> $r->field($n, 'report_id'),
+                    'comment_id' 	=> $r->field($n, 'comment_id'),
                     'firstname'		=> $r->field($n, 'firstname'),
                     'lastname'		=> $r->field($n, 'lastname'),
                     'body'			=> $r->field($n, 'body'),

www/includes/easyparliament/searchlog.php

Spacing +7 added lines, -7 removed lines

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

Braces +2 added lines, -1 removed lines

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