mysociety / theyworkforyou

www/includes/easyparliament/templates/html/alert/index.php

Indentation +9 added lines, -9 removed lines

@@ -128,24 +128,24 @@ 
       <?php } ?>
 
       <?php
-          if(
-              (isset($members) && $members->rows() > 0) ||
+            if(
+                (isset($members) && $members->rows() > 0) ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
-          ) {
-              /* We need to disambiguate the user's instructions */
-              $member_options = false;
-      ?>
+            ) {
+                /* We need to disambiguate the user's instructions */
+                $member_options = false;
+        ?>
         <div class="alert-section alert-section--disambiguation">
             <div class="alert-section__primary">
 
               <?php if (isset($members) && $members->rows() > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when people matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                   <?php
                     foreach ($members as $row) {
-                  ?>
+                    ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -165,7 +165,7 @@ 
               <?php } ?>
 
               <?php if (isset($constituencies) && count($constituencies) > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when MPs for constituencies matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                 <?php foreach ($constituencies as $constituency => $member) { ?>

Spacing +20 added lines, -20 removed lines

@@ -1,7 +1,7 @@ 
 <div class="full-page">
     <div class="full-page__row">
 
-      <?php if ( $message ) { ?>
+      <?php if ($message) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
                 <h3><?= $message['title'] ?></h3>
@@ -12,10 +12,10 @@ 
         </div>
       <?php } ?>
 
-      <?php if ( $results ) { ?>
+      <?php if ($results) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
-              <?php if ( $results == 'alert-confirmed' ) { ?>
+              <?php if ($results == 'alert-confirmed') { ?>
                 <h3>Your alert has been confirmed</h3>
                 <p>
                     You will now receive email alerts for the following criteria:
@@ -45,32 +45,32 @@ 
                 </div>
                 </noscript>
 
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
+              <?php } elseif ($results == 'alert-suspended') { ?>
                 <h3>Alert suspended</h3>
                 <p>
                     You can reactivate the alert at any time, from the sidebar below.
                 </p>
 
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
+              <?php } elseif ($results == 'alert-resumed') { ?>
                 <h3>Alert resumed</h3>
                 <p>
                     You will now receive email alerts on any day when there
                     are entries in Hansard that match your criteria.
                 </p>
 
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
+              <?php } elseif ($results == 'alert-deleted') { ?>
                 <h3>Alert deleted</h3>
                 <p>
                     You will no longer receive this alert.
                 </p>
 
-              <?php } elseif ( $results == 'all-alerts-deleted' ) { ?>
+              <?php } elseif ($results == 'all-alerts-deleted') { ?>
                 <h3>All alerts deleted</h3>
                 <p>
                     You will no longer receive any alerts.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Hmmm, something&rsquo;s not right</h3>
                 <p>
                     The link you followed to reach this page appears to be incomplete.
@@ -86,14 +86,14 @@ 
                     and let us know, and we'll help out!
                 </p>
 
-              <?php } elseif ( $results == 'alert-added' ) { ?>
+              <?php } elseif ($results == 'alert-added') { ?>
                 <h3>Your alert has been added</h3>
                 <p>
                     You will now receive email alerts on any day when
                     <?= _htmlspecialchars($criteria) ?> in parliament.
                 </p>
 
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
+              <?php } elseif ($results == 'alert-confirmation') { ?>
                 <h3>We&rsquo;re nearly done&hellip;</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
@@ -101,20 +101,20 @@ 
                     and receive future alerts. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
+              <?php } elseif ($results == 'alert-exists') { ?>
                 <h3>You&rsquo;re already subscribed to that!</h3>
                 <p>
                     It&rsquo;s good to know you&rsquo;re keen though.
                 </p>
 
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
+              <?php } elseif ($results == 'alert-already-signed') { ?>
                 <h3>We&rsquo;re nearly done</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
                     You will need to follow that link to confirm your email address to receive the alert. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Alert could not be created</h3>
                 <p>
                     Sorry, we were unable to create that alert. Please
@@ -128,7 +128,7 @@ 
       <?php } ?>
 
       <?php
-          if(
+          if (
               (isset($members) && $members->rows() > 0) ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
@@ -152,7 +152,7 @@ 
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="pid" value="<?= $row['person_id'] ?>">
                             When
-                            <?= member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname'] ) ?>
+                            <?= member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']) ?>
                             <?php if ($row['constituency']) { ?>
                                 (<?= $row['constituency'] ?>)
                             <?php } ?>
@@ -183,7 +183,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                if ( $member_options ) { ?>
+                if ($member_options) { ?>
                 <h3>Sign up for alerts for topics</h3>
                 <?php } else { ?>
                 <h3>Great! Can you just confirm what you mean?</h3>
@@ -197,7 +197,7 @@ 
                             Receive alerts when <?= _htmlspecialchars($alertsearch_pretty) ?>
                             <input type="submit" class="button small" value="Subscribe">
                         </form>
-                      <?php if ( isset($mistakes['multiple']) ) { ?>
+                      <?php if (isset($mistakes['multiple'])) { ?>
                         <em class="error">
                             You have used a comma in your search term &ndash;
                             are you sure this is what you want? You cannot
@@ -206,7 +206,7 @@ 
                             for each individual term.
                         </em>
                       <?php } ?>
-                      <?php if ( isset($mistakes['postcode_and']) ) { ?>
+                      <?php if (isset($mistakes['postcode_and'])) { ?>
                         <em class="error">
                             You have used a postcode and something else in your
                             search term &ndash; are you sure this is what you
@@ -255,11 +255,11 @@ 
             <div class="alert-section__secondary">
               <?php if ($email_verified) { ?>
 
-                  <?php if ( $alerts ) { ?>
+                  <?php if ($alerts) { ?>
                     <?php include('_list.php'); ?>
                   <?php } ?>
 
-                  <?php if ( $current_mp ) { ?>
+                  <?php if ($current_mp) { ?>
                     <h3>Your MP alert</h3>
                     <ul class="alerts-manage__list">
                         <li>

www/includes/easyparliament/templates/html/section/_section_toc.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 $divisions_to_link = array();
-foreach($data['rows'] as $speech) {
+foreach ($data['rows'] as $speech) {
 
     # Only care about divisions...
     if ($speech['htype'] != 14) {
@@ -34,7 +34,7 @@ 
                     <li><a href="#g<?= gid_to_anchor($speech['gid']) ?>">Division number <?= $division['number'] ?></a>
                         <?php if ($division['has_description']) { ?>
                             <br><span class="policy-vote__text">
-                                <?php include( dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
+                                <?php include(dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
                             </span>
                         <?php } ?>
 

classes/People.php

Braces +10 added lines, -8 removed lines

@@ -207,15 +207,17 @@
             $query .= 'LEFT OUTER JOIN personinfo ON member.person_id = personinfo.person_id AND data_key="' . $personinfo_key . '" ';
         }
         $query .= ' JOIN person_names p ON p.person_id = member.person_id AND p.type = "name" ';
-        if (isset($args['date']))
-            $query .= 'AND start_date <= :date AND :date <= end_date ';
-        else
-            $query .= 'AND end_date="9999-12-31" ';
+        if (isset($args['date'])) {
+                    $query .= 'AND start_date <= :date AND :date <= end_date ';
+        } else {
+                    $query .= 'AND end_date="9999-12-31" ';
+        }
         $query .= 'WHERE house=' . $this->house . ' ';
-        if (isset($args['date']))
-            $query .= 'AND entered_house <= :date AND :date <= left_house ';
-        elseif (!isset($args['all']) || $this->house == HOUSE_TYPE_COMMONS)
-            $query .= 'AND left_house = (SELECT MAX(left_house) FROM member) ';
+        if (isset($args['date'])) {
+                    $query .= 'AND entered_house <= :date AND :date <= left_house ';
+        } elseif (!isset($args['all']) || $this->house == HOUSE_TYPE_COMMONS) {
+                    $query .= 'AND left_house = (SELECT MAX(left_house) FROM member) ';
+        }
 
         if (isset($args['order'])) {
             $order = $args['order'];

Spacing +14 added lines, -14 removed lines

@@ -36,7 +36,7 @@ 
         $data = $this->_get_data_by_group($args);
 
         $user = new User();
-        if ( $reps = $this->getRegionalReps($user) ) {
+        if ($reps = $this->getRegionalReps($user)) {
             $data['reps'] = $reps;
         }
 
@@ -68,7 +68,7 @@ 
             $args['all'] = true;
         }
 
-        if ( $this->type == 'peers' ) {
+        if ($this->type == 'peers') {
             $args['order'] = 'name';
         }
 
@@ -134,8 +134,8 @@ 
 
     private function addImagesToData($data) {
         $new_data = array();
-        foreach ( $data as $pid => $details ) {
-            list($image, ) = Utility\Member::findMemberImage($pid, true, $this->subs_missing_image);
+        foreach ($data as $pid => $details) {
+            list($image,) = Utility\Member::findMemberImage($pid, true, $this->subs_missing_image);
             $details['image'] = $image;
             $new_data[$pid] = $details;
         }
@@ -152,21 +152,21 @@ 
 
         $urls['plain'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'n'));
+        $URL->insert(array('o' => 'n'));
         $urls['by_name'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'l'));
+        $URL->insert(array('o' => 'l'));
         $urls['by_last'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'f'));
+        $URL->insert(array('o' => 'f'));
         $urls['by_first'] = $URL->generate();
 
-        $URL->insert(array( 'o' => 'p'));
+        $URL->insert(array('o' => 'p'));
         $urls['by_party'] = $URL->generate();
 
-        $URL->insert(array( 'f' => 'csv'));
-        $URL->remove(array( 'o'));
-        if ( $date = get_http_var('date') ) {
+        $URL->insert(array('f' => 'csv'));
+        $URL->remove(array('o'));
+        if ($date = get_http_var('date')) {
             $URL->insert(array('date' => $date));
         }
         $urls['by_csv'] = $URL->generate();
@@ -242,7 +242,7 @@ 
                 $name = member_full_name($this->house, $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']);
                 $constituency = $row['constituency'];
                 $url = make_member_url($name, $constituency, $this->house, $p_id);
-                $narray = array (
+                $narray = array(
                     'person_id' 	=> $p_id,
                     'given_name' => $row['given_name'],
                     'family_name' => $row['family_name'],
@@ -276,8 +276,8 @@ 
             uasort($data, 'by_peer_name');
         }
 
-        $data = array (
-            'info' => array (
+        $data = array(
+            'info' => array(
                 'order' => $order
             ),
             'data' => $data

classes/Divisions.php

Upper-Lower-Casing +8 added lines, -8 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;
@@ -59,7 +59,7 @@ 
      * @param  string|string[]  $houses  House name (eg: "commons") or array of
      *                                   house names. Optional.
      */
-    public function getRecentDivisions($number = 20, $houses = NULL) {
+    public function getRecentDivisions($number = 20, $houses = null) {
         $select = '';
         $where = '';
         $order = 'ORDER BY division_date DESC, division_number DESC';
@@ -123,7 +123,7 @@ 
      * @param  int|int[]        $majors  Major types (e.g. 1) or array of
      *                                   major types. Optional.
      */
-    public function getRecentDebatesWithDivisions($number = 20, $majors = NULL) {
+    public function getRecentDebatesWithDivisions($number = 20, $majors = null) {
         global $hansardmajors;
 
         if (!is_array($majors)) {
@@ -276,7 +276,7 @@ 
               $summary['absent'] += $row['total'];
           } else if ( $vote == 'both' ) {
               $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if ( strpos($vote, 'tell') !== false ) {
               $summary['tell'] += $row['total'];
           } else if ( $policy_vote == $vote ) {
               $summary['for'] += $row['total'];
@@ -365,7 +365,7 @@ 
               'teller' => false
             );
 
-            if (strpos($vote['vote'], 'tell') !== FALSE) {
+            if (strpos($vote['vote'], 'tell') !== false) {
                 $detail['teller'] = true;
             }
 
@@ -568,10 +568,10 @@ 
 
         if (array_key_exists('direction', $row)) {
             $division['direction'] = $row['direction'];
-            if ( strpos( $row['direction'], 'strong') !== FALSE ) {
-                $division['strong'] = TRUE;
+            if ( strpos( $row['direction'], 'strong') !== false ) {
+                $division['strong'] = true;
             } else {
-                $division['strong'] = FALSE;
+                $division['strong'] = false;
             }
         }
 

Indentation +57 added lines, -57 removed lines

@@ -192,7 +192,7 @@ 
 
         $divisions = array();
         foreach ($q as $row) {
-          $divisions[] = $this->getParliamentDivisionDetails($row);
+            $divisions[] = $this->getParliamentDivisionDetails($row);
         }
 
         return $divisions;
@@ -247,44 +247,44 @@ 
         );
 
         foreach ($q as $row) {
-          $policy_id = $row['policy_id'];
+            $policy_id = $row['policy_id'];
 
-          if (!array_key_exists($policy_id, $policy_divisions)) {
+            if (!array_key_exists($policy_id, $policy_divisions)) {
             $summary = array(
-              'max' => $row['latest'],
-              'min' => $row['earliest'],
-              'total' => $row['total'],
-              'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
+                'max' => $row['latest'],
+                'min' => $row['earliest'],
+                'total' => $row['total'],
+                'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
             );
 
             $policy_divisions[$policy_id] = $summary;
-          }
-
-          $summary = $policy_divisions[$policy_id];
-
-          $summary['total'] += $row['total'];
-          if ($summary['max'] < $row['latest']) {
-              $summary['max'] = $row['latest'];
-          }
-          if ($summary['min'] > $row['latest']) {
-              $summary['min'] = $row['latest'];
-          }
-
-          $vote = $row['vote'];
-          $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
-              $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
-              $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
-              $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
-              $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
-              $summary['against'] += $row['total'];
-          }
-
-          $policy_divisions[$policy_id] = $summary;
+            }
+
+            $summary = $policy_divisions[$policy_id];
+
+            $summary['total'] += $row['total'];
+            if ($summary['max'] < $row['latest']) {
+                $summary['max'] = $row['latest'];
+            }
+            if ($summary['min'] > $row['latest']) {
+                $summary['min'] = $row['latest'];
+            }
+
+            $vote = $row['vote'];
+            $policy_vote = str_replace('3', '', $row['policy_vote']);
+            if ( $vote == 'absent' ) {
+                $summary['absent'] += $row['total'];
+            } else if ( $vote == 'both' ) {
+                $summary['both'] += $row['total'];
+            } else if ( strpos($vote, 'tell') !== FALSE ) {
+                $summary['tell'] += $row['total'];
+            } else if ( $policy_vote == $vote ) {
+                $summary['for'] += $row['total'];
+            } else if ( $policy_vote != $vote ) {
+                $summary['against'] += $row['total'];
+            }
+
+            $policy_divisions[$policy_id] = $summary;
         }
 
         return $policy_divisions;
@@ -338,17 +338,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()
         );
 
         $party_breakdown = 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()
         );
 
         # Sort Lords specially
@@ -359,12 +359,12 @@ 
 
         foreach ($data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
+                'person_id' => $vote['person_id'],
+                'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
                     $vote['family_name'], $vote['lordofname'])),
-              'party' => $vote['party'],
-              'proxy' => false,
-              'teller' => false
+                'party' => $vote['party'],
+                'proxy' => false,
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== FALSE) {
@@ -385,23 +385,23 @@ 
             }
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
-              $votes['yes_votes'][] = $detail;
-              @$party_breakdown['yes_votes'][$detail['party']]++;
+                $votes['yes_votes'][] = $detail;
+                @$party_breakdown['yes_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
-              $votes['no_votes'][] = $detail;
-              @$party_breakdown['no_votes'][$detail['party']]++;
+                $votes['no_votes'][] = $detail;
+                @$party_breakdown['no_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'absent') {
-              $votes['absent_votes'][] = $detail;
-              @$party_breakdown['absent_votes'][$detail['party']]++;
+                $votes['absent_votes'][] = $detail;
+                @$party_breakdown['absent_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'both') {
-              $votes['both_votes'][] = $detail;
-              @$party_breakdown['both_votes'][$detail['party']]++;
+                $votes['both_votes'][] = $detail;
+                @$party_breakdown['both_votes'][$detail['party']]++;
             }
         }
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
-          $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
+            $votes[$vote . '_by_party'] = $votes[$vote];
+            usort($votes[$vote . '_by_party'], function ($a, $b) {
                 return $a['party']>$b['party'];
             });
         }

Spacing +23 added lines, -23 removed lines

@@ -68,15 +68,15 @@ 
             ':count' => $number
         );
 
-        if ( is_string($houses) ) {
-            $houses = array( $houses );
+        if (is_string($houses)) {
+            $houses = array($houses);
         }
 
-        if ( is_array($houses) && count($houses) > 0 ) {
+        if (is_array($houses) && count($houses) > 0) {
             $where = 'WHERE house IN ("' . implode('", "', $houses) . '")';
         }
 
-        if ( $this->member ) {
+        if ($this->member) {
             $select = "SELECT divisions.*, vote FROM divisions
                 LEFT JOIN persondivisionvotes ON divisions.division_id=persondivisionvotes.division_id AND person_id=:person_id";
             $params[':person_id'] = $this->member->person_id;
@@ -215,7 +215,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;
         }
@@ -272,15 +272,15 @@ 
 
           $vote = $row['vote'];
           $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
+          if ($vote == 'absent') {
               $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
+          } else if ($vote == 'both') {
               $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if (strpos($vote, 'tell') !== FALSE) {
               $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
+          } else if ($policy_vote == $vote) {
               $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
+          } else if ($policy_vote != $vote) {
               $summary['against'] += $row['total'];
           }
 
@@ -377,7 +377,7 @@ 
                     FROM person_names AS pn
                     WHERE person_id = :person_id
                     AND start_date <= :division_date AND end_date >= :division_date",
-                    [ ':person_id' => $vote['proxy'], ':division_date' => $row['division_date'] ]
+                    [':person_id' => $vote['proxy'], ':division_date' => $row['division_date']]
                 )->first();
                 $detail['proxy'] = ucfirst(member_full_name(
                     HOUSE_TYPE_COMMONS, $q['title'], $q['given_name'],
@@ -401,8 +401,8 @@ 
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
           $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
-                return $a['party']>$b['party'];
+          usort($votes[$vote . '_by_party'], function($a, $b) {
+                return $a['party'] > $b['party'];
             });
         }
 
@@ -456,10 +456,10 @@ 
             $votes['against'] . ' ' . make_plural('vote', $votes['against']) . ' against'
         );
 
-        if ( $votes['both'] ) {
+        if ($votes['both']) {
             $actions[] = $votes['both'] . ' ' . make_plural('abstention', $votes['both']);
         }
-        if ( $votes['absent'] ) {
+        if ($votes['absent']) {
             $actions[] = $votes['absent'] . ' ' . make_plural('absence', $votes['absent']);
         }
         if ($max == $min) {
@@ -517,7 +517,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>";
@@ -535,7 +535,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);
@@ -583,7 +583,7 @@ 
 
         if (array_key_exists('direction', $row)) {
             $division['direction'] = $row['direction'];
-            if ( strpos( $row['direction'], 'strong') !== FALSE ) {
+            if (strpos($row['direction'], 'strong') !== FALSE) {
                 $division['strong'] = TRUE;
             } else {
                 $division['strong'] = FALSE;
@@ -615,24 +615,24 @@ 
         foreach ($q as $row) {
             $policy_id = $row['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($row);
 
-            if ( !$division['strong'] ) {
+            if (!$division['strong']) {
                 $policies[$policy_id]['weak_count']++;
             }
 
@@ -647,7 +647,7 @@ 
 
         $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 ))->first();
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array(':gid' => $gid))->first();
         if (!$q) {
             return '';
         }

www/includes/easyparliament/templates/html/homepage/recent-votes.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( count($divisions) > 0 ) { ?>
+<?php if (count($divisions) > 0) { ?>
     <h2 style="position: relative;">
         Recent Votes
         <div class="meta excerpt__category"><a href="/divisions/">Show all recent votes</a></div>

www/docs/admin/wikipedia.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 remove_form();
 list_ignored();
 $PAGE->stripe_end([
-    [ 'type' => 'html', 'content' => $PAGE->admin_menu() ],
+    ['type' => 'html', 'content' => $PAGE->admin_menu()],
 ]);
 $PAGE->page_end();
 

www/includes/easyparliament/templates/html/divisions/_name_vote_list.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!function_exists('print_voter')) {
-  function print_voter($vote){
+  function print_voter($vote) {
     echo sprintf(
       '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
       $vote['person_id'],
@@ -28,7 +28,7 @@ 
     <?php if (count($tellers) > 0) { ?>
       <h4>Tellers</h4>
       <ul class="division-names">
-        <?php foreach($tellers as $teller) {
+        <?php foreach ($tellers as $teller) {
           print_voter($teller);
         } ?>
       </p>

Indentation +12 added lines, -12 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
 if (!function_exists('print_voter')) {
-  function print_voter($vote){
+    function print_voter($vote){
     echo sprintf(
-      '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
-      $vote['person_id'],
-      $vote['name'],
-      $vote['party'],
-      $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : ''
+        '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
+        $vote['person_id'],
+        $vote['name'],
+        $vote['party'],
+        $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : ''
     );
-  }
+    }
 }
 
 if (count($votes) > 0) { ?>
@@ -18,18 +18,18 @@ 
       <?php $tellers = array(); ?>
       <ul class="division-names js-vote-accordion">
         <?php foreach ($votes as $vote) {
-          if ($vote['teller']) {
-              $tellers[] = $vote;
-          } else {
+            if ($vote['teller']) {
+                $tellers[] = $vote;
+            } else {
             print_voter($vote);
-          }
+            }
         } ?>
       </ul>
     <?php if (count($tellers) > 0) { ?>
       <h4>Tellers</h4>
       <ul class="division-names">
         <?php foreach($tellers as $teller) {
-          print_voter($teller);
+            print_voter($teller);
         } ?>
       </p>
     <?php } ?>