mysociety / theyworkforyou

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

Spacing +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
         }
 
         if (isset($comment['comment_id'])) {
-            $id = 'c' . $comment['comment_id'];
+            $id = 'c'.$comment['comment_id'];
         } else {
             $id = '';
         }
@@ -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']
@@ -100,7 +100,7 @@ 
                 'ret' 	=> $comment['url']
             ));
 
-            $reporthtml = '(<a href="' . $URL->generate() . '" title="Notify moderators that this annotation should be deleted">Report this annotation</a>)';
+            $reporthtml = '(<a href="'.$URL->generate().'" title="Notify moderators that this annotation should be deleted">Report this annotation</a>)';
 
         } elseif ($comment['modflagged']) {
             $reporthtml = '(This annotation has been reported to moderators)';
@@ -119,11 +119,11 @@ 
         $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'])) {
-            print ' <a href="' . $comment['url'] . '" title="Link to this annotation">' . $time . '</a>';
+            print ' <a href="'.$comment['url'].'" title="Link to this annotation">'.$time.'</a>';
 
         } else {
             // There won't be a URL when we're just previewing a comment.

www/includes/easyparliament/templates/html/sidebar/looking_for.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
-    <?php if ( isset($mini_survey) ) {
-        if ( $mini_survey['show'] ) { ?>
+    <?php if (isset($mini_survey)) {
+        if ($mini_survey['show']) { ?>
                 <form class="minisurvey" method="post" action="<?=OPTION_SURVEY_URL?>">
                     <p>Did you find what you were looking for?</p>
                     <input type="hidden" name="sourceidentifier" value="twfy-mini-2">
@@ -17,7 +17,7 @@ 
 
                     <input type="submit" value="Submit answer">
                 </form>
-        <?php } else if ( $mini_survey['answered'] ) { ?>
+        <?php } else if ($mini_survey['answered']) { ?>
             <p>Thanks for answering</p>
         <?php } ?>
     <?php } ?>

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

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
         $USERURL->insert(array('u'=>$comment['user_id']));
         ?>
         <div class="comment">
-            <p><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><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']).' '._htmlentities($comment['lastname']); ?></strong></a><br>
 <?php
         // Make URLs into links and do <br>s.
         $body = prepare_comment_for_display($comment['body']); // In utility.php
@@ -105,7 +105,7 @@ 
         }
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && !$comment['modflagged']

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

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
     <meta name="keywords" content="<?= _htmlentities($meta_keywords); ?>">
     <?php
         if (!empty($robots)) {
-            echo '<meta name="robots" content="' . $robots . '">';
+            echo '<meta name="robots" content="'.$robots.'">';
         }
     ?>
 
@@ -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">
@@ -234,7 +234,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>
@@ -255,7 +255,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>

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

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
                         <?php if ( $featured ) {
-                             include dirname(__FILE__) . "/../homepage/featured.php";
+                                include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
                     <div class="homepage-create-alert homepage-content-section">

Spacing +6 added lines, -6 removed lines

@@ -4,10 +4,10 @@ 
             <div class="hero__mp-search__wrap">
                 <h1>Do your MLAs represent you?</h1>
                 <div class="row collapse">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                             <li>Your MLAs: </li>
-                        <?php foreach ( $data['regional'] as $mla ) { ?>
+                        <?php foreach ($data['regional'] as $mla) { ?>
                             <li class="homepage-rep-list__rep"><a href="/mla/?p=<?= $mla['person_id'] ?>"><?= $mla['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -40,8 +40,8 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( $featured ) {
-                             include dirname(__FILE__) . "/../homepage/featured.php";
+                        <?php if ($featured) {
+                             include dirname(__FILE__)."/../homepage/featured.php";
                         } ?>
                     </div>
                     <div class="homepage-create-alert homepage-content-section">
@@ -85,8 +85,8 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently in the Northern Ireland Assembly</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
-                                include dirname(__FILE__) . '/../homepage/recent-debates.php';
+                            foreach ($debates['recent'] as $recent) {
+                                include dirname(__FILE__).'/../homepage/recent-debates.php';
                             }
                         ?></ul>
                     </div>

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

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
         ?>
                     <dt><a href="<?php echo $row['listurl']; ?>"><?php
         if (isset($row['parent']) && count($row['parent']) > 0) {
-            echo ('<strong>' . $row['parent']['body'] . '</strong>');
+            echo ('<strong>'.$row['parent']['body'].'</strong>');
         }
         echo '</a>';
         if (isset($row['video_status']) && ($row['video_status'] == 5 || $row['video_status'] == 7)) {
@@ -44,17 +44,17 @@ 
         ?></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>
 
         <p>&#8220;<?php
 
-        echo $row['extract'] . "&#8221;</p></dd>\n";
+        echo $row['extract']."&#8221;</p></dd>\n";
     }
     ?>
                 </dl>

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

Spacing +11 added lines, -11 removed lines

@@ -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,22 +161,22 @@ 
 
                 // 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);
 
                     if ($currentDay == $toDay) {
-                        print '<span>' . $currentDay . '</span></td>';
+                        print '<span>'.$currentDay.'</span></td>';
                     } else {
                         $DAYURL->insert(array('d'=>$date));
-                        print "<a href=\"" . $DAYURL->generate() . "\">$currentDay</a></td>";
+                        print "<a href=\"".$DAYURL->generate()."\">$currentDay</a></td>";
                     }
 
                     // $currentDay is not a member of $dates.
 
                 } else {
 
-                        print '<span>' . $currentDay . '</span></td>';
+                        print '<span>'.$currentDay.'</span></td>';
                 }
                 // Increment counters
 
@@ -209,7 +209,7 @@ 
             $year = $years[0];
             $URL = new URL($hansardmajors[$data['info']['major']]['page_year']);
             $URL->insert(array('y'=>$year));
-            print '<p><a href="' . $URL->generate() . '">See all of ' . $year . '</a></p>';
+            print '<p><a href="'.$URL->generate().'">See all of '.$year.'</a></p>';
         }
     }
 } else {

Braces +16 added lines, -8 removed lines

@@ -135,12 +135,16 @@ 
                 }
 
                 $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,11 +153,15 @@ 
                 // 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>';

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

Indentation +17 added lines, -17 removed lines

@@ -61,23 +61,23 @@
               <?php else: ?>
                 <ul class="vote-descriptions">
                   <?php
-                  $policy_ids = array();
-
-                  foreach ($positions as $position) {
-                      if (!in_array($position['policy_id'], $policy_ids)) {
-                          $description = ucfirst($position['desc']);
-                          $link = sprintf(
-                              '%s/divisions?policy=%s',
-                              $member_url,
-                              $position['policy_id']
-                          );
-                          $show_link = $position['position'] != 'has never voted on';
-                          $key_vote = $position;
-                          include(dirname(__DIR__) . '/mp/_vote_description.php');
-
-                          $policy_ids[] = $position['policy_id'];
-                      }
-                  } ?>
+                    $policy_ids = array();
+
+                    foreach ($positions as $position) {
+                        if (!in_array($position['policy_id'], $policy_ids)) {
+                            $description = ucfirst($position['desc']);
+                            $link = sprintf(
+                                '%s/divisions?policy=%s',
+                                $member_url,
+                                $position['policy_id']
+                            );
+                            $show_link = $position['position'] != 'has never voted on';
+                            $key_vote = $position;
+                            include(dirname(__DIR__) . '/mp/_vote_description.php');
+
+                            $policy_ids[] = $position['policy_id'];
+                        }
+                    } ?>
                 </ul>
 
               <?php endif; ?>

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
                           );
                           $show_link = $position['position'] != 'has never voted on';
                           $key_vote = $position;
-                          include(dirname(__DIR__) . '/mp/_vote_description.php');
+                          include(dirname(__DIR__).'/mp/_vote_description.php');
 
                           $policy_ids[] = $position['policy_id'];
                       }
@@ -109,7 +109,7 @@ 
                 <ul class="business-list">
                   <?php foreach ($business as $item): ?>
                     <li>
-                        <?php include(dirname(__DIR__) . '/section/_business_list_item.php'); ?>
+                        <?php include(dirname(__DIR__).'/section/_business_list_item.php'); ?>
                     </li>
                   <?php endforeach; ?>
                 </ul>

Braces +3 added lines, -1 removed lines

@@ -58,10 +58,12 @@
                     to <a href="<?= $member_url ?>/votes">see all their votes</a>.
                 </p>
 
-              <?php else: ?>
+              <?php else {
+    : ?>
                 <ul class="vote-descriptions">
                   <?php
                   $policy_ids = array();
+}
 
                   foreach ($positions as $position) {
                       if (!in_array($position['policy_id'], $policy_ids)) {

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

Spacing +4 added lines, -4 removed lines

@@ -39,20 +39,20 @@
 
         // 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'] . ': ';
+            $member_name = $comment['speaker']['name'].': ';
         } else {
             $member_name = '';
         }
 
-        $user_name = _htmlentities($comment['firstname'] . ' ' . $comment['lastname']);
+        $user_name = _htmlentities($comment['firstname'].' '.$comment['lastname']);
 
         // We're grouping things by epobject_id, so we're going to display the number
         // of comments on this epobject.
         $plural = $comment['total_comments'] == 1 ? ' annotation' : ' annotations';
 
-        echo "\t\t\t\t<p><a href=\"$comment[url]\">$comment[total_comments]$plural</a> to <strong>" . $member_name . $hansardtext . "</strong><br>\n";
+        echo "\t\t\t\t<p><a href=\"$comment[url]\">$comment[total_comments]$plural</a> to <strong>".$member_name.$hansardtext."</strong><br>\n";
         echo "\t\t\t\t<small>(posted on $date)</small><br>\n";
-        echo "\t\t\t\t" . prepare_comment_for_display($comment['body']) . "</p>"; ?>
+        echo "\t\t\t\t".prepare_comment_for_display($comment['body'])."</p>"; ?>
 
 <?php
         $PAGE->stripe_end();