mysociety / theyworkforyou

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="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">Advanced search</a></li>
-              <?php if ( $is_adv ) { ?>
+              <?php if ($is_adv) { ?>
                 <?= $search_phrase ? '<li>Exactly: ' . _htmlentities($search_phrase) . '</li>' : '' ?>
                 <?= $search_exclude ? '<li>Excluding: ' . _htmlentities($search_exclude) . '</li>' : '' ?>
                 <?= $search_from ? '<li>From: ' . _htmlentities($search_from) . '</li>' : '' ?>

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

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
     <p class="search-result__description">
     <?php $details = $member->getMostRecentMembership(); ?>
     <?= $details['left_house'] != '9999-12-31' ? 'Former ' : '' ?><?= $details['party'] ? $details['party'] . ' ' : '' ?><?= $details['rep_name'] ?><?= $details['cons'] ? ', ' . $details['cons'] : ''?>
-    <?php if ( $details['entered_house'] || ( $details['left_house'] && $details['left_house'] != '9999-12-31' )  ) { ?>
+    <?php if ($details['entered_house'] || ($details['left_house'] && $details['left_house'] != '9999-12-31')) { ?>
 , <?= format_date($details['entered_house'], SHORTDATEFORMAT) ?> &ndash; <?= $details['left_house'] != '9999-12-31' ? format_date($details['left_house'], SHORTDATEFORMAT) : '' ?>
     <?php } ?>
     </p>

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

Spacing +22 added lines, -22 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,25 +90,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 != 2 ) { ?>
+                                <?php if ($house != 2) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
                               <?php } else { // no $pid ?>
@@ -116,7 +116,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') ?>

Braces +23 added lines, -11 removed lines

@@ -15,18 +15,22 @@ 
                       <li>
                         <?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 } ?>
                           |
                           <a href="<?= $this_url->generate('html') ?>">Show results for all speakers</a>
                       </li>
                   </ul>
-                <?php } else { ?>
+                <?php }
+else { ?>
                   <p class="search-results-legend"><?= $error ?></p>
                 <?php } ?>
               <?php } ?>
@@ -47,31 +51,36 @@ 
                         <li>
                           <?php if ( $house == 0 ) { ?>
                             Show All
-                          <?php } else { ?>
+                          <?php }
+else { ?>
                             <a href="<?= $this_url->generate('html') ?>">Show All</a>
                           <?php } ?>
                             |
                           <?php if ( $house == 1 ) { ?>
                             MPs only
-                          <?php } else { ?>
+                          <?php }
+else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>1)) ?>">MPs only</a>
                           <?php } ?>
                             |
                           <?php if ( $house == 2 ) { ?>
                             Peers only
-                          <?php } else { ?>
+                          <?php }
+else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>2)) ?>">Lords only</a>
                           <?php } ?>
                             |
                           <?php if ( $house == 4 ) { ?>
                             MSPs only
-                          <?php } else { ?>
+                          <?php }
+else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>4)) ?>">MSPs only</a>
                           <?php } ?>
                             |
                           <?php if ( $house == 3 ) { ?>
                             MLAs only
-                          <?php } else { ?>
+                          <?php }
+else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>3)) ?>">MLAs only</a>
                           <?php } ?>
                         </li>
@@ -111,14 +120,17 @@ 
                                 <?php if ( $house != 2 ) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
-                              <?php } else { // no $pid ?>
+                              <?php }
+else {
+// no $pid ?>
                                 <?= $speaker['name'] ?>
                               <?php } ?>
                             </td>
                             <td>
                               <?php if ( format_date($speaker['pmindate'], 'M Y') == format_date($speaker['pmaxdate'], 'M Y') ) { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>
-                              <?php } else { ?>
+                              <?php }
+else { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>&nbsp;&ndash;&nbsp;<?= format_date($speaker['pmaxdate'], 'M Y') ?>
                               <?php } ?>
                             </td>

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

Braces +5 added lines, -2 removed lines

@@ -46,7 +46,8 @@ 
 
     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) {
+}
+elseif ($info['total_results'] == 0) {
     echo '<h3 style="font-weight:normal">Your search for <strong>', _htmlentities($searchdescription), '</strong> did not match anything.</h3>';
 }
 
@@ -91,7 +92,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 +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 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'], '">';
@@ -79,14 +79,14 @@ 
         }
         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'])) {

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

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
                       <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
@@ -34,23 +34,23 @@ 
                         <h2 class="people-list__person__name"><?= $mp_data['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $mp_data['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $mp_data['party'] ) ?>"><?= $mp_data['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($mp_data['party']) ?>"><?= $mp_data['party'] ?></span>
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $rep['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $rep['party'] ) ?>"><?= $rep['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($rep['party']) ?>"><?= $rep['party'] ?></span>
                         </p>
                     </a>
                         <?php } ?>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -188,7 +188,7 @@ 
                 <img class="people-list__person__image" src="<?= $person['image'] ?>">
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= strtolower($person['party']) ?>"><?= $person['party'] ?></span>
@@ -206,7 +206,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <form method="get" action="<?= $urls['plain'] ?>" class="sidebar-item-with-icon sidebar-item-with-icon--date">
                     <p>
                         Or view a past list
@@ -250,7 +250,7 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -264,7 +264,7 @@ 
                     </p>
                 <?php } ?>
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__) . '/../sidebar/looking_for.php') ?>
             </div>
         </div>
 

Braces +30 added lines, -15 removed lines

@@ -4,9 +4,11 @@ 
 if (!count($data)) {
     if ($type == 'mps' && isset($dissolution[1])) {
         $former = 'former';
-    } elseif ($type == 'msps' && isset($dissolution[4])) {
+    }
+    elseif ($type == 'msps' && isset($dissolution[4])) {
         $former = 'former';
-    } elseif ($type == 'mlas' && isset($dissolution[3])) {
+    }
+    elseif ($type == 'mlas' && isset($dissolution[3])) {
         $former = 'former';
     }
 }
@@ -59,7 +61,8 @@ 
             </div>
         </div>
 
-      <?php } else { ?>
+      <?php }
+else { ?>
 
         <form action="/<?= ($type == 'mlas' || $type == 'msps') ? 'postcode' : 'search' ?>/">
             <div class="search-page__section search-page__section--search">
@@ -67,9 +70,11 @@ 
                     <p class="search-page-main-inputs">
                     <?php if ( $type == 'peers' ) { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php }
+elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
                     <?php } ?>
                         <input type="text" class="form-control" name="<?= ($type == 'mlas' || $type == 'msps') ? 'pc' : 'q' ?>" id="find-mp-by-name-or-postcode">
@@ -91,19 +96,22 @@ 
                 During the period from the dissolution of Parliament to the general election, there are no Members of Parliament.
                 <a href="/mps/?date=<?=$dissolution[1] ?>">View list of MPs as it was when Parliament was dissolved</a>
             </div>
-        <?php } elseif ($type == 'msps') { ?>
+        <?php }
+elseif ($type == 'msps') { ?>
             <div class="search-page__section__primary">
                 During the period from the dissolution of the Scottish Parliament to the election, there are no Members of the Scottish Parliament.
                 <a href="/msps/?date=<?=$dissolution[4] ?>">View list of MSPs as it was when the Scottish Parliament was dissolved</a>
             </div>
-        <?php } elseif ($type == 'mlas') { ?>
+        <?php }
+elseif ($type == 'mlas') { ?>
             <div class="search-page__section__primary">
                 During the period from the dissolution of the Northern Ireland Assembly to the election, there are no Members of the Northern Ireland Assembly.
                 <a href="/mlas/?date=<?=$dissolution[3] ?>">View list of MLAs as it was when the Northern Ireland Assembly was dissolved</a>
             </div>
         <?php
             }
-        } else { ?>
+        }
+        else { ?>
 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
@@ -113,20 +121,24 @@ 
                     <?php if ( $order == 'given_name' ) { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php }
+else if ( $order == 'party' ) { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                     <li><strong>Sorted by</strong> Last name</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
                     <?php } ?>
                 </ul>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <ul class="search-result-display-options">
                     <?php if ( $order == 'party' ) { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                     <li><strong>Sorted by</strong> Name</li>
                     <li>Sort by <a href="<?= $urls['by_party'] ?>">Party</a></li>
                     <?php } ?>
@@ -179,7 +191,8 @@ 
                         if ( $initial != $current_initial ) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
-                        } else {
+                        }
+                        else {
                             $initial_link = "";
                         }
                     }
@@ -250,7 +263,8 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php }
+else if ( $type == 'msps' ) { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -258,7 +272,8 @@ 
                         <a href="<?= $urls['plain'] ?>?date=1999-05-06">MSPs at 1999 election</a>
                         <a href="<?= $urls['plain'] ?>?all=1">Historical list of all MSPs</a>
                     </p>
-                <?php } else { ?>
+                <?php }
+else { ?>
                     <p class="past-list-dates" id="past-list-dates">
                     <a href="<?= $urls['plain'] ?>?all=1">Historical list of all <?= $rep_plural ?></a>
                     </p>

www/includes/easyparliament/templates/html/mp/header.php

Spacing +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
     <div class="regional-header regional-header--<?= $current_assembly ?>">
         <div class="regional-header__overlay"></div>
-        <div class="person-header <?= $this_page ?> <?= (isset($data['photo_attribution_text'])?'has-data-attribution':'') ?>">
+        <div class="person-header <?= $this_page ?> <?= (isset($data['photo_attribution_text']) ? 'has-data-attribution' : '') ?>">
             <div class="full-page__row">
                 <div class="full-page__unit">
                     <div class="person-header__content">
                         <div class="person-name">
-                          <?php if ( $image ) { ?>
+                          <?php if ($image) { ?>
                             <div class="mp-image">
                                 <img src="<?= $image['url'] ?>" height="48">
                             </div>
@@ -17,10 +17,10 @@ 
                               <?php } ?>
                             </div>
                         </div>
-                        <?php if($image && $image['exists']): ?>
-                            <?php if(isset($data['photo_attribution_text'])) { ?>
+                        <?php if ($image && $image['exists']): ?>
+                            <?php if (isset($data['photo_attribution_text'])) { ?>
                                 <div class="person-data-attribution">
-                                  <?php if(isset($data['photo_attribution_link'])) { ?>
+                                  <?php if (isset($data['photo_attribution_link'])) { ?>
                                     Profile photo: <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
                                   <?php } else { ?>
                                     Profile photo: <?= $data['photo_attribution_text'] ?>
@@ -38,10 +38,10 @@ 
                             </div>
                         <?php endif; ?>
                         <div class="person-constituency">
-                          <?php if ( $constituency && $this_page != 'peer' && $this_page != 'royal' ) { ?>
+                          <?php if ($constituency && $this_page != 'peer' && $this_page != 'royal') { ?>
                             <span class="constituency"><?= $constituency ?></span>
                           <?php } ?>
-                          <?php if ( $party ) { ?>
+                          <?php if ($party) { ?>
                             <span class="party <?= $party_short ?>"><?= $party ?></span>
                           <?php } ?>
                         </div>

Braces +7 added lines, -3 removed lines

@@ -22,12 +22,14 @@ 
                                 <div class="person-data-attribution">
                                   <?php if(isset($data['photo_attribution_link'])) { ?>
                                     Profile photo: <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
-                                  <?php } else { ?>
+                                  <?php }
+else { ?>
                                     Profile photo: <?= $data['photo_attribution_text'] ?>
                                   <?php } ?>
                                 </div>
                             <?php } ?>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             <div class="person-data-attribution">
                                 We&rsquo;re missing a photo of <?= $full_name ?>. If you have a
                                 photo <em>that you can release under a Creative Commons Attribution-ShareAlike
@@ -36,7 +38,9 @@ 
                                 Please do not email us about copyrighted photos elsewhere on the internet; we can&rsquo;t
                                 use them.
                             </div>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                         <div class="person-constituency">
                           <?php if ( $constituency && $this_page != 'peer' && $this_page != 'royal' ) { ?>
                             <span class="constituency"><?= $constituency ?></span>

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

Spacing +3 added lines, -3 removed lines

@@ -44,11 +44,11 @@
         ?></dt>
         <dd>
         <div class="appearance-date">
-            <div class="day"><?php echo format_date($row['hdate'], 'j' ) ?></div><!--
+            <div class="day"><?php echo format_date($row['hdate'], 'j') ?></div><!--
             <?php if ($year < $cur_year) { ?>
-            --><div class="month"><?php echo format_date($row['hdate'], 'M y' ) ?></div>
+            --><div class="month"><?php echo format_date($row['hdate'], 'M y') ?></div>
             <?php } else { ?>
-            --><div class="month"><?php echo format_date($row['hdate'], 'M' ) ?></div>
+            --><div class="month"><?php echo format_date($row['hdate'], 'M') ?></div>
             <?php } ?>
         </div>
 

Braces +4 added lines, -2 removed lines

@@ -47,7 +47,8 @@ 
             <div class="day"><?php echo format_date($row['hdate'], 'j' ) ?></div><!--
             <?php if ($year < $cur_year) { ?>
             --><div class="month"><?php echo format_date($row['hdate'], 'M y' ) ?></div>
-            <?php } else { ?>
+            <?php }
+else { ?>
             --><div class="month"><?php echo format_date($row['hdate'], 'M' ) ?></div>
             <?php } ?>
         </div>
@@ -61,7 +62,8 @@ 
 
 <?php
 
-} else { ?>
+}
+else { ?>
 <p>No data to display.</p>
 <?php
 }

www/includes/easyparliament/templates/html/user/view_user.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
                 <div class="row">
                 <span class="label">Website</span>
-                <span class="formw"><?= $website == '' ? 'none' : '<a href="' . _htmlentities($website) . '">'. _htmlentities($website) . '</a>' ?></span>
+                <span class="formw"><?= $website == '' ? 'none' : '<a href="' . _htmlentities($website) . '">' . _htmlentities($website) . '</a>' ?></span>
                 </div>
 
                 <div class="row">