mysociety / theyworkforyou

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 {

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

classes/SPHomepage.php

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

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

classes/Party.php

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

@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if ( stripos($vote, '3') !== false ) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if ( stripos($vote, 'aye') !== false ) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if ( stripos($vote, 'no') !== false ) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {

Braces +9 added lines, -3 removed lines

@@ -144,9 +144,15 @@
             $num_votes = 0;
             foreach ($votes as $vote) {
                 $vote_dir = $vote['vote'];
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ( $vote_dir == '' ) {
+                    continue;
+                }
+                if ( $vote_dir == 'tellno' ) {
+                    $vote_dir = 'no';
+                }
+                if ( $vote_dir == 'tellaye' ) {
+                    $vote_dir = 'aye';
+                }
 
                 $num_votes += $vote['num_votes'];
                 $score += ($vote['num_votes'] * $weights[$vote_dir]);

Spacing +20 added lines, -20 removed lines

@@ -20,7 +20,7 @@ 
     public function __construct($name) {
         // treat Labour and Labour/Co-operative the same as that's how
         // people view them and it'll confuse the results otherwise
-        if ( $name == 'Labour/Co-operative' ) {
+        if ($name == 'Labour/Co-operative') {
             $name = 'Labour';
         }
         $this->name = $name;
@@ -74,8 +74,8 @@ 
             $score = $position['score'];
             $score_desc = score_to_strongly($score);
 
-            if ( $want_score ) {
-                return array( $score_desc, $score);
+            if ($want_score) {
+                return array($score_desc, $score);
             } else {
                 return $score_desc;
             }
@@ -114,7 +114,7 @@ 
             ':party' => $this->name
         );
 
-        if ( $this->name == 'Labour' ) {
+        if ($this->name == 'Labour') {
             $party_where = '( party = :party OR party = :party2 )';
             $params = array(
                 ':party' => $this->name,
@@ -144,40 +144,40 @@ 
             $num_votes = 0;
             foreach ($votes as $vote) {
                 $vote_dir = $vote['vote'];
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ($vote_dir == '') continue;
+                if ($vote_dir == 'tellno') $vote_dir = 'no';
+                if ($vote_dir == 'tellaye') $vote_dir = 'aye';
 
                 $num_votes += $vote['num_votes'];
                 $score += ($vote['num_votes'] * $weights[$vote_dir]);
             }
 
             $total_votes += $num_votes;
-            $max_score += $num_votes * max( array_values( $weights ) );
+            $max_score += $num_votes * max(array_values($weights));
         }
 
-        if ( $total_votes == 0 ) {
+        if ($total_votes == 0) {
             return null;
         }
 
         // this implies that all the divisions in the policy have a policy
         // position of absent so we set weight to -1 to indicate we can't
         // really say what the parties position is.
-        if ( $max_score == 0 ) {
+        if ($max_score == 0) {
             $weight = -1;
         } else {
-            $weight = 1 - ( $score/$max_score );
+            $weight = 1 - ($score / $max_score);
         }
         $score_desc = score_to_strongly($weight);
 
-        if ( $want_score ) {
-            return array( $score_desc, $weight);
+        if ($want_score) {
+            return array($score_desc, $weight);
         } else {
             return $score_desc;
         }
     }
 
-    public function cache_position( $position ) {
+    public function cache_position($position) {
         $this->db->query(
             "REPLACE INTO partypolicy
                 (party, house, policy_id, score)
@@ -197,9 +197,9 @@ 
             return $positions;
         }
 
-        foreach ( $policies->getPolicies() as $policy_id => $policy_text ) {
-            list( $position, $score ) = $this->$method($policy_id, true);
-            if ( $position === null ) {
+        foreach ($policies->getPolicies() as $policy_id => $policy_text) {
+            list($position, $score) = $this->$method($policy_id, true);
+            if ($position === null) {
                 continue;
             }
 
@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if (stripos($vote, '3') !== FALSE) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if (stripos($vote, 'aye') !== FALSE) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if (stripos($vote, 'no') !== FALSE) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {

classes/AlertView.php

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

@@ -11,7 +11,7 @@
     protected $db;
     protected $alert;
 
-    public function __construct($THEUSER = NULL) {
+    public function __construct($THEUSER = null) {
         $this->user = $THEUSER;
         $this->db = new \ParlDB;
         $this->alert = new \ALERT;

classes/Topic.php

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

@@ -28,7 +28,7 @@
      *
      */
 
-    public function __construct($data = NULL)
+    public function __construct($data = null)
     {
         $this->db = new \ParlDB;
 

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 
     public function sctitle() {
         $title = $this->title;
-        if (strpos($title, 'The ') === 0 ) {
+        if (strpos($title, 'The ') === 0) {
             $title = lcfirst($title);
         }
 
@@ -242,7 +242,7 @@ 
             );
         } else {
             foreach ($sets as $set) {
-                if ($set == '' ) {
+                if ($set == '') {
                     continue;
                 }
                 $q = $this->db->query(
@@ -285,7 +285,7 @@ 
             );
         } else {
             foreach ($policies as $policy) {
-                if ($policy == '' ) {
+                if ($policy == '') {
                     continue;
                 }
                 $q = $this->db->query(

Indentation +19 added lines, -19 removed lines

@@ -33,7 +33,7 @@ 
         $this->db = new \ParlDB;
 
         if (is_null($data)) {
-          return;
+            return;
         }
 
         $this->id = $data['id'];
@@ -124,7 +124,7 @@ 
 
     private function _getContentIDs() {
         $q = $this->db->query(
-          "SELECT body, gid, ep.epobject_id FROM epobject ep
+            "SELECT body, gid, ep.epobject_id FROM epobject ep
            JOIN hansard h on ep.epobject_id = h.epobject_id
            JOIN topic_epobjects te on te.epobject_id = ep.epobject_id
            WHERE topic_key = :topic_key",
@@ -178,24 +178,24 @@ 
 
     public function addContent($gid) {
         $q = $this->db->query(
-          "SELECT epobject_id FROM hansard WHERE gid = :gid",
-          array(
+            "SELECT epobject_id FROM hansard WHERE gid = :gid",
+            array(
             ":gid" => $gid
-          )
+            )
         )->first();
 
         if (!$q) {
-          return false;
+            return false;
         }
 
         $epobject_id = $q['epobject_id'];
 
         $q = $this->db->query(
-          "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
-          array(
+            "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $epobject_id
-          )
+            )
         );
 
         return $q->success();
@@ -203,23 +203,23 @@ 
 
     public function deleteContent($id) {
         $q = $this->db->query(
-          "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
-          array(
+            "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $id
-          )
+            )
         );
 
         return $q->success();
     }
 
     public function getPolicySets() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         "SELECT policyset FROM topic_policysets WHERE topic_key = :key",
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
         $sets = array();
         foreach ($q as $row) {
@@ -256,12 +256,12 @@ 
     }
 
     public function getPolicies() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         'SELECT policy_id FROM topic_policies WHERE topic_key = :key',
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
         $policies = array();
         foreach ($q as $row) {
@@ -312,7 +312,7 @@ 
 
     public function save() {
         $q = $this->db->query(
-          "REPLACE INTO topics
+            "REPLACE INTO topics
           (id, title, slug, description, search_string, front_page, image)
           VALUES
           (:id, :title, :slug, :description, :search_string, :front_page, :image)",