mysociety / theyworkforyou

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/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 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 URL($this_page);
-        $URL->insert(array('hide_survey' => $current_question ));
+        $URL->insert(array('hide_survey' => $current_question));
         $hide_url = $URL->generate();
     }
 

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'),

tests/UserPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/user.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/user.xml');
     }
 
     private function fetch_page($vars)
@@ -16,14 +16,14 @@ 
         return $this->base_fetch_page($vars, 'user');
     }
 
-    private function fetch_user_page( $vars = array(), $page = 'user' )
+    private function fetch_user_page($vars = array(), $page = 'user')
     {
-        return $this->base_fetch_page_user( $vars, '1.fbb689a0c092f5534b929d302db2c8a9', $page );
+        return $this->base_fetch_page_user($vars, '1.fbb689a0c092f5534b929d302db2c8a9', $page);
     }
 
     public function testLoginPageLoads()
     {
-        $page = $this->base_fetch_page( array(), 'user/login' );
+        $page = $this->base_fetch_page(array(), 'user/login');
         $this->assertContains('Sign in', $page);
     }
 
@@ -34,7 +34,7 @@ 
             'password' => 'password',
             'submitted' => 'true',
         );
-        $page = $this->base_fetch_page( $vars, 'user/login' );
+        $page = $this->base_fetch_page($vars, 'user/login');
         # it's a redirect which means we should get nothing
         # as we're using the cli version of php :(
         $this->assertEquals('', $page);
@@ -49,7 +49,7 @@ 
 
     public function testEditUserInfo()
     {
-        $page = $this->fetch_user_page( array('pg' => 'edit' ) );
+        $page = $this->fetch_user_page(array('pg' => 'edit'));
         $this->assertContains('Your details', $page);
         $this->assertContains('name="pg" value="edit"', $page);
         $this->assertContains('value="Test"', $page);
@@ -62,7 +62,7 @@ 
             'email' => 'user@example.org',
             'submitted' => 'true',
         );
-        $page = $this->fetch_user_page( $vars );
+        $page = $this->fetch_user_page($vars);
         $this->assertContains('Example User', $page);
     }
 }

tests/FetchPageTestCase.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     protected function base_fetch_page($vars, $dir, $page = 'index.php', $req_uri = '')
     {
         foreach ($vars as $k => $v) {
-            $vars[$k] =  $k . '=' . urlencode($v);
+            $vars[$k] = $k . '=' . urlencode($v);
         }
 
         if (!$req_uri) {
@@ -26,7 +26,7 @@ 
     protected function base_fetch_page_user($vars, $cookie, $dir, $page = 'index.php', $req_uri = '')
     {
         foreach ($vars as $k => $v) {
-            $vars[$k] =  $k . '=' . urlencode($v);
+            $vars[$k] = $k . '=' . urlencode($v);
         }
 
         if (!$req_uri) {

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 ) { ?>