mysociety / theyworkforyou

www/includes/easyparliament/templates/html/homepage/recent-debates.php

Spacing +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@ 
-                            <?php if ( isset( $recent['child'] ) ) { ?>
+                            <?php if (isset($recent['child'])) { ?>
                             <li class="parliamentary-excerpt">
                             <h3 class="excerpt__title"><a href="<?= $recent['list_url'] ?>"><?= $recent['parent']['body'] ? $recent['parent']['body'] . ' : ' : '' ?><?= $recent['body'] ?></a></h3>
                                 <p class="meta"><?=format_date($recent['hdate'], LONGERDATEFORMAT); ?></p>
                                 <p class="meta excerpt__category"><a href="<?= $recent['more_url'] ?>"><?= $recent['desc'] ?></a></p>
                                 <p class="excerpt__statement">
-                                <?php if ( isset($recent['child']['speaker']) && count($recent['child']['speaker']) ) { ?>
+                                <?php if (isset($recent['child']['speaker']) && count($recent['child']['speaker'])) { ?>
                                 <a href="<?= $recent['child']['speaker']['url'] ?>"><?= $recent['child']['speaker']['name'] ?></a>
                                 <?php } ?>
                                 <?= trim_characters($recent['child']['body'], 0, 200) ?>
@@ -13,10 +13,10 @@ 
                             <?php } else { ?>
                             <li class="parliamentary-excerpt">
                             <h3 class="excerpt__title"><?= $recent['desc'] ?></h3>
-                                <?php foreach ( $recent['data'] as $date => $details ) { ?>
+                                <?php foreach ($recent['data'] as $date => $details) { ?>
                                 <p class="meta"><?= $date ?></p>
                                 <p class="meta excerpt__category"><a href="<?= $recent['more_url'] ?>"><?= $recent['desc'] ?></a></p>
-                                <?php foreach ( $details as $bill ) { ?>
+                                <?php foreach ($details as $bill) { ?>
                                 <p class="excerpt__statement">
                                     <a href="<?= $bill['url'] ?>"><?= $bill['bill'] ?>, <?= $bill['sitting'] ?></a>
                                 </p>

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
                                 <?= trim_characters($recent['child']['body'], 0, 200) ?>
                                 </p>
                             </li>
-                            <?php } else { ?>
+                            <?php }
+else { ?>
                             <li class="parliamentary-excerpt">
                             <h3 class="excerpt__title"><?= $recent['desc'] ?></h3>
                                 <?php foreach ( $recent['data'] as $date => $details ) { ?>

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

Spacing +4 added lines, -4 removed lines

@@ -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']
@@ -119,7 +119,7 @@ 
         $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'])) {
@@ -127,7 +127,7 @@ 
 
         } else {
             // There won't be a URL when we're just previewing a comment.
-            print ' '.$time;
+            print ' ' . $time;
         }
         ?> <?php echo $reporthtml; ?></small></p>
 
@@ -139,7 +139,7 @@ 
             $body = prepare_comment_for_display($comment['body']); // In utility.php
             echo "<p class=\"comment\">$body</p>\n";
         } else {
-            print '<p class="comment"><em>This annotation has been removed</em></p>'."\n";
+            print '<p class="comment"><em>This annotation has been removed</em></p>' . "\n";
         }
 
         ?>

Braces +18 added lines, -9 removed lines

@@ -39,13 +39,16 @@ 
     // If we're just previewing a comment, we passed in 'preview' => true.
     $subheading = 'Your annotation would look like this:';
 
-} elseif ($this_page == 'addcomment') {
+}
+elseif ($this_page == 'addcomment') {
     $subheading = 'Previous annotations';
 
-} elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
+}
+elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
     $subheading = "";
 
-} else {
+}
+else {
     $subheading = 'Annotations';
 }
 
@@ -70,7 +73,8 @@ 
 
         if (isset($comment['comment_id'])) {
             $id = 'c' . $comment['comment_id'];
-        } else {
+        }
+        else {
             $id = '';
         }
 
@@ -83,7 +87,8 @@ 
 
         if (!$comment['visible']) {
             $reporthtml = '';
-        } elseif (($this_page != 'commentreport' &&
+        }
+        elseif (($this_page != 'commentreport' &&
             $this_page != 'addcomment'  &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
@@ -102,9 +107,11 @@ 
 
             $reporthtml = '(<a href="' . $URL->generate() . '" title="Notify moderators that this annotation should be deleted">Report this annotation</a>)';
 
-        } elseif ($comment['modflagged']) {
+        }
+        elseif ($comment['modflagged']) {
             $reporthtml = '(This annotation has been reported to moderators)';
-        } else {
+        }
+        else {
             // When previewing a comment...
             $reporthtml = '';
         }
@@ -125,7 +132,8 @@ 
         if (isset($comment['url'])) {
             print ' <a href="' . $comment['url'] . '" title="Link to this annotation">' . $time . '</a>';
 
-        } else {
+        }
+        else {
             // There won't be a URL when we're just previewing a comment.
             print ' '.$time;
         }
@@ -138,7 +146,8 @@ 
             // Make URLs into links and do <br>s.
             $body = prepare_comment_for_display($comment['body']); // In utility.php
             echo "<p class=\"comment\">$body</p>\n";
-        } else {
+        }
+        else {
             print '<p class="comment"><em>This annotation has been removed</em></p>'."\n";
         }
 

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

Braces +2 added lines, -1 removed lines

@@ -32,7 +32,8 @@
             $URL = new URL('member');
             $URL->insert(array('id'=>$row['speaker']['member_id']));
             $member = '<a href="' . $URL->generate() . '">' . $row['speaker']['name'] . '</a>: ';
-        } else {
+        }
+        else {
             $member = '';
         }
         ?>

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

Braces +2 added lines, -1 removed lines

@@ -40,7 +40,8 @@
         // Get the name of the member whose epobject was commented upon (if any).
         if (isset($comment['speaker']) && $comment['speaker']['name'] != '') {
             $member_name = $comment['speaker']['name'] . ': ';
-        } else {
+        }
+        else {
             $member_name = '';
         }
 

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

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
         </div>
 
         <?php
-            if ( isset($content['data']['data']) ) {
+            if (isset($content['data']['data'])) {
                 $data = $content['data']['data'];
                 include '_business_list.php'; ?>
                 <div class="business-section__secondary">
@@ -17,11 +17,11 @@ 
                 <?php
                 $calendar = $content['calendar']['years'];
                 include '_calendar_section.php';
-                if ( !isset($no_survey) ) {
-                    include( dirname(__FILE__) . '/../sidebar/looking_for.php' );
+                if (!isset($no_survey)) {
+                    include(dirname(__FILE__) . '/../sidebar/looking_for.php');
                 }
                 ?>
-                <?php if ( isset($content['rssurl']) ) { ?>
+                <?php if (isset($content['rssurl'])) { ?>
                 <p class="rss-feed">
                     <a href="<?= WEBPATH . $content['rssurl'] ?>">RSS feed of <?= $title ?></a>
                 </p>

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
                 </p>
                 <?php } ?>
                 </div>
-            <?php } else { ?>
+            <?php }
+else { ?>
              <div class="business-section__primary">
                 None.
             </div>

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

Spacing +3 added lines, -3 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>
@@ -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>

Braces +4 added lines, -2 removed lines

@@ -44,7 +44,8 @@ 
             <div class="calendar__controls">
                 <?php if ( isset($prev) ) { ?>
                 <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <span class="calendar__controls__previous">&nbsp;</span>
                 <?php } ?>
                 <span class="calendar__controls__current">
@@ -52,7 +53,8 @@ 
                 </span>
                 <?php if ( isset($next) ) { ?>
                 <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
-                <?php } else { ?>
+                <?php }
+else { ?>
                 <span class="calendar__controls__next">&nbsp;</span>
                 <?php } ?>
             </div>

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

Spacing +11 added lines, -11 removed lines

@@ -24,9 +24,9 @@ 
             <ul class="business-list">
             <?php
                 $first = 0;
-                foreach ( $content['rows'] as $row ) {
-                    if ( $row['htype'] == 10 ) {
-                        if ( !$first ) {
+                foreach ($content['rows'] as $row) {
+                    if ($row['htype'] == 10) {
+                        if (!$first) {
                             print '</li>';
                             $first = 1;
                         } ?>
@@ -37,16 +37,16 @@ 
                                 </h3>
                             </a>
                             <p class="business-list__meta">
-                                <?php if ( isset($row['sitting']) ) { ?>
+                                <?php if (isset($row['sitting'])) { ?>
                                     <?= make_ranking($row['sitting']) ?> sitting &middot;
                                 <?php } ?>
-                                <?= format_date($row['hdate'], LONGERDATEFORMAT ) ?>
-                                <?php if ( $row['contentcount'] > 0 ) { ?>
+                                <?= format_date($row['hdate'], LONGERDATEFORMAT) ?>
+                                <?php if ($row['contentcount'] > 0) { ?>
                                 &middot; <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
                                 <?php } ?>
                             </p>
                             <p class="business-list__excerpt">
-                                <?= trim_characters($row['excerpt'], 0, 200 ) ?>
+                                <?= trim_characters($row['excerpt'], 0, 200) ?>
                             </p>
                     <?php } else { ?>
                     <ul>
@@ -61,7 +61,7 @@ 
                                     <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
                                 </p>
                             <?php } ?>
-                            <?php if ( isset($row['excerpt']) ) { ?>
+                            <?php if (isset($row['excerpt'])) { ?>
                                 <p class="business-list__excerpt">
                                     <?= trim_characters($row['excerpt'], 0, 200) ?>
                                 </p>
@@ -73,7 +73,7 @@ 
             </ul>
         </div>
 
-        <?php if ( isset($content['info']['committee']) ) {
+        <?php if (isset($content['info']['committee'])) {
             $committee = $content['info']['committee'];
         ?>
         <div class="business-section__secondary">
@@ -85,13 +85,13 @@ 
 
             <p><strong>Chairpersons</strong></p>
             <ul>
-            <?php foreach( $committee['chairmen'] as $chair ) { ?>
+            <?php foreach ($committee['chairmen'] as $chair) { ?>
                 <li><?= $chair['name'] ?> (<?= $chair['attending'] ?>)</li>
             <?php } ?>
             </ul>
             <p><strong>Members</strong></p>
             <ul>
-            <?php foreach( $committee['members'] as $chair ) { ?>
+            <?php foreach ($committee['members'] as $chair) { ?>
                 <li><?= $chair['name'] ?> (<?= $chair['attending'] ?>)</li>
             <?php } ?>
             </ul>

Braces +2 added lines, -1 removed lines

@@ -48,7 +48,8 @@
                             <p class="business-list__excerpt">
                                 <?= trim_characters($row['excerpt'], 0, 200 ) ?>
                             </p>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                     <ul>
                         <li>
                             <a href="<?= $row['listurl'] ?>" class="business-list__title">

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

Braces +2 added lines, -1 removed lines

@@ -3,7 +3,8 @@
       <?php if ( isset( $item['parent'] ) ) { ?>
         <?= $item['parent']['body'] ?>
         <br><?= $item['body'] ?>
-      <?php } else { ?>
+      <?php }
+else { ?>
         <?= $item['body'] ?>
       <?php } ?>
     </h3>

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

Spacing +6 added lines, -6 removed lines

@@ -33,17 +33,17 @@
 
         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>';
         }

Braces +8 added lines, -4 removed lines

@@ -35,21 +35,25 @@
         echo '<dd><em><small>This speech is ';
         if ($row['hpos']-$want['hpos']>0) {
             echo ($row['hpos']-$want['hpos']) . ' later than';
-        } else {
+        }
+        else {
             echo ($want['hpos']-$row['hpos']) . ' earlier than';
         }
         echo ' the one you want &ndash; ';
         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 '</small></em></dd>';
     }
     echo '</dl>';
-} else {
+}
+else {
     echo '<p>No data to display.</p>';
 }