mysociety / theyworkforyou

classes/Divisions.php

Indentation +67 added lines, -67 removed lines

@@ -38,25 +38,25 @@ 
     }
 
     public static function getMostRecentDivisionDate() {
-      $db = new \ParlDB;
-      $q = $db->query(
+        $db = new \ParlDB;
+        $q = $db->query(
         "SELECT policy_id, max(division_date) as recent from policydivisions GROUP BY policy_id"
-      );
+        );
 
-      $policy_maxes = array();
-      $row_count = $q->rows();
-      for ($n = 0; $n < $row_count; $n++) {
+        $policy_maxes = array();
+        $row_count = $q->rows();
+        for ($n = 0; $n < $row_count; $n++) {
         $policy_maxes[$q->field($n, 'policy_id')] = $q->field( $n, 'recent' );
-      }
-      $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
-      return $policy_maxes;
+        }
+        $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
+        return $policy_maxes;
     }
 
     public function getRecentDivisions($number = 20) {
         // Grab distinct divisions as sometimes we have the same division for more than one policy
         // and we don't want to display it twice
         $q = $this->db->query(
-          "SELECT distinct division_id, division_title, yes_text, no_text, division_date, division_number, gid, direction, majority_vote,
+            "SELECT distinct division_id, division_title, yes_text, no_text, division_date, division_number, gid, direction, majority_vote,
           yes_total, no_total, absent_total, both_total
           FROM policydivisions ORDER BY division_date DESC, division_number DESC LIMIT :count",
             array(
@@ -94,7 +94,7 @@ 
         $divisions = array();
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
+            $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
         }
 
         return $divisions;
@@ -148,44 +148,44 @@ 
 
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          $policy_id = $q->field($n, 'policy_id');
+            $policy_id = $q->field($n, 'policy_id');
 
-          if (!array_key_exists($policy_id, $policy_divisions)) {
+            if (!array_key_exists($policy_id, $policy_divisions)) {
             $summary = array(
-              'max' => $q->field($n, 'latest'),
-              'min' => $q->field($n, 'earliest'),
-              'total' => $q->field($n, 'total'),
-              'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
+                'max' => $q->field($n, 'latest'),
+                'min' => $q->field($n, 'earliest'),
+                'total' => $q->field($n, 'total'),
+                'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
             );
 
             $policy_divisions[$policy_id] = $summary;
-          }
-
-          $summary = $policy_divisions[$policy_id];
-
-          $summary['total'] += $q->field($n, 'total');
-          if ($summary['max'] < $q->field($n, 'latest')) {
-              $summary['max'] = $q->field($n, 'latest');
-          }
-          if ($summary['min'] > $q->field($n, 'latest')) {
-              $summary['min'] = $q->field($n, 'latest');
-          }
-
-          $vote = $q->field($n, 'vote');
-          $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
-          if ( $vote == 'absent' ) {
-              $summary['absent'] += $q->field($n, 'total');
-          } else if ( $vote == 'both' ) {
-              $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
-              $summary['tell'] += $q->field($n, 'total');
-          } else if ( $policy_vote == $vote ) {
-              $summary['for'] += $q->field($n, 'total');
-          } else if ( $policy_vote != $vote ) {
-              $summary['against'] += $q->field($n, 'total');
-          }
-
-          $policy_divisions[$policy_id] = $summary;
+            }
+
+            $summary = $policy_divisions[$policy_id];
+
+            $summary['total'] += $q->field($n, 'total');
+            if ($summary['max'] < $q->field($n, 'latest')) {
+                $summary['max'] = $q->field($n, 'latest');
+            }
+            if ($summary['min'] > $q->field($n, 'latest')) {
+                $summary['min'] = $q->field($n, 'latest');
+            }
+
+            $vote = $q->field($n, 'vote');
+            $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
+            if ( $vote == 'absent' ) {
+                $summary['absent'] += $q->field($n, 'total');
+            } else if ( $vote == 'both' ) {
+                $summary['both'] += $q->field($n, 'total');
+            } else if ( strpos($vote, 'tell') !== FALSE ) {
+                $summary['tell'] += $q->field($n, 'total');
+            } else if ( $policy_vote == $vote ) {
+                $summary['for'] += $q->field($n, 'total');
+            } else if ( $policy_vote != $vote ) {
+                $summary['against'] += $q->field($n, 'total');
+            }
+
+            $policy_divisions[$policy_id] = $summary;
         }
 
         return $policy_divisions;
@@ -219,17 +219,17 @@ 
         );
 
         $votes = array(
-          'yes_votes' => array(),
-          'no_votes' => array(),
-          'absent_votes' => array(),
-          'both_votes' => array()
+            'yes_votes' => array(),
+            'no_votes' => array(),
+            'absent_votes' => array(),
+            'both_votes' => array()
         );
 
         foreach ($q->data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => $vote['given_name'] . ' ' . $vote['family_name'],
-              'teller' => false
+                'person_id' => $vote['person_id'],
+                'name' => $vote['given_name'] . ' ' . $vote['family_name'],
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== FALSE) {
@@ -237,13 +237,13 @@ 
             }
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
-              $votes['yes_votes'][] = $detail;
+                $votes['yes_votes'][] = $detail;
             } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
-              $votes['no_votes'][] = $detail;
+                $votes['no_votes'][] = $detail;
             } else if ($vote['vote'] == 'absent') {
-              $votes['absent_votes'][] = $detail;
+                $votes['absent_votes'][] = $detail;
             } else if ($vote['vote'] == 'both') {
-              $votes['both_votes'][] = $detail;
+                $votes['both_votes'][] = $detail;
             }
 
         }
@@ -338,11 +338,11 @@ 
         $divisions = array();
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          if ($context == 'Parliament') {
-              $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
-          } else {
-              $divisions[] = $this->getDivisionDetails($q->row($n));
-          }
+            if ($context == 'Parliament') {
+                $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
+            } else {
+                $divisions[] = $this->getDivisionDetails($q->row($n));
+            }
         }
 
         return $divisions;
@@ -444,13 +444,13 @@ 
 
         $division['mp_vote'] = '';
         if (array_key_exists('vote', $row)) {
-          $mp_vote = ' was absent';
-          if ($row['vote'] == 'aye') {
-              $mp_vote = 'voted in favour';
-          } else if ($row['vote'] == 'no') {
-              $mp_vote = 'voted against';
-          }
-          $division['mp_vote'] = $mp_vote;
+            $mp_vote = ' was absent';
+            if ($row['vote'] == 'aye') {
+                $mp_vote = 'voted in favour';
+            } else if ($row['vote'] == 'no') {
+                $mp_vote = 'voted against';
+            }
+            $division['mp_vote'] = $mp_vote;
         }
         $division['division_title'] = $row['division_title'];
         $division['vote'] = $vote;

Spacing +29 added lines, -29 removed lines

@@ -46,7 +46,7 @@ 
       $policy_maxes = array();
       $row_count = $q->rows();
       for ($n = 0; $n < $row_count; $n++) {
-        $policy_maxes[$q->field($n, 'policy_id')] = $q->field( $n, 'recent' );
+        $policy_maxes[$q->field($n, 'policy_id')] = $q->field($n, 'recent');
       }
       $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
       return $policy_maxes;
@@ -117,7 +117,7 @@ 
     public function getMemberDivisionsForPolicy($policyID = null) {
         $where_extra = '';
         $args = array(':person_id' => $this->member->person_id);
-        if ( $policyID ) {
+        if ($policyID) {
             $where_extra = 'AND policy_id = :policy_id';
             $args[':policy_id'] = $policyID;
         }
@@ -173,15 +173,15 @@ 
 
           $vote = $q->field($n, 'vote');
           $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
-          if ( $vote == 'absent' ) {
+          if ($vote == 'absent') {
               $summary['absent'] += $q->field($n, 'total');
-          } else if ( $vote == 'both' ) {
+          } else if ($vote == 'both') {
               $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if (strpos($vote, 'tell') !== FALSE) {
               $summary['tell'] += $q->field($n, 'total');
-          } else if ( $policy_vote == $vote ) {
+          } else if ($policy_vote == $vote) {
               $summary['for'] += $q->field($n, 'total');
-          } else if ( $policy_vote != $vote ) {
+          } else if ($policy_vote != $vote) {
               $summary['against'] += $q->field($n, 'total');
           }
 
@@ -228,7 +228,7 @@ 
         foreach ($q->data as $vote) {
             $detail = array(
               'person_id' => $vote['person_id'],
-              'name' => $vote['given_name'] . ' ' . $vote['family_name'],
+              'name' => $vote['given_name'].' '.$vote['family_name'],
               'teller' => false
             );
 
@@ -280,20 +280,20 @@ 
         $min = $votes['min'];
 
         $actions = array(
-            $votes['for'] . ' ' . make_plural('vote', $votes['for']) . ' for',
-            $votes['against'] . ' ' . make_plural('vote', $votes['against']) . ' against'
+            $votes['for'].' '.make_plural('vote', $votes['for']).' for',
+            $votes['against'].' '.make_plural('vote', $votes['against']).' against'
         );
 
-        if ( $votes['both'] ) {
-            $actions[] = $votes['both'] . ' ' . make_plural('abstention', $votes['both']);
+        if ($votes['both']) {
+            $actions[] = $votes['both'].' '.make_plural('abstention', $votes['both']);
         }
-        if ( $votes['absent'] ) {
-            $actions[] = $votes['absent'] . ' ' . make_plural('absence', $votes['absent']);
+        if ($votes['absent']) {
+            $actions[] = $votes['absent'].' '.make_plural('absence', $votes['absent']);
         }
         if ($max == $min) {
-            return join(', ', $actions) . ', in ' . $max;
+            return join(', ', $actions).', in '.$max;
         } else {
-            return join(', ', $actions) . ', between ' . $min . '&ndash;' . $max;
+            return join(', ', $actions).', between '.$min.'&ndash;'.$max;
         }
     }
 
@@ -351,7 +351,7 @@ 
 
     private function constructYesNoVoteDescription($direction, $title, $short_text) {
         $text = ' voted ';
-        if ( $short_text ) {
+        if ($short_text) {
             $text .= $short_text;
         } else {
             $text .= "$direction on <em>$title</em>";
@@ -369,7 +369,7 @@ 
          * votes so we need to generate some text using the title of the division
          */
 
-        switch ( strtolower($vote) ) {
+        switch (strtolower($vote)) {
             case 'yes':
             case 'aye':
                 $description = $this->constructYesNoVoteDescription('yes', $division_title, $yes_text);
@@ -378,15 +378,15 @@ 
                 $description = $this->constructYesNoVoteDescription('no', $division_title, $no_text);
                 break;
             case 'absent':
-                $description = ' was absent for a vote on <em>' . $division_title . '</em>';
+                $description = ' was absent for a vote on <em>'.$division_title.'</em>';
                 break;
             case 'both':
-                $description = ' abstained on a vote on <em>' . $division_title . '</em>';
+                $description = ' abstained on a vote on <em>'.$division_title.'</em>';
                 break;
             case 'tellyes':
             case 'tellno':
             case 'tellaye':
-                $description = ' acted as teller for a vote on <em>' . $division_title . '</em>';
+                $description = ' acted as teller for a vote on <em>'.$division_title.'</em>';
                 break;
             default:
                 $description = $division_title;
@@ -399,7 +399,7 @@ 
         $division = array();
 
         $direction = $row['direction'];
-        if ( strpos( $direction, 'strong') !== FALSE ) {
+        if (strpos($direction, 'strong') !== FALSE) {
             $division['strong'] = TRUE;
         } else {
             $division['strong'] = FALSE;
@@ -455,7 +455,7 @@ 
         $division['division_title'] = $row['division_title'];
         $division['vote'] = $vote;
 
-        $division['summary'] = $row['yes_total'] . ' for, ' . $row['no_total'] . ' against, ' . $row['absent_total'] . ' absent';
+        $division['summary'] = $row['yes_total'].' for, '.$row['no_total'].' against, '.$row['absent_total'].' absent';
         $division['for'] = $row['yes_total'];
         $division['against'] = $row['no_total'];
         $division['both'] = $row['both_total'];
@@ -471,24 +471,24 @@ 
         for ($n = 0; $n < $row_count; $n++) {
             $policy_id = $q->field($n, 'policy_id');
 
-            if ( !array_key_exists($policy_id, $policies) ) {
+            if (!array_key_exists($policy_id, $policies)) {
                 $policies[$policy_id] = array(
                     'policy_id' => $policy_id,
                     'weak_count' => 0,
                     'divisions' => array()
                 );
-                if ( $this->policies ) {
+                if ($this->policies) {
                     $policies[$policy_id]['desc'] = $this->policies->getPolicies()[$policy_id];
                     $policies[$policy_id]['header'] = $this->policies->getPolicyDetails($policy_id);
                 }
-                if ( $this->positions ) {
+                if ($this->positions) {
                     $policies[$policy_id]['position'] = $this->positions->positionsById[$policy_id];
                 }
             }
 
             $division = $this->getDivisionDetails($q->row($n));
 
-            if ( !$division['strong'] ) {
+            if (!$division['strong']) {
                 $policies[$policy_id]['weak_count']++;
             }
 
@@ -503,9 +503,9 @@ 
 
         $gid = get_canonical_gid($gid);
 
-        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array( ':gid' => $gid ));
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array(':gid' => $gid));
         $parent_gid = $q->field(0, 'gid');
-        if ( !$parent_gid ) {
+        if (!$parent_gid) {
             return '';
         }
         $parent_gid = fix_gid_from_db($parent_gid);

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

@@ -29,7 +29,7 @@ 
      * @param Member   $member   The member to get positions for.
      */
 
-    public function __construct(Member $member = NULL, PolicyPositions $positions = NULL, Policies $policies = NULL)
+    public function __construct(Member $member = null, PolicyPositions $positions = null, Policies $policies = null)
     {
         $this->member = $member;
         $this->positions = $positions;
@@ -177,7 +177,7 @@ 
               $summary['absent'] += $q->field($n, 'total');
           } else if ( $vote == 'both' ) {
               $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if ( strpos($vote, 'tell') !== false ) {
               $summary['tell'] += $q->field($n, 'total');
           } else if ( $policy_vote == $vote ) {
               $summary['for'] += $q->field($n, 'total');
@@ -232,7 +232,7 @@ 
               'teller' => false
             );
 
-            if (strpos($vote['vote'], 'tell') !== FALSE) {
+            if (strpos($vote['vote'], 'tell') !== false) {
                 $detail['teller'] = true;
             }
 
@@ -399,10 +399,10 @@ 
         $division = array();
 
         $direction = $row['direction'];
-        if ( strpos( $direction, 'strong') !== FALSE ) {
-            $division['strong'] = TRUE;
+        if ( strpos( $direction, 'strong') !== false ) {
+            $division['strong'] = true;
         } else {
-            $division['strong'] = FALSE;
+            $division['strong'] = false;
         }
 
         $division['division_id'] = $row['division_id'];

classes/Party.php

Spacing +25 added lines, -25 removed lines

@@ -20,7 +20,7 @@ 
     public function __construct($name) {
         // treat Labour and Labour/Co-operative the same as that's how
         // people view them and it'll confuse the results otherwise
-        if ( $name == 'Labour/Co-operative' ) {
+        if ($name == 'Labour/Co-operative') {
             $name = 'Labour';
         }
         $this->name = $name;
@@ -42,7 +42,7 @@ 
                 ':date' => date('Y-m-d'),
             )
         );
-        if ( $member_count->rows ) {
+        if ($member_count->rows) {
             $num_members = $member_count->field(0, 'num_members');
             return $num_members;
         } else {
@@ -70,12 +70,12 @@ 
             )
         );
 
-        if ( $position->rows ) {
+        if ($position->rows) {
             $score = $position->field(0, 'score');
             $score_desc = score_to_strongly($score);
 
-            if ( $want_score ) {
-                return array( $score_desc, $score);
+            if ($want_score) {
+                return array($score_desc, $score);
             } else {
                 return $score_desc;
             }
@@ -114,7 +114,7 @@ 
             ':party' => $this->name
         );
 
-        if ( $this->name == 'Labour' ) {
+        if ($this->name == 'Labour') {
             $party_where = '( party = :party OR party = :party2 )';
             $params = array(
                 ':party' => $this->name,
@@ -122,7 +122,7 @@ 
             );
         }
 
-        for ( $i = 0; $i < $num_divs; $i++ ) {
+        for ($i = 0; $i < $num_divs; $i++) {
             $division_id = $divisions->field($i, 'division_id');
             $weights = $this->get_vote_scores($divisions->field($i, 'policy_vote'));
 
@@ -142,42 +142,42 @@ 
             );
 
             $num_votes = 0;
-            for ( $j = 0; $j < $votes->rows(); $j++ ) {
+            for ($j = 0; $j < $votes->rows(); $j++) {
                 $vote_dir = $votes->field($j, 'vote');
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ($vote_dir == '') continue;
+                if ($vote_dir == 'tellno') $vote_dir = 'no';
+                if ($vote_dir == 'tellaye') $vote_dir = 'aye';
 
                 $num_votes += $votes->field($j, 'num_votes');
                 $score += ($votes->field($j, 'num_votes') * $weights[$vote_dir]);
             }
 
             $total_votes += $num_votes;
-            $max_score += $num_votes * max( array_values( $weights ) );
+            $max_score += $num_votes * max(array_values($weights));
         }
 
-        if ( $total_votes == 0 ) {
+        if ($total_votes == 0) {
             return null;
         }
 
         // this implies that all the divisions in the policy have a policy
         // position of absent so we set weight to -1 to indicate we can't
         // really say what the parties position is.
-        if ( $max_score == 0 ) {
+        if ($max_score == 0) {
             $weight = -1;
         } else {
-            $weight = 1 - ( $score/$max_score );
+            $weight = 1 - ($score / $max_score);
         }
         $score_desc = score_to_strongly($weight);
 
-        if ( $want_score ) {
-            return array( $score_desc, $weight);
+        if ($want_score) {
+            return array($score_desc, $weight);
         } else {
             return $score_desc;
         }
     }
 
-    public function cache_position( $position ) {
+    public function cache_position($position) {
         $this->db->query(
             "REPLACE INTO partypolicy
                 (party, house, policy_id, score)
@@ -197,9 +197,9 @@ 
             return $positions;
         }
 
-        foreach ( $policies->getPolicies() as $policy_id => $policy_text ) {
-            list( $position, $score ) = $this->$method($policy_id, true);
-            if ( $position === null ) {
+        foreach ($policies->getPolicies() as $policy_id => $policy_text) {
+            list($position, $score) = $this->$method($policy_id, true);
+            if ($position === null) {
                 continue;
             }
 
@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if (stripos($vote, '3') !== FALSE) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if (stripos($vote, 'aye') !== FALSE) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if (stripos($vote, 'no') !== FALSE) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {
@@ -256,7 +256,7 @@ 
         $parties = array();
         $party_count = $party_list->rows;
 
-        for ( $i = 0; $i < $party_count; $i++ ) {
+        for ($i = 0; $i < $party_count; $i++) {
             $party = $party_list->field($i, 'party');
             if (
                 !$party

Braces +9 added lines, -3 removed lines

@@ -144,9 +144,15 @@
             $num_votes = 0;
             for ( $j = 0; $j < $votes->rows(); $j++ ) {
                 $vote_dir = $votes->field($j, 'vote');
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ( $vote_dir == '' ) {
+                    continue;
+                }
+                if ( $vote_dir == 'tellno' ) {
+                    $vote_dir = 'no';
+                }
+                if ( $vote_dir == 'tellaye' ) {
+                    $vote_dir = 'aye';
+                }
 
                 $num_votes += $votes->field($j, 'num_votes');
                 $score += ($votes->field($j, 'num_votes') * $weights[$vote_dir]);

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

@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if ( stripos($vote, '3') !== false ) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if ( stripos($vote, 'aye') !== false ) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if ( stripos($vote, 'no') !== false ) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {

classes/Office.php

Indentation +25 added lines, -25 removed lines

@@ -19,12 +19,12 @@ 
     public $source;
 
     /**
-    * To String
-    *
-    * Return the office title as a string.
-    *
-    * @return string The title of the office, or "Unnamed Office"
-    */
+     * To String
+     *
+     * Return the office title as a string.
+     *
+     * @return string The title of the office, or "Unnamed Office"
+     */
 
     public function __toString() {
         if (isset ($this->title)){
@@ -35,25 +35,25 @@ 
     }
 
     /**
-    * Pretty Dates
-    *
-    * Return a string containing prettified dates of this office.
-    *
-    * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
-    * old selctee/privsec pages on parliament.uk (you can see this in
-    * cmpages/chgpages' privsec0001_2004-06-08.html and
-    * selctee0001_2004-06-08.html). So if the date is those dates for those two
-    * things, you don't want to display it because it's not a known start date,
-    * it could have been before that date. 2005-11-10 is because the PPS changes
-    * did not all happen on that date but the website did not update until that
-    * date so it outputs "before" in either from/to date in that case.
-    * 2009-01-16 is the last date before the page disappeared off parliament.uk
-    * entirely so that displays that fact that after then we don't know.
-    *
-    * @todo https://github.com/mysociety/theyworkforyou/issues/632
-    *
-    * @return string The dates of this office in a readable form.
-    */
+     * Pretty Dates
+     *
+     * Return a string containing prettified dates of this office.
+     *
+     * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
+     * old selctee/privsec pages on parliament.uk (you can see this in
+     * cmpages/chgpages' privsec0001_2004-06-08.html and
+     * selctee0001_2004-06-08.html). So if the date is those dates for those two
+     * things, you don't want to display it because it's not a known start date,
+     * it could have been before that date. 2005-11-10 is because the PPS changes
+     * did not all happen on that date but the website did not update until that
+     * date so it outputs "before" in either from/to date in that case.
+     * 2009-01-16 is the last date before the page disappeared off parliament.uk
+     * entirely so that displays that fact that after then we don't know.
+     *
+     * @todo https://github.com/mysociety/theyworkforyou/issues/632
+     *
+     * @return string The dates of this office in a readable form.
+     */
 
     public function pretty_dates() {
 

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     */
 
     public function __toString() {
-        if (isset ($this->title)){
+        if (isset ($this->title)) {
             return (string) $this->title;
         } else {
             return 'Unnamed Office';
@@ -58,7 +58,7 @@ 
     public function pretty_dates() {
 
         if ($this->to_date == '9999-12-31') {
-            return 'since ' . format_date($this->from_date, SHORTDATEFORMAT);
+            return 'since '.format_date($this->from_date, SHORTDATEFORMAT);
         }
 
         $output = '';
@@ -70,7 +70,7 @@ 
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {
                 $output .= 'before ';
             }
-            $output .= format_date($this->from_date,SHORTDATEFORMAT) . ' ';
+            $output .= format_date($this->from_date, SHORTDATEFORMAT).' ';
         }
 
         $output .= 'to ';

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

@@ -64,7 +64,7 @@
         $output = '';
 
         if (
-            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') AND
+            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') and
             !($this->source == 'chgpages/privsec' && $this->from_date == '2004-05-13')
         ) {
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {

classes/MiniSurvey.php

Spacing +11 added lines, -11 removed lines

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

classes/Search/ParseArgs.php

Spacing +7 added lines, -7 removed lines

@@ -13,11 +13,11 @@ 
         $searchstring = '';
 
         if ($advphrase = get_http_var('phrase')) {
-            $searchstring .= ' "' . $advphrase . '"';
+            $searchstring .= ' "'.$advphrase.'"';
         }
 
         if ($advexclude = get_http_var('exclude')) {
-            $searchstring .= ' -' . join(' -', preg_split('/\s+/', $advexclude));
+            $searchstring .= ' -'.join(' -', preg_split('/\s+/', $advexclude));
         }
 
         return $searchstring;
@@ -81,12 +81,12 @@ 
             $q = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookup($searchspeaker);
             $pids = array();
             $row_count = $q->rows();
-            for ($i=0; $i<$row_count; $i++) {
+            for ($i = 0; $i < $row_count; $i++) {
                 $pids[$q->field($i, 'person_id')] = true;
             }
             $pids = array_keys($pids);
             if (count($pids) > 0) {
-                $searchstring .= ' speaker:' . join(' speaker:', $pids);
+                $searchstring .= ' speaker:'.join(' speaker:', $pids);
             }
         }
 
@@ -97,18 +97,18 @@ 
         $searchstring = '';
 
         if ($advdept = get_http_var('department')) {
-            $searchstring .= ' department:' . preg_replace('#[^a-z]#i', '', $advdept);
+            $searchstring .= ' department:'.preg_replace('#[^a-z]#i', '', $advdept);
         }
 
         if ($advparty = get_http_var('party')) {
-            $searchstring .= ' party:' . join(' party:', explode(',', $advparty));
+            $searchstring .= ' party:'.join(' party:', explode(',', $advparty));
         }
 
         $advsection = get_http_var('section');
         if (!$advsection)
             $advsection = get_http_var('maj'); # Old URLs had this
         if (is_array($advsection)) {
-            $searchstring .= ' section:' . join(' section:', $advsection);
+            $searchstring .= ' section:'.join(' section:', $advsection);
         } elseif ($advsection) {
             $searchstring .= " section:$advsection";
         }

Braces +14 added lines, -6 removed lines

@@ -28,11 +28,17 @@ 
 
         if (get_http_var('from') || get_http_var('to')) {
             $from = parse_date(get_http_var('from'));
-            if ($from) $from = $from['iso'];
-            else $from = '1935-10-01';
+            if ($from) {
+                $from = $from['iso'];
+            } else {
+                $from = '1935-10-01';
+            }
             $to = parse_date(get_http_var('to'));
-            if ($to) $to = $to['iso'];
-            else $to = date('Y-m-d');
+            if ($to) {
+                $to = $to['iso'];
+            } else {
+                $to = date('Y-m-d');
+            }
             $searchstring .= " $from..$to";
         }
 
@@ -105,8 +111,10 @@ 
         }
 
         $advsection = get_http_var('section');
-        if (!$advsection)
-            $advsection = get_http_var('maj'); # Old URLs had this
+        if (!$advsection) {
+                    $advsection = get_http_var('maj');
+        }
+        # Old URLs had this
         if (is_array($advsection)) {
             $searchstring .= ' section:' . join(' section:', $advsection);
         } elseif ($advsection) {

classes/Topic.php

Indentation +29 added lines, -29 removed lines

@@ -33,7 +33,7 @@ 
         $this->db = new \ParlDB;
 
         if (is_null($data)) {
-          return;
+            return;
         }
 
         $this->id = $data['id'];
@@ -124,7 +124,7 @@ 
 
     private function _getContentIDs() {
         $q = $this->db->query(
-          "SELECT body, gid, ep.epobject_id FROM epobject ep
+            "SELECT body, gid, ep.epobject_id FROM epobject ep
            JOIN hansard h on ep.epobject_id = h.epobject_id
            JOIN topic_epobjects te on te.epobject_id = ep.epobject_id
            WHERE topic_key = :topic_key",
@@ -180,24 +180,24 @@ 
 
     function addContent($gid) {
         $q = $this->db->query(
-          "SELECT epobject_id FROM hansard WHERE gid = :gid",
-          array(
+            "SELECT epobject_id FROM hansard WHERE gid = :gid",
+            array(
             ":gid" => $gid
-          )
+            )
         );
 
         if (!$q->success() || $q->rows == 0) {
-          return false;
+            return false;
         }
 
         $epobject_id = $q->field(0, 'epobject_id');
 
         $q = $this->db->query(
-          "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
-          array(
+            "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $epobject_id
-          )
+            )
         );
 
         return $q->success();
@@ -205,31 +205,31 @@ 
 
     function deleteContent($id) {
         $q = $this->db->query(
-          "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
-          array(
+            "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $id
-          )
+            )
         );
 
         return $q->success();
     }
 
     function getPolicySets() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         "SELECT policyset FROM topic_policysets WHERE topic_key = :key",
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
-      $sets = array();
-      $count = $q->rows;
-      for ($i = 0; $i < $count; $i++) {
+        $sets = array();
+        $count = $q->rows;
+        for ($i = 0; $i < $count; $i++) {
         $sets[] = $q->field($i, 'policyset');
-      }
+        }
 
-      return $sets;
+        return $sets;
     }
 
     function addPolicySets($sets) {
@@ -259,20 +259,20 @@ 
     }
 
     function getPolicies() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         'SELECT policy_id FROM topic_policies WHERE topic_key = :key',
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
-      $policies = array();
-      $count = $q->rows;
-      for ($i = 0; $i < $count; $i++) {
+        $policies = array();
+        $count = $q->rows;
+        for ($i = 0; $i < $count; $i++) {
         $policies[] = $q->field($i, 'policy_id');
-      }
+        }
 
-      return $policies;
+        return $policies;
     }
 
     function addPolicies($policies) {
@@ -316,7 +316,7 @@ 
 
     function save() {
         $q = $this->db->query(
-          "REPLACE INTO topics
+            "REPLACE INTO topics
           (id, title, slug, description, search_string, front_page, image)
           VALUES
           (:id, :title, :slug, :description, :search_string, :front_page, :image)",

Spacing +5 added lines, -5 removed lines

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

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

@@ -28,7 +28,7 @@
      *
      */
 
-    public function __construct($data = NULL)
+    public function __construct($data = null)
     {
         $this->db = new \ParlDB;
 

classes/SectionView/SpwransView.php

Spacing +25 added lines, -25 removed lines

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

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

@@ -81,15 +81,15 @@ 
         }
         $result = '';
         $nrows = count($row_data);
-        $last_date = NULL;
-        $first_difference_output = TRUE;
+        $last_date = null;
+        $first_difference_output = true;
         // Keep the references until after the history that's in a timeline:
         $references = array();
         for( $i = 0; $i < $nrows; $i++ ) {
             $row = $row_data[$i];
             if( ! $row["date"] ) {
                 // If this mention isn't associated with a date, the difference won't be interesting.
-                $last_date = NULL;
+                $last_date = null;
             }
             $description = '';
             if ($last_date && ($last_date != $row["date"])) {
@@ -98,17 +98,17 @@ 
                 $daysstring = ($daysdiff == 1) ? "day" : "days";
                 $further = "";
                 if( $first_difference_output ) {
-                    $first_difference_output = FALSE;
+                    $first_difference_output = false;
                 } else {
                     $further = " a further";
                 }
                 $description = "\n<span class=\"question-mention-gap\">After$further $daysdiff $daysstring,</span> ";
             }
-            $reference = FALSE;
+            $reference = false;
             $inner = "BUG: Unknown mention type $row[type]";
             $date = format_date($row['date'], SHORTDATEFORMAT);
             $url = $row['url'];
-            if ( strpos($url, 'business/businessBulletin') !== FALSE ) {
+            if ( strpos($url, 'business/businessBulletin') !== false ) {
                 $url = str_replace('www.scottish', 'archive.scottish', $url);
             }
             switch ($row["type"]) {
@@ -147,7 +147,7 @@ 
                         $URL->insert( array('spid' => $referencing_spid) );
                         $relative_url = $URL->generate("none");
                         $inner = "Referenced in <a href=\"$relative_url\">question $referencing_spid</a>";
-                        $reference = TRUE;
+                        $reference = true;
                     }
                     break;
             }

classes/SectionView/SpView.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'sp' )
+            array('section' => 'sp')
         );
     }
 }

classes/SectionView/WransView.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
 
     protected function display_front() {
         global $DATA, $this_page;
-        if ( get_http_var('type') == 'wrans') {
+        if (get_http_var('type') == 'wrans') {
             return parent::display_front();
         }
 
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \WRANSLIST;
 
         $wrans = array();
@@ -50,10 +50,10 @@ 
 
     protected function getSearchSections() {
         $sections = array(
-            array( 'section' => 'wrans', 'title' => 'Written Answers' ),
+            array('section' => 'wrans', 'title' => 'Written Answers'),
         );
-        if ( get_http_var('type') == '') {
-            $sections[] = array( 'section' => 'wms', 'title' => 'Written Ministerial Statements' );
+        if (get_http_var('type') == '') {
+            $sections[] = array('section' => 'wms', 'title' => 'Written Ministerial Statements');
         }
         return $sections;
     }
@@ -62,7 +62,7 @@ 
     # speech bar the first (assuming that's the question)
     private $votelinks_so_far = 0;
 
-    protected function generate_votes ($votes, $id, $gid) {
+    protected function generate_votes($votes, $id, $gid) {
         /*
         Returns HTML for the 'Does this answer the question?' links (wrans) in the sidebar.
         $votes = => array (