mysociety / theyworkforyou

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

Indentation +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
                     </h2>
 
                   <?php if (isset($data['mp_data'])) {
-                      include('_your_mp.php');
-                  } ?>
+                        include('_your_mp.php');
+                    } ?>
 
                     <div class="debate-speech__division__details">
                       <p>
@@ -38,10 +38,10 @@ 
                       <?php } else { ?>
                           <?php if ($mp_vote['with_majority']) { ?>
                               <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>agreed</b> and';
-                              include('_vote_description.php'); ?>
+                                include('_vote_description.php'); ?>
                           <?php } else { ?>
                               <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>disagreed</b> and';
-                              include('_vote_description.php'); ?>
+                                include('_vote_description.php'); ?>
                           <?php } ?>
                       <?php } ?>
                       </p>

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     <?php if (count($tellers) > 0) { ?>
       <h4><?= gettext('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/divisions/_vote_summary.php

Indentation +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <p>
     <a href="#for"><?= sprintf(gettext('%s for'), $division['for']) ?></a>,
     <a href="#against"><?= sprintf(gettext('%s against'), $division['against']) ?></a><?php
-  if ($division['both'] > 0) { ?>,
+    if ($division['both'] > 0) { ?>,
     <a href="#both"><?= sprintf(gettext('%s abstained'), $division['both']) ?></a><?php
-  }
+    }
     if ($division['absent'] > 0) { ?>,
     <a href="#absent"><?= sprintf(gettext('%s absent'), $division['absent']) ?></a><?php
     } ?>.

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

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     ],
 ];
 
-$sections_with_votes = array_filter(array_keys($vote_sets), function ($s) use ($division) {
+$sections_with_votes = array_filter(array_keys($vote_sets), function($s) use ($division) {
     return count($division[$s]);
 });
 $sections_with_votes = array_values($sections_with_votes);

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

Indentation +16 added lines, -16 removed lines

@@ -11,29 +11,29 @@
     <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)';
-                  break;
-              default:
+                    break;
+                default:
                   echo 'N/A';
-          }
-          ?></span>
+            }
+            ?></span>
       <?php } elseif (isset($before_mp) || isset($after_mp)) { ?>
         <span class="your-mp__vote">N/A</span>
       <?php } ?>

Spacing +1 added lines, -1 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>

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>

www/includes/easyparliament/templates/html/topic/topic.php

Braces +3 added lines, -1 removed lines

@@ -58,10 +58,12 @@
                     to <a href="<?= $member_url ?>/votes">see all their votes</a>.
                 </p>
 
-              <?php else: ?>
+              <?php else {
+    : ?>
                 <ul class="vote-descriptions">
                   <?php
                   $policy_ids = [];
+}
 
                   foreach ($positions as $position) {
                       if (!in_array($position['policy_id'], $policy_ids)) {

Indentation +17 added lines, -17 removed lines

@@ -61,23 +61,23 @@
               <?php else: ?>
                 <ul class="vote-descriptions">
                   <?php
-                  $policy_ids = [];
-
-                  foreach ($positions as $position) {
-                      if (!in_array($position['policy_id'], $policy_ids)) {
-                          $description = ucfirst($position['desc']);
-                          $link = sprintf(
-                              '%s/divisions?policy=%s',
-                              $member_url,
-                              $position['policy_id']
-                          );
-                          $link_text = $position['position'] != 'has never voted on' ? 'Show votes' : 'Details';
-                          $key_vote = $position;
-                          include(dirname(__DIR__) . '/mp/_vote_description.php');
-
-                          $policy_ids[] = $position['policy_id'];
-                      }
-                  } ?>
+                    $policy_ids = [];
+
+                    foreach ($positions as $position) {
+                        if (!in_array($position['policy_id'], $policy_ids)) {
+                            $description = ucfirst($position['desc']);
+                            $link = sprintf(
+                                '%s/divisions?policy=%s',
+                                $member_url,
+                                $position['policy_id']
+                            );
+                            $link_text = $position['position'] != 'has never voted on' ? 'Show votes' : 'Details';
+                            $key_vote = $position;
+                            include(dirname(__DIR__) . '/mp/_vote_description.php');
+
+                            $policy_ids[] = $position['policy_id'];
+                        }
+                    } ?>
                 </ul>
 
               <?php endif; ?>

www/includes/easyparliament/templates/api/comments.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         // COMMENT REPORTING LINK.
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && $THEUSER->user_id() != $comment['user_id']

www/includes/utility.php

Braces +6 added lines, -3 removed lines

@@ -319,7 +319,8 @@ 
 
     if (preg_match("/^(\d\d\d\d)-(\d\d?)-(\d\d?)$/", $date, $matches)) {
         [$string, $year, $month, $day] = $matches;
-        if ($year < 1902) { # gmdate fns only go back to Dec. 1901
+        if ($year < 1902) {
+# gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
                 return ($day + 0) . ' ' . $format_date_months_short[$month + 0] . " $year";
             } else {
@@ -1046,7 +1047,8 @@ 
         'Lords in Waiting (HM Household)' => 'Government Whip',
         'Baronesses in Waiting, HM Household' => 'Government Whip',
     ];
-    if ($pos) { # Government post, or Chairman of Select Committee
+    if ($pos) {
+# Government post, or Chairman of Select Committee
         $pretty = $pos;
         if ($dept && $dept != 'No Department') {
             $pretty .= ", $dept";
@@ -1054,7 +1056,8 @@ 
         if (array_key_exists($pretty, $lookup)) {
             $pretty = $lookup[$pretty];
         }
-    } else { # Member of Select Committee
+    } else {
+# Member of Select Committee
         $pretty = "Member, $dept";
     }
     return $pretty;

Spacing +15 added lines, -15 removed lines

@@ -29,7 +29,7 @@ 
     if ($debug_level != '') {
 
         // Set which level shows which types of debug info.
-        $levels =  [
+        $levels = [
             1 =>  ['THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'],
             2 =>  ['SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'],
             3 =>  ['SQLRESULT'],
@@ -78,7 +78,7 @@ 
     // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
     // E_USER_WARNING and E_USER_NOTICE
     # Commented out are ones that a user function cannot handle.
-    $errortype =  [
+    $errortype = [
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
         #E_PARSE            => "Parsing Error",
@@ -355,14 +355,14 @@ 
     $in_seconds = strtotime($datetime);
     $now = time();
 
-    $diff   =  $now - $in_seconds;
-    $months =  floor($diff / 2419200);
+    $diff   = $now - $in_seconds;
+    $months = floor($diff / 2419200);
     $diff   -= $months * 2419200;
-    $weeks  =  floor($diff / 604800);
+    $weeks  = floor($diff / 604800);
     $diff   -= $weeks * 604800;
-    $days   =  floor($diff / 86400);
+    $days   = floor($diff / 86400);
     $diff   -= $days * 86400;
-    $hours  =  floor($diff / 3600);
+    $hours  = floor($diff / 3600);
     $diff   -= $hours * 3600;
     $minutes = floor($diff / 60);
     $diff   -= $minutes * 60;
@@ -497,11 +497,11 @@ 
 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
-        $filter->allowed =  [];
+        $filter->allowed = [];
     } else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
-        $filter->allowed =  [
+        $filter->allowed = [
             'a' => ['href'],
             'strong' => [],
             'em' => [],
@@ -530,7 +530,7 @@ 
     $link_length = 60;
     $text = preg_replace_callback(
         "/(?<!\"|\/)((http(s?):\/\/)|(www\.))([a-zA-Z\d_.+,;:?%~\-\/#='*$!()&[\]]+)([a-zA-Z\d_?%~\-\/#='*$!&])/",
-        function ($matches) use ($link_length) {
+        function($matches) use ($link_length) {
             if (strlen($matches[0]) > $link_length) {
                 return '<a href="' . $matches[0] . '" rel="nofollow">' . substr($matches[0], 0, $link_length) . "...</a>";
             } else {
@@ -898,7 +898,7 @@ 
 function entities_to_numbers($string) {
     $string = str_replace(
         ['&Ouml;', '&acirc;', '&uacute;', '&aacute;', '&iacute;', '&ocirc;', '&eacute;'],
-        ['&#214;', '&#226;',  '&#250;',   '&#225;',   '&#237;',   '&#244;',  '&#233;'  ],
+        ['&#214;', '&#226;', '&#250;', '&#225;', '&#237;', '&#244;', '&#233;'],
         $string
     );
     return $string;
@@ -915,9 +915,9 @@ 
         }
     }
 
-    $s   = [' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;'];
-    $s2  = [" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93"];
-    $r   = ['_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o'];
+    $s   = [' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;'];
+    $s2  = [" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93"];
+    $r   = ['_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o'];
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -1096,7 +1096,7 @@ 
                 }
                 $out .= '<li>' . $body . '<ul>';
             } else {
-                $LISTURL->insert([ 'id' => $gid ]);
+                $LISTURL->insert(['id' => $gid]);
                 $out .= '<li><a href="' . $LISTURL->generate() . '">';
                 $out .= $body . '</a>';
             }

www/docs/admin/featured.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     global $hansardmajors;
     global $db;
 
-    $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]);
@@ -118,7 +118,7 @@ 
     print "<h2>Preview Content</h2>";
     if ($gid !== null) {
         $h = new MySociety\TheyWorkForYou\Homepage();
-        $featured = $h->getFeaturedDebate($gid, $title, $context, [ $related_gid1, $related_gid2, $related_gid3 ]);
+        $featured = $h->getFeaturedDebate($gid, $title, $context, [$related_gid1, $related_gid2, $related_gid3]);
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
     } else {