mysociety / theyworkforyou

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 +32 added lines, -32 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'));
         }
@@ -273,7 +273,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'];
@@ -320,7 +320,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;
@@ -353,7 +353,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
@@ -376,7 +376,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
@@ -417,47 +417,47 @@ 
 
     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'
             ),
-            101 => array (
+            101 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '&ndash; in the House of Lords'
@@ -472,7 +472,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;
         }
 
@@ -482,7 +482,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;
         }
 
@@ -497,7 +497,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:

classes/AlertView/Simple.php

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

@@ -32,7 +32,7 @@ 
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
             if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
-                $data['already_signed_up'] = True;
+                $data['already_signed_up'] = true;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
             }
@@ -67,13 +67,13 @@ 
 
     private function createAlertForPostCode($email, $postcode) {
         if ( !$this->validateDetails($email, $postcode) ) {
-            return array('invalid-postcode-or-email' => True);
+            return array('invalid-postcode-or-email' => true);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
         } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
-            return array('bad-constituency' => True);
+            return array('bad-constituency' => true);
         }
 
         $details = array(
@@ -93,19 +93,19 @@ 
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['already_signed_up'] = True;
+                    $data['already_signed_up'] = true;
                 }
                 break;
             case self::CREATE_FAILED:
-                $data['error'] = True;
+                $data['error'] = true;
                 break;
             default: // alert created
                 if ( $not_logged_in ) {
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['signedup_no_confirm'] = True;
+                    $data['signedup_no_confirm'] = true;
                 }
         }
 
@@ -146,11 +146,11 @@ 
             }
 
             $this->alert->delete($q->field($i, 'alert_id') . '::' . $q->field($i ,'registrationtoken'));
-            $this->alert->add($details, False);
+            $this->alert->add($details, false);
         }
 
         return array(
-            'signedup_no_confirm' => True,
+            'signedup_no_confirm' => true,
             'new_mp' => $new_mp->full_name(),
         );
     }
@@ -183,7 +183,7 @@ 
 
         if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
             $data = array(
-                'already_signed_up' => True,
+                'already_signed_up' => true,
                 'old_mp' => $old_mp->full_name(),
                 'mp_name' => $new_mp->full_name(),
             );
@@ -194,7 +194,7 @@ 
             );
         }
 
-        $data['update'] = True;
+        $data['update'] = true;
         $data['confirmation'] = $confirmation;
 
         return $data;

Spacing +20 added lines, -20 removed lines

@@ -7,7 +7,7 @@ 
     public function display() {
         $data = array();
         $data['recent_election'] = false;
-        if ( $this->user->loggedin() ) {
+        if ($this->user->loggedin()) {
             $data['user_signed_in'] = true;
         }
 
@@ -17,21 +17,21 @@ 
             $data['postcode'] = get_http_var('postcode');
 
             $result = $this->createAlertForPostCode($data['email'], $data['postcode']);
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update')) {
             $result = $this->getNewMP(get_http_var('update'));
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update-alert')) {
-            $success = $this->replaceAlert( get_http_var('confirmation') );
+            $success = $this->replaceAlert(get_http_var('confirmation'));
             $data['confirmation_received'] = $success;
         } elseif (get_http_var('confirmed')) {
-            $success = $this->confirmAlert( get_http_var('confirmed') );
+            $success = $this->confirmAlert(get_http_var('confirmed'));
             $data['confirmation_received'] = $success;
         } else {
             $data['email'] = $this->user->email() ? $this->user->email() : '';
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
-            if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
+            if ($this->isEmailSignedUpForPostCode($data['email'], $data['postcode'])) {
                 $data['already_signed_up'] = True;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
@@ -66,13 +66,13 @@ 
     }
 
     private function createAlertForPostCode($email, $postcode) {
-        if ( !$this->validateDetails($email, $postcode) ) {
+        if (!$this->validateDetails($email, $postcode)) {
             return array('invalid-postcode-or-email' => True);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
-        } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (\MySociety\TheyWorkForYou\MemberException $e) {
             return array('bad-constituency' => True);
         }
 
@@ -89,7 +89,7 @@ 
 
         switch ($result) {
             case self::ALERT_EXISTS:
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
@@ -102,7 +102,7 @@ 
                 $data['error'] = True;
                 break;
             default: // alert created
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     $data['confirmation_sent'] = True;
                 } else {
                     $data['signedup_no_confirm'] = True;
@@ -116,8 +116,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $old_mp_id ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $old_mp_id));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -131,7 +131,7 @@ 
             )
         );
 
-        for ( $i = 0; $i < $q->rows; $i++ ) {
+        for ($i = 0; $i < $q->rows; $i++) {
             // need to reset this otherwise delete does not work
             $this->alert->token_checked = null;
             $other_criteria = trim(preg_replace('/speaker:\d+/', '', $q->field($i, 'criteria')));
@@ -141,11 +141,11 @@ 
                 'pid' => $new_mp->person_id,
                 'pc' => '',
             );
-            if ( $other_criteria ) {
+            if ($other_criteria) {
                 $details['keyword'] = $other_criteria;
             }
 
-            $this->alert->delete($q->field($i, 'alert_id') . '::' . $q->field($i ,'registrationtoken'));
+            $this->alert->delete($q->field($i, 'alert_id') . '::' . $q->field($i, 'registrationtoken'));
             $this->alert->add($details, False);
         }
 
@@ -158,11 +158,11 @@ 
     private function isEmailSignedUpForPostCode($email, $postcode) {
         $is_signed_up = false;
 
-        if ( $email && $postcode ) {
+        if ($email && $postcode) {
             try {
                 $person = $this->getPersonFromPostcode($postcode);
                 $is_signed_up = $this->alert->fetch_by_mp($email, $person->person_id);
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $is_signed_up = false;
             }
         }
@@ -178,10 +178,10 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $criteria ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $criteria));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
-        if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
+        if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = array(
                 'already_signed_up' => True,
                 'old_mp' => $old_mp->full_name(),

classes/PolicyPositions.php

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

@@ -63,7 +63,7 @@ 
         $this->summaries = isset($options['summaries']) ? $options['summaries'] : array();
         $this->divisions = new \MySociety\TheyWorkForYou\Divisions($member);
 
-        $limit = isset($options['limit']) ? $options['limit'] : NULL;
+        $limit = isset($options['limit']) ? $options['limit'] : null;
 
         // Do the actual getting of positions
         $this->getMemberPolicyPositions($limit);
@@ -77,7 +77,7 @@ 
      * @param int $limit The number of results to limit the output to.
      */
 
-    private function getMemberPolicyPositions ($limit = NULL) {
+    private function getMemberPolicyPositions ($limit = null) {
 
         // Make sure member info has actually been set.
         if (count($this->member->extra_info) === 0) {
@@ -89,7 +89,7 @@ 
         $member_houses = $this->member->houses();
 
         // Determine the policy limit.
-        if ($limit !== NULL AND is_int($limit))
+        if ($limit !== null and is_int($limit))
         {
             $policy_limit = $limit;
         } else {
@@ -208,12 +208,12 @@ 
         $current_member = $this->member->current_member();
 
         if (count($this->policies) > 0) {
-            if (in_array(HOUSE_TYPE_COMMONS, $member_houses) AND
+            if (in_array(HOUSE_TYPE_COMMONS, $member_houses) and
                 $entered_house[HOUSE_TYPE_COMMONS]['date'] > '2001-06-07'
             ) {
                 $since = '';
-            } elseif (!in_array(HOUSE_TYPE_COMMONS, $member_houses) AND
-                in_array(HOUSE_TYPE_LORDS, $member_houses) AND
+            } elseif (!in_array(HOUSE_TYPE_COMMONS, $member_houses) and
+                in_array(HOUSE_TYPE_LORDS, $member_houses) and
                 $entered_house[HOUSE_TYPE_LORDS]['date'] > '2001-06-07'
             ) {
                 $since = '';
@@ -223,9 +223,9 @@ 
                 $since = ' since 2001';
             }
             # If not current MP/Lord, but current MLA/MSP, need to say voting record is when MP
-            if (!$current_member[HOUSE_TYPE_COMMONS] AND
-                !$current_member[HOUSE_TYPE_LORDS] AND
-                ( $current_member[HOUSE_TYPE_SCOTLAND] OR $current_member[HOUSE_TYPE_NI] )
+            if (!$current_member[HOUSE_TYPE_COMMONS] and
+                !$current_member[HOUSE_TYPE_LORDS] and
+                ( $current_member[HOUSE_TYPE_SCOTLAND] or $current_member[HOUSE_TYPE_NI] )
             ) {
                 $since .= ' whilst an MP';
             }
@@ -246,10 +246,10 @@ 
                 '" title="At The Guardian">well-known issues</a> <small>(from the Guardian)</small>';
         }
         if (
-            ( isset($extra_info['public_whip_division_attendance']) AND
+            ( isset($extra_info['public_whip_division_attendance']) and
             $extra_info['public_whip_division_attendance'] != 'n/a' )
-            OR
-            ( isset($extra_info['Lpublic_whip_division_attendance']) AND
+            or
+            ( isset($extra_info['Lpublic_whip_division_attendance']) and
             $extra_info['Lpublic_whip_division_attendance'] != 'n/a' )
         ) {
             $record[] = '<a href="http://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/' .

Spacing +9 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
      * @param int $limit The number of results to limit the output to.
      */
 
-    private function getMemberPolicyPositions ($limit = NULL) {
+    private function getMemberPolicyPositions($limit = NULL) {
 
         // Make sure member info has actually been set.
         if (count($this->member->extra_info) === 0) {
@@ -113,7 +113,7 @@ 
 
                 // don't return votes where they haven't voted on a strong division
                 // if we're limiting the number of votes
-                if ( $limit && !empty($dream_info) && !$dream_info['has_strong'] ) {
+                if ($limit && !empty($dream_info) && !$dream_info['has_strong']) {
                     continue;
                 }
 
@@ -142,7 +142,7 @@ 
 
             } else {
                 // We're over the policy limit, no sense still going, break out of the foreach.
-                break ;
+                break;
             }
         }
 
@@ -197,7 +197,7 @@ 
                 $has_strong = 1;
             }
             $full_sentence = $consistency . ' ' . $policy_description;
-            $out = array( 'full_sentence' => $full_sentence, 'score' => $dmpscore, 'position' => $consistency, 'has_strong' => $has_strong );
+            $out = array('full_sentence' => $full_sentence, 'score' => $dmpscore, 'position' => $consistency, 'has_strong' => $has_strong);
         }
 
         return $out;
@@ -228,7 +228,7 @@ 
             # If not current MP/Lord, but current MLA/MSP, need to say voting record is when MP
             if (!$current_member[HOUSE_TYPE_COMMONS] AND
                 !$current_member[HOUSE_TYPE_LORDS] AND
-                ( $current_member[HOUSE_TYPE_SCOTLAND] OR $current_member[HOUSE_TYPE_NI] )
+                ($current_member[HOUSE_TYPE_SCOTLAND] OR $current_member[HOUSE_TYPE_NI])
             ) {
                 $since .= ' whilst an MP';
             }
@@ -249,11 +249,11 @@ 
                 '" title="At The Guardian">well-known issues</a> <small>(from the Guardian)</small>';
         }
         if (
-            ( isset($extra_info['public_whip_division_attendance']) AND
-            $extra_info['public_whip_division_attendance'] != 'n/a' )
+            (isset($extra_info['public_whip_division_attendance']) AND
+            $extra_info['public_whip_division_attendance'] != 'n/a')
             OR
-            ( isset($extra_info['Lpublic_whip_division_attendance']) AND
-            $extra_info['Lpublic_whip_division_attendance'] != 'n/a' )
+            (isset($extra_info['Lpublic_whip_division_attendance']) AND
+            $extra_info['Lpublic_whip_division_attendance'] != 'n/a')
         ) {
             $record[] = '<a href="http://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/' .
                 $this->member->member_id() .

Braces +4 added lines, -4 removed lines

@@ -89,8 +89,7 @@ 
         $member_houses = $this->member->houses();
 
         // Determine the policy limit.
-        if ($limit !== NULL AND is_int($limit))
-        {
+        if ($limit !== NULL AND is_int($limit)) {
             $policy_limit = $limit;
         } else {
             $policy_limit = count($policies);
@@ -105,8 +104,9 @@ 
         foreach ($policies as $policy) {
             // Are we still within the policy limit?
             if ($i < $policy_limit) {
-                if (isset($policy[2]) && $policy[2] && !in_array(HOUSE_TYPE_COMMONS, $member_houses))
-                    continue;
+                if (isset($policy[2]) && $policy[2] && !in_array(HOUSE_TYPE_COMMONS, $member_houses)) {
+                                    continue;
+                }
 
                 $votes_summary = array_key_exists($policy[0], $this->summaries) ? $this->summaries[$policy[0]] : array();
                 $dream_info = $this->displayDreamComparison($policy[0], $policy[1], $votes_summary);

www/includes/easyparliament/templates/html/mp/divisions.php

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

@@ -33,7 +33,7 @@ 
                 </div>
                 <?php endif; ?>
 
-                <?php $displayed_votes = FALSE; ?>
+                <?php $displayed_votes = false; ?>
                 <?php if ( isset($policydivisions) && $policydivisions ) { ?>
 
                     <?php if ($has_voting_record) { ?>
@@ -86,14 +86,14 @@ 
 
                                     <ul class="vote-descriptions policy-votes">
                                     <?php
-                                        $show_all = FALSE;
+                                        $show_all = false;
                                         if ( $policy['weak_count'] == 0 || $policy['weak_count'] == count($policy['divisions']) ) {
-                                            $show_all = TRUE;
+                                            $show_all = true;
                                         }
                                     ?>
                                     <?php foreach ($policy['divisions'] as $division) {
                                         include('_division_description.php');
-                                        $displayed_votes = TRUE;
+                                        $displayed_votes = true;
                                     } ?>
                                     </ul>
 

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
         </div>
         <div class="person-panels">
             <div class="sidebar__unit in-page-nav">
-                <?php if ( isset($policydivisions) && $policydivisions && count($policydivisions) == 1 ) { ?>
+                <?php if (isset($policydivisions) && $policydivisions && count($policydivisions) == 1) { ?>
                 <p class="policy-votes-intro">
                     How <?= $full_name ?> voted on <?= $policydivisions[array_keys($policydivisions)[0]]['desc'] ?>.
                 </p>
@@ -34,17 +34,17 @@ 
                 <?php endif; ?>
 
                 <?php $displayed_votes = FALSE; ?>
-                <?php if ( isset($policydivisions) && $policydivisions ) { ?>
+                <?php if (isset($policydivisions) && $policydivisions) { ?>
 
                     <?php if ($has_voting_record) { ?>
 
                         <?php foreach ($policydivisions as $policy) { ?>
 
-                            <?php if ( isset($policy['header']) ) { ?>
+                            <?php if (isset($policy['header'])) { ?>
                                 <div class="panel policy-votes-hero" style="background-image: url('<?php echo $policy['header']['image']; ?>');">
                                     <h2><?php echo $policy['header']['title']; ?></h2>
                                     <p><?php echo $policy['header']['description']; ?>.</p>
-                                    <?php if ( $policy['header']['image_source'] ) { ?>
+                                    <?php if ($policy['header']['image_source']) { ?>
                                     <span class="policy-votes-hero__image-attribution">
                                         Photo:
                                         <a href="<?php echo $policy['header']['image_source']; ?>">
@@ -59,9 +59,9 @@ 
                             <?php } ?>
 
 
-                            <?php if ( isset($policy['position']) ) { ?>
+                            <?php if (isset($policy['position'])) { ?>
                                 <div class="panel">
-                                    <?php if ( $policy['position']['has_strong'] ) { ?>
+                                    <?php if ($policy['position']['has_strong']) { ?>
                                         <h3 class="policy-vote-overall-stance">
                                             <?= $full_name . ' ' . $policy['position']['desc'] ?>
                                         </h3>
@@ -87,7 +87,7 @@ 
                                     <ul class="vote-descriptions policy-votes">
                                     <?php
                                         $show_all = FALSE;
-                                        if ( $policy['weak_count'] == 0 || $policy['weak_count'] == count($policy['divisions']) ) {
+                                        if ($policy['weak_count'] == 0 || $policy['weak_count'] == count($policy['divisions'])) {
                                             $show_all = TRUE;
                                         }
                                     ?>
@@ -99,14 +99,14 @@ 
 
                                     <div class="policy-votes-list-footer">
                                     <p class="policy-votes__byline">Vote information from <a href="http://www.publicwhip.org.uk/mp.php?mpid=<?= $member_id ?>&dmp=<?= $policy['policy_id'] ?>">PublicWhip</a>. Last updated: <?= $policy_last_update[$policy['policy_id']] ?></p>
-                                        <?php if ( !$show_all && $policy['weak_count'] > 0 ) { ?>
+                                        <?php if (!$show_all && $policy['weak_count'] > 0) { ?>
                                         <p><button class="button secondary-button small js-show-all-votes">Show all votes, including <?= $policy['weak_count'] ?> less important <?= $policy['weak_count'] == 1 ? 'vote' : 'votes' ?></button></p>
                                         <?php } ?>
                                     </div>
 
                                     <script type="text/javascript">
                                     $(function(){
-                                        <?php if ( !$show_all ) { ?>
+                                        <?php if (!$show_all) { ?>
                                         $('#policy-votes-type').text('Key');
                                         <?php } ?>
                                         $('.js-show-all-votes').on('click', function(){

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>
@@ -102,7 +102,7 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <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/?';
@@ -187,7 +187,7 @@ 
                 $before_mp = isset($speech['before_mp']);
                 $after_mp = isset($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,4 +1,4 @@ 
-  <?php foreach($data['rows'] as $speech) { ?>
+  <?php foreach ($data['rows'] as $speech) { ?>
 
     <?php
 
@@ -61,27 +61,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';
         }
     }
@@ -110,7 +110,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
 
@@ -177,13 +177,13 @@ 
                 <?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'] );
+                $mp_vote = array('vote' => $speech['mp_vote']['vote']);
                 $before_mp = isset($speech['before_mp']);
                 $after_mp = isset($speech['after_mp']);
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
@@ -195,7 +195,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">
@@ -220,10 +220,10 @@ 
 
                 // Video
                 if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only
-                    if ($speech['video_status']&4) { ?>
+                    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
-                    } elseif (!$speech['video'] && $speech['video_status']&1 && !($speech['video_status']&8)) {
+                    } elseif (!$speech['video'] && $speech['video_status'] & 1 && !($speech['video_status'] & 8)) {
                         $gid_type = $data['info']['major'] == 1 ? 'debate' : 'lords'; ?>
                         <a href="/video/?from=debate&amp;gid=<?= $gid_type ?>/<?= $speech['gid'] ?>" class="timestamp debate-speech__meta__link">Video match this</a>
                     <?php
@@ -350,7 +350,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/recent.php

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

@@ -1,4 +1,4 @@
 <div class="full-page__row">
     <?php include '_business_section.php'; ?>
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
+    <?php $search_title = "search $title"; include '_search.php'; ?>
 </div>

www/includes/easyparliament/templates/rss/hansard_search.php

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

@@ -25,7 +25,7 @@
         $row = $data['rows'][$i];
 
         $hdate = format_date($row['hdate'], 'D, d M Y');
-        if (isset($row['htime']) && $row['htime'] != NULL) {
+        if (isset($row['htime']) && $row['htime'] != null) {
             $htime = format_time($row['htime'], 'H:i:s');
         } else {
             $htime = '00:00:00';

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 twfy_debug("TEMPLATE", "rss/hansard_search.php");
 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         $hdate = format_date($row['hdate'], 'D, d M Y');