mysociety / theyworkforyou

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

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

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
         $USERURL->insert(array('u'=>$comment['user_id']));
         ?>
         <div class="comment">
-            <p><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><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) . ' ' . _htmlentities($comment['lastname']); ?></strong></a><br>
 <?php
         // Make URLs into links and do <br>s.
         $body = prepare_comment_for_display($comment['body']); // In utility.php
@@ -105,7 +105,7 @@ 
         }
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && !$comment['modflagged']

Braces +14 added lines, -7 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';
 }
 
@@ -69,7 +72,8 @@ 
         if (isset($comment['comment_id'])) {
             ?> id="c<?php echo $comment['comment_id']; ?>"><a name="c<?php echo $comment['comment_id']; ?>"></a>
 <?php
-        } else {
+        }
+        else {
             echo ">\n";
         }
 
@@ -99,7 +103,8 @@ 
             ?>
         <a href="<?php echo $comment['url']; ?>" title="Link to this annotation"><?php echo $time; ?></a>
 <?php
-        } else {
+        }
+        else {
             // There won't be a URL when we're just previewing a comment.
             echo "\t\t$time";
         }
@@ -124,7 +129,8 @@ 
         <a href="<?php echo $URL->generate(); ?>" title="Notify moderators that this annotation needs editing or deleting">Report this annotation</a>
 <?php
 
-        } elseif ($comment['modflagged']) {
+        }
+        elseif ($comment['modflagged']) {
             ?><br>
         This annotation has been reported
 <?php
@@ -139,7 +145,8 @@ 
 
     }
 
-} else {
+}
+else {
 
     ?>
     <p>No annotations</p>

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

Braces +2 added lines, -1 removed lines

@@ -13,6 +13,7 @@
         }
     }
     api_output($out);
-} else {
+}
+else {
     api_error('Please supply a year');
 }

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

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
         // COMMENT REPORTING LINK.
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && $THEUSER->user_id() != $comment['user_id']
@@ -117,7 +117,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'])) {
@@ -125,7 +125,7 @@ 
 
         } else {
             // There won't be a URL when we're just previewing a comment.
-            print ' '.$time;
+            print ' ' . $time;
         }
         ?> <?php echo $reporthtml; ?></small></p>
 

Braces +16 added lines, -8 removed lines

@@ -39,13 +39,16 @@ 
     // If we're just previewing a comment, we passed in 'preview' => true.
     $subheading = 'Your comment 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 = '';
         }
 
@@ -100,9 +104,11 @@ 
 
             $reporthtml = '(<a href="' . $URL->generate() . '" title="Notify moderators that this comment should be deleted">Report this comment</a>)';
 
-        } elseif ($comment['modflagged']) {
+        }
+        elseif ($comment['modflagged']) {
             $reporthtml = '(This comment has been reported to moderators)';
-        } else {
+        }
+        else {
             // When previewing a comment...
             $reporthtml = '';
         }
@@ -123,7 +129,8 @@ 
         if (isset($comment['url'])) {
             print ' <a href="' . $comment['url'] . '" title="Link to this comment">' . $time . '</a>';
 
-        } else {
+        }
+        else {
             // There won't be a URL when we're just previewing a comment.
             print ' '.$time;
         }
@@ -144,7 +151,8 @@ 
 <?php
     }
 
-} else {
+}
+else {
 
     ?>
                 <div class="comment">

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

Braces +4 added lines, -2 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 = '';
         }
 
@@ -61,7 +62,8 @@ 
     $PAGE->page_links($data);
     $PAGE->stripe_end();
 
-} else {
+}
+else {
 
     $PAGE->stripe_start();
     ?>

www/includes/easyparliament/editqueue.php

Spacing +5 added lines, -5 removed lines

@@ -84,10 +84,10 @@ 
 
         if ($q->success()) {
             // Set the object variables up.
-            $this->editqueue_id 	= $q->insert_id();
+            $this->editqueue_id = $q->insert_id();
             $this->title			= $data['title'];
             $this->body				= $data['body'];
-            $this->posted			= $data['posted'];
+            $this->posted = $data['posted'];
 
             return $this->editqueue_id;
 
@@ -167,7 +167,7 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            epobject_id_l='" .  $this->current_epobject_id. "',
+                            epobject_id_l='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'
@@ -249,7 +249,7 @@ 
         $q = $this->db->query("SELECT eq.edit_id, eq.user_id, u.firstname, u.lastname, eq.glossary_id, eq.title, eq.body, eq.submitted FROM editqueue AS eq, users AS u WHERE eq.user_id = u.user_id AND eq.approved IS NULL ORDER BY eq.submitted DESC;");
         if ($q->success() && $q->rows()) {
             for ($i = 0; $i < ($q->rows()); $i++) {
-                $this->pending[	$q->field($i,"edit_id") ] = $q->row($i);
+                $this->pending[$q->field($i, "edit_id")] = $q->row($i);
             }
 
             $this->update_pending_count();
@@ -361,7 +361,7 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            glossary_id='" .  $this->current_epobject_id. "',
+                            glossary_id='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'

Braces +2 added lines, -1 removed lines

@@ -91,7 +91,8 @@
 
             return $this->editqueue_id;
 
-        } else {
+        }
+        else {
             return false;
         }
     }

www/includes/easyparliament/sidebars/mps.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     'body'=>''));
 ?>
 <p>
-    Vacher Dods charge <a href="http://www.dodonline.co.uk/engine.asp?showPage=article&id=2564"> 95 pounds </a> for this list of MPs names. We think democracy should be free. Click <?php echo '<a href="'.$csvurl.'">here</a>'; ?> to download a CSV (Comma Separated Values) file that you can load into Excel.
+    Vacher Dods charge <a href="http://www.dodonline.co.uk/engine.asp?showPage=article&id=2564"> 95 pounds </a> for this list of MPs names. We think democracy should be free. Click <?php echo '<a href="' . $csvurl . '">here</a>'; ?> to download a CSV (Comma Separated Values) file that you can load into Excel.
 </p>
 <?php
 $this->block_end();