mysociety / theyworkforyou

classes/SectionView/SpView.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'sp' )
+            array('section' => 'sp')
         );
     }
 }

classes/SectionView/WransView.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
 
     protected function display_front() {
         global $DATA, $this_page;
-        if ( get_http_var('type') == 'wrans') {
+        if (get_http_var('type') == 'wrans') {
             return parent::display_front();
         }
 
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \WRANSLIST;
 
         $wrans = array();
@@ -50,10 +50,10 @@ 
 
     protected function getSearchSections() {
         $sections = array(
-            array( 'section' => 'wrans', 'title' => 'Written Answers' ),
+            array('section' => 'wrans', 'title' => 'Written Answers'),
         );
-        if ( get_http_var('type') == '') {
-            $sections[] = array( 'section' => 'wms', 'title' => 'Written Ministerial Statements' );
+        if (get_http_var('type') == '') {
+            $sections[] = array('section' => 'wms', 'title' => 'Written Ministerial Statements');
         }
         return $sections;
     }
@@ -62,7 +62,7 @@ 
     # speech bar the first (assuming that's the question)
     private $votelinks_so_far = 0;
 
-    protected function generate_votes ($votes, $id, $gid) {
+    protected function generate_votes($votes, $id, $gid) {
         /*
         Returns HTML for the 'Does this answer the question?' links (wrans) in the sidebar.
         $votes = => array (

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

Braces +2 added lines, -4 removed lines

@@ -366,14 +366,12 @@
     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 {
                     // if we've limited the policies to a single one then we only

Spacing +5 added lines, -5 removed lines

@@ -302,7 +302,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->shuffle();
 
         } 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['image'];
 
-        if ( $image && file_exists(BASEDIR . '/' . $image)) {
+        if ($image && file_exists(BASEDIR . '/' . $image)) {
             $props['image'] = $image;
             $props['image_license'] = $q['image_license'];
             $props['image_attribution'] = $q['image_attrib'];

classes/Member.php

Indentation +35 added lines, -35 removed lines

@@ -133,12 +133,12 @@ 
     }
 
     /**
-    * Image
-    *
-    * Return a URL for the member's image.
-    *
-    * @return string The URL of the member's image.
-    */
+     * Image
+     *
+     * Return a URL for the member's image.
+     *
+     * @return string The URL of the member's image.
+     */
 
     public function image() {
 
@@ -207,15 +207,15 @@ 
     }
 
     /**
-    * Offices
-    *
-    * Return an array of Office objects held (or previously held) by the member.
-    *
-    * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
-    * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
-    *
-    * @return array An array of Office objects.
-    */
+     * Offices
+     *
+     * Return an array of Office objects held (or previously held) by the member.
+     *
+     * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
+     * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
+     *
+     * @return array An array of Office objects.
+     */
 
     public function offices($include_only = NULL, $ignore_committees = FALSE) {
 
@@ -269,12 +269,12 @@ 
     }
 
     /**
-    * Get Other Parties String
-    *
-    * Return a readable list of party changes for this member.
-    *
-    * @return string|null A readable list of the party changes for this member.
-    */
+     * Get Other Parties String
+     *
+     * Return a readable list of party changes for this member.
+     *
+     * @return string|null A readable list of the party changes for this member.
+     */
 
     public function getOtherPartiesString() {
 
@@ -302,12 +302,12 @@ 
     }
 
     /**
-    * Get Other Constituencies String
-    *
-    * Return a readable list of other constituencies for this member.
-    *
-    * @return string|null A readable list of the other constituencies for this member.
-    */
+     * Get Other Constituencies String
+     *
+     * Return a readable list of other constituencies for this member.
+     *
+     * @return string|null A readable list of the other constituencies for this member.
+     */
 
     public function getOtherConstituenciesString() {
 
@@ -320,14 +320,14 @@ 
     }
 
     /**
-    * Get Entered/Left Strings
-    *
-    * Return an array of readable strings covering when people entered or left
-    * various houses. Returns an array since it's possible for a member to have
-    * done several of these things.
-    *
-    * @return array An array of strings of when this member entered or left houses.
-    */
+     * Get Entered/Left Strings
+     *
+     * Return an array of readable strings covering when people entered or left
+     * various houses. Returns an array since it's possible for a member to have
+     * done several of these things.
+     *
+     * @return array An array of strings of when this member entered or left houses.
+     */
     public function getEnterLeaveStrings() {
         $output = array();
 

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

@@ -39,13 +39,13 @@ 
 
             foreach ($house_types as $house_type) {
 
-                if (in_array($house_type, $left_house) AND
-                    $left_house[$house_type]['reason'] AND
+                if (in_array($house_type, $left_house) and
+                    $left_house[$house_type]['reason'] and
                     $left_house[$house_type]['reason'] == 'Died'
                 ) {
 
                     // This member has left a house because of death.
-                    return TRUE;
+                    return true;
                 }
 
             }
@@ -54,7 +54,7 @@ 
 
         // If we get this far the member hasn't left a house due to death, and
         // is presumably alive.
-        return FALSE;
+        return false;
 
     }
 
@@ -76,11 +76,11 @@ 
 
             $diff = $date_entered->diff($now);
             if ( $diff->y == 0 && $diff->m <= 6 ) {
-                return TRUE;
+                return true;
             }
         }
 
-        return FALSE;
+        return false;
     }
 
     /*
@@ -129,7 +129,7 @@ 
             return $this->extra_info()['eu_ref_stance'];
         }
 
-        return FALSE;
+        return false;
     }
 
     /**
@@ -150,10 +150,10 @@ 
         }
 
         // We can determine if the image exists or not by testing if size is set
-        if ($size !== NULL) {
-            $exists = TRUE;
+        if ($size !== null) {
+            $exists = true;
         } else {
-            $exists = FALSE;
+            $exists = false;
         }
 
         return array(
@@ -217,7 +217,7 @@ 
     * @return array An array of Office objects.
     */
 
-    public function offices($include_only = NULL, $ignore_committees = FALSE) {
+    public function offices($include_only = null, $ignore_committees = false) {
 
         $out = array();
 
@@ -253,16 +253,16 @@ 
     }
 
     private function includeOffice($include_only, $to_date) {
-        $include_office = TRUE;
+        $include_office = true;
 
         // If we should only include previous offices, and the to date is in the future, suppress this office.
-        if ($include_only == 'previous' AND $to_date == '9999-12-31') {
-            $include_office = FALSE;
+        if ($include_only == 'previous' and $to_date == '9999-12-31') {
+            $include_office = false;
         }
 
         // If we should only include previous offices, and the to date is in the past, suppress this office.
-        if ($include_only == 'current' AND $to_date != '9999-12-31') {
-            $include_office = FALSE;
+        if ($include_only == 'current' and $to_date != '9999-12-31') {
+            $include_office = false;
         }
 
         return $include_office;
@@ -287,7 +287,7 @@ 
             $output .= join('; ', $other_parties);
             return $output;
         } else {
-            return NULL;
+            return null;
         }
 
     }
@@ -314,7 +314,7 @@ 
         if ($this->other_constituencies) {
             return 'Also represented ' . join('; ', array_keys($this->other_constituencies));
         } else {
-            return NULL;
+            return null;
         }
 
     }

Spacing +23 added lines, -23 removed lines

@@ -76,7 +76,7 @@ 
             $now = new \DateTime();
 
             $diff = $date_entered->diff($now);
-            if ( $diff->y == 0 && $diff->m <= 6 ) {
+            if ($diff->y == 0 && $diff->m <= 6) {
                 return TRUE;
             }
         }
@@ -97,7 +97,7 @@ 
 
         $entered_house = $this->entered_house($house);
 
-        if ( $entered_house ) {
+        if ($entered_house) {
             $date_entered = $entered_house['date'];
         }
 
@@ -117,7 +117,7 @@ 
 
         $left_house = $this->left_house($house);
 
-        if ( $left_house ) {
+        if ($left_house) {
             $date_left = $left_house['date'];
         }
 
@@ -145,9 +145,9 @@ 
 
         $is_lord = $this->house(HOUSE_TYPE_LORDS);
         if ($is_lord) {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
         } else {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, true);
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, true);
         }
 
         // We can determine if the image exists or not by testing if size is set
@@ -170,10 +170,10 @@ 
 
         usort(
             $departures,
-            function ($a, $b) {
-                if ( $a['date'] == $b['date'] ) {
+            function($a, $b) {
+                if ($a['date'] == $b['date']) {
                     return 0;
-                } else if ( $a['date'] < $b['date'] ) {
+                } else if ($a['date'] < $b['date']) {
                     return -1;
                 } else {
                     return 1;
@@ -211,7 +211,7 @@ 
             $office = $office['office'];
 
             foreach ($office as $row) {
-                if ( $officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row) ) {
+                if ($officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row)) {
                     $out[] = $officeObject;
                 }
             }
@@ -348,7 +348,7 @@ 
     private function entered_house_line($house, $house_name) {
         if (isset($this->entered_house[$house]['date'])) {
             $string = "<strong>Entered the $house_name ";
-            $string .= strlen($this->entered_house[$house]['date_pretty'])==HOUSE_TYPE_SCOTLAND ? 'in ' : 'on ';
+            $string .= strlen($this->entered_house[$house]['date_pretty']) == HOUSE_TYPE_SCOTLAND ? 'in ' : 'on ';
             $string .= $this->entered_house[$house]['date_pretty'] . '</strong>';
             if ($this->entered_house[$house]['reason']) {
                 $string .= ' &mdash; ' . $this->entered_house[$house]['reason'];
@@ -360,7 +360,7 @@ 
     private function left_house_line($house, $house_name) {
         if ($this->house($house) && !$this->current_member($house)) {
             $string = "<strong>Left the $house_name ";
-            $string .= strlen($this->left_house[$house]['date_pretty'])==4 ? 'in ' : 'on ';
+            $string .= strlen($this->left_house[$house]['date_pretty']) == 4 ? 'in ' : 'on ';
             $string .= $this->left_house[$house]['date_pretty'] . '</strong>';
             if ($this->left_house[$house]['reason']) {
                 $string .= ' &mdash; ' . $this->left_house[$house]['reason'];
@@ -373,12 +373,12 @@ 
         $policy_diffs = array();
         $party_positions = $party->getAllPolicyPositions($policiesList);
 
-        if ( !$party_positions ) {
+        if (!$party_positions) {
             return $policy_diffs;
         }
 
-        foreach ( $positions->positionsById as $policy_id => $details ) {
-            if ( $details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
+        foreach ($positions->positionsById as $policy_id => $details) {
+            if ($details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
                 $mp_score = $details['score'];
                 $party_position = $party_positions[$policy_id];
                 $party_score = $party_position['score'];
@@ -393,7 +393,7 @@ 
                 $score_diff = $this->calculatePolicyDiffScore($mp_score, $party_score);
 
                 // skip anything that isn't a yes vs no diff
-                if ( $only_diffs && $score_diff < 2 ) {
+                if ($only_diffs && $score_diff < 2) {
                     continue;
                 }
                 $policy_diffs[$policy_id] = [
@@ -414,18 +414,18 @@ 
         return $policy_diffs;
     }
 
-    private function calculatePolicyDiffScore( $mp_score, $party_score ) {
+    private function calculatePolicyDiffScore($mp_score, $party_score) {
         $score_diff = abs($mp_score - $party_score);
         // if they are on opposite sides of mixture of for and against
         if (
-            ( $mp_score < 0.4 && $party_score > 0.6 ) ||
-            ( $mp_score > 0.6 && $party_score < 0.4 )
+            ($mp_score < 0.4 && $party_score > 0.6) ||
+            ($mp_score > 0.6 && $party_score < 0.4)
         ) {
             $score_diff += 2;
         // if on is mixture of for and against and one is for/against
         } else if (
-            ( $mp_score > 0.4 && $mp_score < 0.6 && ( $party_score > 0.6 || $party_score < 0.4 ) ) ||
-            ( $party_score > 0.4 && $party_score < 0.6 && ( $mp_score > 0.6 || $mp_score < 0.4 ) )
+            ($mp_score > 0.4 && $mp_score < 0.6 && ($party_score > 0.6 || $party_score < 0.4)) ||
+            ($party_score > 0.4 && $party_score < 0.6 && ($mp_score > 0.6 || $mp_score < 0.4))
         ) {
             $score_diff += 1;
         }
@@ -438,7 +438,7 @@ 
 
         $mreg = array();
         $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode);
-        if ( isset($constituencies[$type]) ) {
+        if (isset($constituencies[$type])) {
             $cons_name = $constituencies[$type];
             $query_base = "SELECT member.person_id, title, lordofname, given_name, family_name, constituency, house
                 FROM member, person_names
@@ -455,7 +455,7 @@ 
                     ':cons_name' => $cons_name
                 )
             );
-            if ( !$q->rows() && ($dissolution = Dissolution::db()) ) {
+            if (!$q->rows() && ($dissolution = Dissolution::db())) {
                 $q = $db->query("$query_base AND $dissolution[query]",
                     array(
                         ':house' => $house,
@@ -479,7 +479,7 @@ 
     }
 
     public static function getRepNameForHouse($house) {
-        switch ( $house ) {
+        switch ($house) {
             case HOUSE_TYPE_COMMONS:
                 $name = 'MP';
                 break;

classes/Homepage.php

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

@@ -48,7 +48,7 @@
     }
 
     protected function getRegionalList() {
-        return NULL;
+        return null;
     }
 
     protected function getEditorialContent() {

Spacing +10 added lines, -10 removed lines

@@ -57,14 +57,14 @@ 
         $gid = $featured->get_gid();
         $gidCheck = new Gid($gid);
         $gid = $gidCheck->checkForRedirect();
-        if ( $gid ) {
+        if ($gid) {
             $title = $featured->get_title();
             $context = $featured->get_context();
             $related = $featured->get_related();
             $item = $this->getFeaturedDebate($gid, $title, $context, $related);
         } else {
             $item = $debatelist->display('recent_debates', array('days' => 7, 'num' => 1), 'none');
-            if ( isset($item['data']) && count($item['data']) ) {
+            if (isset($item['data']) && count($item['data'])) {
                 $item = $item['data'][0];
                 $more_url = new Url('debates');
                 $item['more_url'] = $more_url->generate();
@@ -95,8 +95,8 @@ 
         $item['featured'] = true;
 
         $related_debates = array();
-        foreach ( $related as $related_gid ) {
-            if ( $related_gid ) {
+        foreach ($related as $related_gid) {
+            if ($related_gid) {
                 $related_item = $debatelist->display('featured_gid', array('gid' => $related_gid), 'none');
                 $related_debates[] = $related_item['data'];
             }
@@ -121,21 +121,21 @@ 
 
         $recent_content = array();
 
-        foreach ( $this->recent_types as $class => $recent ) {
+        foreach ($this->recent_types as $class => $recent) {
             $class = "\\$class";
             $instance = new $class();
             $more_url = new Url($recent[1]);
-            if ( $recent[0] == 'recent_pbc_debates' ) {
-                $content = array( 'data' => $instance->display($recent[0], array('num' => 5), 'none') );
+            if ($recent[0] == 'recent_pbc_debates') {
+                $content = array('data' => $instance->display($recent[0], array('num' => 5), 'none'));
             } else {
                 $content = $instance->display($recent[0], array('days' => 7, 'num' => 1), 'none');
-                if ( isset($content['data']) && count($content['data']) ) {
+                if (isset($content['data']) && count($content['data'])) {
                     $content = $content['data'][0];
                 } else {
                     $content = array();
                 }
             }
-            if ( $content ) {
+            if ($content) {
                 $content['more_url'] = $more_url->generate();
                 $content['desc'] = $recent[2];
                 $recent_content[] = $content;
@@ -154,7 +154,7 @@ 
             WHERE event_date >= :date
             AND deleted = 0
             ORDER BY event_date, chamber, pos",
-            array( ':date' => $date )
+            array(':date' => $date)
         );
 
         $data = array();

classes/Utility/Hansard.php

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

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 ))->first();
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid))->first();
         $url_gid = fix_gid_from_db($gid);
         $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
         $url->insert(array('id' => $url_gid));

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;
         }
 
     }

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['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 +61 added lines, -24 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,12 +77,14 @@ 
             $name = $q['name'];
             if (self::postcodeIsScottish($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==3)
-                    return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
+                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]);
+                if (count($name)==2) {
+                                    return array('WMC' => $name[0], 'NIE' => $name[1]);
+                }
             } else {
                 return array('WMC' => $name);
             }
@@ -121,8 +125,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'])) {
@@ -172,36 +177,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 +251,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;
     }