mysociety / theyworkforyou

www/includes/easyparliament/page.php

Braces +15 added lines, -13 removed lines

@@ -114,7 +114,10 @@ 
         //  'foot' - For the bottom stripe on hansard debates/wrans listings.
         // $id is the value of an id for this div (if blank, not used).
         ?>
-        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') echo ' ' . $extra_class; ?>"<?php
+        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') {
+    echo ' ' . $extra_class;
+}
+?>"<?php
         if ($id != '') {
             print ' id="' . $id . '"';
         }
@@ -479,7 +482,9 @@ 
 
         global $DATA, $this_page;
 
-        if ($this->page_started()) return;
+        if ($this->page_started()) {
+            return;
+        }
         // The page's HTML hasn't been started yet, so we'd better do it.
 
         // Set the page title (in the <title></title>).
@@ -629,7 +634,9 @@ 
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
                 echo '<br>';
-                if ($wtt) print '<input type="hidden" name="wtt" value="1">';
+                if ($wtt) {
+                    print '<input type="hidden" name="wtt" value="1">';
+                }
         } else { ?>
     <form action="http://www.writetothem.com/lords" method="get">
     <input type="hidden" name="pid" value="<?=_htmlentities(get_http_var('pid')) ?>">
@@ -743,8 +750,7 @@ 
             // The return url for after the user has logged in.
             if (get_http_var("ret") != "") {
                 $returl = get_http_var("ret");
-            }
-            else {
+            } else {
                 $returl = $glossary_returl;
             }
             ?>
@@ -808,15 +814,13 @@ 
                 else {
                     $letters[] = "<li class=\"on\">" . $letter . "</li>";
                 }
-            }
-            elseif (!empty($GLOSSARY->alphabet[$letter])) {
+            } elseif (!empty($GLOSSARY->alphabet[$letter])) {
                 $URL = new \MySociety\TheyWorkForYou\Url('glossary');
                 $URL->insert(array('az' => $letter));
                 $letter_link = $URL->generate('url');
 
                 $letters[] = "<li><a href=\"" . $letter_link . "\">" . $letter . "</a></li>";
-            }
-            else {
+            } else {
                 $letters[] = '<li>' . $letter . '</li>';
             }
         }
@@ -856,8 +860,7 @@ 
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
             $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
-        }
-        else {
+        } else {
             $admin_links = "";
         }
 
@@ -867,8 +870,7 @@ 
             $user_link = $URL->generate('url');
 
             $user_details = "\t\t\t\t<p><small>contributed by user <a href=\"" . $user_link . "\">" . $term['firstname'] . " " . $term['lastname'] . "</a></small>" . $admin_links . "</p>\n";
-        }
-        else {
+        } else {
             $user_details = "";
         }
 

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

Braces +6 added lines, -3 removed lines

@@ -18,10 +18,13 @@
 # Content goes here
 foreach ($data['dates'] as $date => $day_events) {
     foreach ($order as $i => $chamber) {
-        if (!array_key_exists($chamber, $day_events))
-            continue;
+        if (!array_key_exists($chamber, $day_events)) {
+                    continue;
+        }
         $events = $day_events[$chamber];
-        if ($plural[$i]) $chamber .= 's';
+        if ($plural[$i]) {
+            $chamber .= 's';
+        }
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);

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

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
     ?>
                         <ul>
@@ -50,7 +52,9 @@ 
                         <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
 <?php
     }
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $PAGE->block_end();
 }
 ?>

www/docs/api/api_getPerson.php

Braces +18 added lines, -9 removed lines

@@ -28,8 +28,9 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url('mp');
         $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
-    if ($has_party && isset($parties[$row['party']]))
-        $row['party'] = $parties[$row['party']];
+    if ($has_party && isset($parties[$row['party']])) {
+            $row['party'] = $parties[$row['party']];
+    }
     list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
@@ -49,7 +50,9 @@ 
     }
 
     foreach ($row as $k => $r) {
-        if (is_string($r)) $row[$k] = html_entity_decode($r);
+        if (is_string($r)) {
+            $row[$k] = html_entity_decode($r);
+        }
     }
 
     return $row;
@@ -85,8 +88,9 @@ 
         $out = _api_getPerson_row($q->row($i), $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
         $time = strtotime($q->field($i, 'lastupdate'));
-        if ($time > $last_mod)
-            $last_mod = $time;
+        if ($time > $last_mod) {
+                    $last_mod = $time;
+        }
     }
     # Only one MP, not an array
     if ($flatten && count($output) == 1 && $house == HOUSE_TYPE_COMMONS) {
@@ -134,13 +138,18 @@ 
 
     $cons = array();
     foreach ($constituencies as $constituency) {
-        if ($constituency == '') continue;
-        if ($constituency == 'Orkney ')
-            $constituency = 'Orkney & Shetland';
+        if ($constituency == '') {
+            continue;
+        }
+        if ($constituency == 'Orkney ') {
+                    $constituency = 'Orkney & Shetland';
+        }
 
         if ($house == HOUSE_TYPE_COMMONS) {
             $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-            if ($normalised) $constituency = $normalised;
+            if ($normalised) {
+                $constituency = $normalised;
+            }
         }
 
         $cons[] = $constituency;

classes/Db/Query.php

Braces +9 added lines, -5 removed lines

@@ -130,7 +130,9 @@ 
             $this->error($this->conn->errorCode() . ': ' . $this->conn->errorInfo()[2]);
         }
 
-        if (!$this->success) return;
+        if (!$this->success) {
+            return;
+        }
 
         if ((!$pdoStatement) or (empty($pdoStatement))) {
             // A failed query.
@@ -180,8 +182,9 @@ 
      * @param string $column_name
      */
     public function field($row_index, $column_name) {
-        if ($this->rows > 0)
-            return $this->data[$row_index][$column_name];
+        if ($this->rows > 0) {
+                    return $this->data[$row_index][$column_name];
+        }
         return "";
     }
 
@@ -196,8 +199,9 @@ 
      * @param integer $row_index
      */
     public function row($row_index) {
-        if ($this->success && $this->rows > 0)
-            return $this->data[$row_index];
+        if ($this->success && $this->rows > 0) {
+                    return $this->data[$row_index];
+        }
         return array();
     }
 

www/includes/easyparliament/hansardlist.php

Braces +70 added lines, -37 removed lines

@@ -138,8 +138,9 @@ 
 
         global $PAGE;
 
-        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH))
-            return false;
+        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH)) {
+                    return false;
+        }
 
         $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'search_min', 'search_video', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid');
         if (in_array($view, $validviews)) {
@@ -326,10 +327,11 @@ 
             );
 
             $subsectiondata = $this->_get_hansard_data($input);
-            if (count($subsectiondata) == 0)
-                $subsectiondata = null;
-            else
-                $subsectiondata = $subsectiondata[0];
+            if (count($subsectiondata) == 0) {
+                            $subsectiondata = null;
+            } else {
+                            $subsectiondata = $subsectiondata[0];
+            }
 
         } elseif ($itemdata['htype'] == '11') {
             // It's a subsection, so use the item itself.
@@ -1018,12 +1020,12 @@ 
         // Mainly for glossary term adding
         if (isset($args['num']) && $args['num']) {
             $results_per_page = $args['num']+0;
-        }
-        else {
+        } else {
             $results_per_page = 20;
         }
-        if ($results_per_page > 1000)
-            $results_per_page = 1000;
+        if ($results_per_page > 1000) {
+                    $results_per_page = 1000;
+        }
 
         $data['info']['results_per_page'] = $results_per_page;
 
@@ -1051,10 +1053,16 @@ 
         // Get the gids from Xapian
         $sort_order = 'date';
         if (isset($args['o'])) {
-            if ($args['o']=='d') $sort_order = 'newest';
-            if ($args['o']=='o') $sort_order = 'oldest';
-            elseif ($args['o']=='c') $sort_order = 'created';
-            elseif ($args['o']=='r') $sort_order = 'relevance';
+            if ($args['o']=='d') {
+                $sort_order = 'newest';
+            }
+            if ($args['o']=='o') {
+                $sort_order = 'oldest';
+            } elseif ($args['o']=='c') {
+                $sort_order = 'created';
+            } elseif ($args['o']=='r') {
+                $sort_order = 'relevance';
+            }
         }
 
         $data['searchdescription'] = $SEARCHENGINE->query_description_long();
@@ -1114,7 +1122,9 @@ 
                     FROM future
                     LEFT JOIN future_people ON id=calendar_id AND witness=0
                     WHERE id = $id AND deleted=0");
-                if ($q->rows() == 0) continue;
+                if ($q->rows() == 0) {
+                    continue;
+                }
 
                 $itemdata = $q->row(0);
 
@@ -1123,8 +1133,9 @@ 
                     in_array($itemdata['chamber'], array(
                         'Commons: Main Chamber', 'Lords: Main Chamber',
                         'Commons: Westminster Hall',
-                    )))
-                        continue;
+                    ))) {
+                                        continue;
+                }
 
                 list($cal_item, $cal_meta) = \MySociety\TheyWorkForYou\Utility\Calendar::meta($itemdata);
                 $body = $this->prepare_search_result_for_display($cal_item) . '.';
@@ -1237,10 +1248,17 @@ 
                     $section = $this->_get_section($itemdata);
                     $subsection = $this->_get_subsection($itemdata);
                     $body = $hansardmajors[$itemdata['major']]['title'] . ' — ';
-                    if (isset($section['body'])) $body .= $section['body'];
-                    if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
-                    if (isset($subsection['listurl'])) $listurl = $subsection['listurl'];
-                    else $listurl = '';
+                    if (isset($section['body'])) {
+                        $body .= $section['body'];
+                    }
+                    if (isset($subsection['body'])) {
+                        $body .= ': ' . $subsection['body'];
+                    }
+                    if (isset($subsection['listurl'])) {
+                        $listurl = $subsection['listurl'];
+                    } else {
+                        $listurl = '';
+                    }
                     $itemdata['parent'] = array (
                         'body' => $body,
                         'listurl' => $listurl
@@ -1565,7 +1583,8 @@ 
                     'url' => $YEARURL->generate()
                 );
 
-            } else { // action is 'year'.
+            } else {
+// action is 'year'.
 
                 $nextprev['prev'] = array ('body' => 'Previous year');
                 $nextprev['next'] = array ('body' => 'Next year');
@@ -1980,10 +1999,11 @@ 
         // );
 
         // $url_args is an array of other key/value pairs to be appended in the GET string.
-        if ($id_data['major'])
-            $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
-        else
-            $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        if ($id_data['major']) {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
+        } else {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        }
 
         $fragment = '';
 
@@ -2633,7 +2653,9 @@ 
             array(':gid_from_spid' => 'uk.org.publicwhip/spq/' . $fixed_spid)
         );
         $gid = $q->field(0, 'mentioned_gid');
-        if ($gid) return $gid;
+        if ($gid) {
+            return $gid;
+        }
         return null;
     }
     public function old_get_gid_from_spid($spid) {
@@ -2642,7 +2664,9 @@ 
             array(':gid_like' => 'uk.org.publicwhip/spwa/%.' . $spid . '.h')
         );
         $gid = $q->field(0, 'gid');
-        if ($gid) return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        if ($gid) {
+            return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        }
         return null;
     }
 }
@@ -2928,7 +2952,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday)) return $data;
+        if (!count($recentday)) {
+            return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3055,8 +3081,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return array();
+        if (!count($recentday)) {
+                    return array();
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3189,8 +3216,9 @@ 
 
         // Get the most recent day on which we have wrans.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return $data;
+        if (!count($recentday)) {
+                    return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3470,7 +3498,9 @@ 
     }
 
     public function _get_data_by_recent_pbc_debates($args) {
-        if (!isset($args['num'])) $args['num'] = 20;
+        if (!isset($args['num'])) {
+            $args['num'] = 20;
+        }
         $q = $this->db->query('select gid, minor, hdate from hansard
             where htype=10 and major=6
             order by hdate desc limit ' . $args['num']);
@@ -3484,7 +3514,9 @@ 
             $session = $qq->field(0, 'session');
             list($sitting, $part) = $this->_get_sitting($gid);
             $sitting_txt = make_ranking($sitting) . ' sitting';
-            if ($part>0) $sitting .= ", part $part";
+            if ($part>0) {
+                $sitting .= ", part $part";
+            }
             $data[$hdate][] = array(
                 'bill'=> $title,
                 'sitting' => $sitting_txt,
@@ -3496,8 +3528,9 @@ 
 
     # Given a GID, parse out the sitting number and optional part from it
     public function _get_sitting($gid) {
-        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m))
-            return array($m[1]+0, $m[2]);
+        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m)) {
+                    return array($m[1]+0, $m[2]);
+        }
         return array(0, 0);
     }
 }

www/docs/mp/index.php

Braces +145 added lines, -64 removed lines

@@ -62,16 +62,36 @@ 
 $constituency = strtolower(str_replace('_', ' ', get_http_var('c')));
 
 // Fix for names with non-ASCII characters
-if ($name == 'sion simon') $name = 'si\xf4n simon';
-if ($name == 'sian james') $name = 'si\xe2n james';
-if ($name == 'lembit opik') $name = 'lembit \xf6pik';
-if ($name == 'bairbre de brun') $name = 'bairbre de br\xfan';
-if ($name == 'daithi mckay') $name = 'daith\xed mckay';
-if ($name == 'caral ni chuilin') $name = 'car\xe1l n\xed chuil\xedn';
-if ($name == 'caledon du pre') $name = 'caledon du pr\xe9';
-if ($name == 'sean etchingham') $name = 'se\xe1n etchingham';
-if ($name == 'john tinne') $name = 'john tinn\xe9';
-if ($name == 'renee short') $name = 'ren\xe9e short';
+if ($name == 'sion simon') {
+    $name = 'si\xf4n simon';
+}
+if ($name == 'sian james') {
+    $name = 'si\xe2n james';
+}
+if ($name == 'lembit opik') {
+    $name = 'lembit \xf6pik';
+}
+if ($name == 'bairbre de brun') {
+    $name = 'bairbre de br\xfan';
+}
+if ($name == 'daithi mckay') {
+    $name = 'daith\xed mckay';
+}
+if ($name == 'caral ni chuilin') {
+    $name = 'car\xe1l n\xed chuil\xedn';
+}
+if ($name == 'caledon du pre') {
+    $name = 'caledon du pr\xe9';
+}
+if ($name == 'sean etchingham') {
+    $name = 'se\xe1n etchingham';
+}
+if ($name == 'john tinne') {
+    $name = 'john tinn\xe9';
+}
+if ($name == 'renee short') {
+    $name = 'ren\xe9e short';
+}
 
 // Fix for common misspellings, name changes etc
 $name_fix = array(
@@ -103,7 +123,9 @@ 
 }
 
 // Fixes for Ynys Mon, and a Unicode URL
-if ($constituency == 'ynys mon') $constituency = "ynys m\xf4n";
+if ($constituency == 'ynys mon') {
+    $constituency = "ynys m\xf4n";
+}
 if (preg_match("#^ynys m\xc3\xb4n#i", $constituency)) {
     $constituency = "ynys m\xf4n";
 }
@@ -126,11 +148,17 @@ 
 
 /////////////////////////////////////////////////////////
 // DETERMINE TYPE OF REPRESENTITIVE
-if (get_http_var('peer')) $this_page = 'peer';
-elseif (get_http_var('royal')) $this_page = 'royal';
-elseif (get_http_var('mla')) $this_page = 'mla';
-elseif (get_http_var('msp')) $this_page = 'msp';
-else $this_page = 'mp';
+if (get_http_var('peer')) {
+    $this_page = 'peer';
+} elseif (get_http_var('royal')) {
+    $this_page = 'royal';
+} elseif (get_http_var('mla')) {
+    $this_page = 'mla';
+} elseif (get_http_var('msp')) {
+    $this_page = 'msp';
+} else {
+    $this_page = 'mp';
+}
 
 try {
     if (is_numeric($pid)) {
@@ -179,8 +207,9 @@ 
 $desc = "Read $member_name's contributions to Parliament, including speeches and questions";
 
 // Enhance description if this is a current member
-if ($MEMBER->current_member_anywhere())
+if ($MEMBER->current_member_anywhere()) {
     $desc .= ', investigate their voting record, and get email alerts on their activity';
+}
 
 // Enhance title if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
@@ -188,8 +217,10 @@ 
         $title .= ', former';
     }
     $title .= ' MP';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
@@ -202,8 +233,10 @@ 
         $title .= ', former';
     }
     $title .= ' MLA';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of Scottish Parliament
 if ($MEMBER->house(HOUSE_TYPE_SCOTLAND)) {
@@ -224,14 +257,18 @@ 
 // Position if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_COMMONS) ? 'MP' : 'Former MP';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
 // Position if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_NI) ? 'MLA' : 'Former MLA';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
@@ -265,8 +302,9 @@ 
 
 // Build the RSS link and add it to page data.
 $feedurl = $DATA->page_metadata('mp_rss', 'url') . $MEMBER->person_id() . '.rdf';
-if (file_exists(BASEDIR . '/' . $feedurl))
+if (file_exists(BASEDIR . '/' . $feedurl)) {
     $DATA->set_page_metadata($this_page, 'rss', $feedurl);
+}
 
 // Prepare data for the template
 $data['full_name'] = $MEMBER->full_name();
@@ -692,11 +730,13 @@ 
         $url = $MEMBER->url();
         $params = array();
         foreach ($_GET as $key => $value) {
-            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid')
-                $params[] = "$key=$value";
+            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid') {
+                            $params[] = "$key=$value";
+            }
+        }
+        if (count($params)) {
+                    $url .= '?' . join('&', $params);
         }
-        if (count($params))
-            $url .= '?' . join('&', $params);
         if ($pagetype) {
             $pagetype = '/' . $pagetype;
         } else {
@@ -773,16 +813,21 @@ 
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
 
-    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) { # Royal short-circuit
+    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) {
+# Royal short-circuit
         return '<strong>Acceded on ' . $entered_house[HOUSE_TYPE_ROYAL]['date_pretty']
             . '<br>Coronated on 2 June 1953</strong></li>';
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
-            continue; # Same info is printed further down
+        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
+                    continue;
+        }
+        # Same info is printed further down
 
-        if (!$current_member[$house]) $desc .= 'Former ';
+        if (!$current_member[$house]) {
+            $desc .= 'Former ';
+        }
 
         $party = $left_house[$house]['party'];
         $party_br = '';
@@ -790,8 +835,9 @@ 
             $party_br = $m[2];
             $party = $m[1];
         }
-        if ($party != 'unknown')
-            $desc .= _htmlentities($party);
+        if ($party != 'unknown') {
+                    $desc .= _htmlentities($party);
+        }
         if ($party == 'Speaker' || $party == 'Deputy Speaker') {
             $desc .= ', and ';
             # XXX: Might go horribly wrong if something odd happens
@@ -802,15 +848,23 @@ 
         }
         if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
             $desc .= ' ';
-            if ($house==HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
-            if ($house==HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
-            if ($house==HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            if ($house==HOUSE_TYPE_COMMONS) {
+                $desc .= '<abbr title="Member of Parliament">MP</abbr>';
+            }
+            if ($house==HOUSE_TYPE_NI) {
+                $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
+            }
+            if ($house==HOUSE_TYPE_SCOTLAND) {
+                $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            }
             if ($party_br) {
                 $desc .= " ($party_br)";
             }
             $desc .= ' for ' . $left_house[$house]['constituency'];
         }
-        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
+        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') {
+            $desc .= ' Peer';
+        }
         $desc .= ', ';
     }
     $desc = preg_replace('#, $#', '', $desc);
@@ -1073,10 +1127,13 @@ 
     # Find latest entered house
     $entered_house = null;
     foreach ($member->entered_house() as $h => $eh) {
-        if (!$entered_house || $eh['date'] > $entered_house) $entered_house = $eh['date'];
+        if (!$entered_house || $eh['date'] > $entered_house) {
+            $entered_house = $eh['date'];
+        }
+    }
+    if ($entered_house > $year_ago) {
+            $since_text = 'since joining Parliament';
     }
-    if ($entered_house > $year_ago)
-        $since_text = 'since joining Parliament';
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
     $section = 'section:debates section:whall section:lords section:ni';
@@ -1089,10 +1146,12 @@ 
         $MOREURL->insert(array('pid'=>$member->person_id(), 's'=>'section:wrans', 'pop'=>1));
         // We assume that if they've answered a question, they're a minister
         $minister = 0; $Lminister = false;
-        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0)
-            $minister = 1;
-        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0)
-            $Lminister = true;
+        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0) {
+                    $minister = 1;
+        }
+        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0) {
+                    $Lminister = true;
+        }
         if ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
             $minister = 2;
         }
@@ -1141,11 +1200,17 @@ 
 
     if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts']>0 || $has_email_alerts)) {
         $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts']==1?'person is':'people are') . ' tracking ';
-        if ($member->house_disp == HOUSE_TYPE_COMMONS) $line .= 'this MP';
-        elseif ($member->house_disp == HOUSE_TYPE_LORDS) $line .= 'this peer';
-        elseif ($member->house_disp == HOUSE_TYPE_NI) $line .= 'this MLA';
-        elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) $line .= 'this MSP';
-        elseif ($member->house_disp == HOUSE_TYPE_ROYAL) $line .= $member->full_name();
+        if ($member->house_disp == HOUSE_TYPE_COMMONS) {
+            $line .= 'this MP';
+        } elseif ($member->house_disp == HOUSE_TYPE_LORDS) {
+            $line .= 'this peer';
+        } elseif ($member->house_disp == HOUSE_TYPE_NI) {
+            $line .= 'this MLA';
+        } elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) {
+            $line .= 'this MSP';
+        } elseif ($member->house_disp == HOUSE_TYPE_ROYAL) {
+            $line .= $member->full_name();
+        }
         if ($has_email_alerts) {
             $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
         }
@@ -1169,10 +1234,12 @@ 
 
 function display_stats_line($category, $blurb, $type, $inwhat, $afterstuff, $extra_info, $minister = false, $Lminister = false) {
     $return = false;
-    if (isset($extra_info[$category]))
-        $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
-    if (isset($extra_info["L$category"]))
-        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    if (isset($extra_info[$category])) {
+            $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
+    }
+    if (isset($extra_info["L$category"])) {
+            $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    }
     return $return;
 }
 
@@ -1184,17 +1251,21 @@ 
             $inwhat = preg_replace('#<\/a>#', '', $inwhat);
         }
     }
-    if ($house==HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
+    if ($house==HOUSE_TYPE_LORDS) {
+        $inwhat = str_replace('MP', 'Lord', $inwhat);
+    }
     $line = $blurb;
     $line .= '<strong>' . $extra_info[$category];
-    if ($type) $line .= ' ' . make_plural($type, $extra_info[$category]);
+    if ($type) {
+        $line .= ' ' . make_plural($type, $extra_info[$category]);
+    }
     $line .= '</strong>';
     $line .= $inwhat;
     if ($minister===2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
-    } elseif ($minister)
-        $line .= ' &#8212; Ministers do not ask written questions';
-    else {
+    } elseif ($minister) {
+            $line .= ' &#8212; Ministers do not ask written questions';
+    } else {
         $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
         if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
             $line .= ' &#8212; ';
@@ -1233,11 +1304,21 @@ 
         $mean = $extra_info["writetothem_responsiveness_mean_$year"];
 
         $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
-        if ($a == 'very low') $a = 'a very low';
-        if ($a == 'low') $a = 'a low';
-        if ($a == 'medium') $a = 'a medium';
-        if ($a == 'high') $a = 'a high';
-        if ($a == 'very high') $a = 'a very high';
+        if ($a == 'very low') {
+            $a = 'a very low';
+        }
+        if ($a == 'low') {
+            $a = 'a low';
+        }
+        if ($a == 'medium') {
+            $a = 'a medium';
+        }
+        if ($a == 'high') {
+            $a = 'a high';
+        }
+        if ($a == 'very high') {
+            $a = 'a very high';
+        }
         $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"] = $a;
 
         return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);