mysociety / theyworkforyou

www/includes/utility.php

Braces +125 added lines, -76 removed lines

@@ -49,7 +49,9 @@ 
 
         // If we can show this header, then, er, show it.
         if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
-            if (is_array($text)) $text = call_user_func($text);
+            if (is_array($text)) {
+                $text = call_user_func($text);
+            }
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
     }
@@ -65,7 +67,9 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting()==0) {
+        return;
+    }
 
    // define an assoc array of error string
    // in reality the only entries we should
@@ -209,19 +213,29 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+      for ($i=0; $i < $tabs; $i++) {
+          $s .= ' &nbsp; ';
+      }
       $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
+      if (isset($arr['class'])) {
+          $s .= $arr['class'].'.';
+      }
       $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+      if (isset($arr['args'])) {
+          foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
-    elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
-    else {
+      } elseif (is_array($v)) {
+        $args[] = 'Array['.sizeof($v).']';
+    } elseif (is_object($v)) {
+        $args[] = 'Object:'.get_class($v);
+    } elseif (is_bool($v)) {
+        $args[] = $v ? 'true' : 'false';
+    } else {
       $v = (string) @$v;
       $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
+      if (strlen($v) > $MAXSTRLEN) {
+          $str .= '...';
+      }
       $args[] = $str;
     }
       }
@@ -232,7 +246,9 @@ 
       //        $arr['line'],$arr['file'],$arr['file']);
       $s .= "\n";
     }
-    if ($print) print $s;
+    if ($print) {
+        print $s;
+    }
   }
 
   return $s;
@@ -326,7 +342,8 @@ 
 
     if (preg_match("/^(\d\d\d\d)-(\d\d?)-(\d\d?)$/", $date, $matches)) {
         list($string, $year, $month, $day) = $matches;
-        if ($year < 1902) { # gmdate fns only go back to Dec. 1901
+        if ($year < 1902) {
+# gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
                 return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
             } else {
@@ -755,7 +772,9 @@ 
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
 
-    if (!$from) $from = CONTACTEMAIL;
+    if (!$from) {
+        $from = CONTACTEMAIL;
+    }
 
     $headers =
      "From: TheyWorkForYou <$from>\r\n" .
@@ -847,17 +866,21 @@ 
     $rank = $rank + 0;
 
     # 11th, 12th, 13th use "th" not "st", "nd", "rd"
-    if (floor(($rank % 100) / 10) == 1)
-        return $rank . "th";
+    if (floor(($rank % 100) / 10) == 1) {
+            return $rank . "th";
+    }
     # 1st
-    if ($rank % 10 == 1)
-        return $rank . "st";
+    if ($rank % 10 == 1) {
+            return $rank . "st";
+    }
     # 2nd
-    if ($rank % 10 == 2)
-        return $rank . "nd";
+    if ($rank % 10 == 2) {
+            return $rank . "nd";
+    }
     # 3rd
-    if ($rank % 10 == 3)
-        return $rank . "rd";
+    if ($rank % 10 == 3) {
+            return $rank . "rd";
+    }
     # Everything else use th
 
     return $rank . "th";
@@ -865,8 +888,9 @@ 
 
 function make_plural($word, $number)
 {
-    if ($number == 1)
-        return $word;
+    if ($number == 1) {
+            return $word;
+    }
     return $word . "s";
 }
 
@@ -884,8 +908,7 @@ 
 function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = NULL) {
 
     // Case for Elizabeth II
-    if ($house == HOUSE_TYPE_ROYAL)
-    {
+    if ($house == HOUSE_TYPE_ROYAL) {
         return 'elizabeth_the_second';
     }
 
@@ -897,8 +920,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== NULL)
-    {
+    if ($pid !== NULL) {
         $out .= $pid . '/';
     }
 
@@ -906,8 +928,7 @@ 
     $out .= urlencode(str_replace($s2, $r, str_replace($s, $r, $name)));
 
     // If there is a constituency, inject that too
-    if ($const && $house == HOUSE_TYPE_COMMONS)
-    {
+    if ($const && $house == HOUSE_TYPE_COMMONS) {
         $out .= '/' . urlencode(str_replace($s2, $r, str_replace($s, $r, strtolower($const))));
     }
 
@@ -919,10 +940,16 @@ 
     switch ($house) {
         case HOUSE_TYPE_LORDS:
             $s = '';
-            if (!$family_name) $s = 'the ';
+            if (!$family_name) {
+                $s = 'the ';
+            }
             $s .= $title;
-            if ($family_name) $s .= ' ' . $family_name;
-            if ($lordofname) $s .= ' of ' . $lordofname;
+            if ($family_name) {
+                $s .= ' ' . $family_name;
+            }
+            if ($lordofname) {
+                $s .= ' of ' . $lordofname;
+            }
             return $s;
 
         case HOUSE_TYPE_ROYAL:
@@ -940,14 +967,18 @@ 
 }
 
 function by_peer_name($a, $b) {
-    if (!$a['family_name'] && !$b['family_name'])
-        return strcmp($a['lordofname'], $b['lordofname']);
-    if (!$a['family_name'])
-        return strcmp($a['lordofname'], $b['family_name']);
-    if (!$b['family_name'])
-        return strcmp($a['family_name'], $b['lordofname']);
-    if (strcmp($a['family_name'], $b['family_name']))
-        return strcmp($a['family_name'], $b['family_name']);
+    if (!$a['family_name'] && !$b['family_name']) {
+            return strcmp($a['lordofname'], $b['lordofname']);
+    }
+    if (!$a['family_name']) {
+            return strcmp($a['lordofname'], $b['family_name']);
+    }
+    if (!$b['family_name']) {
+            return strcmp($a['family_name'], $b['lordofname']);
+    }
+    if (strcmp($a['family_name'], $b['family_name'])) {
+            return strcmp($a['family_name'], $b['family_name']);
+    }
     return strcmp($a['lordofname'], $b['lordofname']);
 }
 
@@ -974,12 +1005,17 @@ 
         'Lords in Waiting (HM Household)' => 'Government Whip',
         'Baronesses in Waiting, HM Household' => 'Government Whip',
     );
-    if ($pos) { # Government post, or Chairman of Select Committee
+    if ($pos) {
+# Government post, or Chairman of Select Committee
         $pretty = $pos;
-        if ($dept && $dept != 'No Department') $pretty .= ", $dept";
-        if (array_key_exists($pretty, $lookup))
-            $pretty = $lookup[$pretty];
-    } else { # Member of Select Committee
+        if ($dept && $dept != 'No Department') {
+            $pretty .= ", $dept";
+        }
+        if (array_key_exists($pretty, $lookup)) {
+                    $pretty = $lookup[$pretty];
+        }
+    } else {
+# Member of Select Committee
         $pretty = "Member, $dept";
     }
     return $pretty;
@@ -997,13 +1033,16 @@ 
     }
 
     // single date?
-    if (isset($data['date'])) $one_date = true;
+    if (isset($data['date'])) {
+        $one_date = true;
+    }
 
     // remove empty entries, so they don't produce errors
     foreach (array_keys($hansardmajors) as $major) {
         if (array_key_exists($major, $data)) {
-            if (count($data[$major]) == 0)
-                unset($data[$major]);
+            if (count($data[$major]) == 0) {
+                            unset($data[$major]);
+            }
         }
     }
 
@@ -1012,22 +1051,29 @@ 
     if (!$one_date) {
         $todaystime = gmmktime(0, 0, 0, date('m'), date('d'), date('Y'));
         foreach ($data as $major => $array) {
-            if (!in_array('timestamp', $array)) $daytext[$major] = "The most recent ";
-            elseif ($todaystime - $array['timestamp'] == 86400) $daytext[$major] = "Yesterday&rsquo;s";
-            elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
-            else $daytext[$major] = "The most recent ";
+            if (!in_array('timestamp', $array)) {
+                $daytext[$major] = "The most recent ";
+            } elseif ($todaystime - $array['timestamp'] == 86400) {
+                $daytext[$major] = "Yesterday&rsquo;s";
+            } elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) {
+                $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
+            } else {
+                $daytext[$major] = "The most recent ";
+            }
         }
     }
 
     //build html
     foreach ($printed_majors as $p_major) {
-        if (!array_key_exists($p_major, $data))
-            continue;
+        if (!array_key_exists($p_major, $data)) {
+                    continue;
+        }
 
-        if ($one_date)
-            $date = $data['date'];
-        else
-            $date = $data[$p_major]['hdate'];
+        if ($one_date) {
+                    $date = $data['date'];
+        } else {
+                    $date = $data[$p_major]['hdate'];
+        }
         $q = $db->query('SELECT section_id, body, gid
                 FROM hansard, epobject
                 WHERE hansard.epobject_id = epobject.epobject_id '
@@ -1079,14 +1125,16 @@ 
     }
 
     $return .= '<a href="';
-    if (isset($data[$major]['listurl']))
-        $return .= $data[$major]['listurl'];
-    else {
+    if (isset($data[$major]['listurl'])) {
+            $return .= $data[$major]['listurl'];
+    } else {
         $LISTURL->reset();
         $return .= $LISTURL->generate();
     }
     $return .= '">' . $hansardmajors[$major]['title'] . '</a>';
-    if (isset($daytext[$major])) $return;
+    if (isset($daytext[$major])) {
+        $return;
+    }
     $return .= '</h4>';
 
     return $return;
@@ -1094,20 +1142,21 @@ 
 
 function score_to_strongly($dmpscore) {
     $dmpdesc = "unknown about";
-    if ($dmpscore > 0.95 && $dmpscore <= 1.0)
-        $dmpdesc = "consistently voted against";
-    elseif ($dmpscore > 0.85)
-        $dmpdesc = "almost always voted against";
-    elseif ($dmpscore > 0.6)
-        $dmpdesc = "generally voted against";
-    elseif ($dmpscore > 0.4)
-        $dmpdesc = "voted a mixture of for and against";
-    elseif ($dmpscore > 0.15)
-        $dmpdesc = "generally voted for";
-    elseif ($dmpscore > 0.05)
-        $dmpdesc = "almost always voted for";
-    elseif ($dmpscore >= 0.0)
-        $dmpdesc = "consistently voted for";
+    if ($dmpscore > 0.95 && $dmpscore <= 1.0) {
+            $dmpdesc = "consistently voted against";
+    } elseif ($dmpscore > 0.85) {
+            $dmpdesc = "almost always voted against";
+    } elseif ($dmpscore > 0.6) {
+            $dmpdesc = "generally voted against";
+    } elseif ($dmpscore > 0.4) {
+            $dmpdesc = "voted a mixture of for and against";
+    } elseif ($dmpscore > 0.15) {
+            $dmpdesc = "generally voted for";
+    } elseif ($dmpscore > 0.05) {
+            $dmpdesc = "almost always voted for";
+    } elseif ($dmpscore >= 0.0) {
+            $dmpdesc = "consistently voted for";
+    }
     return $dmpdesc;
 }
 

www/docs/mp/index.php

Braces +141 added lines, -63 removed lines

@@ -61,16 +61,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(
@@ -102,7 +122,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";
 }
@@ -125,12 +147,19 @@ 
 
 /////////////////////////////////////////////////////////
 // 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';
-elseif (get_http_var('london-assembly-member')) $this_page = 'london-assembly-member';
-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';
+} elseif (get_http_var('london-assembly-member')) {
+    $this_page = 'london-assembly-member';
+} else {
+    $this_page = 'mp';
+}
 
 try {
     if (is_numeric($pid)) {
@@ -179,8 +208,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 +218,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 +234,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)) {
@@ -238,8 +272,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();
@@ -576,11 +611,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 {
@@ -657,16 +694,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 = '';
@@ -674,8 +716,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
@@ -686,15 +729,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);
@@ -956,10 +1007,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';
@@ -973,10 +1027,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;
         }
@@ -1024,11 +1080,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>';
         }
@@ -1052,10 +1114,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;
 }
 
@@ -1067,17 +1131,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; ';
@@ -1116,11 +1184,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);