mysociety / theyworkforyou

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

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']

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>
 

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

www/includes/easyparliament/sidebars/calendar_future.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 list($firstyear, $firstmonth, $day) = explode('-', $min_future_date);
 list($finalyear, $finalmonth, $day) = explode('-', $max_future_date);
 
-$q =  $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
+$q = $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
     WHERE event_date >= :firstdate
     AND event_date <= :finaldate
     AND deleted = 0
@@ -45,7 +45,7 @@ 
 
 if ($q->rows() > 0) {
     $years = array();
-    for ($row=0; $row<$q->rows(); $row++) {
+    for ($row = 0; $row < $q->rows(); $row++) {
         list($year, $month, $day) = explode('-', $q->field($row, 'event_date'));
         $month = intval($month);
         $years[$year][$month][] = intval($day);

www/includes/easyparliament/sidebars/minisurvey.php

Spacing +5 added lines, -5 removed lines

@@ -33,10 +33,10 @@ 
 if ($hide_question) {
     $always_ask = 0;
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif ($has_answered_question == $current_question && !$always_ask) {
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif (isset($_COOKIE['survey'])) {
     $show_survey_qn = $_COOKIE['survey'];
 }
@@ -49,16 +49,16 @@ 
 if ($show_survey_qn < $current_question && !$has_answered_question) {
     $page_url = '';
     $hide_url = '';
-    if ( in_array( $this_page, array('mp', 'peer', 'msp', 'mla', 'royal') ) ) {
+    if (in_array($this_page, array('mp', 'peer', 'msp', 'mla', 'royal'))) {
         global $MEMBER;
         $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
         $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
     } else {
         $URL = new URL($this_page);
-        $URL->insert(array('answered_survey' => $current_question ));
+        $URL->insert(array('answered_survey' => $current_question));
         $page_url = 'https://' . DOMAIN . $URL->generate();
         $URL = new URL($this_page);
-        $URL->insert(array('hide_survey' => $current_question ));
+        $URL->insert(array('hide_survey' => $current_question));
         $hide_url = $URL->generate();
     }
 

www/includes/easyparliament/commentreportlist.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
         // available for editing, it's accurate.
         $this->_update_locked();
 
-        $data = $this->_get_data_by_recent ();
+        $data = $this->_get_data_by_recent();
 
         $this->render($data);
 
@@ -99,11 +99,11 @@ 
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
-                $data[] = array (
-                    'report_id'		=> $q->field($n,'report_id'),
-                    'comment_id' 	=> $q->field($n,'comment_id'),
+                $data[] = array(
+                    'report_id'		=> $q->field($n, 'report_id'),
+                    'comment_id' 	=> $q->field($n, 'comment_id'),
                     'firstname'		=> $q->field($n, 'firstname'),
                     'lastname'		=> $q->field($n, 'lastname'),
                     'body'			=> $q->field($n, 'body'),
@@ -114,10 +114,10 @@ 
 
         }
         if ($r->rows() > 0) {
-            for ($n=0; $n<$r->rows(); $n++) {
-                $data[] = array (
-                    'report_id'		=> $r->field($n,'report_id'),
-                    'comment_id' 	=> $r->field($n,'comment_id'),
+            for ($n = 0; $n < $r->rows(); $n++) {
+                $data[] = array(
+                    'report_id'		=> $r->field($n, 'report_id'),
+                    'comment_id' 	=> $r->field($n, 'comment_id'),
                     'firstname'		=> $r->field($n, 'firstname'),
                     'lastname'		=> $r->field($n, 'lastname'),
                     'body'			=> $r->field($n, 'body'),

tests/UserPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/user.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/user.xml');
     }
 
     private function fetch_page($vars)
@@ -16,14 +16,14 @@ 
         return $this->base_fetch_page($vars, 'user');
     }
 
-    private function fetch_user_page( $vars = array(), $page = 'user' )
+    private function fetch_user_page($vars = array(), $page = 'user')
     {
-        return $this->base_fetch_page_user( $vars, '1.fbb689a0c092f5534b929d302db2c8a9', $page );
+        return $this->base_fetch_page_user($vars, '1.fbb689a0c092f5534b929d302db2c8a9', $page);
     }
 
     public function testLoginPageLoads()
     {
-        $page = $this->base_fetch_page( array(), 'user/login' );
+        $page = $this->base_fetch_page(array(), 'user/login');
         $this->assertContains('Sign in', $page);
     }
 
@@ -34,7 +34,7 @@ 
             'password' => 'password',
             'submitted' => 'true',
         );
-        $page = $this->base_fetch_page( $vars, 'user/login' );
+        $page = $this->base_fetch_page($vars, 'user/login');
         # it's a redirect which means we should get nothing
         # as we're using the cli version of php :(
         $this->assertEquals('', $page);
@@ -49,7 +49,7 @@ 
 
     public function testEditUserInfo()
     {
-        $page = $this->fetch_user_page( array('pg' => 'edit' ) );
+        $page = $this->fetch_user_page(array('pg' => 'edit'));
         $this->assertContains('Your details', $page);
         $this->assertContains('name="pg" value="edit"', $page);
         $this->assertContains('value="Test"', $page);
@@ -62,7 +62,7 @@ 
             'email' => 'user@example.org',
             'submitted' => 'true',
         );
-        $page = $this->fetch_user_page( $vars );
+        $page = $this->fetch_user_page($vars);
         $this->assertContains('Example User', $page);
     }
 }

tests/FetchPageTestCase.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     protected function base_fetch_page($vars, $dir, $page = 'index.php', $req_uri = '')
     {
         foreach ($vars as $k => $v) {
-            $vars[$k] =  $k . '=' . urlencode($v);
+            $vars[$k] = $k . '=' . urlencode($v);
         }
 
         if (!$req_uri) {
@@ -26,7 +26,7 @@ 
     protected function base_fetch_page_user($vars, $cookie, $dir, $page = 'index.php', $req_uri = '')
     {
         foreach ($vars as $k => $v) {
-            $vars[$k] =  $k . '=' . urlencode($v);
+            $vars[$k] = $k . '=' . urlencode($v);
         }
 
         if (!$req_uri) {