mysociety / theyworkforyou

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

Braces +5 added lines, -2 removed lines

@@ -146,13 +146,16 @@
 
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <div class="panel">
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
                         </div>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 <?php endif; ?>
                 <?php include('_covid19_panel.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">

classes/Model/AnnouncementManagement.php

Spacing +3 added lines, -3 removed lines

@@ -176,7 +176,7 @@ 
         }
 
         # discard any invalid banners
-        $banners = array_filter($banners, function ($banner) {
+        $banners = array_filter($banners, function($banner) {
             return is_valid_item($banner);
         });
 
@@ -198,12 +198,12 @@ 
         }
 
         # discard any invalid announcements
-        $items = array_filter($items, function ($item) {
+        $items = array_filter($items, function($item) {
             return is_valid_item($item);
         });
 
         # limit to announcements with the correct location
-        $items = array_filter($items, function ($item) use ($location) {
+        $items = array_filter($items, function($item) use ($location) {
             return in_array($location, $item->location);
         });
 

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

Spacing +3 added lines, -3 removed lines

@@ -5,9 +5,9 @@ 
 
     <p><?= gettext('For an explanation of the vote descriptions please see our page about <a href="/voting-information">voting information on TheyWorkForYou</a>.') ?></p>
 
-  <?php if(isset($data['photo_attribution_text'])) { ?>
+  <?php if (isset($data['photo_attribution_text'])) { ?>
     <p>
-      <?php if(isset($data['photo_attribution_link'])) { ?>
+      <?php if (isset($data['photo_attribution_link'])) { ?>
         <?= gettext('Profile photo:') ?>
         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
       <?php } else { ?>
@@ -15,7 +15,7 @@ 
       <?php } ?>
     </p>
   <?php } ?>
-  <?php if(!$image || !$image['exists']) { ?>
+  <?php if (!$image || !$image['exists']) { ?>
     <p>
         We&rsquo;re missing a photo of <?= $full_name ?>.
         If you have a photo <em>that you can release under

classes/AlertView/Simple.php

Spacing +4 added lines, -4 removed lines

@@ -121,8 +121,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member([ 'person_id' => $old_mp_id ]);
-        $new_mp = new \MySociety\TheyWorkForYou\Member([ 'constituency' => $old_mp->constituency, 'house' => 1 ]);
+        $old_mp = new \MySociety\TheyWorkForYou\Member(['person_id' => $old_mp_id]);
+        $new_mp = new \MySociety\TheyWorkForYou\Member(['constituency' => $old_mp->constituency, 'house' => 1]);
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -185,8 +185,8 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member([ 'person_id' => $criteria ]);
-        $new_mp = new \MySociety\TheyWorkForYou\Member([ 'constituency' => $old_mp->constituency, 'house' => 1 ]);
+        $old_mp = new \MySociety\TheyWorkForYou\Member(['person_id' => $criteria]);
+        $new_mp = new \MySociety\TheyWorkForYou\Member(['constituency' => $old_mp->constituency, 'house' => 1]);
 
         if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = [

classes/PolicyPositions.php

Spacing +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
                 $has_strong = 1;
             }
             $full_sentence = $consistency . ' ' . $policy_description;
-            $out = [ 'full_sentence' => $full_sentence, 'score' => $dmpscore, 'position' => $consistency, 'has_strong' => $has_strong ];
+            $out = ['full_sentence' => $full_sentence, 'score' => $dmpscore, 'position' => $consistency, 'has_strong' => $has_strong];
         }
 
         return $out;

classes/Renderer/Markdown.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
         $title = $matches[1];
 
-        $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function ($matches) {
+        $html = preg_replace_callback('/<h([1-3])>([^<]+)<\/h[1-3]>/i', function($matches) {
             $level = $matches[1];
             $htitle = $matches[2];
             $slug = slugify($htitle);

classes/Search.php

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
         $data['search_keyword'] = $this->searchkeyword;
 
         $is_adv = false;
-        foreach (['to', 'from', 'person', 'section', 'column', 'phrase', 'exclude' ] as $var) {
+        foreach (['to', 'from', 'person', 'section', 'column', 'phrase', 'exclude'] as $var) {
             $key = "search_$var";
             $data[$key] = get_http_var($var);
             if ($data[$key]) {

classes/Utility/Postcode.php

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

@@ -42,7 +42,7 @@
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug("TIME", "Postcode $postcode looked up last time, is " . (is_array($return_value) ? implode(', ', $return_value) : $return_value));
+            twfy_debug("TIME", "postcode $postcode looked up last time, is " . (is_array($return_value) ? implode(', ', $return_value) : $return_value));
             return $return_value;
         }
 

classes/Utility/Hansard.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", [ ':gid' => $gid ])->first();
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", [':gid' => $gid])->first();
         $url_gid = fix_gid_from_db($gid);
         $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
         $url->insert(['id' => $url_gid]);