mysociety / theyworkforyou

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

Indentation +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
         if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
             $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' <a href="/spwrans/?spid=$1">$1</a> ', $body);
             $body = preg_replace_callback('#<citation id="uk\.org\.publicwhip/(.*?)/(.*?)">\[(.*?)\]</citation>#', function($matches) {
-                   if ($matches[1] == 'spor') {
-                       $href_segment = 'sp/?g';
-                   } elseif ($matches[1] == 'spwa') {
+                    if ($matches[1] == 'spor') {
+                        $href_segment = 'sp/?g';
+                    } elseif ($matches[1] == 'spwa') {
                         $href_segment = 'spwrans/?';
                     } else {
                         $href_segment = 'debates/?';

Spacing +22 added lines, -22 removed lines

@@ -1,4 +1,4 @@ 
-  <?php foreach($data['rows'] as $speech) { ?>
+  <?php foreach ($data['rows'] as $speech) { ?>
 
     <?php
 
@@ -19,7 +19,7 @@ 
                     } else {
                         $href_segment = 'debates/?';
                     }
-                    return '[<a href="' . $href_segment . 'id=' . $matches[2] . '\">' . $matches[3] . '</a>]';
+                    return '[<a href="'.$href_segment.'id='.$matches[2].'\">'.$matches[3].'</a>]';
                 },
                 $body);
             $body = str_replace('href="../../../', 'href="http://www.scottish.parliament.uk/', $body);
@@ -65,34 +65,34 @@ 
             'url' => $speech['source_url']
         );
         $major = $data['info']['major'];
-        if ($major==1 || $major==2 || (($major==3 || $major==4) && isset($speech['speaker']['house'])) || $major==101 || $major==6) {
+        if ($major == 1 || $major == 2 || (($major == 3 || $major == 4) && isset($speech['speaker']['house'])) || $major == 101 || $major == 6) {
             $source['title'] = 'Citation: ';
-            if ($major==1 || $major==2) {
+            if ($major == 1 || $major == 2) {
                 $source['title'] .= 'HC';
-            } elseif ($major==3 || $major==4) {
-                if ($speech['speaker']['house']==1) {
+            } elseif ($major == 3 || $major == 4) {
+                if ($speech['speaker']['house'] == 1) {
                     $source['title'] .= 'HC';
                 } else {
                     $source['title'] .= 'HL';
                 }
-            } elseif ($major==6) {
+            } elseif ($major == 6) {
                 $source['title'] .= $data['section_title'];
             } else {
                 $source['title'] .= 'HL';
             }
-            $source['title'] .= ' Deb, ' . format_date($data['info']['date'], LONGDATEFORMAT) . ', c' . $speech['colnum'];
-            if ($major==2) {
+            $source['title'] .= ' Deb, '.format_date($data['info']['date'], LONGDATEFORMAT).', c'.$speech['colnum'];
+            if ($major == 2) {
                 $source['title'] .= 'WH';
-            } elseif ($major==3) {
+            } elseif ($major == 3) {
                 $source['title'] .= 'W';
-            } elseif ($major==4) {
+            } elseif ($major == 4) {
                 $source['title'] .= 'WS';
             }
         } else {
             $source['title'] = null;
         }
 
-        if ($hansardmajors[$data['info']['major']]['location']=='Scotland'){
+        if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
             $source['text'] = 'Official Report source';
         } else {
             $source['text'] = 'Hansard source';
@@ -109,7 +109,7 @@ 
 
             <div class="debate-speech__speaker-and-content">
 
-          <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
+          <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
             <h2 class="debate-speech__speaker">
                 <?php
 
@@ -135,7 +135,7 @@ 
                         $speaker['party'] != 'Deputy Speaker' &&
                         $speaker['constituency']
                     ) {
-                        $speaker_position .= ', ' . $speaker['constituency'];
+                        $speaker_position .= ', '.$speaker['constituency'];
                     }
                 }
 
@@ -166,7 +166,7 @@ 
           <?php } ?>
             <div class="debate-speech__content"><?=$body ?></div>
 
-            <?php if ( $section ) {
+            <?php if ($section) {
                 if ($speech['voting_data']) { ?>
 
                 <div class="debate-speech__question-answered">
@@ -191,10 +191,10 @@ 
 
                 // Video
                 if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only
-                    if ($speech['video_status']&4) { ?>
+                    if ($speech['video_status'] & 4) { ?>
                         <a href="<?= $speech['commentsurl'] ?>" class="watch debate-speech__meta__link" onclick="return moveVideo(\'debate/'<?= $speech['gid'] ?>\');">Watch this</a>
                     <?php
-                    } elseif (!$speech['video'] && $speech['video_status']&1 && !($speech['video_status']&8)) {
+                    } elseif (!$speech['video'] && $speech['video_status'] & 1 && !($speech['video_status'] & 8)) {
                         $gid_type = $data['info']['major'] == 1 ? 'debate' : 'lords'; ?>
                         <a href="/video/?from=debate&amp;gid=<?= $gid_type ?>/<?= $speech['gid'] ?>" class="timestamp debate-speech__meta__link">Video match this</a>
                     <?php
@@ -284,28 +284,28 @@ 
                 $has_content = false;
             }
             if ($has_content) {
-                print '<a href="' . $row['listurl'] . '">' . $row['body'] . '</a> ';
+                print '<a href="'.$row['listurl'].'">'.$row['body'].'</a> ';
                 // For the "x speeches, x comments" text.
                 $moreinfo = array();
                 if ($hansardmajors[$row['major']]['type'] != 'other') {
                     // All wrans have 2 speeches, so no need for this.
                     // All WMS have 1 speech
                     $plural = $row['contentcount'] == 1 ? 'speech' : 'speeches';
-                    $moreinfo[] = $row['contentcount'] . " $plural";
+                    $moreinfo[] = $row['contentcount']." $plural";
                 }
                 if ($row['totalcomments'] > 0) {
                     $plural = $row['totalcomments'] == 1 ? 'annotation' : 'annotations';
-                    $moreinfo[] = $row['totalcomments'] . " $plural";
+                    $moreinfo[] = $row['totalcomments']." $plural";
                 }
                 if (count($moreinfo) > 0) {
-                    print "<small>(" . implode (', ', $moreinfo) . ") </small>";
+                    print "<small>(".implode(', ', $moreinfo).") </small>";
                 }
             } else {
                 // Nothing in this item, so no link.
                 print $row['body'];
             }
             if (isset($row['excerpt'])) {
-                print "<p class=\"subrows__excerpt\">" . trim_characters($row['excerpt'], 0, 200) . "</p>";
+                print "<p class=\"subrows__excerpt\">".trim_characters($row['excerpt'], 0, 200)."</p>";
             }
         }
         print '</ul></div></div></div>';

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

@@ -157,7 +157,7 @@
               <?php # XXX
                 if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
                     ?><p class="debate-speech__question_id"><small>
-                    <?= "Question $m[1]" ?>
+                    <?= "question $m[1]" ?>
                     </small></p>
               <?php } ?>
             </h2>

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

Spacing +5 added lines, -5 removed lines

@@ -10,17 +10,17 @@
                         <input type="submit" value="Search" class="button search-section__submit">
                     </div>
                 </div>
-                <?php if ( isset($search_sections) ) { ?>
-                    <?php if ( count($search_sections) == 1 ) { ?>
+                <?php if (isset($search_sections)) { ?>
+                    <?php if (count($search_sections) == 1) { ?>
                     <input name="section" value="<?= $search_sections[0]['section'] ?>" type="hidden">
-                    <?php } else if ( count($search_sections) > 1 ) { ?>
+                    <?php } else if (count($search_sections) > 1) { ?>
                     <div class="search-section__filters">
-                        <?php foreach ( $search_sections as $section ) { ?>
+                        <?php foreach ($search_sections as $section) { ?>
                             <label><input name="section[]" value="<?= $section['section'] ?>" type="checkbox" checked="checked"><?= $section['title'] ?></label>
                     <?php } ?>
                     </div>
                     <?php }
-                } else if ( isset($section) ) { ?>
+                } else if (isset($section)) { ?>
                 <input name="section" value="<?= $section ?>" type="hidden">
                 <?php } ?>
             </form>

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>';