mysociety / theyworkforyou

www/includes/easyparliament/templates/html/search/by-person.php

Spacing +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@ 
                 <?php if ($error == 'No results' && isset($house) && $house != HOUSE_TYPE_ROYAL) { ?>
                   <ul class="search-result-display-options">
                       <li>
-                        <?php if ($house ==  HOUSE_TYPE_COMMONS) { ?>
+                        <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                           No results for MPs only
-                        <?php } elseif ($house ==  HOUSE_TYPE_LORDS) { ?>
+                        <?php } elseif ($house == HOUSE_TYPE_LORDS) { ?>
                           No results for Peers only
                         <?php } elseif ($house == HOUSE_TYPE_SCOTLAND) { ?>
                           No results for MSPs only
                         <?php } elseif ($house == HOUSE_TYPE_WALES) { ?>
                           <?= gettext('No results for MSs only') ?>
-                        <?php } elseif ($house ==  HOUSE_TYPE_NI) { ?>
+                        <?php } elseif ($house == HOUSE_TYPE_NI) { ?>
                           No results for MLAs only
                         <?php } ?>
                           |
@@ -47,37 +47,37 @@ 
                     <ul class="search-result-display-options">
                         <li><?= gettext('Results grouped by person') ?></li>
                         <li>
-                          <?php if ($house ==  HOUSE_TYPE_ROYAL) { ?>
+                          <?php if ($house == HOUSE_TYPE_ROYAL) { ?>
                             <?= gettext('Show All') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html') ?>"><?= gettext('Show All') ?></a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_COMMONS) { ?>
+                          <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                             MPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 1]) ?>">MPs only</a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_LORDS) { ?>
+                          <?php if ($house == HOUSE_TYPE_LORDS) { ?>
                             Peers only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 2]) ?>">Lords only</a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_SCOTLAND) { ?>
+                          <?php if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                             MSPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 4]) ?>">MSPs only</a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_WALES) { ?>
+                          <?php if ($house == HOUSE_TYPE_WALES) { ?>
                             <?= gettext('MSs only') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 5]) ?>"><?= gettext('MSs only') ?></a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_NI) { ?>
+                          <?php if ($house == HOUSE_TYPE_NI) { ?>
                             MLAs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => HOUSE_TYPE_NI]) ?>">MLAs only</a>
@@ -118,7 +118,7 @@ 
                                 <?php if (isset($speaker['party'])) { ?>
                                   <span class="search-results-grouped__speaker-party">(<?= $speaker['party'] ?>)</span>
                                 <?php } ?>
-                                <?php if ($house !=  HOUSE_TYPE_LORDS) { ?>
+                                <?php if ($house != HOUSE_TYPE_LORDS) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
                               <?php } else { // no $pid?>

Braces +2 added lines, -1 removed lines

@@ -121,7 +121,8 @@
                                 <?php if ($house !=  HOUSE_TYPE_LORDS) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
-                              <?php } else { // no $pid?>
+                              <?php } else {
+// no $pid?>
                                 <?= $speaker['name'] ?>
                               <?php } ?>
                             </td>

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

Indentation +112 added lines, -112 removed lines

@@ -1,43 +1,43 @@ 
 <div class="calendar">
   <?php if(isset($month)) {
-      // What is the first day of the month in question?
-      $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
-
-      // How many days does this month contain?
-      $numberDays = date('t', $firstDayOfMonth);
-
-      // What is the name of the month in question?
-      $monthName = strftime('%B', $firstDayOfMonth);
-
-      if (isset($info['onday'])) {
-          // 'onday' is like 'yyyy-mm-dd'.
-          $datebits = explode('-', $info['onday']);
-          if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
-              $toDay = $datebits[2];
-          } else {
-              $toDay = '';
-          }
-      } else {
-          // If this calendar is for this current, real world, month
-          // we get the value of today, so we can highlight it.
-          $nowDateComponents = getdate();
-
-          if ($nowDateComponents['year'] == $year && $nowDateComponents['mon'] == $month) {
-              $toDay = $nowDateComponents['mday'];
-          } else {
-              $toDay = '';
-          }
-      }
-
-      $dayOfWeek = strftime('%w', $firstDayOfMonth) - 1;
-
-      // Adjusted to cope with the week starting on Monday.
-      if ($dayOfWeek < 0) {
-          $dayOfWeek = 6;
-      }
-      ?>
+        // What is the first day of the month in question?
+        $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
+
+        // How many days does this month contain?
+        $numberDays = date('t', $firstDayOfMonth);
+
+        // What is the name of the month in question?
+        $monthName = strftime('%B', $firstDayOfMonth);
+
+        if (isset($info['onday'])) {
+            // 'onday' is like 'yyyy-mm-dd'.
+            $datebits = explode('-', $info['onday']);
+            if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
+                $toDay = $datebits[2];
+            } else {
+                $toDay = '';
+            }
+        } else {
+            // If this calendar is for this current, real world, month
+            // we get the value of today, so we can highlight it.
+            $nowDateComponents = getdate();
+
+            if ($nowDateComponents['year'] == $year && $nowDateComponents['mon'] == $month) {
+                $toDay = $nowDateComponents['mday'];
+            } else {
+                $toDay = '';
+            }
+        }
+
+        $dayOfWeek = strftime('%w', $firstDayOfMonth) - 1;
+
+        // Adjusted to cope with the week starting on Monday.
+        if ($dayOfWeek < 0) {
+            $dayOfWeek = 6;
+        }
+        ?>
   <?php }
-  if (!isset($years)) { ?>
+    if (!isset($years)) { ?>
     <div class="calendar__controls">
         <?php if (isset($prev)) { ?>
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
@@ -75,93 +75,93 @@ 
             <tr>
 
 <?php
-          if ($dayOfWeek > 0) {
-              print "<td colspan=\"$dayOfWeek\">&nbsp;</td>";
-          }
+            if ($dayOfWeek > 0) {
+                print "<td colspan=\"$dayOfWeek\">&nbsp;</td>";
+            }
 
-  $currentDay = 1;
+    $currentDay = 1;
 
-  while ($currentDay <= $numberDays) {
+    while ($currentDay <= $numberDays) {
 
-      // Seventh column (Sunday) reached. Start a new row.
+        // Seventh column (Sunday) reached. Start a new row.
 
-      if ($dayOfWeek == 7) {
+        if ($dayOfWeek == 7) {
 
-          $dayOfWeek = 0;
-          ?></tr>
+            $dayOfWeek = 0;
+            ?></tr>
                 <tr><?php
-      }
-
-      $recess = recess_prettify($currentDay, $month, $year, $recess_major);
-
-      // Is this day actually Today in the real world?
-      // If so, higlight it.
-      // Also highlight days where there are no
-      // sittings - e.g. WH is only Tuesday-Thursday
-      if ($currentDay == $toDay) {
-          print '<td class="on"';
-          if ($recess[0] && $recess[0] != 1) {
-              print ' title="' . $recess[0] . '"';
-          }
-          print '>';
-      } elseif ($recess[0]) {
-          print '<td class="no"';
-          if ($recess[0] != 1) {
-              print ' title="' . $recess[0] . '"';
-          }
-          print '>';
-      } else {
-          print '<td>';
-      }
-
-      // Is the $currentDay a member of $dates? If so,
-      // the day should be linked.
-      if (in_array($currentDay, $dates)) {
-
-          $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
-
-          if ($currentDay == $toDay) {
-              print '<span>' . $currentDay . '</span></td>';
-          } else {
-              $day_section = $section;
-              if ($section == 'sp') {
-                  $day_section = 'spdebates';
-              }
-              $urls[$day_section . 'day']->insert(['d' => $date]);
-              print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";
-          }
-
-          // $currentDay is not a member of $dates.
-
-      } else {
-
-          print '<span>' . $currentDay . '</span></td>';
-      }
-      // Increment counters
-
-      $currentDay++;
-      $dayOfWeek++;
-  }
-
-  // Complete the row of the last week in month, if necessary
-
-  if ($dayOfWeek != 7) {
-
-      $remainingDays = 7 - $dayOfWeek;
-      print "<td colspan=\"$remainingDays\">&nbsp;</td>";
-  }
-  ?>
+        }
+
+        $recess = recess_prettify($currentDay, $month, $year, $recess_major);
+
+        // Is this day actually Today in the real world?
+        // If so, higlight it.
+        // Also highlight days where there are no
+        // sittings - e.g. WH is only Tuesday-Thursday
+        if ($currentDay == $toDay) {
+            print '<td class="on"';
+            if ($recess[0] && $recess[0] != 1) {
+                print ' title="' . $recess[0] . '"';
+            }
+            print '>';
+        } elseif ($recess[0]) {
+            print '<td class="no"';
+            if ($recess[0] != 1) {
+                print ' title="' . $recess[0] . '"';
+            }
+            print '>';
+        } else {
+            print '<td>';
+        }
+
+        // Is the $currentDay a member of $dates? If so,
+        // the day should be linked.
+        if (in_array($currentDay, $dates)) {
+
+            $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
+
+            if ($currentDay == $toDay) {
+                print '<span>' . $currentDay . '</span></td>';
+            } else {
+                $day_section = $section;
+                if ($section == 'sp') {
+                    $day_section = 'spdebates';
+                }
+                $urls[$day_section . 'day']->insert(['d' => $date]);
+                print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";
+            }
+
+            // $currentDay is not a member of $dates.
+
+        } else {
+
+            print '<span>' . $currentDay . '</span></td>';
+        }
+        // Increment counters
+
+        $currentDay++;
+        $dayOfWeek++;
+    }
+
+    // Complete the row of the last week in month, if necessary
+
+    if ($dayOfWeek != 7) {
+
+        $remainingDays = 7 - $dayOfWeek;
+        print "<td colspan=\"$remainingDays\">&nbsp;</td>";
+    }
+    ?>
             </tr>
         </tbody>
     </table>
   <?php if(!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
-          $y = $urls['day'];
-      $y->reset();
-      $y->insert([ 'y' => $year ]);
-      $url = $y->generate();
-      ?>
+            $y = $urls['day'];
+        $y->reset();
+        $y->insert([ 'y' => $year ]);
+        $url = $y->generate();
+        ?>
     <a href="<?= $url ?>"><?= sprintf(gettext('See all of %s'), $year) ?></a>
     </div>
   <?php } ?>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <div class="calendar">
-  <?php if(isset($month)) {
+  <?php if (isset($month)) {
       // What is the first day of the month in question?
       $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
@@ -154,12 +154,12 @@ 
             </tr>
         </tbody>
     </table>
-  <?php if(!isset($years)) { ?>
+  <?php if (!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
           $y = $urls['day'];
       $y->reset();
-      $y->insert([ 'y' => $year ]);
+      $y->insert(['y' => $year]);
       $url = $y->generate();
       ?>
     <a href="<?= $url ?>"><?= sprintf(gettext('See all of %s'), $year) ?></a>

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/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)) ?>