mysociety / theyworkforyou

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

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                       <?php } ?>
                     </a>
                   <?php }
-                  if ( isset($row['excerpt']) ) { ?>
+                    if ( isset($row['excerpt']) ) { ?>
                     <p class="business-list__excerpt">
                         <?= trim_characters($row['excerpt'], 0, 200 ) ?>
                     </p>

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

@@ -84,6 +84,6 @@
       <?php } ?>
     </div>
 
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
+    <?php $search_title = "search $title"; include '_search.php'; ?>
 
 </div>

Spacing +15 added lines, -15 removed lines

@@ -6,32 +6,32 @@ 
                 <?= $parent_title ?>
             </h1>
             <p class="business-section__header__date">
-                <?= format_date( $info['date'], LONGERDATEFORMAT ) ?>
+                <?= format_date($info['date'], LONGERDATEFORMAT) ?>
             </p>
         </div>
-      <?php if ( isset($rows) ) { ?>
+      <?php if (isset($rows)) { ?>
         <div class="business-section__primary">
             <ul class="business-list">
               <?php
                 $prevlevel = '';
-                foreach ( $rows as $row ) { ?>
-                <?php if ( $row['htype'] == 10 ) {
-                    if ( $prevlevel == 'sub' ) { ?>
+                foreach ($rows as $row) { ?>
+                <?php if ($row['htype'] == 10) {
+                    if ($prevlevel == 'sub') { ?>
                     </ul>
                     </li>
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
+                    <?php } elseif ($prevlevel == 'top') { ?>
                     </li>
                     <?php } ?>
                     <li>
                 <?php } else {
-                    if ( $prevlevel == '' ) { ?>
+                    if ($prevlevel == '') { ?>
                     <li>
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
+                    <?php } elseif ($prevlevel == 'top') { ?>
                     <ul>
                     <li>
                     <?php } ?>
                 <?php } ?>
-                  <?php if ( isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;") ) { ?>
+                  <?php if (isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) { ?>
                     <div class="business-list__title">
                         <h3>
                             <?= $row['body'] ?>
@@ -42,26 +42,26 @@ 
                         <h3>
                             <?= $row['body'] ?>
                         </h3>
-                      <?php if ( isset($row['contentcount']) && $row['contentcount'] > 0 ) { ?>
+                      <?php if (isset($row['contentcount']) && $row['contentcount'] > 0) { ?>
                         <span class="business-list__meta">
                             <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
                         </span>
                       <?php } ?>
                     </a>
                   <?php }
-                  if ( isset($row['excerpt']) ) { ?>
+                  if (isset($row['excerpt'])) { ?>
                     <p class="business-list__excerpt">
-                        <?= trim_characters($row['excerpt'], 0, 200 ) ?>
+                        <?= trim_characters($row['excerpt'], 0, 200) ?>
                     </p>
                   <?php } ?>
-                <?php if ( $row['htype'] == 10 ) {
+                <?php if ($row['htype'] == 10) {
                     $prevlevel = 'top';
                 } else {
                     $prevlevel = 'sub'; ?>
                 </li>
                 <?php } ?>
               <?php } ?>
-                <?php if ( $prevlevel == 'sub' ) { ?>
+                <?php if ($prevlevel == 'sub') { ?>
                 </ul>
                 </li>
                 <?php } ?>
@@ -74,7 +74,7 @@ 
             </div>
             <?php
                 include '_calendar_section.php';
-                include( dirname(__FILE__) . '/../sidebar/looking_for.php' );
+                include(dirname(__FILE__) . '/../sidebar/looking_for.php');
             ?>
         </div>
       <?php } else { ?>

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

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>

Spacing +15 added lines, -15 removed lines

@@ -1,4 +1,4 @@ 
-  <?php foreach($data['rows'] as $speech) { ?>
+  <?php foreach ($data['rows'] as $speech) { ?>
 
     <?php
 
@@ -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) {
+            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
 
@@ -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
@@ -298,7 +298,7 @@ 
                     $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.

Braces +5 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
             $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';
@@ -190,7 +190,8 @@ 
                 } # End of voting HTML
 
                 // Video
-                if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only
+                if ($data['info']['major'] == 1 && !$individual_item) {
+# Commons debates only
                     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
@@ -242,7 +243,8 @@ 
                 </li>
                 <?php
                 }
-                if (!$section || !$individual_item) { # XXX ?>
+                if (!$section || !$individual_item) {
+# XXX ?>
                 <li class="link-to-speech">
                     <span class="link-to-speech__label">Link to this speech</span>
                     <a href="<?= $speech['listurl'] ?>" class="link debate-speech__meta__link">In context</a>

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/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/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 +4 added lines, -4 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,7 +40,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( $featured ) {
+                        <?php if ($featured) {
                              include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
@@ -85,7 +85,7 @@ 
                     <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 ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>

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

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

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

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

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/calendar_date.php

Braces +6 added lines, -3 removed lines

@@ -18,10 +18,13 @@
 # Content goes here
 foreach ($data['dates'] as $date => $day_events) {
     foreach ($order as $i => $chamber) {
-        if (!array_key_exists($chamber, $day_events))
-            continue;
+        if (!array_key_exists($chamber, $day_events)) {
+                    continue;
+        }
         $events = $day_events[$chamber];
-        if ($plural[$i]) $chamber .= 's';
+        if ($plural[$i]) {
+            $chamber .= 's';
+        }
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new URL($hansardmajors[$major[$i]]['page_all']);

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new URL($hansardmajors[$major[$i]]['page_all']);
-            $URL->insert( array( 'd' => $date ) );
+            $URL->insert(array('d' => $date));
             print ' &nbsp; <a href="' . $URL->generate() . '">See this day &rarr;</a>';
         }
         print "</h2>\n";

www/includes/easyparliament/templates/html/divisions/vote.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
             </div>
 
              <ul class="debate-speech__meta debate-speech__links">
-             <?php if ( $division['debate_url'] ) { ?>
+             <?php if ($division['debate_url']) { ?>
                   <li class="link-to-speech">
                       <a class="link debate-speech__meta__link" href="<?= $division['debate_url'] ?>">Show full debate</a>
                   </li>