mysociety / theyworkforyou

classes/Utility/Member.php

Spacing +16 added lines, -16 removed lines

@@ -25,23 +25,23 @@ 
 
     public static function findMemberImage($pid, $smallonly = false, $substitute_missing = false) {
         $image = null; $sz = null;
-        if (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.jpeg')) {
-            $image = IMAGEPATH . 'mpsL/' . $pid . '.jpeg';
+        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')) {
-            $image = IMAGEPATH . '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')) {
-            $image = IMAGEPATH . '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')) {
-            $image = IMAGEPATH . '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')) {
-            $image = IMAGEPATH . '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')) {
-            $image = IMAGEPATH . 'mps/' . $pid . '.png';
+        } elseif (is_file(BASEDIR.'/images/mps/'.$pid.'.png')) {
+            $image = IMAGEPATH.'mps/'.$pid.'.png';
             $sz = 'S';
         }
 
@@ -49,16 +49,16 @@ 
         if (!$image && $substitute_missing) {
             if ($smallonly) {
                 if ($substitute_missing === "lord") {
-                    $image = IMAGEPATH . "unknownlord.png";
+                    $image = IMAGEPATH."unknownlord.png";
                 } else {
-                    $image = IMAGEPATH . "unknownperson.png";
+                    $image = IMAGEPATH."unknownperson.png";
                 }
                 $sz = 'S';
             } else {
                 if ($substitute_missing === "lord") {
-                    $image = IMAGEPATH . "unknownlord_large.png";
+                    $image = IMAGEPATH."unknownlord_large.png";
                 } else {
-                    $image = IMAGEPATH . "unknownperson_large.png";
+                    $image = IMAGEPATH."unknownperson_large.png";
                 }
                 $sz = 'L';
             }

classes/Utility/Search.php

Spacing +30 added lines, -30 removed lines

@@ -14,7 +14,7 @@ 
         $data = array();
         $SEARCHENGINE = new \SEARCHENGINE($search);
         $data['pagetitle'] = $SEARCHENGINE->query_description_short();
-        $SEARCHENGINE = new \SEARCHENGINE($search . ' groupby:speech');
+        $SEARCHENGINE = new \SEARCHENGINE($search.' groupby:speech');
         $count = $SEARCHENGINE->run_count(0, 5000, 'date');
         if ($count <= 0) {
             $data['error'] = 'No results';
@@ -35,8 +35,8 @@ 
         $speaker_count = array();
         $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++) {
+        $q = $db->query('SELECT gid,person_id,hdate FROM hansard WHERE gid IN ("'.$gids.'")');
+        for ($n = 0; $n < $q->rows(); $n++) {
             $gid = $q->field($n, 'gid');
             $person_id = $q->field($n, 'person_id');
             $hdate = $q->field($n, 'hdate');
@@ -60,10 +60,10 @@ 
                                 moffice_id, dept, position, from_date, to_date, left_house
                             FROM member LEFT JOIN moffice ON member.person_id = moffice.person
                                 JOIN person_names pn ON member.person_id = pn.person_id AND pn.type="name" AND pn.start_date <= left_house AND left_house <= pn.end_date
-                            WHERE member.person_id IN (' . $person_ids . ')
-                            ' . ($house ? " AND house=$house" : '') . '
+                            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,20 +139,20 @@ 
      * 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();
         if (count($searchwords) == 1) {
-            $params[':like_0'] = '%' . $searchwords[0] . '%';
+            $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) {
             // 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] . '%';
-            $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'] = '%'.$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].'%';
             $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)";
@@ -164,12 +164,12 @@ 
             }
         } else {
             $searchwords[2] = str_replace('of ', '', $searchwords[2]);
-            $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'] = '%'.$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].'%';
             $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);
             }
         }
 
@@ -250,14 +250,14 @@ 
             from constituency AS o where name like :try
             and from_date <= date(now()) and date(now()) <= to_date";
         $db = new \ParlDB;
-        $q = $db->query($query, array(':try' => '%' . $try . '%'));
+        $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,8 +292,8 @@ 
     public static function speakerIDsToNames($searchstring) {
         $speakers = self::speakerNamesForIDs($searchstring);
 
-        foreach ( $speakers as $id => $name ) {
-            $searchstring = str_replace('speaker:' . $id, "speaker:$name", $searchstring);
+        foreach ($speakers as $id => $name) {
+            $searchstring = str_replace('speaker:'.$id, "speaker:$name", $searchstring);
         }
 
         return $searchstring;

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();
@@ -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,7 +146,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) {

classes/People/Peers.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             $details['person_id'],
             $details['name'],
             $details['party'],
-            'https://www.theyworkforyou.com/peer/' . $details['url']
+            'https://www.theyworkforyou.com/peer/'.$details['url']
         );
     }
 }

classes/People/MPs.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
             $details['family_name'],
             $details['party'],
             $details['constituency'],
-            'https://www.theyworkforyou.com/mp/' . $details['url']
+            'https://www.theyworkforyou.com/mp/'.$details['url']
         );
     }
 }

classes/Dissolution.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         }
 
         return array(
-            'query' => '(' . join(' OR ', $query) . ')',
+            'query' => '('.join(' OR ', $query).')',
             'params' => $params,
         );
     }

classes/Topics.php

Indentation +36 added lines, -36 removed lines

@@ -25,59 +25,59 @@
     }
 
     public function getTopics() {
-      $q = $this->db->query("SELECT id, slug, title, description, search_string, front_page, image FROM topics");
+        $q = $this->db->query("SELECT id, slug, title, description, search_string, front_page, image FROM topics");
 
-      $topics = array();
-      $count = $q->rows();
+        $topics = array();
+        $count = $q->rows();
 
-      for ($i = 0; $i < $count; $i++ ) {
-          $topic = $q->row($i);
-          $topics[$topic['slug']] = new Topic($topic);
-      }
-      return $topics;
+        for ($i = 0; $i < $count; $i++ ) {
+            $topic = $q->row($i);
+            $topics[$topic['slug']] = new Topic($topic);
+        }
+        return $topics;
     }
 
     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)
-      );
-      if ($q->rows) {
-          return new Topic($q->row(0));
-      }
-
-      return NULL;
+        $q = $this->db->query(
+            "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug",
+            array(':slug' => $topic_name)
+        );
+        if ($q->rows) {
+            return new Topic($q->row(0));
+        }
+
+        return NULL;
     }
 
     public function getFrontPageTopics() {
-      $q = $this->db->query(
-          "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE front_page = TRUE"
-      );
-
-      $topics = array();
-      $count = $q->rows();
-
-      for ($i = 0; $i < $count; $i++ ) {
-          $topic = $q->row($i);
-          $topics[$topic['slug']] = new Topic($topic);
-      }
-      return $topics;
+        $q = $this->db->query(
+            "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE front_page = TRUE"
+        );
+
+        $topics = array();
+        $count = $q->rows();
+
+        for ($i = 0; $i < $count; $i++ ) {
+            $topic = $q->row($i);
+            $topics[$topic['slug']] = new Topic($topic);
+        }
+        return $topics;
     }
 
     public function updateFrontPageTopics($topics) {
         // 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);
 
-          $q = $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
+            $q = $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
 
-          $q = $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
+            $q = $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
         } else {
-          $q = $this->db->query("UPDATE topics SET front_page = FALSE");
+            $q = $this->db->query("UPDATE topics SET front_page = FALSE");
         }
 
         return true;

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
       $topics = array();
       $count = $q->rows();
 
-      for ($i = 0; $i < $count; $i++ ) {
+      for ($i = 0; $i < $count; $i++) {
           $topic = $q->row($i);
           $topics[$topic['slug']] = new Topic($topic);
       }
@@ -57,7 +57,7 @@ 
       $topics = array();
       $count = $q->rows();
 
-      for ($i = 0; $i < $count; $i++ ) {
+      for ($i = 0; $i < $count; $i++) {
           $topic = $q->row($i);
           $topics[$topic['slug']] = new Topic($topic);
       }

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

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

classes/Policies.php

Indentation +13 added lines, -13 removed lines

@@ -309,7 +309,7 @@ 
     }
 
     public function getSetDescriptions() {
-      return $this->set_descs;
+        return $this->set_descs;
     }
 
     /**
@@ -397,18 +397,18 @@ 
     }
 
     public function limitToArray($policies) {
-          $out = array();
-          // Reassemble the new policies list based on the set.
-          foreach ($policies as $policy) {
-              if (isset($this->policies[$policy])) {
-                  $out[$policy] = $this->policies[$policy];
-              }
-          }
-
-          $new_policies = new self();
-          $new_policies->policies = $out;
-
-          return $new_policies;
+            $out = array();
+            // Reassemble the new policies list based on the set.
+            foreach ($policies as $policy) {
+                if (isset($this->policies[$policy])) {
+                    $out[$policy] = $this->policies[$policy];
+                }
+            }
+
+            $new_policies = new self();
+            $new_policies->policies = $out;
+
+            return $new_policies;
     }
 
     public function getPolicyDetails($policyID) {

Spacing +5 added lines, -5 removed lines

@@ -296,7 +296,7 @@ 
     public function __construct($policy_id = NULL) {
         $this->db = new \ParlDB;
 
-        if ( $policy_id ) {
+        if ($policy_id) {
             $this->policy_id = $policy_id;
             $this->policies = array(
                 $policy_id => $this->policies[$policy_id]
@@ -380,8 +380,8 @@ 
                     // want to complain here if we're looking for that policy and
                     // it does not exist. Otherwise, if the single policy isn't in
                     // the set we want to return an empty set
-                    if ( !isset($this->policy_id) || $set_policy == $this->policy_id ) {
-                        throw new \Exception ('Policy ' . $set_policy . ' in set "' . $set . '" does not exist.');
+                    if (!isset($this->policy_id) || $set_policy == $this->policy_id) {
+                        throw new \Exception('Policy '.$set_policy.' in set "'.$set.'" does not exist.');
                     }
                 }
             }
@@ -392,7 +392,7 @@ 
             return $new_policies;
 
         } else {
-            throw new \Exception ('Policy set "' . $set . '" does not exist.');
+            throw new \Exception('Policy set "'.$set.'" does not exist.');
         }
     }
 
@@ -433,7 +433,7 @@ 
 
         $image = $q->field(0, 'image');
 
-        if ( $image && file_exists(BASEDIR . '/' . $image)) {
+        if ($image && file_exists(BASEDIR.'/'.$image)) {
             $props['image'] = $image;
             $props['image_license'] = $q->field(0, 'image_license');
             $props['image_attribution'] = $q->field(0, 'image_attrib');

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

@@ -293,7 +293,7 @@
 
     private $policy_id;
 
-    public function __construct($policy_id = NULL) {
+    public function __construct($policy_id = null) {
         $this->db = new \ParlDB;
 
         if ( $policy_id ) {

classes/Search.php

Switch Indentation +36 added lines, -36 removed lines

@@ -82,42 +82,42 @@
     private function prettify_search_section($section) {
         $name = '';
         switch ($section) {
-        case 'wrans':
-            $name = 'Written Answers';
-            break;
-        case 'uk':
-            $name = 'All UK';
-            break;
-        case 'debates':
-            $name = 'House of Commons debates';
-            break;
-        case 'whall':
-            $name = 'Westminster Hall debates';
-            break;
-        case 'lords':
-            $name = 'House of Lords debates';
-            break;
-        case 'wms':
-            $name = 'Written ministerial statements';
-            break;
-        case 'standing':
-            $name = 'Bill Committees';
-            break;
-        case 'future':
-            $name = 'Future Business';
-            break;
-        case 'ni':
-            $name = 'Northern Ireland Assembly Debates';
-            break;
-        case 'scotland':
-            $name = 'All Scotland';
-            break;
-        case 'sp':
-            $name = 'Scottish Parliament Debates';
-            break;
-        case 'spwrans':
-            $name = 'Scottish Parliament Written answers';
-            break;
+            case 'wrans':
+                $name = 'Written Answers';
+                break;
+            case 'uk':
+                $name = 'All UK';
+                break;
+            case 'debates':
+                $name = 'House of Commons debates';
+                break;
+            case 'whall':
+                $name = 'Westminster Hall debates';
+                break;
+            case 'lords':
+                $name = 'House of Lords debates';
+                break;
+            case 'wms':
+                $name = 'Written ministerial statements';
+                break;
+            case 'standing':
+                $name = 'Bill Committees';
+                break;
+            case 'future':
+                $name = 'Future Business';
+                break;
+            case 'ni':
+                $name = 'Northern Ireland Assembly Debates';
+                break;
+            case 'scotland':
+                $name = 'All Scotland';
+                break;
+            case 'sp':
+                $name = 'Scottish Parliament Debates';
+                break;
+            case 'spwrans':
+                $name = 'Scottish Parliament Written answers';
+                break;
         }
 
         return $name;

Spacing +21 added lines, -21 removed lines

@@ -19,7 +19,7 @@ 
         $this->searchstring = $argparser->construct_search_string();
         $this->searchkeyword = $argparser->searchkeyword;
 
-        if ( !$this->searchstring ) {
+        if (!$this->searchstring) {
             $data = $this->get_form_params($data);
             $data['searchstring'] = '';
             $data['template'] = 'search/results';
@@ -28,14 +28,14 @@ 
 
         $this->searchstring = filter_user_input($this->searchstring, 'strict');
         $warnings = $this->validate_search_string();
-        if ( $warnings ) {
+        if ($warnings) {
             $data['warnings'] = $warnings;
             $data['template'] = 'search/results';
             $data['searchstring'] = $this->searchstring;
             $data = $this->get_form_params($data);
             return $data;
         } else {
-            if (get_http_var('o')=='p') {
+            if (get_http_var('o') == 'p') {
                 $search = new Search\ByUsage();
                 $data = $search->search($this->searchstring);
                 $data['template'] = 'search/by-person';
@@ -52,7 +52,7 @@ 
             $data['person_name'] = $MEMBER->full_name();
         }
 
-        if ( isset($data['info']['spelling_correction']) ) {
+        if (isset($data['info']['spelling_correction'])) {
             $data['info']['spelling_correction_display'] = $this->prettifySearchString($data['info']['spelling_correction']);
         }
 
@@ -144,15 +144,15 @@ 
         $data['search_keyword'] = $this->searchkeyword;
 
         $is_adv = false;
-        foreach ( array('to', 'from', 'person', 'section', 'column', 'phrase', 'exclude' ) as $var ) {
+        foreach (array('to', 'from', 'person', 'section', 'column', 'phrase', 'exclude') as $var) {
             $key = "search_$var";
-            $data[$key] = get_http_var( $var );
-            if ( $data[$key] ) {
+            $data[$key] = get_http_var($var);
+            if ($data[$key]) {
                 $is_adv = true;
             }
         }
 
-        if ( isset($data['search_section']) ) {
+        if (isset($data['search_section'])) {
             $data['search_section_pretty'] = $this->prettify_search_section($data['search_section']);
         }
 
@@ -162,16 +162,16 @@ 
 
     private function set_wtt_options($data) {
         $data['wtt'] = '';
-        if ( $wtt = get_http_var('wtt') ) {
+        if ($wtt = get_http_var('wtt')) {
             $data['wtt'] = $wtt;
-            if ( $wtt == 2 && $pid = get_http_var('pid') ) {
+            if ($wtt == 2 && $pid = get_http_var('pid')) {
                 $data['pid'] = null;
                 try {
                     $lord = new Member(array('person_id' => $pid, 'house' => 2));
-                } catch ( MemberException $e ) {
+                } catch (MemberException $e) {
                     return $data;
                 }
-                if ( $lord->valid ) {
+                if ($lord->valid) {
                     $data['pid'] = $pid;
                     $data['wtt_lord_name'] = $lord->full_name();
                 }
@@ -190,17 +190,17 @@ 
             $value = $this->searchstring;
             if (preg_match_all('#speaker:(\d+)#', $value, $m) == 1) {
                 $person_id = $m[1][0];
-                $value = str_replace('speaker:' . $person_id, '', $value);
+                $value = str_replace('speaker:'.$person_id, '', $value);
                 $url->insert(array('pid' => $person_id));
                 }
             $url->insert(array('q' => $value));
         }
 
-        if ( $params ) {
-            if ( get_http_var('house') ) {
+        if ($params) {
+            if (get_http_var('house')) {
                 $url->insert(array('house' => get_http_var('house')));
             }
-            if ( get_http_var('wtt') ) {
+            if (get_http_var('wtt')) {
                 $url->insert(array('wtt' => get_http_var('wtt')));
             }
         } else {
@@ -214,16 +214,16 @@ 
         global $DATA, $this_page;
 
         $pagetitle = '';
-        if ( isset($data['search_type']) && $data['search_type'] == 'person' ) {
+        if (isset($data['search_type']) && $data['search_type'] == 'person') {
             if (isset($data['wtt']) && $data['wtt'] > 0) {
-                $pagetitle = 'League table of Lords who say ' . $data['pagetitle'];
+                $pagetitle = 'League table of Lords who say '.$data['pagetitle'];
             } else {
-                $pagetitle = 'Who says ' . $data['pagetitle'] . ' the most?';
+                $pagetitle = 'Who says '.$data['pagetitle'].' the most?';
             }
         } else {
-            $pagetitle = 'Search for ' . $data['searchdescription'];
+            $pagetitle = 'Search for '.$data['searchdescription'];
             if (isset($data['info']['page']) && $data['info']['page'] > 1) {
-                $pagetitle .= ", page " . $data['info']['page'];
+                $pagetitle .= ", page ".$data['info']['page'];
             }
         }
         $DATA->set_page_metadata($this_page, 'title', $pagetitle);

classes/SPHomepage.php

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

@@ -38,7 +38,7 @@
     }
 
     protected function getCalendarData() {
-        return NULL;
+        return null;
     }