mysociety / theyworkforyou

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

Indentation +4 added lines, -4 removed lines

@@ -14,10 +14,10 @@
                     </ul>
                     <ul class="division-list">
                         <?php foreach ($votes as $vote) {
-                          $voter = sprintf('<a href="/mp/?p=%d">%s</a>', $vote['person_id'], $vote['name']);
-                          if ($vote['teller']) {
-                              $tellers[] = $voter;
-                          } else { ?>
+                            $voter = sprintf('<a href="/mp/?p=%d">%s</a>', $vote['person_id'], $vote['name']);
+                            if ($vote['teller']) {
+                                $tellers[] = $voter;
+                            } else { ?>
                             <li><?= $voter ?></li>
                         <?php
                             }

classes/Divisions.php

Spacing +20 added lines, -20 removed lines

@@ -49,7 +49,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;
@@ -116,7 +116,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;
         }
@@ -174,15 +174,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');
           }
 
@@ -270,8 +270,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'];
             });
         }
 
@@ -311,10 +311,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) {
@@ -379,7 +379,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>";
@@ -397,7 +397,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);
@@ -445,7 +445,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;
@@ -489,24 +489,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']++;
             }
 
@@ -521,9 +521,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);

Indentation +69 added lines, -69 removed lines

@@ -57,7 +57,7 @@ 
 
     public function getRecentDivisions($number = 20) {
         $q = $this->db->query(
-          "SELECT * FROM divisions ORDER BY division_date DESC, division_number DESC LIMIT :count",
+            "SELECT * FROM divisions ORDER BY division_date DESC, division_number DESC LIMIT :count",
             array(
                 ':count' => $number
             )
@@ -93,7 +93,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;
@@ -149,44 +149,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;
@@ -239,25 +239,25 @@ 
         );
 
         $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()
         );
 
         foreach ($q->data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => $vote['given_name'] . ' ' . $vote['family_name'],
-              'party' => $vote['party'],
-              'teller' => false
+                'person_id' => $vote['person_id'],
+                'name' => $vote['given_name'] . ' ' . $vote['family_name'],
+                'party' => $vote['party'],
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== FALSE) {
@@ -265,23 +265,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'];
             });
         }
@@ -388,11 +388,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;
@@ -486,13 +486,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'];
 

classes/Utility/House.php

Indentation +8 added lines, -8 removed lines

@@ -23,20 +23,20 @@
     public static function house_to_members($house) {
         $house_to_members = array(
             HOUSE_TYPE_COMMONS => array(
-              'singular' => 'MP',
-              'plural'   => 'MPs'
+                'singular' => 'MP',
+                'plural'   => 'MPs'
             ),
             HOUSE_TYPE_LORDS => array(
-              'singular' => 'Member of the House of Lords',
-              'plural'   => 'Members of the House of Lords'
+                'singular' => 'Member of the House of Lords',
+                'plural'   => 'Members of the House of Lords'
             ),
             HOUSE_TYPE_NI => array(
-              'singular' => 'MLA',
-              'plural'   => 'MLAs'
+                'singular' => 'MLA',
+                'plural'   => 'MLAs'
             ),
             HOUSE_TYPE_SCOTLAND => array(
-              'singular' => 'MSP',
-              'plural'   => 'MSPs'
+                'singular' => 'MSP',
+                'plural'   => 'MSPs'
             )
         );
 

Spacing +4 added lines, -4 removed lines

@@ -46,28 +46,28 @@
 
     public static function getCountryDetails($house) {
         $details = array(
-            HOUSE_TYPE_COMMONS => array (
+            HOUSE_TYPE_COMMONS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '– in the House of Commons',
                 'cons_type' => 'WMC',
                 'assembly_name' => 'House of Commons',
             ),
-            HOUSE_TYPE_NI => array (
+            HOUSE_TYPE_NI => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '– in the Northern Ireland Assembly',
                 'cons_type' => 'NIE',
                 'assembly_name' => 'Northern Ireland Assembly',
             ),
-            HOUSE_TYPE_SCOTLAND => array (
+            HOUSE_TYPE_SCOTLAND => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '– in the Scottish Parliament',
                 'cons_type' => 'SPC',
                 'assembly_name' => 'Scottish Parliament',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '– in the House of Lords',

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

Indentation +11 added lines, -11 removed lines

@@ -1,14 +1,14 @@ 
 <?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</span></li>',
-      $vote['person_id'],
-      $vote['name'],
-      $vote['party']
+        '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s</span></li>',
+        $vote['person_id'],
+        $vote['name'],
+        $vote['party']
     );
-  }
+    }
 }
 
 if (count($votes) > 0) { ?>
@@ -17,18 +17,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 } ?>

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</span></li>',
       $vote['person_id'],
@@ -27,7 +27,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>

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

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
                       <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
@@ -38,13 +38,13 @@ 
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -188,7 +188,7 @@ 
                 <img class="people-list__person__image" src="<?= $person['image'] ?>">
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= slugify($person['party']) ?>"><?= $person['party'] ?></span>
@@ -206,7 +206,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <form method="get" action="<?= $urls['plain'] ?>" class="sidebar-item-with-icon sidebar-item-with-icon--date">
                     <p>
                         Or view a past list
@@ -258,7 +258,7 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -272,7 +272,7 @@ 
                     </p>
                 <?php } ?>
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__) . '/../sidebar/looking_for.php') ?>
             </div>
         </div>
 

www/docs/divisions/division.php

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

@@ -58,7 +58,7 @@
 if ($data['division']['house'] == 'pbc') {
     $location = '– in a Public Bill Committee';
 }
-$data['debate_time_human'] = False;
+$data['debate_time_human'] = false;
 $data['debate_day_human'] = format_date($data['division']['date'], LONGDATEFORMAT);
 $data['col_country'] = $country;
 $data['location'] = $location;

Indentation +5 added lines, -5 removed lines

@@ -45,11 +45,11 @@
             $data['mp_vote']['with_majority'] = true;
         }
     } else {
-      if ($data['division']['date'] < $MEMBER->entered_house($division_votes['house_number'])['date']) {
-          $data['before_mp'] = true;
-      } else if ($data['division']['date'] > $MEMBER->left_house($division_votes['house_number'])['date']) {
-          $data['after_mp'] = true;
-      }
+        if ($data['division']['date'] < $MEMBER->entered_house($division_votes['house_number'])['date']) {
+            $data['before_mp'] = true;
+        } else if ($data['division']['date'] > $MEMBER->left_house($division_votes['house_number'])['date']) {
+            $data['after_mp'] = true;
+        }
     }
 
     $mp_data = array(

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

Indentation +8 added lines, -8 removed lines

@@ -38,20 +38,20 @@
 
 $vote_sets = array(
     'yes_votes' => array(
-      'title' => 'Aye',
-      'anchor' => 'for',
+        'title' => 'Aye',
+        'anchor' => 'for',
     ),
     'no_votes' => array(
-      'title' => 'No',
-      'anchor' => 'against',
+        'title' => 'No',
+        'anchor' => 'against',
     ),
     'absent_votes' => array(
-      'title' => 'Absent',
-      'anchor' => 'absent',
+        'title' => 'Absent',
+        'anchor' => 'absent',
     ),
     'both_votes' => array(
-      'title' => 'Abstained',
-      'anchor' => 'both',
+        'title' => 'Abstained',
+        'anchor' => 'both',
     ),
 );
 

Spacing +8 added lines, -8 removed lines

@@ -55,17 +55,17 @@
     ),
 );
 
-foreach ( $division_sections as $s ) {
-    $vote_title = $vote_sets[ $s['thekey'] ]['title'];
-    $anchor = $vote_sets[ $s['thekey'] ]['anchor'];
-    $summary = $division['party_breakdown'][ $s['thekey'] ];
+foreach ($division_sections as $s) {
+    $vote_title = $vote_sets[$s['thekey']]['title'];
+    $anchor = $vote_sets[$s['thekey']]['anchor'];
+    $summary = $division['party_breakdown'][$s['thekey']];
 
-    if ( $s['style'] == 'dot_vote_list' ) {
-        $votes = $division[ $s['thekey'] . '_by_party' ];
+    if ($s['style'] == 'dot_vote_list') {
+        $votes = $division[$s['thekey'] . '_by_party'];
         include '_dot_vote_list.php';
 
-    } else if ( $s['style'] == 'name_vote_list' ) {
-        $votes = $division[ $s['thekey'] ];
+    } else if ($s['style'] == 'name_vote_list') {
+        $votes = $division[$s['thekey']];
         include '_name_vote_list.php';
     }
 }

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

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) {
+/* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>

Indentation +14 added lines, -14 removed lines

@@ -11,27 +11,27 @@
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
       <?php if ( isset($mp_vote) ) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
-          switch ($mp_vote['vote']) {
-              case 'aye':
+            switch ($mp_vote['vote']) {
+                case 'aye':
                   echo 'Aye';
-                  break;
-              case 'no':
+                    break;
+                case 'no':
                   echo 'No';
-                  break;
-              case 'absent':
+                    break;
+                case 'absent':
                   echo 'Absent';
-                  break;
-              case 'both':
+                    break;
+                case 'both':
                   echo 'Abstain';
-                  break;
-              case 'tellaye':
+                    break;
+                case 'tellaye':
                   echo 'Aye (Teller)';
-                  break;
-              case 'tellno':
+                    break;
+                case 'tellno':
                   echo 'No (Teller)';
-              default:
+                default:
                   echo 'N/A';
-          }
+            }
         ?></span>
       <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
         <span class="your-mp__vote">N/A</span>

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if (!isset($main_vote_mp) || !$main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>
@@ -9,7 +9,7 @@ 
     </div>
   <?php } ?>
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
-      <?php if ( isset($mp_vote) ) { ?>
+      <?php if (isset($mp_vote)) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
           switch ($mp_vote['vote']) {
               case 'aye':
@@ -33,7 +33,7 @@ 
                   echo 'N/A';
           }
         ?></span>
-      <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
+      <?php } else if (isset($before_mp) || isset($after_mp)) { ?>
         <span class="your-mp__vote">N/A</span>
       <?php } ?>
         <img class="your-mp__image" src="<?= $data['mp_data']['image'] ?>">
@@ -41,7 +41,7 @@ 
             <h2 class="people-list__person__name"><?= $data['mp_data']['name'] ?></h2>
             <p class="people-list__person__memberships">
                 <span class="people-list__person__constituency"><?= $data['mp_data']['constituency'] ?></span>
-                <span class="people-list__person__party <?= slugify( $data['mp_data']['party'] ) ?>"><?= $data['mp_data']['party'] ?></span>
+                <span class="people-list__person__party <?= slugify($data['mp_data']['party']) ?>"><?= $data['mp_data']['party'] ?></span>
             </p>
         </div>
     </a>

www/docs/section.php

Spacing +2 added lines, -2 removed lines

@@ -21,14 +21,14 @@
     if (isset($THEUSER) && $THEUSER->postcode_is_set()) {
         try {
             $MEMBER = new MySociety\TheyWorkForYou\Member(array('postcode' => $THEUSER->postcode(), 'house' => \MySociety\TheyWorkForYou\Utility\House::majorToHouse($view->major)[0]));
-        } catch ( MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (MySociety\TheyWorkForYou\MemberException $e) {
             $MEMBER = null;
         }
     }
 
     $data = $view->display();
     if ($data) {
-        if ( !empty($data['template']) ) {
+        if (!empty($data['template'])) {
             $template = $data['template'];
         } else {
             $template = 'section/section';

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

@@ -13,7 +13,7 @@
 }
 
 if ($type = ucfirst(get_http_var('type'))) {
-    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
+    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
     $view = new $class_name();
 
     // use this for generating member vote data