mysociety / theyworkforyou

classes/Search/ParseArgs.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
             $q = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookup($searchspeaker);
             $pids = array();
             $row_count = $q->rows();
-            for ($i=0; $i<$row_count; $i++) {
+            for ($i = 0; $i < $row_count; $i++) {
                 $pids[$q->field($i, 'person_id')] = true;
             }
             $pids = array_keys($pids);

Braces +28 added lines, -12 removed lines

@@ -28,11 +28,19 @@ 
 
         if (get_http_var('from') || get_http_var('to')) {
             $from = parse_date(get_http_var('from'));
-            if ($from) $from = $from['iso'];
-            else $from = '1935-10-01';
+            if ($from) {
+                $from = $from['iso'];
+            }
+            else {
+                $from = '1935-10-01';
+            }
             $to = parse_date(get_http_var('to'));
-            if ($to) $to = $to['iso'];
-            else $to = date('Y-m-d');
+            if ($to) {
+                $to = $to['iso'];
+            }
+            else {
+                $to = date('Y-m-d');
+            }
             $searchstring .= " $from..$to";
         }
 
@@ -45,11 +53,14 @@ 
         if ($column = trim(get_http_var('column'))) {
             if (preg_match('#^(\d+)W$#', $column, $m)) {
                 $searchstring .= " column:$m[1] section:wrans";
-            } elseif (preg_match('#^(\d+)WH$#', $column, $m)) {
+            }
+            elseif (preg_match('#^(\d+)WH$#', $column, $m)) {
                 $searchstring .= " column:$m[1] section:whall";
-            } elseif (preg_match('#^(\d+)WS$#', $column, $m)) {
+            }
+            elseif (preg_match('#^(\d+)WS$#', $column, $m)) {
                 $searchstring .= " column:$m[1] section:wms";
-            } elseif (preg_match('#^\d+$#', $column)) {
+            }
+            elseif (preg_match('#^\d+$#', $column)) {
                 $searchstring .= " column:$column";
             }
         }
@@ -105,11 +116,14 @@ 
         }
 
         $advsection = get_http_var('section');
-        if (!$advsection)
-            $advsection = get_http_var('maj'); # Old URLs had this
+        if (!$advsection) {
+                    $advsection = get_http_var('maj');
+        }
+        # Old URLs had this
         if (is_array($advsection)) {
             $searchstring .= ' section:' . join(' section:', $advsection);
-        } elseif ($advsection) {
+        }
+        elseif ($advsection) {
             $searchstring .= " section:$advsection";
         }
 
@@ -123,7 +137,8 @@ 
                 $search_main = "($search_main)";
             }
             $searchstring = "$search_main $searchstring";
-        } elseif ($search_main) {
+        }
+        elseif ($search_main) {
             $searchstring = $search_main;
         }
 
@@ -135,7 +150,8 @@ 
         // If q has a value (other than the default empty string) use that over s.
         if (get_http_var('q') != '') {
             $search_main = trim(get_http_var('q'));
-        } else {
+        }
+        else {
             $search_main = trim(get_http_var('s'));
         }
 

classes/Gid.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
 
         if ($q->rows() == 0) {
             return $this->gid;
-        } else {
+        }
+        else {
             do {
                 $gid = $q->field(0, 'gid_to');
                 $q = $this->db->query(

classes/Utility/Search.php

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
         $gids = join('","', $gids);
         $db = new \ParlDB;
         $q = $db->query('SELECT gid,person_id,hdate FROM hansard WHERE gid IN ("' . $gids . '")');
-        for ($n=0; $n<$q->rows(); $n++) {
+        for ($n = 0; $n < $q->rows(); $n++) {
             $gid = $q->field($n, 'gid');
             $person_id = $q->field($n, 'person_id');
             $hdate = $q->field($n, 'hdate');
@@ -63,7 +63,7 @@ 
                             WHERE member.person_id IN (' . $person_ids . ')
                             ' . ($house ? " AND house=$house" : '') . '
                             ORDER BY left_house DESC');
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
                 $mid = $q->field($n, 'member_id');
                 if (!isset($pids[$mid])) {
                     $title = $q->field($n, 'title');
@@ -84,9 +84,9 @@ 
                 if ($dept && $q->field($n, 'to_date') == '9999-12-31')
                     $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
                 if (!isset($speakers[$pid]['name'])) {
-                    $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
+                    $speakers[$pid]['name'] = $full_name . ($house == 1 ? ' MP' : '');
                 }
-                if ( !isset($speakers[$pid]['party']) && $party ) {
+                if (!isset($speakers[$pid]['party']) && $party) {
                     $speakers[$pid]['party'] = $party;
                 }
             }
@@ -139,7 +139,7 @@ 
      * Return query result from looking for MPs
      */
 
-    public static function searchMemberDbLookup($searchstring, $current_only=false) {
+    public static function searchMemberDbLookup($searchstring, $current_only = false) {
         if (!$searchstring) return false;
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
@@ -151,8 +151,8 @@ 
             // And here we're assuming the user's put the names in the right order.
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-'. $searchwords[1] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-' . $searchwords[1] . '%';
             $where = "(given_name LIKE :like_0 AND family_name LIKE :like_1)";
             $where .= " OR (given_name LIKE :like_1 AND family_name LIKE :like_0)";
             $where .= " OR (title LIKE :like_0 AND family_name LIKE :like_1)";
@@ -167,9 +167,9 @@ 
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
             $params[':like_2'] = '%' . $searchwords[2] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' '. $searchwords[2] . '%';
-            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-'. $searchwords[2] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' ' . $searchwords[2] . '%';
+            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-' . $searchwords[2] . '%';
             $where = "(given_name LIKE :like_0_and_1 AND family_name LIKE :like_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2_hyphen)";
@@ -184,15 +184,15 @@ 
         return $q;
     }
 
-    public static function searchMemberDbLookupWithNames($searchstring, $current_only=false) {
+    public static function searchMemberDbLookupWithNames($searchstring, $current_only = false) {
         $q = self::searchMemberDbLookup($searchstring, $current_only);
 
-        if ( !$q->rows ) {
+        if (!$q->rows) {
             return $q;
         }
 
         $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;
         }
@@ -239,7 +239,7 @@ 
             // Looks like a postcode - can we find the constituency?
             $constituency = Postcode::postcodeToConstituency($searchterm);
             if ($constituency) {
-                return array( array($constituency), true );
+                return array(array($constituency), true);
             }
         }
 
@@ -253,11 +253,11 @@ 
         $q = $db->query($query, array(':try' => '%' . $try . '%'));
 
         $constituencies = array();
-        for ($n=0; $n<$q->rows(); $n++) {
+        for ($n = 0; $n < $q->rows(); $n++) {
             $constituencies[] = $q->field($n, 'name');
         }
 
-        return array( $constituencies, false );
+        return array($constituencies, false);
     }
 
     /**
@@ -273,7 +273,7 @@ 
         $speakers = [];
 
         foreach ($criteria as $c) {
-            if (preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $MEMBER = new \MEMBER(array('person_id'=>$m[1]));
                 $speakers[$m[1]] = $MEMBER->full_name();
             }
@@ -292,7 +292,7 @@ 
     public static function speakerIDsToNames($searchstring) {
         $speakers = self::speakerNamesForIDs($searchstring);
 
-        foreach ( $speakers as $id => $name ) {
+        foreach ($speakers as $id => $name) {
             $searchstring = str_replace('speaker:' . $id, "speaker:$name", $searchstring);
         }
 

Braces +19 added lines, -9 removed lines

@@ -28,8 +28,9 @@ 
 
             return $data;
         }
-        if (count($gids) == 5000)
-            $data['limit_reached'] = true;
+        if (count($gids) == 5000) {
+                    $data['limit_reached'] = true;
+        }
 
         # Fetch all the speakers of the results, count them up and get min/max date usage
         $speaker_count = array();
@@ -46,8 +47,12 @@ 
                 $mindate[$person_id] = '9999-12-31';
             }
             $speaker_count[$person_id]++;
-            if ($hdate < $mindate[$person_id]) $mindate[$person_id] = $hdate;
-            if ($hdate > $maxdate[$person_id]) $maxdate[$person_id] = $hdate;
+            if ($hdate < $mindate[$person_id]) {
+                $mindate[$person_id] = $hdate;
+            }
+            if ($hdate > $maxdate[$person_id]) {
+                $maxdate[$person_id] = $hdate;
+            }
         }
 
         # Fetch details of all the speakers
@@ -81,8 +86,9 @@ 
                 $dept = $q->field($n, 'dept');
                 $posn = $q->field($n, 'position');
                 $moffice_id = $q->field($n, 'moffice_id');
-                if ($dept && $q->field($n, 'to_date') == '9999-12-31')
-                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                if ($dept && $q->field($n, 'to_date') == '9999-12-31') {
+                                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                }
                 if (!isset($speakers[$pid]['name'])) {
                     $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
                 }
@@ -140,13 +146,16 @@ 
      */
 
     public static function searchMemberDbLookup($searchstring, $current_only=false) {
-        if (!$searchstring) return false;
+        if (!$searchstring) {
+            return false;
+        }
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
         if (count($searchwords) == 1) {
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $where = "given_name LIKE :like_0 OR family_name LIKE :like_0 OR lordofname LIKE :like_0";
-        } elseif (count($searchwords) == 2) {
+        }
+        elseif (count($searchwords) == 2) {
             // We don't do anything special if there are more than two search words.
             // And here we're assuming the user's put the names in the right order.
             $params[':like_0'] = '%' . $searchwords[0] . '%';
@@ -162,7 +171,8 @@ 
             if (strtolower($searchwords[0]) == 'nick') {
                 $where .= " OR (given_name LIKE '%nicholas%' AND family_name LIKE :like_1)";
             }
-        } else {
+        }
+        else {
             $searchwords[2] = str_replace('of ', '', $searchwords[2]);
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';

classes/Utility/Alert.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
         }
 
         if (!empty($details['pid'])) {
-            $criteria[] = 'speaker:'.$details['pid'];
+            $criteria[] = 'speaker:' . $details['pid'];
         }
 
         $criteria = join(' ', $criteria);
@@ -33,13 +33,13 @@ 
                 ':email' => $email
             ));
         $out = '';
-        for ($i=0; $i<$q->rows(); ++$i) {
+        for ($i = 0; $i < $q->rows(); ++$i) {
             $row = $q->row($i);
-            $criteria = explode(' ',$row['criteria']);
+            $criteria = explode(' ', $row['criteria']);
             $ccc = array();
             $current = true;
             foreach ($criteria as $c) {
-                if (preg_match('#^speaker:(\d+)#',$c,$m)) {
+                if (preg_match('#^speaker:(\d+)#', $c, $m)) {
                     $MEMBER = new \MEMBER(array('person_id'=>$m[1]));
                     $ccc[] = 'spoken by ' . $MEMBER->full_name();
                     if (!$MEMBER->current_member_anywhere()) {
@@ -49,12 +49,12 @@ 
                     $ccc[] = $c;
                 }
             }
-            $criteria = join(' ',$ccc);
+            $criteria = join(' ', $ccc);
             $token = $row['alert_id'] . '-' . $row['registrationtoken'];
-            $action = '<form action="/alert/" method="post"><input type="hidden" name="t" value="'.$token.'">';
+            $action = '<form action="/alert/" method="post"><input type="hidden" name="t" value="' . $token . '">';
             if (!$row['confirmed']) {
                 $action .= '<input type="submit" name="action" value="Confirm">';
-            } elseif ($row['deleted']==2) {
+            } elseif ($row['deleted'] == 2) {
                 $action .= '<input type="submit" name="action" value="Resume">';
             } else {
                 $action .= '<input type="submit" name="action" value="Suspend"> <input type="submit" name="action" value="Delete">';

Braces +8 added lines, -4 removed lines

@@ -45,7 +45,8 @@ 
                     if (!$MEMBER->current_member_anywhere()) {
                         $current = false;
                     }
-                } else {
+                }
+                else {
                     $ccc[] = $c;
                 }
             }
@@ -54,9 +55,11 @@ 
             $action = '<form action="/alert/" method="post"><input type="hidden" name="t" value="'.$token.'">';
             if (!$row['confirmed']) {
                 $action .= '<input type="submit" name="action" value="Confirm">';
-            } elseif ($row['deleted']==2) {
+            }
+            elseif ($row['deleted']==2) {
                 $action .= '<input type="submit" name="action" value="Resume">';
-            } else {
+            }
+            else {
                 $action .= '<input type="submit" name="action" value="Suspend"> <input type="submit" name="action" value="Delete">';
             }
             $action .= '</form>';
@@ -67,7 +70,8 @@ 
         }
         if ($out) {
             print '<table cellpadding="3" cellspacing="0"><tr><th>Criteria</th><th>Action</th></tr>' . $out . '</table>';
-        } else {
+        }
+        else {
             print '<p>You currently have no email alerts set up. You can create alerts <a href="/alert/">here</a>.</p>';
         }
     }

classes/Utility/Member.php

Braces +16 added lines, -8 removed lines

@@ -28,19 +28,24 @@ 
         if (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.jpeg')) {
             $image = IMAGEPATH . 'mpsL/' . $pid . '.jpeg';
             $sz = 'L';
-        } elseif (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.jpg')) {
+        }
+        elseif (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.jpg')) {
             $image = IMAGEPATH . 'mpsL/' . $pid . '.jpg';
             $sz = 'L';
-        } elseif (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.png')) {
+        }
+        elseif (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.png')) {
             $image = IMAGEPATH . 'mpsL/' . $pid . '.png';
             $sz = 'L';
-        } elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.jpeg')) {
+        }
+        elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.jpeg')) {
             $image = IMAGEPATH . 'mps/' . $pid . '.jpeg';
             $sz = 'S';
-        } elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.jpg')) {
+        }
+        elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.jpg')) {
             $image = IMAGEPATH . 'mps/' . $pid . '.jpg';
             $sz = 'S';
-        } elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.png')) {
+        }
+        elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.png')) {
             $image = IMAGEPATH . 'mps/' . $pid . '.png';
             $sz = 'S';
         }
@@ -50,14 +55,17 @@ 
             if ($smallonly) {
                 if ($substitute_missing === "lord") {
                     $image = IMAGEPATH . "unknownlord.png";
-                } else {
+                }
+                else {
                     $image = IMAGEPATH . "unknownperson.png";
                 }
                 $sz = 'S';
-            } else {
+            }
+            else {
                 if ($substitute_missing === "lord") {
                     $image = IMAGEPATH . "unknownlord_large.png";
-                } else {
+                }
+                else {
                     $image = IMAGEPATH . "unknownperson_large.png";
                 }
                 $sz = 'L';

classes/Utility/Calendar.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
         } else {
             $title = $e['title'];
             if ($pid = $e['person_id']) {
-                $MEMBER = new \MEMBER(array( 'person_id' => $pid ));
+                $MEMBER = new \MEMBER(array('person_id' => $pid));
                 $name = $MEMBER->full_name();
                 $title .= " &#8211; <a href='/mp/?p=$pid'>$name</a>";
             }

Braces +12 added lines, -6 removed lines

@@ -31,7 +31,8 @@ 
         if (!$q->rows()) {
             if ($date >= date('Y-m-d')) {
                 $PAGE->error_message('There is currently no information available for that date.', false, 404);
-            } else {
+            }
+            else {
                 $PAGE->error_message('There is no information available for that date.', false, 404);
             }
 
@@ -53,7 +54,8 @@ 
 
         if (strstr($e['chamber'], 'Select Committee')) {
             print '<dt class="sc" id="cal' . $e['id'] . '">';
-        } else {
+        }
+        else {
             print '<li id="cal' . $e['id'] . '">';
         }
 
@@ -65,7 +67,8 @@ 
 
         if (strstr($e['chamber'], 'Select Committee')) {
             print "</dt>\n";
-        } else {
+        }
+        else {
             print "</li>\n";
         }
 
@@ -83,12 +86,15 @@ 
         if ($e['committee_name']) {
             $title = $e['committee_name'];
             if ($e['title'] == 'to consider the Bill') {
-            } elseif ($e['title'] && $e['title'] != 'This is a private meeting.') {
+            }
+            elseif ($e['title'] && $e['title'] != 'This is a private meeting.') {
                 $title .= ': ' . $e['title'];
-            } else {
+            }
+            else {
                 $private = true;
             }
-        } else {
+        }
+        else {
             $title = $e['title'];
             if ($pid = $e['person_id']) {
                 $MEMBER = new \MEMBER(array( 'person_id' => $pid ));

tests/AcceptApiTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/api.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/api.xml');
     }
 
     private function fetch_page($method, $vars = array())

tests/TopicsTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/topics.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/topics.xml');
     }
 
     private function fetch_topics_page($vars)

tests/AlertsPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alertspage.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alertspage.xml');
     }
 
     private function fetch_page($vars)
@@ -21,37 +21,37 @@ 
 
     public function testFetchPage()
     {
-        $page = $this->fetch_page( array() );
+        $page = $this->fetch_page(array());
         $this->assertContains('TheyWorkForYou Email Alerts', $page);
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'elephant'));
         $this->assertContains('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE'));
         $this->assertContains('when Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord()
     {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by Mrs Test Current-MP', $page);
         $this->assertNotContains('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'PH6 2DB elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'PH6 2DB elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertContains('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'OX1 4LF elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'OX1 4LF elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertNotContains('Did you mean to get alerts for when your MP', $page);
     }