mysociety / theyworkforyou

www/docs/mp/index.php

Switch Indentation +20 added lines, -20 removed lines

@@ -731,26 +731,26 @@
 function person_error_page($message) {
     global $this_page;
     switch($this_page) {
-    case 'mla':
-        $rep = 'MLA';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
-        break;
-    case 'msp':
-        $rep = 'MSP';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
-        break;
-    case 'peer':
-        $rep = 'Lord';
-        $SEARCHURL = '';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
-        break;
-    default:
-        $rep = 'MP';
-        $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
-        $SEARCHURL = $SEARCHURL->generate();
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
+        case 'mla':
+            $rep = 'MLA';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
+            break;
+        case 'msp':
+            $rep = 'MSP';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
+            break;
+        case 'peer':
+            $rep = 'Lord';
+            $SEARCHURL = '';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
+            break;
+        default:
+            $rep = 'MP';
+            $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
+            $SEARCHURL = $SEARCHURL->generate();
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
     }
 
     $data = array(

Spacing +125 added lines, -125 removed lines

@@ -33,10 +33,10 @@ 
 
 // Include all the things this page needs.
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
-include_once INCLUDESPATH . 'technorati.php';
-include_once INCLUDESPATH . '../../commonlib/phplib/random.php';
-include_once INCLUDESPATH . '../../commonlib/phplib/auth.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
+include_once INCLUDESPATH.'technorati.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/random.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/auth.php';
 include_once '../api/api_getGeometry.php';
 include_once '../api/api_getConstituencies.php';
 
@@ -118,8 +118,8 @@ 
     }
     if ($pid) {
         $URL = new \MySociety\TheyWorkForYou\Url('search');
-        $URL->insert( array('pid'=>$pid, 'pop'=>1) );
-        header('Location: ' . $URL->generate('none'));
+        $URL->insert(array('pid'=>$pid, 'pop'=>1));
+        header('Location: '.$URL->generate('none'));
         exit;
     }
 }
@@ -149,7 +149,7 @@ 
     } elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
     } else {
-        twfy_debug ('MP', "We don't have any way of telling what MP to display");
+        twfy_debug('MP', "We don't have any way of telling what MP to display");
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, but we can’t tell which representative to display.');
     }
     if (!isset($MEMBER) || !$MEMBER->valid) {
@@ -188,7 +188,7 @@ 
         $title .= ', former';
     }
     $title .= ' MP';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) $title .= ', '.$MEMBER->constituency();
 }
 
 // Enhance title if this is a member of NIA
@@ -202,7 +202,7 @@ 
         $title .= ', former';
     }
     $title .= ' MLA';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) $title .= ', '.$MEMBER->constituency();
 }
 
 // Enhance title if this is a member of Scottish Parliament
@@ -224,21 +224,21 @@ 
 // Position if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_COMMONS) ? 'MP' : 'Former MP';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) $position .= ', '.$MEMBER->constituency();
     $positions[] = $position;
 }
 
 // Position if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_NI) ? 'MLA' : 'Former MLA';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) $position .= ', '.$MEMBER->constituency();
     $positions[] = $position;
 }
 
 // Position if this is a member of Scottish Parliament
 if ($MEMBER->house(HOUSE_TYPE_SCOTLAND)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_SCOTLAND) ? 'MSP' : 'Former MSP';
-    $position .= ', ' . $MEMBER->constituency();
+    $position .= ', '.$MEMBER->constituency();
     $positions[] = $position;
 }
 
@@ -255,8 +255,8 @@ 
 // Finally, if this is a Votes page, replace the page description with
 // something more descriptive of the actual data on the page.
 if ($pagetype == 'votes') {
-  $title = "Voting record - " . $title;
-  $desc = 'See how ' . $member_name . ' voted on topics like Employment, Social Issues, Foreign Policy, and more.';
+  $title = "Voting record - ".$title;
+  $desc = 'See how '.$member_name.' voted on topics like Employment, Social Issues, Foreign Policy, and more.';
 }
 
 // Set page metadata
@@ -264,8 +264,8 @@ 
 $DATA->set_page_metadata($this_page, 'meta_description', $desc);
 
 // Build the RSS link and add it to page data.
-$feedurl = $DATA->page_metadata('mp_rss', 'url') . $MEMBER->person_id() . '.rdf';
-if (file_exists(BASEDIR . '/' . $feedurl))
+$feedurl = $DATA->page_metadata('mp_rss', 'url').$MEMBER->person_id().'.rdf';
+if (file_exists(BASEDIR.'/'.$feedurl))
     $DATA->set_page_metadata($this_page, 'rss', $feedurl);
 
 // Prepare data for the template
@@ -310,7 +310,7 @@ 
 $data['eu_stance'] = $MEMBER->getEUStance();
 
 # People who are or were MPs and Lords potentially have voting records, except Sinn Fein MPs
-$data['has_voting_record'] = ( ($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS) );
+$data['has_voting_record'] = (($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS));
 # Everyone who is currently somewhere has email alert signup, apart from current Sinn Fein MPs who are not MLAs
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
@@ -336,9 +336,9 @@ 
 
 $data['this_page'] = $this_page;
 $data['current_assembly'] = 'westminster';
-if ( $this_page == 'msp' || $this_page == 'yourmsp' ) {
+if ($this_page == 'msp' || $this_page == 'yourmsp') {
     $data['current_assembly'] = 'scotland';
-} else if ( $this_page == 'mla' || $this_page == 'yourmla' ) {
+} else if ($this_page == 'mla' || $this_page == 'yourmla') {
     $data['current_assembly'] = 'ni';
 }
 
@@ -354,11 +354,11 @@ 
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
         $policySummaries = $divisions->getMemberDivisionDetails();
 
-        $policyOptions = array( 'summaries' => $policySummaries);
+        $policyOptions = array('summaries' => $policySummaries);
 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
-        if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
+        if ($policy_set && array_key_exists($policy_set, $set_descriptions)) {
           $data['key_votes_segments'] = array(
               array(
                   'key' => $policy_set,
@@ -368,9 +368,9 @@ 
                   )
               )
           );
-          $data['og_image'] = $MEMBER->url(true) . "/policy_set_png?policy_set=" . $policy_set;
-          $data['page_title'] = $policiesList->getSetDescriptions()[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
-          $data['meta_description'] = 'See how ' . $data['full_name'] . ' voted on ' . $policiesList->getSetDescriptions()[$policy_set];
+          $data['og_image'] = $MEMBER->url(true)."/policy_set_png?policy_set=".$policy_set;
+          $data['page_title'] = $policiesList->getSetDescriptions()[$policy_set].' '.$title.' - TheyWorkForYou';
+          $data['meta_description'] = 'See how '.$data['full_name'].' voted on '.$policiesList->getSetDescriptions()[$policy_set];
           $data['single_policy_page'] = true;
         } else {
             $data['single_policy_page'] = false;
@@ -476,7 +476,7 @@ 
 
     case 'recent':
         $policiesList = new MySociety\TheyWorkForYou\Policies;
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
         $data['divisions'] = $divisions->getRecentMemberDivisions();
@@ -487,15 +487,15 @@ 
 
     case 'divisions':
         $policyID = get_http_var('policy');
-        if ( $policyID ) {
-            $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
+        if ($policyID) {
+            $policiesList = new MySociety\TheyWorkForYou\Policies($policyID);
         } else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
-        if ( $policyID ) {
+        if ($policyID) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
         } else {
             $data['policydivisions'] = $divisions->getAllMemberDivisionsByPolicy();
@@ -542,15 +542,15 @@ 
         $im = new Imagick();
         $policiesList = new MySociety\TheyWorkForYou\Policies;
 
-        $url = $MEMBER->url(true) . "/policy_set_svg?policy_set=" . $policy_set;
+        $url = $MEMBER->url(true)."/policy_set_svg?policy_set=".$policy_set;
         $svg = file_get_contents($url);
         $im->setOption('-antialias', true);
         $im->readImageBlob($svg);
         $im->setImageFormat("png24");
 
-        $filename = strtolower(str_replace(' ', '_', $MEMBER->full_name() . "_" . $policiesList->getSetDescriptions()[$policy_set] . ".png"));
+        $filename = strtolower(str_replace(' ', '_', $MEMBER->full_name()."_".$policiesList->getSetDescriptions()[$policy_set].".png"));
         header("Content-type: image/png");
-        header('Content-Disposition: filename="' . $filename . '"');
+        header('Content-Disposition: filename="'.$filename.'"');
         print $im->getImageBlob();
 
         $im->clear();
@@ -572,7 +572,7 @@ 
 
         // generate party policy diffs
         $party = new MySociety\TheyWorkForYou\Party($MEMBER->party());
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $party_positions = $party->getAllPolicyPositions($policiesList);
         $policy_diffs = $MEMBER->getPartyPolicyDiffs($party, $policiesList, $positions, true);
 
@@ -626,16 +626,16 @@ 
     global $THEUSER;
     $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
     if (!validate_postcode($pc)) {
-        twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a valid postcode');
+        twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc).' isn’t a valid postcode');
     }
-    twfy_debug ('MP', "MP lookup by postcode");
+    twfy_debug('MP', "MP lookup by postcode");
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "connection_timed_out") {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
     } elseif ($constituency == "") {
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a known postcode');
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc).' isn’t a known postcode');
     } else {
         // Redirect to the canonical MP page, with a person id.
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
@@ -647,11 +647,11 @@ 
     }
 }
 
-function get_person_by_name($name, $const='') {
+function get_person_by_name($name, $const = '') {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('name' => $name, 'constituency' => $const));
     // Edge case, only attempt further detection if this isn't the Queen.
     if ($name !== 'elizabeth the second' || $const) {
-        twfy_debug ('MP', 'Redirecting for MP found by name/constituency');
+        twfy_debug('MP', 'Redirecting for MP found by name/constituency');
         member_redirect($MEMBER);
     }
     return $MEMBER;
@@ -685,7 +685,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect(&$MEMBER, $code = 301, $pagetype = NULL) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -696,13 +696,13 @@ 
                 $params[] = "$key=$value";
         }
         if (count($params))
-            $url .= '?' . join('&', $params);
+            $url .= '?'.join('&', $params);
         if ($pagetype) {
-            $pagetype = '/' . $pagetype;
+            $pagetype = '/'.$pagetype;
         } else {
             $pagetype = '';
         }
-        header('Location: ' . $url . $pagetype, true, $code );
+        header('Location: '.$url.$pagetype, true, $code);
         exit;
     }
 }
@@ -717,8 +717,8 @@ 
     $data = array('mps' => array());
     foreach ($ids as $id => $constituency) {
         $data['mps'][] = array(
-            'url'  => WEBPATH . 'mp/?pid=' . $id,
-            'name' => ucwords(strtolower($name)) . ', ' . $constituency,
+            'url'  => WEBPATH.'mp/?pid='.$id,
+            'name' => ucwords(strtolower($name)).', '.$constituency,
         );
     }
     $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
@@ -730,7 +730,7 @@ 
 
 function person_error_page($message) {
     global $this_page;
-    switch($this_page) {
+    switch ($this_page) {
     case 'mla':
         $rep = 'MLA';
         $SEARCHURL = '/postcode/';
@@ -768,18 +768,18 @@ 
  * Generate the summary of this person's held positions.
  */
 
-function person_summary_description ($MEMBER) {
+function person_summary_description($MEMBER) {
     $entered_house = $MEMBER->entered_house();
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
 
     if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) { # Royal short-circuit
-        return '<strong>Acceded on ' . $entered_house[HOUSE_TYPE_ROYAL]['date_pretty']
+        return '<strong>Acceded on '.$entered_house[HOUSE_TYPE_ROYAL]['date_pretty']
             . '<br>Coronated on 2 June 1953</strong></li>';
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
+        if ($house == HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
             continue; # Same info is printed further down
 
         if (!$current_member[$house]) $desc .= 'Former ';
@@ -797,20 +797,20 @@ 
             # XXX: Might go horribly wrong if something odd happens
             if ($party == 'Deputy Speaker') {
                 $last = end($MEMBER->other_parties);
-                $desc .= $last['from'] . ' ';
+                $desc .= $last['from'].' ';
             }
         }
-        if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
+        if ($house == HOUSE_TYPE_COMMONS || $house == HOUSE_TYPE_NI || $house == HOUSE_TYPE_SCOTLAND) {
             $desc .= ' ';
-            if ($house==HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
-            if ($house==HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
-            if ($house==HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            if ($house == HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
+            if ($house == HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
+            if ($house == HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
             if ($party_br) {
                 $desc .= " ($party_br)";
             }
-            $desc .= ' for ' . $left_house[$house]['constituency'];
+            $desc .= ' for '.$left_house[$house]['constituency'];
         }
-        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
+        if ($house == HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
         $desc .= ', ';
     }
     $desc = preg_replace('#, $#', '', $desc);
@@ -827,7 +827,7 @@ 
  * @return string A HTML summary of this person's rebellion rate.
  */
 
-function person_rebellion_rate ($member) {
+function person_rebellion_rate($member) {
 
     // Rebellion string may be empty.
     $rebellion_string = '';
@@ -836,7 +836,7 @@ 
         $displayed_stuff = 1;
         $rebels_term = 'rebelled';
 
-        $rebellion_string = 'has <a href="http://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/' . $member->member_id() . '#divisions" title="See more details at Public Whip"><strong>' . _htmlentities($member->extra_info['public_whip_rebel_description']) . ' ' . $rebels_term . '</strong></a> against their party';
+        $rebellion_string = 'has <a href="http://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/'.$member->member_id().'#divisions" title="See more details at Public Whip"><strong>'._htmlentities($member->extra_info['public_whip_rebel_description']).' '.$rebels_term.'</strong></a> against their party';
 
         if (isset($member->extra_info['public_whip_rebelrank'])) {
             if ($member->extra_info['public_whip_data_date'] == 'complete') {
@@ -866,10 +866,10 @@ 
     // benefit unfortunately.
     twfy_debug_timestamp();
 
-    $person_id= $member->person_id();
+    $person_id = $member->person_id();
 
     $memcache = new MySociety\TheyWorkForYou\Memcache;
-    $recent = $memcache->get('recent_appear:' . $person_id);
+    $recent = $memcache->get('recent_appear:'.$person_id);
 
     if (!$recent) {
         // Initialise the search engine
@@ -877,7 +877,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args = array (
+        $args = array(
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -886,21 +886,21 @@ 
         );
         $results = $hansard->search($searchstring, $args);
         $recent = serialize($results['rows']);
-        $memcache->set('recent_appear:' . $person_id, $recent);
+        $memcache->set('recent_appear:'.$person_id, $recent);
     }
     $out['appearances'] = unserialize($recent);
     twfy_debug_timestamp();
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
-    $MOREURL->insert( array('pid'=>$person_id, 'pop'=>1) );
+    $MOREURL->insert(array('pid'=>$person_id, 'pop'=>1));
 
-    $out['more_href'] = $MOREURL->generate() . '#n4';
-    $out['more_text'] = 'More of ' . ucfirst($member->full_name()) . '&rsquo;s recent appearances';
+    $out['more_href'] = $MOREURL->generate().'#n4';
+    $out['more_text'] = 'More of '.ucfirst($member->full_name()).'&rsquo;s recent appearances';
 
     if ($rssurl = $DATA->page_metadata($this_page, 'rss')) {
         // If we set an RSS feed for this page.
         $HELPURL = new \MySociety\TheyWorkForYou\Url('help');
-        $out['additional_links'] = '<a href="' . WEBPATH . $rssurl . '" title="XML version of this person&rsquo;s recent appearances">RSS feed</a> (<a href="' . $HELPURL->generate() . '#rss" title="An explanation of what RSS feeds are for">?</a>)';
+        $out['additional_links'] = '<a href="'.WEBPATH.$rssurl.'" title="XML version of this person&rsquo;s recent appearances">RSS feed</a> (<a href="'.$HELPURL->generate().'#rss" title="An explanation of what RSS feeds are for">?</a>)';
     }
 
     return $out;
@@ -916,7 +916,7 @@ 
     if (isset($links['maiden_speech'])) {
         $maiden_speech = fix_gid_from_db($links['maiden_speech']);
         $out[] = array(
-                'href' => WEBPATH . 'debate/?id=' . $maiden_speech,
+                'href' => WEBPATH.'debate/?id='.$maiden_speech,
                 'text' => 'Maiden speech'
         );
     }
@@ -960,7 +960,7 @@ 
 
     if ($member->house(HOUSE_TYPE_COMMONS)) {
         $out[] = array(
-                'href' => 'http://www.edms.org.uk/mps/' . $member->person_id(),
+                'href' => 'http://www.edms.org.uk/mps/'.$member->person_id(),
                 'text' => 'Early Day Motions signed by this MP'
         );
     }
@@ -983,8 +983,8 @@ 
 
     if (isset($links['twitter_username'])) {
         $out[] = array(
-                'href' => 'https://twitter.com/' . _htmlentities($links['twitter_username']),
-                'text' => '@' . _htmlentities($links['twitter_username']),
+                'href' => 'https://twitter.com/'._htmlentities($links['twitter_username']),
+                'text' => '@'._htmlentities($links['twitter_username']),
                 'type' => 'twitter'
         );
     }
@@ -1049,11 +1049,11 @@ 
             if ($arr['chairman']) {
                 $text .= 'Chairman, ';
             }
-            $text .= $arr['title'] . ' Committee';
+            $text .= $arr['title'].' Committee';
             $out['data'][] = array(
-                'href'      => '/pbc/' . $arr['session'] . '/' . urlencode($arr['title']),
+                'href'      => '/pbc/'.$arr['session'].'/'.urlencode($arr['title']),
                 'text'      => $text,
-                'attending' => $arr['attending'] . ' out of ' . $arr['outof']
+                'attending' => $arr['attending'].' out of '.$arr['outof']
             );
         }
     }
@@ -1082,8 +1082,8 @@ 
     $section = 'section:debates section:whall section:lords section:ni';
     $MOREURL->insert(array('pid'=>$member->person_id(), 's'=>$section, 'pop'=>1));
     if ($member->party() != 'Sinn Féin') {
-        if (display_stats_line('debate_sectionsspoken_inlastyear', 'Has spoken in ', 'debate', ' ' . $since_text, ' <a href="' . $MOREURL->generate() . '">See all ' . $member->full_name() . '&rsquo;s speeches</a>', $extra_info)) {
-            $out[] = display_stats_line('debate_sectionsspoken_inlastyear', 'Has spoken in ', 'debate', ' ' . $since_text, ' <a href="' . $MOREURL->generate() . '">See all ' . $member->full_name() . '&rsquo;s speeches</a>', $extra_info);
+        if (display_stats_line('debate_sectionsspoken_inlastyear', 'Has spoken in ', 'debate', ' '.$since_text, ' <a href="'.$MOREURL->generate().'">See all '.$member->full_name().'&rsquo;s speeches</a>', $extra_info)) {
+            $out[] = display_stats_line('debate_sectionsspoken_inlastyear', 'Has spoken in ', 'debate', ' '.$since_text, ' <a href="'.$MOREURL->generate().'">See all '.$member->full_name().'&rsquo;s speeches</a>', $extra_info);
         }
 
         $MOREURL->insert(array('pid'=>$member->person_id(), 's'=>'section:wrans', 'pop'=>1));
@@ -1096,12 +1096,12 @@ 
         if ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
             $minister = 2;
         }
-        if (display_stats_line('wrans_asked_inlastyear', 'Has received answers to <a href="' . $MOREURL->generate() . '">', 'written question', '</a> ' . $since_text, '', $extra_info, $minister, $Lminister)) {
-            $out[] = display_stats_line('wrans_asked_inlastyear', 'Has received answers to <a href="' . $MOREURL->generate() . '">', 'written question', '</a> ' . $since_text, '', $extra_info, $minister, $Lminister);
+        if (display_stats_line('wrans_asked_inlastyear', 'Has received answers to <a href="'.$MOREURL->generate().'">', 'written question', '</a> '.$since_text, '', $extra_info, $minister, $Lminister)) {
+            $out[] = display_stats_line('wrans_asked_inlastyear', 'Has received answers to <a href="'.$MOREURL->generate().'">', 'written question', '</a> '.$since_text, '', $extra_info, $minister, $Lminister);
         }
     }
 
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
         $wtt_displayed = display_writetothem_numbers($year, $extra_info);
         if ($wtt_displayed) {
             $out[] = $wtt_displayed;
@@ -1121,7 +1121,7 @@ 
         if ($member->house_disp == HOUSE_TYPE_LORDS) {
             $when = 'in this House with this affiliation up to the 2015 general election';
         }
-        $div_attend = display_stats_line('public_whip_division_attendance', 'Has voted in <a href="http://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/' . $member->member_id() . '&amp;showall=yes#divisions" title="See more details at Public Whip">', 'of vote', '</a> ' . $when, $after_stuff, $extra_info);
+        $div_attend = display_stats_line('public_whip_division_attendance', 'Has voted in <a href="http://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/'.$member->member_id().'&amp;showall=yes#divisions" title="See more details at Public Whip">', 'of vote', '</a> '.$when, $after_stuff, $extra_info);
         if ($div_attend) {
             $out[] = $div_attend;
         }
@@ -1131,33 +1131,33 @@ 
         }
         */
 
-        if (display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info)) {
-            $out[] = display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info);
+        if (display_stats_line('comments_on_speeches', 'People have made <a href="'.WEBPATH.'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info)) {
+            $out[] = display_stats_line('comments_on_speeches', 'People have made <a href="'.WEBPATH.'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info);
         }
         if (display_stats_line('reading_age', 'This MP&rsquo;s speeches, in Hansard, are readable by an average ', '', ' year old, going by the <a href="https://en.wikipedia.org/wiki/Flesch-Kincaid_Readability_Test">Flesch-Kincaid Grade Level</a> score', '', $extra_info)) {
             $out[] = display_stats_line('reading_age', 'This MP&rsquo;s speeches, in Hansard, are readable by an average ', '', ' year old, going by the <a href="https://en.wikipedia.org/wiki/Flesch-Kincaid_Readability_Test">Flesch-Kincaid Grade Level</a> score', '', $extra_info);
         }
     }
 
-    if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts']>0 || $has_email_alerts)) {
-        $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts']==1?'person is':'people are') . ' tracking ';
+    if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts'] > 0 || $has_email_alerts)) {
+        $line = '<strong>'._htmlentities($extra_info['number_of_alerts']).'</strong> '.($extra_info['number_of_alerts'] == 1 ? 'person is' : 'people are').' tracking ';
         if ($member->house_disp == HOUSE_TYPE_COMMONS) $line .= 'this MP';
         elseif ($member->house_disp == HOUSE_TYPE_LORDS) $line .= 'this peer';
         elseif ($member->house_disp == HOUSE_TYPE_NI) $line .= 'this MLA';
         elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) $line .= 'this MSP';
         elseif ($member->house_disp == HOUSE_TYPE_ROYAL) $line .= $member->full_name();
         if ($has_email_alerts) {
-            $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
+            $line .= ' &mdash; <a href="'.WEBPATH.'alert/?pid='.$member->person_id().'">email me updates on '.$member->full_name().'&rsquo;s activity</a>';
         }
 
         $out[] = $line;
     }
 
     if ($member->party() != 'Sinn Féin') {
-        if (display_stats_line('three_word_alliterations', 'Has used three-word alliterative phrases (e.g. "she sells seashells") ', 'time', ' in debates', ' <small>(<a href="' . WEBPATH . 'help/#numbers">Why is this here?</a>)</small>', $extra_info)) {
-            $line = display_stats_line('three_word_alliterations', 'Has used three-word alliterative phrases (e.g. "she sells seashells") ', 'time', ' in debates', ' <small>(<a href="' . WEBPATH . 'help/#numbers">Why is this here?</a>)</small>', $extra_info);
+        if (display_stats_line('three_word_alliterations', 'Has used three-word alliterative phrases (e.g. "she sells seashells") ', 'time', ' in debates', ' <small>(<a href="'.WEBPATH.'help/#numbers">Why is this here?</a>)</small>', $extra_info)) {
+            $line = display_stats_line('three_word_alliterations', 'Has used three-word alliterative phrases (e.g. "she sells seashells") ', 'time', ' in debates', ' <small>(<a href="'.WEBPATH.'help/#numbers">Why is this here?</a>)</small>', $extra_info);
             if (isset($extra_info['three_word_alliteration_content'])) {
-                $line .= "\n<!-- " . $extra_info['three_word_alliteration_content'] . " -->\n";
+                $line .= "\n<!-- ".$extra_info['three_word_alliteration_content']." -->\n";
             }
             $out[] = $line;
         }
@@ -1177,28 +1177,28 @@ 
 }
 
 function display_stats_line_house($house, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff) {
-    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category =='comments_on_speeches' ||
-        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category =='Lcomments_on_speeches') {
-        if ($extra_info[$category]==0) {
+    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category == 'comments_on_speeches' ||
+        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category == 'Lcomments_on_speeches') {
+        if ($extra_info[$category] == 0) {
             $blurb = preg_replace('#<a.*?>#', '', $blurb);
             $inwhat = preg_replace('#<\/a>#', '', $inwhat);
         }
     }
-    if ($house==HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
+    if ($house == HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
     $line = $blurb;
-    $line .= '<strong>' . $extra_info[$category];
-    if ($type) $line .= ' ' . make_plural($type, $extra_info[$category]);
+    $line .= '<strong>'.$extra_info[$category];
+    if ($type) $line .= ' '.make_plural($type, $extra_info[$category]);
     $line .= '</strong>';
     $line .= $inwhat;
-    if ($minister===2) {
+    if ($minister === 2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
     } elseif ($minister)
         $line .= ' &#8212; Ministers do not ask written questions';
     else {
-        $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
-        if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
+        $type = ($house == HOUSE_TYPE_COMMONS ? 'MP' : ($house == HOUSE_TYPE_LORDS ? 'Lord' : 'MLA'));
+        if (!get_http_var('rem') && isset($extra_info[$category.'_quintile'])) {
             $line .= ' &#8212; ';
-            $q = $extra_info[$category . '_quintile'];
+            $q = $extra_info[$category.'_quintile'];
             if ($q == 0) {
                 $line .= 'well above average';
             } elseif ($q == 1) {
@@ -1213,13 +1213,13 @@ 
                 $line .= '[Impossible quintile!]';
             }
             $line .= ' amongst ';
-            $line .= $type . 's';
-        } elseif (!get_http_var('rem') && isset($extra_info[$category . '_rank'])) {
+            $line .= $type.'s';
+        } elseif (!get_http_var('rem') && isset($extra_info[$category.'_rank'])) {
             $line .= ' &#8212; ';
             #if (isset($extra_info[$category . '_rank_joint']))
             #   print 'joint ';
-            $line .= make_ranking($extra_info[$category . '_rank']) . ' out of ' . $extra_info[$category . '_rank_outof'];
-            $line .= ' ' . $type . 's';
+            $line .= make_ranking($extra_info[$category.'_rank']).' out of '.$extra_info[$category.'_rank_outof'];
+            $line .= ' '.$type.'s';
         }
     }
     $line .= ".$afterstuff";
@@ -1228,7 +1228,7 @@ 
 
 function display_writetothem_numbers($year, $extra_info) {
     if (isset($extra_info["writetothem_responsiveness_notes_$year"])) {
-        return '<li>Responsiveness to messages sent via <a href="https://www.writetothem.com/stats/' . $year . '/mps">WriteToThem.com</a> in ' . $year . ': ' . $extra_info["writetothem_responsiveness_notes_$year"] . '.</li>';
+        return '<li>Responsiveness to messages sent via <a href="https://www.writetothem.com/stats/'.$year.'/mps">WriteToThem.com</a> in '.$year.': '.$extra_info["writetothem_responsiveness_notes_$year"].'.</li>';
     } elseif (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
         $mean = $extra_info["writetothem_responsiveness_mean_$year"];
 
@@ -1240,7 +1240,7 @@ 
         if ($a == 'very high') $a = 'a very high';
         $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"] = $a;
 
-        return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);
+        return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: ".$mean." --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);
     }
 
 }
@@ -1248,7 +1248,7 @@ 
 function get_all_writetothem_strings($member, $wtt_stats_years) {
     $extra_info = $member->extra_info();
     $strings = array();
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
 
         if (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
             $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
@@ -1264,7 +1264,7 @@ 
         return;
     }
 
-    $reg = array( 'date' => '', 'data' => '<p>Nil</p>' );
+    $reg = array('date' => '', 'data' => '<p>Nil</p>');
     if (isset($extra_info['register_member_interests_date'])) {
         $reg['date'] = format_date($extra_info['register_member_interests_date'], SHORTDATEFORMAT);
     }
@@ -1279,27 +1279,27 @@ 
     if ($constituencies == 'CONNECTION_TIMED_OUT') {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn&rsquo;t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
     } elseif (!$constituencies) {
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . htmlentities($pc) . ' isn&rsquo;t a known postcode');
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '.htmlentities($pc).' isn&rsquo;t a known postcode');
     } elseif (!isset($constituencies[$area_type])) {
-        throw new MySociety\TheyWorkForYou\MemberException(htmlentities($pc) . ' does not appear to be a valid postcode');
+        throw new MySociety\TheyWorkForYou\MemberException(htmlentities($pc).' does not appear to be a valid postcode');
     }
     global $PAGE;
     $a = array_values($constituencies);
     $db = new ParlDB;
     $query_base = "SELECT member.person_id, given_name, family_name, constituency, house
         FROM member, person_names pn
-        WHERE constituency IN ('" . join("','", $a) . "')
+        WHERE constituency IN ('" . join("','", $a)."')
             AND member.person_id = pn.person_id AND pn.type = 'name'
             AND pn.end_date = (SELECT MAX(end_date) FROM person_names WHERE person_names.person_id = member.person_id)";
-    $q = $db->query($query_base . " AND left_reason = 'still_in_office' AND house in (" . HOUSE_TYPE_NI . "," . HOUSE_TYPE_SCOTLAND . ")");
+    $q = $db->query($query_base." AND left_reason = 'still_in_office' AND house in (".HOUSE_TYPE_NI.",".HOUSE_TYPE_SCOTLAND.")");
     $current = true;
     if (!$q->rows() && ($dissolution = MySociety\TheyWorkForYou\Dissolution::db())) {
         $current = false;
-        $q = $db->query($query_base . " AND $dissolution[query]",
+        $q = $db->query($query_base." AND $dissolution[query]",
             $dissolution['params']);
     }
     $mcon = array(); $mreg = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $pid = $q->field($i, 'person_id');
         $cons = $q->field($i, 'constituency');
@@ -1314,33 +1314,33 @@ 
                 $mreg[] = $q->row($i);
             }
         } else {
-            throw new MySociety\TheyWorkForYou\MemberException('Odd result returned!' . $house);
+            throw new MySociety\TheyWorkForYou\MemberException('Odd result returned!'.$house);
         }
     }
     if ($rep_type == 'msp') {
         if ($current) {
             $data['members_statement'] = '<p>You have one constituency MSP (Member of the Scottish Parliament) and multiple region MSPs.</p>';
-            $data['members_statement'] .= '<p>Your <strong>constituency MSP</strong> is <a href="/msp/?p=' . $mcon['person_id'] . '">';
-            $data['members_statement'] .= $mcon['given_name'] . ' ' . $mcon['family_name'] . '</a>, MSP for ' . $mcon['constituency'];
-            $data['members_statement'] .= '.</p> <p>Your <strong>' . $constituencies['SPE'] . ' region MSPs</strong> are:</p>';
+            $data['members_statement'] .= '<p>Your <strong>constituency MSP</strong> is <a href="/msp/?p='.$mcon['person_id'].'">';
+            $data['members_statement'] .= $mcon['given_name'].' '.$mcon['family_name'].'</a>, MSP for '.$mcon['constituency'];
+            $data['members_statement'] .= '.</p> <p>Your <strong>'.$constituencies['SPE'].' region MSPs</strong> are:</p>';
         } else {
             $data['members_statement'] = '<p>You had one constituency MSP (Member of the Scottish Parliament) and multiple region MSPs.</p>';
-            $data['members_statement'] .= '<p>Your <strong>constituency MSP</strong> was <a href="/msp/?p=' . $mcon['person_id'] . '">';
-            $data['members_statement'] .= $mcon['given_name'] . ' ' . $mcon['family_name'] . '</a>, MSP for ' . $mcon['constituency'];
-            $data['members_statement'] .= '.</p> <p>Your <strong>' . $constituencies['SPE'] . ' region MSPs</strong> were:</p>';
+            $data['members_statement'] .= '<p>Your <strong>constituency MSP</strong> was <a href="/msp/?p='.$mcon['person_id'].'">';
+            $data['members_statement'] .= $mcon['given_name'].' '.$mcon['family_name'].'</a>, MSP for '.$mcon['constituency'];
+            $data['members_statement'] .= '.</p> <p>Your <strong>'.$constituencies['SPE'].' region MSPs</strong> were:</p>';
         }
     } else {
         if ($current) {
-            $data['members_statement'] = '<p>You have multiple MLAs (Members of the Legislative Assembly) who represent you in ' . $constituencies['NIE'] . '. They are:</p>';
+            $data['members_statement'] = '<p>You have multiple MLAs (Members of the Legislative Assembly) who represent you in '.$constituencies['NIE'].'. They are:</p>';
         } else {
-            $data['members_statement'] = '<p>You had multiple MLAs (Members of the Legislative Assembly) who represented you in ' . $constituencies['NIE'] . '. They were:</p>';
+            $data['members_statement'] = '<p>You had multiple MLAs (Members of the Legislative Assembly) who represented you in '.$constituencies['NIE'].'. They were:</p>';
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] = array (
-            'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
-            'name' => $reg['given_name'] . ' ' . $reg['family_name']
+    foreach ($mreg as $reg) {
+        $data['members'][] = array(
+            'url' => '/'.$rep_type.'/?p='.$reg['person_id'],
+            'name' => $reg['given_name'].' '.$reg['family_name']
         );
 
     }

Braces +143 added lines, -63 removed lines

@@ -62,16 +62,36 @@ 
 $constituency = strtolower(str_replace('_', ' ', get_http_var('c')));
 
 // Fix for names with non-ASCII characters
-if ($name == 'sion simon') $name = 'si\xf4n simon';
-if ($name == 'sian james') $name = 'si\xe2n james';
-if ($name == 'lembit opik') $name = 'lembit \xf6pik';
-if ($name == 'bairbre de brun') $name = 'bairbre de br\xfan';
-if ($name == 'daithi mckay') $name = 'daith\xed mckay';
-if ($name == 'caral ni chuilin') $name = 'car\xe1l n\xed chuil\xedn';
-if ($name == 'caledon du pre') $name = 'caledon du pr\xe9';
-if ($name == 'sean etchingham') $name = 'se\xe1n etchingham';
-if ($name == 'john tinne') $name = 'john tinn\xe9';
-if ($name == 'renee short') $name = 'ren\xe9e short';
+if ($name == 'sion simon') {
+    $name = 'si\xf4n simon';
+}
+if ($name == 'sian james') {
+    $name = 'si\xe2n james';
+}
+if ($name == 'lembit opik') {
+    $name = 'lembit \xf6pik';
+}
+if ($name == 'bairbre de brun') {
+    $name = 'bairbre de br\xfan';
+}
+if ($name == 'daithi mckay') {
+    $name = 'daith\xed mckay';
+}
+if ($name == 'caral ni chuilin') {
+    $name = 'car\xe1l n\xed chuil\xedn';
+}
+if ($name == 'caledon du pre') {
+    $name = 'caledon du pr\xe9';
+}
+if ($name == 'sean etchingham') {
+    $name = 'se\xe1n etchingham';
+}
+if ($name == 'john tinne') {
+    $name = 'john tinn\xe9';
+}
+if ($name == 'renee short') {
+    $name = 'ren\xe9e short';
+}
 
 // Fix for common misspellings, name changes etc
 $name_fix = array(
@@ -103,7 +123,9 @@ 
 }
 
 // Fixes for Ynys Mon, and a Unicode URL
-if ($constituency == 'ynys mon') $constituency = "ynys m\xf4n";
+if ($constituency == 'ynys mon') {
+    $constituency = "ynys m\xf4n";
+}
 if (preg_match("#^ynys m\xc3\xb4n#i", $constituency)) {
     $constituency = "ynys m\xf4n";
 }
@@ -126,11 +148,17 @@ 
 
 /////////////////////////////////////////////////////////
 // DETERMINE TYPE OF REPRESENTITIVE
-if (get_http_var('peer')) $this_page = 'peer';
-elseif (get_http_var('royal')) $this_page = 'royal';
-elseif (get_http_var('mla')) $this_page = 'mla';
-elseif (get_http_var('msp')) $this_page = 'msp';
-else $this_page = 'mp';
+if (get_http_var('peer')) {
+    $this_page = 'peer';
+} elseif (get_http_var('royal')) {
+    $this_page = 'royal';
+} elseif (get_http_var('mla')) {
+    $this_page = 'mla';
+} elseif (get_http_var('msp')) {
+    $this_page = 'msp';
+} else {
+    $this_page = 'mp';
+}
 
 try {
     if (is_numeric($pid)) {
@@ -179,8 +207,9 @@ 
 $desc = "Read $member_name's contributions to Parliament, including speeches and questions";
 
 // Enhance description if this is a current member
-if ($MEMBER->current_member_anywhere())
+if ($MEMBER->current_member_anywhere()) {
     $desc .= ', investigate their voting record, and get email alerts on their activity';
+}
 
 // Enhance title if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
@@ -188,8 +217,10 @@ 
         $title .= ', former';
     }
     $title .= ' MP';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
@@ -202,8 +233,10 @@ 
         $title .= ', former';
     }
     $title .= ' MLA';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of Scottish Parliament
 if ($MEMBER->house(HOUSE_TYPE_SCOTLAND)) {
@@ -224,14 +257,18 @@ 
 // Position if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_COMMONS) ? 'MP' : 'Former MP';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
 // Position if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_NI) ? 'MLA' : 'Former MLA';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
@@ -265,8 +302,9 @@ 
 
 // Build the RSS link and add it to page data.
 $feedurl = $DATA->page_metadata('mp_rss', 'url') . $MEMBER->person_id() . '.rdf';
-if (file_exists(BASEDIR . '/' . $feedurl))
+if (file_exists(BASEDIR . '/' . $feedurl)) {
     $DATA->set_page_metadata($this_page, 'rss', $feedurl);
+}
 
 // Prepare data for the template
 $data['full_name'] = $MEMBER->full_name();
@@ -692,11 +730,13 @@ 
         $url = $MEMBER->url();
         $params = array();
         foreach ($_GET as $key => $value) {
-            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid')
-                $params[] = "$key=$value";
+            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid') {
+                            $params[] = "$key=$value";
+            }
+        }
+        if (count($params)) {
+                    $url .= '?' . join('&', $params);
         }
-        if (count($params))
-            $url .= '?' . join('&', $params);
         if ($pagetype) {
             $pagetype = '/' . $pagetype;
         } else {
@@ -779,10 +819,14 @@ 
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
-            continue; # Same info is printed further down
+        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
+                    continue;
+        }
+        # Same info is printed further down
 
-        if (!$current_member[$house]) $desc .= 'Former ';
+        if (!$current_member[$house]) {
+            $desc .= 'Former ';
+        }
 
         $party = $left_house[$house]['party'];
         $party_br = '';
@@ -790,8 +834,9 @@ 
             $party_br = $m[2];
             $party = $m[1];
         }
-        if ($party != 'unknown')
-            $desc .= _htmlentities($party);
+        if ($party != 'unknown') {
+                    $desc .= _htmlentities($party);
+        }
         if ($party == 'Speaker' || $party == 'Deputy Speaker') {
             $desc .= ', and ';
             # XXX: Might go horribly wrong if something odd happens
@@ -802,15 +847,23 @@ 
         }
         if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
             $desc .= ' ';
-            if ($house==HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
-            if ($house==HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
-            if ($house==HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            if ($house==HOUSE_TYPE_COMMONS) {
+                $desc .= '<abbr title="Member of Parliament">MP</abbr>';
+            }
+            if ($house==HOUSE_TYPE_NI) {
+                $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
+            }
+            if ($house==HOUSE_TYPE_SCOTLAND) {
+                $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            }
             if ($party_br) {
                 $desc .= " ($party_br)";
             }
             $desc .= ' for ' . $left_house[$house]['constituency'];
         }
-        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
+        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') {
+            $desc .= ' Peer';
+        }
         $desc .= ', ';
     }
     $desc = preg_replace('#, $#', '', $desc);
@@ -1073,10 +1126,13 @@ 
     # Find latest entered house
     $entered_house = null;
     foreach ($member->entered_house() as $h => $eh) {
-        if (!$entered_house || $eh['date'] > $entered_house) $entered_house = $eh['date'];
+        if (!$entered_house || $eh['date'] > $entered_house) {
+            $entered_house = $eh['date'];
+        }
+    }
+    if ($entered_house > $year_ago) {
+            $since_text = 'since joining Parliament';
     }
-    if ($entered_house > $year_ago)
-        $since_text = 'since joining Parliament';
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
     $section = 'section:debates section:whall section:lords section:ni';
@@ -1089,10 +1145,12 @@ 
         $MOREURL->insert(array('pid'=>$member->person_id(), 's'=>'section:wrans', 'pop'=>1));
         // We assume that if they've answered a question, they're a minister
         $minister = 0; $Lminister = false;
-        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0)
-            $minister = 1;
-        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0)
-            $Lminister = true;
+        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0) {
+                    $minister = 1;
+        }
+        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0) {
+                    $Lminister = true;
+        }
         if ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
             $minister = 2;
         }
@@ -1141,11 +1199,17 @@ 
 
     if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts']>0 || $has_email_alerts)) {
         $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts']==1?'person is':'people are') . ' tracking ';
-        if ($member->house_disp == HOUSE_TYPE_COMMONS) $line .= 'this MP';
-        elseif ($member->house_disp == HOUSE_TYPE_LORDS) $line .= 'this peer';
-        elseif ($member->house_disp == HOUSE_TYPE_NI) $line .= 'this MLA';
-        elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) $line .= 'this MSP';
-        elseif ($member->house_disp == HOUSE_TYPE_ROYAL) $line .= $member->full_name();
+        if ($member->house_disp == HOUSE_TYPE_COMMONS) {
+            $line .= 'this MP';
+        } elseif ($member->house_disp == HOUSE_TYPE_LORDS) {
+            $line .= 'this peer';
+        } elseif ($member->house_disp == HOUSE_TYPE_NI) {
+            $line .= 'this MLA';
+        } elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) {
+            $line .= 'this MSP';
+        } elseif ($member->house_disp == HOUSE_TYPE_ROYAL) {
+            $line .= $member->full_name();
+        }
         if ($has_email_alerts) {
             $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
         }
@@ -1169,10 +1233,12 @@ 
 
 function display_stats_line($category, $blurb, $type, $inwhat, $afterstuff, $extra_info, $minister = false, $Lminister = false) {
     $return = false;
-    if (isset($extra_info[$category]))
-        $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
-    if (isset($extra_info["L$category"]))
-        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    if (isset($extra_info[$category])) {
+            $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
+    }
+    if (isset($extra_info["L$category"])) {
+            $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    }
     return $return;
 }
 
@@ -1184,17 +1250,21 @@ 
             $inwhat = preg_replace('#<\/a>#', '', $inwhat);
         }
     }
-    if ($house==HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
+    if ($house==HOUSE_TYPE_LORDS) {
+        $inwhat = str_replace('MP', 'Lord', $inwhat);
+    }
     $line = $blurb;
     $line .= '<strong>' . $extra_info[$category];
-    if ($type) $line .= ' ' . make_plural($type, $extra_info[$category]);
+    if ($type) {
+        $line .= ' ' . make_plural($type, $extra_info[$category]);
+    }
     $line .= '</strong>';
     $line .= $inwhat;
     if ($minister===2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
-    } elseif ($minister)
-        $line .= ' &#8212; Ministers do not ask written questions';
-    else {
+    } elseif ($minister) {
+            $line .= ' &#8212; Ministers do not ask written questions';
+    } else {
         $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
         if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
             $line .= ' &#8212; ';
@@ -1233,11 +1303,21 @@ 
         $mean = $extra_info["writetothem_responsiveness_mean_$year"];
 
         $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
-        if ($a == 'very low') $a = 'a very low';
-        if ($a == 'low') $a = 'a low';
-        if ($a == 'medium') $a = 'a medium';
-        if ($a == 'high') $a = 'a high';
-        if ($a == 'very high') $a = 'a very high';
+        if ($a == 'very low') {
+            $a = 'a very low';
+        }
+        if ($a == 'low') {
+            $a = 'a low';
+        }
+        if ($a == 'medium') {
+            $a = 'a medium';
+        }
+        if ($a == 'high') {
+            $a = 'a high';
+        }
+        if ($a == 'very high') {
+            $a = 'a very high';
+        }
         $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"] = $a;
 
         return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);

www/docs/admin/featured.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
 $out = '';
 if (get_http_var('preview')) {
     preview_featured();
-} else if ( get_http_var('confirm') ) {
+} else if (get_http_var('confirm')) {
     $out = update_featured();
 }
 
@@ -23,13 +23,13 @@ 
 print '</div>';
 
 function gid_to_url($gid) {
-    if ( !$gid ) {
+    if (!$gid) {
         return '';
     }
     global $hansardmajors;
     global $db;
 
-    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
     $url_gid = fix_gid_from_db($gid);
     $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q->field(0, 'major')]['page']);
     $url->insert(array('id' => $url_gid));
@@ -43,7 +43,7 @@ 
     $related = $featured->get_related();
     $context = $featured->get_context();
 
-    if ( get_http_var('url') ) {
+    if (get_http_var('url')) {
         $url = get_http_var('url');
         $title = get_http_var('title');
         $context = get_http_var('context');
@@ -113,11 +113,11 @@ 
     $related_gid3 = $related3 ? get_gid_from_url($related3) : NULL;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== NULL ) {
+    if ($gid !== NULL) {
         $h = new MySociety\TheyWorkForYou\Homepage;
-        $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
+        $featured = $h->getFeaturedDebate($gid, $title, $context, array($related_gid1, $related_gid2, $related_gid3));
 
-        include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
+        include INCLUDESPATH.'easyparliament/templates/html/homepage/featured.php';
     } else {
         print "<p>A random debate from the last 7 days will be displayed</p>";
     }
@@ -157,7 +157,7 @@ 
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 
-    if ( $query['id'] ) {
+    if ($query['id']) {
         if (strpos($parts['path'], 'lords') !== false) {
             $gid = 'uk.org.publicwhip/lords/';
         } elseif (strpos($parts['path'], 'whall') !== false) {
@@ -186,7 +186,7 @@ 
     $featured->set_related(array($related1, $related2, $related3));
 
     $out = "<h4>update successful</h4>";
-    $out .= "<p>Title set to " . _htmlspecialchars($title) . " and gid to " . _htmlspecialchars($gid) . "</p>";
+    $out .= "<p>Title set to "._htmlspecialchars($title)." and gid to "._htmlspecialchars($gid)."</p>";
 
     return $out;
 }

classes/MiniSurvey.php

Spacing +11 added lines, -11 removed lines

@@ -2,8 +2,8 @@ 
 
 namespace MySociety\TheyWorkForYou;
 
-require_once INCLUDESPATH . "../../commonlib/phplib/random.php";
-require_once INCLUDESPATH . "../../commonlib/phplib/auth.php";
+require_once INCLUDESPATH."../../commonlib/phplib/random.php";
+require_once INCLUDESPATH."../../commonlib/phplib/auth.php";
 
 class MiniSurvey {
 
@@ -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 ) {
-                    $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
-                    $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
+                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 ));
-                $page_url = 'https://' . DOMAIN . $URL->generate();
+                $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();
             }
 

classes/Topic.php

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
 
     function sctitle() {
         $title = $this->title;
-        if (strpos($title, 'The ') === 0 ) {
+        if (strpos($title, 'The ') === 0) {
             $title = lcfirst($title);
         }
 
@@ -74,7 +74,7 @@ 
 
     function url() {
         $url = new Url('topic');
-        return $url->generate() . $this->slug;
+        return $url->generate().$this->slug;
     }
 
     function image() {
@@ -82,7 +82,7 @@ 
     }
 
     function image_url() {
-        return "/topic/image.php?id=" . $this->slug();
+        return "/topic/image.php?id=".$this->slug();
     }
 
     function image_path() {
@@ -242,7 +242,7 @@ 
             );
         } else {
             foreach ($sets as $set) {
-                if ($set == '' ) {
+                if ($set == '') {
                     continue;
                 }
                 $q = $this->db->query(
@@ -285,7 +285,7 @@ 
             );
         } else {
             foreach ($policies as $policy) {
-                if ($policy == '' ) {
+                if ($policy == '') {
                     continue;
                 }
                 $q = $this->db->query(

classes/Renderer.php

Spacing +8 added lines, -8 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;
         }
 
@@ -84,25 +84,25 @@ 
         // Require the templates and output
 
         if ($template_only) {
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/'.$template.'.php';
         } else {
           header('Content-Type: text/html; charset=utf-8');
-          require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/header.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/'.$template.'.php';
+          require_once INCLUDESPATH.'easyparliament/templates/html/footer.php';
         }
     }
 
     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/Homepage.php

Spacing +10 added lines, -10 removed lines

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

classes/Utility/Hansard.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
         $parts = parse_url($url);
         parse_str($parts['query'], $query);
 
-        if ( $query['id'] ) {
+        if ($query['id']) {
             if (strpos($parts['path'], 'lords') !== false) {
                 $gid = 'uk.org.publicwhip/lords/';
             } elseif (strpos($parts['path'], 'whall') !== false) {
@@ -30,13 +30,13 @@ 
 
 
     public static function gid_to_url($gid) {
-        if ( !$gid ) {
+        if (!$gid) {
             return '';
         }
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
         $url_gid = fix_gid_from_db($gid);
         $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q->field(0, 'major')]['page']);
         $url->insert(array('id' => $url_gid));

classes/Renderer/User.php

Spacing +3 added lines, -3 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') {
@@ -68,7 +68,7 @@ 
             $logoutclass = 'on';
         }
 
-        $username = $this->user->firstname() . ' ' . $this->user->lastname();
+        $username = $this->user->firstname().' '.$this->user->lastname();
 
         $this->data['user_nav_links'][] = array(
             'href'    => $LOGOUTURL->generate(),

classes/SectionView/SectionView.php

Spacing +36 added lines, -36 removed lines

@@ -16,7 +16,7 @@ 
         $this->major_data = $hansardmajors[$this->major];
         $this->page_base = str_replace('year', '', $this->major_data['page_year']);
         if (!$this->list) {
-            $this->class = "\\" . $this->class;
+            $this->class = "\\".$this->class;
             $this->list = new $this->class();
         }
     }
@@ -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;
         }
@@ -128,12 +128,12 @@ 
 
     protected function display_year($year) {
         global $this_page, $PAGE, $DATA;
-        $this_page = $this->page_base . 'year';
+        $this_page = $this->page_base.'year';
         if (is_numeric($year)) {
             $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();
@@ -165,13 +165,13 @@ 
 
     protected function display_day($date) {
         global $this_page;
-        $this_page = $this->page_base . 'day';
-        $args = array ( 'date' => get_http_var('d') );
+        $this_page = $this->page_base.'day';
+        $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
@@ -398,47 +398,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'
@@ -451,9 +451,9 @@ 
 
     protected function display_front() {
         global $DATA, $this_page;
-        $this_page = $this->page_base . 'front';
+        $this_page = $this->page_base.'front';
         $data = array();
-        if ( $this->index_template ) {
+        if ($this->index_template) {
             $data['template'] = $this->index_template;
         }
 
@@ -463,7 +463,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;
         }
 
@@ -478,7 +478,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: