mysociety / theyworkforyou

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

Indentation +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
             <ul class="business-list">
               <?php
                 $prevlevel = '';
-          foreach ($rows as $row) { ?>
+            foreach ($rows as $row) { ?>
                 <?php if ($row['htype'] == 10) {
                     if ($prevlevel == 'sub') { ?>
                     </ul>
@@ -49,7 +49,7 @@ 
                       <?php } ?>
                     </a>
                   <?php }
-                  if (isset($row['excerpt'])) { ?>
+                    if (isset($row['excerpt'])) { ?>
                     <p class="business-list__excerpt">
                         <?= trim_characters($row['excerpt'], 0, 200) ?>
                     </p>

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

Indentation +3 added lines, -3 removed lines

@@ -32,9 +32,9 @@
         </div>
     </div>
   <?php } else {
-      $section = false;
-      include '_section_content.php';
-  } ?>
+        $section = false;
+        include '_section_content.php';
+    } ?>
 
 </div>
 

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

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-foreach($data['rows'] as $speech) { ?>
+foreach ($data['rows'] as $speech) { ?>
 
     <?php
 
@@ -15,7 +15,7 @@ 
             $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) {
+                function($matches) {
                     if ($matches[1] == 'spor') {
                         $href_segment = 'sp/?g';
                     } elseif ($matches[1] == 'spwa') {
@@ -119,7 +119,7 @@ 
             <div class="debate-speech__speaker-and-content">
             <?php } ?>
 
-          <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
+          <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
             <h2 class="debate-speech__speaker">
                 <?php
 
@@ -193,7 +193,7 @@ 
                 <?php } ?>
 
               <?php if (isset($speech['mp_vote'])) {
-                  $mp_vote = [ 'vote' => $speech['mp_vote']['vote'] ];
+                  $mp_vote = ['vote' => $speech['mp_vote']['vote']];
                   if (isset($speech['before_mp'])) {
                       $before_mp = $speech['before_mp'];
                   }

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

@@ -167,7 +167,7 @@
               <?php # XXX
               if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
                   ?><p class="debate-speech__question_id"><small>
-                    <?= "Question $m[1]" ?>
+                    <?= "question $m[1]" ?>
                     </small></p>
               <?php } ?>
 

Indentation +33 added lines, -33 removed lines

@@ -124,32 +124,32 @@ 
                 <?php
 
                 $speaker = $speech['speaker'];
-              $speaker_name = ucfirst($speaker['name']);
-
-              [$image_url, $size] = MySociety\TheyWorkForYou\Utility\Member::findMemberImage(
-                  $speaker['person_id'],
-                  true,
-                  $data['info']['major'] == 101 ? 'lord' : 'general'
-              );
-
-              if (count($speaker['office'])) {
-                  $desc = [];
-                  foreach ($speaker['office'] as $off) {
-                      $desc[] = $off['pretty'];
-                  }
-                  $speaker_position = join(', ', $desc);
-              } else {
-                  $speaker_position = _htmlentities($speaker['party']);
-                  if ($speaker['house'] == 1 &&
+                $speaker_name = ucfirst($speaker['name']);
+
+                [$image_url, $size] = MySociety\TheyWorkForYou\Utility\Member::findMemberImage(
+                    $speaker['person_id'],
+                    true,
+                    $data['info']['major'] == 101 ? 'lord' : 'general'
+                );
+
+                if (count($speaker['office'])) {
+                    $desc = [];
+                    foreach ($speaker['office'] as $off) {
+                        $desc[] = $off['pretty'];
+                    }
+                    $speaker_position = join(', ', $desc);
+                } else {
+                    $speaker_position = _htmlentities($speaker['party']);
+                    if ($speaker['house'] == 1 &&
                       $speaker['party'] != 'Speaker' &&
                       $speaker['party'] != 'Deputy Speaker' &&
                       $speaker['constituency']
-                  ) {
-                      $speaker_position .= ', ' . $speaker['constituency'];
-                  }
-              }
+                    ) {
+                        $speaker_position .= ', ' . $speaker['constituency'];
+                    }
+                }
 
-              ?>
+                ?>
                 <a href="<?= $speech['speaker']['url'] ?>">
                     <img src="<?= $image_url ?>" alt="Photo of <?= $speaker_name ?>">
                     <strong class="debate-speech__speaker__name"><?= $speaker_name ?></strong>
@@ -165,8 +165,8 @@ 
               <?php } ?>
 
               <?php # XXX
-              if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
-                  ?><p class="debate-speech__question_id"><small>
+                if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
+                    ?><p class="debate-speech__question_id"><small>
                     <?= "Question $m[1]" ?>
                     </small></p>
               <?php } ?>
@@ -193,15 +193,15 @@ 
                 <?php } ?>
 
               <?php if (isset($speech['mp_vote'])) {
-                  $mp_vote = [ 'vote' => $speech['mp_vote']['vote'] ];
-                  if (isset($speech['before_mp'])) {
-                      $before_mp = $speech['before_mp'];
-                  }
-                  if (isset($speech['after_mp'])) {
-                      $after_mp = $speech['after_mp'];
-                  }
-                  include dirname(__FILE__) . '/../divisions/_your_mp.php';
-              } ?>
+                    $mp_vote = [ 'vote' => $speech['mp_vote']['vote'] ];
+                    if (isset($speech['before_mp'])) {
+                        $before_mp = $speech['before_mp'];
+                    }
+                    if (isset($speech['after_mp'])) {
+                        $after_mp = $speech['after_mp'];
+                    }
+                    include dirname(__FILE__) . '/../divisions/_your_mp.php';
+                } ?>
                 <div class="debate-speech__division__details">
                   <?php include dirname(__FILE__) . '/../divisions/_votes.php'; ?>
                 </div>

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

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $divisions_to_link = [];
-foreach($data['rows'] as $speech) {
+foreach ($data['rows'] as $speech) {
 
     # Only care about divisions...
     if ($speech['htype'] != 14) {

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

Spacing +2 added lines, -2 removed lines

@@ -85,13 +85,13 @@
 
             <p><strong>Chairpersons</strong></p>
             <ul>
-            <?php foreach($committee['chairmen'] as $chair) { ?>
+            <?php foreach ($committee['chairmen'] as $chair) { ?>
                 <li><?= $chair['name'] ?> (<?= $chair['attending'] ?>)</li>
             <?php } ?>
             </ul>
             <p><strong>Members</strong></p>
             <ul>
-            <?php foreach($committee['members'] as $chair) { ?>
+            <?php foreach ($committee['members'] as $chair) { ?>
                 <li><?= $chair['name'] ?> (<?= $chair['attending'] ?>)</li>
             <?php } ?>
             </ul>

www/includes/easyparliament/templates/html/mp/_division_description.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     <?php
     # remove the current policy from the list of related policies
     if (isset($policy)) {
-        $division['related_policies'] = array_filter($division['related_policies'], function ($related_policy) use ($policy) {
+        $division['related_policies'] = array_filter($division['related_policies'], function($related_policy) use ($policy) {
             return $related_policy['policy_id'] != $policy['policy_id'];
         });
     }

www/includes/easyparliament/templates/html/mp/votes.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
                           $policy_direction = $key_vote["person_position"];
                           $policy_group = "highlighted";
                           $party_score_difference = $key_vote["score_difference"];
-                          $party_position = $key_vote['party_position'] ;
+                          $party_position = $key_vote['party_position'];
                           $comparison_party = $data["comparison_party"];
                           $current_party_comparison = $data["current_party_comparison"];
                           $unslugified_comparison_party = ucwords(str_replace('-', ' ', $comparison_party));

Indentation +78 added lines, -78 removed lines

@@ -113,34 +113,34 @@ 
                     <ul class="vote-descriptions">
                       <?php foreach ($sorted_diffs_only as $policy_id => $diff) {
 
-                          $key_vote = $diff;
-                          $covid_affected = in_array($policy_id, $covid_policy_list);
-                          $policy_desc = strip_tags($key_vote['policy_text']);
-                          $policy_direction = $key_vote["person_position"];
-                          $policy_group = "highlighted";
-                          $party_score_difference = $key_vote["score_difference"];
-                          $party_position = $key_vote['party_position'] ;
-                          $comparison_party = $data["comparison_party"];
-                          $current_party_comparison = $data["current_party_comparison"];
-                          $unslugified_comparison_party = ucwords(str_replace('-', ' ', $comparison_party));
-
-                          if (strlen($unslugified_comparison_party) == 3) {
-                              $unslugified_comparison_party = strtoupper($comparison_party);
-                          }
-                          $description = sprintf(
-                              '%s <b>%s</b> %s; comparable %s MPs <b>%s</b>.',
-                              $full_name,
-                              $diff['person_position'],
-                              strip_tags($diff['policy_text']),
-                              $unslugified_comparison_party,
-                              $diff['party_position']
-                          );
-                          $link = $member_url . '/divisions?policy=' . $policy_id;
-                          $link_text = 'Show votes';
-
-                          include '_vote_description.php';
-
-                      } ?>
+                            $key_vote = $diff;
+                            $covid_affected = in_array($policy_id, $covid_policy_list);
+                            $policy_desc = strip_tags($key_vote['policy_text']);
+                            $policy_direction = $key_vote["person_position"];
+                            $policy_group = "highlighted";
+                            $party_score_difference = $key_vote["score_difference"];
+                            $party_position = $key_vote['party_position'] ;
+                            $comparison_party = $data["comparison_party"];
+                            $current_party_comparison = $data["current_party_comparison"];
+                            $unslugified_comparison_party = ucwords(str_replace('-', ' ', $comparison_party));
+
+                            if (strlen($unslugified_comparison_party) == 3) {
+                                $unslugified_comparison_party = strtoupper($comparison_party);
+                            }
+                            $description = sprintf(
+                                '%s <b>%s</b> %s; comparable %s MPs <b>%s</b>.',
+                                $full_name,
+                                $diff['person_position'],
+                                strip_tags($diff['policy_text']),
+                                $unslugified_comparison_party,
+                                $diff['party_position']
+                            );
+                            $link = $member_url . '/divisions?policy=' . $policy_id;
+                            $link_text = 'Show votes';
+
+                            include '_vote_description.php';
+
+                        } ?>
                     </ul>
 
                     <?php } ?>
@@ -175,56 +175,56 @@ 
 
                             <ul class="vote-descriptions">
                               <?php foreach ($segment['votes']->positions as $key_vote) {
-                                  $policy_id = $key_vote['policy_id'];
-                                  $covid_affected = in_array($policy_id, $covid_policy_list);
-                                  $policy_desc = strip_tags($key_vote['policy']);
-                                  $policy_direction = $key_vote["position"];
-                                  $policy_group = $segment['key'];
-
-                                  if (isset($policy_last_update[$policy_id]) && $policy_last_update[$policy_id] > $most_recent) {
-                                      $most_recent = $policy_last_update[$policy_id];
-                                  }
-
-                                  if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
-                                      $description = ucfirst($key_vote['desc']);
-                                  } else {
-                                      $description = sprintf(
-                                          'We don&rsquo;t have enough information to calculate %s&rsquo;s position on %s.',
-                                          $full_name,
-                                          $key_vote['policy']
-                                      );
-                                  }
-                                  $link = sprintf(
-                                      '%s/divisions?policy=%s',
-                                      $member_url,
-                                      $policy_id
-                                  );
-                                  $link_text = $key_vote['position'] != 'has never voted on' ? 'Show votes' : 'Details';
-                                  $comparison_party = $data["comparison_party"];
-
-                                  # Unslugify for display
-                                  $unslugified_comparison_party = ucwords(str_replace('-', ' ', $comparison_party));
-
-                                  if (strlen($unslugified_comparison_party) == 3) {
-                                      $unslugified_comparison_party = strtoupper($comparison_party);
-                                  }
-                                  $min_diff_score = 0; // setting this to 0 means that all comparisons are displayed.
-                                  if (isset($sorted_diffs[$policy_id])) {
-                                      $diff = $sorted_diffs[$policy_id];
-                                      $party_position = $diff['party_position'];
-                                      $party_score_difference = $diff["score_difference"];
-                                      if ($sorted_diffs[$policy_id]['score_difference'] > $min_diff_score && $party_member_count > 1) {
-                                          $party_voting_line = sprintf('Comparable %s MPs %s.', $unslugified_comparison_party, $diff['party_position']);
-                                      }
-                                  } else {
-                                      $party_voting_line = null;
-                                      $party_position = null;
-                                      $party_score_difference = null;
-                                  }
-
-                                  include '_vote_description.php';
-
-                              } ?>
+                                    $policy_id = $key_vote['policy_id'];
+                                    $covid_affected = in_array($policy_id, $covid_policy_list);
+                                    $policy_desc = strip_tags($key_vote['policy']);
+                                    $policy_direction = $key_vote["position"];
+                                    $policy_group = $segment['key'];
+
+                                    if (isset($policy_last_update[$policy_id]) && $policy_last_update[$policy_id] > $most_recent) {
+                                        $most_recent = $policy_last_update[$policy_id];
+                                    }
+
+                                    if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
+                                        $description = ucfirst($key_vote['desc']);
+                                    } else {
+                                        $description = sprintf(
+                                            'We don&rsquo;t have enough information to calculate %s&rsquo;s position on %s.',
+                                            $full_name,
+                                            $key_vote['policy']
+                                        );
+                                    }
+                                    $link = sprintf(
+                                        '%s/divisions?policy=%s',
+                                        $member_url,
+                                        $policy_id
+                                    );
+                                    $link_text = $key_vote['position'] != 'has never voted on' ? 'Show votes' : 'Details';
+                                    $comparison_party = $data["comparison_party"];
+
+                                    # Unslugify for display
+                                    $unslugified_comparison_party = ucwords(str_replace('-', ' ', $comparison_party));
+
+                                    if (strlen($unslugified_comparison_party) == 3) {
+                                        $unslugified_comparison_party = strtoupper($comparison_party);
+                                    }
+                                    $min_diff_score = 0; // setting this to 0 means that all comparisons are displayed.
+                                    if (isset($sorted_diffs[$policy_id])) {
+                                        $diff = $sorted_diffs[$policy_id];
+                                        $party_position = $diff['party_position'];
+                                        $party_score_difference = $diff["score_difference"];
+                                        if ($sorted_diffs[$policy_id]['score_difference'] > $min_diff_score && $party_member_count > 1) {
+                                            $party_voting_line = sprintf('Comparable %s MPs %s.', $unslugified_comparison_party, $diff['party_position']);
+                                        }
+                                    } else {
+                                        $party_voting_line = null;
+                                        $party_position = null;
+                                        $party_score_difference = null;
+                                    }
+
+                                    include '_vote_description.php';
+
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

www/includes/easyparliament/templates/html/mp/recent.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
                 <div>
                     <h3 class="browse-content"><?= gettext('Browse content') ?></h3>
                     <ul>
-                        <?php foreach($sidebar_links as $date) { ?>
+                        <?php foreach ($sidebar_links as $date) { ?>
                           <li>
                               <a href="#<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                                   <?= strftime('%e %b %Y', strtotime($date)) ?>

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

Indentation +15 added lines, -15 removed lines

@@ -116,19 +116,19 @@ 
       <?php } ?>
 
       <?php
-          if(
-              $members ||
+            if(
+                $members ||
               (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 ($members) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3><?= sprintf(gettext('Sign up for alerts when people matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3>
                 <ul>
                   <?php
@@ -140,7 +140,7 @@ 
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="pid" value="<?= $row['person_id'] ?>">
                             <?php
-                                  $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']);
+                                    $name = member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']);
                         if ($row['constituency']) {
                             $name .= ' (' . gettext($row['constituency']) . ')';
                         }
@@ -154,7 +154,7 @@ 
               <?php } ?>
 
               <?php if (isset($constituencies) && count($constituencies) > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3><?= sprintf(gettext('Sign up for alerts when MPs for constituencies matching <i>%s</i> speaks'), _htmlspecialchars($alertsearch)) ?></h3>
                 <ul>
                 <?php foreach ($constituencies as $constituency => $member) { ?>
@@ -172,7 +172,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                  if ($member_options) { ?>
+                    if ($member_options) { ?>
                 <h3><?= gettext('Sign up for alerts for topics') ?></h3>
                 <?php } else { ?>
                 <h3><?= gettext('Great! Can you just confirm what you mean?') ?></h3>
@@ -202,8 +202,8 @@ 
                             want? You will only get an alert if all of these
                             are mentioned in the same debate.') ?>
                           <?php if (isset($member_alertsearch)) {
-                              printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…'));
-                          } ?>
+                                printf(gettext('Did you mean to get alerts for when your representative mentions something instead? If so maybe you want to subscribe to…'));
+                            } ?>
                         </em>
                       <?php } ?>
                     </li>
@@ -287,9 +287,9 @@ 
                 <h3>
                     <?php
                         $name = $pid_member->full_name();
-                  if ($pid_member->constituency()) {
-                      $name .= ' (' . _htmlspecialchars($pid_member->constituency()) . ')';
-                  } ?>
+                    if ($pid_member->constituency()) {
+                        $name .= ' (' . _htmlspecialchars($pid_member->constituency()) . ')';
+                    } ?>
                     <?= sprintf(gettext('Sign up for an alert when %s speaks.'), $name) ?>
                 </h3>
               <?php } elseif ($keyword) { ?>

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
       <?php } ?>
 
       <?php
-          if(
+          if (
               $members ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)