mysociety / theyworkforyou

classes/Utility/Video.php

Braces +10 added lines, -4 removed lines

@@ -19,7 +19,9 @@ 
     }
 
     public static function fromTimestamp($videodb, $date, $time) {
-        if (!$videodb) return null;
+        if (!$videodb) {
+            return null;
+        }
         date_default_timezone_set('Europe/London');
         $epoch = strtotime("$date $time");
         $timestamp = gmdate('c', $epoch);
@@ -38,9 +40,13 @@ 
 
     public static function object($video_id, $start, $gid, $stamping = '', $pid = 0) {
         $flashvars = "gid=$gid&file=$video_id&start=$start";
-        if ($stamping) $flashvars .= '&stamping=1';
-        if ($pid) $flashvars .= '&pid=' . $pid;
-/*
+        if ($stamping) {
+            $flashvars .= '&stamping=1';
+        }
+        if ($pid) {
+            $flashvars .= '&pid=' . $pid;
+        }
+        /*
 <object width='360' height='300'
     classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'
     codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0'>

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
 
     public static function dbConnect() {
-        $connstr = 'host='.OPTION_BBC_DB_HOST.' port='.OPTION_BBC_DB_PORT.' dbname='.OPTION_BBC_DB_NAME.' user='.OPTION_BBC_DB_USER.' password='.OPTION_BBC_DB_PASS;
+        $connstr = 'host=' . OPTION_BBC_DB_HOST . ' port=' . OPTION_BBC_DB_PORT . ' dbname=' . OPTION_BBC_DB_NAME . ' user=' . OPTION_BBC_DB_USER . ' password=' . OPTION_BBC_DB_PASS;
         $videodb = pg_connect($connstr);
 
         return $videodb;

classes/Utility/Hansard.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
         $parts = parse_url($url);
         parse_str($parts['query'], $query);
 
-        if ( $query['id'] ) {
+        if ($query['id']) {
             if (strpos($parts['path'], 'lords') !== false) {
                 $gid = 'uk.org.publicwhip/lords/';
             } elseif (strpos($parts['path'], 'whall') !== false) {
@@ -30,13 +30,13 @@ 
 
 
     public static function gid_to_url($gid) {
-        if ( !$gid ) {
+        if (!$gid) {
             return '';
         }
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
         $url_gid = fix_gid_from_db($gid);
         $url = new \URL($hansardmajors[$q->field(0, 'major')]['page']);
         $url->insert(array('id' => $url_gid));

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

@@ -11,7 +11,7 @@
 class Hansard
 {
     public static function get_gid_from_url($url) {
-        $gid = NULL;
+        $gid = null;
         $parts = parse_url($url);
         parse_str($parts['query'], $query);
 

Braces +4 added lines, -2 removed lines

@@ -18,9 +18,11 @@
         if ( $query['id'] ) {
             if (strpos($parts['path'], 'lords') !== false) {
                 $gid = 'uk.org.publicwhip/lords/';
-            } elseif (strpos($parts['path'], 'whall') !== false) {
+            }
+            elseif (strpos($parts['path'], 'whall') !== false) {
                 $gid = 'uk.org.publicwhip/westminhall/';
-            } else {
+            }
+            else {
                 $gid = 'uk.org.publicwhip/debate/';
             }
             $gid .= $query['id'];

classes/Utility/Wikipedia.php

Indentation +37 added lines, -37 removed lines

@@ -136,63 +136,63 @@
 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
-      $contentwalker = 0;
-      $length = strlen( $content );
-      $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+        $contentwalker = 0;
+        $length = strlen( $content );
+        $tagend = -1;
+        for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
         {
-          // got the start of a tag.  Now find the proper end!
-          $walker = $tagstart + 1;
-          $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+            // got the start of a tag.  Now find the proper end!
+            $walker = $tagstart + 1;
+            $open = 1;
+            while( $open != 0 && $walker < strlen( $content ) )
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
+            $nextopen = strpos( $content, '<', $walker );
+            $nextclose = strpos( $content, '>', $walker );
+            if( $nextclose === false )
             {    // ERROR! Open waka without close waka!
-              // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
-              return $content;
+                // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
+                return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
+            if( $nextopen === false || $nextopen > $nextclose )
             { // No more opens, but there was a close; or, a close happens before the next open.
-              // walker goes to the close+1, and open decrements
-              $open --;
-              $walker = $nextclose + 1;
+                // walker goes to the close+1, and open decrements
+                $open --;
+                $walker = $nextclose + 1;
             }
-          elseif( $nextopen < $nextclose )
+            elseif( $nextopen < $nextclose )
             { // an open before the next close
-              $open ++;
-              $walker = $nextopen + 1;
+                $open ++;
+                $walker = $nextopen + 1;
             }
         }
-          $tagend = $walker;
-          if( $tagend > strlen( $content ) )
+            $tagend = $walker;
+            if( $tagend > strlen( $content ) )
         $tagend = strlen( $content );
-          else
+            else
         {
-          $tagend --;
-          $tagstart ++;
+            $tagend --;
+            $tagstart ++;
         }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
-          $tags[] = '<' . $tag . '>';
+            $tag = substr( $content, $tagstart, $tagend - $tagstart );
+            $tags[] = '<' . $tag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
 
-          $newtags[] = '<' . $newtag . '>';
+            $newtags[] = '<' . $newtag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
+        }
+        if (isset($tags)&&isset($newtags)) {
+        $content = str_replace($tags, $newtags, $content);
         }
-      if (isset($tags)&&isset($newtags)) {
-      $content = str_replace($tags, $newtags, $content);
-      }
 
     return $content;
 

Spacing +18 added lines, -18 removed lines

@@ -83,7 +83,7 @@ 
         $source = explode('|||', $source);
         $q = $db->query("SELECT titles.title FROM titles LEFT JOIN titles_ignored ON titles.title=titles_ignored.title WHERE titles.title IN (" . join(',', array_keys($params)) . ") AND titles_ignored.title IS NULL", $params);
         $phrases = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $phrases[] = $q->field($i, 'title');
         }
 
@@ -105,7 +105,7 @@ 
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
             # 1 means only replace one match for phrase per paragraph
-            $source = preg_replace ('{
+            $source = preg_replace('{
             \b(' . $phrase_re . ')\b # Match the phrase itself
             (?!                      # Match as long as the following does *not* apply:
                 (?:                  #   Match, possessively, as many strings of:
@@ -137,43 +137,43 @@ 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
       $contentwalker = 0;
-      $length = strlen( $content );
+      $length = strlen($content);
       $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+      for ($tagstart = strpos($content, '<', $tagend + 1); $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend))
         {
           // got the start of a tag.  Now find the proper end!
           $walker = $tagstart + 1;
           $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+          while ($open != 0 && $walker < strlen($content))
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
+          $nextopen = strpos($content, '<', $walker);
+          $nextclose = strpos($content, '>', $walker);
+          if ($nextclose === false)
             {    // ERROR! Open waka without close waka!
               // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
               return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
+          if ($nextopen === false || $nextopen > $nextclose)
             { // No more opens, but there was a close; or, a close happens before the next open.
               // walker goes to the close+1, and open decrements
-              $open --;
+              $open--;
               $walker = $nextclose + 1;
             }
-          elseif( $nextopen < $nextclose )
+          elseif ($nextopen < $nextclose)
             { // an open before the next close
-              $open ++;
+              $open++;
               $walker = $nextopen + 1;
             }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) )
-        $tagend = strlen( $content );
+          if ($tagend > strlen($content))
+        $tagend = strlen($content);
           else
         {
-          $tagend --;
-          $tagstart ++;
+          $tagend--;
+          $tagstart++;
         }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
+          $tag = substr($content, $tagstart, $tagend - $tagstart);
           $tags[] = '<' . $tag . '>';
 
           if (function_exists('format_to_output')) {
@@ -190,7 +190,7 @@ 
             $newtag = strip_tags($tag);
           }
         }
-      if (isset($tags)&&isset($newtags)) {
+      if (isset($tags) && isset($newtags)) {
       $content = str_replace($tags, $newtags, $content);
       }
 

Braces +20 added lines, -16 removed lines

@@ -99,8 +99,9 @@ 
 
             # See if already matched a string this one is contained within
             foreach ($matched as $got) {
-                if (strstr($got, $phrase))
-                    continue 2;
+                if (strstr($got, $phrase)) {
+                                    continue 2;
+                }
             }
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
@@ -119,8 +120,9 @@ 
             array_push($matched, $phrase);
         }
 
-        if (!$was_array)
-            $source = join('|||', $source);
+        if (!$was_array) {
+                    $source = join('|||', $source);
+        }
 
         return $source;
 
@@ -148,28 +150,28 @@ 
         {
           $nextopen = strpos( $content, '<', $walker );
           $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
-            {    // ERROR! Open waka without close waka!
+          if( $nextclose === false ) {
+// ERROR! Open waka without close waka!
               // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
               return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
-            { // No more opens, but there was a close; or, a close happens before the next open.
+          if( $nextopen === false || $nextopen > $nextclose ) {
+// No more opens, but there was a close; or, a close happens before the next open.
               // walker goes to the close+1, and open decrements
               $open --;
               $walker = $nextclose + 1;
             }
-          elseif( $nextopen < $nextclose )
-            { // an open before the next close
+            elseif( $nextopen < $nextclose ) {
+// an open before the next close
               $open ++;
               $walker = $nextopen + 1;
             }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) )
-        $tagend = strlen( $content );
-          else
-        {
+          if( $tagend > strlen( $content ) ) {
+                  $tagend = strlen( $content );
+          }
+          else {
           $tagend --;
           $tagstart ++;
         }
@@ -178,7 +180,8 @@ 
 
           if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+          }
+          else {
             $newtag = strip_tags($tag);
           }
 
@@ -186,7 +189,8 @@ 
 
           if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+          }
+          else {
             $newtag = strip_tags($tag);
           }
         }

classes/Utility/Constituencies.php

Braces +6 added lines, -4 removed lines

@@ -31,13 +31,15 @@
         $q1 = $db->query($query, array(
             ':name' => $name
             ));
-        if ($q1->rows <= 0)
-            return false;
+        if ($q1->rows <= 0) {
+                    return false;
+        }
 
         $query = "select name from constituency where main_name and cons_id = '".$q1->field(0,'cons_id')."'";
         $q2 = $db->query($query);
-        if ($q2->rows <= 0)
-            return false;
+        if ($q2->rows <= 0) {
+                    return false;
+        }
 
         return $q2->field(0, "name");
     }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         if ($q1->rows <= 0)
             return false;
 
-        $query = "select name from constituency where main_name and cons_id = '".$q1->field(0,'cons_id')."'";
+        $query = "select name from constituency where main_name and cons_id = '" . $q1->field(0, 'cons_id') . "'";
         $q2 = $db->query($query);
         if ($q2->rows <= 0)
             return false;

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() {

Braces +2 added lines, -1 removed lines

@@ -76,7 +76,8 @@
           $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)");
-        } else {
+        }
+        else {
           $q = $this->db->query("UPDATE topics SET front_page = FALSE");
         }
 

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) {

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 ) {

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');

Braces +6 added lines, -6 removed lines

@@ -366,16 +366,15 @@ 
     public function limitToSet($set) {
 
         // Sanity check the set exists
-        if (isset($this->sets[$set]))
-        {
+        if (isset($this->sets[$set])) {
             $out = array();
             // Reassemble the new policies list based on the set.
             foreach ($this->sets[$set] as $set_policy)
             {
-                if (isset($this->policies[$set_policy]))
-                {
+                if (isset($this->policies[$set_policy])) {
                     $out[$set_policy] = $this->policies[$set_policy];
-                } else {
+                }
+                else {
                     // if we've limited the policies to a single one then we only
                     // want to complain here if we're looking for that policy and
                     // it does not exist. Otherwise, if the single policy isn't in
@@ -391,7 +390,8 @@ 
 
             return $new_policies;
 
-        } else {
+        }
+        else {
             throw new \Exception ('Policy set "' . $set . '" does not exist.');
         }
     }

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 +16 added lines, -16 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();
                 }
@@ -196,11 +196,11 @@ 
             $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,7 +214,7 @@ 
         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'];
             } else {

Braces +10 added lines, -5 removed lines

@@ -34,12 +34,14 @@ 
             $data['searchstring'] = $this->searchstring;
             $data = $this->get_form_params($data);
             return $data;
-        } else {
+        }
+        else {
             if (get_http_var('o')=='p') {
                 $search = new Search\ByUsage();
                 $data = $search->search($this->searchstring);
                 $data['template'] = 'search/by-person';
-            } else {
+            }
+            else {
                 $search = new Search\Normal();
                 $data = $search->search($this->searchstring);
                 $data['template'] = 'search/results';
@@ -203,7 +205,8 @@ 
             if ( get_http_var('wtt') ) {
                 $url->insert(array('wtt' => get_http_var('wtt')));
             }
-        } else {
+        }
+        else {
             $url->remove(array('o', 'house'));
         }
 
@@ -217,10 +220,12 @@ 
         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'];
-            } else {
+            }
+            else {
                 $pagetitle = 'Who says ' . $data['pagetitle'] . ' the most?';
             }
-        } else {
+        }
+        else {
             $pagetitle = 'Search for ' . $data['searchdescription'];
             if (isset($data['info']['page']) && $data['info']['page'] > 1) {
                 $pagetitle .= ", page " . $data['info']['page'];

classes/Utility/Gaze.php

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

@@ -25,7 +25,7 @@
         if (defined('OPTION_GAZE_URL') && OPTION_GAZE_URL) {
             return gaze_get_country_from_ip($ip);
         } else {
-            return NULL;
+            return null;
         }
 
     }

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
 
         if (defined('OPTION_GAZE_URL') && OPTION_GAZE_URL) {
             return gaze_get_country_from_ip($ip);
-        } else {
+        }
+        else {
             return NULL;
         }
 

classes/Utility/Postcode.php

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

@@ -39,7 +39,7 @@
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug ("TIME", "Postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
+            twfy_debug ("TIME", "postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
             return $return_value;
         }
 

Spacing +19 added lines, -19 removed lines

@@ -39,7 +39,7 @@ 
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug ("TIME", "Postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
+            twfy_debug("TIME", "Postcode $postcode looked up last time, is " . (is_array($return_value) ? implode(', ', $return_value) : $return_value));
             return $return_value;
         }
 
@@ -75,11 +75,11 @@ 
             $name = $q->field(0, 'name');
             if (self::postcodeIsScottish($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==3)
+                if (count($name) == 3)
                     return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
             } elseif (self::postcodeIsNi($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==2)
+                if (count($name) == 2)
                     return array('WMC' => $name[0], 'NIE' => $name[1]);
             } else {
                 return array('WMC' => $name);
@@ -113,7 +113,7 @@ 
 
         $r = json_decode($file, true);
         if (!$r) {
-            trigger_error("Postcode database is not working. Content:\n".$file.", request: ". $filename, E_USER_WARNING);
+            trigger_error("Postcode database is not working. Content:\n" . $file . ", request: " . $filename, E_USER_WARNING);
             return '';
         }
         if (isset($r['error']) || !isset($r['areas'])) {
@@ -179,29 +179,29 @@ 
         if (in_array($m[1], array('AB', 'DD', 'EH', 'FK', 'G', 'HS', 'IV', 'KA', 'KW', 'KY', 'ML', 'PA', 'PH', 'ZE')))
             return true;
 
-        if ($m[1]=='DG') {
-            if ($m[2]==16 && $m[3]==5 && in_array($m[4], array('HT','HU','HZ','JA','JB'))) return false; # A few postcodes in England
+        if ($m[1] == 'DG') {
+            if ($m[2] == 16 && $m[3] == 5 && in_array($m[4], array('HT', 'HU', 'HZ', 'JA', 'JB'))) return false; # A few postcodes in England
             return true;
         }
 
         # Damn postcodes crossing country boundaries
-        if ($m[1]=='TD') {
-            if ($m[2]!=15 && $m[2]!=12 && $m[2]!=9) return true; # TD1-8, 10-11, 13-14 all in Scotland
-            if ($m[2]==9) {
-                if ($m[3]!=0) return true; # TD9 1-9 all in Scotland
-                if (!in_array($m[4], array('TJ','TP','TR','TS','TT','TU','TW'))) return true; # Nearly all of TD9 0 in Scotland
+        if ($m[1] == 'TD') {
+            if ($m[2] != 15 && $m[2] != 12 && $m[2] != 9) return true; # TD1-8, 10-11, 13-14 all in Scotland
+            if ($m[2] == 9) {
+                if ($m[3] != 0) return true; # TD9 1-9 all in Scotland
+                if (!in_array($m[4], array('TJ', 'TP', 'TR', 'TS', 'TT', 'TU', 'TW'))) return true; # Nearly all of TD9 0 in Scotland
             }
             $m[5] = substr($m[4], 0, 1);
-            if ($m[2]==12) { # $m[3] will be 4 currently.
-                if ($m[4]=='XE') return true;
-                if (in_array($m[5], array('A','B','D','E','H','J','L','N','W','Y'))) return true; # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
+            if ($m[2] == 12) { # $m[3] will be 4 currently.
+                if ($m[4] == 'XE') return true;
+                if (in_array($m[5], array('A', 'B', 'D', 'E', 'H', 'J', 'L', 'N', 'W', 'Y'))) return true; # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
             }
             # TD15 is mostly England
-            if ($m[2]==15) {
-                if ($m[3]!=1) return false; # TD15 2 and 9 are in England
-                if (in_array($m[4], array('BT','SU','SZ','UF','UG','UH','UJ','UL','US','UZ','WY','WZ'))) return true;
-                if ($m[5]=='T' && $m[4]!='TA' && $m[4]!='TB') return true; # Most of TD15 1T* in Scotland
-                if ($m[5]=='X' && $m[4]!='XX') return true; # TD15 1XX in England, rest of TD15 1X* in Scotland
+            if ($m[2] == 15) {
+                if ($m[3] != 1) return false; # TD15 2 and 9 are in England
+                if (in_array($m[4], array('BT', 'SU', 'SZ', 'UF', 'UG', 'UH', 'UJ', 'UL', 'US', 'UZ', 'WY', 'WZ'))) return true;
+                if ($m[5] == 'T' && $m[4] != 'TA' && $m[4] != 'TB') return true; # Most of TD15 1T* in Scotland
+                if ($m[5] == 'X' && $m[4] != 'XX') return true; # TD15 1XX in England, rest of TD15 1X* in Scotland
             }
         }
 

Braces +71 added lines, -29 removed lines

@@ -52,7 +52,9 @@ 
             $ret = self::postcodeFetchFromMapit($postcode);
         }
 
-        if (is_string($ret)) return $ret;
+        if (is_string($ret)) {
+            return $ret;
+        }
 
         $last_postcode = $postcode;
         $last_postcode_value = $ret;
@@ -75,13 +77,17 @@ 
             $name = $q->field(0, 'name');
             if (self::postcodeIsScottish($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==3)
-                    return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
-            } elseif (self::postcodeIsNi($postcode)) {
+                if (count($name)==3) {
+                                    return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
+                }
+            }
+            elseif (self::postcodeIsNi($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==2)
-                    return array('WMC' => $name[0], 'NIE' => $name[1]);
-            } else {
+                if (count($name)==2) {
+                                    return array('WMC' => $name[0], 'NIE' => $name[1]);
+                }
+            }
+            else {
                 return array('WMC' => $name);
             }
         }
@@ -121,8 +127,9 @@ 
         }
         $areas = array();
         foreach ($r['areas'] as $row) {
-            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE')))
-                $areas[$row['type']] = $row['name'];
+            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE'))) {
+                            $areas[$row['type']] = $row['name'];
+            }
         }
 
         if (!isset($areas['WMC'])) {
@@ -135,9 +142,11 @@ 
             $areas['WMC'] = $normalised;
             if (self::postcodeIsScottish($postcode)) {
                 $serialized = "$areas[WMC]|$areas[SPC]|$areas[SPE]";
-            } elseif (self::postcodeIsNi($postcode)) {
+            }
+            elseif (self::postcodeIsNi($postcode)) {
                 $serialized = "$areas[WMC]|$areas[NIE]";
-            } else {
+            }
+            else {
                 $serialized = $normalised;
             }
             $db = new \ParlDB;
@@ -146,7 +155,8 @@ 
                     ':postcode' => $postcode,
                     ':serialized' => $serialized
                 ));
-        } else {
+        }
+        else {
             return '';
         }
 
@@ -172,36 +182,67 @@ 
      */
 
     public static function postcodeIsScottish($pc) {
-        if (!preg_match('#^([A-Z]{1,2})(\d+) (\d)([A-Z]{2})#', self::canonicalisePostcode($pc), $m))
-            return false;
+        if (!preg_match('#^([A-Z]{1,2})(\d+) (\d)([A-Z]{2})#', self::canonicalisePostcode($pc), $m)) {
+                    return false;
+        }
 
         # Check for Scottish postal areas
-        if (in_array($m[1], array('AB', 'DD', 'EH', 'FK', 'G', 'HS', 'IV', 'KA', 'KW', 'KY', 'ML', 'PA', 'PH', 'ZE')))
-            return true;
+        if (in_array($m[1], array('AB', 'DD', 'EH', 'FK', 'G', 'HS', 'IV', 'KA', 'KW', 'KY', 'ML', 'PA', 'PH', 'ZE'))) {
+                    return true;
+        }
 
         if ($m[1]=='DG') {
-            if ($m[2]==16 && $m[3]==5 && in_array($m[4], array('HT','HU','HZ','JA','JB'))) return false; # A few postcodes in England
+            if ($m[2]==16 && $m[3]==5 && in_array($m[4], array('HT','HU','HZ','JA','JB'))) {
+                return false;
+            }
+            # A few postcodes in England
             return true;
         }
 
         # Damn postcodes crossing country boundaries
         if ($m[1]=='TD') {
-            if ($m[2]!=15 && $m[2]!=12 && $m[2]!=9) return true; # TD1-8, 10-11, 13-14 all in Scotland
+            if ($m[2]!=15 && $m[2]!=12 && $m[2]!=9) {
+                return true;
+            }
+            # TD1-8, 10-11, 13-14 all in Scotland
             if ($m[2]==9) {
-                if ($m[3]!=0) return true; # TD9 1-9 all in Scotland
-                if (!in_array($m[4], array('TJ','TP','TR','TS','TT','TU','TW'))) return true; # Nearly all of TD9 0 in Scotland
+                if ($m[3]!=0) {
+                    return true;
+                }
+                # TD9 1-9 all in Scotland
+                if (!in_array($m[4], array('TJ','TP','TR','TS','TT','TU','TW'))) {
+                    return true;
+                }
+                # Nearly all of TD9 0 in Scotland
             }
             $m[5] = substr($m[4], 0, 1);
-            if ($m[2]==12) { # $m[3] will be 4 currently.
-                if ($m[4]=='XE') return true;
-                if (in_array($m[5], array('A','B','D','E','H','J','L','N','W','Y'))) return true; # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
+            if ($m[2]==12) {
+# $m[3] will be 4 currently.
+                if ($m[4]=='XE') {
+                    return true;
+                }
+                if (in_array($m[5], array('A','B','D','E','H','J','L','N','W','Y'))) {
+                    return true;
+                }
+                # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
             }
             # TD15 is mostly England
             if ($m[2]==15) {
-                if ($m[3]!=1) return false; # TD15 2 and 9 are in England
-                if (in_array($m[4], array('BT','SU','SZ','UF','UG','UH','UJ','UL','US','UZ','WY','WZ'))) return true;
-                if ($m[5]=='T' && $m[4]!='TA' && $m[4]!='TB') return true; # Most of TD15 1T* in Scotland
-                if ($m[5]=='X' && $m[4]!='XX') return true; # TD15 1XX in England, rest of TD15 1X* in Scotland
+                if ($m[3]!=1) {
+                    return false;
+                }
+                # TD15 2 and 9 are in England
+                if (in_array($m[4], array('BT','SU','SZ','UF','UG','UH','UJ','UL','US','UZ','WY','WZ'))) {
+                    return true;
+                }
+                if ($m[5]=='T' && $m[4]!='TA' && $m[4]!='TB') {
+                    return true;
+                }
+                # Most of TD15 1T* in Scotland
+                if ($m[5]=='X' && $m[4]!='XX') {
+                    return true;
+                }
+                # TD15 1XX in England, rest of TD15 1X* in Scotland
             }
         }
 
@@ -215,8 +256,9 @@ 
 
     public static function postcodeIsNi($pc) {
         $prefix = substr(self::canonicalisePostcode($pc), 0, 2);
-        if ($prefix == 'BT')
-            return true;
+        if ($prefix == 'BT') {
+                    return true;
+        }
         return false;
     }