mysociety / theyworkforyou

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;
     }
     ?>

www/includes/easyparliament/templates/html/homepage/recent-debates.php

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
-                            <?php if ( isset( $recent['child'] ) ) { ?>
+                            <?php if (isset($recent['child'])) { ?>
                             <li class="parliamentary-excerpt">
                             <h3 class="excerpt__title"><a href="<?= $recent['list_url'] ?>"><?= $recent['parent']['body'] ? $recent['parent']['body'] . ' : ' : '' ?><?= $recent['body'] ?></a></h3>
                                 <p class="meta"><?=format_date($recent['hdate'], LONGERDATEFORMAT); ?></p>
                                 <p class="meta excerpt__category"><a href="<?= $recent['more_url'] ?>"><?= $recent['desc'] ?></a></p>
                                 <p class="excerpt__statement">
-                                <?php if ( isset($recent['child']['speaker']) && count($recent['child']['speaker']) ) { ?>
+                                <?php if (isset($recent['child']['speaker']) && count($recent['child']['speaker'])) { ?>
                                 <a href="<?= $recent['child']['speaker']['url'] ?>"><?= $recent['child']['speaker']['name'] ?></a>
                                 <?php } ?>
                                 <?= trim_characters($recent['child']['body'], 0, 200) ?>
@@ -13,10 +13,10 @@ 
                             <?php } else { ?>
                             <li class="parliamentary-excerpt">
                             <h3 class="excerpt__title"><?= $recent['desc'] ?></h3>
-                                <?php foreach ( $recent['data'] as $date => $details ) { ?>
+                                <?php foreach ($recent['data'] as $date => $details) { ?>
                                 <p class="meta"><?= $date ?></p>
                                 <p class="meta excerpt__category"><a href="<?= $recent['more_url'] ?>"><?= $recent['desc'] ?></a></p>
-                                <?php foreach ( $details as $bill ) { ?>
+                                <?php foreach ($details as $bill) { ?>
                                 <p class="excerpt__statement">
                                     <a href="<?= $bill['url'] ?>"><?= $bill['bill'] ?>, <?= $bill['sitting'] ?></a>
                                 </p>

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
                                 <?= trim_characters($recent['child']['body'], 0, 200) ?>
                                 </p>
                             </li>
-                            <?php } else { ?>
+                            <?php }
+else { ?>
                             <li class="parliamentary-excerpt">
                             <h3 class="excerpt__title"><?= $recent['desc'] ?></h3>
                                 <?php foreach ( $recent['data'] as $date => $details ) { ?>

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

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
         if (!$comment['visible']) {
             $reporthtml = '';
         } elseif (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && $THEUSER->user_id() != $comment['user_id']
@@ -119,7 +119,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
         ?>
-                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) .' '. _htmlentities($comment['lastname']); ?></strong></a><br>
+                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) . ' ' . _htmlentities($comment['lastname']); ?></strong></a><br>
                     <small>Posted on <?php echo $date;
 
         if (isset($comment['url'])) {
@@ -127,7 +127,7 @@ 
 
         } else {
             // There won't be a URL when we're just previewing a comment.
-            print ' '.$time;
+            print ' ' . $time;
         }
         ?> <?php echo $reporthtml; ?></small></p>
 
@@ -139,7 +139,7 @@ 
             $body = prepare_comment_for_display($comment['body']); // In utility.php
             echo "<p class=\"comment\">$body</p>\n";
         } else {
-            print '<p class="comment"><em>This annotation has been removed</em></p>'."\n";
+            print '<p class="comment"><em>This annotation has been removed</em></p>' . "\n";
         }
 
         ?>

Braces +18 added lines, -9 removed lines

@@ -39,13 +39,16 @@ 
     // If we're just previewing a comment, we passed in 'preview' => true.
     $subheading = 'Your annotation would look like this:';
 
-} elseif ($this_page == 'addcomment') {
+}
+elseif ($this_page == 'addcomment') {
     $subheading = 'Previous annotations';
 
-} elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
+}
+elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
     $subheading = "";
 
-} else {
+}
+else {
     $subheading = 'Annotations';
 }
 
@@ -70,7 +73,8 @@ 
 
         if (isset($comment['comment_id'])) {
             $id = 'c' . $comment['comment_id'];
-        } else {
+        }
+        else {
             $id = '';
         }
 
@@ -83,7 +87,8 @@ 
 
         if (!$comment['visible']) {
             $reporthtml = '';
-        } elseif (($this_page != 'commentreport' &&
+        }
+        elseif (($this_page != 'commentreport' &&
             $this_page != 'addcomment'  &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
@@ -102,9 +107,11 @@ 
 
             $reporthtml = '(<a href="' . $URL->generate() . '" title="Notify moderators that this annotation should be deleted">Report this annotation</a>)';
 
-        } elseif ($comment['modflagged']) {
+        }
+        elseif ($comment['modflagged']) {
             $reporthtml = '(This annotation has been reported to moderators)';
-        } else {
+        }
+        else {
             // When previewing a comment...
             $reporthtml = '';
         }
@@ -125,7 +132,8 @@ 
         if (isset($comment['url'])) {
             print ' <a href="' . $comment['url'] . '" title="Link to this annotation">' . $time . '</a>';
 
-        } else {
+        }
+        else {
             // There won't be a URL when we're just previewing a comment.
             print ' '.$time;
         }
@@ -138,7 +146,8 @@ 
             // Make URLs into links and do <br>s.
             $body = prepare_comment_for_display($comment['body']); // In utility.php
             echo "<p class=\"comment\">$body</p>\n";
-        } else {
+        }
+        else {
             print '<p class="comment"><em>This annotation has been removed</em></p>'."\n";
         }
 

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

Braces +2 added lines, -1 removed lines

@@ -40,7 +40,8 @@
         // Get the name of the member whose epobject was commented upon (if any).
         if (isset($comment['speaker']) && $comment['speaker']['name'] != '') {
             $member_name = $comment['speaker']['name'] . ': ';
-        } else {
+        }
+        else {
             $member_name = '';
         }
 

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

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
         </div>
 
         <?php
-            if ( isset($content['data']['data']) ) {
+            if (isset($content['data']['data'])) {
                 $data = $content['data']['data'];
                 include '_business_list.php'; ?>
                 <div class="business-section__secondary">
@@ -17,11 +17,11 @@ 
                 <?php
                 $calendar = $content['calendar']['years'];
                 include '_calendar_section.php';
-                if ( !isset($no_survey) ) {
-                    include( dirname(__FILE__) . '/../sidebar/looking_for.php' );
+                if (!isset($no_survey)) {
+                    include(dirname(__FILE__) . '/../sidebar/looking_for.php');
                 }
                 ?>
-                <?php if ( isset($content['rssurl']) ) { ?>
+                <?php if (isset($content['rssurl'])) { ?>
                 <p class="rss-feed">
                     <a href="<?= WEBPATH . $content['rssurl'] ?>">RSS feed of <?= $title ?></a>
                 </p>

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
                 </p>
                 <?php } ?>
                 </div>
-            <?php } else { ?>
+            <?php }
+else { ?>
              <div class="business-section__primary">
                 None.
             </div>