mysociety / theyworkforyou

classes/Member.php

Doc Comments +12 added lines

@@ -207,6 +207,10 @@ 
 
     }
 
+    /**
+     * @param string|null $include_only
+     * @param boolean $ignore_committees
+     */
     private function getOfficeObject($include_only, $ignore_committees, $row) {
         if (!$this->includeOffice($include_only, $row['to_date'])) {
             return null;
@@ -338,6 +342,10 @@ 
         return $output;
     }
 
+    /**
+     * @param integer $house
+     * @param string $house_name
+     */
     private function entered_house_line($house, $house_name) {
         if (isset($this->entered_house[$house]['date'])) {
             $string = "<strong>Entered the $house_name ";
@@ -350,6 +358,10 @@ 
         }
     }
 
+    /**
+     * @param integer $house
+     * @param string $house_name
+     */
     private function left_house_line($house, $house_name) {
         if ($this->house($house) && !$this->current_member($house)) {
             $string = "<strong>Left the $house_name ";

Indentation +35 added lines, -35 removed lines

@@ -133,12 +133,12 @@ 
     }
 
     /**
-    * Image
-    *
-    * Return a URL for the member's image.
-    *
-    * @return string The URL of the member's image.
-    */
+     * Image
+     *
+     * Return a URL for the member's image.
+     *
+     * @return string The URL of the member's image.
+     */
 
     public function image() {
 
@@ -207,15 +207,15 @@ 
     }
 
     /**
-    * Offices
-    *
-    * Return an array of Office objects held (or previously held) by the member.
-    *
-    * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
-    * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
-    *
-    * @return array An array of Office objects.
-    */
+     * Offices
+     *
+     * Return an array of Office objects held (or previously held) by the member.
+     *
+     * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
+     * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
+     *
+     * @return array An array of Office objects.
+     */
 
     public function offices($include_only = NULL, $ignore_committees = FALSE) {
 
@@ -269,12 +269,12 @@ 
     }
 
     /**
-    * Get Other Parties String
-    *
-    * Return a readable list of party changes for this member.
-    *
-    * @return string|null A readable list of the party changes for this member.
-    */
+     * Get Other Parties String
+     *
+     * Return a readable list of party changes for this member.
+     *
+     * @return string|null A readable list of the party changes for this member.
+     */
 
     public function getOtherPartiesString() {
 
@@ -302,12 +302,12 @@ 
     }
 
     /**
-    * Get Other Constituencies String
-    *
-    * Return a readable list of other constituencies for this member.
-    *
-    * @return string|null A readable list of the other constituencies for this member.
-    */
+     * Get Other Constituencies String
+     *
+     * Return a readable list of other constituencies for this member.
+     *
+     * @return string|null A readable list of the other constituencies for this member.
+     */
 
     public function getOtherConstituenciesString() {
 
@@ -320,14 +320,14 @@ 
     }
 
     /**
-    * Get Entered/Left Strings
-    *
-    * Return an array of readable strings covering when people entered or left
-    * various houses. Returns an array since it's possible for a member to have
-    * done several of these things.
-    *
-    * @return array An array of strings of when this member entered or left houses.
-    */
+     * Get Entered/Left Strings
+     *
+     * Return an array of readable strings covering when people entered or left
+     * various houses. Returns an array since it's possible for a member to have
+     * done several of these things.
+     *
+     * @return array An array of strings of when this member entered or left houses.
+     */
     public function getEnterLeaveStrings() {
         $output = array();
 

Switch Indentation +14 added lines, -14 removed lines

@@ -488,20 +488,20 @@
 
     public static function getRepNameForHouse($house) {
         switch ( $house ) {
-        case 1:
-            $name = 'MP';
-            break;
-        case 2:
-            $name = 'Peer';
-            break;
-        case 3:
-            $name = 'MLA';
-            break;
-        case 4:
-            $name = 'MSP';
-            break;
-        default:
-            $name = '';
+            case 1:
+                $name = 'MP';
+                break;
+            case 2:
+                $name = 'Peer';
+                break;
+            case 3:
+                $name = 'MLA';
+                break;
+            case 4:
+                $name = 'MSP';
+                break;
+            default:
+                $name = '';
         }
         return $name;
     }

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

@@ -39,13 +39,13 @@ 
 
             foreach ($house_types as $house_type) {
 
-                if (in_array($house_type, $left_house) AND
-                    $left_house[$house_type]['reason'] AND
+                if (in_array($house_type, $left_house) and
+                    $left_house[$house_type]['reason'] and
                     $left_house[$house_type]['reason'] == 'Died'
                 ) {
 
                     // This member has left a house because of death.
-                    return TRUE;
+                    return true;
                 }
 
             }
@@ -54,7 +54,7 @@ 
 
         // If we get this far the member hasn't left a house due to death, and
         // is presumably alive.
-        return FALSE;
+        return false;
 
     }
 
@@ -76,11 +76,11 @@ 
 
             $diff = $date_entered->diff($now);
             if ( $diff->y == 0 && $diff->m <= 6 ) {
-                return TRUE;
+                return true;
             }
         }
 
-        return FALSE;
+        return false;
     }
 
     /*
@@ -129,7 +129,7 @@ 
             return $this->extra_info()['eu_ref_stance'];
         }
 
-        return FALSE;
+        return false;
     }
 
     /**
@@ -150,10 +150,10 @@ 
         }
 
         // We can determine if the image exists or not by testing if size is set
-        if ($size !== NULL) {
-            $exists = TRUE;
+        if ($size !== null) {
+            $exists = true;
         } else {
-            $exists = FALSE;
+            $exists = false;
         }
 
         return array(
@@ -217,7 +217,7 @@ 
     * @return array An array of Office objects.
     */
 
-    public function offices($include_only = NULL, $ignore_committees = FALSE) {
+    public function offices($include_only = null, $ignore_committees = false) {
 
         $out = array();
 
@@ -253,16 +253,16 @@ 
     }
 
     private function includeOffice($include_only, $to_date) {
-        $include_office = TRUE;
+        $include_office = true;
 
         // If we should only include previous offices, and the to date is in the future, suppress this office.
-        if ($include_only == 'previous' AND $to_date == '9999-12-31') {
-            $include_office = FALSE;
+        if ($include_only == 'previous' and $to_date == '9999-12-31') {
+            $include_office = false;
         }
 
         // If we should only include previous offices, and the to date is in the past, suppress this office.
-        if ($include_only == 'current' AND $to_date != '9999-12-31') {
-            $include_office = FALSE;
+        if ($include_only == 'current' and $to_date != '9999-12-31') {
+            $include_office = false;
         }
 
         return $include_office;
@@ -287,7 +287,7 @@ 
             $output .= join('; ', $other_parties);
             return $output;
         } else {
-            return NULL;
+            return null;
         }
 
     }
@@ -314,7 +314,7 @@ 
         if ($this->other_constituencies) {
             return 'Also represented ' . join('; ', array_keys($this->other_constituencies));
         } else {
-            return NULL;
+            return null;
         }
 
     }

Spacing +25 added lines, -25 removed lines

@@ -75,7 +75,7 @@ 
             $now = new \DateTime();
 
             $diff = $date_entered->diff($now);
-            if ( $diff->y == 0 && $diff->m <= 6 ) {
+            if ($diff->y == 0 && $diff->m <= 6) {
                 return TRUE;
             }
         }
@@ -96,7 +96,7 @@ 
 
         $entered_house = $this->entered_house($house);
 
-        if ( $entered_house ) {
+        if ($entered_house) {
             $date_entered = $entered_house['date'];
         }
 
@@ -116,7 +116,7 @@ 
 
         $left_house = $this->left_house($house);
 
-        if ( $left_house ) {
+        if ($left_house) {
             $date_left = $left_house['date'];
         }
 
@@ -144,9 +144,9 @@ 
 
         $is_lord = $this->house(HOUSE_TYPE_LORDS);
         if ($is_lord) {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
         } else {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, true);
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, true);
         }
 
         // We can determine if the image exists or not by testing if size is set
@@ -169,15 +169,15 @@ 
         $last_cons = '';
         $last_house = null;
         $last_party = null;
-        if ( $this->current_member_anywhere() ) {
+        if ($this->current_member_anywhere()) {
             $houses = array_keys(array_filter($this->current_member(), 'strlen'));
             $last_cons = $this->constituency;
             $last_party = $this->party;
             $last_house = $this->house_disp;
         } else {
             $max_date = null;
-            foreach ( array_keys($this->left_house) as $house ) {
-                if ($this->left_house[$house]['date'] > $max_date ) {
+            foreach (array_keys($this->left_house) as $house) {
+                if ($this->left_house[$house]['date'] > $max_date) {
                     $max_date = $this->left_house[$house]['date'];
                     $last_cons = $this->left_house[$house]['constituency'];
                     $last_party = $this->left_house[$house]['party'];
@@ -196,10 +196,10 @@ 
 
         $entered_house = $this->entered_house($last_house);
         $left_house = $this->left_house($last_house);
-        if ( isset($entered_house['date']) ) {
+        if (isset($entered_house['date'])) {
             $details['entered_house'] = $entered_house['date'];
         }
-        if ( isset($left_house['date']) ) {
+        if (isset($left_house['date'])) {
             $details['left_house'] = $left_house['date'];
         }
 
@@ -226,7 +226,7 @@ 
             $office = $office['office'];
 
             foreach ($office as $row) {
-                if ( $officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row) ) {
+                if ($officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row)) {
                     $out[] = $officeObject;
                 }
             }
@@ -370,7 +370,7 @@ 
     private function entered_house_line($house, $house_name) {
         if (isset($this->entered_house[$house]['date'])) {
             $string = "<strong>Entered the $house_name ";
-            $string .= strlen($this->entered_house[$house]['date_pretty'])==4 ? 'in ' : 'on ';
+            $string .= strlen($this->entered_house[$house]['date_pretty']) == 4 ? 'in ' : 'on ';
             $string .= $this->entered_house[$house]['date_pretty'] . '</strong>';
             if ($this->entered_house[$house]['reason']) {
                 $string .= ' &mdash; ' . $this->entered_house[$house]['reason'];
@@ -382,7 +382,7 @@ 
     private function left_house_line($house, $house_name) {
         if ($this->house($house) && !$this->current_member($house)) {
             $string = "<strong>Left the $house_name ";
-            $string .= strlen($this->left_house[$house]['date_pretty'])==4 ? 'in ' : 'on ';
+            $string .= strlen($this->left_house[$house]['date_pretty']) == 4 ? 'in ' : 'on ';
             $string .= $this->left_house[$house]['date_pretty'] . '</strong>';
             if ($this->left_house[$house]['reason']) {
                 $string .= ' &mdash; ' . $this->left_house[$house]['reason'];
@@ -395,19 +395,19 @@ 
         $policy_diffs = array();
         $party_positions = $party->getAllPolicyPositions($policiesList);
 
-        if ( !$party_positions ) {
+        if (!$party_positions) {
             return $policy_diffs;
         }
 
-        foreach ( $positions->positionsById as $policy_id => $details ) {
-            if ( $details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
+        foreach ($positions->positionsById as $policy_id => $details) {
+            if ($details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
                 $mp_score = $details['score'];
                 $party_score = $party_positions[$policy_id]['score'];
 
                 $score_diff = $this->calculatePolicyDiffScore($mp_score, $party_score);
 
                 // skip anything that isn't a yes vs no diff
-                if ( $only_diffs && $score_diff < 2 ) {
+                if ($only_diffs && $score_diff < 2) {
                     continue;
                 }
                 $policy_diffs[$policy_id] = $score_diff;
@@ -419,18 +419,18 @@ 
         return $policy_diffs;
     }
 
-    private function calculatePolicyDiffScore( $mp_score, $party_score ) {
+    private function calculatePolicyDiffScore($mp_score, $party_score) {
         $score_diff = abs($mp_score - $party_score);
         // if they are on opposite sides of mixture of for and against
         if (
-            ( $mp_score < 0.4 && $party_score > 0.6 ) ||
-            ( $mp_score > 0.6 && $party_score < 0.4 )
+            ($mp_score < 0.4 && $party_score > 0.6) ||
+            ($mp_score > 0.6 && $party_score < 0.4)
         ) {
             $score_diff += 2;
         // if on is mixture of for and against and one is for/against
         } else if (
-            ( $mp_score > 0.4 && $mp_score < 0.6 && ( $party_score > 0.6 || $party_score < 0.4 ) ) ||
-            ( $party_score > 0.4 && $party_score < 0.6 && ( $mp_score > 0.6 || $mp_score < 0.4 ) )
+            ($mp_score > 0.4 && $mp_score < 0.6 && ($party_score > 0.6 || $party_score < 0.4)) ||
+            ($party_score > 0.4 && $party_score < 0.6 && ($mp_score > 0.6 || $mp_score < 0.4))
         ) {
             $score_diff += 1;
         }
@@ -443,7 +443,7 @@ 
 
         $mreg = array();
         $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode);
-        if ( isset($constituencies[$type]) ) {
+        if (isset($constituencies[$type])) {
             $cons_name = $constituencies[$type];
             $query_base = "SELECT member.person_id, title, lordofname, given_name, family_name, constituency, house
                 FROM member, person_names
@@ -460,7 +460,7 @@ 
                     ':cons_name' => $cons_name
                 )
             );
-            if ( !$q->rows() && ($dissolution = Dissolution::db()) ) {
+            if (!$q->rows() && ($dissolution = Dissolution::db())) {
                 $q = $db->query("$query_base AND $dissolution[query]",
                     array(
                         ':house' => $house,
@@ -487,7 +487,7 @@ 
     }
 
     public static function getRepNameForHouse($house) {
-        switch ( $house ) {
+        switch ($house) {
         case 1:
             $name = 'MP';
             break;

Braces +12 added lines, -6 removed lines

@@ -145,14 +145,16 @@ 
         $is_lord = $this->house(HOUSE_TYPE_LORDS);
         if ($is_lord) {
             list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
-        } else {
+        }
+        else {
             list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, true);
         }
 
         // We can determine if the image exists or not by testing if size is set
         if ($size !== NULL) {
             $exists = TRUE;
-        } else {
+        }
+        else {
             $exists = FALSE;
         }
 
@@ -174,7 +176,8 @@ 
             $last_cons = $this->constituency;
             $last_party = $this->party;
             $last_house = $this->house_disp;
-        } else {
+        }
+        else {
             $max_date = null;
             foreach ( array_keys($this->left_house) as $house ) {
                 if ($this->left_house[$house]['date'] > $max_date ) {
@@ -286,7 +289,8 @@ 
             }
             $output .= join('; ', $other_parties);
             return $output;
-        } else {
+        }
+        else {
             return NULL;
         }
 
@@ -313,7 +317,8 @@ 
 
         if ($this->other_constituencies) {
             return 'Also represented ' . join('; ', array_keys($this->other_constituencies));
-        } else {
+        }
+        else {
             return NULL;
         }
 
@@ -428,7 +433,8 @@ 
         ) {
             $score_diff += 2;
         // if on is mixture of for and against and one is for/against
-        } else if (
+        }
+        else if (
             ( $mp_score > 0.4 && $mp_score < 0.6 && ( $party_score > 0.6 || $party_score < 0.4 ) ) ||
             ( $party_score > 0.4 && $party_score < 0.6 && ( $mp_score > 0.6 || $mp_score < 0.4 ) )
         ) {

www/docs/mp/index.php

Doc Comments +14 added lines

@@ -590,6 +590,7 @@ 
  * Member Redirect
  *
  * Redirect to the canonical page for a member.
+ * @param MySociety\TheyWorkForYou\Member $MEMBER
  */
 
 function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
@@ -1056,6 +1057,12 @@ 
 
 }
 
+/**
+ * @param string $blurb
+ * @param string $type
+ * @param string $inwhat
+ * @param string $afterstuff
+ */
 function display_stats_line($category, $blurb, $type, $inwhat, $afterstuff, $extra_info, $minister = false, $Lminister = false) {
     $return = false;
     if (isset($extra_info[$category]))
@@ -1065,6 +1072,10 @@ 
     return $return;
 }
 
+/**
+ * @param integer $house
+ * @param boolean $minister
+ */
 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') {
@@ -1163,6 +1174,9 @@ 
     return $reg;
 }
 
+/**
+ * @param string $area_type
+ */
 function regional_list($pc, $area_type, $rep_type) {
     $constituencies = MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($pc);
     if ($constituencies == 'CONNECTION_TIMED_OUT') {

Indentation +20 added lines, -20 removed lines

@@ -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
@@ -359,19 +359,19 @@ 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
         if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
-          $data['key_votes_segments'] = array(
-              array(
-                  'key' => $policy_set,
-                  'title' => $set_descriptions[$policy_set],
-                  'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
-                      $policiesList->limitToSet($policy_set), $MEMBER, $policyOptions
-                  )
-              )
-          );
-          $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;
+            $data['key_votes_segments'] = array(
+                array(
+                    'key' => $policy_set,
+                    'title' => $set_descriptions[$policy_set],
+                    'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
+                        $policiesList->limitToSet($policy_set), $MEMBER, $policyOptions
+                    )
+                )
+            );
+            $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;
             $data['key_votes_segments'] = array(
@@ -519,11 +519,11 @@ 
 
         // Generate voting segments
         $data['segment'] = array(
-          'key'   => $policy_set,
-          'title' => $policiesList->getSetDescriptions()[$policy_set],
-          'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
-              $policiesList->limitToSet($policy_set), $MEMBER
-          )
+            'key'   => $policy_set,
+            'title' => $policiesList->getSetDescriptions()[$policy_set],
+            'votes' => new MySociety\TheyWorkForYou\PolicyPositions(
+                $policiesList->limitToSet($policy_set), $MEMBER
+            )
         );
 
         MySociety\TheyWorkForYou\Renderer::output('mp/votes_svg', $data, true);

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 \URL('mlas');
-        break;
-    case 'msp':
-        $rep = 'MSP';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \URL('msps');
-        break;
-    case 'peer':
-        $rep = 'Lord';
-        $SEARCHURL = '';
-        $MPSURL = new \URL('peers');
-        break;
-    default:
-        $rep = 'MP';
-        $SEARCHURL = new \URL('mp');
-        $SEARCHURL = $SEARCHURL->generate();
-        $MPSURL = new \URL('mps');
+        case 'mla':
+            $rep = 'MLA';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \URL('mlas');
+            break;
+        case 'msp':
+            $rep = 'MSP';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \URL('msps');
+            break;
+        case 'peer':
+            $rep = 'Lord';
+            $SEARCHURL = '';
+            $MPSURL = new \URL('peers');
+            break;
+        default:
+            $rep = 'MP';
+            $SEARCHURL = new \URL('mp');
+            $SEARCHURL = $SEARCHURL->generate();
+            $MPSURL = new \URL('mps');
     }
 
     $data = array(

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

@@ -29,7 +29,7 @@ 
  */
 
 // Disable the old PAGE class.
-$new_style_template = TRUE;
+$new_style_template = true;
 
 // Include all the things this page needs.
 include_once '../../includes/easyparliament/init.php';
@@ -176,7 +176,7 @@ 
 // Basic name, title and description
 $member_name = ucfirst($MEMBER->full_name());
 $title = $member_name;
-$desc = "Read $member_name's contributions to Parliament, including speeches and questions";
+$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())
@@ -244,8 +244,8 @@ 
 
 $position = implode('; ', $positions);
 
-$current_offices = $MEMBER->offices('current', TRUE);
-$former_offices = $MEMBER->offices('previous', TRUE);
+$current_offices = $MEMBER->offices('current', true);
+$former_offices = $MEMBER->offices('previous', true);
 
 // If this person has named non-committee offices, they override the default
 if (count($current_offices) > 0) {
@@ -315,11 +315,11 @@ 
 $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';
 
-$data['pre_2010_expenses'] = False;
+$data['pre_2010_expenses'] = false;
 $data['post_2010_expenses'] = $data['leave_date'] > '2010-05-05';
 
 if ($data['entry_date'] < '2010-05-05') {
-    $data['pre_2010_expenses'] = True;
+    $data['pre_2010_expenses'] = true;
     // Set the expenses URL if we know it
     if (isset($MEMBER->extra_info['expenses_url'])) {
         $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'];
@@ -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()) {
@@ -1171,8 +1171,8 @@ 
     $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["l$category"]))
+        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "l$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
     return $return;
 }
 

Spacing +53 added lines, -53 removed lines

@@ -118,7 +118,7 @@ 
     }
     if ($pid) {
         $URL = new URL('search');
-        $URL->insert( array('pid'=>$pid, 'pop'=>1) );
+        $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) {
@@ -216,7 +216,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_SCOTLAND)) {
         $title .= ', former';
     }
-    $title .= ' MSP, '.$MEMBER->constituency();
+    $title .= ' MSP, ' . $MEMBER->constituency();
 }
 
 $positions = array();
@@ -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,
@@ -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();
@@ -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()) {
@@ -702,7 +702,7 @@ 
         } else {
             $pagetype = '';
         }
-        header('Location: ' . $url . $pagetype, true, $code );
+        header('Location: ' . $url . $pagetype, true, $code);
         exit;
     }
 }
@@ -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,7 +768,7 @@ 
  * 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();
@@ -779,7 +779,7 @@ 
     }
     $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 ';
@@ -800,17 +800,17 @@ 
                 $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'];
         }
-        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 = '';
@@ -866,7 +866,7 @@ 
     // 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);
@@ -877,7 +877,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args = array (
+        $args = array(
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -892,7 +892,7 @@ 
     twfy_debug_timestamp();
 
     $MOREURL = new \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';
@@ -1101,7 +1101,7 @@ 
         }
     }
 
-    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;
@@ -1131,23 +1131,23 @@ 
         }
         */
 
-        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;
@@ -1177,25 +1177,25 @@ 
 }
 
 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>';
     $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'));
+        $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'];
@@ -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);
     }
@@ -1299,7 +1299,7 @@ 
             $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');
@@ -1337,8 +1337,8 @@ 
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] = array (
+    foreach ($mreg as $reg) {
+        $data['members'][] = array(
             'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
             'name' => $reg['given_name'] . ' ' . $reg['family_name']
         );

Braces +236 added lines, -104 removed lines

@@ -43,7 +43,8 @@ 
 // Ensure that page type is set
 if (get_http_var('pagetype')) {
     $pagetype = get_http_var('pagetype');
-} else {
+}
+else {
     $pagetype = 'profile';
 }
 if ($pagetype == 'profile') {
@@ -62,16 +63,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(
@@ -97,13 +118,16 @@ 
         if ($constituency == $name_fix[$name][1]) {
             $name = $name_fix[$name][0];
         }
-    } else {
+    }
+    else {
         $name = $name_fix[$name];
     }
 }
 
 // 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,29 +150,46 @@ 
 
 /////////////////////////////////////////////////////////
 // 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)) {
         $MEMBER = get_person_by_id($pid);
-    } elseif (is_numeric(get_http_var('m'))) {
+    }
+    elseif (is_numeric(get_http_var('m'))) {
         get_person_by_member_id(get_http_var('m'));
-    } elseif (get_http_var('pc')) {
+    }
+    elseif (get_http_var('pc')) {
         get_person_by_postcode(get_http_var('pc'));
-    } elseif ($name) {
+    }
+    elseif ($name) {
         $MEMBER = get_person_by_name($name, $constituency);
-    } elseif ($constituency) {
+    }
+    elseif ($constituency) {
         get_mp_by_constituency($constituency);
-    } elseif (($this_page == 'msp' || $this_page == 'mla') && $THEUSER->postcode_is_set()) {
+    }
+    elseif (($this_page == 'msp' || $this_page == 'mla') && $THEUSER->postcode_is_set()) {
         get_regional_by_user_postcode($THEUSER->postcode(), $this_page);
         exit;
-    } elseif ($THEUSER->postcode_is_set()) {
+    }
+    elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
-    } else {
+    }
+    else {
         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.');
     }
@@ -179,8 +220,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,28 +230,34 @@ 
         $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)) {
     if ($MEMBER->house(HOUSE_TYPE_COMMONS) || $MEMBER->house(HOUSE_TYPE_LORDS)) {
         $desc = str_replace('Parliament', 'Parliament and the Northern Ireland Assembly', $desc);
-    } else {
+    }
+    else {
         $desc = str_replace('Parliament', 'the Northern Ireland Assembly', $desc);
     }
     if (!$MEMBER->current_member(HOUSE_TYPE_NI)) {
         $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)) {
     if ($MEMBER->house(HOUSE_TYPE_COMMONS) || $MEMBER->house(HOUSE_TYPE_LORDS)) {
         $desc = str_replace('Parliament', 'the UK and Scottish Parliaments', $desc);
-    } else {
+    }
+    else {
         $desc = str_replace('Parliament', 'the Scottish Parliament', $desc);
     }
     $desc = str_replace(', and get email alerts on their activity', '', $desc);
@@ -224,14 +272,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 +317,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();
@@ -323,7 +376,8 @@ 
     // Set the expenses URL if we know it
     if (isset($MEMBER->extra_info['expenses_url'])) {
         $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'];
-    } else {
+    }
+    else {
         $data['expenses_url_2004'] = 'http://mpsallowances.parliament.uk/mpslordsandoffices/hocallowances/allowances%2Dby%2Dmp/';
     }
 }
@@ -338,7 +392,8 @@ 
 $data['current_assembly'] = 'westminster';
 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';
 }
 
@@ -372,7 +427,8 @@ 
           $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 {
+        }
+        else {
             $data['single_policy_page'] = false;
             $data['key_votes_segments'] = array(
                 array(
@@ -489,7 +545,8 @@ 
         $policyID = get_http_var('policy');
         if ( $policyID ) {
             $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
-        } else {
+        }
+        else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
         $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
@@ -497,7 +554,8 @@ 
 
         if ( $policyID ) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
-        } else {
+        }
+        else {
             $data['policydivisions'] = $divisions->getAllMemberDivisionsByPolicy();
         }
 
@@ -633,10 +691,12 @@ 
     $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 == "") {
+    }
+    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');
-    } else {
+    }
+    else {
         // Redirect to the canonical MP page, with a person id.
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
         if ($MEMBER->person_id()) {
@@ -667,9 +727,11 @@ 
     $this_page = "your$page";
     if ($page == 'msp' && \MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsScottish($pc)) {
         regional_list($pc, 'SPC', $page);
-    } elseif ($page == 'mla' && \MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($pc)) {
+    }
+    elseif ($page == 'mla' && \MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($pc)) {
         regional_list($pc, 'NIE', $page);
-    } else {
+    }
+    else {
         throw new MySociety\TheyWorkForYou\MemberException('Your set postcode is not in the right region.');
     }
 }
@@ -692,14 +754,17 @@ 
         $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 {
+        }
+        else {
             $pagetype = '';
         }
         header('Location: ' . $url . $pagetype, true, $code );
@@ -773,16 +838,21 @@ 
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
 
-    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) { # Royal short-circuit
+    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) {
+# Royal short-circuit
         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]))
-            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 +860,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 +873,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);
@@ -841,7 +920,8 @@ 
         if (isset($member->extra_info['public_whip_rebelrank'])) {
             if ($member->extra_info['public_whip_data_date'] == 'complete') {
                 $rebellion_string .= ' in their last parliament.';
-            } else {
+            }
+            else {
                 $rebellion_string .= ' in the current parliament.';
             }
         }
@@ -1021,7 +1101,8 @@ 
 function constituency_previous_mps($member) {
     if ($member->house(HOUSE_TYPE_COMMONS)) {
         return $member->previous_mps();
-    } else {
+    }
+    else {
         return array();
     }
 }
@@ -1029,7 +1110,8 @@ 
 function constituency_future_mps($member) {
     if ($member->house(HOUSE_TYPE_COMMONS)) {
         return $member->future_mps();
-    } else {
+    }
+    else {
         return array();
     }
 }
@@ -1073,10 +1155,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 \URL('search');
     $section = 'section:debates section:whall section:lords section:ni';
@@ -1089,10 +1174,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;
         }
@@ -1112,7 +1199,8 @@ 
     $after_stuff = ' <small>(From Public Whip)</small>';
     if ($member->party() == 'SNP') {
         $after_stuff .= '<br><em>Note SNP MPs do not vote on legislation not affecting Scotland.</em>';
-    } elseif ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
+    }
+    elseif ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
         $after_stuff .= '<br><em>Speakers and deputy speakers cannot vote except to break a tie.</em>';
     }
     if ($member->party() != 'Sinn Féin') {
@@ -1141,11 +1229,21 @@ 
 
     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 +1267,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,16 +1284,22 @@ 
             $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';
+    }
+    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'])) {
@@ -1201,20 +1307,26 @@ 
             $q = $extra_info[$category . '_quintile'];
             if ($q == 0) {
                 $line .= 'well above average';
-            } elseif ($q == 1) {
+            }
+            elseif ($q == 1) {
                 $line .= 'above average';
-            } elseif ($q == 2) {
+            }
+            elseif ($q == 2) {
                 $line .= 'average';
-            } elseif ($q == 3) {
+            }
+            elseif ($q == 3) {
                 $line .= 'below average';
-            } elseif ($q == 4) {
+            }
+            elseif ($q == 4) {
                 $line .= 'well below average';
-            } else {
+            }
+            else {
                 $line .= '[Impossible quintile!]';
             }
             $line .= ' amongst ';
             $line .= $type . 's';
-        } elseif (!get_http_var('rem') && isset($extra_info[$category . '_rank'])) {
+        }
+        elseif (!get_http_var('rem') && isset($extra_info[$category . '_rank'])) {
             $line .= ' &#8212; ';
             #if (isset($extra_info[$category . '_rank_joint']))
             #   print 'joint ';
@@ -1229,15 +1341,26 @@ 
 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>';
-    } elseif (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
+    }
+    elseif (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
         $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);
@@ -1278,9 +1401,11 @@ 
     $constituencies = MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($pc);
     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) {
+    }
+    elseif (!$constituencies) {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . htmlentities($pc) . ' isn&rsquo;t a known postcode');
-    } elseif (!isset($constituencies[$area_type])) {
+    }
+    elseif (!isset($constituencies[$area_type])) {
         throw new MySociety\TheyWorkForYou\MemberException(htmlentities($pc) . ' does not appear to be a valid postcode');
     }
     global $PAGE;
@@ -1305,15 +1430,19 @@ 
         $cons = $q->field($i, 'constituency');
         if ($house == HOUSE_TYPE_COMMONS) {
             continue;
-        } elseif ($house == HOUSE_TYPE_NI) {
+        }
+        elseif ($house == HOUSE_TYPE_NI) {
             $mreg[] = $q->row($i);
-        } elseif ($house == HOUSE_TYPE_SCOTLAND) {
+        }
+        elseif ($house == HOUSE_TYPE_SCOTLAND) {
             if ($cons == $constituencies['SPC']) {
                 $mcon = $q->row($i);
-            } elseif ($cons == $constituencies['SPE']) {
+            }
+            elseif ($cons == $constituencies['SPE']) {
                 $mreg[] = $q->row($i);
             }
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Odd result returned!' . $house);
         }
     }
@@ -1323,16 +1452,19 @@ 
             $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 {
+        }
+        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>';
         }
-    } else {
+    }
+    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>';
-        } else {
+        }
+        else {
             $data['members_statement'] = '<p>You had multiple MLAs (Members of the Legislative Assembly) who represented you in ' . $constituencies['NIE'] . '. They were:</p>';
         }
     }

www/docs/api/api_getPerson.php

Doc Comments +9 added lines

@@ -77,6 +77,9 @@ 
     }
 }
 
+/**
+ * @param MySQLQuery $q
+ */
 function _api_getPerson_output($q, $flatten=false) {
     $output = array();
     $last_mod = 0;
@@ -95,10 +98,16 @@ 
     api_output($output, $last_mod);
 }
 
+/**
+ * @param integer $house
+ */
 function api_getPerson_constituency($constituency, $house) {
     _api_getPerson_constituency(array($constituency), $house);
 }
 
+/**
+ * @param integer $house
+ */
 function api_getPerson_postcode($pc, $house) {
     $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc);
     $types = array();

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

@@ -17,7 +17,7 @@
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party=false) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party = FALSE) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);
@@ -30,7 +30,7 @@ 
     }
     if ($has_party && isset($parties[$row['party']]))
         $row['party'] = $parties[$row['party']];
-    list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
+    list($image, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
         $row['image'] = $image;
@@ -43,7 +43,7 @@ 
         # Ministerialships and Select Committees
         $db = new ParlDB;
         $q = $db->query('SELECT * FROM moffice WHERE to_date="9999-12-31" and person=' . $row['person_id'] . ' ORDER BY from_date DESC');
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $row['office'][] = $q->row($i);
         }
     }
@@ -55,7 +55,7 @@ 
     return $row;
 }
 
-function api_getPerson_id($id, $house='') {
+function api_getPerson_id($id, $house = '') {
     $db = new ParlDB;
     $params = array(
         ':person_id' => $id
@@ -77,10 +77,10 @@ 
     }
 }
 
-function _api_getPerson_output($q, $flatten=false) {
+function _api_getPerson_output($q, $flatten = false) {
     $output = array();
     $last_mod = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $out = _api_getPerson_row($q->row($i), $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;

Braces +34 added lines, -17 removed lines

@@ -28,8 +28,9 @@ 
         $URL = new URL('mp');
         $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
-    if ($has_party && isset($parties[$row['party']]))
-        $row['party'] = $parties[$row['party']];
+    if ($has_party && isset($parties[$row['party']])) {
+            $row['party'] = $parties[$row['party']];
+    }
     list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
@@ -49,7 +50,9 @@ 
     }
 
     foreach ($row as $k => $r) {
-        if (is_string($r)) $row[$k] = html_entity_decode($r);
+        if (is_string($r)) {
+            $row[$k] = html_entity_decode($r);
+        }
     }
 
     return $row;
@@ -72,7 +75,8 @@ 
         order by left_house desc", $params);
     if ($q->rows()) {
         _api_getPerson_output($q);
-    } else {
+    }
+    else {
         api_error('Unknown person ID');
     }
 }
@@ -85,8 +89,9 @@ 
         $out = _api_getPerson_row($q->row($i), $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
         $time = strtotime($q->field($i, 'lastupdate'));
-        if ($time > $last_mod)
-            $last_mod = $time;
+        if ($time > $last_mod) {
+                    $last_mod = $time;
+        }
     }
     # Only one MP, not an array
     if ($flatten && count($output) == 1 && $house == HOUSE_TYPE_COMMONS) {
@@ -104,24 +109,30 @@ 
     $types = array();
     if ($house == HOUSE_TYPE_NI) {
         $types = array('NIE');
-    } elseif ($house == HOUSE_TYPE_SCOTLAND) {
+    }
+    elseif ($house == HOUSE_TYPE_SCOTLAND) {
         $types = array('SPC', 'SPE');
     }
     if (validate_postcode($pc)) {
         $constituencies = MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($pc);
         if ($constituencies == 'CONNECTION_TIMED_OUT') {
             api_error('Connection timed out');
-        } elseif ($types && isset($constituencies[$types[0]])) {
+        }
+        elseif ($types && isset($constituencies[$types[0]])) {
             $constituencies = array_map(function($c) use ($constituencies) { return $constituencies[$c]; }, $types);
             _api_getPerson_constituency($constituencies, $house);
-        } elseif ($types && isset($constituencies['WMC'])) {
+        }
+        elseif ($types && isset($constituencies['WMC'])) {
             api_error('Postcode not in correct region');
-        } elseif (isset($constituencies['WMC'])) {
+        }
+        elseif (isset($constituencies['WMC'])) {
             _api_getPerson_constituency(array($constituencies['WMC']), $house);
-        } else {
+        }
+        else {
             api_error('Unknown postcode');
         }
-    } else {
+    }
+    else {
         api_error('Invalid postcode');
     }
 }
@@ -134,13 +145,18 @@ 
 
     $cons = array();
     foreach ($constituencies as $constituency) {
-        if ($constituency == '') continue;
-        if ($constituency == 'Orkney ')
-            $constituency = 'Orkney & Shetland';
+        if ($constituency == '') {
+            continue;
+        }
+        if ($constituency == 'Orkney ') {
+                    $constituency = 'Orkney & Shetland';
+        }
 
         if ($house == HOUSE_TYPE_COMMONS) {
             $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-            if ($normalised) $constituency = $normalised;
+            if ($normalised) {
+                $constituency = $normalised;
+            }
         }
 
         $cons[] = $constituency;
@@ -167,7 +183,8 @@ 
 
     if ($q->rows > 0) {
         _api_getPerson_output($q, true);
-    } else {
+    }
+    else {
         api_error('Unknown constituency, or no results for that constituency');
     }
 }

www/includes/utility.php

Doc Comments +23 added lines

@@ -318,6 +318,9 @@ 
 $format_date_months = array('', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
 $format_date_months_short = array('', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
 
+/**
+ * @param string $format
+ */
 function format_date($date, $format) {
     global $format_date_months, $format_date_months_short;
     // Pass it a date (YYYY-MM-DD) and a
@@ -342,6 +345,9 @@ 
 }
 
 
+/**
+ * @param string $format
+ */
 function format_time($time, $format) {
     // Pass it a time (HH:MM:SS) and a
     // PHP date format string (eg, "H:i")
@@ -486,6 +492,7 @@ 
 
 /**
  * Filters user input to remove unwanted HTML tags etc
+ * @param string $filter_type
  */
 function filter_user_input($text, $filter_type) {
     // We use this to filter any major user input, especially comments.
@@ -735,12 +742,18 @@ 
 /* verp_envelope_sender RECIPIENT
  * Construct a VERP envelope sender for an email to RECIPIENT
  */
+/**
+ * @return string|null
+ */
 function twfy_verp_envelope_sender($recipient) {
     $envelope_sender = verp_envelope_sender($recipient, 'twfy', EMAILDOMAIN);
 
     return $envelope_sender;
 }
 
+/**
+ * @param string $message
+ */
 function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false) {
     // Use this rather than PHP's mail() direct, so we can make alterations
     // easily to all the emails we send out from the site.
@@ -799,6 +812,9 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
+/**
+ * @param string $name
+ */
 function get_cookie_var($name, $default='') {
     if (array_key_exists($name, $_COOKIE)) {
         return clean_var($_COOKIE[$name]);
@@ -1039,6 +1055,10 @@ 
     }
 }
 
+/**
+ * @param integer $major
+ * @param URL $LISTURL
+ */
 function _major_summary_title($major, $data, $LISTURL, $daytext) {
     global $hansardmajors;
 
@@ -1088,6 +1108,9 @@ 
     return $return;
 }
 
+/**
+ * @param string|null $url
+ */
 function redirect($url) {
     if (defined('TESTING')) {
         print "Location: $url";

Indentation +40 added lines, -40 removed lines

@@ -67,11 +67,11 @@ 
     # Ignore errors we've asked to ignore
     if (error_reporting()==0) return;
 
-   // define an assoc array of error string
-   // in reality the only entries we should
-   // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
-   // E_USER_WARNING and E_USER_NOTICE
-   # Commented out are ones that a user function cannot handle.
+    // define an assoc array of error string
+    // in reality the only entries we should
+    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
+    // E_USER_WARNING and E_USER_NOTICE
+    # Commented out are ones that a user function cannot handle.
     $errortype = array (
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
@@ -200,8 +200,8 @@ 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
 function adodb_backtrace($print=true)
 {
-  $s = '';
-  if (PHPVERSION() >= 4.3) {
+    $s = '';
+    if (PHPVERSION() >= 4.3) {
 
     $MAXSTRLEN = 64;
 
@@ -209,33 +209,33 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
-      $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
-      $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+        for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+        $tabs -= 1;
+        if (isset($arr['class'])) $s .= $arr['class'].'.';
+        $args = array();
+        if (isset($arr['args'])) foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
     elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
     elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
     elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
     else {
-      $v = (string) @$v;
-      $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
-      $args[] = $str;
+        $v = (string) @$v;
+        $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
+        if (strlen($v) > $MAXSTRLEN) $str .= '...';
+        $args[] = $str;
     }
-      }
+        }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
-      //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
-      //            " file: <a href=\"file:/%s\">%s</a></font>",
-      //        $arr['line'],$arr['file'],$arr['file']);
-      $s .= "\n";
+        $s .= $arr['function'].'('.implode(', ',$args).')';
+        //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
+        //            " file: <a href=\"file:/%s\">%s</a></font>",
+        //        $arr['line'],$arr['file'],$arr['file']);
+        $s .= "\n";
     }
     if ($print) print $s;
-  }
+    }
 
-  return $s;
+    return $s;
 }
 
 // Far from foolproof, but better than nothing.
@@ -567,14 +567,14 @@ 
     //$tbl["»"] = "&raquo;";
     //$tbl["«"] = "&laquo;";
 
-  // lib_filter will replace unmatched < and > with entities so
-  // we abuse strtr's only replace once behaviour to not double
-  // encode them. May not be robust.
-  // This does mean if anyone actually wants to put &gt; or &lt;
-  // in a comment they can't but that's a lot less likely than
-  // < or > for less than and greater than.
-  $tbl['&lt;'] = "&lt;";
-  $tbl['&gt;'] = "&gt;";
+    // lib_filter will replace unmatched < and > with entities so
+    // we abuse strtr's only replace once behaviour to not double
+    // encode them. May not be robust.
+    // This does mean if anyone actually wants to put &gt; or &lt;
+    // in a comment they can't but that's a lot less likely than
+    // < or > for less than and greater than.
+    $tbl['&lt;'] = "&lt;";
+    $tbl['&gt;'] = "&gt;";
 
     // Don't want to encode these things
     unset ($tbl["<"]);
@@ -764,16 +764,16 @@ 
     if (!$from) $from = CONTACTEMAIL;
 
     $headers =
-     "From: TheyWorkForYou <$from>\r\n" .
-     "Content-Type: text/plain; charset=utf-8\r\n" .
-     "MIME-Version: 1.0\r\n" .
-     "Content-Transfer-Encoding: 8bit\r\n" .
-     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
-     "X-Mailer: PHP/" . phpversion();
+        "From: TheyWorkForYou <$from>\r\n" .
+        "Content-Type: text/plain; charset=utf-8\r\n" .
+        "MIME-Version: 1.0\r\n" .
+        "Content-Transfer-Encoding: 8bit\r\n" .
+        ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
+        "X-Mailer: PHP/" . phpversion();
     twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'");
 
     if ($want_bounces) {
-      $envelope_sender = twfy_verp_envelope_sender($to);
+        $envelope_sender = twfy_verp_envelope_sender($to);
         $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
     } else {
         $success = mail ($to, $subject, $message, $headers);
@@ -1063,7 +1063,7 @@ 
 
     $return = '<h4>';
     if (isset($daytext[$major])) {
-     $return .= $daytext[$major] . ' ';
+        $return .= $daytext[$major] . ' ';
     }
 
     $return .= '<a href="';

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

@@ -887,7 +887,7 @@ 
     return $string;
 }
 
-function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = NULL) {
+function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = null) {
 
     // Case for Elizabeth II
     if ($house == HOUSE_TYPE_ROYAL)
@@ -903,7 +903,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== NULL)
+    if ($pid !== null)
     {
         $out .= $pid . '/';
     }

Spacing +78 added lines, -78 removed lines

@@ -10,7 +10,7 @@ 
 
 # Pass it a brief header word and some debug text and it'll be output.
 # If TEXT is an array, call the user function, assuming it's a class.
-function twfy_debug($header, $text="") {
+function twfy_debug($header, $text = "") {
 
     // We set ?DEBUGTAG=n in the URL.
     // (DEBUGTAG is set in config.php).
@@ -27,10 +27,10 @@ 
     if ($debug_level != '') {
 
         // Set which level shows which types of debug info.
-        $levels = array (
-            1 => array ('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
-            2 => array ('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
-            3 => array ('SQLRESULT')
+        $levels = array(
+            1 => array('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
+            2 => array('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
+            3 => array('SQLRESULT')
             // Higher than this: 'DATA', etc.
         );
 
@@ -44,11 +44,11 @@ 
         }
 
         for ($n = 1; $n <= $max_level_to_show; $n++) {
-            $allowed_headers = array_merge ($allowed_headers, $levels[$n] );
+            $allowed_headers = array_merge($allowed_headers, $levels[$n]);
         }
 
         // If we can show this header, then, er, show it.
-        if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
+        if (in_array($header, $allowed_headers) || $debug_level >= 4) {
             if (is_array($text)) $text = call_user_func($text);
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
@@ -65,14 +65,14 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting() == 0) return;
 
    // define an assoc array of error string
    // in reality the only entries we should
    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
    // E_USER_WARNING and E_USER_NOTICE
    # Commented out are ones that a user function cannot handle.
-    $errortype = array (
+    $errortype = array(
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
         #E_PARSE            => "Parsing Error",
@@ -131,11 +131,11 @@ 
         $source = file($filename);
         $err .= "\nSource:\n\n";
         // Show the line, plus prev and next, with line numbers.
-        $err .= $linenum-2 . " " . $source[$linenum-3];
-        $err .= $linenum-1 . " " . $source[$linenum-2];
-        $err .= $linenum . " " . $source[$linenum-1];
-        $err .= $linenum+1 . " " . $source[$linenum];
-        $err .= $linenum+2 . " " . $source[$linenum+1];
+        $err .= $linenum - 2 . " " . $source[$linenum - 3];
+        $err .= $linenum - 1 . " " . $source[$linenum - 2];
+        $err .= $linenum . " " . $source[$linenum - 1];
+        $err .= $linenum + 1 . " " . $source[$linenum];
+        $err .= $linenum + 2 . " " . $source[$linenum + 1];
     }
 
 
@@ -179,8 +179,8 @@ 
             header('HTTP/1.0 500 Internal Server Error');
             print "<p>Oops, sorry, an error has occurred!</p>\n";
         }
-        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect')===false && strpos($errmsg, 'mysql_connect')===false) {
-            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n".  "X-Mailer: PHP/" . phpversion() );
+        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect') === false && strpos($errmsg, 'mysql_connect') === false) {
+            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n" . "X-Mailer: PHP/" . phpversion());
         }
     }
 
@@ -198,7 +198,7 @@ 
 }
 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
-function adodb_backtrace($print=true)
+function adodb_backtrace($print = true)
 {
   $s = '';
   if (PHPVERSION() >= 4.3) {
@@ -207,26 +207,26 @@ 
 
     $traceArr = debug_backtrace();
     array_shift($traceArr);
-    $tabs = sizeof($traceArr)-1;
+    $tabs = sizeof($traceArr) - 1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+      for ($i = 0; $i < $tabs; $i++) $s .= ' &nbsp; ';
       $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
+      if (isset($arr['class'])) $s .= $arr['class'] . '.';
       $args = array();
       if (isset($arr['args'])) foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
+    elseif (is_array($v)) $args[] = 'Array[' . sizeof($v) . ']';
+    elseif (is_object($v)) $args[] = 'Object:' . get_class($v);
     elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
     else {
       $v = (string) @$v;
-      $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
+      $str = _htmlspecialchars(substr($v, 0, $MAXSTRLEN));
       if (strlen($v) > $MAXSTRLEN) $str .= '...';
       $args[] = $str;
     }
       }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
+      $s .= $arr['function'] . '(' . implode(', ', $args) . ')';
       //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
       //            " file: <a href=\"file:/%s\">%s</a></font>",
       //        $arr['line'],$arr['file'],$arr['file']);
@@ -240,9 +240,9 @@ 
 
 // Far from foolproof, but better than nothing.
 function validate_email($string) {
-    if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+'.
-        '@'.
-        '[-!#$%&\'*.\\+\/0-9=?A-Z^_`a-z{|}~]+\.'.
+    if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+' .
+        '@' .
+        '[-!#$%&\'*.\\+\/0-9=?A-Z^_`a-z{|}~]+\.' .
         '[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+$/', $string)) {
         return false;
     } else {
@@ -264,7 +264,7 @@ 
     $nom = '0123456789';
     $gap = '\s\.';
 
-    if (    preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
+    if (preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
@@ -280,7 +280,7 @@ 
 // Returns the unixtime in microseconds.
 function getmicrotime() {
     $mtime = microtime();
-    $mtime = explode(" ",$mtime);
+    $mtime = explode(" ", $mtime);
     $mtime = $mtime[1] + $mtime[0];
 
     return $mtime;
@@ -293,7 +293,7 @@ 
     global $timestamp_last, $timestamp_start;
     $t = getmicrotime();
     twfy_debug("TIME", sprintf("%f msecs since start; %f msecs since last; %s",
-            ($t - $timestamp_start)*1000.0, ($t - $timestamp_last)*1000.0, $label));
+            ($t - $timestamp_start) * 1000.0, ($t - $timestamp_last) * 1000.0, $label));
     $timestamp_last = $t;
 }
 
@@ -307,7 +307,7 @@ 
     if (preg_match("/^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/", $timestamp, $matches)) {
         list($string, $year, $month, $day, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec, $month, $day, $year));
+        return gmdate($format, gmmktime($hour, $min, $sec, $month, $day, $year));
     } else {
         return "";
     }
@@ -328,13 +328,13 @@ 
         list($string, $year, $month, $day) = $matches;
         if ($year < 1902) { # gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
-                return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months_short[$month + 0] . " $year";
             } else {
-                return ($day+0) . ' ' . $format_date_months[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months[$month + 0] . " $year";
             }
         }
 
-        return gmdate ($format, gmmktime(0, 0, 0, $month, $day, $year));
+        return gmdate($format, gmmktime(0, 0, 0, $month, $day, $year));
     } else {
         return "";
     }
@@ -350,7 +350,7 @@ 
     if (preg_match("/^(\d\d):(\d\d):(\d\d)$/", $time, $matches)) {
         list($string, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec));
+        return gmdate($format, gmmktime($hour, $min, $sec));
     } else {
         return "";
     }
@@ -371,16 +371,16 @@ 
     $in_seconds = strtotime($datetime);
     $now = time();
 
-    $diff   =  $now - $in_seconds;
-    $months =  floor($diff/2419200);
+    $diff   = $now - $in_seconds;
+    $months = floor($diff / 2419200);
     $diff   -= $months * 2419200;
-    $weeks  =  floor($diff/604800);
-    $diff   -= $weeks*604800;
-    $days   =  floor($diff/86400);
+    $weeks  = floor($diff / 604800);
+    $diff   -= $weeks * 604800;
+    $days   = floor($diff / 86400);
     $diff   -= $days * 86400;
-    $hours  =  floor($diff/3600);
+    $hours  = floor($diff / 3600);
     $diff   -= $hours * 3600;
-    $minutes = floor($diff/60);
+    $minutes = floor($diff / 60);
     $diff   -= $minutes * 60;
     $seconds = $diff;
 
@@ -394,27 +394,27 @@ 
         $relative_date = '';
         if ($weeks > 0) {
             // Weeks and days
-            $relative_date .= ($relative_date?', ':'').$weeks.' week'.($weeks>1?'s':'');
-            $relative_date .= $days>0?($relative_date?', ':'').$days.' day'.($days>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
+            $relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
         } elseif ($days > 0) {
             // days and hours
-            $relative_date .= ($relative_date?', ':'').$days.' day'.($days>1?'s':'');
-            $relative_date .= $hours>0?($relative_date?', ':'').$hours.' hour'.($hours>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
+            $relative_date .= $hours > 0 ? ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
         } elseif ($hours > 0) {
             // hours and minutes
-            $relative_date .= ($relative_date?', ':'').$hours.' hour'.($hours>1?'s':'');
-            $relative_date .= $minutes>0?($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
+            $relative_date .= $minutes > 0 ? ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
         } elseif ($minutes > 0) {
             // minutes only
-            $relative_date .= ($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
         } else {
             // seconds only
-            $relative_date .= ($relative_date?', ':'').$seconds.' second'.($seconds>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $seconds . ' second' . ($seconds > 1 ? 's' : '');
         }
     }
 
     // Return relative date and add proper verbiage
-    return $relative_date.' ago';
+    return $relative_date . ' ago';
 
 }
 
@@ -455,10 +455,10 @@ 
         $text = substr($text, $start);
 
         // Word boundary.
-        if (preg_match ("/.+?\b(.*)/", $text, $matches)) {
+        if (preg_match("/.+?\b(.*)/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the start.
-            $text = preg_replace ("/^\s/", '', $text);
+            $text = preg_replace("/^\s/", '', $text);
         }
         $text = '...' . $text;
     }
@@ -470,10 +470,10 @@ 
         $text = substr($text, 0, $length - 3);
 
         // Word boundary.
-        if (preg_match ("/(.*)\s.+/", $text, $matches)) {
+        if (preg_match("/(.*)\s.+/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the end.
-            $text = preg_replace ("/\s$/", '', $text);
+            $text = preg_replace("/\s$/", '', $text);
         }
         // We don't want to use the HTML entity for an ellipsis (&#8230;), because then
         // it screws up when we subsequently use htmlentities() to print the returned
@@ -505,11 +505,11 @@ 
 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
-        $filter->allowed = array ();
+        $filter->allowed = array();
     } else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
-        $filter->allowed = array (
+        $filter->allowed = array(
             'a' => array('href'),
             'strong' => array(),
             'em' => array(),
@@ -630,10 +630,10 @@ 
     // This returns 'debate_2003-02-28.475.3'.
 
     if ($keepmajor) {
-        $newgid = substr($gid, strpos($gid, '/')+1 );
+        $newgid = substr($gid, strpos($gid, '/') + 1);
         $newgid = str_replace('/', '_', $newgid);
     } else {
-        $newgid = substr($gid, strrpos($gid, '/')+1 );
+        $newgid = substr($gid, strrpos($gid, '/') + 1);
     }
 
     return $newgid;
@@ -647,7 +647,7 @@ 
     // will be like 2003-11-20.966.0
     // This function returns 966.0
 
-    return substr( $gid, (strpos($gid, '.') + 1) );
+    return substr($gid, (strpos($gid, '.') + 1));
 }
 
 function preg_replacement_quote($s) {
@@ -691,7 +691,7 @@ 
     global $PAGE;
 
     if (!isset($data['to']) || $data['to'] == '') {
-        $PAGE->error_message ("We need an email address to send to.");
+        $PAGE->error_message("We need an email address to send to.");
         return false;
     }
 
@@ -715,7 +715,7 @@ 
         if (isset($data['subject'])) {
             $subject = trim($data['subject']);
         } else {
-            $subject = trim( substr($firstline, 8) );
+            $subject = trim(substr($firstline, 8));
         }
 
         // Either way, remove this subject line from the template.
@@ -724,7 +724,7 @@ 
     } elseif (isset($data['subject'])) {
         $subject = $data['subject'];
     } else {
-        $PAGE->error_message ("We don't have a subject line for the email, so it wasn't sent.");
+        $PAGE->error_message("We don't have a subject line for the email, so it wasn't sent.");
         return false;
     }
 
@@ -734,14 +734,14 @@ 
     $replace = array();
 
     foreach ($merge as $key => $val) {
-        $search[] = '/{'.$key.'}/';
+        $search[] = '/{' . $key . '}/';
         $replace[] = preg_replacement_quote($val);
     }
 
     $emailtext = preg_replace($search, $replace, $emailtext);
 
     // Send it!
-    $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces);
+    $success = send_email($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces);
 
     return $success;
 
@@ -768,15 +768,15 @@ 
      "Content-Type: text/plain; charset=utf-8\r\n" .
      "MIME-Version: 1.0\r\n" .
      "Content-Transfer-Encoding: 8bit\r\n" .
-     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
+     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "") .
      "X-Mailer: PHP/" . phpversion();
     twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'");
 
     if ($want_bounces) {
       $envelope_sender = twfy_verp_envelope_sender($to);
-        $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
+        $success = mail($to, $subject, $message, $headers, '-f ' . $envelope_sender);
     } else {
-        $success = mail ($to, $subject, $message, $headers);
+        $success = mail($to, $subject, $message, $headers);
     }
 
     return $success;
@@ -788,7 +788,7 @@ 
 // http://www.iamcal.com/publish/article.php?id=13
 
 // Call this with a key name to get a GET or POST variable.
-function get_http_var($name, $default='') {
+function get_http_var($name, $default = '') {
     if (array_key_exists($name, $_GET)) {
         return clean_var($_GET[$name]);
     }
@@ -814,7 +814,7 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
-function get_cookie_var($name, $default='') {
+function get_cookie_var($name, $default = '') {
     if (array_key_exists($name, $_COOKIE)) {
         return clean_var($_COOKIE[$name]);
     }
@@ -825,7 +825,7 @@ 
 // Pass it an array of key names that should not be generated as
 // hidden form variables. It then outputs hidden form variables
 // based on the session_vars for this page.
-function hidden_form_vars ($omit = array()) {
+function hidden_form_vars($omit = array()) {
     global $DATA, $this_page;
 
     $session_vars = $DATA->page_metadata($this_page, "session_vars");
@@ -838,7 +838,7 @@ 
 }
 
 // Deprecated. Use hidden_form_vars, above, instead.
-function hidden_vars ($omit = array()) {
+function hidden_vars($omit = array()) {
     global $DATA;
 
     foreach ($args as $key => $val) {
@@ -881,7 +881,7 @@ 
 function entities_to_numbers($string) {
     $string = str_replace(
         array('&Ouml;', '&acirc;', '&uacute;', '&aacute;', '&iacute;', '&ocirc;', '&eacute;'),
-        array('&#214;', '&#226;',  '&#250;',   '&#225;',   '&#237;',   '&#244;',  '&#233;'  ),
+        array('&#214;', '&#226;', '&#250;', '&#225;', '&#237;', '&#244;', '&#233;'),
         $string
     );
     return $string;
@@ -895,9 +895,9 @@ 
         return 'elizabeth_the_second';
     }
 
-    $s   = array(' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
-    $s2  = array(" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
-    $r   = array('_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o');
+    $s   = array(' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
+    $s2  = array(" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
+    $r   = array('_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o');
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -1037,8 +1037,8 @@ 
                 }
                 $out .= '<li>' . $body . '<ul>';
             } else {
-                $LISTURL->insert( array( 'id' => $gid ) );
-                $out .= '<li><a href="'.$LISTURL->generate().'">';
+                $LISTURL->insert(array('id' => $gid));
+                $out .= '<li><a href="' . $LISTURL->generate() . '">';
                 $out .= $body . '</a>';
             }
         }

Braces +194 added lines, -99 removed lines

@@ -39,7 +39,8 @@ 
 
         if ($debug_level > count($levels)) {
             $max_level_to_show = count($levels);
-        } else {
+        }
+        else {
             $max_level_to_show = $debug_level;
         }
 
@@ -49,7 +50,9 @@ 
 
         // If we can show this header, then, er, show it.
         if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
-            if (is_array($text)) $text = call_user_func($text);
+            if (is_array($text)) {
+                $text = call_user_func($text);
+            }
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
     }
@@ -65,7 +68,9 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting()==0) {
+        return;
+    }
 
    // define an assoc array of error string
    // in reality the only entries we should
@@ -92,17 +97,20 @@ 
     $err = '';
     if (isset($_SERVER['REQUEST_URI'])) {
         $err .= "URL:\t\thttps://" . DOMAIN . $_SERVER['REQUEST_URI'] . "\n";
-    } else {
+    }
+    else {
         $err .= "URL:\t\tNone - running from command line?\n";
     }
     if (isset($_SERVER['HTTP_REFERER'])) {
         $err .= "Referer:\t" . $_SERVER['HTTP_REFERER'] . "\n";
-    } else {
+    }
+    else {
         $err .= "Referer:\tNone\n";
     }
     if (isset($_SERVER['HTTP_USER_AGENT'])) {
         $err .= "User-Agent:\t" . $_SERVER['HTTP_USER_AGENT'] . "\n";
-    } else {
+    }
+    else {
         $err .= "User-Agent:\tNone\n";
     }
     $err .= "Number:\t\t$errno\n";
@@ -143,7 +151,8 @@ 
     $fatal_errors = array(E_ERROR, E_USER_ERROR);
     if (in_array($errno, $fatal_errors)) {
         $fatal = true;
-    } else {
+    }
+    else {
         $fatal = false;
     }
 
@@ -161,11 +170,13 @@ 
         );
         if (is_object($PAGE)) {
             $PAGE->error_message($message, $fatal);
-        } else {
+        }
+        else {
             vardump($message);
         }
 
-    } else {
+    }
+    else {
         // On live sites we display a nice message and email the problem.
 
         $message = array(
@@ -175,7 +186,8 @@ 
 
         if (is_object($PAGE)) {
             $PAGE->error_message($message, $fatal);
-        } else {
+        }
+        else {
             header('HTTP/1.0 500 Internal Server Error');
             print "<p>Oops, sorry, an error has occurred!</p>\n";
         }
@@ -209,19 +221,33 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+      for ($i=0; $i < $tabs; $i++) {
+          $s .= ' &nbsp; ';
+      }
       $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
+      if (isset($arr['class'])) {
+          $s .= $arr['class'].'.';
+      }
       $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+      if (isset($arr['args'])) {
+          foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
-    elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
+      }
+    elseif (is_array($v)) {
+        $args[] = 'Array['.sizeof($v).']';
+    }
+    elseif (is_object($v)) {
+        $args[] = 'Object:'.get_class($v);
+    }
+    elseif (is_bool($v)) {
+        $args[] = $v ? 'true' : 'false';
+    }
     else {
       $v = (string) @$v;
       $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
+      if (strlen($v) > $MAXSTRLEN) {
+          $str .= '...';
+      }
       $args[] = $str;
     }
       }
@@ -232,7 +258,9 @@ 
       //        $arr['line'],$arr['file'],$arr['file']);
       $s .= "\n";
     }
-    if ($print) print $s;
+    if ($print) {
+        print $s;
+    }
   }
 
   return $s;
@@ -245,7 +273,8 @@ 
         '[-!#$%&\'*.\\+\/0-9=?A-Z^_`a-z{|}~]+\.'.
         '[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+$/', $string)) {
         return false;
-    } else {
+    }
+    else {
         return true;
     }
 }
@@ -272,7 +301,8 @@ 
             preg_match("/^[$fst][$sec][$num][$fth][$gap]*[$nom][$in][$in]$/i", $postcode)
         ) {
         return true;
-    } else {
+    }
+    else {
         return false;
     }
 }
@@ -308,7 +338,8 @@ 
         list($string, $year, $month, $day, $hour, $min, $sec) = $matches;
 
         return gmdate ($format, gmmktime($hour, $min, $sec, $month, $day, $year));
-    } else {
+    }
+    else {
         return "";
     }
 
@@ -326,16 +357,19 @@ 
 
     if (preg_match("/^(\d\d\d\d)-(\d\d?)-(\d\d?)$/", $date, $matches)) {
         list($string, $year, $month, $day) = $matches;
-        if ($year < 1902) { # gmdate fns only go back to Dec. 1901
+        if ($year < 1902) {
+# gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
                 return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
-            } else {
+            }
+            else {
                 return ($day+0) . ' ' . $format_date_months[$month+0] . " $year";
             }
         }
 
         return gmdate ($format, gmmktime(0, 0, 0, $month, $day, $year));
-    } else {
+    }
+    else {
         return "";
     }
 
@@ -351,7 +385,8 @@ 
         list($string, $hour, $min, $sec) = $matches;
 
         return gmdate ($format, gmmktime($hour, $min, $sec));
-    } else {
+    }
+    else {
         return "";
     }
 }
@@ -390,24 +425,29 @@ 
         $date = substr($datetime, 0, 10);
         return format_date($date, LONGDATEFORMAT);
 
-    } else {
+    }
+    else {
         $relative_date = '';
         if ($weeks > 0) {
             // Weeks and days
             $relative_date .= ($relative_date?', ':'').$weeks.' week'.($weeks>1?'s':'');
             $relative_date .= $days>0?($relative_date?', ':'').$days.' day'.($days>1?'s':''):'';
-        } elseif ($days > 0) {
+        }
+        elseif ($days > 0) {
             // days and hours
             $relative_date .= ($relative_date?', ':'').$days.' day'.($days>1?'s':'');
             $relative_date .= $hours>0?($relative_date?', ':'').$hours.' hour'.($hours>1?'s':''):'';
-        } elseif ($hours > 0) {
+        }
+        elseif ($hours > 0) {
             // hours and minutes
             $relative_date .= ($relative_date?', ':'').$hours.' hour'.($hours>1?'s':'');
             $relative_date .= $minutes>0?($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':''):'';
-        } elseif ($minutes > 0) {
+        }
+        elseif ($minutes > 0) {
             // minutes only
             $relative_date .= ($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':'');
-        } else {
+        }
+        else {
             // seconds only
             $relative_date .= ($relative_date?', ':'').$seconds.' second'.($seconds>1?'s':'');
         }
@@ -506,7 +546,8 @@ 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
         $filter->allowed = array ();
-    } else {
+    }
+    else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
         $filter->allowed = array (
@@ -541,7 +582,8 @@ 
         function($matches) use ($link_length) {
             if (strlen($matches[0]) > $link_length) {
                 return '<a href="' . $matches[0] . '" rel="nofollow">' . substr($matches[0], 0, $link_length) . "...</a>";
-            } else {
+            }
+            else {
                 return '<a href="' . $matches[0] . '" rel="nofollow">' . $matches[0] . '</a>';
             }
         },
@@ -607,7 +649,8 @@ 
         $q = $db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
         if ($q->rows() > 0) {
             $gid = $q->field(0, 'gid_to');
-        } else {
+        }
+        else {
             $might_be_redirected = false;
         }
     }
@@ -632,7 +675,8 @@ 
     if ($keepmajor) {
         $newgid = substr($gid, strpos($gid, '/')+1 );
         $newgid = str_replace('/', '_', $newgid);
-    } else {
+    }
+    else {
         $newgid = substr($gid, strrpos($gid, '/')+1 );
     }
 
@@ -714,16 +758,19 @@ 
     if (preg_match("/Subject:/", $firstline)) {
         if (isset($data['subject'])) {
             $subject = trim($data['subject']);
-        } else {
+        }
+        else {
             $subject = trim( substr($firstline, 8) );
         }
 
         // Either way, remove this subject line from the template.
         $emailtext = substr($emailtext, strpos($emailtext, "\n"));
 
-    } elseif (isset($data['subject'])) {
+    }
+    elseif (isset($data['subject'])) {
         $subject = $data['subject'];
-    } else {
+    }
+    else {
         $PAGE->error_message ("We don't have a subject line for the email, so it wasn't sent.");
         return false;
     }
@@ -761,7 +808,9 @@ 
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
 
-    if (!$from) $from = CONTACTEMAIL;
+    if (!$from) {
+        $from = CONTACTEMAIL;
+    }
 
     $headers =
      "From: TheyWorkForYou <$from>\r\n" .
@@ -775,7 +824,8 @@ 
     if ($want_bounces) {
       $envelope_sender = twfy_verp_envelope_sender($to);
         $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
-    } else {
+    }
+    else {
         $success = mail ($to, $subject, $message, $headers);
     }
 
@@ -807,7 +857,8 @@ 
         while (list($key, $val) = each($a)) {
             $a[$key] = recursive_strip($val);
         }
-    } else {
+    }
+    else {
         $a = StripSlashes($a);
     }
     return $a;
@@ -853,17 +904,21 @@ 
     $rank = $rank + 0;
 
     # 11th, 12th, 13th use "th" not "st", "nd", "rd"
-    if (floor(($rank % 100) / 10) == 1)
-        return $rank . "th";
+    if (floor(($rank % 100) / 10) == 1) {
+            return $rank . "th";
+    }
     # 1st
-    if ($rank % 10 == 1)
-        return $rank . "st";
+    if ($rank % 10 == 1) {
+            return $rank . "st";
+    }
     # 2nd
-    if ($rank % 10 == 2)
-        return $rank . "nd";
+    if ($rank % 10 == 2) {
+            return $rank . "nd";
+    }
     # 3rd
-    if ($rank % 10 == 3)
-        return $rank . "rd";
+    if ($rank % 10 == 3) {
+            return $rank . "rd";
+    }
     # Everything else use th
 
     return $rank . "th";
@@ -871,8 +926,9 @@ 
 
 function make_plural($word, $number)
 {
-    if ($number == 1)
-        return $word;
+    if ($number == 1) {
+            return $word;
+    }
     return $word . "s";
 }
 
@@ -890,8 +946,7 @@ 
 function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = NULL) {
 
     // Case for Elizabeth II
-    if ($house == HOUSE_TYPE_ROYAL)
-    {
+    if ($house == HOUSE_TYPE_ROYAL) {
         return 'elizabeth_the_second';
     }
 
@@ -903,8 +958,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== NULL)
-    {
+    if ($pid !== NULL) {
         $out .= $pid . '/';
     }
 
@@ -912,8 +966,7 @@ 
     $out .= urlencode(str_replace($s2, $r, str_replace($s, $r, $name)));
 
     // If there is a constituency, inject that too
-    if ($const && $house == HOUSE_TYPE_COMMONS)
-    {
+    if ($const && $house == HOUSE_TYPE_COMMONS) {
         $out .= '/' . urlencode(str_replace($s2, $r, str_replace($s, $r, strtolower($const))));
     }
 
@@ -927,13 +980,22 @@ 
         if ($title) {
             $s = $title . ' ' . $s;
         }
-    } elseif ($house == HOUSE_TYPE_LORDS) {
+    }
+    elseif ($house == HOUSE_TYPE_LORDS) {
         $s = '';
-        if (!$family_name) $s = 'the ';
+        if (!$family_name) {
+            $s = 'the ';
+        }
         $s .= $title;
-        if ($family_name) $s .= ' ' . $family_name;
-        if ($lordofname) $s .= ' of ' . $lordofname;
-    } elseif ($house == HOUSE_TYPE_ROYAL) { # Queen
+        if ($family_name) {
+            $s .= ' ' . $family_name;
+        }
+        if ($lordofname) {
+            $s .= ' of ' . $lordofname;
+        }
+    }
+    elseif ($house == HOUSE_TYPE_ROYAL) {
+# Queen
         $s = "$given_name $family_name";
     }
     return $s;
@@ -962,12 +1024,18 @@ 
         'Lords in Waiting (HM Household)' => 'Government Whip',
         'Baronesses in Waiting, HM Household' => 'Government Whip',
     );
-    if ($pos) { # Government post, or Chairman of Select Committee
+    if ($pos) {
+# Government post, or Chairman of Select Committee
         $pretty = $pos;
-        if ($dept && $dept != 'No Department') $pretty .= ", $dept";
-        if (array_key_exists($pretty, $lookup))
-            $pretty = $lookup[$pretty];
-    } else { # Member of Select Committee
+        if ($dept && $dept != 'No Department') {
+            $pretty .= ", $dept";
+        }
+        if (array_key_exists($pretty, $lookup)) {
+                    $pretty = $lookup[$pretty];
+        }
+    }
+    else {
+# Member of Select Committee
         $pretty = "Member, $dept";
     }
     return $pretty;
@@ -985,13 +1053,16 @@ 
     }
 
     // single date?
-    if (isset($data['date'])) $one_date = true;
+    if (isset($data['date'])) {
+        $one_date = true;
+    }
 
     // remove empty entries, so they don't produce errors
     foreach (array_keys($hansardmajors) as $major) {
         if (array_key_exists($major, $data)) {
-            if (count($data[$major]) == 0)
-                unset($data[$major]);
+            if (count($data[$major]) == 0) {
+                            unset($data[$major]);
+            }
         }
     }
 
@@ -1000,22 +1071,33 @@ 
     if (!$one_date) {
         $todaystime = gmmktime(0, 0, 0, date('m'), date('d'), date('Y'));
         foreach ($data as $major => $array) {
-            if (!in_array('timestamp', $array)) $daytext[$major] = "The most recent ";
-            elseif ($todaystime - $array['timestamp'] == 86400) $daytext[$major] = "Yesterday&rsquo;s";
-            elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
-            else $daytext[$major] = "The most recent ";
+            if (!in_array('timestamp', $array)) {
+                $daytext[$major] = "The most recent ";
+            }
+            elseif ($todaystime - $array['timestamp'] == 86400) {
+                $daytext[$major] = "Yesterday&rsquo;s";
+            }
+            elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) {
+                $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
+            }
+            else {
+                $daytext[$major] = "The most recent ";
+            }
         }
     }
 
     //build html
     foreach ($printed_majors as $p_major) {
-        if (!array_key_exists($p_major, $data))
-            continue;
+        if (!array_key_exists($p_major, $data)) {
+                    continue;
+        }
 
-        if ($one_date)
-            $date = $data['date'];
-        else
-            $date = $data[$p_major]['hdate'];
+        if ($one_date) {
+                    $date = $data['date'];
+        }
+        else {
+                    $date = $data[$p_major]['hdate'];
+        }
         $q = $db->query('SELECT section_id, body, gid
                 FROM hansard, epobject
                 WHERE hansard.epobject_id = epobject.epobject_id '
@@ -1036,7 +1118,8 @@ 
                     $out .= '</ul>';
                 }
                 $out .= '<li>' . $body . '<ul>';
-            } else {
+            }
+            else {
                 $LISTURL->insert( array( 'id' => $gid ) );
                 $out .= '<li><a href="'.$LISTURL->generate().'">';
                 $out .= $body . '</a>';
@@ -1053,7 +1136,8 @@ 
 
     if ($echo) {
         print $html;
-    } else {
+    }
+    else {
         return $html;
     }
 }
@@ -1067,14 +1151,17 @@ 
     }
 
     $return .= '<a href="';
-    if (isset($data[$major]['listurl']))
-        $return .= $data[$major]['listurl'];
+    if (isset($data[$major]['listurl'])) {
+            $return .= $data[$major]['listurl'];
+    }
     else {
         $LISTURL->reset();
         $return .= $LISTURL->generate();
     }
     $return .= '">' . $hansardmajors[$major]['title'] . '</a>';
-    if (isset($daytext[$major])) $return;
+    if (isset($daytext[$major])) {
+        $return;
+    }
     $return .= '</h4>';
 
     return $return;
@@ -1082,20 +1169,27 @@ 
 
 function score_to_strongly($dmpscore) {
     $dmpdesc = "unknown about";
-    if ($dmpscore > 0.95 && $dmpscore <= 1.0)
-        $dmpdesc = "consistently voted against";
-    elseif ($dmpscore > 0.85)
-        $dmpdesc = "almost always voted against";
-    elseif ($dmpscore > 0.6)
-        $dmpdesc = "generally voted against";
-    elseif ($dmpscore > 0.4)
-        $dmpdesc = "voted a mixture of for and against";
-    elseif ($dmpscore > 0.15)
-        $dmpdesc = "generally voted for";
-    elseif ($dmpscore > 0.05)
-        $dmpdesc = "almost always voted for";
-    elseif ($dmpscore >= 0.0)
-        $dmpdesc = "consistently voted for";
+    if ($dmpscore > 0.95 && $dmpscore <= 1.0) {
+            $dmpdesc = "consistently voted against";
+    }
+    elseif ($dmpscore > 0.85) {
+            $dmpdesc = "almost always voted against";
+    }
+    elseif ($dmpscore > 0.6) {
+            $dmpdesc = "generally voted against";
+    }
+    elseif ($dmpscore > 0.4) {
+            $dmpdesc = "voted a mixture of for and against";
+    }
+    elseif ($dmpscore > 0.15) {
+            $dmpdesc = "generally voted for";
+    }
+    elseif ($dmpscore > 0.05) {
+            $dmpdesc = "almost always voted for";
+    }
+    elseif ($dmpscore >= 0.0) {
+            $dmpdesc = "consistently voted for";
+    }
     return $dmpdesc;
 }
 
@@ -1110,7 +1204,8 @@ 
 function redirect($url) {
     if (defined('TESTING')) {
         print "Location: $url";
-    } else {
+    }
+    else {
         header("Location: $url", true, 301);
     }
     exit;

classes/PolicyPositions.php

Doc Comments -1 removed lines

@@ -53,7 +53,6 @@
      *
      * @param Policies $policies The list of policies to get the positions for.
      * @param Member   $member   The member to get positions for.
-     * @param int      $limit    The number of policies to limit the list to.
      */
 
     public function __construct(Policies $policies, Member $member, $options = array())

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
                 if (!empty($dream_info)) {
                     $summary = '';
                     if (array_key_exists($policy[0], $this->summaries)) {
-                      $summary = $this->divisions->generateSummary($this->summaries[$policy[0]]);
+                        $summary = $this->divisions->generateSummary($this->summaries[$policy[0]]);
                     }
                     $this->positions[] = array(
                         'policy_id' => $policy[0],

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

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

Spacing +10 added lines, -10 removed lines

@@ -77,7 +77,7 @@ 
      * @param int $limit The number of results to limit the output to.
      */
 
-    private function getMemberPolicyPositions ($limit = NULL) {
+    private function getMemberPolicyPositions($limit = NULL) {
 
         // Make sure member info has actually been set.
         if (count($this->member->extra_info) === 0) {
@@ -112,7 +112,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;
                 }
 
@@ -145,7 +145,7 @@ 
 
             } else {
                 // We're over the policy limit, no sense still going, break out of the foreach.
-                break ;
+                break;
             }
         }
 
@@ -174,7 +174,7 @@ 
      *
      */
 
-    private function displayDreamComparison($dreamid, $policy_description, $inverse=false) {
+    private function displayDreamComparison($dreamid, $policy_description, $inverse = false) {
         $out = array();
 
         $extra_info = $this->member->extra_info();
@@ -194,7 +194,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;
@@ -225,7 +225,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';
             }
@@ -246,11 +246,11 @@ 
                 '" title="At The Guardian">well-known issues</a> <small>(from the Guardian)</small>';
         }
         if (
-            ( isset($extra_info['public_whip_division_attendance']) AND
-            $extra_info['public_whip_division_attendance'] != 'n/a' )
+            (isset($extra_info['public_whip_division_attendance']) AND
+            $extra_info['public_whip_division_attendance'] != 'n/a')
             OR
-            ( isset($extra_info['Lpublic_whip_division_attendance']) AND
-            $extra_info['Lpublic_whip_division_attendance'] != 'n/a' )
+            (isset($extra_info['Lpublic_whip_division_attendance']) AND
+            $extra_info['Lpublic_whip_division_attendance'] != 'n/a')
         ) {
             $record[] = '<a href="http://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/' .
                 $this->member->member_id() .

Braces +21 added lines, -13 removed lines

@@ -89,10 +89,10 @@ 
         $member_houses = $this->member->houses();
 
         // Determine the policy limit.
-        if ($limit !== NULL AND is_int($limit))
-        {
+        if ($limit !== NULL AND is_int($limit)) {
             $policy_limit = $limit;
-        } else {
+        }
+        else {
             $policy_limit = count($policies);
         }
 
@@ -105,8 +105,9 @@ 
         foreach ($policies as $policy) {
             // Are we still within the policy limit?
             if ($i < $policy_limit) {
-                if (isset($policy[2]) && $policy[2] && !in_array(HOUSE_TYPE_COMMONS, $member_houses))
-                    continue;
+                if (isset($policy[2]) && $policy[2] && !in_array(HOUSE_TYPE_COMMONS, $member_houses)) {
+                                    continue;
+                }
 
                 $dream_info = $this->displayDreamComparison($policy[0], $policy[1]);
 
@@ -143,7 +144,8 @@ 
                     $i++;
                 }
 
-            } else {
+            }
+            else {
                 // We're over the policy limit, no sense still going, break out of the foreach.
                 break ;
             }
@@ -183,10 +185,12 @@ 
             if ($extra_info["public_whip_dreammp${dreamid}_both_voted"] == 0) {
                 $consistency = 'has never voted on';
                 $dmpscore = -1;
-            } else {
+            }
+            else {
                 $dmpscore = floatval($extra_info["public_whip_dreammp${dreamid}_distance"]);
-                if ($inverse)
-                    $dmpscore = 1.0 - $dmpscore;
+                if ($inverse) {
+                                    $dmpscore = 1.0 - $dmpscore;
+                }
                 $consistency = score_to_strongly($dmpscore);
             }
             $has_strong = 0;
@@ -212,14 +216,17 @@ 
                 $entered_house[HOUSE_TYPE_COMMONS]['date'] > '2001-06-07'
             ) {
                 $since = '';
-            } elseif (!in_array(HOUSE_TYPE_COMMONS, $member_houses) AND
+            }
+            elseif (!in_array(HOUSE_TYPE_COMMONS, $member_houses) AND
                 in_array(HOUSE_TYPE_LORDS, $member_houses) AND
                 $entered_house[HOUSE_TYPE_LORDS]['date'] > '2001-06-07'
             ) {
                 $since = '';
-            } elseif ($this->member->isDead()) {
+            }
+            elseif ($this->member->isDead()) {
                 $since = '';
-            } else {
+            }
+            else {
                 $since = ' since 2001';
             }
             # If not current MP/Lord, but current MLA/MSP, need to say voting record is when MP
@@ -259,7 +266,8 @@ 
 
         if (count($record) > 0) {
             return 'More on ' . implode(' &amp; ', $record);
-        } else {
+        }
+        else {
             return '';
         }
     }

www/includes/easyparliament/member.php

Doc Comments +7 added lines

@@ -489,6 +489,10 @@ 
     public function house_text($house) {
         return $this->houses_pretty[$house];
     }
+
+    /**
+     * @return string
+     */
     public function constituency() { return $this->constituency; }
     public function party() { return $this->party; }
     public function party_text($party = null) {
@@ -607,6 +611,9 @@ 
         }
     }
 
+    /**
+     * @param string $direction
+     */
     private function _previous_future_mps_query($direction) {
         $entered_house = $this->entered_house(HOUSE_TYPE_COMMONS);
         if (is_null($entered_house)) return '';

Indentation +2 added lines, -2 removed lines

@@ -362,7 +362,7 @@ 
         $this->extra_info = array();
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
-                              array(':person_id' => $this->person_id));
+                                array(':person_id' => $this->person_id));
         for ($row=0; $row<$q->rows(); $row++) {
             $this->extra_info['office'][] = $q->row($row);
         }
@@ -450,7 +450,7 @@ 
         $q = $this->db->query('select bill_id,session,title,sum(attending) as a,sum(chairman) as c
             from pbc_members, bills
             where bill_id = bills.id and person_id = ' . $this->person_id()
-             . ' group by bill_id order by session desc');
+                . ' group by bill_id order by session desc');
         $this->extra_info['pbc'] = array();
         for ($i=0; $i<$q->rows(); $i++) {
             $bill_id = $q->field($i, 'bill_id');

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 class MEMBER {
 
@@ -112,15 +112,15 @@ 
 
         $this->house_disp = 0;
         $last_party = null;
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             $house          = $q->field($row, 'house');
             if (!in_array($house, $this->houses)) $this->houses[] = $house;
             $const          = $q->field($row, 'constituency');
-            $party		= $q->field($row, 'party');
-            $entered_house	= $q->field($row, 'entered_house');
-            $left_house	= $q->field($row, 'left_house');
-            $entered_reason	= $q->field($row, 'entered_reason');
-            $left_reason	= $q->field($row, 'left_reason');
+            $party = $q->field($row, 'party');
+            $entered_house = $q->field($row, 'entered_house');
+            $left_house = $q->field($row, 'left_house');
+            $entered_reason = $q->field($row, 'entered_reason');
+            $left_reason = $q->field($row, 'left_reason');
 
             if (!isset($this->entered_house[$house]) || $entered_house < $this->entered_house[$house]['date']) {
                 $this->entered_house[$house] = array(
@@ -140,22 +140,22 @@ 
                 );
             }
 
-            if ( $house==HOUSE_TYPE_ROYAL 					# The Monarch
-                || (!$this->house_disp && $house==HOUSE_TYPE_SCOTLAND)	# MSPs and
-                || (!$this->house_disp && $house==HOUSE_TYPE_NI)	# MLAs have lowest priority
-                || ($this->house_disp!=HOUSE_TYPE_LORDS && $house==HOUSE_TYPE_LORDS)	# Lords have highest priority
-                || (!$this->house_disp && $house==HOUSE_TYPE_COMMONS) # MPs
+            if ($house == HOUSE_TYPE_ROYAL 					# The Monarch
+                || (!$this->house_disp && $house == HOUSE_TYPE_SCOTLAND)	# MSPs and
+                || (!$this->house_disp && $house == HOUSE_TYPE_NI)	# MLAs have lowest priority
+                || ($this->house_disp != HOUSE_TYPE_LORDS && $house == HOUSE_TYPE_LORDS)	# Lords have highest priority
+                || (!$this->house_disp && $house == HOUSE_TYPE_COMMONS) # MPs
             ) {
                 $this->house_disp = $house;
                 $this->constituency = $const;
                 $this->party = $party;
 
-                $this->member_id	= $q->field($row, 'member_id');
-                $this->title		= $q->field($row, 'title');
+                $this->member_id = $q->field($row, 'member_id');
+                $this->title = $q->field($row, 'title');
                 $this->given_name = $q->field($row, 'given_name');
                 $this->family_name = $q->field($row, 'family_name');
                 $this->lordofname = $q->field($row, 'lordofname');
-                $this->person_id	= $q->field($row, 'person_id');
+                $this->person_id = $q->field($row, 'person_id');
             }
 
             if (($last_party && $party && $party != $last_party) || $left_reason == 'changed_party') {
@@ -199,13 +199,13 @@ 
         }
     }
 
-    public function postcode_to_person_id($postcode, $house=null) {
-        twfy_debug ('MP', "postcode_to_person_id converting postcode to person");
+    public function postcode_to_person_id($postcode, $house = null) {
+        twfy_debug('MP', "postcode_to_person_id converting postcode to person");
         $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($postcode));
         return $this->constituency_to_person_id($constituency, $house);
     }
 
-    public function constituency_to_person_id($constituency, $house=null) {
+    public function constituency_to_person_id($constituency, $house = null) {
         if ($constituency == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no constituency was found.');
         }
@@ -244,7 +244,7 @@ 
         }
     }
 
-    public function name_to_person_id($name, $const='') {
+    public function name_to_person_id($name, $const = '') {
         global $this_page;
         if ($name == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no name was found.');
@@ -294,7 +294,7 @@ 
 
         # More than one person ID matching the given name
         $person_ids = array();
-        for ($i=0; $i<$q->rows; ++$i) {
+        for ($i = 0; $i < $q->rows; ++$i) {
             $pid = $q->field($i, 'person_id');
             $person_ids[$pid] = 1;
         }
@@ -324,7 +324,7 @@ 
         $q = $this->db->query($q, $params);
         if ($q->rows > 1) {
             $person_ids = array();
-            for ($i=0; $i<$q->rows(); ++$i) {
+            for ($i = 0; $i < $q->rows(); ++$i) {
                 $person_ids[$q->field($i, 'person_id')] = $q->field($i, 'constituency');
             }
             throw new MySociety\TheyWorkForYou\MemberMultipleException($person_ids);
@@ -342,7 +342,7 @@ 
         global $THEUSER;
         if (is_object($THEUSER) && $THEUSER->postcode_is_set() && $this->current_member(1)) {
             $pc = $THEUSER->postcode();
-            twfy_debug ('MP', "set_users_mp converting postcode to person");
+            twfy_debug('MP', "set_users_mp converting postcode to person");
             $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
             if ($constituency == strtolower($this->constituency())) {
                 $this->the_users_mp = true;
@@ -363,7 +363,7 @@ 
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
                               array(':person_id' => $this->person_id));
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             $this->extra_info['office'][] = $q->row($row);
         }
 
@@ -418,9 +418,9 @@ 
 
         if (isset($this->extra_info['public_whip_attendrank'])) {
             $prefix = ($this->house(HOUSE_TYPE_LORDS) ? 'L' : '');
-            $this->extra_info[$prefix.'public_whip_division_attendance_rank'] = $this->extra_info['public_whip_attendrank'];
-            $this->extra_info[$prefix.'public_whip_division_attendance_rank_outof'] = $this->extra_info['public_whip_attendrank_outof'];
-            $this->extra_info[$prefix.'public_whip_division_attendance_quintile'] = floor($this->extra_info['public_whip_attendrank'] / ($this->extra_info['public_whip_attendrank_outof']+1) * 5);
+            $this->extra_info[$prefix . 'public_whip_division_attendance_rank'] = $this->extra_info['public_whip_attendrank'];
+            $this->extra_info[$prefix . 'public_whip_division_attendance_rank_outof'] = $this->extra_info['public_whip_attendrank_outof'];
+            $this->extra_info[$prefix . 'public_whip_division_attendance_quintile'] = floor($this->extra_info['public_whip_attendrank'] / ($this->extra_info['public_whip_attendrank_outof'] + 1) * 5);
         }
         if ($this->house(HOUSE_TYPE_LORDS) && isset($this->extra_info['public_whip_division_attendance'])) {
             $this->extra_info['Lpublic_whip_division_attendance'] = $this->extra_info['public_whip_division_attendance'];
@@ -428,7 +428,7 @@ 
         }
 
         if ($display && array_key_exists('register_member_interests_html', $this->extra_info) && ($this->extra_info['register_member_interests_html'] != '')) {
-            $args = array (
+            $args = array(
                 "sort" => "regexp_replace"
             );
             $GLOSSARY = new GLOSSARY($args);
@@ -436,7 +436,7 @@ 
         $GLOSSARY->glossarise($this->extra_info['register_member_interests_html']);
         }
 
-        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:'.$this->person_id.'%" and confirmed and not deleted');
+        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:' . $this->person_id . '%" and confirmed and not deleted');
         $this->extra_info['number_of_alerts'] = $q->field(0, 'c');
 
         if (isset($this->extra_info['reading_ease'])) {
@@ -452,16 +452,16 @@ 
             where bill_id = bills.id and person_id = ' . $this->person_id()
              . ' group by bill_id order by session desc');
         $this->extra_info['pbc'] = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $bill_id = $q->field($i, 'bill_id');
-            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor='.$bill_id.' and htype=10');
+            $c = $this->db->query('select count(*) as c from hansard where major=6 and minor=' . $bill_id . ' and htype=10');
             $c = $c->field(0, 'c');
             $title = $q->field($i, 'title');
             $attending = $q->field($i, 'a');
             $chairman = $q->field($i, 'c');
             $this->extra_info['pbc'][$bill_id] = array(
                 'title' => $title, 'session' => $q->field($i, 'session'),
-                'attending'=>$attending, 'chairman'=>($chairman>0), 'outof' => $c
+                'attending'=>$attending, 'chairman'=>($chairman > 0), 'outof' => $c
             );
         }
 
@@ -476,7 +476,7 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND))
+        if ($no_mp_title && ($this->house_disp == HOUSE_TYPE_COMMONS || $this->house_disp == HOUSE_TYPE_NI || $this->house_disp == HOUSE_TYPE_SCOTLAND))
             $title = '';
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
     }
@@ -509,9 +509,9 @@ 
     public function entered_house_text($entered_house) {
         if (!$entered_house) return '';
         list($year, $month, $day) = explode('-', $entered_house);
-        if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
+        if ($month == 1 && $day == 1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             return $year;
         } elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
@@ -531,7 +531,7 @@ 
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
         } else {
@@ -633,7 +633,7 @@ 
             $name = $q->field($r, 'given_name') . ' ' . $q->field($r, 'family_name');
             if ($last_pid != $pid) {
                 $mships[] = array(
-                    'href' => WEBPATH . 'mp/?pid='.$pid,
+                    'href' => WEBPATH . 'mp/?pid=' . $pid,
                     'text' => $name
                 );
                 $last_pid = $pid;

Braces +116 added lines, -60 removed lines

@@ -71,15 +71,19 @@ 
         $person_id = '';
         if (isset($args['member_id']) && is_numeric($args['member_id'])) {
             $person_id = $this->member_id_to_person_id($args['member_id']);
-        } elseif (isset($args['name'])) {
+        }
+        elseif (isset($args['name'])) {
             $con = isset($args['constituency']) ? $args['constituency'] : '';
             $person_id = $this->name_to_person_id($args['name'], $con);
-        } elseif (isset($args['constituency'])) {
+        }
+        elseif (isset($args['constituency'])) {
             $still_in_office = isset($args['still_in_office']) ? $args['still_in_office'] : false;
             $person_id = $this->constituency_to_person_id($args['constituency'], $house, $still_in_office);
-        } elseif (isset($args['postcode'])) {
+        }
+        elseif (isset($args['postcode'])) {
             $person_id = $this->postcode_to_person_id($args['postcode'], $house);
-        } elseif (isset($args['person_id']) && is_numeric($args['person_id'])) {
+        }
+        elseif (isset($args['person_id']) && is_numeric($args['person_id'])) {
             $person_id = $args['person_id'];
             $q = $this->db->query("SELECT gid_to FROM gidredirect
                     WHERE gid_from = :gid_from",
@@ -114,7 +118,9 @@ 
         $last_party = null;
         for ($row=0; $row<$q->rows(); $row++) {
             $house          = $q->field($row, 'house');
-            if (!in_array($house, $this->houses)) $this->houses[] = $house;
+            if (!in_array($house, $this->houses)) {
+                $this->houses[] = $house;
+            }
             $const          = $q->field($row, 'constituency');
             $party		= $q->field($row, 'party');
             $entered_house	= $q->field($row, 'entered_house');
@@ -194,7 +200,8 @@ 
         }
         if ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no member with a member ID of "' . _htmlentities($member_id) . '".');
         }
     }
@@ -215,7 +222,9 @@ 
         }
 
         $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-        if ($normalised) $constituency = $normalised;
+        if ($normalised) {
+            $constituency = $normalised;
+        }
 
         $params = array();
 
@@ -239,7 +248,8 @@ 
 
         if ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no current member for the "' . _htmlentities(ucwords($constituency)) . '" constituency.');
         }
     }
@@ -254,10 +264,12 @@ 
         $q = "SELECT person_id FROM person_names WHERE type = 'name' ";
         if ($this_page == 'peer') {
             $success = preg_match('#^(.*?) (.*?) of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
+            }
+            if (!$success) {
+                            $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -265,10 +277,12 @@ 
             $params[':family_name'] = $m[2];
             $params[':lordofname'] = $m[3];
             $q .= "AND title = :title AND family_name = :family_name AND lordofname = :lordofname";
-        } elseif ($this_page == 'msp' || $this_page == 'mla' || strstr($this_page, 'mp')) {
+        }
+        elseif ($this_page == 'msp' || $this_page == 'mla' || strstr($this_page, 'mp')) {
             $success = preg_match('#^(.*?) (.*?) (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -288,7 +302,8 @@ 
         $q = $this->db->query($q, $params);
         if (!$q->rows) {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, we could not find anyone with that name.');
-        } elseif ($q->rows == 1) {
+        }
+        elseif ($q->rows == 1) {
             return $q->field(0, 'person_id');
         }
 
@@ -303,13 +318,17 @@ 
         $params = array();
         if ($this_page == 'peer') {
             $params[':house'] = HOUSE_TYPE_LORDS;
-        } elseif ($this_page == 'msp') {
+        }
+        elseif ($this_page == 'msp') {
             $params[':house'] = HOUSE_TYPE_SCOTLAND;
-        } elseif ($this_page == 'mla') {
+        }
+        elseif ($this_page == 'mla') {
             $params[':house'] = HOUSE_TYPE_NI;
-        } elseif ($this_page == 'royal') {
+        }
+        elseif ($this_page == 'royal') {
             $params[':house'] = HOUSE_TYPE_ROYAL;
-        } else {
+        }
+        else {
             $params[':house'] = HOUSE_TYPE_COMMONS;
         }
 
@@ -328,11 +347,14 @@ 
                 $person_ids[$q->field($i, 'person_id')] = $q->field($i, 'constituency');
             }
             throw new MySociety\TheyWorkForYou\MemberMultipleException($person_ids);
-        } elseif ($q->rows > 0) {
+        }
+        elseif ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } elseif ($const) {
+        }
+        elseif ($const) {
             return $this->name_to_person_id($name);
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no current member with that name.');
         }
     }
@@ -403,16 +425,21 @@ 
         if (array_key_exists('public_whip_rebellions', $this->extra_info)) {
             $rebellions = $this->extra_info['public_whip_rebellions'];
             $rebel_desc = "<unknown>";
-            if ($rebellions == 0)
-                $rebel_desc = "never";
-            elseif ($rebellions <= 1)
-                $rebel_desc = "hardly ever";
-            elseif ($rebellions <= 3)
-                $rebel_desc = "occasionally";
-            elseif ($rebellions <= 5)
-                $rebel_desc = "sometimes";
-            elseif ($rebellions > 5)
-                $rebel_desc = "quite often";
+            if ($rebellions == 0) {
+                            $rebel_desc = "never";
+            }
+            elseif ($rebellions <= 1) {
+                            $rebel_desc = "hardly ever";
+            }
+            elseif ($rebellions <= 3) {
+                            $rebel_desc = "occasionally";
+            }
+            elseif ($rebellions <= 5) {
+                            $rebel_desc = "sometimes";
+            }
+            elseif ($rebellions > 5) {
+                            $rebel_desc = "quite often";
+            }
             $this->extra_info['public_whip_rebel_description'] = $rebel_desc;
         }
 
@@ -476,8 +503,9 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND))
-            $title = '';
+        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND)) {
+                    $title = '';
+        }
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
     }
     public function houses() {
@@ -493,48 +521,62 @@ 
     public function party() { return $this->party; }
     public function party_text($party = null) {
         global $parties;
-        if (!$party)
-            $party = $this->party;
+        if (!$party) {
+                    $party = $this->party;
+        }
         if (isset($parties[$party])) {
             return $parties[$party];
-        } else {
+        }
+        else {
             return $party;
         }
     }
 
     public function entered_house($house = 0) {
-        if ($house) return array_key_exists($house, $this->entered_house) ? $this->entered_house[$house] : null;
+        if ($house) {
+            return array_key_exists($house, $this->entered_house) ? $this->entered_house[$house] : null;
+        }
         return $this->entered_house;
     }
     public function entered_house_text($entered_house) {
-        if (!$entered_house) return '';
+        if (!$entered_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $entered_house);
         if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        }
+        elseif ($month==0 && $day==0) {
             return $year;
-        } elseif (checkdate($month, $day, $year) && $year != '9999') {
+        }
+        elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
-        } else {
+        }
+        else {
             return "n/a";
         }
     }
 
     public function left_house($house = null) {
-        if (!is_null($house))
-            return array_key_exists($house, $this->left_house) ? $this->left_house[$house] : null;
+        if (!is_null($house)) {
+                    return array_key_exists($house, $this->left_house) ? $this->left_house[$house] : null;
+        }
         return $this->left_house;
     }
 
     public function left_house_text($left_house) {
-        if (!$left_house) return '';
+        if (!$left_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        }
+        elseif ($month==0 && $day==0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
-        } else {
+        }
+        else {
             return "n/a";
         }
     }
@@ -543,7 +585,8 @@ 
     public function entered_reason_text($entered_reason) {
         if (isset($this->reasons[$entered_reason])) {
             return $this->reasons[$entered_reason];
-        } else {
+        }
+        else {
             return $entered_reason;
         }
     }
@@ -557,13 +600,16 @@ 
                 $max = $q->field(0, 'max');
                 if ($max == $left_house) {
                     return $left_reason[0];
-                } else {
+                }
+                else {
                     return $left_reason[1];
                 }
-            } else {
+            }
+            else {
                 return $left_reason;
             }
-        } else {
+        }
+        else {
             return $left_reason;
         }
     }
@@ -576,7 +622,9 @@ 
             $lh = $this->left_house($h);
             $current[$h] = ($lh['date'] == '9999-12-31');
         }
-        if ($house) return $current[$house];
+        if ($house) {
+            return $current[$house];
+        }
         return $current;
     }
 
@@ -586,13 +634,17 @@ 
         $house = $this->house_disp;
         if ($house == HOUSE_TYPE_COMMONS) {
             $URL = new URL('mp');
-        } elseif ($house == HOUSE_TYPE_LORDS) {
+        }
+        elseif ($house == HOUSE_TYPE_LORDS) {
             $URL = new URL('peer');
-        } elseif ($house == HOUSE_TYPE_NI) {
+        }
+        elseif ($house == HOUSE_TYPE_NI) {
             $URL = new URL('mla');
-        } elseif ($house == HOUSE_TYPE_SCOTLAND) {
+        }
+        elseif ($house == HOUSE_TYPE_SCOTLAND) {
             $URL = new URL('msp');
-        } elseif ($house == HOUSE_TYPE_ROYAL) {
+        }
+        elseif ($house == HOUSE_TYPE_ROYAL) {
             $URL = new URL('royal');
         }
         $member_url = make_member_url($this->full_name(true), $this->constituency(), $house, $this->person_id());
@@ -602,17 +654,21 @@ 
                 $protocol = 'http://';
             }
             return $protocol . DOMAIN . $URL->generate('none') . $member_url;
-        } else {
+        }
+        else {
             return $URL->generate('none') . $member_url;
         }
     }
 
     private function _previous_future_mps_query($direction) {
         $entered_house = $this->entered_house(HOUSE_TYPE_COMMONS);
-        if (is_null($entered_house)) return '';
+        if (is_null($entered_house)) {
+            return '';
+        }
         if ($direction == '>') {
             $order = '';
-        } else {
+        }
+        else {
             $order = 'DESC';
         }
         $q = $this->db->query('SELECT *

classes/FacebookLogin.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
         return $this->fb;
     }
 
+    /**
+     * @return string
+     */
     public function getLoginURL() {
         $helper = $this->getFacebookObject()->getRedirectLoginHelper();
         $permissions = ['email'];

Indentation +24 added lines, -24 removed lines

@@ -13,11 +13,11 @@ 
 
     public function getFacebookObject() {
         if (!isset($this->fb)) {
-          $this->fb = new \Facebook\Facebook([
+            $this->fb = new \Facebook\Facebook([
             'app_id' => FACEBOOK_APP_ID,
             'app_secret' => FACEBOOK_APP_SECRET,
             'default_graph_version' => 'v2.2',
-          ]);
+            ]);
         }
 
         return $this->fb;
@@ -30,46 +30,46 @@ 
     }
 
     public function handleFacebookRedirect() {
-      $helper = $this->getFacebookObject()->getRedirectLoginHelper();
+        $helper = $this->getFacebookObject()->getRedirectLoginHelper();
 
-      $data = array('login_url' => $this->getLoginURL());
+        $data = array('login_url' => $this->getLoginURL());
 
-      try {
+        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;
-      }
+        }
 
-      $token = $this->checkAccessToken($accessToken);
+        $token = $this->checkAccessToken($accessToken);
 
-      if ($token) {
-          return array('token' => $token);
-      } else {
-          $data['error'] = 'Problem getting Facebook token';
-          return $data;
-      }
+        if ($token) {
+            return array('token' => $token);
+        } else {
+            $data['error'] = 'Problem getting Facebook token';
+            return $data;
+        }
     }
 
 
     private function checkAccessToken($accessToken) {
-      if (!isset($accessToken)) {
-          return False;
-      }
+        if (!isset($accessToken)) {
+            return False;
+        }
 
-      if (! $accessToken->isLongLived()) {
+        if (! $accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
-          $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
+            $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+            return False;
+        }
         }
-      }
 
-      return $accessToken;
+        return $accessToken;
     }
 
     public function loginUser($accessToken) {
@@ -158,7 +158,7 @@ 
             'optin' => $THEUSER->optin(),
             'emailpublic' => False,
             'password' => '',
-         );
+            );
 
         $THEUSER->update_self_no_confirm($details);
     }

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

@@ -57,7 +57,7 @@ 
 
     private function checkAccessToken($accessToken) {
       if (!isset($accessToken)) {
-          return False;
+          return false;
       }
 
       if (! $accessToken->isLongLived()) {
@@ -65,7 +65,7 @@ 
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+          return false;
         }
       }
 
@@ -86,7 +86,7 @@ 
         $expires = intval($accessToken->getExpiresAt()->format('U'));
         twfy_debug("THEUSER", "Facebook access token expires at " . $expires);
 
-        $success = False;
+        $success = false;
         if ($user_id) {
             twfy_debug("THEUSER", "Faceook user exists in the database: " . $user_id);
             $success = $THEUSER->init($user_id);
@@ -112,7 +112,7 @@ 
             return $logged_in;
         }
 
-        return False;
+        return false;
     }
 
     public function createUser($accessToken, $user) {
@@ -128,9 +128,9 @@ 
             'url' => '',
             'status' => '',
             'password' => '',
-            'optin' => False,
-            'emailpublic' => False,
-            'mp_alert' => False,
+            'optin' => false,
+            'emailpublic' => false,
+            'mp_alert' => false,
             'facebook_id' => $user['id']
         );
         $added = $THEUSER->add($details, false);
@@ -156,7 +156,7 @@ 
             'postcode' => $THEUSER->postcode(),
             'url' => $THEUSER->url(),
             'optin' => $THEUSER->optin(),
-            'emailpublic' => False,
+            'emailpublic' => false,
             'password' => '',
          );
 

Spacing +3 added lines, -3 removed lines

@@ -36,10 +36,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;
       }
@@ -60,7 +60,7 @@ 
           return False;
       }
 
-      if (! $accessToken->isLongLived()) {
+      if (!$accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
 
       if ($token) {
           return array('token' => $token);
-      } else {
+      }
+      else {
           $data['error'] = 'Problem getting Facebook token';
           return $data;
       }
@@ -95,7 +96,8 @@ 
                 $THEUSER->add_facebook_id($user['id']);
             }
             twfy_debug("THEUSER", "inited user has id : " . $THEUSER->user_id());
-        } else {
+        }
+        else {
             twfy_debug("THEUSER", "Faceook user does not exist in the database");
             $success = $this->createUser($accessToken, $user);
         }

classes/Model/Featured.php

Doc Comments +8 added lines

@@ -52,6 +52,11 @@ 
         $this->_set('featured_related', $related);
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     private function _get($key) {
         $text = NULL;
 
@@ -72,6 +77,9 @@ 
         return $text;
     }
 
+    /**
+     * @param string $key
+     */
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
             $value = NULL;

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q->rows) {
             $text = $q->field(0, '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;

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

@@ -53,7 +53,7 @@ 
     }
 
     private function _get($key) {
-        $text = NULL;
+        $text = null;
 
         $q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",
@@ -65,7 +65,7 @@ 
         if ($q->rows) {
             $text = $q->field(0, 'value');
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
         }
 
@@ -74,7 +74,7 @@ 
 
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
-            $value = NULL;
+            $value = null;
         }
         $check_q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",

Braces +2 added lines, -1 removed lines

@@ -89,7 +89,8 @@
                     ':value' => $value
                 )
             );
-        } else {
+        }
+        else {
             $set_q = $this->db->query("INSERT INTO editorial (item, value ) VALUES (:key, :value)",
                 array(
                     ':key' => $key,

www/includes/test/utility_test.php

Indentation +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 
 class UtilityTest extends UnitTestCase{
 
-  public function testVerpEnvelopeSenderCanCreateStandardSender() {
+    public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
     $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
-  }
+    }
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -3,18 +3,18 @@
  * SimpleTest tests for the functions in utility.php
  * $Id: utility_test.php,v 1.3 2009-06-25 12:23:58 louise Exp $
  */
-error_reporting (E_ALL);
+error_reporting(E_ALL);
 ini_set("display_errors", 1);
 include_once dirname(__FILE__) . '/../../../conf/general';
 include_once '../utility.php';
 include_once 'simpletest/unit_tester.php';
 include_once 'simpletest/reporter.php';
 
-class UtilityTest extends UnitTestCase{
+class UtilityTest extends UnitTestCase {
 
   public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
-    $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
+    $expected_sender = 'twfy+aperson=a.nother.dom@' +EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
   }