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

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'
             )
         );
 

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 } ?>

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',
     ),
 );
 

www/docs/divisions/division.php

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/_your_mp.php

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>

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

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
                   <?php if (isset($data['mp_data'])) {
                     include('_your_mp.php');
-                  } ?>
+                    } ?>
 
                     <div class="debate-speech__division__details">
                       <p>

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

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
         if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
             $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' <a href="/spwrans/?spid=$1">$1</a> ', $body);
             $body = preg_replace_callback('#<citation id="uk\.org\.publicwhip/(.*?)/(.*?)">\[(.*?)\]</citation>#', function($matches) {
-                   if ($matches[1] == 'spor') {
-                       $href_segment = 'sp/?g';
-                   } elseif ($matches[1] == 'spwa') {
+                    if ($matches[1] == 'spor') {
+                        $href_segment = 'sp/?g';
+                    } elseif ($matches[1] == 'spwa') {
                         $href_segment = 'spwrans/?';
                     } else {
                         $href_segment = 'debates/?';
@@ -187,7 +187,7 @@ 
                 $before_mp = isset($speech['before_mp']);
                 $after_mp = isset($speech['after_mp']);
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
-              } ?>
+                } ?>
                 <div class="debate-speech__division__details">
                   <?php include dirname(__FILE__) . '/../divisions/_votes.php'; ?>
                 </div>