mysociety / theyworkforyou

www/includes/easyparliament/alert.php

Spacing +14 added lines, -14 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;
 
@@ -72,7 +72,7 @@ 
             $contents = array('criteria' => $row['criteria'], 'count' => $row['cnt']);
             $data[] = $contents;
         }
-        $data = array ('alerts' => $data);
+        $data = array('alerts' => $data);
         return $data;
     }
 
@@ -100,12 +100,12 @@ 
 
         $data = $q->fetchAll();
         $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.
@@ -170,7 +170,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. And double slash would be treated as single and
@@ -244,19 +244,19 @@ 
 
         $urltoken = $this->alert_id . '-' . $this->registrationtoken;
 
-        if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
+        if (isset($details['confirm_base']) && $details['confirm_base'] !== '') {
             $confirmurl = $details['confirm_base'] . $urltoken;
         } else {
             $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
         }
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'CONFIRMURL'	=> $confirmurl,
             'CRITERIA'	=> $this->criteria_pretty()
         );
@@ -270,7 +270,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup'
         );
@@ -278,7 +278,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge = array (
+        $merge = array(
             'CRITERIA'	=> $this->criteria_pretty()
         );
 
@@ -449,20 +449,20 @@ 
     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>':'* ') . sprintf(gettext('Mentions of [%s]'), implode(' ', $words)) . ($html?'</li>':'') . "\n";
+            $criteria .= ($html ? '<li>' : '* ') . sprintf(gettext('Mentions of [%s]'), implode(' ', $words)) . ($html ? '</li>' : '') . "\n";
         }
         if ($spokenby) {
-            $criteria .= ($html?'<li>':'* ') . sprintf(gettext("Things by %s"), implode(' or ', $spokenby)) . ($html?'</li>':'') . "\n";
+            $criteria .= ($html ? '<li>' : '* ') . sprintf(gettext("Things by %s"), implode(' or ', $spokenby)) . ($html ? '</li>' : '') . "\n";
         }
         return $criteria;
     }

www/includes/easyparliament/templates/html/homepage/recent-votes.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( count($divisions) > 0 ) { ?>
+<?php if (count($divisions) > 0) { ?>
     <h2 style="position: relative;">
         <?= gettext('Recent Votes') ?>
         <div class="meta excerpt__category"><a href="/divisions/"><?= gettext('Show all recent votes') ?></a></div>

www/includes/easyparliament/templates/html/alert/index.php

Indentation +10 added lines, -10 removed lines

@@ -116,24 +116,24 @@ 
       <?php } ?>
 
       <?php
-          if(
-              $members ||
+            if(
+                $members ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
-          ) {
-              /* We need to disambiguate the user's instructions */
-              $member_options = false;
-      ?>
+            ) {
+                /* We need to disambiguate the user's instructions */
+                $member_options = false;
+        ?>
         <div class="alert-section alert-section--disambiguation">
             <div class="alert-section__primary">
 
               <?php if ($members) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3>
                 <ul>
                   <?php
                     foreach ($members as $row) {
-                  ?>
+                    ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -154,7 +154,7 @@ 
               <?php } ?>
 
               <?php if (isset($constituencies) && count($constituencies) > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3><?= sprintf(gettext('Sign up for alerts when MPs for constituencies matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3>
                 <ul>
                 <?php foreach ($constituencies as $constituency => $member) { ?>
@@ -203,7 +203,7 @@ 
                             are mentioned in the same debate.') ?>
                           <?php if (isset($member_alertsearch)) {
                                 printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…'));
-                          } ?>
+                            } ?>
                         </em>
                       <?php } ?>
                     </li>

Spacing +19 added lines, -19 removed lines

@@ -1,7 +1,7 @@ 
 <div class="full-page">
     <div class="full-page__row">
 
-      <?php if ( $message ) { ?>
+      <?php if ($message) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
                 <h3><?= $message['title'] ?></h3>
@@ -12,10 +12,10 @@ 
         </div>
       <?php } ?>
 
-      <?php if ( $results ) { ?>
+      <?php if ($results) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
-              <?php if ( $results == 'alert-confirmed' ) { ?>
+              <?php if ($results == 'alert-confirmed') { ?>
                 <h3><?= gettext('Your alert has been confirmed') ?></h3>
                 <p>
                     <?= gettext('You will now receive email alerts for the following criteria:') ?>
@@ -44,31 +44,31 @@ 
                 </div>
                 </noscript>
 
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
+              <?php } elseif ($results == 'alert-suspended') { ?>
                 <h3><?= gettext('Alert suspended') ?></h3>
                 <p>
                     <?= gettext('You can reactivate the alert at any time, from the sidebar below.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
+              <?php } elseif ($results == 'alert-resumed') { ?>
                 <h3><?= gettext('Alert resumed') ?></h3>
                 <p>
                     <?= gettext('You will now receive email alerts on any day when there are entries in Hansard that match your criteria.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
+              <?php } elseif ($results == 'alert-deleted') { ?>
                 <h3><?= gettext('Alert deleted') ?></h3>
                 <p>
                     <?= gettext('You will no longer receive this alert.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'all-alerts-deleted' ) { ?>
+              <?php } elseif ($results == 'all-alerts-deleted') { ?>
                 <h3><?= gettext('All alerts deleted') ?></h3>
                 <p>
                     <?= gettext('You will no longer receive any alerts.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3><?= gettext('Hmmm, something’s not right') ?></h3>
                 <p>
                     <?= gettext('The link you followed to reach this page appears to be incomplete.') ?>
@@ -80,31 +80,31 @@ 
                     <?= sprintf(gettext('If you still get this message, please do <a href="mailto:%s">email us</a> and let us know, and we’ll help out!'), str_replace('@', '&#64;', CONTACTEMAIL)) ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-added' ) { ?>
+              <?php } elseif ($results == 'alert-added') { ?>
                 <h3><?= gettext('Your alert has been added') ?></h3>
                 <p>
                     <?= sprintf(gettext('You will now receive email alerts on any day when %s in parliament.'), _htmlspecialchars($criteria)) ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
+              <?php } elseif ($results == 'alert-confirmation') { ?>
                 <h3><?= gettext('We’re nearly done…') ?></h3>
                 <p>
                     <?= gettext('You should receive an email shortly which will contain a link. You will need to follow that link to confirm your email address and receive future alerts. Thanks.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
+              <?php } elseif ($results == 'alert-exists') { ?>
                 <h3><?= gettext('You’re already subscribed to that!') ?></h3>
                 <p>
                     <?= gettext('It’s good to know you’re keen though.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
+              <?php } elseif ($results == 'alert-already-signed') { ?>
                 <h3><?= gettext('We’re nearly done') ?></h3>
                 <p>
                     <?= gettext('You should receive an email shortly which will contain a link. You will need to follow that link to confirm your email address and receive future alerts. Thanks.') ?>
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3><?= gettext('Alert could not be created') ?></h3>
                 <p>
                     <?= sprintf(gettext('Sorry, we were unable to create that alert. Please <a href="mailto:%s">let us know</a>. Thanks.'), str_replace('@', '&#64;', CONTACTEMAIL)) ?>
@@ -116,7 +116,7 @@ 
       <?php } ?>
 
       <?php
-          if(
+          if (
               $members ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
@@ -172,7 +172,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                if ( $member_options ) { ?>
+                if ($member_options) { ?>
                 <h3><?= gettext('Sign up for alerts for topics') ?></h3>
                 <?php } else { ?>
                 <h3><?= gettext('Great! Can you just confirm what you mean?') ?></h3>
@@ -186,7 +186,7 @@ 
                             <?= sprintf(gettext('Receive alerts when %s'), _htmlspecialchars($alertsearch_pretty)) ?>
                             <input type="submit" class="button small" value="<?= gettext('Subscribe') ?>">
                         </form>
-                      <?php if ( isset($mistakes['multiple']) ) { ?>
+                      <?php if (isset($mistakes['multiple'])) { ?>
                         <em class="error"><?= gettext('
                             You have used a comma in your search term –
                             are you sure this is what you want? You cannot
@@ -195,7 +195,7 @@ 
                             for each individual term.') ?>
                         </em>
                       <?php } ?>
-                      <?php if ( isset($mistakes['postcode_and']) ) { ?>
+                      <?php if (isset($mistakes['postcode_and'])) { ?>
                         <em class="error"><?= gettext('
                             You have used a postcode and something else in your
                             search term – are you sure this is what you
@@ -253,11 +253,11 @@ 
             <div class="alert-section__secondary">
               <?php if ($email_verified) { ?>
 
-                  <?php if ( $alerts ) { ?>
+                  <?php if ($alerts) { ?>
                     <?php include('_list.php'); ?>
                   <?php } ?>
 
-                  <?php if ( $current_mp ) { ?>
+                  <?php if ($current_mp) { ?>
                     <h3><?= gettext('Your MP alert') ?></h3>
                     <ul class="alerts-manage__list">
                         <li>

www/includes/easyparliament/templates/html/alert/_list.php

Spacing +3 added lines, -3 removed lines

@@ -1,14 +1,14 @@
 <h3><?= gettext('Your current email alerts') ?></h3>
 
 <ul class="alerts-manage__list">
-  <?php foreach ( $alerts as $alert ) { ?>
+  <?php foreach ($alerts as $alert) { ?>
     <li>
         <?= sprintf(gettext('When %s'), _htmlspecialchars($alert['criteria'])) ?>.
         <form action="<?= $actionurl ?>" method="POST">
             <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-          <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
+          <?php if ($alert['status'] == 'unconfirmed') { ?>
             <input type="submit" class="button small" name="action" value="<?= gettext('Confirm') ?>">
-          <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+          <?php } elseif ($alert['status'] == 'suspended') { ?>
             <input type="submit" class="button small" name="action" value="<?= gettext('Resume') ?>">
           <?php } else { ?>
             <input type="submit" class="button button--secondary small" name="action" value="<?= gettext('Suspend') ?>">

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

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
             <input type="text" name="q" value="<?= _htmlentities($search_keyword) ?>" class="form-control">
             <input type="submit" class="button" value="<?= gettext('Search') ?>">
         </p>
-      <?php if (isset($warnings) ) { ?>
+      <?php if (isset($warnings)) { ?>
         <p class="error">
             <?= $warnings ?>
         </p>
@@ -18,7 +18,7 @@ 
         <p>
             <ul class="search-result-display-options">
                 <li><a href="#options" class="search-options-toggle js-toggle-search-options"><?= gettext('Advanced search') ?></a></li>
-              <?php if ( $is_adv ) { ?>
+              <?php if ($is_adv) { ?>
                 <?= $search_phrase ? '<li>' . gettext('Exactly:') . ' ' . _htmlentities($search_phrase) . '</li>' : '' ?>
                 <?= $search_exclude ? '<li>' . gettext('Excluding:') . ' ' . _htmlentities($search_exclude) . '</li>' : '' ?>
                 <?= $search_from ? '<li>' . gettext('From:') . ' ' . _htmlentities($search_from) . '</li>' : '' ?>

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

Spacing +2 added lines, -2 removed lines

@@ -2,12 +2,12 @@
     <img src="<?= $member->image()['url'] ?>" alt="">
     <h3 class="search-result__title"><a href="<?= $member->url() ?>"><?= $member->full_name() ?></a></h3>
     <?php $latest_membership = $member->getMostRecentMembership(); ?>
-    <?php if ( $latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL ) { ?>
+    <?php if ($latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL) { ?>
         <p class="search-result__description">
             <?= $latest_membership['current'] ? '' : 'Former' ?>
             <?= $latest_membership['party'] == 'Bishop' ? '' : $latest_membership['party'] ?>
             <?= $latest_membership['rep_name'] ?>
-            <?php if ( $latest_membership['constituency'] ) { ?>
+            <?php if ($latest_membership['constituency']) { ?>
                 <?= sprintf(gettext('for %s'), $latest_membership['constituency']) ?>
             <?php } ?>
             (<?= format_date($latest_membership['start_date'], SHORTDATEFORMAT) ?> – <?= $latest_membership['current'] ? gettext('current') : format_date($latest_membership['end_date'], SHORTDATEFORMAT); ?>)

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

Spacing +26 added lines, -26 removed lines

@@ -1,20 +1,20 @@ 
 <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 if ( $cons ) { ?>
-                <?php if ( count($cons) > 1 ) {
-                    if ( $mp_types['mp'] > 0 && $mp_types['former'] > 0 ) {
+              <?php if ($cons) { ?>
+                <?php if (count($cons) > 1) {
+                    if ($mp_types['mp'] > 0 && $mp_types['former'] > 0) {
                         $desc = gettext('MPs and former MPs');
-                    } elseif ( $mp_types['mp'] > 0 ) {
+                    } elseif ($mp_types['mp'] > 0) {
                         $desc = gettext('MPs');
-                    } elseif ( $mp_types['former'] > 0 ) {
+                    } elseif ($mp_types['former'] > 0) {
                         $desc = gettext('Former MPs');
                     }
                 ?>
@@ -24,14 +24,14 @@ 
                 <?php } else { // count($cons) <= 1 ?>
                   <h2><?= sprintf(gettext('MP for <em class="current-search-term">%s</em>'), _htmlentities($searchstring)) ?></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><?= sprintf(gettext('People matching <em class="current-search-term">%s</em>'), _htmlentities($searchstring)) ?></h2>
-                <?php foreach ( $members as $member ) { ?>
+                <?php foreach ($members as $member) { ?>
                     <?php include('person.php'); ?>
                 <?php } ?>
                 <hr>
@@ -39,43 +39,43 @@ 
 
               <?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
                         $term = sprintf('<em class="current-search-term">%s</em>', _htmlentities($searchdescription));
-                        if ( $pagination_links ) { ?>
+                        if ($pagination_links) { ?>
                     <?= sprintf(gettext('Results %s–%s of %s for %s'), $pagination_links['first_result'], $pagination_links['last_result'], $info['total_results'], $term) ?>
-                  <?php } else if ( $info['total_results'] == 1 ) { ?>
+                  <?php } else if ($info['total_results'] == 1) { ?>
                     <?= sprintf(gettext('The only result for %s'), $term) ?>
-                  <?php } else if ( $info['total_results'] == 0 ) { ?>
+                  <?php } else if ($info['total_results'] == 0) { ?>
                     <?= sprintf(gettext('There were no results for %s'), $term) ?>
                   <?php } else { ?>
                     <?= sprintf(gettext('All %s results for %s'), $info['total_results'], $term) ?>
                   <?php } ?>
                 </h2>
 
-                  <?php if ( $info['spelling_correction'] ) { ?>
-                    <p><?= sprintf(gettext('Did you mean %s?'), '<a href="/search/?q=' . urlencode($info['spelling_correction']) . '">' . _htmlentities( $info['spelling_correction_display'] ) . '</a>') ?></p>
+                  <?php if ($info['spelling_correction']) { ?>
+                    <p><?= sprintf(gettext('Did you mean %s?'), '<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><?= gettext('Sorted by relevance') ?></li>
                         <li><?= gettext('Sort by date') ?>: <a href="<?= $urls['newest'] ?>"><?= gettext('newest') ?></a> / <a href="<?= $urls['oldest'] ?>"><?= gettext('oldest') ?></a></li>
-                      <?php } else if ( $sort_order == 'oldest' ) { ?>
+                      <?php } else if ($sort_order == 'oldest') { ?>
                         <li><?= sprintf(gettext('Sort by <a href="%s">relevance</a>'), $urls['relevance']) ?></li>
                         <li><?= gettext('Sorted by date') ?>: <a href="<?= $urls['newest'] ?>"><?= gettext('newest') ?></a> / <?= gettext('oldest') ?></li>
                       <?php } else { ?>
@@ -86,7 +86,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>
@@ -95,16 +95,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="<?= gettext('First page') ?>">&lt;&lt;</a>
                         <a href="<?= $pagination_links['prev']['url'] ?>" title="<?= gettext('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="<?= gettext('Next page') ?>">&gt;</a>
                         <a href="<?= $pagination_links['lastpage']['url'] ?>" title="<?= gettext('Final page') ?>">&gt;&gt;</a>
                       <?php } ?>

Braces +4 added lines, -2 removed lines

@@ -19,9 +19,11 @@
                     }
                 ?>
                   <h2><?= sprintf(gettext('%s in constituencies matching <em class="current-search-term">%s</em>'), $desc, _htmlentities($searchstring)) ?></h2>
-                <?php } elseif ($mp_types['former']) { // count($cons) <= 1 ?>
+                <?php } elseif ($mp_types['former']) {
+// count($cons) <= 1 ?>
                   <h2><?= sprintf(gettext('Former MP for <em class="current-search-term">%s</em>'), _htmlentities($searchstring)) ?></h2>
-                <?php } else { // count($cons) <= 1 ?>
+                <?php } else {
+// count($cons) <= 1 ?>
                   <h2><?= sprintf(gettext('MP for <em class="current-search-term">%s</em>'), _htmlentities($searchstring)) ?></h2>
                 <?php } ?>
                 <?php foreach ( $cons as $member ) { ?>

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

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
             <div class="search-page__section__secondary search-page-sidebar">
-                <?php if ( isset( $search_sidebar['email'] ) ) { ?>
+                <?php if (isset($search_sidebar['email'])) { ?>
                 <h2><?= gettext('Create an alert') ?></h2>
                 <p class="sidebar-item-with-icon">
                     <?= sprintf(gettext('<a href="%s">Subscribe to an email alert</a> for <em class="current-search-term">%s</em>'), $search_sidebar['email'], $search_sidebar['email_desc']) ?>
-                    <?php if (isset( $search_sidebar['email_section'] ) ) { ?>
+                    <?php if (isset($search_sidebar['email_section'])) { ?>
                     <br><small><?= sprintf(gettext('(or just <a href="%s">%s</a>)'), $search_sidebar['email_section'], $search_sidebar['email_desc_section']) ?></small>
                     <?php } ?>
                 </p>

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

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 $divisions_to_link = array();
-foreach($data['rows'] as $speech) {
+foreach ($data['rows'] as $speech) {
 
     # Only care about divisions...
     if ($speech['htype'] != 14) {
@@ -34,7 +34,7 @@ 
                     <li><a href="#g<?= gid_to_anchor($speech['gid']) ?>"><?= sprintf(gettext('Division number %s'), $division['number']) ?></a>
                         <?php if ($division['has_description']) { ?>
                             <br><span class="policy-vote__text">
-                                <?php include( dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
+                                <?php include(dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
                             </span>
                         <?php } ?>