mysociety / theyworkforyou

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 +12 added lines, -12 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,7 +118,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);
 
@@ -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 +7 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <div class="calendar">
-  <?php if(isset($month)){
+  <?php if(isset($month)) {
     $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
 
     // What is the first day of the month in question?
@@ -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>';

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/_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/divisions/index.php

Indentation +4 added lines, -4 removed lines

@@ -7,9 +7,9 @@ 
           </div>
           <div class="business-section__primary">
                <?php
-               if ( isset($divisions) && $divisions ) {
-                 $current_date = '';
-               ?>
+                if ( isset($divisions) && $divisions ) {
+                    $current_date = '';
+                ?>
                <ul class="business-list">
                     <?php foreach ($divisions as $division) { ?>
                     <li id="<?= $division['division_id'] ?>">
@@ -18,7 +18,7 @@ 
                         <h3><?= format_date($division['date'], LONGERDATEFORMAT) ?></h3>
                         </span>
                         <?php
-                          $current_date = $division['date'];
+                            $current_date = $division['date'];
                         } ?>
                         <a href="/divisions/<?= $division['division_id'] ?>" class="business-list__title">
                             <h3><?= $division['division_title'] ?></h3>

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
           </div>
           <div class="business-section__primary">
                <?php
-               if ( isset($divisions) && $divisions ) {
+               if (isset($divisions) && $divisions) {
                  $current_date = '';
                ?>
                <ul class="business-list">

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

Spacing +5 added lines, -5 removed lines

@@ -84,13 +84,13 @@
         $db->display_total_duration();
 
         $duration = getmicrotime() - STARTTIME;
-        twfy_debug ("TIME", "Total time for page: $duration seconds.");
+        twfy_debug("TIME", "Total time for page: $duration seconds.");
         if (!isset($_SERVER['WINDIR'])) {
             $rusage = getrusage();
-            $duration = $rusage['ru_utime.tv_sec']*1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
-            twfy_debug ('TIME', "Total user time: $duration microseconds.");
-            $duration = $rusage['ru_stime.tv_sec']*1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
-            twfy_debug ('TIME', "Total system time: $duration microseconds.");
+            $duration = $rusage['ru_utime.tv_sec'] * 1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
+            twfy_debug('TIME', "Total user time: $duration microseconds.");
+            $duration = $rusage['ru_stime.tv_sec'] * 1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
+            twfy_debug('TIME', "Total system time: $duration microseconds.");
         }
 
 ?>