mysociety / theyworkforyou

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

Spacing +4 added lines, -4 removed lines

@@ -22,19 +22,19 @@
         if (isset($row['listurl'])) {
             // So we can link to the 'More recent appearances' precisely.
             $count = $n + 1;
-            $text = "<a name=\"n$count\"></a><strong><a href=\"" . $row['listurl'] . "\">$text</a></strong> ";
+            $text = "<a name=\"n$count\"></a><strong><a href=\"".$row['listurl']."\">$text</a></strong> ";
         }
 
-        $text .= '<small>' . format_date($row['hdate'], SHORTDATEFORMAT);
+        $text .= '<small>'.format_date($row['hdate'], SHORTDATEFORMAT);
 
         if ($hansardmajors[$row['major']]['type'] == 'debate') {
             $plural = $row['total_speeches'] == 1 ? 'speech' : 'speeches';
-            $text .= ' (' . $row['total_speeches'] . " $plural)";
+            $text .= ' ('.$row['total_speeches']." $plural)";
         }
 
         $text .= '</small>';
 
-        $text = "\t\t\t\t<p>$text<br>\n\t\t\t\t&#8220;" . trim_characters($row['body'], 0, 200) . "&#8221;</p>\n";
+        $text = "\t\t\t\t<p>$text<br>\n\t\t\t\t&#8220;".trim_characters($row['body'], 0, 200)."&#8221;</p>\n";
 
         print $text;
     }

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

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
           <?php if (isset($data['user_signed_in']) && isset($data['already_signed_up'])): ?>
             <div class="alerts-message alerts-message--reminder">
                 <h2>You are already signed up</h2>
-                <p>You are already receiving alerts when your MP<?= isset($data['mp_name']) ? ', ' . $data['mp_name'] . ',' : '' ?> speaks in Parliament or receives an answer to a written question.</p>
+                <p>You are already receiving alerts when your MP<?= isset($data['mp_name']) ? ', '.$data['mp_name'].',' : '' ?> speaks in Parliament or receives an answer to a written question.</p>
                 <p><a href="/alert/" class="button radius">Show my email settings</a></p>
             </div>
            <?php endif ?>

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

Indentation +9 added lines, -9 removed lines

@@ -122,25 +122,25 @@ 
       <?php } ?>
 
       <?php
-          if(
-              (isset($members) && $members->rows() > 0) ||
+            if(
+                (isset($members) && $members->rows() > 0) ||
               (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 (isset($members) && $members->rows() > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when people matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                   <?php
                     $q = $members;
                     for ($n=0; $n<$q->rows(); $n++) {
-                  ?>
+                    ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -160,7 +160,7 @@ 
               <?php } ?>
 
               <?php if (isset($constituencies) && count($constituencies) > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when MPs for constituencies matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                 <?php foreach ($constituencies as $constituency => $member) { ?>

Spacing +24 added lines, -24 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>Your alert has been confirmed</h3>
                 <p>
                     You will now receive email alerts for the following criteria:
@@ -45,26 +45,26 @@ 
                 </div>
                 </noscript>
 
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
+              <?php } elseif ($results == 'alert-suspended') { ?>
                 <h3>Alert suspended</h3>
                 <p>
                     You can reactivate the alert at any time, from the sidebar below.
                 </p>
 
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
+              <?php } elseif ($results == 'alert-resumed') { ?>
                 <h3>Alert resumed</h3>
                 <p>
                     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>Alert deleted</h3>
                 <p>
                     You will no longer receive this alert.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Hmmm, something&rsquo;s not right</h3>
                 <p>
                     The link you followed to reach this page appears to be incomplete.
@@ -80,14 +80,14 @@ 
                     and let us know, and we'll help out!
                 </p>
 
-              <?php } elseif ( $results == 'alert-added' ) { ?>
+              <?php } elseif ($results == 'alert-added') { ?>
                 <h3>Your alert has been added</h3>
                 <p>
                     You will now receive email alerts on any day when
                     <?= _htmlspecialchars($criteria) ?> in parliament.
                 </p>
 
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
+              <?php } elseif ($results == 'alert-confirmation') { ?>
                 <h3>We&rsquo;re nearly done&hellip;</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
@@ -95,20 +95,20 @@ 
                     and receive future alerts. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
+              <?php } elseif ($results == 'alert-exists') { ?>
                 <h3>You&rsquo;re already subscribed to that!</h3>
                 <p>
                     It&rsquo;s good to know you&rsquo;re keen though.
                 </p>
 
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
+              <?php } elseif ($results == 'alert-already-signed') { ?>
                 <h3>We&rsquo;re nearly done</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
                     You will need to follow that link to confirm your email address to receive the alert. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Alert could not be created</h3>
                 <p>
                     Sorry, we were unable to create that alert. Please
@@ -122,7 +122,7 @@ 
       <?php } ?>
 
       <?php
-          if(
+          if (
               (isset($members) && $members->rows() > 0) ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
@@ -139,7 +139,7 @@ 
                 <ul>
                   <?php
                     $q = $members;
-                    for ($n=0; $n<$q->rows(); $n++) {
+                    for ($n = 0; $n < $q->rows(); $n++) {
                   ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
@@ -147,7 +147,7 @@ 
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="pid" value="<?= $q->field($n, 'person_id') ?>">
                             When
-                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname') ) ?>
+                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname')) ?>
                             <?php if ($q->field($n, 'constituency')) { ?>
                                 (<?= $q->field($n, 'constituency') ?>)
                             <?php } ?>
@@ -178,7 +178,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                if ( $member_options ) { ?>
+                if ($member_options) { ?>
                 <h3>Sign up for alerts for topics</h3>
                 <?php } else { ?>
                 <h3>Great! Can you just confirm what you mean?</h3>
@@ -192,7 +192,7 @@ 
                             Receive alerts when <?= _htmlspecialchars($alertsearch_pretty) ?>
                             <input type="submit" class="button small" value="Subscribe">
                         </form>
-                      <?php if ( isset($mistakes['multiple']) ) { ?>
+                      <?php if (isset($mistakes['multiple'])) { ?>
                         <em class="error">
                             You have used a comma in your search term &ndash;
                             are you sure this is what you want? You cannot
@@ -201,7 +201,7 @@ 
                             for each individual term.
                         </em>
                       <?php } ?>
-                      <?php if ( isset($mistakes['postcode_and']) ) { ?>
+                      <?php if (isset($mistakes['postcode_and'])) { ?>
                         <em class="error">
                             You have used a postcode and something else in your
                             search term &ndash; are you sure this is what you
@@ -222,7 +222,7 @@ 
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="keyword" value="<?= _htmlspecialchars($member_alertsearch) ?>">
-                            Mentions of [<?= _htmlspecialchars($member_displaysearch) ?>] by <?= $mp_display_text . $member->full_name() ?>
+                            Mentions of [<?= _htmlspecialchars($member_displaysearch) ?>] by <?= $mp_display_text.$member->full_name() ?>
                             <input type="submit" class="button small" value="Subscribe">
                         </form>
                     </li>
@@ -350,17 +350,17 @@ 
             <div class="alert-section__secondary">
               <?php if ($email_verified) { ?>
 
-                  <?php if ( $alerts ) { ?>
+                  <?php if ($alerts) { ?>
                     <h3>Your current email alerts</h3>
                     <ul class="alerts-manage__list">
-                      <?php foreach ( $alerts as $alert ) { ?>
+                      <?php foreach ($alerts as $alert) { ?>
                         <li>
                             When <?= _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="Confirm">
-                              <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+                              <?php } elseif ($alert['status'] == 'suspended') { ?>
                                 <input type="submit" class="button small" name="action" value="Resume">
                               <?php } else { ?>
                                 <input type="submit" class="button button--secondary small" name="action" value="Suspend">
@@ -372,7 +372,7 @@ 
                     </ul>
                   <?php } ?>
 
-                  <?php if ( $current_mp ) { ?>
+                  <?php if ($current_mp) { ?>
                     <h3>Your MP alert</h3>
                     <ul class="alerts-manage__list">
                         <li>

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

Braces +3 added lines, -1 removed lines

@@ -91,7 +91,9 @@
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {
             echo "<em>" . ucfirst($row['speaker']['name']) . "</em>";
-            if ($row['extract']) echo ": ";
+            if ($row['extract']) {
+                echo ": ";
+            }
         }
 
         echo $row['extract'] . "</p></dd>\n";

Spacing +10 added lines, -10 removed lines

@@ -44,7 +44,7 @@ 
         $last_result = $info['total_results'];
     }
 
-    print "\t\t\t\t<h3 style='font-weight:normal'>Results <strong>" . number_format($info['first_result']) . '-' . number_format($last_result) . '</strong> of ' . number_format($info['total_results']) . " for <strong>" . _htmlentities($searchdescription) . "</strong></h3>\n";
+    print "\t\t\t\t<h3 style='font-weight:normal'>Results <strong>".number_format($info['first_result']).'-'.number_format($last_result).'</strong> of '.number_format($info['total_results'])." for <strong>"._htmlentities($searchdescription)."</strong></h3>\n";
 
 } elseif ($info['total_results'] == 0) {
     echo '<h3 style="font-weight:normal">Your search for <strong>', _htmlentities($searchdescription), '</strong> did not match anything.</h3>';
@@ -54,7 +54,7 @@ 
     $u = new \MySociety\TheyWorkForYou\Url('search');
     $u->reset();
     $u->insert(array('s' => $info['spelling_correction']));
-    echo '<p><big>Did you mean: <a href="' . $u->generate(), '">', $info['spelling_correction'] . '</a>?</big></p>';
+    echo '<p><big>Did you mean: <a href="'.$u->generate(), '">', $info['spelling_correction'].'</a>?</big></p>';
 }
 
 if ($match = get_http_var('match')) {
@@ -66,35 +66,35 @@ 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
 
     echo '<dl id="searchresults">';
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
         echo '<dt><a href="', $row['listurl'], '">';
         if (isset($row['parent']) && count($row['parent']) > 0) {
-            echo ('<strong>' . $row['parent']['body'] . '</strong>');
+            echo ('<strong>'.$row['parent']['body'].'</strong>');
         }
-        echo '</a> <small>(' . format_date($row['hdate'], LONGDATEFORMAT) . ')';
+        echo '</a> <small>('.format_date($row['hdate'], LONGDATEFORMAT).')';
         if (isset($row['video_status']) && ($row['video_status'] == 5 || $row['video_status'] == 7)) {
             echo ' <em>has video</em> ';
         }
         if (isset($row['collapsed']) && $row['collapsed'] && $row['subsection_id']) {
             $URL = new \MySociety\TheyWorkForYou\Url('search');
-            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]" ));
+            $URL->insert(array('s' => $info['s']." segment:$row[subsection_id]"));
             echo ' <a href="', $URL->generate(), '">See ', $row['collapsed'],
-            ' other result', $row['collapsed']>1?'s':'', ' from this ',
+            ' other result', $row['collapsed'] > 1 ? 's' : '', ' from this ',
             $hansardmajors[$row['major']]['singular'], '</a>';
         }
         echo '</small>';
         if ($match = get_http_var('match')) {
-            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'] , '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
+            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'], '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
         }
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {
-            echo "<em>" . ucfirst($row['speaker']['name']) . "</em>";
+            echo "<em>".ucfirst($row['speaker']['name'])."</em>";
             if ($row['extract']) echo ": ";
         }
 
-        echo $row['extract'] . "</p></dd>\n";
+        echo $row['extract']."</p></dd>\n";
 
     }
 

www/includes/easyparliament/templates/html/homepage/featured.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
-                        <?php if ( $featured['featured'] ) { ?>
+                        <?php if ($featured['featured']) { ?>
                         <h2>In the news</h2>
-                        <?php if ( isset($featured['headline']) ) { ?>
+                        <?php if (isset($featured['headline'])) { ?>
                         <h3 class="in-the-news__topic"><a href="<?= $featured['list_url'] ?>"><?= $featured['headline'] ?></a></h3>
-                        <?php if ( isset($featured['context']) ) { ?>
+                        <?php if (isset($featured['context'])) { ?>
                         <p class="in-the-news__context"><?= $featured['context'] ?></p>
                         <?php } ?>
                         <?php } ?>
@@ -15,21 +15,21 @@ 
                             <p class="meta excerpt__category"><a href="<?= $featured['more_url'] ?>"><?= $featured['desc'] ?></a></p>
                             <p class="excerpt__statement">
                                 <q>
-                                <?php if ( $featured['child']['speaker'] ) { ?>
+                                <?php if ($featured['child']['speaker']) { ?>
                                 <a href="<?= $featured['child']['speaker']['url'] ?>"><?= $featured['child']['speaker']['name'] ?></a> :
                                 <?php } ?>
                                 <?= trim_characters($featured['child']['body'], 0, 200) ?>
                                 </q>
                             </p>
                         </div>
-                        <?php if ( count($featured['related']) ) { ?>
+                        <?php if (count($featured['related'])) { ?>
                         <div class="in-the-news__key-events">
                             <!-- No maximum, but less than 4 looks best -->
                             <ul class="key-events__list">
                                 <li>
                                     <h4>Key events</h4>
                                 </li>
-                                <?php foreach ( $featured['related'] as $related ) { ?>
+                                <?php foreach ($featured['related'] as $related) { ?>
                                  <li>
                                      <a href="<?= $related['list_url'] ?>"><?= $related['parent']['body'] ?></a>
                                     <p class="meta"><?= format_date($related['hdate'], SHORTDATEFORMAT) ?></p>

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

Spacing +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
-                            <?php if ( isset( $recent['child'] ) ) { ?>
+                            <?php if (isset($recent['child'])) { ?>
                             <li class="parliamentary-excerpt">
-                            <h3 class="excerpt__title"><a href="<?= $recent['list_url'] ?>"><?= $recent['parent']['body'] ? $recent['parent']['body'] . ' : ' : '' ?><?= $recent['body'] ?></a></h3>
+                            <h3 class="excerpt__title"><a href="<?= $recent['list_url'] ?>"><?= $recent['parent']['body'] ? $recent['parent']['body'].' : ' : '' ?><?= $recent['body'] ?></a></h3>
                                 <p class="meta"><?=format_date($recent['hdate'], LONGERDATEFORMAT); ?></p>
                                 <p class="meta excerpt__category"><a href="<?= $recent['more_url'] ?>"><?= $recent['desc'] ?></a></p>
                                 <p class="excerpt__statement">
-                                <?php if ( isset($recent['child']['speaker']) && count($recent['child']['speaker']) ) { ?>
+                                <?php if (isset($recent['child']['speaker']) && count($recent['child']['speaker'])) { ?>
                                 <a href="<?= $recent['child']['speaker']['url'] ?>"><?= $recent['child']['speaker']['name'] ?></a>
                                 <?php } ?>
                                 <?= trim_characters($recent['child']['body'], 0, 200) ?>
@@ -13,10 +13,10 @@ 
                             <?php } else { ?>
                             <li class="parliamentary-excerpt">
                             <h3 class="excerpt__title"><?= $recent['desc'] ?></h3>
-                                <?php foreach ( $recent['data'] as $date => $details ) { ?>
+                                <?php foreach ($recent['data'] as $date => $details) { ?>
                                 <p class="meta"><?= $date ?></p>
                                 <p class="meta excerpt__category"><a href="<?= $recent['more_url'] ?>"><?= $recent['desc'] ?></a></p>
-                                <?php foreach ( $details as $bill ) { ?>
+                                <?php foreach ($details as $bill) { ?>
                                 <p class="excerpt__statement">
                                     <a href="<?= $bill['url'] ?>"><?= $bill['bill'] ?>, <?= $bill['sitting'] ?></a>
                                 </p>

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

Spacing +5 added lines, -5 removed lines

@@ -42,24 +42,24 @@
     ?>
                 <dl id="searchresults">
 <?php
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
 
         ?>
                     <dt><a href="<?php echo $row['listurl']; ?>"><?php
         if (isset($row['parent']) && count($row['parent']) > 0) {
-            echo ('<strong>' . $row['parent']['body'] . '</strong>');
+            echo ('<strong>'.$row['parent']['body'].'</strong>');
         }
-        echo ('</a> <small>(' . format_date($row['hdate'], SHORTDATEFORMAT) . ')</small>');
+        echo ('</a> <small>('.format_date($row['hdate'], SHORTDATEFORMAT).')</small>');
         ?></dt>
                     <dd><p><?php
 
         if (isset($row['speaker']['name'])) {
-            echo "<em>" . $row['speaker']['name'] . "</em>: ";
+            echo "<em>".$row['speaker']['name']."</em>: ";
         }
 
-        echo $row['extract'] . "</p></dd>\n";
+        echo $row['extract']."</p></dd>\n";
 
     }
 

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

Spacing +3 added lines, -3 removed lines

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

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

Spacing +23 added lines, -23 removed lines

@@ -9,17 +9,17 @@ 
             <div class="search-page__section__primary">
                 <h2>Who says <em class="current-search-term"><?= _htmlentities($searchstring) ?></em> the most?</h2>
 
-              <?php if ( isset($error) ) { ?>
-                <?php if ( $error == 'No results' && isset( $house ) && $house != 0 ) { ?>
+              <?php if (isset($error)) { ?>
+                <?php if ($error == 'No results' && isset($house) && $house != 0) { ?>
                   <ul class="search-result-display-options">
                       <li>
-                        <?php if ( $house == 1 ) { ?>
+                        <?php if ($house == 1) { ?>
                           No results for MPs only
-                        <?php } else if ( $house == 2 ) { ?>
+                        <?php } else if ($house == 2) { ?>
                           No results for Peers only
-                        <?php } else if ( $house == 4 ) { ?>
+                        <?php } else if ($house == 4) { ?>
                           No results for MSPs only
-                        <?php } else if ( $house == 3 ) { ?>
+                        <?php } else if ($house == 3) { ?>
                           No results for MLAs only
                         <?php } ?>
                           |
@@ -31,7 +31,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,
                 hit the "I want to write to this Lord" button on their results page
@@ -39,37 +39,37 @@ 
                 </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>Results grouped by person</li>
                         <li>
-                          <?php if ( $house == 0 ) { ?>
+                          <?php if ($house == 0) { ?>
                             Show All
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html') ?>">Show All</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 1 ) { ?>
+                          <?php if ($house == 1) { ?>
                             MPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>1)) ?>">MPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 2 ) { ?>
+                          <?php if ($house == 2) { ?>
                             Peers only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>2)) ?>">Lords only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 4 ) { ?>
+                          <?php if ($house == 4) { ?>
                             MSPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>4)) ?>">MSPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 3 ) { ?>
+                          <?php if ($house == 3) { ?>
                             MLAs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>3)) ?>">MLAs only</a>
@@ -90,33 +90,33 @@ 
                         </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 != 2 ) { ?>
-                                  <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
+                                <?php if ($house != 2) { ?>
+                                  <?= isset($speaker['office']) ? ' - '.join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
                               <?php } else { // no $pid ?>
                                 <?= $speaker['name'] ?>
                               <?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') ?>