mysociety / theyworkforyou

www/includes/url.php

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 
         // These stores an associative array of key/value pairs that
         // we'll want passed on to other pages.
-        $this->session_vars = array ();
+        $this->session_vars = array();
 
         // Prevent things using $DATA running if it hasn't been set, ie in testing
         if (isset($DATA)) {
@@ -102,7 +102,7 @@ 
 
     public function reset() {
         // Call this to remove all the session_vars.
-        $this->session_vars = array ();
+        $this->session_vars = array();
     }
 
     public function insert($arr) {
@@ -136,7 +136,7 @@ 
         }
     }
 
-    public function generate($encode = "html", $overrideVars=array()) {
+    public function generate($encode = "html", $overrideVars = array()) {
         // Returns a URL with the appropriate session_vars.
         // If $encode is "html", the URL will be suitable to be put in HTML.
         // If $encode is "none", the URL will be as is.
@@ -149,7 +149,7 @@ 
         // them.
         global $DATA;
 
-        $url_args = array ();
+        $url_args = array();
 
         foreach (array_merge($this->session_vars, $overrideVars) as $key => $var) {
             if (is_array($var)) {
@@ -180,7 +180,7 @@ 
     // If you have a form that changes, say, $s, then you'll need to
     // pass "s" in in the $remove_vars array, so it isn't created as a
     // hidden variable.
-    public function hidden_form_varsOLD ($remove_vars=array(), $insert_vars=array()) {
+    public function hidden_form_varsOLD($remove_vars = array(), $insert_vars = array()) {
         // This should really be tidied up lots. That $dont_keep array for a start is NASTY!
         // You can also pass in an array of variables to remove() and insert().
 
@@ -201,7 +201,7 @@ 
         $html = "";
 
         // Put keys of any variables you never want to hang on to in here:
-        $dont_keep = array();	// VERY BAD!
+        $dont_keep = array(); // VERY BAD!
         $this->remove($dont_keep);
 
         foreach ($this->session_vars as $key => $val) {

Braces +10 added lines, -5 removed lines

@@ -156,18 +156,22 @@ 
                 foreach ($var as $v) {
                     $url_args[] = "$key=" . urlencode(stripslashes($v));
                 }
-            } elseif ($var != null)
-                $url_args[] = "$key=" . urlencode(stripslashes($var));
+            }
+            elseif ($var != null) {
+                            $url_args[] = "$key=" . urlencode(stripslashes($var));
+            }
         }
 
         $page_url = WEBPATH . $DATA->page_metadata($this->destinationpage, "url");
 
         if (sizeof($url_args) == 0) {
             return $page_url;
-        } else {
+        }
+        else {
             if ($encode == "html") {
                 return $page_url . "?" . implode("&", $url_args);
-            } elseif ($encode == "none" || $encode == "url") {
+            }
+            elseif ($encode == "none" || $encode == "url") {
                 return $page_url . "?" . implode("&", $url_args);
             }
         }
@@ -218,7 +222,8 @@ 
 
         if ($html != "") {
             return $html . "\n";
-        } else {
+        }
+        else {
             return $html;
         }
 

www/includes/easyparliament/trackback.php

Spacing +19 added lines, -19 removed lines

@@ -51,7 +51,7 @@ 
     public function moderate_trackbacks() { return $this->moderate_trackbacks; }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is one of:
         //	'epobject_id' - display the pings for one epobject.
         // 	'recent' - to get the most recent pings to anywhere.
@@ -64,18 +64,18 @@ 
         if ($view == 'epobject_id' || $view == 'recent') {
 
             // What function do we call for this view?
-            $function = '_get_trackbacks_by_'.$view;
+            $function = '_get_trackbacks_by_' . $view;
             // Get all the data that's to be rendered.
             $trackbackdata = $this->$function($args);
 
         } else {
-            $PAGE->error_message ("You haven't specified a valid view type.");
+            $PAGE->error_message("You haven't specified a valid view type.");
             return false;
         }
 
-        $data = array (
+        $data = array(
             'data' 	=> $trackbackdata,
-            'info'	=> array (
+            'info'	=> array(
                 'view' => $view
             )
         );
@@ -86,7 +86,7 @@ 
         $this->render($view, $data, $format);
     }
 
-    public function render($view, $data, $format='html') {
+    public function render($view, $data, $format = 'html') {
 
         if ($format != 'html') {
             $format = 'html';
@@ -95,7 +95,7 @@ 
         // We currently only have one kind of trackback template, so
         // we're ignoring $view here I'm afraid...
 
-        include (INCLUDESPATH."easyparliament/templates/$format/trackbacks" . ".php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/trackbacks" . ".php");
 
     }
 
@@ -131,14 +131,14 @@ 
 
 
         // Still here? Then we're trackbacking to a valid hansard item.
-        $url 		= $trackbackdata['url'];
-        $source_ip	= $trackbackdata['source_ip'];
+        $url = $trackbackdata['url'];
+        $source_ip = $trackbackdata['source_ip'];
         // These all strip_tags too.
-        $title 		= trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
-        $excerpt 	= trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
-        $blog_name 	= trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
+        $title = trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
+        $excerpt = trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
+        $blog_name = trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
 
-        $visible 		= $this->moderate_trackbacks ? 0 : 1;
+        $visible = $this->moderate_trackbacks ? 0 : 1;
 
         $q = $this->db->query("INSERT INTO trackbacks
                         (epobject_id, blog_name, title, excerpt, url, source_ip, posted, visible)
@@ -198,8 +198,8 @@ 
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),
@@ -247,8 +247,8 @@ 
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),
@@ -277,13 +277,13 @@ 
             // This page just does XML.
 
             if ($error) {
-                echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+                echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
                 echo "<response>\n";
                 echo "<error>1</error>\n";
                 echo "<message>$error_message</message>\n";
                 echo "</response>";
             } else {
-                echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+                echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
                 echo "<response>\n";
                 echo "<error>0</error>\n";
                 echo "</response>";

Braces +12 added lines, -6 removed lines

@@ -42,7 +42,8 @@ 
         // Set in init.php
         if (ALLOWTRACKBACKS == true) {
             $this->trackbacks_enabled = true;
-        } else {
+        }
+        else {
             $this->trackbacks_enabled = false;
         }
     }
@@ -68,7 +69,8 @@ 
             // Get all the data that's to be rendered.
             $trackbackdata = $this->$function($args);
 
-        } else {
+        }
+        else {
             $PAGE->error_message ("You haven't specified a valid view type.");
             return false;
         }
@@ -157,7 +159,8 @@ 
             // Return a success message.
             $this->_trackback_response(0);
 
-        } else {
+        }
+        else {
             die ("Sorry, we could not save the trackback to the database. Please <a href=\"mailto:" . CONTACTEMAIL . "\">email us</a> to let us know. Thanks.");
         }
     }
@@ -282,7 +285,8 @@ 
                 echo "<error>1</error>\n";
                 echo "<message>$error_message</message>\n";
                 echo "</response>";
-            } else {
+            }
+            else {
                 echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
                 echo "<response>\n";
                 echo "<error>0</error>\n";
@@ -290,12 +294,14 @@ 
             }
             die();
 
-        } else {
+        }
+        else {
             // We're adding a trackback from a page that's probably expecting HTML.
 
             if ($error) {
                 $PAGE->error_message($error_message);
-            } else {
+            }
+            else {
                 print "<p>Trackback added successfully.</p>\n";
             }
         }

www/includes/easyparliament/glossarylist.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 class GLOSSARYLIST {
 
-    public function render($data, $format='html', $template='glossary') {
+    public function render($data, $format = 'html', $template = 'glossary') {
         // Once we have the data that's to be rendered,
         // include the template.
 
@@ -10,7 +10,7 @@ 
             $format = 'html';
         }
 
-        include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/$template.php");
 
     }
 

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

Braces +15 added lines, -7 removed lines

@@ -20,7 +20,9 @@ 
                     $desc = ucfirst(implode(' and ', $types));
                 ?>
                   <h2><?= $desc ?> in constituencies matching <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
-                <?php } else { // count($cons) <= 1 ?>
+                <?php }
+else {
+// count($cons) <= 1 ?>
                   <h2><?= $mp_types['former'] ? 'Former ' : '' ?>MP for <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
                 <?php } ?>
                 <?php foreach ( $cons as $member ) { ?>
@@ -50,15 +52,19 @@ 
 
               <?php if ( isset($error) ) { ?>
                 There was an error &ndash; <?= $error ?> &ndash; searching for <em class="current-search-term"><?= _htmlentities($searchstring) ?></em>.
-              <?php } else { ?>
+              <?php }
+else { ?>
                 <h2>
                   <?php if ( $pagination_links ) { ?>
                     Results <?= $pagination_links['first_result'] ?>&ndash;<?= $pagination_links['last_result'] ?> of <?= $info['total_results'] ?>
-                  <?php } else if ( $info['total_results'] == 1 ) { ?>
+                  <?php }
+else if ( $info['total_results'] == 1 ) { ?>
                     The only result
-                  <?php } else if ( $info['total_results'] == 0 ) { ?>
+                  <?php }
+else if ( $info['total_results'] == 0 ) { ?>
                     There were no results
-                  <?php } else { ?>
+                  <?php }
+else { ?>
                     All <?= $info['total_results'] ?> results
                   <?php } ?>
                     for <em class="current-search-term"><?= _htmlentities($searchdescription) ?></em>
@@ -73,10 +79,12 @@ 
                       <?php if ( $sort_order == 'relevance' ) { ?>
                         <li>Sorted by relevance</li>
                         <li>Sort by date: <a href="<?= $urls['newest'] ?>">newest</a> / <a href="<?= $urls['oldest'] ?>">oldest</a></li>
-                      <?php } else if ( $sort_order == 'oldest' ) { ?>
+                      <?php }
+else if ( $sort_order == 'oldest' ) { ?>
                         <li>Sort by <a href="<?= $urls['relevance'] ?>">relevance</a></li>
                         <li>Sorted by date: <a href="<?= $urls['newest'] ?>">newest</a> / oldest</li>
-                      <?php } else { ?>
+                      <?php }
+else { ?>
                         <li>Sort by <a href="<?= $urls['relevance'] ?>">relevance</a></li>
                         <li>Sorted by date: newest / <a href="<?= $urls['oldest'] ?>">oldest</a></li>
                       <?php } ?>

Indentation +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
         <div class="search-page__section search-page__section--results">
             <div class="search-page__section__primary">
               <?php
-              # XXX Hack
-              if (preg_match('#budget#', $searchstring)) { ?>
+                # XXX Hack
+                if (preg_match('#budget#', $searchstring)) { ?>
                 <h3 class="search-result__title"><a href="https://www.theyworkforyou.com/debates/?id=2017-11-22a.1045.3">Read the Budget speech and debate</a></h3>
               <?php } ?>
 

Spacing +25 added lines, -25 removed lines

@@ -1,11 +1,11 @@ 
 <div class="full-page">
-    <div class="full-page__row search-page <?php if ( !$searchstring ) { ?>search-page--blank<?php } ?>">
+    <div class="full-page__row search-page <?php if (!$searchstring) { ?>search-page--blank<?php } ?>">
 
         <form class="js-search-form-without-options">
             <?php include 'form_main.php'; ?>
         </form>
 
-      <?php if ( $searchstring && !isset($warnings) ) { ?>
+      <?php if ($searchstring && !isset($warnings)) { ?>
         <div class="search-page__section search-page__section--results">
             <div class="search-page__section__primary">
               <?php
@@ -14,13 +14,13 @@ 
                 <h3 class="search-result__title"><a href="https://www.theyworkforyou.com/debates/?id=2017-11-22a.1045.3">Read the Budget speech and debate</a></h3>
               <?php } ?>
 
-              <?php if ( $cons ) { ?>
-                <?php if ( count($cons) > 1 ) {
+              <?php if ($cons) { ?>
+                <?php if (count($cons) > 1) {
                     $types = array();
-                    if ( $mp_types['mp'] > 0 ) {
+                    if ($mp_types['mp'] > 0) {
                         $types[] = 'MPs';
                     }
-                    if ( $mp_types['former'] > 0 ) {
+                    if ($mp_types['former'] > 0) {
                         $types[] = 'former MPs';
                     }
                     $desc = ucfirst(implode(' and ', $types));
@@ -29,14 +29,14 @@ 
                 <?php } else { // count($cons) <= 1 ?>
                   <h2><?= $mp_types['former'] ? 'Former ' : '' ?>MP for <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
                 <?php } ?>
-                <?php foreach ( $cons as $member ) { ?>
+                <?php foreach ($cons as $member) { ?>
                   <?php include('person.php'); ?>
                 <?php } ?>
               <?php } ?>
 
-              <?php if ( $members ) { ?>
+              <?php if ($members) { ?>
                 <h2>People matching <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
-                <?php foreach ( $members as $member ) { ?>
+                <?php foreach ($members as $member) { ?>
                     <?php include('person.php'); ?>
                 <?php } ?>
                 <hr>
@@ -44,25 +44,25 @@ 
 
               <?php if ($glossary) { ?>
                 <h2>Glossary items matching <em class="current-search-term"><?= _htmlentities($searchstring) ?></em></h2>
-                <?php foreach ( $glossary as $item ) { ?>
+                <?php foreach ($glossary as $item) { ?>
                     <?php include('glossary.php'); ?>
                 <?php } ?>
                 <hr>
               <?php } ?>
 
-              <?php if ( isset($pid) && $wtt == 2 ) { ?>
+              <?php if (isset($pid) && $wtt == 2) { ?>
                 <p>I want to <a href="https://www.writetothem.com/lords/?pid=<?= $pid ?>">write to <?= $wtt_lord_name ?></a></p>
               <?php } ?>
 
-              <?php if ( isset($error) ) { ?>
+              <?php if (isset($error)) { ?>
                 There was an error &ndash; <?= $error ?> &ndash; searching for <em class="current-search-term"><?= _htmlentities($searchstring) ?></em>.
               <?php } else { ?>
                 <h2>
-                  <?php if ( $pagination_links ) { ?>
+                  <?php if ($pagination_links) { ?>
                     Results <?= $pagination_links['first_result'] ?>&ndash;<?= $pagination_links['last_result'] ?> of <?= $info['total_results'] ?>
-                  <?php } else if ( $info['total_results'] == 1 ) { ?>
+                  <?php } else if ($info['total_results'] == 1) { ?>
                     The only result
-                  <?php } else if ( $info['total_results'] == 0 ) { ?>
+                  <?php } else if ($info['total_results'] == 0) { ?>
                     There were no results
                   <?php } else { ?>
                     All <?= $info['total_results'] ?> results
@@ -70,16 +70,16 @@ 
                     for <em class="current-search-term"><?= _htmlentities($searchdescription) ?></em>
                 </h2>
 
-                  <?php if ( $info['spelling_correction'] ) { ?>
-                    <p>Did you mean <a href="/search/?q=<?= urlencode($info['spelling_correction']) ?>"><?= _htmlentities( $info['spelling_correction_display'] ) ?></a>?</p>
+                  <?php if ($info['spelling_correction']) { ?>
+                    <p>Did you mean <a href="/search/?q=<?= urlencode($info['spelling_correction']) ?>"><?= _htmlentities($info['spelling_correction_display']) ?></a>?</p>
                   <?php } ?>
 
-                  <?php if ( $info['total_results'] ) { ?>
+                  <?php if ($info['total_results']) { ?>
                     <ul class="search-result-display-options">
-                      <?php if ( $sort_order == 'relevance' ) { ?>
+                      <?php if ($sort_order == 'relevance') { ?>
                         <li>Sorted by relevance</li>
                         <li>Sort by date: <a href="<?= $urls['newest'] ?>">newest</a> / <a href="<?= $urls['oldest'] ?>">oldest</a></li>
-                      <?php } else if ( $sort_order == 'oldest' ) { ?>
+                      <?php } else if ($sort_order == 'oldest') { ?>
                         <li>Sort by <a href="<?= $urls['relevance'] ?>">relevance</a></li>
                         <li>Sorted by date: <a href="<?= $urls['newest'] ?>">newest</a> / oldest</li>
                       <?php } else { ?>
@@ -90,7 +90,7 @@ 
                     </ul>
                   <?php } ?>
 
-                  <?php foreach ( $rows as $result ) { ?>
+                  <?php foreach ($rows as $result) { ?>
                     <div class="search-result search-result--generic">
                         <h3 class="search-result__title"><a href="<?= $result['listurl'] ?>"><?= $result['parent']['body'] ?></a> (<?= format_date($result['hdate'], SHORTDATEFORMAT) ?>)</h3>
                         <p class="search-result__description"><?= isset($result['speaker']) ? $result['speaker']['name'] . ': ' : '' ?><?= $result['extract'] ?></p>
@@ -99,16 +99,16 @@ 
 
                 <hr>
 
-                  <?php if ( $pagination_links ) { ?>
+                  <?php if ($pagination_links) { ?>
                     <div class="search-result-pagination">
-                      <?php if ( isset($pagination_links['prev']) ) { ?>
+                      <?php if (isset($pagination_links['prev'])) { ?>
                         <a href="<?= $pagination_links['firstpage']['url'] ?>" title="First page">&lt;&lt;</a>
                         <a href="<?= $pagination_links['prev']['url'] ?>" title="Previous page">&lt;</a>
                       <?php } ?>
-                      <?php foreach ( $pagination_links['nums'] as $link ) { ?>
+                      <?php foreach ($pagination_links['nums'] as $link) { ?>
                         <a href="<?= $link['url'] ?>"<?= $link['current'] ? ' class="search-result-pagination__current-page"' : '' ?>><?= $link['page'] ?></a>
                       <?php } ?>
-                      <?php if ( isset($pagination_links['next']) ) { ?>
+                      <?php if (isset($pagination_links['next'])) { ?>
                         <a href="<?= $pagination_links['next']['url'] ?>" title="Next page">&gt;</a>
                         <a href="<?= $pagination_links['lastpage']['url'] ?>" title="Final page">&gt;&gt;</a>
                       <?php } ?>

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

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 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'])) {

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";