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/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/SectionView/PbcView.php

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

@@ -65,7 +65,7 @@
         } elseif ($this->session) {
             # Display the bills for a particular session
             $this_page = 'pbc_session';
-            $DATA->set_page_metadata($this_page, 'title', "Session $this->session");
+            $DATA->set_page_metadata($this_page, 'title', "session $this->session");
             $args = array (
                 'session' => $this->session,
             );

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         } elseif ($bill_id) {
             # Display the page for a particular bill
             $this_page = 'pbc_bill';
-            $args = array (
+            $args = array(
                 'id' => $bill_id,
                 'title' => $this->bill,
                 'session' => $this->session,
@@ -66,7 +66,7 @@ 
             # Display the bills for a particular session
             $this_page = 'pbc_session';
             $DATA->set_page_metadata($this_page, 'title', "Session $this->session");
-            $args = array (
+            $args = array(
                 'session' => $this->session,
             );
             $data = array();
@@ -88,12 +88,12 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'pbc' )
+            array('section' => 'pbc')
         );
     }
 
     protected function front_content() {
-        return $this->list->display( 'recent_pbc_debates', array( 'num' => 50 ), 'none' );
+        return $this->list->display('recent_pbc_debates', array('num' => 50), 'none');
     }
 
     protected function display_front() {

classes/SectionView/SectionView.php

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

@@ -512,7 +512,7 @@
             if ($row['totalcomments'] > 1) {
                 $morecount = $row['totalcomments'] - 1;
                 $plural = $morecount == 1 ? 'annotation' : 'annotations';
-                $linktext = "Read $morecount more $plural";
+                $linktext = "read $morecount more $plural";
             }
 
         } else {

Spacing +33 added lines, -33 removed lines

@@ -32,7 +32,7 @@ 
             $data = $this->addCommonData($data);
         } elseif ($date = get_http_var('d')) {
             $data = $this->display_day($date);
-            if ( !isset($data['template']) ) {
+            if (!isset($data['template'])) {
                 $data['template'] = 'section/day';
             }
             $data = $this->addCommonData($data);
@@ -40,7 +40,7 @@ 
             $data = $this->display_section_or_speech();
         } else {
             $data = $this->display_front();
-            if ( !isset($data['template']) ) {
+            if (!isset($data['template'])) {
                 $data['template'] = 'section/recent';
             }
             $data['search_sections'] = $this->getSearchSections();
@@ -59,10 +59,10 @@ 
         $data['recess_major'] = $this->getRecessMajor();
 
         $nextprev = $DATA->page_metadata($this_page, 'nextprev');
-        if ( isset($nextprev['next']['url']) ) {
+        if (isset($nextprev['next']['url'])) {
             $data['next'] = $nextprev['next'];
         }
-        if ( isset($nextprev['prev']['url']) ) {
+        if (isset($nextprev['prev']['url'])) {
             $data['prev'] = $nextprev['prev'];
         }
 
@@ -71,7 +71,7 @@ 
         if (!isset($data['title']) && $parent_page != '') {
             $data['title'] = $DATA->page_metadata($parent_page, 'title');
         }
-        if ( $parent_page ) {
+        if ($parent_page) {
             $data['parent_title'] = $DATA->page_metadata($parent_page, 'title');
         }
 
@@ -87,7 +87,7 @@ 
 
         $urls = array_merge($urls, $this->getViewUrls());
 
-        if ( isset($data['info']['page']) ) {
+        if (isset($data['info']['page'])) {
             $day = new \MySociety\TheyWorkForYou\Url($data['info']['page']);
             $urls['day'] = $day;
         }
@@ -133,7 +133,7 @@ 
             $DATA->set_page_metadata($this_page, 'title', $year);
         }
 
-        $args = array ( 'year' => $year );
+        $args = array('year' => $year);
         $data = $this->list->display('calendar', $args, 'none');
         return $data;
     }
@@ -141,7 +141,7 @@ 
     protected function display_column($date, $column) {
         global $this_page;
         $this_page = $this->page_base;
-        $args = array( 'date' => $date, 'column' => $column );
+        $args = array('date' => $date, 'column' => $column);
         $content = $this->list->display('column', $args, 'none');
 
         $data = array();
@@ -166,12 +166,12 @@ 
     protected function display_day($date) {
         global $this_page;
         $this_page = $this->page_base . 'day';
-        $args = array ( 'date' => get_http_var('d') );
+        $args = array('date' => get_http_var('d'));
         $data = $this->list->display('date', $args, 'none');
         list($year, $month, $day) = explode('-', $date);
-        $args = array( 'year' => $year, 'month' => $month, 'day' => $day);
+        $args = array('year' => $year, 'month' => $month, 'day' => $day);
         $calendar = $this->list->display('calendar', $args, 'none');
-        if ( isset($calendar['years']) ) {
+        if (isset($calendar['years'])) {
             $data['calendar'] = $calendar['years'];
         }
         return $data;
@@ -181,7 +181,7 @@ 
         global $DATA, $this_page, $THEUSER;
 
         # += as we *don't* want to override any already supplied argument
-        $args += array (
+        $args += array(
             'gid' => get_http_var('id'),
             's' => get_http_var('s'), // Search terms to be highlighted.
             'member_id' => get_http_var('m'), // Member's speeches to be highlighted.
@@ -198,14 +198,14 @@ 
             if ($this->major == 6) {
                 # Magically (as in I can't remember quite why), pbc_clause will
                 # contain the new URL without any change...
-                $URL->remove( array('id') );
+                $URL->remove(array('id'));
             } else {
-                $URL->insert( array('id'=>$e->getMessage()) );
+                $URL->insert(array('id'=>$e->getMessage()));
             }
             # put the search term back in so highlighting works.
             # NB: as we don't see the # part of the URL we lose this :(
-            if ( $args['s'] !== '' ) {
-                $URL->insert( array('s'=>$args['s']) );
+            if ($args['s'] !== '') {
+                $URL->insert(array('s'=>$args['s']));
             }
             redirect($URL->generate('none'), 301);
         }
@@ -280,7 +280,7 @@ 
         if (array_key_exists('text_heading', $data['info'])) {
             // avoid having Clause 1 etc as the alert text search string on PBC pages as it's
             // almost certainly not what the person wants
-            if ( $this->major == 6 ) {
+            if ($this->major == 6) {
                 $data['email_alert_text'] = $data['section_title'];
             } else {
                 $data['email_alert_text'] = $data['info']['text_heading'];
@@ -327,7 +327,7 @@ 
             $body = preg_replace('#<phrase class="honfriend" id="uk.org.publicwhip/member/(\d+)" name="([^"]*?)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?m=$1" title="Our page on $2 - \'$3\'">$4</a>', $body);
             $body = preg_replace('#<phrase class="honfriend" name="([^"]*?)" person_id="uk.org.publicwhip/person/(\d+)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?p=$2" title="Our page on $1 - \'$3\'">$4</a>', $body);
             $body = preg_replace_callback('#<phrase class="offrep" id="(.*?)/(\d+)-(\d+)-(\d+)\.(.*?)">(.*?)</phrase>#', function($matches) {
-                return '<a href="/search/?pop=1&s=date:' . $matches[2] . $matches[3] . $matches[4] . '+column:' . $matches[5] . '+section:' . $matches[1] .'">' . str_replace("Official Report", "Hansard", $matches[6]) . '</a>';
+                return '<a href="/search/?pop=1&s=date:' . $matches[2] . $matches[3] . $matches[4] . '+column:' . $matches[5] . '+section:' . $matches[1] . '">' . str_replace("Official Report", "Hansard", $matches[6]) . '</a>';
             }, $body);
             #$body = preg_replace('#<phrase class="offrep" id="((.*?)/(\d+)-(\d+)-(\d+)\.(.*?))">(.*?)</phrase>#e', "\"<a href='/search/?pop=1&amp;s=date:$3$4$5+column:$6+section:$2&amp;match=$1'>\" . str_replace('Official Report', 'Hansard', '$7') . '</a>'", $body);
             $bodies[] = $body;
@@ -360,7 +360,7 @@ 
         $data['section_title'] = '';
         $subsection_title = '';
         $rows = count($data['rows']);
-        for ($i=0; $i<$rows; $i++) {
+        for ($i = 0; $i < $rows; $i++) {
             $row = $data['rows'][$i];
             $htype = $row['htype'];
             // HPOS should be defined below if it's needed; otherwise default to 0
@@ -383,7 +383,7 @@ 
                 # Voting links
                 $data['rows'][$i]['voting_data'] = '';
                 if (isset($row['votes'])) {
-                    $data['rows'][$i]['voting_data'] = $this->generate_votes( $row['votes'], $row['epobject_id'], $row['gid'] );
+                    $data['rows'][$i]['voting_data'] = $this->generate_votes($row['votes'], $row['epobject_id'], $row['gid']);
                 }
 
                 # Annotation link
@@ -424,52 +424,52 @@ 
 
     private function getCountryDetails() {
         $details = array(
-            1 => array (
+            1 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in the House of Commons'
             ),
-            2 => array (
+            2 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in Westminster Hall'
             ),
-            3 => array (
+            3 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => 'written question &ndash; answered'
             ),
-            4 => array (
+            4 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => 'written statement &ndash; made'
             ),
-            5 => array (
+            5 => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '&ndash; in the Northern Ireland Assembly'
             ),
-            6 => array (
+            6 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in a Public Bill Committee'
             ),
-            7 => array (
+            7 => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '&ndash; in the Scottish Parliament'
             ),
-            8 => array (
+            8 => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '&ndash; Scottish Parliament written question &ndash; answered'
             ),
-            9 => array (
+            9 => array(
                 'country' => 'LONDON',
                 'assembly' => 'london-assembly',
                 'location' => 'Questions to the Mayor of London &ndash; answered'
             ),
-            101 => array (
+            101 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '&ndash; in the House of Lords'
@@ -500,7 +500,7 @@ 
         global $DATA, $this_page;
         $this_page = $this->page_base . 'front';
         $data = array();
-        if ( $this->index_template ) {
+        if ($this->index_template) {
             $data['template'] = $this->index_template;
         }
 
@@ -510,7 +510,7 @@ 
 
         $content['calendar'] = $class->display('calendar', array('months' => 1), 'none');
 
-        if ( $rssurl = $DATA->page_metadata($this_page, 'rss') ) {
+        if ($rssurl = $DATA->page_metadata($this_page, 'rss')) {
             $content['rssurl'] = $rssurl;
         }
 
@@ -525,7 +525,7 @@ 
     }
 
     //$totalcomments, $comment, $commenturl
-    function generate_commentteaser ($row) {
+    function generate_commentteaser($row) {
         // Returns HTML for the one fragment of comment and link for the sidebar.
         // $totalcomments is the number of comments this item has on it.
         // $comment is an array like:

www/includes/easyparliament/templates/html/static/linktous.php

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

@@ -24,7 +24,7 @@
     </form>
 </div>
 <!-- TheyWorkForYou box, end -->
-END;
+end;
 print $link_to_us_form;
 ?>
 

www/includes/easyparliament/templates/html/scotland/index.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
                         <?php if ( $featured ) {
-                             include dirname(__FILE__) . "/../homepage/featured.php";
+                                include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
                     <div class="homepage-create-alert homepage-content-section">

Spacing +4 added lines, -4 removed lines

@@ -11,10 +11,10 @@ 
                 </div>
                 <div class="row">
                     <div class="medium-9 columns">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                         <li>Your Regional MSPs:</li>
-                        <?php foreach ( $data['regional'] as $msp ) { ?>
+                        <?php foreach ($data['regional'] as $msp) { ?>
                             <li class="homepage-rep-list__rep"><a href="/msp/?p=<?= $msp['person_id'] ?>"><?= $msp['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -57,7 +57,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( $featured ) {
+                        <?php if ($featured) {
                              include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
@@ -104,7 +104,7 @@ 
 
                         <h2>Recently in Parliament</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>

www/includes/easyparliament/templates/html/section/_section_content.php

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

@@ -157,7 +157,7 @@
               <?php # XXX
                 if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
                     ?><p class="debate-speech__question_id"><small>
-                    <?= "Question $m[1]" ?>
+                    <?= "question $m[1]" ?>
                     </small></p>
               <?php } ?>
             </h2>

Braces +2 added lines, -1 removed lines

@@ -186,7 +186,8 @@
                 } # End of voting HTML
 
                 // Video
-                if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only
+                if ($data['info']['major'] == 1 && !$individual_item) {
+# Commons debates only
                     if ($speech['video_status']&4) { ?>
                         <a href="<?= $speech['commentsurl'] ?>" class="watch debate-speech__meta__link" onclick="return moveVideo(\'debate/'<?= $speech['gid'] ?>\');">Watch this</a>
                     <?php

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
         if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
             $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' <a href="/spwrans/?spid=$1">$1</a> ', $body);
             $body = preg_replace_callback('#<citation id="uk\.org\.publicwhip/(.*?)/(.*?)">\[(.*?)\]</citation>#', function($matches) {
-                   if ($matches[1] == 'spor') {
-                       $href_segment = 'sp/?g';
-                   } elseif ($matches[1] == 'spwa') {
+                    if ($matches[1] == 'spor') {
+                        $href_segment = 'sp/?g';
+                    } elseif ($matches[1] == 'spwa') {
                         $href_segment = 'spwrans/?';
                     } else {
                         $href_segment = 'debates/?';
@@ -191,7 +191,7 @@ 
                     $after_mp = $speech['after_mp'];
                 }
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
-              } ?>
+                } ?>
                 <div class="debate-speech__division__details">
                   <?php include dirname(__FILE__) . '/../divisions/_votes.php'; ?>
                 </div>

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-foreach($data['rows'] as $speech) { ?>
+foreach ($data['rows'] as $speech) { ?>
 
     <?php
 
@@ -63,27 +63,27 @@ 
     $source = array();
 
     $major = $data['info']['major'];
-    if ($major==1 || $major==2 || (($major==3 || $major==4) && isset($speech['speaker']['house'])) || $major==101 || $major==6) {
+    if ($major == 1 || $major == 2 || (($major == 3 || $major == 4) && isset($speech['speaker']['house'])) || $major == 101 || $major == 6) {
         $source['title'] = 'Citation: ';
-        if ($major==1 || $major==2) {
+        if ($major == 1 || $major == 2) {
             $source['title'] .= 'HC';
-        } elseif ($major==3 || $major==4) {
-            if ($speech['speaker']['house']==1) {
+        } elseif ($major == 3 || $major == 4) {
+            if ($speech['speaker']['house'] == 1) {
                 $source['title'] .= 'HC';
             } else {
                 $source['title'] .= 'HL';
             }
-        } elseif ($major==6) {
+        } elseif ($major == 6) {
             $source['title'] .= $data['section_title'];
         } else {
             $source['title'] .= 'HL';
         }
         $source['title'] .= ' Deb, ' . format_date($data['info']['date'], LONGDATEFORMAT) . ', c' . $speech['colnum'];
-        if ($major==2) {
+        if ($major == 2) {
             $source['title'] .= 'WH';
-        } elseif ($major==3) {
+        } elseif ($major == 3) {
             $source['title'] .= 'W';
-        } elseif ($major==4) {
+        } elseif ($major == 4) {
             $source['title'] .= 'WS';
         }
     }
@@ -114,7 +114,7 @@ 
             <div class="debate-speech__speaker-and-content">
             <?php } ?>
 
-          <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
+          <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
             <h2 class="debate-speech__speaker">
                 <?php
 
@@ -181,17 +181,17 @@ 
                 <?php if ($division['has_description']) { ?>
                 <div class="debate-speech__division__details">
                     <span class="policy-vote__text">
-                        <?php include( dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
+                        <?php include(dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
                     </span><br>
                 </div>
                 <?php } ?>
 
               <?php if (isset($speech['mp_vote'])) {
-                $mp_vote = array( 'vote' => $speech['mp_vote']['vote'] );
-                if ( isset($speech['before_mp']) ) {
+                $mp_vote = array('vote' => $speech['mp_vote']['vote']);
+                if (isset($speech['before_mp'])) {
                     $before_mp = $speech['before_mp'];
                 }
-                if ( isset($speech['after_mp']) ) {
+                if (isset($speech['after_mp'])) {
                     $after_mp = $speech['after_mp'];
                 }
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
@@ -203,7 +203,7 @@ 
             <div class="debate-speech__content"><?=$body ?></div>
             <?php } ?>
 
-            <?php if ( $section ) {
+            <?php if ($section) {
                 if ($speech['voting_data']) { ?>
 
                 <div class="debate-speech__question-answered">
@@ -361,7 +361,7 @@ 
                     $moreinfo[] = $row['totalcomments'] . " $plural";
                 }
                 if (count($moreinfo) > 0) {
-                    print "<small>(" . implode (', ', $moreinfo) . ") </small>";
+                    print "<small>(" . implode(', ', $moreinfo) . ") </small>";
                 }
             } else {
                 // Nothing in this item, so no link.

www/includes/easyparliament/templates/html/section/year.php

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

@@ -34,6 +34,6 @@
         </div>
     </div>
 
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
+    <?php $search_title = "search $title"; include '_search.php'; ?>
 
 </div>