mysociety / theyworkforyou

www/includes/easyparliament/glossary.php

Spacing +24 added lines, -24 removed lines

@@ -27,16 +27,16 @@ 
 
 class GLOSSARY {
 
-    public $num_terms;			// how many glossary entries do we have
+    public $num_terms; // how many glossary entries do we have
                             // (changes depending on how GLOSSARY is called
-    public $hansard_count;		// how many times does the phrase appear in hansard?
-    public $query;				// search term
-    public $glossary_id;		// if this is set then we only have 1 glossary term
-    public $current_term;		// will only be set if we have a valid epobject_id
+    public $hansard_count; // how many times does the phrase appear in hansard?
+    public $query; // search term
+    public $glossary_id; // if this is set then we only have 1 glossary term
+    public $current_term; // will only be set if we have a valid epobject_id
     public $current_letter;
 
     // constructor...
-    public function __construct($args=array()) {
+    public function __construct($args = array()) {
     // We can optionally start the glossary with one of several arguments
     //		1. glossary_id - treat the glossary as a single term
     //		2. glossary_term - search within glossary for a term
@@ -75,16 +75,16 @@ 
 
             // These stop stupid submissions.
             // everything should be lowercase.
-            $this->stopwords = array( "the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate" );
+            $this->stopwords = array("the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate");
 
     }
 
-    public function get_glossary_item($args=array()) {
+    public function get_glossary_item($args = array()) {
         // Search for and fetch glossary item with title or glossary_id
         // We could also search glossary text that contains the title text, for cross references
 
         $this->alphabet = array();
-        foreach (range ("A", "Z") as $letter) {
+        foreach (range("A", "Z") as $letter) {
             $this->alphabet[$letter] = array();
         }
 
@@ -93,11 +93,11 @@ 
             WHERE g.glossary_id=eq.glossary_id AND u.user_id=eq.user_id AND g.visible=1 AND eq.approved=1
             ORDER by g.title");
         if ($q->success() && $q->rows()) {
-            for ($i=0; $i < $q->rows(); $i++) {
-                $this->terms[ $q->field($i,"glossary_id") ] = $q->row($i);
+            for ($i = 0; $i < $q->rows(); $i++) {
+                $this->terms[$q->field($i, "glossary_id")] = $q->row($i);
                 // Now add the epobject to the alphabet navigation.
-                $first_letter = strtoupper(substr($q->field($i,"title"),0,1));
-                $this->alphabet[$first_letter][] = $q->field($i,"glossary_id");
+                $first_letter = strtoupper(substr($q->field($i, "title"), 0, 1));
+                $this->alphabet[$first_letter][] = $q->field($i, "glossary_id");
             }
 
             $this->num_terms = $q->rows();
@@ -140,7 +140,7 @@ 
         }
     }
 
-    public function search_glossary($args=array()) {
+    public function search_glossary($args = array()) {
         // Search for and fetch glossary item with a title
         // Useful for the search page, and nowhere else (so far)
 
@@ -151,12 +151,12 @@ 
         $query = "SELECT g.glossary_id, g.title, g.body, u.user_id, u.firstname, u.lastname
             FROM editqueue AS eq, glossary AS g, users AS u
             WHERE g.glossary_id=eq.glossary_id AND u.user_id=eq.user_id AND g.visible=1
-                AND g.title LIKE '%" . $this->query . "%'
+                AND g.title LIKE '%" . $this->query."%'
             ORDER by g.title";
         $q = $this->db->query($query);
         if ($q->success() && $q->rows()) {
-            for ($i=0; $i < $q->rows(); $i++) {
-                $this->search_matches[ $q->field($i,"glossary_id") ] = $q->row($i);
+            for ($i = 0; $i < $q->rows(); $i++) {
+                $this->search_matches[$q->field($i, "glossary_id")] = $q->row($i);
             }
             $this->num_search_matches = $q->rows();
         }
@@ -192,12 +192,12 @@ 
         global $THEUSER;
 
         if ($data['title'] == '') {
-            error ("Sorry, you can't define a term without a title");
+            error("Sorry, you can't define a term without a title");
             return false;
         }
 
         if ($data['body'] == '') {
-            error ("You haven't entered a definition!");
+            error("You haven't entered a definition!");
             return false;
         }
 
@@ -209,7 +209,7 @@ 
 
             $q = $this->db->query("SELECT glossary_id
                             FROM	editqueue
-                            WHERE	user_id = '" . $THEUSER->user_id() . "'
+                            WHERE	user_id = '" . $THEUSER->user_id()."'
                             AND		submitted + 0 > NOW() - $flood_time_limit");
 
             if ($q->rows() > 0) {
@@ -250,7 +250,7 @@ 
         }
     }
 
-    public function glossarise($body, $tokenize=0, $urlize=0) {
+    public function glossarise($body, $tokenize = 0, $urlize = 0) {
     // Turn a body of text into a link-up wonderland of glossary joy
 
         global $this_page;
@@ -264,7 +264,7 @@ 
         // should be the complete and linked url.
         // NB. This should only match when $body is a definition beginning with "http:"
         if (is_string($body) && preg_match("/^(http:*[^\s])$/i", $body)) {
-            $body = "<a href=\"" . $body . "\" title=\"External link to " . $body . "\">" . $body . "</a>";
+            $body = "<a href=\"".$body."\" title=\"External link to ".$body."\">".$body."</a>";
             return ($body);
         }
 
@@ -286,7 +286,7 @@ 
 
             $URL->update(array("gl" => $glossary_id));
             # The regex here ensures that the phrase is only matched if it's not already within <a> tags, preventing double-linking. Kudos to http://stackoverflow.com/questions/7798829/php-regular-expression-to-match-keyword-outside-html-tag-a
-            $findwords[$glossary_id] = "/\b(" . $term_title . ")\b(?!(?>[^<]*(?:<(?!\/?a\b)[^<]*)*)<\/a>)/i";
+            $findwords[$glossary_id] = "/\b(".$term_title.")\b(?!(?>[^<]*(?:<(?!\/?a\b)[^<]*)*)<\/a>)/i";
             // catch glossary terms within their own definitions
             if ($glossary_id == $this->glossary_id) {
                 $replacewords[] = "<strong>\\1</strong>";
@@ -305,7 +305,7 @@ 
         // Highlight all occurrences of another glossary term in the definition.
         $body = preg_replace($findwords, $replacewords, $body, 1);
         if (isset($this->glossary_id))
-            $body = preg_replace("/(?<![>\.\'\/])\b(" . $this->terms[$this->glossary_id]['title'] . ")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
+            $body = preg_replace("/(?<![>\.\'\/])\b(".$this->terms[$this->glossary_id]['title'].")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
 
         // Replace any phrases in wikipedia
         // TODO: Merge this code into above, so our gloss and wikipedia

Braces +14 added lines, -15 removed lines

@@ -107,19 +107,19 @@ 
             if (isset($args['glossary_id']) && ($args['glossary_id'] != "")) {
                 $next = 0; $first_term = null;
                 foreach ($this->terms as $term) {
-                    if (!$first_term) $first_term = $term;
+                    if (!$first_term) {
+                        $first_term = $term;
+                    }
                     $last_term = $term;
                     if ($next == 1) {
                         $this->next_term = $term;
                         break;
-                    }
-                    elseif ($term['glossary_id'] == $args['glossary_id']) {
+                    } elseif ($term['glossary_id'] == $args['glossary_id']) {
                         $this->glossary_id = $args['glossary_id'];
                         $this->current_term = $term;
                         $next = 1;
 
-                    }
-                    else {
+                    } else {
                         $this->previous_term = $term;
                     }
                 }
@@ -134,8 +134,7 @@ 
             }
 
             return ($this->num_terms);
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -278,8 +277,9 @@ 
 
         // check for any glossary terms to replace
         foreach ($this->replace_order as $glossary_id => $count) {
-            if ($glossary_id == $this->glossary_id)
-                continue;
+            if ($glossary_id == $this->glossary_id) {
+                            continue;
+            }
 
             $term_body = $this->terms[$glossary_id]['body'];
             $term_title = $this->terms[$glossary_id]['title'];
@@ -290,12 +290,10 @@ 
             // catch glossary terms within their own definitions
             if ($glossary_id == $this->glossary_id) {
                 $replacewords[] = "<strong>\\1</strong>";
-            }
-            else {
+            } else {
                 if ($this_page == "admin_glossary") {
                     $link_url = "#gl".$glossary_id;
-                }
-                else {
+                } else {
                     $link_url = $URL->generate('url');
                 }
                 $title = _htmlentities(trim_characters($term_body, 0, 80));
@@ -304,8 +302,9 @@ 
         }
         // Highlight all occurrences of another glossary term in the definition.
         $body = preg_replace($findwords, $replacewords, $body, 1);
-        if (isset($this->glossary_id))
-            $body = preg_replace("/(?<![>\.\'\/])\b(" . $this->terms[$this->glossary_id]['title'] . ")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
+        if (isset($this->glossary_id)) {
+                    $body = preg_replace("/(?<![>\.\'\/])\b(" . $this->terms[$this->glossary_id]['title'] . ")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
+        }
 
         // Replace any phrases in wikipedia
         // TODO: Merge this code into above, so our gloss and wikipedia

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

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 twfy_debug("TEMPLATE", "rss/hansard_search.php");
 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         $hdate = format_date($row['hdate'], 'D, d M Y');
@@ -37,16 +37,16 @@ 
         if (isset($row['parent']) && count($row['parent']) > 0) {
             echo strip_tags($row['parent']['body']);
         }
-        echo (' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ')');
+        echo (' ('.format_date($row['hdate'], SHORTDATEFORMAT).')');
 ?></title>
 <link>https://www.theyworkforyou.com<?=$row['listurl'] ?></link>
 <pubDate><?=$date ?></pubDate>
 <description><?php
         if (isset($row['speaker']) && count($row['speaker'])) {
             $name = ucfirst($row['speaker']['name']);
-            echo entities_to_numbers($name) . ': ';
+            echo entities_to_numbers($name).': ';
         }
-        echo _htmlspecialchars(str_replace(array('&#8212;', '<span class="hi">', '</span>'), array('-', '<b>', '</b>'), $row['extract'])) . "</description>\n</item>\n";
+        echo _htmlspecialchars(str_replace(array('&#8212;', '<span class="hi">', '</span>'), array('-', '<b>', '</b>'), $row['extract']))."</description>\n</item>\n";
     }
 }
 ?>

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         $row = $data['rows'][$i];
 
         $hdate = format_date($row['hdate'], 'D, d M Y');
-        if (isset($row['htime']) && $row['htime'] != NULL) {
+        if (isset($row['htime']) && $row['htime'] != null) {
             $htime = format_time($row['htime'], 'H:i:s');
         } else {
             $htime = '00:00:00';

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

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
             <p><?= $error ?></p>
 
-        <?php if ( $rep_search_url ) { ?>
+        <?php if ($rep_search_url) { ?>
         </div>
 
         <div class="full-page__unit">

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

Indentation +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
                               <?php foreach ($segment['votes']->positions as $key_vote) {
 
                                 if (isset($policy_last_update[$key_vote['policy_id']]) && $policy_last_update[$key_vote['policy_id']] > $most_recent) {
-                                  $most_recent = $policy_last_update[$key_vote['policy_id']];
+                                    $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
@@ -81,7 +81,7 @@ 
 
                                 include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-include_once INCLUDESPATH . "easyparliament/templates/html/mp/header.php";
+include_once INCLUDESPATH."easyparliament/templates/html/mp/header.php";
 ?>
 
 <div class="full-page">
@@ -63,7 +63,7 @@ 
                                   $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
-                                if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+                                if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
                                     $description = ucfirst($key_vote['desc']);
                                 } else {
                                     $description = sprintf(
@@ -87,7 +87,7 @@ 
                             <div class="share-vote-descriptions">
                                 <p>Share a screenshot of these votes:</p>
 
-                                <a href="#" class="fb-share-button-tracked" data-title="<?= $single_policy_page ? '' : $segment['title'] . ' ' ?><?= $page_title ?>" data-href="<?= $abs_member_url ?>/votes?policy=<?= $segment['key'] ?>" data-image="<?= $abs_member_url ?>/policy_set_png?policy_set=<?= $segment['key'] ?>" "See how <?= $full_name ?> voted on <?= $segment["title"] ?>">Share</a>
+                                <a href="#" class="fb-share-button-tracked" data-title="<?= $single_policy_page ? '' : $segment['title'].' ' ?><?= $page_title ?>" data-href="<?= $abs_member_url ?>/votes?policy=<?= $segment['key'] ?>" data-image="<?= $abs_member_url ?>/policy_set_png?policy_set=<?= $segment['key'] ?>" "See how <?= $full_name ?> voted on <?= $segment["title"] ?>">Share</a>
 
                                 <a class="twitter-share-button" href="https://twitter.com/share" data-size="small" data-url="<?= $abs_member_url ?>/votes?policy=<?= $segment['key'] ?>">Tweet</a>
                                 </div>

Braces +5 added lines, -2 removed lines

@@ -110,13 +110,16 @@
 
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <div class="panel">
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
                         </div>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 <?php endif; ?>
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 
                 <?php if ($has_voting_record): ?>
 
-                    <?php $displayed_votes = FALSE; ?>
+                    <?php $displayed_votes = false; ?>
 
                     <?php foreach ($key_votes_segments as $segment): ?>
 
@@ -94,7 +94,7 @@ 
                                 <small>Last updated: <?= format_date($most_recent, LONGDATEFORMAT) ?></small>
                             </div>
 
-                            <?php $displayed_votes = TRUE; ?>
+                            <?php $displayed_votes = true; ?>
 
                         <?php endif; ?>
 

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

Indentation +4 added lines, -4 removed lines

@@ -38,11 +38,11 @@ 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                            $displayed_votes = TRUE;
 
-                          if ($current_date != $division['date']) {
+                            if ($current_date != $division['date']) {
                             if ($current_date != '' ) {
-                              print('</ul></div>');
+                                print('</ul></div>');
                             }
                             $current_date = $division['date'];
                             $sidebar_links[] = $division['date'];
@@ -51,7 +51,7 @@ 
                             <h2><?= strftime('%e %b %Y', strtotime($division['date'])) ?></h2>
                              <ul class="vote-descriptions policy-votes">
                           <?php }
-                          include('_division_description.php');
+                            include('_division_description.php');
                         }
                         echo('</div>');
                     }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-include_once INCLUDESPATH . "easyparliament/templates/html/mp/header.php";
+include_once INCLUDESPATH."easyparliament/templates/html/mp/header.php";
 ?>
 
 <div class="full-page">
@@ -35,13 +35,13 @@ 
                 $current_date = '';
                 $sidebar_links = array();
 
-                if ( isset($divisions) && $divisions ) {
+                if (isset($divisions) && $divisions) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
                           $displayed_votes = TRUE;
 
                           if ($current_date != $division['date']) {
-                            if ($current_date != '' ) {
+                            if ($current_date != '') {
                               print('</ul></div>');
                             }
                             $current_date = $division['date'];
@@ -67,7 +67,7 @@ 
 
             <div class="sidebar__unit in-page-nav">
                 <ul data-magellan-expedition="fixed">
-                  <?php foreach($sidebar_links as $date) { ?>
+                  <?php foreach ($sidebar_links as $date) { ?>
                     <li data-magellan-arrival="<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                         <a href="#<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                             <?= strftime('%e %b %Y', strtotime($date)) ?>

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
 
                 <?php
 
-                $displayed_votes = FALSE;
-                $show_all = TRUE;
+                $displayed_votes = false;
+                $show_all = true;
                 $current_date = '';
                 $sidebar_links = array();
 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                          $displayed_votes = true;
 
                           if ($current_date != $division['date']) {
                             if ($current_date != '' ) {

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

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-include_once INCLUDESPATH . "easyparliament/templates/html/mp/header.php";
+include_once INCLUDESPATH."easyparliament/templates/html/mp/header.php";
 ?>
 
 <div class="full-page">
@@ -15,7 +15,7 @@ 
         </div>
         <div class="person-panels">
             <div class="sidebar__unit in-page-nav">
-                <?php if ( isset($policydivisions) && $policydivisions && count($policydivisions) == 1 ) { ?>
+                <?php if (isset($policydivisions) && $policydivisions && count($policydivisions) == 1) { ?>
                 <p class="policy-votes-intro">
                     How <?= $full_name ?> voted on <?= $policydivisions[array_keys($policydivisions)[0]]['desc'] ?>.
                 </p>
@@ -34,17 +34,17 @@ 
                 <?php endif; ?>
 
                 <?php $displayed_votes = FALSE; ?>
-                <?php if ( isset($policydivisions) && $policydivisions ) { ?>
+                <?php if (isset($policydivisions) && $policydivisions) { ?>
 
                     <?php if ($has_voting_record) { ?>
 
                         <?php foreach ($policydivisions as $policy) { ?>
 
-                            <?php if ( isset($policy['header']) ) { ?>
+                            <?php if (isset($policy['header'])) { ?>
                                 <div class="panel policy-votes-hero" style="background-image: url('<?php echo $policy['header']['image']; ?>');">
                                     <h2><?php echo $policy['header']['title']; ?></h2>
                                     <p><?php echo $policy['header']['description']; ?>.</p>
-                                    <?php if ( $policy['header']['image_source'] ) { ?>
+                                    <?php if ($policy['header']['image_source']) { ?>
                                     <span class="policy-votes-hero__image-attribution">
                                         Photo:
                                         <a href="<?php echo $policy['header']['image_source']; ?>">
@@ -59,14 +59,14 @@ 
                             <?php } ?>
 
 
-                            <?php if ( isset($policy['position']) ) { ?>
+                            <?php if (isset($policy['position'])) { ?>
                                 <div class="panel">
-                                    <?php if ( $policy['position']['has_strong'] ) { ?>
+                                    <?php if ($policy['position']['has_strong']) { ?>
                                         <h3 class="policy-vote-overall-stance">
-                                            <?= $full_name . ' ' . $policy['position']['desc'] ?>
+                                            <?= $full_name.' '.$policy['position']['desc'] ?>
                                         </h3>
 
-                                        <?php $pw_url = 'http://www.publicwhip.org.uk/mp.php?mpid=' . $member_id . '&amp;dmp=' . $policy['policy_id']; ?>
+                                        <?php $pw_url = 'http://www.publicwhip.org.uk/mp.php?mpid='.$member_id.'&amp;dmp='.$policy['policy_id']; ?>
                                         <p>
                                             TheyWorkForYou has automatically calculated this MP&rsquo;s stance based on all
                                             of their votes on the topic. <a href="<?= $pw_url ?>">You can browse the source
@@ -87,7 +87,7 @@ 
                                     <ul class="vote-descriptions policy-votes">
                                     <?php
                                         $show_all = FALSE;
-                                        if ( $policy['weak_count'] == 0 || $policy['weak_count'] == count($policy['divisions']) ) {
+                                        if ($policy['weak_count'] == 0 || $policy['weak_count'] == count($policy['divisions'])) {
                                             $show_all = TRUE;
                                         }
                                     ?>
@@ -99,14 +99,14 @@ 
 
                                     <div class="policy-votes-list-footer">
                                     <p class="policy-votes__byline">Vote information from <a href="http://www.publicwhip.org.uk/mp.php?mpid=<?= $member_id ?>&dmp=<?= $policy['policy_id'] ?>">PublicWhip</a>. Last updated: <?= $policy_last_update[$policy['policy_id']] ?></p>
-                                        <?php if ( !$show_all && $policy['weak_count'] > 0 ) { ?>
+                                        <?php if (!$show_all && $policy['weak_count'] > 0) { ?>
                                         <p><button class="button secondary-button small js-show-all-votes">Show all votes, including <?= $policy['weak_count'] ?> less important <?= $policy['weak_count'] == 1 ? 'vote' : 'votes' ?></button></p>
                                         <?php } ?>
                                     </div>
 
                                     <script type="text/javascript">
                                     $(function(){
-                                        <?php if ( !$show_all ) { ?>
+                                        <?php if (!$show_all) { ?>
                                         $('#policy-votes-type').text('Key');
                                         <?php } ?>
                                         $('.js-show-all-votes').on('click', function(){

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
                 </div>
                 <?php endif; ?>
 
-                <?php $displayed_votes = FALSE; ?>
+                <?php $displayed_votes = false; ?>
                 <?php if ( isset($policydivisions) && $policydivisions ) { ?>
 
                     <?php if ($has_voting_record) { ?>
@@ -86,14 +86,14 @@ 
 
                                     <ul class="vote-descriptions policy-votes">
                                     <?php
-                                        $show_all = FALSE;
+                                        $show_all = false;
                                         if ( $policy['weak_count'] == 0 || $policy['weak_count'] == count($policy['divisions']) ) {
-                                            $show_all = TRUE;
+                                            $show_all = true;
                                         }
                                     ?>
                                     <?php foreach ($policy['divisions'] as $division) {
                                         include('_division_description.php');
-                                        $displayed_votes = TRUE;
+                                        $displayed_votes = true;
                                     } ?>
                                     </ul>
 

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

Indentation +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -119,7 +119,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -148,7 +148,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-include_once INCLUDESPATH . "easyparliament/templates/html/mp/header.php";
+include_once INCLUDESPATH."easyparliament/templates/html/mp/header.php";
 
 // if this is set to a year for which we have WTT responsiveness stats then
 // it'll display a banner with the MPs stats, assuming we have them for the
@@ -58,7 +58,7 @@ 
                 </div>
               <?php endif; ?>
 
-                <?php if ( !$current_member[HOUSE_TYPE_COMMONS] ) { ?>
+                <?php if (!$current_member[HOUSE_TYPE_COMMONS]) { ?>
                     <?php if (count($policyPositions->positions) > 0) { ?>
                     <div class="panel">
                         <a name="votes"></a>
@@ -114,7 +114,7 @@ 
                                 $party,
                                 $party_positions[$policy_id]['position']
                             );
-                            $link = $member_url . '/divisions?policy=' . $policy_id;
+                            $link = $member_url.'/divisions?policy='.$policy_id;
                             $show_link = true;
 
                             include '_vote_description.php';
@@ -124,7 +124,7 @@ 
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
 
-                    <?php elseif (count($policyPositions->positions) > 0 ): ?>
+                    <?php elseif (count($policyPositions->positions) > 0): ?>
                         <?php if (count($party_positions) && $party_member_count > 1) { ?>
                         <p>
                         <?= $full_name ?> is a <?= $party ?> MP, and on the <b>vast majority</b> of issues votes the <b>same way</b> as other <?= $party ?> MPs.
@@ -152,7 +152,7 @@ 
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
-                    <?php elseif (count($policyPositions->positions) == 0 ): ?>
+                    <?php elseif (count($policyPositions->positions) == 0): ?>
 
                         <p>No votes to display.</p>
 

Braces +5 added lines, -2 removed lines

@@ -190,11 +190,14 @@
                         <?= $recent_appearances['additional_links'] ?>
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <p>No recent appearances to display.</p>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 </div>
                 <?php endif; ?>

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
                         <ul class="vote-descriptions">
                           <?php foreach ($sorted_diffs as $policy_id => $score) {
 
-                            $key_vote = NULL;
+                            $key_vote = null;
                             $description = sprintf(
                                 '%s <b>%s</b> %s, while most %s MPs <b>%s</b>.',
                                 $full_name,

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

Spacing +8 added lines, -8 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>
@@ -58,7 +58,7 @@ 
                                     echo "?person=uk.org.publicwhip/person/$person_id";
                                 }
                                 if ($the_users_mp) {
-                                    echo "?a=WMC&amp;pc=" . _htmlentities(urlencode($user_postcode));
+                                    echo "?a=WMC&amp;pc="._htmlentities(urlencode($user_postcode));
                                 }
                             ?>" class="button wtt" onclick="trackLinkClick(this, 'Links', 'WriteToThem', 'Person'); return false;"><img src="/style/img/envelope.png">Send a message</a>
 

Braces +5 added lines, -2 removed lines

@@ -27,7 +27,8 @@ 
                                   <?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 +37,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/mp/_vote_description.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <li>
     <?= $description ?>
-    <?php if ( $show_link ) { ?>
+    <?php if ($show_link) { ?>
         <a class="vote-description__source" href="<?= $link ?>">Show votes</a>
         <?php if (isset($key_vote)) { ?>
         <a class="vote-description__evidence" href="<?= $link ?>"><?= $key_vote['summary'] ?></a>