mysociety / theyworkforyou

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/by-person.php

Spacing +24 added lines, -24 removed lines

@@ -9,19 +9,19 @@ 
             <div class="search-page__section__primary">
                 <h2><?= sprintf(gettext('Who says <em class="current-search-term">%s</em> the most?'), _htmlentities($searchstring)) ?></h2>
 
-              <?php if ( isset($error) ) { ?>
-                <?php if ( $error == 'No results' && isset( $house ) && $house != HOUSE_TYPE_ROYAL ) { ?>
+              <?php if (isset($error)) { ?>
+                <?php if ($error == 'No results' && isset($house) && $house != HOUSE_TYPE_ROYAL) { ?>
                   <ul class="search-result-display-options">
                       <li>
-                        <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
+                        <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                           No results for MPs only
-                        <?php } else if ( $house ==  HOUSE_TYPE_LORDS) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_LORDS) { ?>
                           No results for Peers only
-                        <?php } else if ( $house == HOUSE_TYPE_SCOTLAND) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                           No results for MSPs only
-                        <?php } else if ( $house == HOUSE_TYPE_WALES) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_WALES) { ?>
                           <?= gettext('No results for MSs only') ?>
-                        <?php } else if ( $house ==  HOUSE_TYPE_NI) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_NI) { ?>
                           No results for MLAs only
                         <?php } ?>
                           |
@@ -33,7 +33,7 @@ 
                 <?php } ?>
               <?php } ?>
 
-              <?php if ( $wtt ) { ?>
+              <?php if ($wtt) { ?>
                 <p><strong>Now, try reading what a couple of these Lords are saying,
                 to help you find someone appropriate. When you've found someone,
                 follow the "I want to write to (name of lord)" link on their results page
@@ -41,43 +41,43 @@ 
                 </strong></p>
               <?php } ?>
 
-              <?php if ( isset($speakers) && count($speakers) ) { ?>
+              <?php if (isset($speakers) && count($speakers)) { ?>
 
-                  <?php if ( !$wtt ) { ?>
+                  <?php if (!$wtt) { ?>
                     <ul class="search-result-display-options">
                         <li><?= gettext('Results grouped by person') ?></li>
                         <li>
-                          <?php if ( $house ==  HOUSE_TYPE_ROYAL) { ?>
+                          <?php if ($house == HOUSE_TYPE_ROYAL) { ?>
                             <?= gettext('Show All') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html') ?>"><?= gettext('Show All') ?></a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
+                          <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                             MPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>1)) ?>">MPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_LORDS) { ?>
+                          <?php if ($house == HOUSE_TYPE_LORDS) { ?>
                             Peers only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>2)) ?>">Lords only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_SCOTLAND) { ?>
+                          <?php if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                             MSPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>4)) ?>">MSPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_WALES) { ?>
+                          <?php if ($house == HOUSE_TYPE_WALES) { ?>
                             <?= gettext('MSs only') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>5)) ?>"><?= gettext('MSs only') ?></a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_NI) { ?>
+                          <?php if ($house == HOUSE_TYPE_NI) { ?>
                             MLAs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>HOUSE_TYPE_NI)) ?>">MLAs only</a>
@@ -98,25 +98,25 @@ 
                         </tr>
                     </thead>
                     <tbody>
-                      <?php foreach ( $speakers as $pid => $speaker ) { ?>
+                      <?php foreach ($speakers as $pid => $speaker) { ?>
 
-                        <?php if ( $wtt && $pid == 0 ) { continue; } // skip heading count for WTT lords list ?>
+                        <?php if ($wtt && $pid == 0) { continue; } // skip heading count for WTT lords list ?>
 
                         <tr>
                             <td><?= $speaker['count'] ?></td>
                             <td>
-                              <?php if ( $pid ) { ?>
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
+                              <?php if ($pid) { ?>
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
                                   <a href="/search/?q=<?= _htmlentities($searchstring) ?>&amp;pid=<?= $pid ?><?= isset($wtt) && $speaker['left'] == '9999-12-31' ? '&amp;wtt=2' : '' ?>">
                                 <?php } ?>
                                 <?= isset($speaker['name']) ? $speaker['name'] : 'N/A' ?>
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
                                   </a>
                                 <?php } ?>
-                                <?php if ( isset($speaker['party']) ) { ?>
+                                <?php if (isset($speaker['party'])) { ?>
                                   <span class="search-results-grouped__speaker-party">(<?= $speaker['party'] ?>)</span>
                                 <?php } ?>
-                                <?php if ( $house !=  HOUSE_TYPE_LORDS) { ?>
+                                <?php if ($house != HOUSE_TYPE_LORDS) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
                               <?php } else { // no $pid ?>
@@ -124,7 +124,7 @@ 
                               <?php } ?>
                             </td>
                             <td>
-                              <?php if ( format_date($speaker['pmindate'], 'M Y') == format_date($speaker['pmaxdate'], 'M Y') ) { ?>
+                              <?php if (format_date($speaker['pmindate'], 'M Y') == format_date($speaker['pmaxdate'], 'M Y')) { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>
                               <?php } else { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>&nbsp;&ndash;&nbsp;<?= format_date($speaker['pmaxdate'], 'M Y') ?>

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

Spacing +14 added lines, -14 removed lines

@@ -6,32 +6,32 @@ 
                 <?= $parent_title ?>
             </h1>
             <p class="business-section__header__date">
-                <?= format_date( $info['date'], LONGERDATEFORMAT ) ?>
+                <?= format_date($info['date'], LONGERDATEFORMAT) ?>
             </p>
         </div>
-      <?php if ( isset($rows) ) { ?>
+      <?php if (isset($rows)) { ?>
         <div class="business-section__primary">
             <ul class="business-list">
               <?php
                 $prevlevel = '';
-                foreach ( $rows as $row ) { ?>
-                <?php if ( $row['htype'] == 10 ) {
-                    if ( $prevlevel == 'sub' ) { ?>
+                foreach ($rows as $row) { ?>
+                <?php if ($row['htype'] == 10) {
+                    if ($prevlevel == 'sub') { ?>
                     </ul>
                     </li>
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
+                    <?php } elseif ($prevlevel == 'top') { ?>
                     </li>
                     <?php } ?>
                     <li>
                 <?php } else {
-                    if ( $prevlevel == '' ) { ?>
+                    if ($prevlevel == '') { ?>
                     <li>
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
+                    <?php } elseif ($prevlevel == 'top') { ?>
                     <ul>
                     <li>
                     <?php } ?>
                 <?php } ?>
-                  <?php if ( isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;") ) { ?>
+                  <?php if (isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) { ?>
                     <div class="business-list__title">
                         <h3>
                             <?= $row['body'] ?>
@@ -42,26 +42,26 @@ 
                         <h3>
                             <?= $row['body'] ?>
                         </h3>
-                      <?php if ( isset($row['contentcount']) && $row['contentcount'] > 0 ) { ?>
+                      <?php if (isset($row['contentcount']) && $row['contentcount'] > 0) { ?>
                         <span class="business-list__meta">
                             <?= sprintf(ngettext('%s speech', '%s speeches', $row['contentcount']), $row['contentcount']) ?>
                         </span>
                       <?php } ?>
                     </a>
                   <?php }
-                  if ( isset($row['excerpt']) ) { ?>
+                  if (isset($row['excerpt'])) { ?>
                     <p class="business-list__excerpt">
-                        <?= trim_characters($row['excerpt'], 0, 200 ) ?>
+                        <?= trim_characters($row['excerpt'], 0, 200) ?>
                     </p>
                   <?php } ?>
-                <?php if ( $row['htype'] == 10 ) {
+                <?php if ($row['htype'] == 10) {
                     $prevlevel = 'top';
                 } else {
                     $prevlevel = 'sub'; ?>
                 </li>
                 <?php } ?>
               <?php } ?>
-                <?php if ( $prevlevel == 'sub' ) { ?>
+                <?php if ($prevlevel == 'sub') { ?>
                 </ul>
                 </li>
                 <?php } ?>

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

Spacing +13 added lines, -13 removed lines

@@ -1,10 +1,10 @@ 
 <div class="calendar">
-  <?php if(isset($month)) {
+  <?php if (isset($month)) {
     // What is the first day of the month in question?
-    $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
+    $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
     // How many days does this month contain?
-    $numberDays = date('t',$firstDayOfMonth);
+    $numberDays = date('t', $firstDayOfMonth);
 
     // What is the name of the month in question?
     $monthName = strftime('%B', $firstDayOfMonth);
@@ -12,7 +12,7 @@ 
     if (isset($info['onday'])) {
         // 'onday' is like 'yyyy-mm-dd'.
         $datebits = explode('-', $info['onday']);
-        if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) {
+        if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
             $toDay = $datebits[2];
         } else {
             $toDay = '';
@@ -39,7 +39,7 @@ 
   <?php }
     if (!isset($years)) { ?>
     <div class="calendar__controls">
-        <?php if ( isset($prev) ) { ?>
+        <?php if (isset($prev)) { ?>
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
         <?php } else { ?>
         <span class="calendar__controls__previous">&nbsp;</span>
@@ -47,7 +47,7 @@ 
         <span class="calendar__controls__current">
             <?= $monthName ?> <?= $year ?>
         </span>
-        <?php if ( isset($next) ) { ?>
+        <?php if (isset($next)) { ?>
         <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
         <?php } else { ?>
         <span class="calendar__controls__next">&nbsp;</span>
@@ -100,14 +100,14 @@ 
                 // sittings - e.g. WH is only Tuesday-Thursday
                 if ($currentDay == $toDay) {
                     print '<td class="on"';
-                    if ($recess[0] && $recess[0]!=1) {
-                        print ' title="'.$recess[0].'"';
+                    if ($recess[0] && $recess[0] != 1) {
+                        print ' title="' . $recess[0] . '"';
                     }
                     print '>';
                 } elseif ($recess[0]) {
                     print '<td class="no"';
-                    if ($recess[0]!=1) {
-                        print ' title="'.$recess[0].'"';
+                    if ($recess[0] != 1) {
+                        print ' title="' . $recess[0] . '"';
                     }
                     print '>';
                 } else {
@@ -116,7 +116,7 @@ 
 
                 // Is the $currentDay a member of $dates? If so,
                 // the day should be linked.
-                if (in_array($currentDay,$dates)) {
+                if (in_array($currentDay, $dates)) {
 
                     $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
@@ -154,12 +154,12 @@ 
             </tr>
         </tbody>
     </table>
-  <?php if(!isset($years)){ ?>
+  <?php if (!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
         $y = $urls['day'];
         $y->reset();
-        $y->insert(array( 'y' => $year ));
+        $y->insert(array('y' => $year));
         $url = $y->generate();
     ?>
     <a href="<?= $url ?>"><?= sprintf(gettext('See all of %s'), $year) ?></a>