mysociety / theyworkforyou

tests/DivisionsTest.php

Spacing +5 added lines, -5 removed lines

@@ -17,17 +17,17 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
     }
 
     private function fetch_mp_recent_page()
     {
-        $vars = array( 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' );
+        $vars = array('pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent');
         return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/recent.php');
     }
 
     private function fetch_recent_page() {
-        return $this->base_fetch_page( array('url' => '/divisions' ), 'divisions', 'index.php', '/divisions/index.php' );
+        return $this->base_fetch_page(array('url' => '/divisions'), 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -113,7 +113,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertContains('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -124,7 +124,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page( array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ), 'divisions', 'division.php', '/divisions/division.php' );
+        $page = $this->base_fetch_page(array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'), 'divisions', 'division.php', '/divisions/division.php');
         $this->assertContains('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertContains('Aye: 200', $page);
         $this->assertNotContains('No:', $page); # Summary 100, but no actual votes. In reality, summary can only be <= actual.

classes/Utility/Search.php

Braces +15 added lines, -7 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();
@@ -45,8 +46,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
@@ -80,8 +85,9 @@ 
                 $dept = $row['dept'];
                 $posn = $row['position'];
                 $moffice_id = $row['moffice_id'];
-                if ($dept && $row['to_date'] == '9999-12-31')
-                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                if ($dept && $row['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':'');
                 }
@@ -139,7 +145,9 @@ 
      */
 
     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) {

Spacing +13 added lines, -13 removed lines

@@ -83,9 +83,9 @@ 
                 if ($dept && $row['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;
                 }
             }
@@ -138,7 +138,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();
@@ -150,8 +150,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)";
@@ -166,9 +166,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)";
@@ -183,7 +183,7 @@ 
         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()) {
@@ -238,7 +238,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);
             }
         }
 
@@ -256,7 +256,7 @@ 
             $constituencies[] = $row['name'];
         }
 
-        return array( $constituencies, false );
+        return array($constituencies, false);
     }
 
     /**
@@ -272,7 +272,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();
             }
@@ -291,7 +291,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);
         }
 

classes/SectionView/SpwransView.php

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
         $this_page = 'spwransfront';
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \SPWRANSLIST;
 
         $wrans = array();
@@ -43,7 +43,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'spwrans' )
+            array('section' => 'spwrans')
         );
     }
 
@@ -54,29 +54,29 @@ 
         $SPWRANSLIST = new \SPWRANSLIST;
         $gid = $SPWRANSLIST->get_gid_from_spid($spid);
         if ($gid) {
-            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spwrans');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
-            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spdebates');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
             } else {
-                $PAGE->error_message ("Strange GID ($gid) for that Scottish Parliament ID.");
+                $PAGE->error_message("Strange GID ($gid) for that Scottish Parliament ID.");
             }
         }
-        $PAGE->error_message ("Couldn't match that Scottish Parliament ID to a GID.");
+        $PAGE->error_message("Couldn't match that Scottish Parliament ID to a GID.");
     }
 
     protected function get_question_mentions_html($row_data) {
-        if( count($row_data) == 0 ) {
+        if (count($row_data) == 0) {
             return '';
         }
         $result = '';
@@ -85,17 +85,17 @@ 
         // Keep the references until after the history that's in a timeline:
         $references = array();
         foreach ($row_data as $row) {
-            if( ! $row["date"] ) {
+            if (!$row["date"]) {
                 // If this mention isn't associated with a date, the difference won't be interesting.
                 $last_date = NULL;
             }
             $description = '';
             if ($last_date && ($last_date != $row["date"])) {
                 // Calculate how long the gap was in days:
-                $daysdiff = (integer)((strtotime($row["date"]) - strtotime($last_date)) / 86400);
+                $daysdiff = (integer) ((strtotime($row["date"]) - strtotime($last_date)) / 86400);
                 $daysstring = ($daysdiff == 1) ? "day" : "days";
                 $further = "";
-                if( $first_difference_output ) {
+                if ($first_difference_output) {
                     $first_difference_output = FALSE;
                 } else {
                     $further = " a further";
@@ -106,7 +106,7 @@ 
             $inner = "BUG: Unknown mention type $row[type]";
             $date = format_date($row['date'], SHORTDATEFORMAT);
             $url = $row['url'];
-            if ( strpos($url, 'business/businessBulletin') !== FALSE ) {
+            if (strpos($url, 'business/businessBulletin') !== FALSE) {
                 $url = str_replace('www.scottish', 'archive.scottish', $url);
             }
             switch ($row["type"]) {
@@ -120,9 +120,9 @@ 
                     $inner = "Mentioned in <a class=\"debate-speech__meta__link\" href=\"$url\">tabled written questions on $date</a>";
                     break;
                 case 4:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $m[1]) );
+                        $URL->insert(array('spid' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "Given a <a class=\"debate-speech__meta__link\" href=\"$relative_url\">written answer on $date</a>";
                     }
@@ -131,25 +131,25 @@ 
                     $inner = "Given a holding answer on $date";
                     break;
                 case 6:
-                    if( preg_match('/^uk.org.publicwhip\/spor\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spor\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spdebates");
-                        $URL->insert( array('id' => $m[1]) );
+                        $URL->insert(array('id' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "<a href=\"$relative_url\">Asked in parliament on $date</a>";
                     }
                     break;
                 case 7:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $referencing_spid = $m[1];
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $referencing_spid) );
+                        $URL->insert(array('spid' => $referencing_spid));
                         $relative_url = $URL->generate("none");
                         $inner = "Referenced in <a href=\"$relative_url\">question $referencing_spid</a>";
                         $reference = TRUE;
                     }
                     break;
             }
-            if( $reference ) {
+            if ($reference) {
                 $references[] = "\n<li>$inner.";
             } else {
                 $result .= "\n<li class=\"link-to-hansard\">$description$inner</span>";

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

@@ -80,14 +80,14 @@ 
             return '';
         }
         $result = '';
-        $last_date = NULL;
-        $first_difference_output = TRUE;
+        $last_date = null;
+        $first_difference_output = true;
         // Keep the references until after the history that's in a timeline:
         $references = array();
         foreach ($row_data as $row) {
             if( ! $row["date"] ) {
                 // If this mention isn't associated with a date, the difference won't be interesting.
-                $last_date = NULL;
+                $last_date = null;
             }
             $description = '';
             if ($last_date && ($last_date != $row["date"])) {
@@ -96,17 +96,17 @@ 
                 $daysstring = ($daysdiff == 1) ? "day" : "days";
                 $further = "";
                 if( $first_difference_output ) {
-                    $first_difference_output = FALSE;
+                    $first_difference_output = false;
                 } else {
                     $further = " a further";
                 }
                 $description = "\n<span class=\"question-mention-gap\">After$further $daysdiff $daysstring,</span> ";
             }
-            $reference = FALSE;
+            $reference = false;
             $inner = "BUG: Unknown mention type $row[type]";
             $date = format_date($row['date'], SHORTDATEFORMAT);
             $url = $row['url'];
-            if ( strpos($url, 'business/businessBulletin') !== FALSE ) {
+            if ( strpos($url, 'business/businessBulletin') !== false ) {
                 $url = str_replace('www.scottish', 'archive.scottish', $url);
             }
             switch ($row["type"]) {
@@ -145,7 +145,7 @@ 
                         $URL->insert( array('spid' => $referencing_spid) );
                         $relative_url = $URL->generate("none");
                         $inner = "Referenced in <a href=\"$relative_url\">question $referencing_spid</a>";
-                        $reference = TRUE;
+                        $reference = true;
                     }
                     break;
             }

classes/AlertView/Simple.php

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
     public function display() {
         $data = array();
         $data['recent_election'] = false;
-        if ( $this->user->loggedin() ) {
+        if ($this->user->loggedin()) {
             $data['user_signed_in'] = true;
         }
 
@@ -17,21 +17,21 @@ 
             $data['postcode'] = get_http_var('postcode');
 
             $result = $this->createAlertForPostCode($data['email'], $data['postcode']);
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update')) {
             $result = $this->getNewMP(get_http_var('update'));
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update-alert')) {
-            $success = $this->replaceAlert( get_http_var('confirmation') );
+            $success = $this->replaceAlert(get_http_var('confirmation'));
             $data['confirmation_received'] = $success;
         } elseif (get_http_var('confirmed')) {
-            $success = $this->confirmAlert( get_http_var('confirmed') );
+            $success = $this->confirmAlert(get_http_var('confirmed'));
             $data['confirmation_received'] = $success;
         } else {
             $data['email'] = $this->user->email() ? $this->user->email() : '';
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
-            if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
+            if ($this->isEmailSignedUpForPostCode($data['email'], $data['postcode'])) {
                 $data['already_signed_up'] = True;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
@@ -66,13 +66,13 @@ 
     }
 
     private function createAlertForPostCode($email, $postcode) {
-        if ( !$this->validateDetails($email, $postcode) ) {
+        if (!$this->validateDetails($email, $postcode)) {
             return array('invalid-postcode-or-email' => True);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
-        } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (\MySociety\TheyWorkForYou\MemberException $e) {
             return array('bad-constituency' => True);
         }
 
@@ -89,7 +89,7 @@ 
 
         switch ($result) {
             case self::ALERT_EXISTS:
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
@@ -102,7 +102,7 @@ 
                 $data['error'] = True;
                 break;
             default: // alert created
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     $data['confirmation_sent'] = True;
                 } else {
                     $data['signedup_no_confirm'] = True;
@@ -116,8 +116,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $old_mp_id ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $old_mp_id));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -141,7 +141,7 @@ 
                 'pid' => $new_mp->person_id,
                 'pc' => '',
             );
-            if ( $other_criteria ) {
+            if ($other_criteria) {
                 $details['keyword'] = $other_criteria;
             }
 
@@ -158,11 +158,11 @@ 
     private function isEmailSignedUpForPostCode($email, $postcode) {
         $is_signed_up = false;
 
-        if ( $email && $postcode ) {
+        if ($email && $postcode) {
             try {
                 $person = $this->getPersonFromPostcode($postcode);
                 $is_signed_up = $this->alert->fetch_by_mp($email, $person->person_id);
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $is_signed_up = false;
             }
         }
@@ -178,10 +178,10 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $criteria ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $criteria));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
-        if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
+        if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = array(
                 'already_signed_up' => True,
                 'old_mp' => $old_mp->full_name(),

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

@@ -32,7 +32,7 @@ 
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
             if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
-                $data['already_signed_up'] = True;
+                $data['already_signed_up'] = true;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
             }
@@ -67,13 +67,13 @@ 
 
     private function createAlertForPostCode($email, $postcode) {
         if ( !$this->validateDetails($email, $postcode) ) {
-            return array('invalid-postcode-or-email' => True);
+            return array('invalid-postcode-or-email' => true);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
         } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
-            return array('bad-constituency' => True);
+            return array('bad-constituency' => true);
         }
 
         $details = array(
@@ -93,19 +93,19 @@ 
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['already_signed_up'] = True;
+                    $data['already_signed_up'] = true;
                 }
                 break;
             case self::CREATE_FAILED:
-                $data['error'] = True;
+                $data['error'] = true;
                 break;
             default: // alert created
                 if ( $not_logged_in ) {
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['signedup_no_confirm'] = True;
+                    $data['signedup_no_confirm'] = true;
                 }
         }
 
@@ -146,11 +146,11 @@ 
             }
 
             $this->alert->delete($row['alert_id'] . '::' . $row['registrationtoken']);
-            $this->alert->add($details, False);
+            $this->alert->add($details, false);
         }
 
         return array(
-            'signedup_no_confirm' => True,
+            'signedup_no_confirm' => true,
             'new_mp' => $new_mp->full_name(),
         );
     }
@@ -183,7 +183,7 @@ 
 
         if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
             $data = array(
-                'already_signed_up' => True,
+                'already_signed_up' => true,
                 'old_mp' => $old_mp->full_name(),
                 'mp_name' => $new_mp->full_name(),
             );
@@ -194,7 +194,7 @@ 
             );
         }
 
-        $data['update'] = True;
+        $data['update'] = true;
         $data['confirmation'] = $confirmation;
 
         return $data;

classes/Topics.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $this->db = new \ParlDB;
     }
 
-    private function query($where='') {
+    private function query($where = '') {
         $q = $this->db->query(
             "SELECT id, slug, title, description, search_string, front_page, image FROM topics $where"
         );

Indentation +15 added lines, -15 removed lines

@@ -41,15 +41,15 @@ 
     }
 
     public function getTopic($topic_name) {
-      $q = $this->db->query(
-          "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug",
-          array(':slug' => $topic_name)
-      )->first();
-      if ($q) {
-          return new Topic($q);
-      }
+        $q = $this->db->query(
+            "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug",
+            array(':slug' => $topic_name)
+        )->first();
+        if ($q) {
+            return new Topic($q);
+        }
 
-      return NULL;
+        return NULL;
     }
 
     public function getFrontPageTopics() {
@@ -60,15 +60,15 @@ 
         // PDO doesn't cope with arrays so we have to do this by hand :|
         $quoted = array();
         if ($topics) {
-          foreach ($topics as $topic) {
-              $quoted[] = $this->db->quote($topic);
-          }
-          $topics_str = implode(',', $quoted);
+            foreach ($topics as $topic) {
+                $quoted[] = $this->db->quote($topic);
+            }
+            $topics_str = implode(',', $quoted);
 
-          $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
-          $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
+            $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
+            $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
         } else {
-          $this->db->query("UPDATE topics SET front_page = FALSE");
+            $this->db->query("UPDATE topics SET front_page = FALSE");
         }
 
         return true;

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

@@ -49,7 +49,7 @@
           return new Topic($q);
       }
 
-      return NULL;
+      return null;
     }
 
     public function getFrontPageTopics() {

scripts/video-check.php

Indentation +7 added lines, -7 removed lines

@@ -10,12 +10,12 @@
 	order by hdate, hpos');
 $last = array('hdate'=>'');
 foreach ($q as $row) {
-	if ($row['hdate'] != $last['hdate'])
-		$last = array();
-	if ($last && $row['atime'] < $last['atime']-5) {
-		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
-		print "  Last was $last[gid] $last[hdate] $last[atime]\n";
-	}
-	$last = $row;
+    if ($row['hdate'] != $last['hdate'])
+        $last = array();
+    if ($last && $row['atime'] < $last['atime']-5) {
+        print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
+        print "  Last was $last[gid] $last[hdate] $last[atime]\n";
+    }
+    $last = $row;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 foreach ($q as $row) {
 	if ($row['hdate'] != $last['hdate'])
 		$last = array();
-	if ($last && $row['atime'] < $last['atime']-5) {
+	if ($last && $row['atime'] < $last['atime'] - 5) {
 		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
 		print "  Last was $last[gid] $last[hdate] $last[atime]\n";
 	}

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 	order by hdate, hpos');
 $last = array('hdate'=>'');
 foreach ($q as $row) {
-	if ($row['hdate'] != $last['hdate'])
-		$last = array();
+	if ($row['hdate'] != $last['hdate']) {
+			$last = array();
+	}
 	if ($last && $row['atime'] < $last['atime']-5) {
 		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
 		print "  Last was $last[gid] $last[hdate] $last[atime]\n";

scripts/wranstats.php

Indentation +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
 $db = new ParlDB;
 
 $q = $db->query(
-	'select person_id,
+    'select person_id,
 		count(hansard.epobject_id) as wrans,
 		sum(yes_votes) + IFNULL((select sum(vote) from uservotes, hansard as hansard2
 				  where uservotes.epobject_id=hansard2.epobject_id
@@ -20,23 +20,23 @@ 
 	group by person_id');
 
 foreach ($q as $row) {
-	$p_id = $row['person_id'];
-	$name = $row['first_name'] . ' ' . $row['last_name'];
-	$con = $row['constituency'];
-	$wrans = $row['wrans'];
-	$yes = $row['yes'];
-	$no = $row['no'];
-	if ($p_id) {
-	$qq = $db->query('(select hansard.epobject_id from hansard, uservotes
+    $p_id = $row['person_id'];
+    $name = $row['first_name'] . ' ' . $row['last_name'];
+    $con = $row['constituency'];
+    $wrans = $row['wrans'];
+    $yes = $row['yes'];
+    $no = $row['no'];
+    if ($p_id) {
+    $qq = $db->query('(select hansard.epobject_id from hansard, uservotes
 			where hansard.epobject_id=uservotes.epobject_id
             and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())
 		union
 			(select hansard.epobject_id from hansard,member,anonvotes
 			 where hansard.epobject_id=anonvotes.epobject_id
              and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
-	$wrans_with_votes = $qq->rows();
-	} else {
-		$wrans_with_votes = '';
-	}
-	print "$name\t$con\t$wrans\t$wrans_with_votes\t$yes\t$no\n";
+    $wrans_with_votes = $qq->rows();
+    } else {
+        $wrans_with_votes = '';
+    }
+    print "$name\t$con\t$wrans\t$wrans_with_votes\t$yes\t$no\n";
 }

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
 	if ($p_id) {
 	$qq = $db->query('(select hansard.epobject_id from hansard, uservotes
 			where hansard.epobject_id=uservotes.epobject_id
-            and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())
+            and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())
 		union
 			(select hansard.epobject_id from hansard,member,anonvotes
 			 where hansard.epobject_id=anonvotes.epobject_id
-             and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
+             and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())');
 	$wrans_with_votes = $qq->rows();
 	} else {
 		$wrans_with_votes = '';

classes/Model/Banner.php

Spacing +4 added lines, -4 removed lines

@@ -28,12 +28,12 @@ 
     public function get_text() {
         $text = $this->mem->get('banner');
 
-        if ( $text === false ) {
+        if ($text === false) {
             $q = $this->db->query("SELECT value FROM editorial WHERE item = 'banner'")->first();
 
             if ($q) {
                 $text = $q['value'];
-                if ( trim($text) == '' ) {
+                if (trim($text) == '') {
                     $text = NULL;
                 }
                 $this->mem->set('banner', $text, 86400);
@@ -50,8 +50,8 @@ 
             )
         );
 
-        if ( $q->success() ) {
-            if ( trim($text) == '' ) {
+        if ($q->success()) {
+            if (trim($text) == '') {
                 $text = NULL;
             }
             $this->mem->set('banner', $text, 86400);

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

@@ -34,7 +34,7 @@ 
             if ($q) {
                 $text = $q['value'];
                 if ( trim($text) == '' ) {
-                    $text = NULL;
+                    $text = null;
                 }
                 $this->mem->set('banner', $text, 86400);
             }
@@ -52,7 +52,7 @@ 
 
         if ( $q->success() ) {
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
             $this->mem->set('banner', $text, 86400);
             return true;

classes/Model/Featured.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q) {
             $text = $q['value'];
-            if ( trim($text) == '' ) {
+            if (trim($text) == '') {
                 $text = NULL;
             }
         }
@@ -73,7 +73,7 @@ 
     }
 
     private function _set($key, $value) {
-        if ( trim($value) == '' ) {
+        if (trim($value) == '') {
             $value = NULL;
         }
         $check_q = $this->db->query(
@@ -82,7 +82,7 @@ 
                 ':key' => $key
             )
         );
-        if ( $check_q->rows() ) {
+        if ($check_q->rows()) {
             $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key",
                 array(
                     ':key' => $key,
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ( $set_q->success() ) {
+        if ($set_q->success()) {
             return true;
         }
         return false;

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

@@ -53,7 +53,7 @@ 
     }
 
     private function _get($key) {
-        $text = NULL;
+        $text = null;
 
         $q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",
@@ -65,7 +65,7 @@ 
         if ($q) {
             $text = $q['value'];
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
         }
 
@@ -74,7 +74,7 @@ 
 
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
-            $value = NULL;
+            $value = null;
         }
         $check_q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",