mysociety / theyworkforyou

scripts/alertmailer.php

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

@@ -423,7 +423,7 @@
 
     $text .= '====================';
     $sentemails++;
-    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    mlog("send $sentemails : Sending email to $current[email] ... ");
     $d = array('to' => $current['email'], 'template' => $template);
     $m = array(
         'DATA' => $text,

Spacing +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
     $data = $DEBATELIST->_get_data_by_search($args);
     $total_results = $data['info']['total_results'];
     $queries++;
-    mlog(", hits " . $total_results . ", time " . (getmicrotime()-$start) . "\n");
+    mlog(", hits " . $total_results . ", time " . (getmicrotime() - $start) . "\n");
 
     # Divisions
     if (preg_match('#^speaker:(\d+)$#', $criteria_raw, $m)) {

classes/Model/Featured.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q) {
             $text = $q['value'];
-            if ( trim($text) == '' ) {
+            if (trim($text) == '') {
                 $text = null;
             }
         }
@@ -73,7 +73,7 @@ 
     }
 
     private function _set($key, $value) {
-        if ( trim($value) == '' ) {
+        if (trim($value) == '') {
             $value = null;
         }
         $check_q = $this->db->query(
@@ -82,7 +82,7 @@ 
                 ':key' => $key
             )
         );
-        if ( $check_q->rows() ) {
+        if ($check_q->rows()) {
             $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key",
                 array(
                     ':key' => $key,
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ( $set_q->success() ) {
+        if ($set_q->success()) {
             return true;
         }
         return false;

classes/SectionView/SpwransView.php

Spacing +20 added lines, -20 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,17 +85,17 @@ 
         // Keep the references until after the history that's in a timeline:
         $references = array();
         foreach ($row_data as $row) {
-            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";
@@ -106,7 +106,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"]) {
@@ -120,9 +120,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>";
                     }
@@ -131,25 +131,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>";

classes/SectionView/NiView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'ni' )
+            array('section' => 'ni')
         );
     }
 
@@ -51,23 +51,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = null;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Northern Ireland Assembly debates";
                 $debate['more_url'] = $MOREURL->generate();
@@ -76,7 +76,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';
@@ -85,7 +85,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMLAList();
         $data['template'] = 'ni/index';

classes/Office.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {
                 $output .= 'before ';
             }
-            $output .= format_date($this->from_date,SHORTDATEFORMAT) . ' ';
+            $output .= format_date($this->from_date, SHORTDATEFORMAT) . ' ';
         }
 
         $output .= 'to ';

classes/FacebookLogin.php

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@ 
 
         try {
             $accessToken = $helper->getAccessToken();
-        } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+        } catch (\Facebook\Exceptions\FacebookResponseException $e) {
             $data['error'] = 'Graph returned an error: ' . $e->getMessage();
             return $data;
-        } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+        } catch (\Facebook\Exceptions\FacebookSDKException $e) {
             $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
             return $data;
         }
@@ -67,7 +67,7 @@ 
             return false;
         }
 
-        if (! $accessToken->isLongLived()) {
+        if (!$accessToken->isLongLived()) {
             $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
             try {
                 $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

classes/Utility/Wikipedia.php

Indentation +43 added lines, -43 removed lines

@@ -145,59 +145,59 @@
 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
-      $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+        $tagend = -1;
+        for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
         {
-          // got the start of a tag.  Now find the proper end!
-          $walker = $tagstart + 1;
-          $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+            // got the start of a tag.  Now find the proper end!
+            $walker = $tagstart + 1;
+            $open = 1;
+            while( $open != 0 && $walker < strlen( $content ) )
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false ) {
-              // ERROR! Open waka without close waka!
-              // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
-              return $content;
-          }
-          if( $nextopen === false || $nextopen > $nextclose ) {
-              // No more opens, but there was a close; or, a close happens before the next open.
-              // walker goes to the close+1, and open decrements
-              $open --;
-              $walker = $nextclose + 1;
-          } elseif( $nextopen < $nextclose ) {
-              // an open before the next close
-              $open ++;
-              $walker = $nextopen + 1;
-          }
+            $nextopen = strpos( $content, '<', $walker );
+            $nextclose = strpos( $content, '>', $walker );
+            if( $nextclose === false ) {
+                // ERROR! Open waka without close waka!
+                // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
+                return $content;
+            }
+            if( $nextopen === false || $nextopen > $nextclose ) {
+                // No more opens, but there was a close; or, a close happens before the next open.
+                // walker goes to the close+1, and open decrements
+                $open --;
+                $walker = $nextclose + 1;
+            } elseif( $nextopen < $nextclose ) {
+                // an open before the next close
+                $open ++;
+                $walker = $nextopen + 1;
+            }
         }
-          $tagend = $walker;
-          if( $tagend > strlen( $content ) ) {
-              $tagend = strlen( $content );
-          } else {
-              $tagend --;
-              $tagstart ++;
-          }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
-          $tags[] = '<' . $tag . '>';
-
-          if (function_exists('format_to_output')) {
+            $tagend = $walker;
+            if( $tagend > strlen( $content ) ) {
+                $tagend = strlen( $content );
+            } else {
+                $tagend --;
+                $tagstart ++;
+            }
+            $tag = substr( $content, $tagstart, $tagend - $tagstart );
+            $tags[] = '<' . $tag . '>';
+
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
 
-          $newtags[] = '<' . $newtag . '>';
+            $newtags[] = '<' . $newtag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
+        }
+        if (isset($tags)&&isset($newtags)) {
+        $content = str_replace($tags, $newtags, $content);
         }
-      if (isset($tags)&&isset($newtags)) {
-      $content = str_replace($tags, $newtags, $content);
-      }
 
     return $content;
 

Spacing +16 added lines, -16 removed lines

@@ -113,7 +113,7 @@ 
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
             # 1 means only replace one match for phrase per paragraph
-            $source = preg_replace ('{
+            $source = preg_replace('{
             \b(' . $phrase_re . ')\b # Match the phrase itself
             (?!                      # Match as long as the following does *not* apply:
                 (?:                  #   Match, possessively, as many strings of:
@@ -146,39 +146,39 @@ 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
       $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+      for ($tagstart = strpos($content, '<', $tagend + 1); $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend))
         {
           // got the start of a tag.  Now find the proper end!
           $walker = $tagstart + 1;
           $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+          while ($open != 0 && $walker < strlen($content))
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false ) {
+          $nextopen = strpos($content, '<', $walker);
+          $nextclose = strpos($content, '>', $walker);
+          if ($nextclose === false) {
               // ERROR! Open waka without close waka!
               // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
               return $content;
           }
-          if( $nextopen === false || $nextopen > $nextclose ) {
+          if ($nextopen === false || $nextopen > $nextclose) {
               // No more opens, but there was a close; or, a close happens before the next open.
               // walker goes to the close+1, and open decrements
-              $open --;
+              $open--;
               $walker = $nextclose + 1;
-          } elseif( $nextopen < $nextclose ) {
+          } elseif ($nextopen < $nextclose) {
               // an open before the next close
-              $open ++;
+              $open++;
               $walker = $nextopen + 1;
           }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) ) {
-              $tagend = strlen( $content );
+          if ($tagend > strlen($content)) {
+              $tagend = strlen($content);
           } else {
-              $tagend --;
-              $tagstart ++;
+              $tagend--;
+              $tagstart++;
           }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
+          $tag = substr($content, $tagstart, $tagend - $tagstart);
           $tags[] = '<' . $tag . '>';
 
           if (function_exists('format_to_output')) {
@@ -195,7 +195,7 @@ 
             $newtag = strip_tags($tag);
           }
         }
-      if (isset($tags)&&isset($newtags)) {
+      if (isset($tags) && isset($newtags)) {
       $content = str_replace($tags, $newtags, $content);
       }
 

classes/Utility/Search.php

Spacing +13 added lines, -13 removed lines

@@ -89,9 +89,9 @@ 
                     $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
                 }
                 if (!isset($speakers[$pid]['name'])) {
-                    $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
+                    $speakers[$pid]['name'] = $full_name . ($house == 1 ? ' MP' : '');
                 }
-                if ( !isset($speakers[$pid]['party']) && $party ) {
+                if (!isset($speakers[$pid]['party']) && $party) {
                     $speakers[$pid]['party'] = $party;
                 }
             }
@@ -144,7 +144,7 @@ 
      * Return query result from looking for MPs
      */
 
-    public static function searchMemberDbLookup($searchstring, $current_only=false) {
+    public static function searchMemberDbLookup($searchstring, $current_only = false) {
         if (!$searchstring) {
             return array();
         }
@@ -158,8 +158,8 @@ 
             // And here we're assuming the user's put the names in the right order.
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-'. $searchwords[1] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-' . $searchwords[1] . '%';
             $where = "(given_name LIKE :like_0 AND family_name LIKE :like_1)";
             $where .= " OR (given_name LIKE :like_1 AND family_name LIKE :like_0)";
             $where .= " OR (title LIKE :like_0 AND family_name LIKE :like_1)";
@@ -174,9 +174,9 @@ 
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
             $params[':like_2'] = '%' . $searchwords[2] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' '. $searchwords[2] . '%';
-            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-'. $searchwords[2] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' ' . $searchwords[2] . '%';
+            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-' . $searchwords[2] . '%';
             $where = "(given_name LIKE :like_0_and_1 AND family_name LIKE :like_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2_hyphen)";
@@ -205,7 +205,7 @@ 
         return array_unique($pids);
     }
 
-    public static function searchMemberDbLookupWithNames($searchstring, $current_only=false) {
+    public static function searchMemberDbLookupWithNames($searchstring, $current_only = false) {
         $pids = self::searchMemberDbLookup($searchstring, $current_only);
 
         if (!count($pids)) {
@@ -254,7 +254,7 @@ 
             // Looks like a postcode - can we find the constituency?
             $constituency = Postcode::postcodeToConstituency($searchterm);
             if ($constituency) {
-                return array( array($constituency), true );
+                return array(array($constituency), true);
             }
         }
 
@@ -272,7 +272,7 @@ 
             $constituencies[] = $row['name'];
         }
 
-        return array( $constituencies, false );
+        return array($constituencies, false);
     }
 
     /**
@@ -288,7 +288,7 @@ 
         $speakers = [];
 
         foreach ($criteria as $c) {
-            if (preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $MEMBER = new \MEMBER(array('person_id'=>$m[1]));
                 $speakers[$m[1]] = $MEMBER->full_name();
             }
@@ -307,7 +307,7 @@ 
     public static function speakerIDsToNames($searchstring) {
         $speakers = self::speakerNamesForIDs($searchstring);
 
-        foreach ( $speakers as $id => $name ) {
+        foreach ($speakers as $id => $name) {
             $searchstring = str_replace('speaker:' . $id, "speaker:$name", $searchstring);
         }
 

classes/PolicyPositions.php

Spacing +8 added lines, -8 removed lines

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