mysociety / theyworkforyou

www/includes/easyparliament/templates/api/hansard_gid.php

Indentation +1 added lines, -1 removed lines

@@ -67,4 +67,4 @@
     api_output($out);
 } else {
     api_error('Nothing');
-   }
+    }

Braces +9 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 if (isset ($data['rows'])) {
     for ($i=0; $i<count($data['rows']); $i++) {
         $row = $data['rows'][$i];
-        if (count($row) == 0) continue;
+        if (count($row) == 0) {
+            continue;
+        }
         if ($row['htype'] == '12') {
             if (isset($row['speaker']) && count($row['speaker']) > 0) {
                 $speaker = $row['speaker'];
@@ -36,7 +38,9 @@ 
                     $desc .= $speaker['constituency'] . ', ';
                 }
                 $desc .= _htmlentities($speaker['party']);
-                if ($desc) $row['speaker']['desc'] = $desc;
+                if ($desc) {
+                    $row['speaker']['desc'] = $desc;
+                }
             }
         }
         $out[] = $row;
@@ -52,8 +56,9 @@ 
                 $has_content = false;
             }
             $entry = $row;
-            if (isset($row['excerpt']))
-                $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            if (isset($row['excerpt'])) {
+                            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            }
             if ($has_content) {
             } else {
                 unset($entry['listurl']);

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $out = array();
 if (isset ($data['rows'])) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
         if (count($row) == 0) continue;
         if ($row['htype'] == '12') {

www/includes/easyparliament/templates/api/hansard_date.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (isset ($data['rows'])) {
     $out = array();
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         if ($row['htype'] == '10' && isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) {
@@ -40,7 +40,7 @@ 
         if ($row['htype'] == '10') {
             $out[] = array('entry' => $entry, 'subs' => array());
         } else {
-            $out[sizeof($out)-1]['subs'][] = $entry;
+            $out[sizeof($out) - 1]['subs'][] = $entry;
         }
 
     }

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
         }
 
         $entry = $row;
-        if (isset($row['excerpt']))
-            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        if (isset($row['excerpt'])) {
+                    $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        }
         if ($has_content) {
         } else {
             unset($entry['listurl']);

www/includes/easyparliament/sidebars/search_filters.php

Indentation +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
  <select id="section" name="section">
  <option value="">Any
 <?php
- optgroups(array(
+    optgroups(array(
     'UK Parliament' => array(
         'uk' => 'All UK',
         'debates' => 'House of Commons debates',
@@ -85,8 +85,8 @@ 
         'sp' => 'Debates',
         'spwrans' => 'Written answers',
     ),
- ), $section);
- ?>
+    ), $section);
+    ?>
  </select>
  <div class="help">
  Restrict results to a particular parliament or assembly that we cover (e.g. the

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 if (preg_match('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', $filter_ss, $m)) {
     $from = $m[1];
     $to = $m[2];
-    $filter_ss =  preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
+    $filter_ss = preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
 }
 $section = get_http_var('section');
 if (preg_match('#\s*section:([a-z]*)#', $filter_ss, $m)) {
@@ -36,7 +36,7 @@ 
     $filter_ss = preg_replace('#\s*speaker:[0-9]*#', '', $filter_ss);
 }
 
-$this->block_start(array( 'title' => "Filtering your results"));
+$this->block_start(array('title' => "Filtering your results"));
 
 ?>
 <form method="get" action="/search/">

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
         echo '<optgroup label="', $key, '">';
         foreach ($values as $k => $v) {
             echo '<option';
-            if ($current == $k) echo ' selected';
+            if ($current == $k) {
+                echo ' selected';
+            }
             echo ' value="', $k, '">', $v;
         }
         echo "</optgroup>\n";

www/includes/easyparliament/comment.php

Indentation +2 added lines, -2 removed lines

@@ -210,8 +210,8 @@
                             array(':epobject_id' => $this->epobject_id));
 
             if ($q->rows() > 0) {
-                 // If you change stuff here, you might have to change it in
-                 // $COMMENTLIST->_get_comment_data() too...
+                    // If you change stuff here, you might have to change it in
+                    // $COMMENTLIST->_get_comment_data() too...
 
                 $gid = fix_gid_from_db($q->field(0, 'gid')); // In includes/utility.php
 

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

@@ -31,7 +31,7 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
+    public $modflagged = null;	// Is a datetime when set.
     public $firstname = '';	// Of the person who posted it.
     public $lastname = '';
     public $url = '';
@@ -138,7 +138,7 @@ 
             $flag = "'$date'";
 
         } elseif ($switch == 'off') {
-            $date = NULL;
+            $date = null;
             $flag = 'NULL';
 
         } else {

Spacing +14 added lines, -14 removed lines

@@ -31,8 +31,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = NULL; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -41,7 +41,7 @@ 
     public $exists = false;
 
 
-    public function __construct($comment_id='') {
+    public function __construct($comment_id = '') {
 
         $this->db = new ParlDB;
 
@@ -69,12 +69,12 @@ 
             if ($q->rows() > 0) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q->field(0, 'user_id');
+                $this->user_id = $q->field(0, 'user_id');
                 $this->epobject_id	= $q->field(0, 'epobject_id');
-                $this->body			= $q->field(0, 'body');
-                $this->posted		= $q->field(0, 'posted');
-                $this->visible		= $q->field(0, 'visible');
-                $this->modflagged	= $q->field(0, 'modflagged');
+                $this->body = $q->field(0, 'body');
+                $this->posted = $q->field(0, 'posted');
+                $this->visible = $q->field(0, 'visible');
+                $this->modflagged = $q->field(0, 'modflagged');
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -104,9 +104,9 @@ 
     public function comments_enabled() { return $this->comments_enabled; }
 
 
-    public function display($format='html', $template='comments') {
+    public function display($format = 'html', $template = 'comments') {
 
-        $data['comments'][0] = array (
+        $data['comments'][0] = array(
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -142,7 +142,7 @@ 
             $flag = 'NULL';
 
         } else {
-            $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
+            $PAGE->error_message("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
         }
 
         $q = $this->db->query("UPDATE comments
@@ -154,7 +154,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag."
             );
@@ -176,7 +176,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message = array (
+                $message = array(
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation."
                 );
@@ -185,7 +185,7 @@ 
             }
 
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations."
             );

www/includes/easyparliament/member.php

Indentation +2 added lines, -2 removed lines

@@ -362,7 +362,7 @@ 
         $this->extra_info = array();
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
-                              array(':person_id' => $this->person_id));
+                                array(':person_id' => $this->person_id));
         for ($row=0; $row<$q->rows(); $row++) {
             $this->extra_info['office'][] = $q->row($row);
         }
@@ -450,7 +450,7 @@ 
         $q = $this->db->query('select bill_id,session,title,sum(attending) as a,sum(chairman) as c
             from pbc_members, bills
             where bill_id = bills.id and person_id = ' . $this->person_id()
-             . ' group by bill_id order by session desc');
+                . ' group by bill_id order by session desc');
         $this->extra_info['pbc'] = array();
         for ($i=0; $i<$q->rows(); $i++) {
             $bill_id = $q->field($i, 'bill_id');

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 class MEMBER {
 
@@ -112,15 +112,15 @@ 
 
         $this->house_disp = 0;
         $last_party = null;
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             $house          = $q->field($row, 'house');
             if (!in_array($house, $this->houses)) $this->houses[] = $house;
             $const          = $q->field($row, 'constituency');
-            $party		= $q->field($row, 'party');
-            $entered_house	= $q->field($row, 'entered_house');
-            $left_house	= $q->field($row, 'left_house');
-            $entered_reason	= $q->field($row, 'entered_reason');
-            $left_reason	= $q->field($row, 'left_reason');
+            $party = $q->field($row, 'party');
+            $entered_house = $q->field($row, 'entered_house');
+            $left_house = $q->field($row, 'left_house');
+            $entered_reason = $q->field($row, 'entered_reason');
+            $left_reason = $q->field($row, 'left_reason');
 
             if (!isset($this->entered_house[$house]) || $entered_house < $this->entered_house[$house]['date']) {
                 $this->entered_house[$house] = array(
@@ -142,22 +142,22 @@ 
                 );
             }
 
-            if ( $house==HOUSE_TYPE_ROYAL 					# The Monarch
-                || (!$this->house_disp && $house==HOUSE_TYPE_SCOTLAND)	# MSPs and
-                || (!$this->house_disp && $house==HOUSE_TYPE_NI)	# MLAs have lowest priority
-                || ($this->house_disp!=HOUSE_TYPE_LORDS && $house==HOUSE_TYPE_LORDS)	# Lords have highest priority
-                || (!$this->house_disp && $house==HOUSE_TYPE_COMMONS) # MPs
+            if ($house == HOUSE_TYPE_ROYAL 					# The Monarch
+                || (!$this->house_disp && $house == HOUSE_TYPE_SCOTLAND)	# MSPs and
+                || (!$this->house_disp && $house == HOUSE_TYPE_NI)	# MLAs have lowest priority
+                || ($this->house_disp != HOUSE_TYPE_LORDS && $house == HOUSE_TYPE_LORDS)	# Lords have highest priority
+                || (!$this->house_disp && $house == HOUSE_TYPE_COMMONS) # MPs
             ) {
                 $this->house_disp = $house;
                 $this->constituency = $const;
                 $this->party = $party;
 
-                $this->member_id	= $q->field($row, 'member_id');
-                $this->title		= $q->field($row, 'title');
+                $this->member_id = $q->field($row, 'member_id');
+                $this->title = $q->field($row, 'title');
                 $this->given_name = $q->field($row, 'given_name');
                 $this->family_name = $q->field($row, 'family_name');
                 $this->lordofname = $q->field($row, 'lordofname');
-                $this->person_id	= $q->field($row, 'person_id');
+                $this->person_id = $q->field($row, 'person_id');
             }
 
             if (($last_party && $party && $party != $last_party) || $left_reason == 'changed_party') {
@@ -201,13 +201,13 @@ 
         }
     }
 
-    public function postcode_to_person_id($postcode, $house=null) {
-        twfy_debug ('MP', "postcode_to_person_id converting postcode to person");
+    public function postcode_to_person_id($postcode, $house = null) {
+        twfy_debug('MP', "postcode_to_person_id converting postcode to person");
         $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($postcode));
         return $this->constituency_to_person_id($constituency, $house);
     }
 
-    public function constituency_to_person_id($constituency, $house=null) {
+    public function constituency_to_person_id($constituency, $house = null) {
         if ($constituency == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no constituency was found.');
         }
@@ -246,7 +246,7 @@ 
         }
     }
 
-    public function name_to_person_id($name, $const='') {
+    public function name_to_person_id($name, $const = '') {
         global $this_page;
         if ($name == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no name was found.');
@@ -296,7 +296,7 @@ 
 
         # More than one person ID matching the given name
         $person_ids = array();
-        for ($i=0; $i<$q->rows; ++$i) {
+        for ($i = 0; $i < $q->rows; ++$i) {
             $pid = $q->field($i, 'person_id');
             $person_ids[$pid] = 1;
         }
@@ -326,7 +326,7 @@ 
         $q = $this->db->query($q, $params);
         if ($q->rows > 1) {
             $person_ids = array();
-            for ($i=0; $i<$q->rows(); ++$i) {
+            for ($i = 0; $i < $q->rows(); ++$i) {
                 $person_ids[$q->field($i, 'person_id')] = $q->field($i, 'constituency');
             }
             throw new MySociety\TheyWorkForYou\MemberMultipleException($person_ids);
@@ -344,7 +344,7 @@ 
         global $THEUSER;
         if (is_object($THEUSER) && $THEUSER->postcode_is_set() && $this->current_member(1)) {
             $pc = $THEUSER->postcode();
-            twfy_debug ('MP', "set_users_mp converting postcode to person");
+            twfy_debug('MP', "set_users_mp converting postcode to person");
             $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
             if ($constituency == strtolower($this->constituency())) {
                 $this->the_users_mp = true;
@@ -365,7 +365,7 @@ 
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
                               array(':person_id' => $this->person_id));
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             $this->extra_info['office'][] = $q->row($row);
         }
 
@@ -420,9 +420,9 @@ 
 
         if (isset($this->extra_info['public_whip_attendrank'])) {
             $prefix = ($this->house(HOUSE_TYPE_LORDS) ? 'L' : '');
-            $this->extra_info[$prefix.'public_whip_division_attendance_rank'] = $this->extra_info['public_whip_attendrank'];
-            $this->extra_info[$prefix.'public_whip_division_attendance_rank_outof'] = $this->extra_info['public_whip_attendrank_outof'];
-            $this->extra_info[$prefix.'public_whip_division_attendance_quintile'] = floor($this->extra_info['public_whip_attendrank'] / ($this->extra_info['public_whip_attendrank_outof']+1) * 5);
+            $this->extra_info[$prefix . 'public_whip_division_attendance_rank'] = $this->extra_info['public_whip_attendrank'];
+            $this->extra_info[$prefix . 'public_whip_division_attendance_rank_outof'] = $this->extra_info['public_whip_attendrank_outof'];
+            $this->extra_info[$prefix . 'public_whip_division_attendance_quintile'] = floor($this->extra_info['public_whip_attendrank'] / ($this->extra_info['public_whip_attendrank_outof'] + 1) * 5);
         }
         if ($this->house(HOUSE_TYPE_LORDS) && isset($this->extra_info['public_whip_division_attendance'])) {
             $this->extra_info['Lpublic_whip_division_attendance'] = $this->extra_info['public_whip_division_attendance'];
@@ -430,7 +430,7 @@ 
         }
 
         if ($display && array_key_exists('register_member_interests_html', $this->extra_info) && ($this->extra_info['register_member_interests_html'] != '')) {
-            $args = array (
+            $args = array(
                 "sort" => "regexp_replace"
             );
             $GLOSSARY = new GLOSSARY($args);
@@ -438,7 +438,7 @@ 
         $GLOSSARY->glossarise($this->extra_info['register_member_interests_html']);
         }
 
-        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:'.$this->person_id.'%" and confirmed and not deleted');
+        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:' . $this->person_id . '%" and confirmed and not deleted');
         $this->extra_info['number_of_alerts'] = $q->field(0, 'c');
 
         if (isset($this->extra_info['reading_ease'])) {
@@ -454,16 +454,16 @@ 
             where bill_id = bills.id and person_id = ' . $this->person_id()
              . ' group by bill_id order by session desc');
         $this->extra_info['pbc'] = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $bill_id = $q->field($i, 'bill_id');
-            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor='.$bill_id.' and htype=10');
+            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor=' . $bill_id . ' and htype=10');
             $c = $c->field(0, 'c');
             $title = $q->field($i, 'title');
             $attending = $q->field($i, 'a');
             $chairman = $q->field($i, 'c');
             $this->extra_info['pbc'][$bill_id] = array(
                 'title' => $title, 'session' => $q->field($i, 'session'),
-                'attending'=>$attending, 'chairman'=>($chairman>0), 'outof' => $c
+                'attending'=>$attending, 'chairman'=>($chairman > 0), 'outof' => $c
             );
         }
 
@@ -478,7 +478,7 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND))
+        if ($no_mp_title && ($this->house_disp == HOUSE_TYPE_COMMONS || $this->house_disp == HOUSE_TYPE_NI || $this->house_disp == HOUSE_TYPE_SCOTLAND))
             $title = '';
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
     }
@@ -505,8 +505,8 @@ 
     }
 
     public function entered_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->entered_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->entered_house)) {
                 return $this->entered_house[$house];
             } else {
                 return null;
@@ -518,9 +518,9 @@ 
     public function entered_house_text($entered_house) {
         if (!$entered_house) return '';
         list($year, $month, $day) = explode('-', $entered_house);
-        if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
+        if ($month == 1 && $day == 1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             return $year;
         } elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
@@ -530,8 +530,8 @@ 
     }
 
     public function left_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->left_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->left_house)) {
                 return $this->left_house[$house];
             } else {
                 return null;
@@ -545,7 +545,7 @@ 
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
         } else {
@@ -647,7 +647,7 @@ 
             $name = $q->field($r, 'given_name') . ' ' . $q->field($r, 'family_name');
             if ($last_pid != $pid) {
                 $mships[] = array(
-                    'href' => WEBPATH . 'mp/?pid='.$pid,
+                    'href' => WEBPATH . 'mp/?pid=' . $pid,
                     'text' => $name
                 );
                 $last_pid = $pid;

Braces +44 added lines, -26 removed lines

@@ -114,7 +114,9 @@ 
         $last_party = null;
         for ($row=0; $row<$q->rows(); $row++) {
             $house          = $q->field($row, 'house');
-            if (!in_array($house, $this->houses)) $this->houses[] = $house;
+            if (!in_array($house, $this->houses)) {
+                $this->houses[] = $house;
+            }
             $const          = $q->field($row, 'constituency');
             $party		= $q->field($row, 'party');
             $entered_house	= $q->field($row, 'entered_house');
@@ -217,7 +219,9 @@ 
         }
 
         $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-        if ($normalised) $constituency = $normalised;
+        if ($normalised) {
+            $constituency = $normalised;
+        }
 
         $params = array();
 
@@ -256,10 +260,12 @@ 
         $q = "SELECT person_id FROM person_names WHERE type = 'name' ";
         if ($this_page == 'peer') {
             $success = preg_match('#^(.*?) (.*?) of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
+            }
+            if (!$success) {
+                            $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -269,8 +275,9 @@ 
             $q .= "AND title = :title AND family_name = :family_name AND lordofname = :lordofname";
         } elseif ($this_page == 'msp' || $this_page == 'mla' || strstr($this_page, 'mp')) {
             $success = preg_match('#^(.*?) (.*?) (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -405,16 +412,17 @@ 
         if (array_key_exists('public_whip_rebellions', $this->extra_info)) {
             $rebellions = $this->extra_info['public_whip_rebellions'];
             $rebel_desc = "<unknown>";
-            if ($rebellions == 0)
-                $rebel_desc = "never";
-            elseif ($rebellions <= 1)
-                $rebel_desc = "hardly ever";
-            elseif ($rebellions <= 3)
-                $rebel_desc = "occasionally";
-            elseif ($rebellions <= 5)
-                $rebel_desc = "sometimes";
-            elseif ($rebellions > 5)
-                $rebel_desc = "quite often";
+            if ($rebellions == 0) {
+                            $rebel_desc = "never";
+            } elseif ($rebellions <= 1) {
+                            $rebel_desc = "hardly ever";
+            } elseif ($rebellions <= 3) {
+                            $rebel_desc = "occasionally";
+            } elseif ($rebellions <= 5) {
+                            $rebel_desc = "sometimes";
+            } elseif ($rebellions > 5) {
+                            $rebel_desc = "quite often";
+            }
             $this->extra_info['public_whip_rebel_description'] = $rebel_desc;
         }
 
@@ -478,8 +486,9 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND))
-            $title = '';
+        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND)) {
+                    $title = '';
+        }
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
     }
     public function houses() {
@@ -495,8 +504,9 @@ 
     public function party() { return $this->party; }
     public function party_text($party = null) {
         global $parties;
-        if (!$party)
-            $party = $this->party;
+        if (!$party) {
+                    $party = $this->party;
+        }
         if (isset($parties[$party])) {
             return $parties[$party];
         } else {
@@ -516,7 +526,9 @@ 
     }
 
     public function entered_house_text($entered_house) {
-        if (!$entered_house) return '';
+        if (!$entered_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $entered_house);
         if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
@@ -541,7 +553,9 @@ 
     }
 
     public function left_house_text($left_house) {
-        if (!$left_house) return '';
+        if (!$left_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
@@ -590,7 +604,9 @@ 
             $lh = $this->left_house($h);
             $current[$h] = ($lh['date'] == '9999-12-31');
         }
-        if ($house) return $current[$house];
+        if ($house) {
+            return $current[$house];
+        }
         return $current;
     }
 
@@ -623,7 +639,9 @@ 
 
     private function _previous_future_mps_query($direction) {
         $entered_house = $this->entered_house(HOUSE_TYPE_COMMONS);
-        if (is_null($entered_house)) return '';
+        if (is_null($entered_house)) {
+            return '';
+        }
         if ($direction == '>') {
             $order = '';
         } else {

www/includes/easyparliament/recess.php

Braces +30 added lines, -19 removed lines

@@ -362,12 +362,13 @@ 
         } else {
             $from = "$year-7-" . $dates[$year][7]['more'];
         }
-        if (!isset($dates[$year][9]))
-            $to = "$year-08-31";
-        elseif (isset($dates[$year][9]['all']))
-            $to = "$year-10-" . $dates[$year][10]['less'];
-        else
-            $to = "$year-9-" . $dates[$year][9]['less'];
+        if (!isset($dates[$year][9])) {
+                    $to = "$year-08-31";
+        } elseif (isset($dates[$year][9]['all'])) {
+                    $to = "$year-10-" . $dates[$year][10]['less'];
+        } else {
+                    $to = "$year-9-" . $dates[$year][9]['less'];
+        }
     }
     if ( (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])
     || (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more'])
@@ -375,11 +376,17 @@ 
     || (isset($dates[$year][$month]['between'][2]) && $day > $dates[$year][$month]['between'][2] && $day < $dates[$year][$month]['between'][3]) ) {
         switch ($month) {
             case 1: case 12: $recess = 'Christmas Recess'; break;
-            case 2: if ($body==1 || $body==101) $recess = 'Half Term Week';
-                elseif ($body==4) $recess = 'February Recess';
+            case 2: if ($body==1 || $body==101) {
+                $recess = 'Half Term Week';
+            } elseif ($body==4) {
+                    $recess = 'February Recess';
+                }
                 break;
-            case 3: if ($body==1 || $body==101) $recess = 'Easter Recess';
-                elseif ($body==4) $recess = 'Spring Recess';
+            case 3: if ($body==1 || $body==101) {
+                $recess = 'Easter Recess';
+            } elseif ($body==4) {
+                    $recess = 'Spring Recess';
+                }
                 break;
             case 4: if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
                     $recess = 'Election Recess';
@@ -417,9 +424,13 @@ 
                     trigger_error("Argh9");
                 }
                 break;
-            case 10: if ($body==1 || $body==101) $recess = 'Conference Recess';
-                elseif ($body==4) $recess = 'Autumn Recess';
-                elseif ($body==5) $recess = 'Halloween Recess';
+            case 10: if ($body==1 || $body==101) {
+                $recess = 'Conference Recess';
+            } elseif ($body==4) {
+                    $recess = 'Autumn Recess';
+                } elseif ($body==5) {
+                    $recess = 'Halloween Recess';
+                }
                 break;
             case 11: $recess = 'Autumn Recess';
                 break;
@@ -427,9 +438,9 @@ 
         }
         if (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less']) {
             $to = "$year-$month-" . $dates[$year][$month]['less'];
-            if ($month==1)
-                $from = ($year-1)."-12-" . $dates[$year-1][12]['more'];
-            else {
+            if ($month==1) {
+                            $from = ($year-1)."-12-" . $dates[$year-1][12]['more'];
+            } else {
                 for ($newmonth = $month-1; $newmonth>=1; $newmonth--) {
                     if (isset($dates[$year][$newmonth]['more'])) {
                         $from = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['more'];
@@ -440,9 +451,9 @@ 
         }
         if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
             $from = "$year-$month-" . $dates[$year][$month]['more'];
-            if ($month==12)
-                $to = ($year+1)."-01-" . $dates[$year+1][1]['less'];
-            else {
+            if ($month==12) {
+                            $to = ($year+1)."-01-" . $dates[$year+1][1]['less'];
+            } else {
                 for ($newmonth = $month+1; $newmonth<=12; $newmonth++) {
                     if (isset($dates[$year][$newmonth]['less'])) {
                         $to = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['less'];

Spacing +79 added lines, -79 removed lines

@@ -12,20 +12,20 @@ 
     ),
     2001 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(15,26)),
-        4=>array('between'=>array(10,23)),
+        2=>array('between'=>array(15, 26)),
+        4=>array('between'=>array(10, 23)),
         5=>array('more'=>13),
         6=>array('less'=>13),
         7=>array('more'=>20),
         8=>array('all'=>1),
         9=>array('less'=>14, 'more'=>14),
-        10=>array('less'=>4, 'between'=>array(4,8, 8,15)),
+        10=>array('less'=>4, 'between'=>array(4, 8, 8, 15)),
         12=>array('more'=>19) ),
     2002 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(14,25)),
+        2=>array('between'=>array(14, 25)),
         3=>array('more'=>26),
-        4=>array('less'=>3, 'between'=>array(3,10)),
+        4=>array('less'=>3, 'between'=>array(3, 10)),
         5=>array('more'=>24),
         6=>array('less'=>10),
         7=>array('more'=>24),
@@ -35,8 +35,8 @@ 
         12=>array('more'=>19) ),
     2003 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(13,24)),
-        4=>array('between'=>array(14,28)),
+        2=>array('between'=>array(13, 24)),
+        4=>array('between'=>array(14, 28)),
         5=>array('more'=>22),
         6=>array('less'=>3),
         7=>array('more'=>17),
@@ -46,8 +46,8 @@ 
         12=>array('more'=>18)),
     2004 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(12,23)),
-        4=>array('between'=>array(1,19)),
+        2=>array('between'=>array(12, 23)),
+        4=>array('between'=>array(1, 19)),
         5=>array('more'=>27),
         6=>array('less'=>7),
         7=>array('more'=>22),
@@ -57,7 +57,7 @@ 
         12=>array('more'=>21) ),
     2005 => array(
         1=>array('less'=>10),
-        2=>array('between'=>array(10,21)),
+        2=>array('between'=>array(10, 21)),
         3=>array('more'=>24),
         4=>array('less'=>4, 'more'=>10),
         5=>array('less'=>11, 'more'=>26),
@@ -69,7 +69,7 @@ 
         12=>array('more'=>20) ),
     2006 => array(
         1=>array('less'=>9),
-        2=>array('between'=>array(16,27)),
+        2=>array('between'=>array(16, 27)),
         3=>array('more'=>30),
         4=>array('less'=>18),
         5=>array('more'=>25),
@@ -82,7 +82,7 @@ 
     ),
     2007 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(8,19)),
+        2=>array('between'=>array(8, 19)),
         3=>array('more'=>29),
         4=>array('less'=>16),
         5=>array('more'=>24),
@@ -95,8 +95,8 @@ 
     ),
     2008 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(7,18)),
-        4=>array('between'=>array(3,21)),
+        2=>array('between'=>array(7, 18)),
+        4=>array('between'=>array(3, 21)),
         5=>array('more'=>22),
         6=>array('less'=>2),
         7=>array('more'=>22),
@@ -107,8 +107,8 @@ 
     ),
     2009 => array(
         1=>array('less'=>12),
-        2=>array('between'=>array(12,23)),
-        4=>array('between'=>array(2,20)),
+        2=>array('between'=>array(12, 23)),
+        4=>array('between'=>array(2, 20)),
         5=>array('more'=>21),
         6=>array('less'=>1),
         7=>array('more'=>21),
@@ -119,7 +119,7 @@ 
     ),
     2010 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(10,22)),
+        2=>array('between'=>array(10, 22)),
         3=>array('more'=>30),
         4=>array('less'=>6, 'more'=>8),
         5=>array('less'=>18, 'more'=>27),
@@ -132,62 +132,62 @@ 
     ),
     2011 => array(
         1=>array('less'=>10),
-        2=>array('between'=>array(17,28)),
-        4=>array('between'=>array(5,26)),
+        2=>array('between'=>array(17, 28)),
+        4=>array('between'=>array(5, 26)),
         5=>array('more'=>24),
         6=>array('less'=>7),
         7=>array('more'=>19),
         8=>array('all'=>1),
         9=>array('less'=>5, 'more'=>15),
         10=>array('less'=>10),
-        11=>array('between'=>array(15,21)),
+        11=>array('between'=>array(15, 21)),
         12=>array('more'=>20),
     ),
     2012 => array(
         1=>array('less'=>10),
-        2=>array('between'=>array(9,20)),
+        2=>array('between'=>array(9, 20)),
         3=>array('more'=>27),
         4=>array('less'=>16),
         5=>array('more'=>24),
         6=>array('less'=>11),
         7=>array('more'=>17),
         8=>array('all'=>1),
-        9=>array('less'=>3,'more'=>18),
+        9=>array('less'=>3, 'more'=>18),
         10=>array('less'=>15),
-        11=>array('between'=>array(13,19)),
+        11=>array('between'=>array(13, 19)),
         12=>array('more'=>20)
     ),
     2013 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(14,25)),
+        2=>array('between'=>array(14, 25)),
         3=>array('more'=>26),
         4=>array('less'=>15),
         5=>array('more'=>21),
         6=>array('less'=>3),
         7=>array('more'=>18),
         8=>array('all'=>1),
-        9=>array('less'=>2,'more'=>13),
+        9=>array('less'=>2, 'more'=>13),
         10=>array('less'=>8),
-        11=>array('between'=>array(12,18)),
+        11=>array('between'=>array(12, 18)),
         12=>array('more'=>19)
     ),
     2014 => array(
         1=>array('less'=>6),
-        2=>array('between'=>array(13,24)),
-        4=>array('between'=>array(10,28)),
-        5=>array('between'=>array(1,6))
+        2=>array('between'=>array(13, 24)),
+        4=>array('between'=>array(10, 28)),
+        5=>array('between'=>array(1, 6))
     ),
     2015 => array(
         7=>array('more'=>21),
         8=>array('all'=>1),
         9=>array('less'=>7, 'more'=>17),
         10=>array('less'=>12),
-        11=>array('between'=>array(10,16)),
+        11=>array('between'=>array(10, 16)),
         12=>array('more'=>17)
     ),
     2016 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(11,22))
+        2=>array('between'=>array(11, 22))
     )
 );
 # Lords differences
@@ -199,15 +199,15 @@ 
 $GLOBALS['recessdates'][101][2010][12]['more'] = 22;
 $GLOBALS['recessdates'][101][2011] = array(
     1 => array('less'=>10),
-    2 => array('between'=>array(16,28)),
-    4 => array('between'=>array(6,26)),
+    2 => array('between'=>array(16, 28)),
+    4 => array('between'=>array(6, 26)),
     5 => array('more'=>25),
     6 => array('less'=>6),
     7 => array('more'=>20),
     8 => array('all'=>1),
     9 => array('less'=>5, 'more'=>15),
     10 => array('less'=>3),
-    11=>array('between'=>array(16,21)),
+    11=>array('between'=>array(16, 21)),
     12 => array('more'=>21),
 );
 
@@ -216,74 +216,74 @@ 
     1999 => array(
         7 => array('more' => 2),
         8 => array('less' => 31),
-        10 => array('between' => array(8,25)),
+        10 => array('between' => array(8, 25)),
         12 => array('more' => 17)
     ),
     2000 => array(
         1 => array('less' => 10),
-        4 => array('between' => array(7,25)),
+        4 => array('between' => array(7, 25)),
         7 => array('more' => 7),
         8 => array('all' => 1),
         9 => array('less' => 4),
-        10 => array('between' => array(6,23)),
+        10 => array('between' => array(6, 23)),
         12 => array('more' => 20)
     ),
     2001 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(16,26)),
-        4=>array('between'=>array(6,23)),
+        2=>array('between'=>array(16, 26)),
+        4=>array('between'=>array(6, 23)),
         6=>array('more'=>29),
         7=>array('all'=>1),
         8=>array('all'=>1),
         9=>array('less'=>3),
-        10=>array('between'=>array(5,22)),
+        10=>array('between'=>array(5, 22)),
         12=>array('more'=>21) ),
     2002 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(15,25)),
+        2=>array('between'=>array(15, 25)),
         3=>array('more'=>28),
         4=>array('less'=>15),
         7=>array('more'=>10),
         8=>array('all'=>1),
         9=>array('less'=>2),
-        10=>array('between'=>array(11,28)),
+        10=>array('between'=>array(11, 28)),
         12=>array('more'=>20) ),
     2003 => array(
         1=>array('less'=>6),
-        4=>array('between'=>array(0,31)),
+        4=>array('between'=>array(0, 31)),
         5=>array('less'=>2),
         6=>array('more'=>27),
         7=>array('all'=>1),
         8=>array('all'=>1),
-        10=>array('between'=>array(10,27)),
+        10=>array('between'=>array(10, 27)),
         12=>array('more'=>19)),
     2004 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(13,23)),
-        4=>array('between'=>array(2,19)),
+        2=>array('between'=>array(13, 23)),
+        4=>array('between'=>array(2, 19)),
         6=>array('more'=>25),
         7=>array('all'=>1),
         8=>array('less'=>30),
-        10=>array('between'=>array(10,23)),
+        10=>array('between'=>array(10, 23)),
         12=>array('more'=>26) ),
     2005 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(11,21)),
+        2=>array('between'=>array(11, 21)),
         3=>array('more'=>24),
         4=>array('less'=>11),
         7=>array('more'=>1),
         8=>array('all'=>1),
         9=>array('less'=>5),
-        10=>array('between'=>array(7,24)),
+        10=>array('between'=>array(7, 24)),
         12=>array('more'=>23) ),
     2006 => array(
         1=>array('less'=>9),
-        2=>array('between'=>array(10,20)),
+        2=>array('between'=>array(10, 20)),
         4=>array('less'=>18),
         7=>array('more'=>0),
         8=>array('all'=>1),
         9=>array('less'=>4),
-        10=>array('between'=>array(6,23)),
+        10=>array('between'=>array(6, 23)),
         12=>array('more'=>22),
     ),
     2007 => array(
@@ -293,18 +293,18 @@ 
         7=>array('all'=>1),
         8=>array('all'=>1),
         9=>array('less'=>3),
-        10=>array('between'=>array(5,22)),
+        10=>array('between'=>array(5, 22)),
         12=>array('more'=>21),
     ),
     2008 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(8,18)),
+        2=>array('between'=>array(8, 18)),
         3=>array('more'=>28),
         4=>array('less'=>14),
         6=>array('more'=>27),
         7=>array('all'=>1),
         8=>array('all'=>1),
-        10=>array('between'=>array(10,27)),
+        10=>array('between'=>array(10, 27)),
     ),
 );
 
@@ -369,39 +369,39 @@ 
         else
             $to = "$year-9-" . $dates[$year][9]['less'];
     }
-    if ( (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])
+    if ((isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])
     || (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more'])
     || (isset($dates[$year][$month]['between']) && $day > $dates[$year][$month]['between'][0] && $day < $dates[$year][$month]['between'][1])
-    || (isset($dates[$year][$month]['between'][2]) && $day > $dates[$year][$month]['between'][2] && $day < $dates[$year][$month]['between'][3]) ) {
+    || (isset($dates[$year][$month]['between'][2]) && $day > $dates[$year][$month]['between'][2] && $day < $dates[$year][$month]['between'][3])) {
         switch ($month) {
             case 1: case 12: $recess = 'Christmas Recess'; break;
-            case 2: if ($body==1 || $body==101) $recess = 'Half Term Week';
-                elseif ($body==4) $recess = 'February Recess';
+            case 2: if ($body == 1 || $body == 101) $recess = 'Half Term Week';
+                elseif ($body == 4) $recess = 'February Recess';
                 break;
-            case 3: if ($body==1 || $body==101) $recess = 'Easter Recess';
-                elseif ($body==4) $recess = 'Spring Recess';
+            case 3: if ($body == 1 || $body == 101) $recess = 'Easter Recess';
+                elseif ($body == 4) $recess = 'Spring Recess';
                 break;
             case 4: if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
                     $recess = 'Election Recess';
-                } elseif ($body==4 && $year==2003) {
+                } elseif ($body == 4 && $year == 2003) {
                     $recess = 'Election Recess';
-                } elseif ($body==1 || $body==101) {
+                } elseif ($body == 1 || $body == 101) {
                     $recess = 'Easter Recess';
-                } elseif ($body==4) {
+                } elseif ($body == 4) {
                     $recess = 'Spring Recess';
                 }
                 break;
-            case 5: if ($year==2001 || (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])) {
+            case 5: if ($year == 2001 || (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])) {
                     $recess = 'Election Recess';
                 } else {
                     $recess = 'Whit Recess';
                 }
                 break;
-            case 6: if ($year==2001) {
+            case 6: if ($year == 2001) {
                     $recess = 'Election Recess';
-                } elseif ($body==1 || $body==101) {
+                } elseif ($body == 1 || $body == 101) {
                     $recess = 'Whit Recess';
-                } elseif ($body==4) {
+                } elseif ($body == 4) {
                     $recess = 'Summer Recess';
                 } else {
                     trigger_error("Argh6");
@@ -411,15 +411,15 @@ 
                 break;
             case 9: if (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less']) {
                     $recess = 'Summer Recess';
-                } elseif ($body==1 || $body==101) {
+                } elseif ($body == 1 || $body == 101) {
                     $recess = 'Conference Recess';
                 } else {
                     trigger_error("Argh9");
                 }
                 break;
-            case 10: if ($body==1 || $body==101) $recess = 'Conference Recess';
-                elseif ($body==4) $recess = 'Autumn Recess';
-                elseif ($body==5) $recess = 'Halloween Recess';
+            case 10: if ($body == 1 || $body == 101) $recess = 'Conference Recess';
+                elseif ($body == 4) $recess = 'Autumn Recess';
+                elseif ($body == 5) $recess = 'Halloween Recess';
                 break;
             case 11: $recess = 'Autumn Recess';
                 break;
@@ -427,12 +427,12 @@ 
         }
         if (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less']) {
             $to = "$year-$month-" . $dates[$year][$month]['less'];
-            if ($month==1)
-                $from = ($year-1)."-12-" . $dates[$year-1][12]['more'];
+            if ($month == 1)
+                $from = ($year - 1) . "-12-" . $dates[$year - 1][12]['more'];
             else {
-                for ($newmonth = $month-1; $newmonth>=1; $newmonth--) {
+                for ($newmonth = $month - 1; $newmonth >= 1; $newmonth--) {
                     if (isset($dates[$year][$newmonth]['more'])) {
-                        $from = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['more'];
+                        $from = "$year-" . ($newmonth) . "-" . $dates[$year][$newmonth]['more'];
                         break;
                     }
                 }
@@ -440,12 +440,12 @@ 
         }
         if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
             $from = "$year-$month-" . $dates[$year][$month]['more'];
-            if ($month==12)
-                $to = ($year+1)."-01-" . $dates[$year+1][1]['less'];
+            if ($month == 12)
+                $to = ($year + 1) . "-01-" . $dates[$year + 1][1]['less'];
             else {
-                for ($newmonth = $month+1; $newmonth<=12; $newmonth++) {
+                for ($newmonth = $month + 1; $newmonth <= 12; $newmonth++) {
                     if (isset($dates[$year][$newmonth]['less'])) {
-                        $to = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['less'];
+                        $to = "$year-" . ($newmonth) . "-" . $dates[$year][$newmonth]['less'];
                         break;
                     }
                 }

www/includes/easyparliament/alert.php

Indentation +5 added lines, -5 removed lines

@@ -52,9 +52,9 @@ 
 // FUNCTION: fetch_between
 
     public function fetch_between($confirmed, $deleted, $start_date, $end_date) {
-      // Return summary data on all the alerts that were created between $start_date
-      // and $end_date (inclusive) and whose confirmed and deleted values match the booleans
-      // passed in $confirmed and $deleted
+        // Return summary data on all the alerts that were created between $start_date
+        // and $end_date (inclusive) and whose confirmed and deleted values match the booleans
+        // passed in $confirmed and $deleted
         $q = $this->db->query("SELECT   criteria, count(*) as cnt
             FROM     alerts
             WHERE    confirmed = :confirmed
@@ -69,8 +69,8 @@ 
             ));
         $data = array();
     for ($row=0; $row<$q->rows(); $row++) {
-      $contents = array('criteria' => $q->field($row, 'criteria'), 'count' => $q->field($row, 'cnt'));
-          $data[] = $contents;
+        $contents = array('criteria' => $q->field($row, 'criteria'), 'count' => $q->field($row, 'cnt'));
+            $data[] = $contents;
     }
     $data = array ('alerts' => $data);
 

Spacing +16 added lines, -16 removed lines

@@ -41,7 +41,7 @@ 
     public $token_checked = null;
     private $alert_id = "";
     public $email = "";
-    public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $criteria = ""; // Sets the terms that are used to produce the search results.
 
     private $db;
 
@@ -68,11 +68,11 @@ 
             ':end_date' => $end_date
             ));
         $data = array();
-    for ($row=0; $row<$q->rows(); $row++) {
+    for ($row = 0; $row < $q->rows(); $row++) {
       $contents = array('criteria' => $q->field($row, 'criteria'), 'count' => $q->field($row, 'cnt'));
           $data[] = $contents;
     }
-    $data = array ('alerts' => $data);
+    $data = array('alerts' => $data);
 
     return $data;
     }
@@ -100,7 +100,7 @@ 
 
         $data = array();
 
-            for ($row=0; $row<$q->rows(); $row++) {
+            for ($row = 0; $row < $q->rows(); $row++) {
                 $contents = array(
                 'alert_id' 	=> $q->field($row, 'alert_id'),
                 'email' 	=> $q->field($row, 'email'),
@@ -112,13 +112,13 @@ 
                 $data[] = $contents;
             }
             $info = "Alert";
-            $data = array ('info' => $info, 'data' => $data);
+            $data = array('info' => $info, 'data' => $data);
 
 
             return $data;
     }
 
-    public function add($details, $confirmation_email=false, $instantly_confirm=true) {
+    public function add($details, $confirmation_email = false, $instantly_confirm = true) {
 
         // Adds a new alert's info into the database.
         // Then calls another function to send them a confirmation email.
@@ -182,7 +182,7 @@ 
             // This gives a code for their email address which is then joined
             // to the timestamp so as to provide a unique ID for each alert.
 
-            $token = substr( password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16 );
+            $token = substr(password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16);
 
             // Full stops don't work well at the end of URLs in emails,
             // so replace them. We won't be doing anything clever with the hash
@@ -255,19 +255,19 @@ 
 
         $urltoken = $this->alert_id . '-' . $this->registrationtoken;
 
-        if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
+        if (isset($details['confirm_base']) && $details['confirm_base'] !== '') {
             $confirmurl = $details['confirm_base'] . $urltoken;
         } else {
             $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
         }
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME' 	=> 'THEY WORK FOR YOU',
             'LASTNAME' 		=> ' ALERT CONFIRMATION',
             'CONFIRMURL'	=> $confirmurl,
@@ -283,7 +283,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup'
         );
@@ -291,7 +291,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME' 	=> 'THEY WORK FOR YOU',
             'LASTNAME' 		=> ' ALERT ALREADY SIGNED UP',
             'CRITERIA'	=> $this->criteria_pretty()
@@ -442,17 +442,17 @@ 
     public function email() { return $this->email; }
     public function criteria() { return $this->criteria; }
     public function criteria_pretty($html = false) {
-        $criteria = explode(' ',$this->criteria);
+        $criteria = explode(' ', $this->criteria);
         $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($this->criteria));
         $words = array();
         foreach ($criteria as $c) {
-            if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $words[] = $c;
             }
         }
         $criteria = '';
-        if (count($words)) $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
-        if ($spokenby) $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        if (count($words)) $criteria .= ($html ? '<li>' : '* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html ? '</li>' : '') . "\n";
+        if ($spokenby) $criteria .= ($html ? '<li>' : '* ') . "Things by " . implode(' or ', $spokenby) . ($html ? '</li>' : '') . "\n";
         return $criteria;
     }
 

Braces +30 added lines, -13 removed lines

@@ -340,17 +340,20 @@ 
     }
 
     public function check_token($token) {
-        if (!is_null($this->token_checked))
-            return $this->token_checked;
+        if (!is_null($this->token_checked)) {
+                    return $this->token_checked;
+        }
 
         $arg = strstr($token, '::') ? '::' : '-';
         $token_parts = explode($arg, $token);
-        if (count($token_parts) != 2)
-            return false;
+        if (count($token_parts) != 2) {
+                    return false;
+        }
 
         list($alert_id, $registrationtoken) = $token_parts;
-        if (!is_numeric($alert_id) || !$registrationtoken)
-            return false;
+        if (!is_numeric($alert_id) || !$registrationtoken) {
+                    return false;
+        }
 
         $q = $this->db->query("SELECT alert_id, email, criteria
                         FROM alerts
@@ -398,7 +401,9 @@ 
     // If all goes well the alert will be confirmed.
     // The alert will be active when scripts run each day to send the actual emails.
     public function confirm($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $this->criteria = $alert['criteria'];
         $this->email = $alert['email'];
         $r = $this->db->query("UPDATE alerts SET confirmed = 1, deleted = 0 WHERE alert_id = :alert_id", array(
@@ -412,7 +417,9 @@ 
     // and the deletion page has passed the token from the URL to here.
     // If all goes well the alert will be deleted.
     public function delete($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("DELETE FROM alerts WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -421,7 +428,9 @@ 
     }
 
     public function delete_all($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("DELETE FROM alerts WHERE email = :email", array(
             ':email' => $alert['email']
             ));
@@ -430,7 +439,9 @@ 
     }
 
     public function suspend($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("UPDATE alerts SET deleted = 2 WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -439,7 +450,9 @@ 
     }
 
     public function resume($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("UPDATE alerts SET deleted = 0 WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -460,8 +473,12 @@ 
             }
         }
         $criteria = '';
-        if (count($words)) $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
-        if ($spokenby) $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        if (count($words)) {
+            $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
+        }
+        if ($spokenby) {
+            $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        }
         return $criteria;
     }
 

www/includes/utility.php

Indentation +40 added lines, -40 removed lines

@@ -67,11 +67,11 @@ 
     # Ignore errors we've asked to ignore
     if (error_reporting()==0) return;
 
-   // define an assoc array of error string
-   // in reality the only entries we should
-   // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
-   // E_USER_WARNING and E_USER_NOTICE
-   # Commented out are ones that a user function cannot handle.
+    // define an assoc array of error string
+    // in reality the only entries we should
+    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
+    // E_USER_WARNING and E_USER_NOTICE
+    # Commented out are ones that a user function cannot handle.
     $errortype = array (
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
@@ -200,8 +200,8 @@ 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
 function adodb_backtrace($print=true)
 {
-  $s = '';
-  if (PHPVERSION() >= 4.3) {
+    $s = '';
+    if (PHPVERSION() >= 4.3) {
 
     $MAXSTRLEN = 64;
 
@@ -209,33 +209,33 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
-      $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
-      $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+        for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+        $tabs -= 1;
+        if (isset($arr['class'])) $s .= $arr['class'].'.';
+        $args = array();
+        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 {
-      $v = (string) @$v;
-      $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
-      $args[] = $str;
+        $v = (string) @$v;
+        $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
+        if (strlen($v) > $MAXSTRLEN) $str .= '...';
+        $args[] = $str;
     }
-      }
+        }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
-      //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
-      //            " file: <a href=\"file:/%s\">%s</a></font>",
-      //        $arr['line'],$arr['file'],$arr['file']);
-      $s .= "\n";
+        $s .= $arr['function'].'('.implode(', ',$args).')';
+        //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
+        //            " file: <a href=\"file:/%s\">%s</a></font>",
+        //        $arr['line'],$arr['file'],$arr['file']);
+        $s .= "\n";
     }
     if ($print) print $s;
-  }
+    }
 
-  return $s;
+    return $s;
 }
 
 // Far from foolproof, but better than nothing.
@@ -567,14 +567,14 @@ 
     //$tbl["»"] = "&raquo;";
     //$tbl["«"] = "&laquo;";
 
-  // lib_filter will replace unmatched < and > with entities so
-  // we abuse strtr's only replace once behaviour to not double
-  // encode them. May not be robust.
-  // This does mean if anyone actually wants to put &gt; or &lt;
-  // in a comment they can't but that's a lot less likely than
-  // < or > for less than and greater than.
-  $tbl['&lt;'] = "&lt;";
-  $tbl['&gt;'] = "&gt;";
+    // lib_filter will replace unmatched < and > with entities so
+    // we abuse strtr's only replace once behaviour to not double
+    // encode them. May not be robust.
+    // This does mean if anyone actually wants to put &gt; or &lt;
+    // in a comment they can't but that's a lot less likely than
+    // < or > for less than and greater than.
+    $tbl['&lt;'] = "&lt;";
+    $tbl['&gt;'] = "&gt;";
 
     // Don't want to encode these things
     unset ($tbl["<"]);
@@ -764,16 +764,16 @@ 
     if (!$from) $from = CONTACTEMAIL;
 
     $headers =
-     "From: TheyWorkForYou <$from>\r\n" .
-     "Content-Type: text/plain; charset=utf-8\r\n" .
-     "MIME-Version: 1.0\r\n" .
-     "Content-Transfer-Encoding: 8bit\r\n" .
-     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
-     "X-Mailer: PHP/" . phpversion();
+        "From: TheyWorkForYou <$from>\r\n" .
+        "Content-Type: text/plain; charset=utf-8\r\n" .
+        "MIME-Version: 1.0\r\n" .
+        "Content-Transfer-Encoding: 8bit\r\n" .
+        ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
+        "X-Mailer: PHP/" . phpversion();
     twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'");
 
     if ($want_bounces) {
-      $envelope_sender = twfy_verp_envelope_sender($to);
+        $envelope_sender = twfy_verp_envelope_sender($to);
         $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
     } else {
         $success = mail ($to, $subject, $message, $headers);
@@ -1063,7 +1063,7 @@ 
 
     $return = '<h4>';
     if (isset($daytext[$major])) {
-     $return .= $daytext[$major] . ' ';
+        $return .= $daytext[$major] . ' ';
     }
 
     $return .= '<a href="';

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

@@ -887,7 +887,7 @@ 
     return $string;
 }
 
-function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = NULL) {
+function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = null) {
 
     // Case for Elizabeth II
     if ($house == HOUSE_TYPE_ROYAL)
@@ -903,7 +903,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== NULL)
+    if ($pid !== null)
     {
         $out .= $pid . '/';
     }

Braces +115 added lines, -69 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 {
@@ -761,7 +778,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" .
@@ -853,17 +872,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";
@@ -871,8 +894,9 @@ 
 
 function make_plural($word, $number)
 {
-    if ($number == 1)
-        return $word;
+    if ($number == 1) {
+            return $word;
+    }
     return $word . "s";
 }
 
@@ -890,8 +914,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';
     }
 
@@ -903,8 +926,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== NULL)
-    {
+    if ($pid !== NULL) {
         $out .= $pid . '/';
     }
 
@@ -912,8 +934,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))));
     }
 
@@ -929,11 +950,18 @@ 
         }
     } elseif ($house == 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;
-    } elseif ($house == HOUSE_TYPE_ROYAL) { # Queen
+        if ($family_name) {
+            $s .= ' ' . $family_name;
+        }
+        if ($lordofname) {
+            $s .= ' of ' . $lordofname;
+        }
+    } elseif ($house == HOUSE_TYPE_ROYAL) {
+# Queen
         $s = "$given_name $family_name";
     }
     return $s;
@@ -962,12 +990,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;
@@ -985,13 +1018,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]);
+            }
         }
     }
 
@@ -1000,22 +1036,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 '
@@ -1067,14 +1110,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;
@@ -1082,20 +1127,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;
 }
 

Spacing +77 added lines, -77 removed lines

@@ -10,7 +10,7 @@ 
 
 # Pass it a brief header word and some debug text and it'll be output.
 # If TEXT is an array, call the user function, assuming it's a class.
-function twfy_debug($header, $text="") {
+function twfy_debug($header, $text = "") {
 
     // We set ?DEBUGTAG=n in the URL.
     // (DEBUGTAG is set in config.php).
@@ -27,10 +27,10 @@ 
     if ($debug_level != '') {
 
         // Set which level shows which types of debug info.
-        $levels = array (
-            1 => array ('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
-            2 => array ('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
-            3 => array ('SQLRESULT')
+        $levels = array(
+            1 => array('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
+            2 => array('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
+            3 => array('SQLRESULT')
             // Higher than this: 'DATA', etc.
         );
 
@@ -44,11 +44,11 @@ 
         }
 
         for ($n = 1; $n <= $max_level_to_show; $n++) {
-            $allowed_headers = array_merge ($allowed_headers, $levels[$n] );
+            $allowed_headers = array_merge($allowed_headers, $levels[$n]);
         }
 
         // If we can show this header, then, er, show it.
-        if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
+        if (in_array($header, $allowed_headers) || $debug_level >= 4) {
             if (is_array($text)) $text = call_user_func($text);
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
@@ -65,14 +65,14 @@ 
     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
    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
    // E_USER_WARNING and E_USER_NOTICE
    # Commented out are ones that a user function cannot handle.
-    $errortype = array (
+    $errortype = array(
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
         #E_PARSE            => "Parsing Error",
@@ -131,11 +131,11 @@ 
         $source = file($filename);
         $err .= "\nSource:\n\n";
         // Show the line, plus prev and next, with line numbers.
-        $err .= $linenum-2 . " " . $source[$linenum-3];
-        $err .= $linenum-1 . " " . $source[$linenum-2];
-        $err .= $linenum . " " . $source[$linenum-1];
-        $err .= $linenum+1 . " " . $source[$linenum];
-        $err .= $linenum+2 . " " . $source[$linenum+1];
+        $err .= $linenum - 2 . " " . $source[$linenum - 3];
+        $err .= $linenum - 1 . " " . $source[$linenum - 2];
+        $err .= $linenum . " " . $source[$linenum - 1];
+        $err .= $linenum + 1 . " " . $source[$linenum];
+        $err .= $linenum + 2 . " " . $source[$linenum + 1];
     }
 
 
@@ -179,8 +179,8 @@ 
             header('HTTP/1.0 500 Internal Server Error');
             print "<p>Oops, sorry, an error has occurred!</p>\n";
         }
-        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect')===false && strpos($errmsg, 'mysql_connect')===false) {
-            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n".  "X-Mailer: PHP/" . phpversion() );
+        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect') === false && strpos($errmsg, 'mysql_connect') === false) {
+            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n" . "X-Mailer: PHP/" . phpversion());
         }
     }
 
@@ -198,7 +198,7 @@ 
 }
 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
-function adodb_backtrace($print=true)
+function adodb_backtrace($print = true)
 {
   $s = '';
   if (PHPVERSION() >= 4.3) {
@@ -207,26 +207,26 @@ 
 
     $traceArr = debug_backtrace();
     array_shift($traceArr);
-    $tabs = sizeof($traceArr)-1;
+    $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 (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
+    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));
+      $str = _htmlspecialchars(substr($v, 0, $MAXSTRLEN));
       if (strlen($v) > $MAXSTRLEN) $str .= '...';
       $args[] = $str;
     }
       }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
+      $s .= $arr['function'] . '(' . implode(', ', $args) . ')';
       //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
       //            " file: <a href=\"file:/%s\">%s</a></font>",
       //        $arr['line'],$arr['file'],$arr['file']);
@@ -240,9 +240,9 @@ 
 
 // Far from foolproof, but better than nothing.
 function validate_email($string) {
-    if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+'.
-        '@'.
-        '[-!#$%&\'*.\\+\/0-9=?A-Z^_`a-z{|}~]+\.'.
+    if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+' .
+        '@' .
+        '[-!#$%&\'*.\\+\/0-9=?A-Z^_`a-z{|}~]+\.' .
         '[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+$/', $string)) {
         return false;
     } else {
@@ -264,7 +264,7 @@ 
     $nom = '0123456789';
     $gap = '\s\.';
 
-    if (    preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
+    if (preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
@@ -280,7 +280,7 @@ 
 // Returns the unixtime in microseconds.
 function getmicrotime() {
     $mtime = microtime();
-    $mtime = explode(" ",$mtime);
+    $mtime = explode(" ", $mtime);
     $mtime = $mtime[1] + $mtime[0];
 
     return $mtime;
@@ -293,7 +293,7 @@ 
     global $timestamp_last, $timestamp_start;
     $t = getmicrotime();
     twfy_debug("TIME", sprintf("%f msecs since start; %f msecs since last; %s",
-            ($t - $timestamp_start)*1000.0, ($t - $timestamp_last)*1000.0, $label));
+            ($t - $timestamp_start) * 1000.0, ($t - $timestamp_last) * 1000.0, $label));
     $timestamp_last = $t;
 }
 
@@ -307,7 +307,7 @@ 
     if (preg_match("/^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/", $timestamp, $matches)) {
         list($string, $year, $month, $day, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec, $month, $day, $year));
+        return gmdate($format, gmmktime($hour, $min, $sec, $month, $day, $year));
     } else {
         return "";
     }
@@ -328,13 +328,13 @@ 
         list($string, $year, $month, $day) = $matches;
         if ($year < 1902) { # gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
-                return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months_short[$month + 0] . " $year";
             } else {
-                return ($day+0) . ' ' . $format_date_months[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months[$month + 0] . " $year";
             }
         }
 
-        return gmdate ($format, gmmktime(0, 0, 0, $month, $day, $year));
+        return gmdate($format, gmmktime(0, 0, 0, $month, $day, $year));
     } else {
         return "";
     }
@@ -350,7 +350,7 @@ 
     if (preg_match("/^(\d\d):(\d\d):(\d\d)$/", $time, $matches)) {
         list($string, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec));
+        return gmdate($format, gmmktime($hour, $min, $sec));
     } else {
         return "";
     }
@@ -371,16 +371,16 @@ 
     $in_seconds = strtotime($datetime);
     $now = time();
 
-    $diff   =  $now - $in_seconds;
-    $months =  floor($diff/2419200);
+    $diff   = $now - $in_seconds;
+    $months = floor($diff / 2419200);
     $diff   -= $months * 2419200;
-    $weeks  =  floor($diff/604800);
-    $diff   -= $weeks*604800;
-    $days   =  floor($diff/86400);
+    $weeks  = floor($diff / 604800);
+    $diff   -= $weeks * 604800;
+    $days   = floor($diff / 86400);
     $diff   -= $days * 86400;
-    $hours  =  floor($diff/3600);
+    $hours  = floor($diff / 3600);
     $diff   -= $hours * 3600;
-    $minutes = floor($diff/60);
+    $minutes = floor($diff / 60);
     $diff   -= $minutes * 60;
     $seconds = $diff;
 
@@ -394,27 +394,27 @@ 
         $relative_date = '';
         if ($weeks > 0) {
             // Weeks and days
-            $relative_date .= ($relative_date?', ':'').$weeks.' week'.($weeks>1?'s':'');
-            $relative_date .= $days>0?($relative_date?', ':'').$days.' day'.($days>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
+            $relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
         } elseif ($days > 0) {
             // days and hours
-            $relative_date .= ($relative_date?', ':'').$days.' day'.($days>1?'s':'');
-            $relative_date .= $hours>0?($relative_date?', ':'').$hours.' hour'.($hours>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
+            $relative_date .= $hours > 0 ? ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
         } elseif ($hours > 0) {
             // hours and minutes
-            $relative_date .= ($relative_date?', ':'').$hours.' hour'.($hours>1?'s':'');
-            $relative_date .= $minutes>0?($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
+            $relative_date .= $minutes > 0 ? ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
         } elseif ($minutes > 0) {
             // minutes only
-            $relative_date .= ($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
         } else {
             // seconds only
-            $relative_date .= ($relative_date?', ':'').$seconds.' second'.($seconds>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $seconds . ' second' . ($seconds > 1 ? 's' : '');
         }
     }
 
     // Return relative date and add proper verbiage
-    return $relative_date.' ago';
+    return $relative_date . ' ago';
 
 }
 
@@ -455,10 +455,10 @@ 
         $text = substr($text, $start);
 
         // Word boundary.
-        if (preg_match ("/.+?\b(.*)/", $text, $matches)) {
+        if (preg_match("/.+?\b(.*)/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the start.
-            $text = preg_replace ("/^\s/", '', $text);
+            $text = preg_replace("/^\s/", '', $text);
         }
         $text = '...' . $text;
     }
@@ -470,10 +470,10 @@ 
         $text = substr($text, 0, $length - 3);
 
         // Word boundary.
-        if (preg_match ("/(.*)\s.+/", $text, $matches)) {
+        if (preg_match("/(.*)\s.+/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the end.
-            $text = preg_replace ("/\s$/", '', $text);
+            $text = preg_replace("/\s$/", '', $text);
         }
         // We don't want to use the HTML entity for an ellipsis (&#8230;), because then
         // it screws up when we subsequently use htmlentities() to print the returned
@@ -505,11 +505,11 @@ 
 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
-        $filter->allowed = array ();
+        $filter->allowed = array();
     } else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
-        $filter->allowed = array (
+        $filter->allowed = array(
             'a' => array('href'),
             'strong' => array(),
             'em' => array(),
@@ -622,7 +622,7 @@ 
 
     // $gid will be like 'uk.org.publicwhip/debate/2003-02-28.475.3'.
 
-    $newgid = substr($gid, strrpos($gid, '/')+1 );
+    $newgid = substr($gid, strrpos($gid, '/') + 1);
     return $newgid;
 }
 
@@ -633,7 +633,7 @@ 
     // will be like 2003-11-20.966.0
     // This function returns 966.0
 
-    return substr( $gid, (strpos($gid, '.') + 1) );
+    return substr($gid, (strpos($gid, '.') + 1));
 }
 
 function preg_replacement_quote($s) {
@@ -677,7 +677,7 @@ 
     global $PAGE;
 
     if (!isset($data['to']) || $data['to'] == '') {
-        $PAGE->error_message ("We need an email address to send to.");
+        $PAGE->error_message("We need an email address to send to.");
         return false;
     }
 
@@ -701,7 +701,7 @@ 
         if (isset($data['subject'])) {
             $subject = trim($data['subject']);
         } else {
-            $subject = trim( substr($firstline, 8) );
+            $subject = trim(substr($firstline, 8));
         }
 
         // Either way, remove this subject line from the template.
@@ -710,7 +710,7 @@ 
     } elseif (isset($data['subject'])) {
         $subject = $data['subject'];
     } else {
-        $PAGE->error_message ("We don't have a subject line for the email, so it wasn't sent.");
+        $PAGE->error_message("We don't have a subject line for the email, so it wasn't sent.");
         return false;
     }
 
@@ -720,14 +720,14 @@ 
     $replace = array();
 
     foreach ($merge as $key => $val) {
-        $search[] = '/{'.$key.'}/';
+        $search[] = '/{' . $key . '}/';
         $replace[] = preg_replacement_quote($val);
     }
 
     $emailtext = preg_replace($search, $replace, $emailtext);
 
     // Send it!
-    $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces);
+    $success = send_email($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces);
 
     return $success;
 
@@ -754,15 +754,15 @@ 
      "Content-Type: text/plain; charset=utf-8\r\n" .
      "MIME-Version: 1.0\r\n" .
      "Content-Transfer-Encoding: 8bit\r\n" .
-     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
+     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "") .
      "X-Mailer: PHP/" . phpversion();
     twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'");
 
     if ($want_bounces) {
       $envelope_sender = twfy_verp_envelope_sender($to);
-        $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
+        $success = mail($to, $subject, $message, $headers, '-f ' . $envelope_sender);
     } else {
-        $success = mail ($to, $subject, $message, $headers);
+        $success = mail($to, $subject, $message, $headers);
     }
 
     return $success;
@@ -774,7 +774,7 @@ 
 // http://www.iamcal.com/publish/article.php?id=13
 
 // Call this with a key name to get a GET or POST variable.
-function get_http_var($name, $default='') {
+function get_http_var($name, $default = '') {
     if (array_key_exists($name, $_GET)) {
         return clean_var($_GET[$name]);
     }
@@ -800,7 +800,7 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
-function get_cookie_var($name, $default='') {
+function get_cookie_var($name, $default = '') {
     if (array_key_exists($name, $_COOKIE)) {
         return clean_var($_COOKIE[$name]);
     }
@@ -811,7 +811,7 @@ 
 // Pass it an array of key names that should not be generated as
 // hidden form variables. It then outputs hidden form variables
 // based on the session_vars for this page.
-function hidden_form_vars ($omit = array()) {
+function hidden_form_vars($omit = array()) {
     global $DATA, $this_page;
 
     $session_vars = $DATA->page_metadata($this_page, "session_vars");
@@ -824,7 +824,7 @@ 
 }
 
 // Deprecated. Use hidden_form_vars, above, instead.
-function hidden_vars ($omit = array()) {
+function hidden_vars($omit = array()) {
     global $DATA;
 
     foreach ($args as $key => $val) {
@@ -867,7 +867,7 @@ 
 function entities_to_numbers($string) {
     $string = str_replace(
         array('&Ouml;', '&acirc;', '&uacute;', '&aacute;', '&iacute;', '&ocirc;', '&eacute;'),
-        array('&#214;', '&#226;',  '&#250;',   '&#225;',   '&#237;',   '&#244;',  '&#233;'  ),
+        array('&#214;', '&#226;', '&#250;', '&#225;', '&#237;', '&#244;', '&#233;'),
         $string
     );
     return $string;
@@ -881,9 +881,9 @@ 
         return 'elizabeth_the_second';
     }
 
-    $s   = array(' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
-    $s2  = array(" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
-    $r   = array('_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o');
+    $s   = array(' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
+    $s2  = array(" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
+    $r   = array('_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o');
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -1023,8 +1023,8 @@ 
                 }
                 $out .= '<li>' . $body . '<ul>';
             } else {
-                $LISTURL->insert( array( 'id' => $gid ) );
-                $out .= '<li><a href="'.$LISTURL->generate().'">';
+                $LISTURL->insert(array('id' => $gid));
+                $out .= '<li><a href="' . $LISTURL->generate() . '">';
                 $out .= $body . '</a>';
             }
         }

www/docs/mp/index.php

Indentation +20 added lines, -20 removed lines

@@ -255,8 +255,8 @@ 
 // Finally, if this is a Votes page, replace the page description with
 // something more descriptive of the actual data on the page.
 if ($pagetype == 'votes') {
-  $title = "Voting record - " . $title;
-  $desc = 'See how ' . $member_name . ' voted on topics like Employment, Social Issues, Foreign Policy, and more.';
+    $title = "Voting record - " . $title;
+    $desc = 'See how ' . $member_name . ' voted on topics like Employment, Social Issues, Foreign Policy, and more.';
 }
 
 // Set page metadata
@@ -359,19 +359,19 @@ 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
         if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
-          $data['key_votes_segments'] = array(
-              array(
-                  'key' => $policy_set,
-                  'title' => $set_descriptions[$policy_set],
-                  'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
-                      $policiesList->limitToSet($policy_set), $MEMBER, $policyOptions
-                  )
-              )
-          );
-          $data['og_image'] = $MEMBER->url(true) . "/policy_set_png?policy_set=" . $policy_set;
-          $data['page_title'] = $policiesList->getSetDescriptions()[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
-          $data['meta_description'] = 'See how ' . $data['full_name'] . ' voted on ' . $policiesList->getSetDescriptions()[$policy_set];
-          $data['single_policy_page'] = true;
+            $data['key_votes_segments'] = array(
+                array(
+                    'key' => $policy_set,
+                    'title' => $set_descriptions[$policy_set],
+                    'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
+                        $policiesList->limitToSet($policy_set), $MEMBER, $policyOptions
+                    )
+                )
+            );
+            $data['og_image'] = $MEMBER->url(true) . "/policy_set_png?policy_set=" . $policy_set;
+            $data['page_title'] = $policiesList->getSetDescriptions()[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
+            $data['meta_description'] = 'See how ' . $data['full_name'] . ' voted on ' . $policiesList->getSetDescriptions()[$policy_set];
+            $data['single_policy_page'] = true;
         } else {
             $data['single_policy_page'] = false;
             $data['key_votes_segments'] = array(
@@ -519,11 +519,11 @@ 
 
         // Generate voting segments
         $data['segment'] = array(
-          'key'   => $policy_set,
-          'title' => $policiesList->getSetDescriptions()[$policy_set],
-          'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
-              $policiesList->limitToSet($policy_set), $MEMBER
-          )
+            'key'   => $policy_set,
+            'title' => $policiesList->getSetDescriptions()[$policy_set],
+            'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
+                $policiesList->limitToSet($policy_set), $MEMBER
+            )
         );
 
         MySociety\TheyWorkForYou\Renderer::output('mp/votes_svg', $data, true);

Switch Indentation +20 added lines, -20 removed lines

@@ -731,26 +731,26 @@
 function person_error_page($message) {
     global $this_page;
     switch($this_page) {
-    case 'mla':
-        $rep = 'MLA';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
-        break;
-    case 'msp':
-        $rep = 'MSP';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
-        break;
-    case 'peer':
-        $rep = 'Lord';
-        $SEARCHURL = '';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
-        break;
-    default:
-        $rep = 'MP';
-        $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
-        $SEARCHURL = $SEARCHURL->generate();
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
+        case 'mla':
+            $rep = 'MLA';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
+            break;
+        case 'msp':
+            $rep = 'MSP';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
+            break;
+        case 'peer':
+            $rep = 'Lord';
+            $SEARCHURL = '';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
+            break;
+        default:
+            $rep = 'MP';
+            $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
+            $SEARCHURL = $SEARCHURL->generate();
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
     }
 
     $data = array(

Braces +139 added lines, -62 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)) {
@@ -256,8 +289,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();
@@ -684,11 +718,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 {
@@ -765,16 +801,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 = '';
@@ -782,8 +823,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
@@ -794,15 +836,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);
@@ -1065,10 +1115,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';
@@ -1081,10 +1134,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;
         }
@@ -1133,11 +1188,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>';
         }
@@ -1161,10 +1222,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;
 }
 
@@ -1176,17 +1239,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; ';
@@ -1225,11 +1292,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);

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

@@ -29,7 +29,7 @@ 
  */
 
 // Disable the old PAGE class.
-$new_style_template = TRUE;
+$new_style_template = true;
 
 // Include all the things this page needs.
 include_once '../../includes/easyparliament/init.php';
@@ -176,7 +176,7 @@ 
 // Basic name, title and description
 $member_name = ucfirst($MEMBER->full_name());
 $title = $member_name;
-$desc = "Read $member_name's contributions to Parliament, including speeches and questions";
+$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())
@@ -220,7 +220,7 @@ 
 }
 
 $known_for = '';
-$current_offices_ignoring_committees = $MEMBER->offices('current', TRUE);
+$current_offices_ignoring_committees = $MEMBER->offices('current', true);
 if (count($current_offices_ignoring_committees) > 0) {
     $known_for = $current_offices_ignoring_committees[0];
 }
@@ -307,11 +307,11 @@ 
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
 
-$data['pre_2010_expenses'] = False;
+$data['pre_2010_expenses'] = false;
 $data['post_2010_expenses'] = $data['leave_date'] > '2010-05-05';
 
 if ($data['entry_date'] < '2010-05-05') {
-    $data['pre_2010_expenses'] = True;
+    $data['pre_2010_expenses'] = true;
     // Set the expenses URL if we know it
     if (isset($MEMBER->extra_info['expenses_url'])) {
         $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'];
@@ -677,7 +677,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect (&$MEMBER, $code = 301, $pagetype = null) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -1163,8 +1163,8 @@ 
     $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["l$category"]))
+        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "l$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
     return $return;
 }
 

Spacing +51 added lines, -51 removed lines

@@ -118,7 +118,7 @@ 
     }
     if ($pid) {
         $URL = new \MySociety\TheyWorkForYou\Url('search');
-        $URL->insert( array('pid'=>$pid, 'pop'=>1) );
+        $URL->insert(array('pid'=>$pid, 'pop'=>1));
         header('Location: ' . $URL->generate('none'));
         exit;
     }
@@ -149,7 +149,7 @@ 
     } elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
     } else {
-        twfy_debug ('MP', "We don't have any way of telling what MP to display");
+        twfy_debug('MP', "We don't have any way of telling what MP to display");
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, but we can’t tell which representative to display.');
     }
     if (!isset($MEMBER) || !$MEMBER->valid) {
@@ -216,7 +216,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_SCOTLAND)) {
         $title .= ', former';
     }
-    $title .= ' MSP, '.$MEMBER->constituency();
+    $title .= ' MSP, ' . $MEMBER->constituency();
 }
 
 $known_for = '';
@@ -284,7 +284,7 @@ 
 $data['eu_stance'] = $MEMBER->getEUStance();
 
 # People who are or were MPs and Lords potentially have voting records, except Sinn Fein MPs
-$data['has_voting_record'] = ( ($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS) );
+$data['has_voting_record'] = (($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS));
 # Everyone who is currently somewhere has email alert signup, apart from current Sinn Fein MPs who are not MLAs
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
@@ -310,9 +310,9 @@ 
 
 $data['this_page'] = $this_page;
 $data['current_assembly'] = 'westminster';
-if ( $this_page == 'msp' || $this_page == 'yourmsp' ) {
+if ($this_page == 'msp' || $this_page == 'yourmsp') {
     $data['current_assembly'] = 'scotland';
-} else if ( $this_page == 'mla' || $this_page == 'yourmla' ) {
+} else if ($this_page == 'mla' || $this_page == 'yourmla') {
     $data['current_assembly'] = 'ni';
 }
 
@@ -328,11 +328,11 @@ 
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
         $policySummaries = $divisions->getMemberDivisionDetails();
 
-        $policyOptions = array( 'summaries' => $policySummaries);
+        $policyOptions = array('summaries' => $policySummaries);
 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
-        if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
+        if ($policy_set && array_key_exists($policy_set, $set_descriptions)) {
           $data['key_votes_segments'] = array(
               array(
                   'key' => $policy_set,
@@ -450,7 +450,7 @@ 
 
     case 'recent':
         $policiesList = new MySociety\TheyWorkForYou\Policies;
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
         $data['divisions'] = $divisions->getRecentMemberDivisions();
@@ -461,15 +461,15 @@ 
 
     case 'divisions':
         $policyID = get_http_var('policy');
-        if ( $policyID ) {
-            $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
+        if ($policyID) {
+            $policiesList = new MySociety\TheyWorkForYou\Policies($policyID);
         } else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
-        if ( $policyID ) {
+        if ($policyID) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
         } else {
             $data['policydivisions'] = $divisions->getAllMemberDivisionsByPolicy();
@@ -546,7 +546,7 @@ 
 
         // generate party policy diffs
         $party = new MySociety\TheyWorkForYou\Party($MEMBER->party());
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $party_positions = $party->getAllPolicyPositions($policiesList);
         $policy_diffs = $MEMBER->getPartyPolicyDiffs($party, $policiesList, $positions, true);
 
@@ -600,16 +600,16 @@ 
     global $THEUSER;
     $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
     if (!validate_postcode($pc)) {
-        twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a valid postcode');
+        twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
     }
-    twfy_debug ('MP', "MP lookup by postcode");
+    twfy_debug('MP', "MP lookup by postcode");
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "connection_timed_out") {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
     } elseif ($constituency == "") {
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a known postcode');
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
     } else {
         // Redirect to the canonical MP page, with a person id.
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
@@ -621,11 +621,11 @@ 
     }
 }
 
-function get_person_by_name($name, $const='') {
+function get_person_by_name($name, $const = '') {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('name' => $name, 'constituency' => $const));
     // Edge case, only attempt further detection if this isn't the Queen.
     if ($name !== 'elizabeth the second' || $const) {
-        twfy_debug ('MP', 'Redirecting for MP found by name/constituency');
+        twfy_debug('MP', 'Redirecting for MP found by name/constituency');
         member_redirect($MEMBER);
     }
     return $MEMBER;
@@ -659,7 +659,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect(&$MEMBER, $code = 301, $pagetype = NULL) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -676,7 +676,7 @@ 
         } else {
             $pagetype = '';
         }
-        header('Location: ' . $url . $pagetype, true, $code );
+        header('Location: ' . $url . $pagetype, true, $code);
         exit;
     }
 }
@@ -704,7 +704,7 @@ 
 
 function person_error_page($message) {
     global $this_page;
-    switch($this_page) {
+    switch ($this_page) {
     case 'mla':
         $rep = 'MLA';
         $SEARCHURL = '/postcode/';
@@ -742,7 +742,7 @@ 
  * Generate the summary of this person's held positions.
  */
 
-function person_summary_description ($MEMBER) {
+function person_summary_description($MEMBER) {
     $entered_house = $MEMBER->entered_house();
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
@@ -753,7 +753,7 @@ 
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
+        if ($house == HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
             continue; # Same info is printed further down
 
         if (!$current_member[$house]) $desc .= 'Former ';
@@ -774,17 +774,17 @@ 
                 $desc .= $last['from'] . ' ';
             }
         }
-        if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
+        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);
@@ -801,7 +801,7 @@ 
  * @return string A HTML summary of this person's rebellion rate.
  */
 
-function person_rebellion_rate ($member) {
+function person_rebellion_rate($member) {
 
     // Rebellion string may be empty.
     $rebellion_string = '';
@@ -839,7 +839,7 @@ 
     // benefit unfortunately.
     twfy_debug_timestamp();
 
-    $person_id= $member->person_id();
+    $person_id = $member->person_id();
 
     $memcache = new MySociety\TheyWorkForYou\Memcache;
     $recent = $memcache->get('recent_appear:' . $person_id);
@@ -850,7 +850,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args = array (
+        $args = array(
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -865,7 +865,7 @@ 
     twfy_debug_timestamp();
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
-    $MOREURL->insert( array('pid'=>$person_id, 'pop'=>1) );
+    $MOREURL->insert(array('pid'=>$person_id, 'pop'=>1));
 
     $out['more_href'] = $MOREURL->generate() . '#n4';
     $out['more_text'] = 'More of ' . ucfirst($member->full_name()) . '&rsquo;s recent appearances';
@@ -1076,7 +1076,7 @@ 
         }
     }
 
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
         $wtt_displayed = display_writetothem_numbers($year, $extra_info);
         if ($wtt_displayed) {
             $out[] = $wtt_displayed;
@@ -1112,15 +1112,15 @@ 
         }
     }
 
-    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 (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 ($has_email_alerts) {
-            $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
+            $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid=' . $member->person_id() . '">email me updates on ' . $member->full_name() . '&rsquo;s activity</a>';
         }
 
         $out[] = $line;
@@ -1150,25 +1150,25 @@ 
 }
 
 function display_stats_line_house($house, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff) {
-    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category =='comments_on_speeches' ||
-        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category =='Lcomments_on_speeches') {
-        if ($extra_info[$category]==0) {
+    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category == 'comments_on_speeches' ||
+        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category == 'Lcomments_on_speeches') {
+        if ($extra_info[$category] == 0) {
             $blurb = preg_replace('#<a.*?>#', '', $blurb);
             $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]);
     $line .= '</strong>';
     $line .= $inwhat;
-    if ($minister===2) {
+    if ($minister === 2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
     } elseif ($minister)
         $line .= ' &#8212; Ministers do not ask written questions';
     else {
-        $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
+        $type = ($house == HOUSE_TYPE_COMMONS ? 'MP' : ($house == HOUSE_TYPE_LORDS ? 'Lord' : 'MLA'));
         if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
             $line .= ' &#8212; ';
             $q = $extra_info[$category . '_quintile'];
@@ -1213,7 +1213,7 @@ 
         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);
+        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);
     }
 
 }
@@ -1221,7 +1221,7 @@ 
 function get_all_writetothem_strings($member, $wtt_stats_years) {
     $extra_info = $member->extra_info();
     $strings = array();
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
 
         if (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
             $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
@@ -1237,7 +1237,7 @@ 
         return;
     }
 
-    $reg = array( 'date' => '', 'data' => '<p>Nil</p>' );
+    $reg = array('date' => '', 'data' => '<p>Nil</p>');
     if (isset($extra_info['register_member_interests_date'])) {
         $reg['date'] = format_date($extra_info['register_member_interests_date'], SHORTDATEFORMAT);
     }
@@ -1272,7 +1272,7 @@ 
             $dissolution['params']);
     }
     $mcon = array(); $mreg = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $cons = $q->field($i, 'constituency');
         if ($house == HOUSE_TYPE_COMMONS) {
@@ -1309,8 +1309,8 @@ 
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] = array (
+    foreach ($mreg as $reg) {
+        $data['members'][] = array(
             'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
             'name' => $reg['given_name'] . ' ' . $reg['family_name']
         );