mysociety / theyworkforyou

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

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     echo '<?xml version="1.0" encoding="iso-8859-1"?>';
 
- ?>
+    ?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="1000" height="500" viewBox="0 0 1000 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" font-family="Droid Sans, Trebuchet">
 

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

@@ -53,7 +53,7 @@
     <text font-size="24" font-weight="normal" fill="#000000">
         <?php foreach ($lines as $j=>$line) { ?>
             <tspan x="40" y="<?= $stance_y + $stance_padding_top + $stance_baseline_offset + ($stance_lineheight * $j) ?>"><?php
-                if (strpos($line, '*') !== False) {
+                if (strpos($line, '*') !== false) {
                     echo preg_replace(
                         '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
                         $tspan_bold_open . '$1' . $tspan_bold_close,

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
     $stances = array();
 
     foreach ($segment['votes']->positions as $key_vote) {
-        if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+        if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
             $stance = strip_tags($key_vote['desc'], '<b>');
             $stance = ucfirst($stance);
             $stance = preg_replace('#</?b>#i', '*', $stance);

Braces +2 added lines, -1 removed lines

@@ -59,7 +59,8 @@
                         $tspan_bold_open . '$1' . $tspan_bold_close,
                         $line
                     );
-                } else {
+                }
+                else {
                     echo $line;
                 }
             ?></tspan>

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

Indentation +9 added lines, -9 removed lines

@@ -122,25 +122,25 @@ 
       <?php } ?>
 
       <?php
-          if(
-              (isset($members) && $members->rows() > 0) ||
+            if(
+                (isset($members) && $members->rows() > 0) ||
               (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 (isset($members) && $members->rows() > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when people matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                   <?php
                     $q = $members;
                     for ($n=0; $n<$q->rows(); $n++) {
-                  ?>
+                    ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -160,7 +160,7 @@ 
               <?php } ?>
 
               <?php if (isset($constituencies) && count($constituencies) > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when MPs for constituencies matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                 <?php foreach ($constituencies as $constituency => $member) { ?>

Spacing +23 added lines, -23 removed lines

@@ -1,7 +1,7 @@ 
 <div class="full-page">
     <div class="full-page__row">
 
-      <?php if ( $message ) { ?>
+      <?php if ($message) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
                 <h3><?= $message['title'] ?></h3>
@@ -12,10 +12,10 @@ 
         </div>
       <?php } ?>
 
-      <?php if ( $results ) { ?>
+      <?php if ($results) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
-              <?php if ( $results == 'alert-confirmed' ) { ?>
+              <?php if ($results == 'alert-confirmed') { ?>
                 <h3>Your alert has been confirmed</h3>
                 <p>
                     You will now receive email alerts for the following criteria:
@@ -45,26 +45,26 @@ 
                 </div>
                 </noscript>
 
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
+              <?php } elseif ($results == 'alert-suspended') { ?>
                 <h3>Alert suspended</h3>
                 <p>
                     You can reactivate the alert at any time, from the sidebar below.
                 </p>
 
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
+              <?php } elseif ($results == 'alert-resumed') { ?>
                 <h3>Alert resumed</h3>
                 <p>
                     You will now receive email alerts on any day when there
                     are entries in Hansard that match your criteria.
                 </p>
 
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
+              <?php } elseif ($results == 'alert-deleted') { ?>
                 <h3>Alert deleted</h3>
                 <p>
                     You will no longer receive this alert.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Hmmm, something&rsquo;s not right</h3>
                 <p>
                     The link you followed to reach this page appears to be incomplete.
@@ -80,14 +80,14 @@ 
                     and let us know, and we'll help out!
                 </p>
 
-              <?php } elseif ( $results == 'alert-added' ) { ?>
+              <?php } elseif ($results == 'alert-added') { ?>
                 <h3>Your alert has been added</h3>
                 <p>
                     You will now receive email alerts on any day when
                     <?= _htmlspecialchars($criteria) ?> in parliament.
                 </p>
 
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
+              <?php } elseif ($results == 'alert-confirmation') { ?>
                 <h3>We&rsquo;re nearly done&hellip;</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
@@ -95,20 +95,20 @@ 
                     and receive future alerts. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
+              <?php } elseif ($results == 'alert-exists') { ?>
                 <h3>You&rsquo;re already subscribed to that!</h3>
                 <p>
                     It&rsquo;s good to know you&rsquo;re keen though.
                 </p>
 
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
+              <?php } elseif ($results == 'alert-already-signed') { ?>
                 <h3>We&rsquo;re nearly done</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
                     You will need to follow that link to confirm your email address to receive the alert. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Alert could not be created</h3>
                 <p>
                     Sorry, we were unable to create that alert. Please
@@ -122,7 +122,7 @@ 
       <?php } ?>
 
       <?php
-          if(
+          if (
               (isset($members) && $members->rows() > 0) ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
@@ -139,7 +139,7 @@ 
                 <ul>
                   <?php
                     $q = $members;
-                    for ($n=0; $n<$q->rows(); $n++) {
+                    for ($n = 0; $n < $q->rows(); $n++) {
                   ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
@@ -147,7 +147,7 @@ 
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="pid" value="<?= $q->field($n, 'person_id') ?>">
                             When
-                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname') ) ?>
+                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname')) ?>
                             <?php if ($q->field($n, 'constituency')) { ?>
                                 (<?= $q->field($n, 'constituency') ?>)
                             <?php } ?>
@@ -178,7 +178,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                if ( $member_options ) { ?>
+                if ($member_options) { ?>
                 <h3>Sign up for alerts for topics</h3>
                 <?php } else { ?>
                 <h3>Great! Can you just confirm what you mean?</h3>
@@ -192,7 +192,7 @@ 
                             Receive alerts when <?= _htmlspecialchars($alertsearch_pretty) ?>
                             <input type="submit" class="button small" value="Subscribe">
                         </form>
-                      <?php if ( isset($mistakes['multiple']) ) { ?>
+                      <?php if (isset($mistakes['multiple'])) { ?>
                         <em class="error">
                             You have used a comma in your search term &ndash;
                             are you sure this is what you want? You cannot
@@ -201,7 +201,7 @@ 
                             for each individual term.
                         </em>
                       <?php } ?>
-                      <?php if ( isset($mistakes['postcode_and']) ) { ?>
+                      <?php if (isset($mistakes['postcode_and'])) { ?>
                         <em class="error">
                             You have used a postcode and something else in your
                             search term &ndash; are you sure this is what you
@@ -350,17 +350,17 @@ 
             <div class="alert-section__secondary">
               <?php if ($email_verified) { ?>
 
-                  <?php if ( $alerts ) { ?>
+                  <?php if ($alerts) { ?>
                     <h3>Your current email alerts</h3>
                     <ul class="alerts-manage__list">
-                      <?php foreach ( $alerts as $alert ) { ?>
+                      <?php foreach ($alerts as $alert) { ?>
                         <li>
                             When <?= _htmlspecialchars($alert['criteria']) ?>.
                             <form action="<?= $actionurl ?>" method="POST">
                                 <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-                              <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
+                              <?php if ($alert['status'] == 'unconfirmed') { ?>
                                 <input type="submit" class="button small" name="action" value="Confirm">
-                              <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+                              <?php } elseif ($alert['status'] == 'suspended') { ?>
                                 <input type="submit" class="button small" name="action" value="Resume">
                               <?php } else { ?>
                                 <input type="submit" class="button button--secondary small" name="action" value="Suspend">
@@ -372,7 +372,7 @@ 
                     </ul>
                   <?php } ?>
 
-                  <?php if ( $current_mp ) { ?>
+                  <?php if ($current_mp) { ?>
                     <h3>Your MP alert</h3>
                     <ul class="alerts-manage__list">
                         <li>

Braces +34 added lines, -17 removed lines

@@ -45,26 +45,30 @@ 
                 </div>
                 </noscript>
 
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
+              <?php }
+elseif ( $results == 'alert-suspended' ) { ?>
                 <h3>Alert suspended</h3>
                 <p>
                     You can reactivate the alert at any time, from the sidebar below.
                 </p>
 
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
+              <?php }
+elseif ( $results == 'alert-resumed' ) { ?>
                 <h3>Alert resumed</h3>
                 <p>
                     You will now receive email alerts on any day when there
                     are entries in Hansard that match your criteria.
                 </p>
 
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
+              <?php }
+elseif ( $results == 'alert-deleted' ) { ?>
                 <h3>Alert deleted</h3>
                 <p>
                     You will no longer receive this alert.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php }
+elseif ( $results == 'alert-fail' ) { ?>
                 <h3>Hmmm, something&rsquo;s not right</h3>
                 <p>
                     The link you followed to reach this page appears to be incomplete.
@@ -80,14 +84,16 @@ 
                     and let us know, and we'll help out!
                 </p>
 
-              <?php } elseif ( $results == 'alert-added' ) { ?>
+              <?php }
+elseif ( $results == 'alert-added' ) { ?>
                 <h3>Your alert has been added</h3>
                 <p>
                     You will now receive email alerts on any day when
                     <?= _htmlspecialchars($criteria) ?> in parliament.
                 </p>
 
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
+              <?php }
+elseif ( $results == 'alert-confirmation' ) { ?>
                 <h3>We&rsquo;re nearly done&hellip;</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
@@ -95,20 +101,23 @@ 
                     and receive future alerts. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
+              <?php }
+elseif ( $results == 'alert-exists' ) { ?>
                 <h3>You&rsquo;re already subscribed to that!</h3>
                 <p>
                     It&rsquo;s good to know you&rsquo;re keen though.
                 </p>
 
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
+              <?php }
+elseif ( $results == 'alert-already-signed' ) { ?>
                 <h3>We&rsquo;re nearly done</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
                     You will need to follow that link to confirm your email address to receive the alert. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php }
+elseif ( $results == 'alert-fail' ) { ?>
                 <h3>Alert could not be created</h3>
                 <p>
                     Sorry, we were unable to create that alert. Please
@@ -180,7 +189,8 @@ 
               <?php if ($alertsearch) {
                 if ( $member_options ) { ?>
                 <h3>Sign up for alerts for topics</h3>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <h3>Great! Can you just confirm what you mean?</h3>
                 <?php } ?>
                 <ul>
@@ -255,11 +265,13 @@ 
                     (<?= _htmlspecialchars($pid_member->constituency()) ?>)
                     speaks.
                 </h3>
-              <?php } elseif ($keyword) { ?>
+              <?php }
+elseif ($keyword) { ?>
                 <h3>
                     Sign up for an alert when <?= _htmlspecialchars($display_keyword) ?>.
                 </h3>
-              <?php } else { ?>
+              <?php }
+else { ?>
                 <h3>Request a new TheyWorkForYou email alert</h3>
               <?php } ?>
 
@@ -277,9 +289,11 @@ 
                       <?php if ($pid) { ?>
                         <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled"
                             value="<?= $pid_member->full_name() ?> (<?= _htmlspecialchars($pid_member->constituency()) ?>)">
-                      <?php } elseif ($keyword) { ?>
+                      <?php }
+elseif ($keyword) { ?>
                         <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled" value="<?= _htmlspecialchars($display_keyword) ?>">
-                      <?php } else { ?>
+                      <?php }
+else { ?>
                         <input type="text" class="form-control" placeholder="Search term, postcode, or MP name" name="alertsearch" id="alertsearch" value="<?= _htmlentities($search_text) ?>">
                       <?php } ?>
                         <input type="submit" class="button" value="<?= ($pid || $keyword) ? 'Subscribe' : 'Search' ?>">
@@ -360,9 +374,11 @@ 
                                 <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
                               <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
                                 <input type="submit" class="button small" name="action" value="Confirm">
-                              <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+                              <?php }
+elseif ( $alert['status'] == 'suspended' ) { ?>
                                 <input type="submit" class="button small" name="action" value="Resume">
-                              <?php } else { ?>
+                              <?php }
+else { ?>
                                 <input type="submit" class="button button--secondary small" name="action" value="Suspend">
                                 <input type="submit" class="button button--negative small" name="action" value="Delete">
                               <?php } ?>
@@ -387,7 +403,8 @@ 
                     </ul>
                   <?php } ?>
 
-              <?php } else { ?>
+              <?php }
+else { ?>
                 <p>
                     If you <a href="/user/?pg=join">join</a> or
                     <a href="/user/login/?ret=%2Falert%2F">sign in</a>,

www/includes/easyparliament/templates/html/homepage/featured.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
-                        <?php if ( $featured['featured'] ) { ?>
+                        <?php if ($featured['featured']) { ?>
                         <h2>In the news</h2>
-                        <?php if ( isset($featured['headline']) ) { ?>
+                        <?php if (isset($featured['headline'])) { ?>
                         <h3 class="in-the-news__topic"><a href="<?= $featured['list_url'] ?>"><?= $featured['headline'] ?></a></h3>
-                        <?php if ( isset($featured['context']) ) { ?>
+                        <?php if (isset($featured['context'])) { ?>
                         <p class="in-the-news__context"><?= $featured['context'] ?></p>
                         <?php } ?>
                         <?php } ?>
@@ -15,21 +15,21 @@ 
                             <p class="meta excerpt__category"><a href="<?= $featured['more_url'] ?>"><?= $featured['desc'] ?></a></p>
                             <p class="excerpt__statement">
                                 <q>
-                                <?php if ( $featured['child']['speaker'] ) { ?>
+                                <?php if ($featured['child']['speaker']) { ?>
                                 <a href="<?= $featured['child']['speaker']['url'] ?>"><?= $featured['child']['speaker']['name'] ?></a> :
                                 <?php } ?>
                                 <?= trim_characters($featured['child']['body'], 0, 200) ?>
                                 </q>
                             </p>
                         </div>
-                        <?php if ( count($featured['related']) ) { ?>
+                        <?php if (count($featured['related'])) { ?>
                         <div class="in-the-news__key-events">
                             <!-- No maximum, but less than 4 looks best -->
                             <ul class="key-events__list">
                                 <li>
                                     <h4>Key events</h4>
                                 </li>
-                                <?php foreach ( $featured['related'] as $related ) { ?>
+                                <?php foreach ($featured['related'] as $related) { ?>
                                  <li>
                                      <a href="<?= $related['list_url'] ?>"><?= $related['parent']['body'] ?></a>
                                     <p class="meta"><?= format_date($related['hdate'], SHORTDATEFORMAT) ?></p>

Braces +2 added lines, -1 removed lines

@@ -6,7 +6,8 @@
                         <p class="in-the-news__context"><?= $featured['context'] ?></p>
                         <?php } ?>
                         <?php } ?>
-                        <?php } else { ?>
+                        <?php }
+else { ?>
                         <h2>Random debate</h2>
                         <?php } ?>
                         <div class="parliamentary-excerpt">

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
         <div class="business-section__primary">
             <ul class="business-list">
-              <?php foreach ( $data as $item ) { ?>
+              <?php foreach ($data as $item) { ?>
                 <li>
                     <?php include '_business_list_item.php'; ?>
                 </li>

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

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                 foreach ( $years as $year => $months ) { ?>
             <div class="calendar-year">
                 <?php foreach ($months as $month => $dates) {
-                  include '_calendar.php';
+                    include '_calendar.php';
                 } ?>
             </div>
             <?php }

Spacing +4 added lines, -4 removed lines

@@ -8,20 +8,20 @@
         </div>
         <div class="business-section__solo">
             <div class="calendar__controls">
-                <?php if ( isset( $prev ) ) { ?>
+                <?php if (isset($prev)) { ?>
                 <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr; <?= $prev['title'] ?></a>
                 <?php } else { ?>
                 <span class="calendar__controls__previous"></span>
                 <?php } ?>
                 <span class="calendar__controls__current"><?= $year ?></span>
-                <?php if ( isset( $next ) ) { ?>
+                <?php if (isset($next)) { ?>
                 <a href="<?= $next['url'] ?>" class="calendar__controls__next"><?= $next['title'] ?> &rarr;</a>
                 <?php } else { ?>
                 <span class="calendar__controls__next"></span>
                 <?php } ?>
             </div>
-            <?php if ( isset($years) ) {
-                foreach ( $years as $year => $months ) { ?>
+            <?php if (isset($years)) {
+                foreach ($years as $year => $months) { ?>
             <div class="calendar-year">
                 <?php foreach ($months as $month => $dates) {
                   include '_calendar.php';

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

@@ -34,6 +34,6 @@
         </div>
     </div>
 
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
+    <?php $search_title = "search $title"; include '_search.php'; ?>
 
 </div>

Braces +6 added lines, -3 removed lines

@@ -10,13 +10,15 @@ 
             <div class="calendar__controls">
                 <?php if ( isset( $prev ) ) { ?>
                 <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr; <?= $prev['title'] ?></a>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <span class="calendar__controls__previous"></span>
                 <?php } ?>
                 <span class="calendar__controls__current"><?= $year ?></span>
                 <?php if ( isset( $next ) ) { ?>
                 <a href="<?= $next['url'] ?>" class="calendar__controls__next"><?= $next['title'] ?> &rarr;</a>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <span class="calendar__controls__next"></span>
                 <?php } ?>
             </div>
@@ -28,7 +30,8 @@ 
                 } ?>
             </div>
             <?php }
-            } else { ?>
+            }
+            else { ?>
                 We don't seem to have any <?= $parent_title ?> for this year.
             <?php } ?>
         </div>

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

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
 
         <div class="business-section__primary">
             <ul class="business-list">
-                <?php foreach ( $content['data'] as $date => $bills ) { ?>
+                <?php foreach ($content['data'] as $date => $bills) { ?>
                 <li>
                     <span class="business-list__title">
                         <h3>
                             <?= $date ?>
                         </h3>
                     </span>
-                    <?php foreach ( $bills as $bill ) { ?>
+                    <?php foreach ($bills as $bill) { ?>
                     <p>
                     <a href="<?= $bill['url'] ?>" class="business-list__title">
                         <?= $bill['bill'] ?> &ndash; <?= $bill['sitting'] ?>

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

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
             <?php
             foreach ( $calendar as $year => $months ) {
                 foreach ($months as $month => $dates) {
-                     include '_calendar.php';
+                        include '_calendar.php';
                 }
             } ?>

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
             <?php
-            foreach ( $calendar as $year => $months ) {
+            foreach ($calendar as $year => $months) {
                 foreach ($months as $month => $dates) {
                      include '_calendar.php';
                 }

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

Indentation +2 added lines, -2 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 </div>
 <div class="full-page">
 
-  <?php if ( count($data['rows']) == 0 ) { ?>
+  <?php if (count($data['rows']) == 0) { ?>
     <div class="debate-speech">
         <div class="full-page__row">
             <div class="full-page__unit">
-                <?php if ( $col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND' ) { ?>
+                <?php if ($col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND') { ?>
                     We only have information about columns for debates in the House of Commons and the House of Lords.
                 <?php } else { ?>
                     We can't find anything in column <?= $column ?> on <?= $debate_day_human ?>.

Braces +4 added lines, -2 removed lines

@@ -25,13 +25,15 @@
             <div class="full-page__unit">
                 <?php if ( $col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND' ) { ?>
                     We only have information about columns for debates in the House of Commons and the House of Lords.
-                <?php } else { ?>
+                <?php }
+else { ?>
                     We can't find anything in column <?= $column ?> on <?= $debate_day_human ?>.
                 <?php } ?>
             </div>
         </div>
     </div>
-  <?php } else {
+  <?php }
+else {
       $section = false; include '_section_content.php';
   } ?>
 

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

Indentation +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
     if ($dayOfWeek < 0) {
         $dayOfWeek = 6;
     }
-  ?>
+    ?>
   <?php }
     if (!isset($years)) { ?>
     <div class="calendar__controls">
@@ -127,7 +127,7 @@ 
                     } else {
                         $day_section = $section;
                         if ($section == 'sp') {
-                          $day_section = 'spdebates';
+                            $day_section = 'spdebates';
                         }
                         $urls[$day_section . 'day']->insert(array('d'=>$date));
                         print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";

Spacing +12 added lines, -12 removed lines

@@ -1,12 +1,12 @@ 
 <div class="calendar">
-  <?php if(isset($month)){
-    $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+  <?php if (isset($month)) {
+    $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun');
 
     // What is the first day of the month in question?
-    $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
+    $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
     // How many days does this month contain?
-    $numberDays = date('t',$firstDayOfMonth);
+    $numberDays = date('t', $firstDayOfMonth);
 
     // Retrieve some information about the first day of the
     // month in question.
@@ -18,7 +18,7 @@ 
     if (isset($info['onday'])) {
         // 'onday' is like 'yyyy-mm-dd'.
         $datebits = explode('-', $info['onday']);
-        if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) {
+        if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
             $toDay = $datebits[2];
         } else {
             $toDay = '';
@@ -45,7 +45,7 @@ 
   <?php }
     if (!isset($years)) { ?>
     <div class="calendar__controls">
-        <?php if ( isset($prev) ) { ?>
+        <?php if (isset($prev)) { ?>
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
         <?php } else { ?>
         <span class="calendar__controls__previous">&nbsp;</span>
@@ -53,7 +53,7 @@ 
         <span class="calendar__controls__current">
             <?= $monthName ?> <?= $year ?>
         </span>
-        <?php if ( isset($next) ) { ?>
+        <?php if (isset($next)) { ?>
         <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
         <?php } else { ?>
         <span class="calendar__controls__next">&nbsp;</span>
@@ -106,11 +106,11 @@ 
                 // 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].'"';
+                    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].'"';
+                    if ($recess[0] != 1) print ' title="' . $recess[0] . '"';
                     print '>';
                 } else {
                     print '<td>';
@@ -118,7 +118,7 @@ 
 
                 // Is the $currentDay a member of $dates? If so,
                 // the day should be linked.
-                if (in_array($currentDay,$dates)) {
+                if (in_array($currentDay, $dates)) {
 
                     $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
@@ -156,12 +156,12 @@ 
             </tr>
         </tbody>
     </table>
-  <?php if(!isset($years)){ ?>
+  <?php if (!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
         $y = $urls['day'];
         $y->reset();
-        $y->insert(array( 'y' => $year ));
+        $y->insert(array('y' => $year));
         $url = $y->generate();
     ?>
     <a href="<?= $url ?>">See all of <?= $year ?></a>

Braces +27 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <div class="calendar">
-  <?php if(isset($month)){
+  <?php if(isset($month)) {
     $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
 
     // What is the first day of the month in question?
@@ -20,17 +20,20 @@ 
         $datebits = explode('-', $info['onday']);
         if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) {
             $toDay = $datebits[2];
-        } else {
+        }
+        else {
             $toDay = '';
         }
-    } else {
+    }
+    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 {
+        }
+        else {
             $toDay = '';
         }
     }
@@ -47,7 +50,8 @@ 
     <div class="calendar__controls">
         <?php if ( isset($prev) ) { ?>
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
-        <?php } else { ?>
+        <?php }
+else { ?>
         <span class="calendar__controls__previous">&nbsp;</span>
         <?php } ?>
         <span class="calendar__controls__current">
@@ -55,11 +59,13 @@ 
         </span>
         <?php if ( isset($next) ) { ?>
         <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
-        <?php } else { ?>
+        <?php }
+else { ?>
         <span class="calendar__controls__next">&nbsp;</span>
         <?php } ?>
     </div>
-  <?php } else { ?>
+  <?php }
+else { ?>
     <div class="calendar__header">
         <?= $monthName ?>
     </div>
@@ -106,13 +112,19 @@ 
                 // 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].'"';
+                    if ($recess[0] && $recess[0]!=1) {
+                        print ' title="'.$recess[0].'"';
+                    }
                     print '>';
-                } elseif ($recess[0]) {
+                }
+                elseif ($recess[0]) {
                     print '<td class="no"';
-                    if ($recess[0]!=1) print ' title="'.$recess[0].'"';
+                    if ($recess[0]!=1) {
+                        print ' title="'.$recess[0].'"';
+                    }
                     print '>';
-                } else {
+                }
+                else {
                     print '<td>';
                 }
 
@@ -124,7 +136,8 @@ 
 
                     if ($currentDay == $toDay) {
                         print '<span>' . $currentDay . '</span></td>';
-                    } else {
+                    }
+                    else {
                         $day_section = $section;
                         if ($section == 'sp') {
                           $day_section = 'spdebates';
@@ -135,7 +148,8 @@ 
 
                     // $currentDay is not a member of $dates.
 
-                } else {
+                }
+                else {
 
                         print '<span>' . $currentDay . '</span></td>';
                 }