mysociety / theyworkforyou

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

Braces +6 added lines, -3 removed lines

@@ -18,10 +18,13 @@
 # Content goes here
 foreach ($data['dates'] as $date => $day_events) {
     foreach ($order as $i => $chamber) {
-        if (!array_key_exists($chamber, $day_events))
-            continue;
+        if (!array_key_exists($chamber, $day_events)) {
+                    continue;
+        }
         $events = $day_events[$chamber];
-        if ($plural[$i]) $chamber .= 's';
+        if ($plural[$i]) {
+            $chamber .= 's';
+        }
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new URL($hansardmajors[$major[$i]]['page_all']);

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new URL($hansardmajors[$major[$i]]['page_all']);
-            $URL->insert( array( 'd' => $date ) );
+            $URL->insert(array('d' => $date));
             print ' &nbsp; <a href="' . $URL->generate() . '">See this day &rarr;</a>';
         }
         print "</h2>\n";

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>

Braces +24 added lines, -12 removed lines

@@ -49,11 +49,13 @@ 
                         <a href="/mp/?p=<?=  $member->person_id() ?>"><?= $member->full_name() ?></a> <?= preg_replace('/(voted\s+(?:for|against|not to|to|in favour))/', '<b>\1</b>', $mp_vote['text']) ?>
                         </span><br>
                     </p>
-                    <?php } else if (isset($before_mp)) { ?>
+                    <?php }
+else if (isset($before_mp)) { ?>
                     <p>
                         This vote happened before <a href="/mp/?p=<?= $member->person_id() ?>"><?= $member->full_name() ?></a> was elected.
                     </p>
-                    <?php } else if (isset($after_mp)) { ?>
+                    <?php }
+else if (isset($after_mp)) { ?>
                     <p>
                         This vote happened after <a href="/mp/?p=<?= $member->person_id() ?>"><?= $member->full_name() ?></a> left the House of Commons.
                     </p>
@@ -63,17 +65,20 @@ 
                         <span class="policy-vote__text">
                             <?php include('_vote_description.php'); ?>
                         </span><br>
-                    <?php } else { ?>
+                    <?php }
+else { ?>
                         <?php if ($mp_vote['with_majority']) { ?>
                             A majority of MPs voted the same.
-                        <?php } else { ?>
+                        <?php }
+else { ?>
                             <?php $vote_prefix = 'A majority of MPs <b>disagreed</b> and'; include('_vote_description.php'); ?>
                         <?php } ?>
                     <?php } ?>
                     </p>
 
                     <?php include('_vote_summary.php'); ?>
-                <?php } else { ?>
+                <?php }
+else { ?>
                     <p>
                         <span class="policy-vote__text">
                             <?php include('_vote_description.php'); ?>
@@ -87,23 +92,30 @@ 
                       Your MP, <a href="/mp/?p=<?= $member->person_id() ?>"><?= $member->full_name() ?></a>,
                         <?php if ($mp_vote['vote'] == 'aye') { ?>
                             voted for.
-                        <?php } else if ($mp_vote['vote'] == 'no') { ?>
+                        <?php }
+else if ($mp_vote['vote'] == 'no') { ?>
                             voted against.
-                        <?php } else if ($mp_vote['vote'] == 'absent') { ?>
+                        <?php }
+else if ($mp_vote['vote'] == 'absent') { ?>
                             was absent.
-                        <?php } else if ($mp_vote['vote'] == 'both') { ?>
+                        <?php }
+else if ($mp_vote['vote'] == 'both') { ?>
                             abstained.
-                        <?php } else if ($mp_vote['vote'] == 'tellaye') { ?>
+                        <?php }
+else if ($mp_vote['vote'] == 'tellaye') { ?>
                             was a teller for the Ayes.
-                        <?php } else if ($mp_vote['vote'] == 'tellno') { ?>
+                        <?php }
+else if ($mp_vote['vote'] == 'tellno') { ?>
                             was a teller for the Nos.
                         <?php } ?>
                     </p>
-                    <?php } else if (isset($before_mp)) { ?>
+                    <?php }
+else if (isset($before_mp)) { ?>
                     <p>
                         This vote happened before your MP, <a href="/mp/?p=<?= $member->person_id() ?>"><?= $member->full_name() ?></a>, was elected.
                     </p>
-                    <?php } else if (isset($after_mp)) { ?>
+                    <?php }
+else if (isset($after_mp)) { ?>
                     <p>
                         This vote happened after your MP, <a href="/mp/?p=<?= $member->person_id() ?>"><?= $member->full_name() ?></a>, left the House of Commons.
                     </p>

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
                             }

Braces +4 added lines, -2 removed lines

@@ -12,7 +12,8 @@ 
                           $voter = sprintf('<a href="/mp/?p=%d">%s</a>', $vote['person_id'], $vote['name']);
                           if ($vote['teller']) {
                               $tellers[] = $voter;
-                          } else { ?>
+                          }
+                          else { ?>
                             <li><?= $voter ?></li>
                         <?php
                             }
@@ -23,7 +24,8 @@ 
                       Tellers: <?= implode(', ', $tellers) ?>
                     </p>
                     <?php }
-                    } else { ?>
+                    }
+                    else { ?>
                     <p>
                     None
                     </p>

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

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();
 }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
 
-        $count = $n+1;
+        $count = $n + 1;
 
         $USERURL->insert(array('u'=>$comment['user_id']));
 
@@ -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);

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.");
         }
 
 ?>

www/includes/easyparliament/templates/html/static/search_help.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 </li>
 
 <?php
-$user_agent = ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) ? strtolower( $_SERVER['HTTP_USER_AGENT'] ) : '';
+$user_agent = (isset($_SERVER['HTTP_USER_AGENT'])) ? strtolower($_SERVER['HTTP_USER_AGENT']) : '';
 if (stristr($user_agent, 'Firefox/')) {
 ?>
      <li>You can also add TheyWorkForYou to <a href="http://mycroft.mozdev.org/download.html?name=theyworkforyou">Firefox's search box</a>.</li>

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

Indentation +1 added lines, -1 removed lines

@@ -67,4 +67,4 @@
     api_output($out);
 } else {
     api_error('Nothing');
-   }
+    }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $out = array();
 if (isset ($data['rows'])) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
         if (count($row) == 0) continue;
         if ($row['htype'] == '12') {

Braces +19 added lines, -9 removed lines

@@ -14,13 +14,16 @@ 
 if (isset ($data['rows'])) {
     for ($i=0; $i<count($data['rows']); $i++) {
         $row = $data['rows'][$i];
-        if (count($row) == 0) continue;
+        if (count($row) == 0) {
+            continue;
+        }
         if ($row['htype'] == '12') {
             if (isset($row['speaker']) && count($row['speaker']) > 0) {
                 $speaker = $row['speaker'];
                 if (is_file(BASEDIR . IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpeg')) {
                     $row['speaker']['image'] = IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpeg';
-                } elseif (is_file(BASEDIR . IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpg')) {
+                }
+                elseif (is_file(BASEDIR . IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpg')) {
                     $row['speaker']['image'] = IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpg';
                 }
                 $desc = '';
@@ -36,7 +39,9 @@ 
                     $desc .= $speaker['constituency'] . ', ';
                 }
                 $desc .= _htmlentities($speaker['party']);
-                if ($desc) $row['speaker']['desc'] = $desc;
+                if ($desc) {
+                    $row['speaker']['desc'] = $desc;
+                }
             }
         }
         $out[] = $row;
@@ -46,16 +51,20 @@ 
         foreach ($data['subrows'] as $row) {
             if (isset($row['contentcount']) && $row['contentcount'] > 0) {
                 $has_content = true;
-            } elseif ($row['htype'] == '11' && $hansardmajors[$row['major']]['type'] == 'other') {
+            }
+            elseif ($row['htype'] == '11' && $hansardmajors[$row['major']]['type'] == 'other') {
                 $has_content = true;
-            } else {
+            }
+            else {
                 $has_content = false;
             }
             $entry = $row;
-            if (isset($row['excerpt']))
-                $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            if (isset($row['excerpt'])) {
+                            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            }
             if ($has_content) {
-            } else {
+            }
+            else {
                 unset($entry['listurl']);
                 unset($entry['commentsurl']);
                 unset($entry['comment']);
@@ -65,6 +74,7 @@ 
         }
     }
     api_output($out);
-} else {
+}
+else {
     api_error('Nothing');
    }

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

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (isset ($data['rows'])) {
     $out = array();
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         if ($row['htype'] == '10' && isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) {
@@ -40,7 +40,7 @@ 
         if ($row['htype'] == '10') {
             $out[] = array('entry' => $entry, 'subs' => array());
         } else {
-            $out[sizeof($out)-1]['subs'][] = $entry;
+            $out[sizeof($out) - 1]['subs'][] = $entry;
         }
 
     }

Braces +15 added lines, -8 removed lines

@@ -18,19 +18,24 @@ 
             // We fake it here. We hope this section only has a single line like
             // "The Secretary of State was asked-" and we don't want to make it a link.
             $has_content = false;
-        } elseif (isset($row['contentcount']) && $row['contentcount'] > 0) {
+        }
+        elseif (isset($row['contentcount']) && $row['contentcount'] > 0) {
             $has_content = true;
-        } elseif ($row['htype'] == '11' && $hansardmajors[$row['major']]['type'] == 'other') {
+        }
+        elseif ($row['htype'] == '11' && $hansardmajors[$row['major']]['type'] == 'other') {
             $has_content = true;
-        } else {
+        }
+        else {
             $has_content = false;
         }
 
         $entry = $row;
-        if (isset($row['excerpt']))
-            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        if (isset($row['excerpt'])) {
+                    $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        }
         if ($has_content) {
-        } else {
+        }
+        else {
             unset($entry['listurl']);
             unset($entry['commentsurl']);
             unset($entry['comment']);
@@ -39,12 +44,14 @@ 
 
         if ($row['htype'] == '10') {
             $out[] = array('entry' => $entry, 'subs' => array());
-        } else {
+        }
+        else {
             $out[sizeof($out)-1]['subs'][] = $entry;
         }
 
     }
     api_output($out);
-} else {
+}
+else {
     api_error('No data to display');
 }