mysociety / theyworkforyou

www/includes/easyparliament/templates/html/search/form_main.php

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
             <input type="text" name="q" value="<?= _htmlentities($search_keyword) ?>" class="form-control">
             <input type="submit" class="button" value="Search">
         </p>
-      <?php if (isset($warnings) ) { ?>
+      <?php if (isset($warnings)) { ?>
         <p class="error">
             <?= $warnings ?>
         </p>
@@ -18,14 +18,14 @@ 
         <p>
             <ul class="search-result-display-options">
                 <li><a href="#options" class="search-options-toggle js-toggle-search-options">Advanced search</a></li>
-              <?php if ( $is_adv ) { ?>
-                <?= $search_phrase ? '<li>Exactly: ' . _htmlentities($search_phrase) . '</li>' : '' ?>
-                <?= $search_exclude ? '<li>Excluding: ' . _htmlentities($search_exclude) . '</li>' : '' ?>
-                <?= $search_from ? '<li>From: ' . _htmlentities($search_from) . '</li>' : '' ?>
-                <?= $search_to ? '<li>To: ' . _htmlentities($search_to) . '</li>' : '' ?>
-                <?= $search_person ? '<li>Person: ' . _htmlentities($search_person) . '</li>' : '' ?>
-                <?= $search_section ? '<li>Section: ' . _htmlentities($search_section_pretty) . '</li>' : '' ?>
-                <?= $search_column ? '<li>Column: ' . _htmlentities($search_column) . '</li>' : '' ?>
+              <?php if ($is_adv) { ?>
+                <?= $search_phrase ? '<li>Exactly: '._htmlentities($search_phrase).'</li>' : '' ?>
+                <?= $search_exclude ? '<li>Excluding: '._htmlentities($search_exclude).'</li>' : '' ?>
+                <?= $search_from ? '<li>From: '._htmlentities($search_from).'</li>' : '' ?>
+                <?= $search_to ? '<li>To: '._htmlentities($search_to).'</li>' : '' ?>
+                <?= $search_person ? '<li>Person: '._htmlentities($search_person).'</li>' : '' ?>
+                <?= $search_section ? '<li>Section: '._htmlentities($search_section_pretty).'</li>' : '' ?>
+                <?= $search_column ? '<li>Column: '._htmlentities($search_column).'</li>' : '' ?>
               <?php } ?>
             </ul>
         </p>

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

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
             <ul class="business-list">
             <?php
                 $first = 0;
-                foreach ( $rows as $row ) { ?>
+                foreach ($rows as $row) { ?>
                     <li>
                         <a href="<?= $row['url'] ?>" class="business-list__title">
                             <h3>
@@ -33,7 +33,7 @@ 
                         </a>
                         <?php if (isset($row['contentcount'])) { ?>
                             <p class="business-list__meta">
-                                <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
+                                <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'].' speeches' ?>
                             </p>
                         <?php } ?>
                     </li>
@@ -42,7 +42,7 @@ 
         </div>
         <div class="business-section__secondary">
             <div class="calendar__controls">
-                <?php if ( isset($prev) ) { ?>
+                <?php if (isset($prev)) { ?>
                 <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
                 <?php } else { ?>
                 <span class="calendar__controls__previous">&nbsp;</span>
@@ -50,7 +50,7 @@ 
                 <span class="calendar__controls__current">
                     <?= $session ?> session
                 </span>
-                <?php if ( isset($next) ) { ?>
+                <?php if (isset($next)) { ?>
                 <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
                 <?php } else { ?>
                 <span class="calendar__controls__next">&nbsp;</span>

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
         <div class="business-section__primary">
             <ul class="business-list">
-              <?php foreach ( $data as $item ) { ?>
+              <?php foreach ($data as $item) { ?>
                 <li>
                     <?php include '_business_list_item.php'; ?>
                 </li>

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

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                 foreach ( $years as $year => $months ) { ?>
             <div class="calendar-year">
                 <?php foreach ($months as $month => $dates) {
-                  include '_calendar.php';
+                    include '_calendar.php';
                 } ?>
             </div>
             <?php }

Spacing +4 added lines, -4 removed lines

@@ -8,20 +8,20 @@
         </div>
         <div class="business-section__solo">
             <div class="calendar__controls">
-                <?php if ( isset( $prev ) ) { ?>
+                <?php if (isset($prev)) { ?>
                 <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr; <?= $prev['title'] ?></a>
                 <?php } else { ?>
                 <span class="calendar__controls__previous"></span>
                 <?php } ?>
                 <span class="calendar__controls__current"><?= $year ?></span>
-                <?php if ( isset( $next ) ) { ?>
+                <?php if (isset($next)) { ?>
                 <a href="<?= $next['url'] ?>" class="calendar__controls__next"><?= $next['title'] ?> &rarr;</a>
                 <?php } else { ?>
                 <span class="calendar__controls__next"></span>
                 <?php } ?>
             </div>
-            <?php if ( isset($years) ) {
-                foreach ( $years as $year => $months ) { ?>
+            <?php if (isset($years)) {
+                foreach ($years as $year => $months) { ?>
             <div class="calendar-year">
                 <?php foreach ($months as $month => $dates) {
                   include '_calendar.php';

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

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

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

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
 
         <div class="business-section__primary">
             <ul class="business-list">
-                <?php foreach ( $content['data'] as $date => $bills ) { ?>
+                <?php foreach ($content['data'] as $date => $bills) { ?>
                 <li>
                     <span class="business-list__title">
                         <h3>
                             <?= $date ?>
                         </h3>
                     </span>
-                    <?php foreach ( $bills as $bill ) { ?>
+                    <?php foreach ($bills as $bill) { ?>
                     <p>
                     <a href="<?= $bill['url'] ?>" class="business-list__title">
                         <?= $bill['bill'] ?> &ndash; <?= $bill['sitting'] ?>

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

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
             <?php
             foreach ( $calendar as $year => $months ) {
                 foreach ($months as $month => $dates) {
-                     include '_calendar.php';
+                        include '_calendar.php';
                 }
             } ?>

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
             <?php
-            foreach ( $calendar as $year => $months ) {
+            foreach ($calendar as $year => $months) {
                 foreach ($months as $month => $dates) {
                      include '_calendar.php';
                 }

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

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <a href="<?= $item['list_url'] ?>" class="business-list__title">
     <h3>
-      <?php if ( isset( $item['parent'] ) ) { ?>
+      <?php if (isset($item['parent'])) { ?>
         <?= $item['parent']['body'] ?>
         <br><?= $item['body'] ?>
       <?php } else { ?>
@@ -9,14 +9,14 @@ 
     </h3>
     <span class="business-list__meta">
       <?= format_date($item['hdate'], LONGERDATEFORMAT) ?>
-      <?=  isset($item['contentcount']) ? '&middot; ' . $item['contentcount'] . ( $item['contentcount'] == 1 ? ' speech' : ' speeches' ) : '' ?>
+      <?=  isset($item['contentcount']) ? '&middot; '.$item['contentcount'].($item['contentcount'] == 1 ? ' speech' : ' speeches') : '' ?>
     </span>
 </a>
-<?php if ( isset( $item['child'] ) ) { ?>
+<?php if (isset($item['child'])) { ?>
 <p class="business-list__excerpt">
-  <?php if ( isset($item['child']['speaker']) && count($item['child']['speaker']) > 0 ) { ?>
+  <?php if (isset($item['child']['speaker']) && count($item['child']['speaker']) > 0) { ?>
     <a href="<?= $item['child']['speaker']['url'] ?>"><?= $item['child']['speaker']['name'] ?></a>
   <?php } ?>
-  <?= strip_tags(trim_characters( $item['child']['body'], 0, 200 )) ?>
+  <?= strip_tags(trim_characters($item['child']['body'], 0, 200)) ?>
 </p>
 <?php } ?>

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

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
         </div>
     </div>
   <?php } else {
-      $section = false; include '_section_content.php';
-  } ?>
+        $section = false; include '_section_content.php';
+    } ?>
 
 </div>
 

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 </div>
 <div class="full-page">
 
-  <?php if ( count($data['rows']) == 0 ) { ?>
+  <?php if (count($data['rows']) == 0) { ?>
     <div class="debate-speech">
         <div class="full-page__row">
             <div class="full-page__unit">
-                <?php if ( $col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND' ) { ?>
+                <?php if ($col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND') { ?>
                     We only have information about columns for debates in the House of Commons and the House of Lords.
                 <?php } else { ?>
                     We can't find anything in column <?= $column ?> on <?= $debate_day_human ?>.

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

Indentation +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
     if ($dayOfWeek < 0) {
         $dayOfWeek = 6;
     }
-  ?>
+    ?>
   <?php }
     if (!isset($years)) { ?>
     <div class="calendar__controls">
@@ -127,7 +127,7 @@ 
                     } else {
                         $day_section = $section;
                         if ($section == 'sp') {
-                          $day_section = 'spdebates';
+                            $day_section = 'spdebates';
                         }
                         $urls[$day_section . 'day']->insert(array('d'=>$date));
                         print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";

Spacing +16 added lines, -16 removed lines

@@ -1,12 +1,12 @@ 
 <div class="calendar">
-  <?php if(isset($month)){
-    $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+  <?php if (isset($month)) {
+    $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.
@@ -18,7 +18,7 @@ 
     if (isset($info['onday'])) {
         // 'onday' is like 'yyyy-mm-dd'.
         $datebits = explode('-', $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 = '';
@@ -45,7 +45,7 @@ 
   <?php }
     if (!isset($years)) { ?>
     <div class="calendar__controls">
-        <?php if ( isset($prev) ) { ?>
+        <?php if (isset($prev)) { ?>
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
         <?php } else { ?>
         <span class="calendar__controls__previous">&nbsp;</span>
@@ -53,7 +53,7 @@ 
         <span class="calendar__controls__current">
             <?= $monthName ?> <?= $year ?>
         </span>
-        <?php if ( isset($next) ) { ?>
+        <?php if (isset($next)) { ?>
         <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
         <?php } else { ?>
         <span class="calendar__controls__next">&nbsp;</span>
@@ -106,11 +106,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>';
@@ -118,26 +118,26 @@ 
 
                 // 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 {
                         $day_section = $section;
                         if ($section == 'sp') {
                           $day_section = 'spdebates';
                         }
-                        $urls[$day_section . 'day']->insert(array('d'=>$date));
-                        print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";
+                        $urls[$day_section.'day']->insert(array('d'=>$date));
+                        print "<a href=\"".$urls[$day_section.'day']->generate()."\">$currentDay</a></td>";
                     }
 
                     // $currentDay is not a member of $dates.
 
                 } else {
 
-                        print '<span>' . $currentDay . '</span></td>';
+                        print '<span>'.$currentDay.'</span></td>';
                 }
                 // Increment counters
 
@@ -156,12 +156,12 @@ 
             </tr>
         </tbody>
     </table>
-  <?php if(!isset($years)){ ?>
+  <?php if (!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
         $y = $urls['day'];
         $y->reset();
-        $y->insert(array( 'y' => $year ));
+        $y->insert(array('y' => $year));
         $url = $y->generate();
     ?>
     <a href="<?= $url ?>">See all of <?= $year ?></a>

Braces +6 added lines, -2 removed lines

@@ -106,11 +106,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>';