mysociety / theyworkforyou

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

Spacing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
 
     echo '<dl id="searchresults">';
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
         echo '<dt><a href="', $row['listurl'], '">';
@@ -79,14 +79,14 @@ 
         }
         if (isset($row['collapsed']) && $row['collapsed'] && $row['subsection_id']) {
             $URL = new URL('search');
-            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]" ));
+            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]"));
             echo ' <a href="', $URL->generate(), '">See ', $row['collapsed'],
-            ' other result', $row['collapsed']>1?'s':'', ' from this ',
+            ' other result', $row['collapsed'] > 1 ? 's' : '', ' from this ',
             $hansardmajors[$row['major']]['singular'], '</a>';
         }
         echo '</small>';
         if ($match = get_http_var('match')) {
-            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'] , '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
+            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'], '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
         }
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {

Braces +5 added lines, -2 removed lines

@@ -46,7 +46,8 @@ 
 
     print "\t\t\t\t<h3 style='font-weight:normal'>Results <strong>" . number_format($info['first_result']) . '-' . number_format($last_result) . '</strong> of ' . number_format($info['total_results']) . " for <strong>" . _htmlentities($searchdescription) . "</strong></h3>\n";
 
-} elseif ($info['total_results'] == 0) {
+}
+elseif ($info['total_results'] == 0) {
     echo '<h3 style="font-weight:normal">Your search for <strong>', _htmlentities($searchdescription), '</strong> did not match anything.</h3>';
 }
 
@@ -91,7 +92,9 @@ 
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {
             echo "<em>" . ucfirst($row['speaker']['name']) . "</em>";
-            if ($row['extract']) echo ": ";
+            if ($row['extract']) {
+                echo ": ";
+            }
         }
 
         echo $row['extract'] . "</p></dd>\n";

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

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
                       <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
@@ -34,23 +34,23 @@ 
                         <h2 class="people-list__person__name"><?= $mp_data['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $mp_data['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $mp_data['party'] ) ?>"><?= $mp_data['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($mp_data['party']) ?>"><?= $mp_data['party'] ?></span>
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $rep['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $rep['party'] ) ?>"><?= $rep['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($rep['party']) ?>"><?= $rep['party'] ?></span>
                         </p>
                     </a>
                         <?php } ?>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -188,7 +188,7 @@ 
                 <img class="people-list__person__image" src="<?= $person['image'] ?>">
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= strtolower($person['party']) ?>"><?= $person['party'] ?></span>
@@ -206,7 +206,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <form method="get" action="<?= $urls['plain'] ?>" class="sidebar-item-with-icon sidebar-item-with-icon--date">
                     <p>
                         Or view a past list
@@ -250,7 +250,7 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -264,7 +264,7 @@ 
                     </p>
                 <?php } ?>
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__) . '/../sidebar/looking_for.php') ?>
             </div>
         </div>
 

Braces +30 added lines, -15 removed lines

@@ -4,9 +4,11 @@ 
 if (!count($data)) {
     if ($type == 'mps' && isset($dissolution[1])) {
         $former = 'former';
-    } elseif ($type == 'msps' && isset($dissolution[4])) {
+    }
+    elseif ($type == 'msps' && isset($dissolution[4])) {
         $former = 'former';
-    } elseif ($type == 'mlas' && isset($dissolution[3])) {
+    }
+    elseif ($type == 'mlas' && isset($dissolution[3])) {
         $former = 'former';
     }
 }
@@ -59,7 +61,8 @@ 
             </div>
         </div>
 
-      <?php } else { ?>
+      <?php }
+else { ?>
 
         <form action="/<?= ($type == 'mlas' || $type == 'msps') ? 'postcode' : 'search' ?>/">
             <div class="search-page__section search-page__section--search">
@@ -67,9 +70,11 @@ 
                     <p class="search-page-main-inputs">
                     <?php if ( $type == 'peers' ) { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php }
+elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
                     <?php } ?>
                         <input type="text" class="form-control" name="<?= ($type == 'mlas' || $type == 'msps') ? 'pc' : 'q' ?>" id="find-mp-by-name-or-postcode">
@@ -91,19 +96,22 @@ 
                 During the period from the dissolution of Parliament to the general election, there are no Members of Parliament.
                 <a href="/mps/?date=<?=$dissolution[1] ?>">View list of MPs as it was when Parliament was dissolved</a>
             </div>
-        <?php } elseif ($type == 'msps') { ?>
+        <?php }
+elseif ($type == 'msps') { ?>
             <div class="search-page__section__primary">
                 During the period from the dissolution of the Scottish Parliament to the election, there are no Members of the Scottish Parliament.
                 <a href="/msps/?date=<?=$dissolution[4] ?>">View list of MSPs as it was when the Scottish Parliament was dissolved</a>
             </div>
-        <?php } elseif ($type == 'mlas') { ?>
+        <?php }
+elseif ($type == 'mlas') { ?>
             <div class="search-page__section__primary">
                 During the period from the dissolution of the Northern Ireland Assembly to the election, there are no Members of the Northern Ireland Assembly.
                 <a href="/mlas/?date=<?=$dissolution[3] ?>">View list of MLAs as it was when the Northern Ireland Assembly was dissolved</a>
             </div>
         <?php
             }
-        } else { ?>
+        }
+        else { ?>
 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
@@ -113,20 +121,24 @@ 
                     <?php if ( $order == 'given_name' ) { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php }
+else if ( $order == 'party' ) { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                     <li><strong>Sorted by</strong> Last name</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
                     <?php } ?>
                 </ul>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <ul class="search-result-display-options">
                     <?php if ( $order == 'party' ) { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                     <li><strong>Sorted by</strong> Name</li>
                     <li>Sort by <a href="<?= $urls['by_party'] ?>">Party</a></li>
                     <?php } ?>
@@ -179,7 +191,8 @@ 
                         if ( $initial != $current_initial ) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
-                        } else {
+                        }
+                        else {
                             $initial_link = "";
                         }
                     }
@@ -250,7 +263,8 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php }
+else if ( $type == 'msps' ) { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -258,7 +272,8 @@ 
                         <a href="<?= $urls['plain'] ?>?date=1999-05-06">MSPs at 1999 election</a>
                         <a href="<?= $urls['plain'] ?>?all=1">Historical list of all MSPs</a>
                     </p>
-                <?php } else { ?>
+                <?php }
+else { ?>
                     <p class="past-list-dates" id="past-list-dates">
                     <a href="<?= $urls['plain'] ?>?all=1">Historical list of all <?= $rep_plural ?></a>
                     </p>

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

Spacing +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
     <div class="regional-header regional-header--<?= $current_assembly ?>">
         <div class="regional-header__overlay"></div>
-        <div class="person-header <?= $this_page ?> <?= (isset($data['photo_attribution_text'])?'has-data-attribution':'') ?>">
+        <div class="person-header <?= $this_page ?> <?= (isset($data['photo_attribution_text']) ? 'has-data-attribution' : '') ?>">
             <div class="full-page__row">
                 <div class="full-page__unit">
                     <div class="person-header__content">
                         <div class="person-name">
-                          <?php if ( $image ) { ?>
+                          <?php if ($image) { ?>
                             <div class="mp-image">
                                 <img src="<?= $image['url'] ?>" height="48">
                             </div>
@@ -17,10 +17,10 @@ 
                               <?php } ?>
                             </div>
                         </div>
-                        <?php if($image && $image['exists']): ?>
-                            <?php if(isset($data['photo_attribution_text'])) { ?>
+                        <?php if ($image && $image['exists']): ?>
+                            <?php if (isset($data['photo_attribution_text'])) { ?>
                                 <div class="person-data-attribution">
-                                  <?php if(isset($data['photo_attribution_link'])) { ?>
+                                  <?php if (isset($data['photo_attribution_link'])) { ?>
                                     Profile photo: <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
                                   <?php } else { ?>
                                     Profile photo: <?= $data['photo_attribution_text'] ?>
@@ -38,10 +38,10 @@ 
                             </div>
                         <?php endif; ?>
                         <div class="person-constituency">
-                          <?php if ( $constituency && $this_page != 'peer' && $this_page != 'royal' ) { ?>
+                          <?php if ($constituency && $this_page != 'peer' && $this_page != 'royal') { ?>
                             <span class="constituency"><?= $constituency ?></span>
                           <?php } ?>
-                          <?php if ( $party ) { ?>
+                          <?php if ($party) { ?>
                             <span class="party <?= $party_short ?>"><?= $party ?></span>
                           <?php } ?>
                         </div>

Braces +7 added lines, -3 removed lines

@@ -22,12 +22,14 @@ 
                                 <div class="person-data-attribution">
                                   <?php if(isset($data['photo_attribution_link'])) { ?>
                                     Profile photo: <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
-                                  <?php } else { ?>
+                                  <?php }
+else { ?>
                                     Profile photo: <?= $data['photo_attribution_text'] ?>
                                   <?php } ?>
                                 </div>
                             <?php } ?>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             <div class="person-data-attribution">
                                 We&rsquo;re missing a photo of <?= $full_name ?>. If you have a
                                 photo <em>that you can release under a Creative Commons Attribution-ShareAlike
@@ -36,7 +38,9 @@ 
                                 Please do not email us about copyrighted photos elsewhere on the internet; we can&rsquo;t
                                 use them.
                             </div>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                         <div class="person-constituency">
                           <?php if ( $constituency && $this_page != 'peer' && $this_page != 'royal' ) { ?>
                             <span class="constituency"><?= $constituency ?></span>

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

Spacing +3 added lines, -3 removed lines

@@ -44,11 +44,11 @@
         ?></dt>
         <dd>
         <div class="appearance-date">
-            <div class="day"><?php echo format_date($row['hdate'], 'j' ) ?></div><!--
+            <div class="day"><?php echo format_date($row['hdate'], 'j') ?></div><!--
             <?php if ($year < $cur_year) { ?>
-            --><div class="month"><?php echo format_date($row['hdate'], 'M y' ) ?></div>
+            --><div class="month"><?php echo format_date($row['hdate'], 'M y') ?></div>
             <?php } else { ?>
-            --><div class="month"><?php echo format_date($row['hdate'], 'M' ) ?></div>
+            --><div class="month"><?php echo format_date($row['hdate'], 'M') ?></div>
             <?php } ?>
         </div>
 

Braces +4 added lines, -2 removed lines

@@ -47,7 +47,8 @@ 
             <div class="day"><?php echo format_date($row['hdate'], 'j' ) ?></div><!--
             <?php if ($year < $cur_year) { ?>
             --><div class="month"><?php echo format_date($row['hdate'], 'M y' ) ?></div>
-            <?php } else { ?>
+            <?php }
+else { ?>
             --><div class="month"><?php echo format_date($row['hdate'], 'M' ) ?></div>
             <?php } ?>
         </div>
@@ -61,7 +62,8 @@ 
 
 <?php
 
-} else { ?>
+}
+else { ?>
 <p>No data to display.</p>
 <?php
 }

www/includes/easyparliament/templates/html/user/view_user.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
                 <div class="row">
                 <span class="label">Website</span>
-                <span class="formw"><?= $website == '' ? 'none' : '<a href="' . _htmlentities($website) . '">'. _htmlentities($website) . '</a>' ?></span>
+                <span class="formw"><?= $website == '' ? 'none' : '<a href="' . _htmlentities($website) . '">' . _htmlentities($website) . '</a>' ?></span>
                 </div>
 
                 <div class="row">

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

Spacing +3 added lines, -3 removed lines

@@ -158,7 +158,7 @@ 
         }(document, 'script', 'facebook-jssdk'));
     </script>
 
-  <?php if ( $banner_text ) { ?>
+  <?php if ($banner_text) { ?>
     <div class="banner">
         <div class="full-page__row">
             <div class="banner__content">
@@ -227,7 +227,7 @@ 
                             <img src="/style/img/user@2.png" width="24" height="24" alt=""><span>Your Profile</span>
                         </a>
                         <ul id="nav-user">
-                          <?php foreach ($user_nav_links as $nav_link){ ?>
+                          <?php foreach ($user_nav_links as $nav_link) { ?>
                             <li><a href="<?= $nav_link['href']; ?>" title="<?= $nav_link['title']; ?>" class="<?= $nav_link['classes']; ?>"><?= $nav_link['text'] ?></a></li>
                             <?php } ?>
                         </ul>
@@ -248,7 +248,7 @@ 
     <div class="full-page legacy-page static-page">
         <div class="full-page__row">
             <div class="panel">
-            <?php foreach ( $page_errors as $error ) { ?>
+            <?php foreach ($page_errors as $error) { ?>
                 <p><?= $error['text'] ?></p>
             <?php } ?>
             </div>

Braces +8 added lines, -4 removed lines

@@ -30,7 +30,8 @@ 
     <meta property="og:image:width" content="1000">
     <meta property="og:image:height" content="500">
     <meta property="og:type" content="profile">
-    <?php } else { ?>
+    <?php }
+else { ?>
     <meta property="og:type" content="website">
       <meta property="og:image" content="https://<?= DOMAIN ?>/images/facebook-avatar.png">
         <meta property="og:image:width" content="200">
@@ -174,11 +175,14 @@ 
             <div class="banner__content">
               <?php if ($country == 'NZ') { ?>
                 You&rsquo;re in New Zealand, so check out <a href="http://www.theyworkforyou.co.nz">TheyWorkForYou.co.nz</a>
-              <?php } elseif ($country == 'AU') { ?>
+              <?php }
+elseif ($country == 'AU') { ?>
                 You&rsquo;re in Australia, so check out <a href="http://www.openaustralia.org">OpenAustralia</a>, a TheyWorkForYou for down under
-              <?php } elseif ($country == 'IE') { ?>
+              <?php }
+elseif ($country == 'IE') { ?>
                 Check out <a href="https://www.kildarestreet.com/">KildareStreet</a>, a TheyWorkForYou for the Houses of the Oireachtas
-              <?php } elseif ($country == 'CA') { ?>
+              <?php }
+elseif ($country == 'CA') { ?>
                 Check out <a href="https://openparliament.ca/">OpenParliament.ca</a>
               <?php } ?>
             </div>

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

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 // $data['info'] may have 'onday', a 'yyyy-mm-dd' date which indicates
 // which date will be highlighted (otherwise, today is).
 
-include_once INCLUDESPATH."easyparliament/recess.php";
+include_once INCLUDESPATH . "easyparliament/recess.php";
 global $PAGE, $DATA, $this_page, $hansardmajors;
 
 twfy_debug("TEMPLATE", "hansard_calendar.php");
@@ -40,13 +40,13 @@ 
 
 
             // Create array containing abbreviations of days of week.
-            $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+            $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.
@@ -60,7 +60,7 @@ 
             if (isset($data['info']['onday'])) {
                 // 'onday' is like 'yyyy-mm-dd'.
                 $datebits = explode('-', $data['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 = '';
@@ -149,11 +149,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>';
@@ -161,7 +161,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);
 

Braces +33 added lines, -16 removed lines

@@ -62,17 +62,20 @@ 
                 $datebits = explode('-', $data['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 = '';
                 }
             }
@@ -135,12 +138,17 @@ 
                 }
 
                 $recess_major = 1; # For all of UK Parliament
-                if ($hansardmajors[$data['info']['major']]['location'] == 'NI')
-                    $recess_major = 5;
-                elseif ($hansardmajors[$data['info']['major']]['location'] == 'Scotland')
-                    $recess_major = 4; # For all of Scotland
-                elseif ($data['info']['major'] == 101)
-                    $recess_major = 101; # Lords slightly different
+                if ($hansardmajors[$data['info']['major']]['location'] == 'NI') {
+                                    $recess_major = 5;
+                }
+                elseif ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
+                                    $recess_major = 4;
+                }
+                # For all of Scotland
+                elseif ($data['info']['major'] == 101) {
+                                    $recess_major = 101;
+                }
+                # Lords slightly different
                 $recess = recess_prettify($currentDay, $month, $year, $recess_major);
 
                 // Is this day actually Today in the real world?
@@ -149,13 +157,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>';
                 }
 
@@ -167,14 +181,16 @@ 
 
                     if ($currentDay == $toDay) {
                         print '<span>' . $currentDay . '</span></td>';
-                    } else {
+                    }
+                    else {
                         $DAYURL->insert(array('d'=>$date));
                         print "<a href=\"" . $DAYURL->generate() . "\">$currentDay</a></td>";
                     }
 
                     // $currentDay is not a member of $dates.
 
-                } else {
+                }
+                else {
 
                         print '<span>' . $currentDay . '</span></td>';
                 }
@@ -212,7 +228,8 @@ 
             print '<p><a href="' . $URL->generate() . '">See all of ' . $year . '</a></p>';
         }
     }
-} else {
+}
+else {
     ?>
             <p>There is no data, sorry.</p>
 <?php

www/includes/easyparliament/templates/html/login/facebook.php

Braces +2 added lines, -1 removed lines

@@ -43,7 +43,8 @@
                 </form>
 
                 <a href="<?= $fb_login_url ?>">Log in with Facebook!</a>            </div> <!-- end .main -->
-        <?php } else { ?>
+        <?php }
+else { ?>
 
             // ASK FOR POSTCODE
         <?php } ?>

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

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( count($featured) > 0 ) {
+                        <?php if (count($featured) > 0) {
                             include 'homepage/featured.php';
                         } else { ?>
                             No debates found.
@@ -108,14 +108,14 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently in Parliament</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include 'homepage/recent-debates.php';
                             }
                         ?></ul>
                     </div>
                     <div class="homepage-upcoming homepage-content-section">
                         <h2>Upcoming</h2>
-                        <?php if ( count($calendar) ) { ?>
+                        <?php if (count($calendar)) { ?>
                         <div class="upcoming__controls">
                             <!--
                                 These controls should make the upcoming section slide to the next day.
@@ -134,24 +134,24 @@ 
                             </div>
                         </div>
                         <?php $first = true; $count = 0;
-                            foreach ( $calendar as $date => $places ) {
+                            foreach ($calendar as $date => $places) {
                                 $count++; ?>
                                 <div class="cal-wrapper <?= $first ? 'visible' : 'hidden' ?>" id="day-<?= $count ?>" data-count="<?= $count ?>" data-date="<?= format_date($date, SHORTDATEFORMAT); ?>">
                                 <?php foreach ($places as $place => $events) { ?>
                                     <?php $first = false; ?>
                                     <h3><?= $place ?></h3>
                                     <ul class="upcoming__list">
-                                        <?php for ( $i = 0; $i < 3; $i++ ) {
-                                            if ( isset( $events[$i] ) ) { ?>
+                                        <?php for ($i = 0; $i < 3; $i++) {
+                                            if (isset($events[$i])) { ?>
                                         <li>
                                             <h4 class="upcoming__title"><a href="<?= $events[$i]['link_external'] ?>"><?= $events[$i]['title'] ?></a></h4>
                                             <p class="meta"><?php
                                                 $meta_items = array();
                                                 $meta_items[] = $events[$i]['debate_type'];
-                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ){
+                                                if (isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00') {
                                                     $times = format_time($events[$i]['time_start'], 'g:i a');
 
-                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ){
+                                                    if (isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00') {
                                                         $times = $times . ' - ' . format_time($events[$i]['time_end'], 'g:i a');
                                                     }
                                                     $meta_items[] = $times;
@@ -163,7 +163,7 @@ 
                                         <?php } ?>
                                         <?php } ?>
                                     </ul>
-                                    <?php if ( count($events) - 3 > 0 ) { ?>
+                                    <?php if (count($events) - 3 > 0) { ?>
                                     <a href="/calendar/?d=<?= format_date($date, 'Y-m-d') ?>" class="upcoming__more">And <?= count($events) - 3 ?> more</a><!-- (just links to relevant upcoming page) -->
                                     <?php } ?>
                             <?php } ?>
@@ -171,7 +171,7 @@ 
                         <?php } ?>
                         <?php } else {
                             list($recess, $from, $to) = recess_prettify(date('j'), date('n'), date('Y'), 1);
-                            if ( $recess ) { ?>
+                            if ($recess) { ?>
                                 <p>
                                 Parliament is on holiday until <?= format_date($to, LONGERDATEFORMAT) ?>.
                                 Follow us on <a href="https://twitter.com/theyworkforyou">Twitter</a> and you'll

Braces +10 added lines, -6 removed lines

@@ -14,7 +14,8 @@ 
                         <a class="homepage-search__change-postcode" href="<?= $mp_data['change_url'] ?>">Change postcode</a>
                     </div>
                 </div>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <h1>Does your MP represent you?</h1>
                 <div class="row collapse">
                     <form action="/postcode/" class="mp-search__form"  onsubmit="trackFormSubmit(this, 'PostcodeSearch', 'Submit', 'Home'); return false;">
@@ -47,7 +48,8 @@ 
                     <div class="homepage-in-the-news homepage-content-section">
                         <?php if ( count($featured) > 0 ) {
                             include 'homepage/featured.php';
-                        } else { ?>
+                        }
+                        else { ?>
                             No debates found.
                         <?php } ?>
 
@@ -148,10 +150,10 @@ 
                                             <p class="meta"><?php
                                                 $meta_items = array();
                                                 $meta_items[] = $events[$i]['debate_type'];
-                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ){
+                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ) {
                                                     $times = format_time($events[$i]['time_start'], 'g:i a');
 
-                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ){
+                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ) {
                                                         $times = $times . ' - ' . format_time($events[$i]['time_end'], 'g:i a');
                                                     }
                                                     $meta_items[] = $times;
@@ -169,7 +171,8 @@ 
                             <?php } ?>
                                 </div>
                         <?php } ?>
-                        <?php } else {
+                        <?php }
+else {
                             list($recess, $from, $to) = recess_prettify(date('j'), date('n'), date('Y'), 1);
                             if ( $recess ) { ?>
                                 <p>
@@ -177,7 +180,8 @@ 
                                 Follow us on <a href="https://twitter.com/theyworkforyou">Twitter</a> and you'll
                                 be the first to know when they're back in session.
                                 </p>
-                            <?php } else { ?>
+                            <?php }
+else { ?>
                                 <p>
                                 We don&rsquo;t have details of any upcoming events.
                                 </p>