mysociety / theyworkforyou

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

Spacing +6 added lines, -6 removed lines

@@ -11,10 +11,10 @@ 
                 </div>
                 <div class="row">
                     <div class="medium-9 columns">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                         <li>Your Regional MSPs:</li>
-                        <?php foreach ( $data['regional'] as $msp ) { ?>
+                        <?php foreach ($data['regional'] as $msp) { ?>
                             <li class="homepage-rep-list__rep"><a href="/msp/?p=<?= $msp['person_id'] ?>"><?= $msp['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -57,8 +57,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">
@@ -102,8 +102,8 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently in Parliament</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>

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">

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

Spacing +10 added lines, -10 removed lines

@@ -24,28 +24,28 @@
     foreach ($data['rows'] as $n => $row) {
         echo '<dt>';
         if (isset($row['parent']) && count($row['parent']) > 0) {
-            echo ('<strong>' . $row['parent']['body'] . '</strong>');
+            echo ('<strong>'.$row['parent']['body'].'</strong>');
         }
         echo '</dt> <dd>';
         if (isset($row['speaker']) && count($row['speaker'])) {
-            echo "<em>" . ucfirst($row['speaker']['name']) . "</em>: ";
+            echo "<em>".ucfirst($row['speaker']['name'])."</em>: ";
         }
 
-        echo '&#8220;' . $row['extract'] . "&#8221;</dd>\n";
+        echo '&#8220;'.$row['extract']."&#8221;</dd>\n";
         echo '<dd><em><small>This speech is ';
-        if ($row['hpos']-$want['hpos']>0) {
-            echo ($row['hpos']-$want['hpos']) . ' later than';
+        if ($row['hpos'] - $want['hpos'] > 0) {
+            echo ($row['hpos'] - $want['hpos']).' later than';
         } else {
-            echo ($want['hpos']-$row['hpos']) . ' earlier than';
+            echo ($want['hpos'] - $row['hpos']).' earlier than';
         }
         echo ' the one you want &ndash; ';
-        if ($row['video_status']&8 || !($row['video_status']&1)) {
+        if ($row['video_status'] & 8 || !($row['video_status'] & 1)) {
             echo ' it doesn\'t have any video';
-        } elseif ($row['video_status']&4) {
+        } elseif ($row['video_status'] & 4) {
             echo ' it has already been matched';
-        } elseif ($row['video_status']&1) {
+        } elseif ($row['video_status'] & 1) {
             # Only for Commons currently
-            echo ' if you prefer, <a target="_top" onclick="t = parent.document[\'video\'].currentTime(); this.href += t;" href="/video/?gid=debate/' . $row['gid'] . '&amp;file=' . $want['file'] . '&amp;start=">switch to matching this speech instead</a>';
+            echo ' if you prefer, <a target="_top" onclick="t = parent.document[\'video\'].currentTime(); this.href += t;" href="/video/?gid=debate/'.$row['gid'].'&amp;file='.$want['file'].'&amp;start=">switch to matching this speech instead</a>';
         }
         echo '</small></em></dd>';
     }

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

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 if (count($data) > 0) {
 
     if ($info['view'] == 'recent') {
-        $title = $info['num'] . ' most recent trackbacks';
+        $title = $info['num'].' most recent trackbacks';
     } else {
         $title = 'Some sites linking to this page';
     }
@@ -64,7 +64,7 @@ 
         ?>
         <dt><a href="<?php echo _htmlentities($trackback['url']); ?>"><?php echo _htmlentities($trackback['title']); ?></a></dt>
         <dd><?php echo _htmlentities($trackback['excerpt']); ?><br>
-            <small>At <?php echo _htmlentities($trackback['blog_name']); ?> on <?php echo $date . ' ' . $time; ?></small>
+            <small>At <?php echo _htmlentities($trackback['blog_name']); ?> on <?php echo $date.' '.$time; ?></small>
         </dd>
 <?php
 

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>

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

Indentation +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@
                     ?>
                     <ul class="division-list">
                         <?php foreach ($votes as $vote) {
-                          $voter = sprintf('<a href="/mp/?p=%d">%s</a>', $vote['person_id'], $vote['name']);
-                          if ($vote['teller']) {
-                              $tellers[] = $voter;
-                          } else { ?>
+                            $voter = sprintf('<a href="/mp/?p=%d">%s</a>', $vote['person_id'], $vote['name']);
+                            if ($vote['teller']) {
+                                $tellers[] = $voter;
+                            } else { ?>
                             <li><?= $voter ?></li>
                         <?php
                             }

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 +2 added lines, -2 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">
@@ -29,7 +29,7 @@ 
                             <br>
                             <span class="business-list__meta">
                                 <?= $division['summary'] ?>
-                                <?= $division['mp_vote'] !== '' ? '. <b>Your MP, ' . $mp_name . ', ' . $division['mp_vote'] . '.</b>': '' ?>
+                                <?= $division['mp_vote'] !== '' ? '. <b>Your MP, '.$mp_name.', '.$division['mp_vote'].'.</b>' : '' ?>
                             </span>
                         </p>
                     </li>

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

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 if (isset($data['comments']) && count($data['comments']) > 0) {
     $title = 'Most recent annotations';
     if (isset($data['full_name'])) {
-        $title .= ' on things by ' . $data['full_name'];
+        $title .= ' on things by '.$data['full_name'];
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
@@ -33,11 +33,11 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
 
-        $count = $n+1;
+        $count = $n + 1;
 
         $USERURL->insert(array('u'=>$comment['user_id']));
 
-        ?><a name="c<?php echo $count; ?>"></a><strong><?php echo _htmlentities($comment['firstname'] . ' ' . $comment['lastname']); ?>:</strong> <?php echo $commenttext; ?> <small>(<?php echo relative_time($comment['posted']); ?>)</small><br><a href="<?php echo $comment['url']; ?>">Read annotation</a> | <a href="<?php echo $USERURL->generate(); ?>" title="See more information about this user">All by this user</a> </li>
+        ?><a name="c<?php echo $count; ?>"></a><strong><?php echo _htmlentities($comment['firstname'].' '.$comment['lastname']); ?>:</strong> <?php echo $commenttext; ?> <small>(<?php echo relative_time($comment['posted']); ?>)</small><br><a href="<?php echo $comment['url']; ?>">Read annotation</a> | <a href="<?php echo $USERURL->generate(); ?>" title="See more information about this user">All by this user</a> </li>
 <?php
     }
     ?>
@@ -47,7 +47,7 @@ 
     if ($this_page == 'home') {
         $MOREURL = new URL('comments_recent');
         ?>
-                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
+                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments']) + 1; ?>">See more annotations posted recently</a></p>
 <?php
     }
     if ($this_page != 'home') $PAGE->page_links($data);

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $USERURL = new URL('userview');
     ?>
                         <ul>
@@ -50,7 +52,9 @@ 
                         <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
 <?php
     }
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $PAGE->block_end();
 }
 ?>

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

Spacing +20 added lines, -20 removed lines

@@ -26,31 +26,31 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
-                      <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
+                      <h3>Your <?= $mp_data['former'] ? $mp_data['former'].' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $mp_data['image'] ?>">
                         <h2 class="people-list__person__name"><?= $mp_data['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $mp_data['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $mp_data['party'] ) ?>"><?= $mp_data['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($mp_data['party']) ?>"><?= $mp_data['party'] ?></span>
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $rep['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $rep['party'] ) ?>"><?= $rep['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($rep['party']) ?>"><?= $rep['party'] ?></span>
                         </p>
                     </a>
                         <?php } ?>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -188,7 +188,7 @@ 
                 <img class="people-list__person__image" src="<?= $person['image'] ?>">
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= strtolower($person['party']) ?>"><?= $person['party'] ?></span>
@@ -206,7 +206,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <form method="get" action="<?= $urls['plain'] ?>" class="sidebar-item-with-icon sidebar-item-with-icon--date">
                     <p>
                         Or view a past list
@@ -250,7 +250,7 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -264,7 +264,7 @@ 
                     </p>
                 <?php } ?>
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__).'/../sidebar/looking_for.php') ?>
             </div>
         </div>
 

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

Spacing +11 added lines, -11 removed lines

@@ -45,7 +45,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( count($featured) > 0 ) {
+                        <?php if (count($featured) > 0) {
                             include 'homepage/featured.php';
                         } else { ?>
                             No debates found.
@@ -100,14 +100,14 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently in Parliament</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include 'homepage/recent-debates.php';
                             }
                         ?></ul>
                     </div>
                     <div class="homepage-upcoming homepage-content-section">
                         <h2>Upcoming</h2>
-                        <?php if ( count($calendar) ) { ?>
+                        <?php if (count($calendar)) { ?>
                         <div class="upcoming__controls">
                             <!--
                                 These controls should make the upcoming section slide to the next day.
@@ -126,25 +126,25 @@ 
                             </div>
                         </div>
                         <?php $first = true; $count = 0;
-                            foreach ( $calendar as $date => $places ) {
+                            foreach ($calendar as $date => $places) {
                                 $count++; ?>
                                 <div class="cal-wrapper <?= $first ? 'visible' : 'hidden' ?>" id="day-<?= $count ?>" data-count="<?= $count ?>" data-date="<?= format_date($date, SHORTDATEFORMAT); ?>">
                                 <?php foreach ($places as $place => $events) { ?>
                                     <?php $first = false; ?>
                                     <h3><?= $place ?></h3>
                                     <ul class="upcoming__list">
-                                        <?php for ( $i = 0; $i < 3; $i++ ) {
-                                            if ( isset( $events[$i] ) ) { ?>
+                                        <?php for ($i = 0; $i < 3; $i++) {
+                                            if (isset($events[$i])) { ?>
                                         <li>
                                             <h4 class="upcoming__title"><a href="<?= $events[$i]['link_external'] ?>"><?= $events[$i]['title'] ?></a></h4>
                                             <p class="meta"><?php
                                                 $meta_items = array();
                                                 $meta_items[] = $events[$i]['debate_type'];
-                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ){
+                                                if (isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00') {
                                                     $times = format_time($events[$i]['time_start'], 'g:i a');
 
-                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ){
-                                                        $times = $times . ' - ' . format_time($events[$i]['time_end'], 'g:i a');
+                                                    if (isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00') {
+                                                        $times = $times.' - '.format_time($events[$i]['time_end'], 'g:i a');
                                                     }
                                                     $meta_items[] = $times;
                                                 }
@@ -155,7 +155,7 @@ 
                                         <?php } ?>
                                         <?php } ?>
                                     </ul>
-                                    <?php if ( count($events) - 3 > 0 ) { ?>
+                                    <?php if (count($events) - 3 > 0) { ?>
                                     <a href="/calendar/?d=<?= format_date($date, 'Y-m-d') ?>" class="upcoming__more">And <?= count($events) - 3 ?> more</a><!-- (just links to relevant upcoming page) -->
                                     <?php } ?>
                             <?php } ?>
@@ -163,7 +163,7 @@ 
                         <?php } ?>
                         <?php } else {
                             list($recess, $from, $to) = recess_prettify(date('j'), date('n'), date('Y'), 1);
-                            if ( $recess ) { ?>
+                            if ($recess) { ?>
                                 <p>
                                 Parliament is on holiday until <?= format_date($to, LONGERDATEFORMAT) ?>.
                                 Follow us on <a href="https://twitter.com/theyworkforyou">Twitter</a> and you'll