mysociety / theyworkforyou

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

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

Braces +9 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 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'];
@@ -36,7 +38,9 @@ 
                     $desc .= $speaker['constituency'] . ', ';
                 }
                 $desc .= _htmlentities($speaker['party']);
-                if ($desc) $row['speaker']['desc'] = $desc;
+                if ($desc) {
+                    $row['speaker']['desc'] = $desc;
+                }
             }
         }
         $out[] = $row;
@@ -52,8 +56,9 @@ 
                 $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 {
                 unset($entry['listurl']);

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') {

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 +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
         }
 
         $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 {
             unset($entry['listurl']);

www/includes/easyparliament/sidebars/search_filters.php

Indentation +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
  <select id="section" name="section">
  <option value="">Any
 <?php
- optgroups(array(
+    optgroups(array(
     'UK Parliament' => array(
         'uk' => 'All UK',
         'debates' => 'House of Commons debates',
@@ -85,8 +85,8 @@ 
         'sp' => 'Debates',
         'spwrans' => 'Written answers',
     ),
- ), $section);
- ?>
+    ), $section);
+    ?>
  </select>
  <div class="help">
  Restrict results to a particular parliament or assembly that we cover (e.g. the

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 if (preg_match('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', $filter_ss, $m)) {
     $from = $m[1];
     $to = $m[2];
-    $filter_ss =  preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
+    $filter_ss = preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
 }
 $section = get_http_var('section');
 if (preg_match('#\s*section:([a-z]*)#', $filter_ss, $m)) {
@@ -36,7 +36,7 @@ 
     $filter_ss = preg_replace('#\s*speaker:[0-9]*#', '', $filter_ss);
 }
 
-$this->block_start(array( 'title' => "Filtering your results"));
+$this->block_start(array('title' => "Filtering your results"));
 
 ?>
 <form method="get" action="/search/">

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
         echo '<optgroup label="', $key, '">';
         foreach ($values as $k => $v) {
             echo '<option';
-            if ($current == $k) echo ' selected';
+            if ($current == $k) {
+                echo ' selected';
+            }
             echo ' value="', $k, '">', $v;
         }
         echo "</optgroup>\n";

www/includes/easyparliament/comment.php

Indentation +2 added lines, -2 removed lines

@@ -210,8 +210,8 @@
                             array(':epobject_id' => $this->epobject_id));
 
             if ($q->rows() > 0) {
-                 // If you change stuff here, you might have to change it in
-                 // $COMMENTLIST->_get_comment_data() too...
+                    // If you change stuff here, you might have to change it in
+                    // $COMMENTLIST->_get_comment_data() too...
 
                 $gid = fix_gid_from_db($q->field(0, 'gid')); // In includes/utility.php
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
+    public $modflagged = null;	// Is a datetime when set.
     public $firstname = '';	// Of the person who posted it.
     public $lastname = '';
     public $url = '';
@@ -138,7 +138,7 @@ 
             $flag = "'$date'";
 
         } elseif ($switch == 'off') {
-            $date = NULL;
+            $date = null;
             $flag = 'NULL';
 
         } else {

Spacing +14 added lines, -14 removed lines

@@ -31,8 +31,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = NULL; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -41,7 +41,7 @@ 
     public $exists = false;
 
 
-    public function __construct($comment_id='') {
+    public function __construct($comment_id = '') {
 
         $this->db = new ParlDB;
 
@@ -69,12 +69,12 @@ 
             if ($q->rows() > 0) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q->field(0, 'user_id');
+                $this->user_id = $q->field(0, 'user_id');
                 $this->epobject_id	= $q->field(0, 'epobject_id');
-                $this->body			= $q->field(0, 'body');
-                $this->posted		= $q->field(0, 'posted');
-                $this->visible		= $q->field(0, 'visible');
-                $this->modflagged	= $q->field(0, 'modflagged');
+                $this->body = $q->field(0, 'body');
+                $this->posted = $q->field(0, 'posted');
+                $this->visible = $q->field(0, 'visible');
+                $this->modflagged = $q->field(0, 'modflagged');
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -104,9 +104,9 @@ 
     public function comments_enabled() { return $this->comments_enabled; }
 
 
-    public function display($format='html', $template='comments') {
+    public function display($format = 'html', $template = 'comments') {
 
-        $data['comments'][0] = array (
+        $data['comments'][0] = array(
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -142,7 +142,7 @@ 
             $flag = 'NULL';
 
         } else {
-            $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
+            $PAGE->error_message("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
         }
 
         $q = $this->db->query("UPDATE comments
@@ -154,7 +154,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag."
             );
@@ -176,7 +176,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message = array (
+                $message = array(
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation."
                 );
@@ -185,7 +185,7 @@ 
             }
 
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations."
             );