mysociety / theyworkforyou

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>

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

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     ?>
                 <dl id="searchresults">
 <?php
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
 

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

Braces +4 added lines, -2 removed lines

@@ -39,14 +39,16 @@
 
     if ($info['view'] == 'recent') {
         $title = $info['num'] . ' most recent trackbacks';
-    } else {
+    }
+    else {
         $title = 'Some sites linking to this page';
     }
 
     if (!$PAGE->within_stripe()) {
         $PAGE->stripe_start();
         $stripe_must_be_ended = true;
-    } else {
+    }
+    else {
         $stripe_must_be_ended = false;
     }
     ?>