mysociety / theyworkforyou

www/docs/index-election.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
 $HANSARDURL = new \MySociety\TheyWorkForYou\Url('hansard');
 $MPURL = new \MySociety\TheyWorkForYou\Url('yourmp');
 
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
+$PAGE->block_start(array('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
 ?>
                         <ol>
 
@@ -89,7 +89,7 @@ 
     } else {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('userchangepc');
     }
-    $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
+    $MEMBER = new MEMBER(array('postcode'=>$THEUSER->postcode(), 'house'=>1));
     $mpname = $MEMBER->full_name();
     ?>
       <p><a href="<?php echo $MPURL->generate(); ?>"><strong>Find out more about how <?php echo $mpname; ?>, your ex-MP, represented you over the last parliament</strong></a><br>
@@ -185,11 +185,11 @@ 
 //$PAGE->block_end();
 
 $PAGE->stripe_end(array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'whatisthissite'
     ),
-    array (
+    array(
         'type' => 'include',
         'content' => 'sitenews_recent'
     )

Braces +12 added lines, -6 removed lines

@@ -43,17 +43,20 @@ 
         if ($todaystime - $debatesdata['timestamp'] == 86400) {
             $daytext = "yesterday's";
 
-        } elseif ($todaystime - $debatesdata['timestamp'] <= (6 * 86400)) {
+        }
+        elseif ($todaystime - $debatesdata['timestamp'] <= (6 * 86400)) {
             // Less than a week ago, so like "last Tuesday's".
             $daytext = gmdate('l', $debatesdata['timestamp']) . "'s";
 
-        } else {
+        }
+        else {
 
             // Over a week ago.
             $daytext = "the most recent ";
         }
 
-    } else {
+    }
+    else {
         // Debates and Wrans are from different dates. We'll just do this for now:
         $daytext = "the most recent ";
     }
@@ -61,7 +64,8 @@ 
 #	$hansardline = "Comment on $daytext <ul><li>$debatestext</li><li>$wranstext</li><li>$whalltext</li><li>$wmstext</li></ul>";
     $hansardline = "Comment on $daytext $debatestext, $wranstext, $whalltext, and $wmstext";
 
-} else {
+}
+else {
     // We didn't get some or all of the data, so just...
     $hansardline = "Comment on events in parliament";
 }
@@ -86,7 +90,8 @@ 
 
     if ($THEUSER->isloggedin()) {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('useredit');
-    } else {
+    }
+    else {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('userchangepc');
     }
     $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
@@ -96,7 +101,8 @@ 
                         In <?php echo strtoupper(_htmlentities($THEUSER->postcode())); ?> (<a href="<?php echo $CHANGEURL->generate(); ?>">Change your postcode</a>)</p>
 <?php
 
-} else {
+}
+else {
     // User is not logged in and doesn't have a personal postcode set.
     ?>
                         <form action="<?php echo $MPURL->generate(); ?>" method="get">

www/docs/api/api_convertURL.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
     $fragment = '';
     if ($id_data['htype'] == '11' || $id_data['htype'] == '10') {
-        $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
+        $LISTURL->insert(array('id' => $id_data['gid']));
     } else {
         $parent_epobject_id = $id_data['subsection_id'];
         $parent_gid = '';
@@ -50,10 +50,10 @@ 
                     ':epobject_id' => $parent_epobject_id
                     ));
         if ($r->rows() > 0) {
-            $parent_gid = fix_gid_from_db( $r->field(0, 'gid') );
+            $parent_gid = fix_gid_from_db($r->field(0, 'gid'));
         }
         if ($parent_gid != '') {
-            $LISTURL->insert( array( 'id' => $parent_gid ) );
+            $LISTURL->insert(array('id' => $parent_gid));
             $fragment = '#g' . gid_to_anchor($id_data['gid']);
         }
     }

classes/Renderer.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
         $user = new Renderer\User();
         $data = array_merge($user->data, $data);
 
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
 
@@ -95,14 +95,14 @@ 
 
     private static function addCommonURLs($data) {
         $urls = array();
-        if ( isset($data['urls']) ) {
+        if (isset($data['urls'])) {
             $urls = $data['urls'];
         }
 
         $common_urls = array('search', 'alert');
 
-        foreach ( $common_urls as $path ) {
-            if (!isset($urls[$path]) ) {
+        foreach ($common_urls as $path) {
+            if (!isset($urls[$path])) {
                 $url = new Url($path);
                 $urls[$path] = $url->generate();
             }

classes/MiniSurvey.php

Spacing +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@ 
         if ($hide_question) {
             $always_ask = 0;
             $show_survey_qn = $current_question;
-            setcookie('survey', $current_question, time()+60*60*24*365, '/');
+            setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
         } elseif ($has_answered_question == $current_question && !$always_ask) {
             $show_survey_qn = $current_question;
-            setcookie('survey', $current_question, time()+60*60*24*365, '/');
+            setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
         } elseif (isset($_COOKIE['survey'])) {
             $show_survey_qn = $_COOKIE['survey'];
         }
@@ -38,18 +38,18 @@ 
 
             $page_url = '';
             $hide_url = '';
-            if ( in_array( $this_page, array('mp', 'peer', 'msp', 'mla', 'royal') ) ) {
+            if (in_array($this_page, array('mp', 'peer', 'msp', 'mla', 'royal'))) {
                 global $MEMBER;
-                if ( $MEMBER ) {
+                if ($MEMBER) {
                     $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
                     $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
                 }
             } else {
                 $URL = new Url($this_page);
-                $URL->insert(array('answered_survey' => $current_question ));
+                $URL->insert(array('answered_survey' => $current_question));
                 $page_url = 'https://' . DOMAIN . $URL->generate();
                 $URL = new Url($this_page);
-                $URL->insert(array('hide_survey' => $current_question ));
+                $URL->insert(array('hide_survey' => $current_question));
                 $hide_url = $URL->generate();
             }
 

Braces +6 added lines, -3 removed lines

@@ -26,10 +26,12 @@ 
             $always_ask = 0;
             $show_survey_qn = $current_question;
             setcookie('survey', $current_question, time()+60*60*24*365, '/');
-        } elseif ($has_answered_question == $current_question && !$always_ask) {
+        }
+        elseif ($has_answered_question == $current_question && !$always_ask) {
             $show_survey_qn = $current_question;
             setcookie('survey', $current_question, time()+60*60*24*365, '/');
-        } elseif (isset($_COOKIE['survey'])) {
+        }
+        elseif (isset($_COOKIE['survey'])) {
             $show_survey_qn = $_COOKIE['survey'];
         }
 
@@ -44,7 +46,8 @@ 
                     $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
                     $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
                 }
-            } else {
+            }
+            else {
                 $URL = new Url($this_page);
                 $URL->insert(array('answered_survey' => $current_question ));
                 $page_url = 'https://' . DOMAIN . $URL->generate();

classes/SectionView/PbcView.php

Braces +8 added lines, -4 removed lines

@@ -44,7 +44,8 @@ 
             return $this->display_section_or_speech(array(
                 'gid' => $standingprefix . $id,
             ));
-        } elseif ($bill_id) {
+        }
+        elseif ($bill_id) {
             # Display the page for a particular bill
             $this_page = 'pbc_bill';
             $args = array (
@@ -57,12 +58,14 @@ 
             $data['session'] = $this->session;
             $data['template'] = 'section/pbc_bill';
             return $this->addCommonData($data);
-        } elseif ($this->session && $this->bill) {
+        }
+        elseif ($this->session && $this->bill) {
             # Illegal bill title, redirect to session page
             $URL = new \MySociety\TheyWorkForYou\Url('pbc_session');
             header('Location: ' . $URL->generate() . urlencode($this->session));
             exit;
-        } elseif ($this->session) {
+        }
+        elseif ($this->session) {
             # Display the bills for a particular session
             $this_page = 'pbc_session';
             $DATA->set_page_metadata($this_page, 'title', "Session $this->session");
@@ -74,7 +77,8 @@ 
             $data['template'] = 'section/pbc_session';
             $data['session'] = $this->session;
             return $this->addCommonData($data);
-        } else {
+        }
+        else {
             return $this->display_front();
         }
     }

classes/SectionView/SectionView.php

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($data);
 
         $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;
@@ -352,7 +352,7 @@ 
         $first_speech = null;
         $data['section_title'] = '';
         $subsection_title = '';
-        for ($i=0; $i<count($data['rows']); $i++) {
+        for ($i = 0; $i < count($data['rows']); $i++) {
             $row = $data['rows'][$i];
             $htype = $row['htype'];
             // HPOS should be defined below if it's needed; otherwise default to 0
@@ -375,7 +375,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
@@ -416,47 +416,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'
@@ -471,7 +471,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;
         }
 
@@ -481,7 +481,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;
         }
 
@@ -496,7 +496,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/SectionView/SpwransView.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
         $this_page = 'spwransfront';
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \SPWRANSLIST;
 
         $wrans = array();
@@ -43,7 +43,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'spwrans' )
+            array('section' => 'spwrans')
         );
     }
 
@@ -54,29 +54,29 @@ 
         $SPWRANSLIST = new \SPWRANSLIST;
         $gid = $SPWRANSLIST->get_gid_from_spid($spid);
         if ($gid) {
-            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spwrans');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
-            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spdebates');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
             } else {
-                $PAGE->error_message ("Strange GID ($gid) for that Scottish Parliament ID.");
+                $PAGE->error_message("Strange GID ($gid) for that Scottish Parliament ID.");
             }
         }
-        $PAGE->error_message ("Couldn't match that Scottish Parliament ID to a GID.");
+        $PAGE->error_message("Couldn't match that Scottish Parliament ID to a GID.");
     }
 
     protected function get_question_mentions_html($row_data) {
-        if( count($row_data) == 0 ) {
+        if (count($row_data) == 0) {
             return '';
         }
         $result = '';
@@ -85,19 +85,19 @@ 
         $first_difference_output = TRUE;
         // Keep the references until after the history that's in a timeline:
         $references = array();
-        for( $i = 0; $i < $nrows; $i++ ) {
+        for ($i = 0; $i < $nrows; $i++) {
             $row = $row_data[$i];
-            if( ! $row["date"] ) {
+            if (!$row["date"]) {
                 // If this mention isn't associated with a date, the difference won't be interesting.
                 $last_date = NULL;
             }
             $description = '';
             if ($last_date && ($last_date != $row["date"])) {
                 // Calculate how long the gap was in days:
-                $daysdiff = (integer)((strtotime($row["date"]) - strtotime($last_date)) / 86400);
+                $daysdiff = (integer) ((strtotime($row["date"]) - strtotime($last_date)) / 86400);
                 $daysstring = ($daysdiff == 1) ? "day" : "days";
                 $further = "";
-                if( $first_difference_output ) {
+                if ($first_difference_output) {
                     $first_difference_output = FALSE;
                 } else {
                     $further = " a further";
@@ -108,7 +108,7 @@ 
             $inner = "BUG: Unknown mention type $row[type]";
             $date = format_date($row['date'], SHORTDATEFORMAT);
             $url = $row['url'];
-            if ( strpos($url, 'business/businessBulletin') !== FALSE ) {
+            if (strpos($url, 'business/businessBulletin') !== FALSE) {
                 $url = str_replace('www.scottish', 'archive.scottish', $url);
             }
             switch ($row["type"]) {
@@ -122,9 +122,9 @@ 
                     $inner = "Mentioned in <a class=\"debate-speech__meta__link\" href=\"$url\">tabled written questions on $date</a>";
                     break;
                 case 4:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $m[1]) );
+                        $URL->insert(array('spid' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "Given a <a class=\"debate-speech__meta__link\" href=\"$relative_url\">written answer on $date</a>";
                     }
@@ -133,25 +133,25 @@ 
                     $inner = "Given a holding answer on $date";
                     break;
                 case 6:
-                    if( preg_match('/^uk.org.publicwhip\/spor\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spor\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spdebates");
-                        $URL->insert( array('id' => $m[1]) );
+                        $URL->insert(array('id' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "<a href=\"$relative_url\">Asked in parliament on $date</a>";
                     }
                     break;
                 case 7:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $referencing_spid = $m[1];
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $referencing_spid) );
+                        $URL->insert(array('spid' => $referencing_spid));
                         $relative_url = $URL->generate("none");
                         $inner = "Referenced in <a href=\"$relative_url\">question $referencing_spid</a>";
                         $reference = TRUE;
                     }
                     break;
             }
-            if( $reference ) {
+            if ($reference) {
                 $references[] = "\n<li>$inner.";
             } else {
                 $result .= "\n<li class=\"link-to-hansard\">$description$inner</span>";

Braces +10 added lines, -5 removed lines

@@ -11,7 +11,8 @@ 
         if ($spid = get_http_var('spid')) {
             $this->spwrans_redirect($spid);
             $PAGE->page_end();
-        } else {
+        }
+        else {
             return parent::display();
         }
     }
@@ -61,14 +62,16 @@ 
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
-            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            }
+            elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spdebates');
                 $URL->reset();
                 $URL->insert( array('id' => $m[1]) );
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
-            } else {
+            }
+            else {
                 $PAGE->error_message ("Strange GID ($gid) for that Scottish Parliament ID.");
             }
         }
@@ -99,7 +102,8 @@ 
                 $further = "";
                 if( $first_difference_output ) {
                     $first_difference_output = FALSE;
-                } else {
+                }
+                else {
                     $further = " a further";
                 }
                 $description = "\n<span class=\"question-mention-gap\">After$further $daysdiff $daysstring,</span> ";
@@ -153,7 +157,8 @@ 
             }
             if( $reference ) {
                 $references[] = "\n<li>$inner.";
-            } else {
+            }
+            else {
                 $result .= "\n<li class=\"link-to-hansard\">$description$inner</span>";
                 $last_date = $row["date"];
             }

classes/Renderer/User.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
         $edittext   = $menudata['text'];
         $edittitle  = $menudata['title'];
         $EDITURL    = new \MySociety\TheyWorkForYou\Url('userviewself');
-        if ($this->page == 'userviewself' || $this->page == 'useredit' ) {
+        if ($this->page == 'userviewself' || $this->page == 'useredit') {
             $editclass = 'on';
         } else {
             $editclass = '';
@@ -58,7 +58,7 @@ 
         // The 'Log out' link.
         $menudata   = $this->pagedata->page_metadata('userlogout', 'menu');
         $logouttext = $menudata['text'];
-        $logouttitle= $menudata['title'];
+        $logouttitle = $menudata['title'];
 
         $LOGOUTURL  = new \MySociety\TheyWorkForYou\Url('userlogout');
         if ($this->page != 'userlogout') {

Braces +12 added lines, -6 removed lines

@@ -38,7 +38,8 @@ 
         //user logged in
         if ($this->user->isloggedin()) {
             $this->addLoggedInLinks();
-        } else {
+        }
+        else {
             $this->addLoggedOutLinks();
         }
     }
@@ -51,7 +52,8 @@ 
         $EDITURL    = new \MySociety\TheyWorkForYou\Url('userviewself');
         if ($this->page == 'userviewself' || $this->page == 'useredit' ) {
             $editclass = 'on';
-        } else {
+        }
+        else {
             $editclass = '';
         }
 
@@ -64,7 +66,8 @@ 
         if ($this->page != 'userlogout') {
             $LOGOUTURL->insert(array("ret"=>$this->returl));
             $logoutclass = '';
-        } else {
+        }
+        else {
             $logoutclass = 'on';
         }
 
@@ -105,7 +108,8 @@ 
                 $JOINURL->insert(array("ret"=>$this->returl));
             }
             $joinclass = '';
-        } else {
+        }
+        else {
             $joinclass = 'on';
         }
 
@@ -127,7 +131,8 @@ 
                 $LOGINURL->insert(array("ret"=>$this->returl));
             }
             $loginclass = '';
-        } else {
+        }
+        else {
             $loginclass = 'on';
         }
 
@@ -153,7 +158,8 @@ 
             $items = array('yourmp');
             if (\MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsScottish($this->user->postcode())) {
                 $items[] = 'yourmsp';
-            } elseif (\MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($this->user->postcode())) {
+            }
+            elseif (\MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($this->user->postcode())) {
                 $items[] = 'yourmla';
             }
 

classes/Renderer/Header.php

Braces +30 added lines, -13 removed lines

@@ -38,7 +38,8 @@ 
         # Robots header
         if (DEVSITE) {
             $this->data['robots'] = 'noindex,nofollow';
-        } elseif ($robots = $DATA->page_metadata($this_page, 'robots')) {
+        }
+        elseif ($robots = $DATA->page_metadata($this_page, 'robots')) {
             $this->data['robots'] = $robots;
         }
     }
@@ -71,7 +72,8 @@ 
         if ($this_page == 'overview') {
             $this->data['page_title'] = $sitetitle . ': ' . $DATA->page_metadata($this_page, "title");
 
-        } else {
+        }
+        else {
 
             if ($page_title = $DATA->page_metadata($this_page, "title")) {
                 $this->data['page_title'] = $page_title;
@@ -81,13 +83,16 @@ 
 
             $parent_page = $DATA->page_metadata($this_page, 'parent');
             if ($parent_title = $DATA->page_metadata($parent_page, 'title')) {
-                if ($this->data['page_title']) $this->data['page_title'] .= ': ';
+                if ($this->data['page_title']) {
+                    $this->data['page_title'] .= ': ';
+                }
                 $this->data['page_title'] .= $parent_title;
             }
 
             if ($this->data['page_title'] == '') {
                 $this->data['page_title'] = $sitetitle;
-            } else {
+            }
+            else {
                 $this->data['page_title'] .= ' - ' . $sitetitle;
             }
         }
@@ -103,7 +108,9 @@ 
         // Meta keywords
         if (!$this->data['meta_keywords'] = $DATA->page_metadata($this_page, "meta_keywords")) {
             $this->data['meta_keywords'] = $this->keywords_title;
-            if ($this->data['meta_keywords']) $this->data['meta_keywords'] .= ', ';
+            if ($this->data['meta_keywords']) {
+                $this->data['meta_keywords'] .= ', ';
+            }
             $this->data['meta_keywords'] .= 'Hansard, Official Report, Parliament, government, House of Commons, House of Lords, MP, Peer, Member of Parliament, MPs, Peers, Lords, Commons, Scottish Parliament, Northern Ireland Assembly, MSP, MLA, MSPs, MLAs';
         }
 
@@ -141,7 +148,8 @@ 
                     $linktitle = $nextprev[$linktype]['speaker']['name'] . ': ' . $linktitle;
                 }
 
-            } elseif (isset($nextprev[$linktype]['hdate'])) {
+            }
+            elseif (isset($nextprev[$linktype]['hdate'])) {
                 $linktitle = format_date($nextprev[$linktype]['hdate'], SHORTDATEFORMAT);
             }
 
@@ -198,13 +206,16 @@ 
             $url = new \MySociety\TheyWorkForYou\Url('hansard');
             $selected_top_link['link'] = $url->generate();
 
-        } else {
+        }
+        else {
 
             $parents = array($parent);
             $p = $parent;
             while ($p) {
                 $p = $DATA->page_metadata($p, 'parent');
-                if ($p) $parents[] = $p;
+                if ($p) {
+                    $parents[] = $p;
+                }
             }
 
             $top_highlight = array_pop($parents);
@@ -213,7 +224,8 @@ 
                 // We're on one of the pages linked to by the bottom menu.
                 // So highlight it and its parent.
                 $bottom_highlight = $this_page;
-            } else {
+            }
+            else {
                 // This page is not in either menu. So highlight its parent
                 // (in the bottom menu) and its grandparent (in the top).
                 $bottom_highlight = array_pop($parents);
@@ -232,13 +244,16 @@ 
         if ($top_highlight == 'hansard') {
             $section = 'uk';
             $selected_top_link['text'] = 'UK';
-        } elseif ($top_highlight == 'ni_home') {
+        }
+        elseif ($top_highlight == 'ni_home') {
             $section = 'ni';
             $selected_top_link['text'] = 'NORTHERN IRELAND';
-        } elseif ($top_highlight == 'sp_home') {
+        }
+        elseif ($top_highlight == 'sp_home') {
             $section = 'scotland';
             $selected_top_link['text'] = 'SCOTLAND';
-        } else {
+        }
+        else {
             $section = '';
         }
 
@@ -279,7 +294,9 @@ 
             $menudata = $DATA->page_metadata($toppage, 'menu');
                 $text = $menudata['text'];
                 $title = $menudata['title'];
-            if (!$title) continue;
+            if (!$title) {
+                continue;
+            }
 
                 //get link and description for the menu ans add it to the array
             $class = $toppage == $this->nav_highlights['top'] ? 'on' : '';