mysociety / theyworkforyou

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/searchlog.php

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'])) {

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
     // Select popular queries
     public function popular_recent($count, $max_chars = null) {
 
-        $q =  $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
+        $q = $this->db->query("SELECT query_string, 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)
@@ -124,7 +124,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;
     }
@@ -143,7 +143,7 @@ 
 
     public function admin_popular_searches($count) {
 
-        $q =  $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
+        $q = $this->db->query("SELECT query_string, 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;");

www/includes/easyparliament/templates/html/search/results.php

Indentation +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
         <div class="search-page__section search-page__section--results">
             <div class="search-page__section__primary">
               <?php
-              # XXX Hack
-              if (preg_match('#budget#', $searchstring)) { ?>
+                # XXX Hack
+                if (preg_match('#budget#', $searchstring)) { ?>
                 <h3 class="search-result__title"><a href="https://www.theyworkforyou.com/debates/?id=2017-11-22a.1045.3">Read the Budget speech and debate</a></h3>
               <?php } ?>
 

Spacing +25 added lines, -25 removed lines

@@ -1,11 +1,11 @@ 
 <div class="full-page">
-    <div class="full-page__row search-page <?php if ( !$searchstring ) { ?>search-page--blank<?php } ?>">
+    <div class="full-page__row search-page <?php if (!$searchstring) { ?>search-page--blank<?php } ?>">
 
         <form class="js-search-form-without-options">
             <?php include 'form_main.php'; ?>
         </form>
 
-      <?php if ( $searchstring && !isset($warnings) ) { ?>
+      <?php if ($searchstring && !isset($warnings)) { ?>
         <div class="search-page__section search-page__section--results">
             <div class="search-page__section__primary">
               <?php
@@ -14,13 +14,13 @@ 
                 <h3 class="search-result__title"><a href="https://www.theyworkforyou.com/debates/?id=2017-11-22a.1045.3">Read the Budget speech and debate</a></h3>
               <?php } ?>
 
-              <?php if ( $cons ) { ?>
-                <?php if ( count($cons) > 1 ) {
+              <?php if ($cons) { ?>
+                <?php if (count($cons) > 1) {
                     $types = array();
-                    if ( $mp_types['mp'] > 0 ) {
+                    if ($mp_types['mp'] > 0) {
                         $types[] = 'MPs';
                     }
-                    if ( $mp_types['former'] > 0 ) {
+                    if ($mp_types['former'] > 0) {
                         $types[] = 'former MPs';
                     }
                     $desc = ucfirst(implode(' and ', $types));
@@ -29,14 +29,14 @@ 
                 <?php } else { // count($cons) <= 1 ?>
                   <h2><?= $mp_types['former'] ? 'Former ' : '' ?>MP for <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
                 <?php } ?>
-                <?php foreach ( $cons as $member ) { ?>
+                <?php foreach ($cons as $member) { ?>
                   <?php include('person.php'); ?>
                 <?php } ?>
               <?php } ?>
 
-              <?php if ( $members ) { ?>
+              <?php if ($members) { ?>
                 <h2>People matching <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
-                <?php foreach ( $members as $member ) { ?>
+                <?php foreach ($members as $member) { ?>
                     <?php include('person.php'); ?>
                 <?php } ?>
                 <hr>
@@ -44,25 +44,25 @@ 
 
               <?php if ($glossary) { ?>
                 <h2>Glossary items matching <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
-                <?php foreach ( $glossary as $item ) { ?>
+                <?php foreach ($glossary as $item) { ?>
                     <?php include('glossary.php'); ?>
                 <?php } ?>
                 <hr>
               <?php } ?>
 
-              <?php if ( isset($pid) && $wtt == 2 ) { ?>
+              <?php if (isset($pid) && $wtt == 2) { ?>
                 <p>I want to <a href="https://www.writetothem.com/lords/?pid=<?= $pid ?>">write to <?= $wtt_lord_name ?></a></p>
               <?php } ?>
 
-              <?php if ( isset($error) ) { ?>
+              <?php if (isset($error)) { ?>
                 There was an error &ndash; <?= $error ?> &ndash; searching for <em class="current-search-term"><?= _htmlentities($searchstring) ?></em>.
               <?php } else { ?>
                 <h2>
-                  <?php if ( $pagination_links ) { ?>
+                  <?php if ($pagination_links) { ?>
                     Results <?= $pagination_links['first_result'] ?>&ndash;<?= $pagination_links['last_result'] ?> of <?= $info['total_results'] ?>
-                  <?php } else if ( $info['total_results'] == 1 ) { ?>
+                  <?php } else if ($info['total_results'] == 1) { ?>
                     The only result
-                  <?php } else if ( $info['total_results'] == 0 ) { ?>
+                  <?php } else if ($info['total_results'] == 0) { ?>
                     There were no results
                   <?php } else { ?>
                     All <?= $info['total_results'] ?> results
@@ -70,16 +70,16 @@ 
                     for <em class="current-search-term"><?= _htmlentities($searchdescription) ?></em>
                 </h2>
 
-                  <?php if ( $info['spelling_correction'] ) { ?>
-                    <p>Did you mean <a href="/search/?q=<?= urlencode($info['spelling_correction']) ?>"><?= _htmlentities( $info['spelling_correction_display'] ) ?></a>?</p>
+                  <?php if ($info['spelling_correction']) { ?>
+                    <p>Did you mean <a href="/search/?q=<?= urlencode($info['spelling_correction']) ?>"><?= _htmlentities($info['spelling_correction_display']) ?></a>?</p>
                   <?php } ?>
 
-                  <?php if ( $info['total_results'] ) { ?>
+                  <?php if ($info['total_results']) { ?>
                     <ul class="search-result-display-options">
-                      <?php if ( $sort_order == 'relevance' ) { ?>
+                      <?php if ($sort_order == 'relevance') { ?>
                         <li>Sorted by relevance</li>
                         <li>Sort by date: <a href="<?= $urls['newest'] ?>">newest</a> / <a href="<?= $urls['oldest'] ?>">oldest</a></li>
-                      <?php } else if ( $sort_order == 'oldest' ) { ?>
+                      <?php } else if ($sort_order == 'oldest') { ?>
                         <li>Sort by <a href="<?= $urls['relevance'] ?>">relevance</a></li>
                         <li>Sorted by date: <a href="<?= $urls['newest'] ?>">newest</a> / oldest</li>
                       <?php } else { ?>
@@ -90,7 +90,7 @@ 
                     </ul>
                   <?php } ?>
 
-                  <?php foreach ( $rows as $result ) { ?>
+                  <?php foreach ($rows as $result) { ?>
                     <div class="search-result search-result--generic">
                         <h3 class="search-result__title"><a href="<?= $result['listurl'] ?>"><?= $result['parent']['body'] ?></a> (<?= format_date($result['hdate'], SHORTDATEFORMAT) ?>)</h3>
                         <p class="search-result__description"><?= isset($result['speaker']) ? $result['speaker']['name'] . ': ' : '' ?><?= $result['extract'] ?></p>
@@ -99,16 +99,16 @@ 
 
                 <hr>
 
-                  <?php if ( $pagination_links ) { ?>
+                  <?php if ($pagination_links) { ?>
                     <div class="search-result-pagination">
-                      <?php if ( isset($pagination_links['prev']) ) { ?>
+                      <?php if (isset($pagination_links['prev'])) { ?>
                         <a href="<?= $pagination_links['firstpage']['url'] ?>" title="First page">&lt;&lt;</a>
                         <a href="<?= $pagination_links['prev']['url'] ?>" title="Previous page">&lt;</a>
                       <?php } ?>
-                      <?php foreach ( $pagination_links['nums'] as $link ) { ?>
+                      <?php foreach ($pagination_links['nums'] as $link) { ?>
                         <a href="<?= $link['url'] ?>"<?= $link['current'] ? ' class="search-result-pagination__current-page"' : '' ?>><?= $link['page'] ?></a>
                       <?php } ?>
-                      <?php if ( isset($pagination_links['next']) ) { ?>
+                      <?php if (isset($pagination_links['next'])) { ?>
                         <a href="<?= $pagination_links['next']['url'] ?>" title="Next page">&gt;</a>
                         <a href="<?= $pagination_links['lastpage']['url'] ?>" title="Final page">&gt;&gt;</a>
                       <?php } ?>

Braces +2 added lines, -1 removed lines

@@ -26,7 +26,8 @@
                     $desc = ucfirst(implode(' and ', $types));
                 ?>
                   <h2><?= $desc ?> in constituencies matching <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
-                <?php } else { // count($cons) <= 1 ?>
+                <?php } else {
+// count($cons) <= 1 ?>
                   <h2><?= $mp_types['former'] ? 'Former ' : '' ?>MP for <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
                 <?php } ?>
                 <?php foreach ( $cons as $member ) { ?>

www/includes/easyparliament/sidebars/minisurvey.php

Spacing +5 added lines, -5 removed lines

@@ -33,10 +33,10 @@ 
 if ($hide_question) {
     $always_ask = 0;
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif ($has_answered_question == $current_question && !$always_ask) {
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif (isset($_COOKIE['survey'])) {
     $show_survey_qn = $_COOKIE['survey'];
 }
@@ -49,16 +49,16 @@ 
 if ($show_survey_qn < $current_question && !$has_answered_question) {
     $page_url = '';
     $hide_url = '';
-    if ( in_array( $this_page, array('mp', 'peer', 'msp', 'mla', 'royal') ) ) {
+    if (in_array($this_page, array('mp', 'peer', 'msp', 'mla', 'royal'))) {
         global $MEMBER;
         $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
         $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
     } else {
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-        $URL->insert(array('answered_survey' => $current_question ));
+        $URL->insert(array('answered_survey' => $current_question));
         $page_url = 'https://' . DOMAIN . $URL->generate();
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-        $URL->insert(array('hide_survey' => $current_question ));
+        $URL->insert(array('hide_survey' => $current_question));
         $hide_url = $URL->generate();
     }
 

www/docs/user/prompt/index.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 $anchor = '#addcomment';
 
 $URL = new \MySociety\TheyWorkForYou\Url('userjoin');
-$URL->insert(array('ret'=>$returl.$anchor));
+$URL->insert(array('ret'=>$returl . $anchor));
 $joinurl = $URL->generate();