mysociety / theyworkforyou

www/includes/easyparliament/templates/html/divisions/vote.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
                   <?php if (isset($data['mp_data'])) {
                     include('_your_mp.php');
-                  } ?>
+                    } ?>
 
                     <div class="debate-speech__division__details">
                       <p>

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
                           </span><br>
                       <?php } else { ?>
                           <?php if ($mp_vote['with_majority']) { ?>
-                              <?php $vote_prefix = 'A majority of ' . $division['members']['plural']  . ' <b>agreed</b> and'; include('_vote_description.php'); ?>
+                              <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>agreed</b> and'; include('_vote_description.php'); ?>
                           <?php } else { ?>
                               <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>disagreed</b> and'; include('_vote_description.php'); ?>
                           <?php } ?>

tests/DivisionsTest.php

Spacing +5 added lines, -5 removed lines

@@ -17,17 +17,17 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
     }
 
     private function fetch_mp_recent_page()
     {
-        $vars = array( 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' );
+        $vars = array('pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent');
         return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/recent.php');
     }
 
     private function fetch_recent_page() {
-        return $this->base_fetch_page( array('url' => '/divisions' ), 'divisions', 'index.php', '/divisions/index.php' );
+        return $this->base_fetch_page(array('url' => '/divisions'), 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -113,7 +113,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertContains('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -124,7 +124,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page( array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ), 'divisions', 'division.php', '/divisions/division.php' );
+        $page = $this->base_fetch_page(array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'), 'divisions', 'division.php', '/divisions/division.php');
         $this->assertContains('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertContains('Aye: 200', $page);
         $this->assertNotContains('No:', $page); # Summary 100, but no actual votes. In reality, summary can only be <= actual.

classes/Topics.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $this->db = new \ParlDB;
     }
 
-    private function query($where='') {
+    private function query($where = '') {
         $q = $this->db->query(
             "SELECT id, slug, title, description, search_string, front_page, image FROM topics $where"
         );

classes/Search/Normal.php

Spacing +21 added lines, -21 removed lines

@@ -12,12 +12,12 @@ 
         }
 
         $o = get_http_var('o');
-        $args = array (
+        $args = array(
             's' => $this->searchstring,
             'p' => $pagenum,
             'num' => get_http_var('num'),
             'pop' => get_http_var('pop'),
-            'o' => ($o=='d' || $o=='r' || $o=='o') ? $o : 'd',
+            'o' => ($o == 'd' || $o == 'r' || $o == 'o') ? $o : 'd',
         );
 
         return $args;
@@ -55,9 +55,9 @@ 
         }
 
         $sort_order = 'newest';
-        if ( $args['o'] == 'o' ) {
+        if ($args['o'] == 'o') {
             $sort_order = 'oldest';
-        } else if ( $args['o'] == 'r' ) {
+        } else if ($args['o'] == 'r') {
             $sort_order = 'relevance';
         }
 
@@ -73,7 +73,7 @@ 
             return array('error' => $SEARCHENGINE->error);
         } else {
             $LIST = new \HANSARDLIST();
-            $data = $LIST->display('search', $args , 'none');
+            $data = $LIST->display('search', $args, 'none');
             $data['search_type'] = 'normal';
             $data['sort_order'] = $sort_order;
             $data['members'] = $members;
@@ -93,10 +93,10 @@ 
             return false;
         }
 
-        list ($constituencies, ) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
+        list ($constituencies,) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
 
         $constituency = "";
-        if (count($constituencies)==1) {
+        if (count($constituencies) == 1) {
             $constituency = $constituencies[0];
         }
 
@@ -112,12 +112,12 @@ 
 
                 $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                 $cons[] = $MEMBER;
-                if ( $MEMBER->current_member(1) ) {
+                if ($MEMBER->current_member(1)) {
                     $mp_types['mp']++;
                 } else {
                     $mp_types['former']++;
                 }
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $cons = array();
             }
         } elseif (count($constituencies)) {
@@ -125,12 +125,12 @@ 
                 try {
                     $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                     $cons[] = $MEMBER;
-                    if ( $MEMBER->current_member(1) ) {
+                    if ($MEMBER->current_member(1)) {
                         $mp_types['mp']++;
                     } else {
                         $mp_types['former']++;
                     }
-                } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+                } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     continue;
                 }
             }
@@ -201,7 +201,7 @@ 
             $link = array(
                 'url' => $url->generate(),
                 'page' => $n,
-                'current' => ( $n == $data['page'] )
+                'current' => ($n == $data['page'])
             );
 
             $links[] = $link;
@@ -242,27 +242,27 @@ 
             $numlinks = $this->generate_pagination_links($data, $URL, $firstpage, $lastpage);
 
             $pagelinks['nums'] = $numlinks;
-            $pagelinks['first_result'] = $page == 1 ? 1 : ( ( $page - 1 ) * $results_per_page ) + 1;
-            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ( $results_per_page - 1 );
+            $pagelinks['first_result'] = $page == 1 ? 1 : (($page - 1) * $results_per_page) + 1;
+            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ($results_per_page - 1);
 
-            if ( $page != 1 ) {
+            if ($page != 1) {
                 $prev_page = $page - 1;
-                $URL->insert(array( 'p' => $prev_page ) );
+                $URL->insert(array('p' => $prev_page));
                 $pagelinks['prev'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => 1 ) );
+                $URL->insert(array('p' => 1));
                 $pagelinks['firstpage'] = array(
                     'url' => $URL->generate()
                 );
             }
             if ($page != $numpages) {
                 $next_page = $page + 1;
-                $URL->insert(array( 'p' => $next_page ) );
+                $URL->insert(array('p' => $next_page));
                 $pagelinks['next'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => $numpages ) );
+                $URL->insert(array('p' => $numpages));
                 $pagelinks['lastpage'] = array(
                     'url' => $URL->generate()
                 );
@@ -279,7 +279,7 @@ 
         $links['rss'] = $DATA->page_metadata($this_page, 'rss');
 
         if ($SEARCHENGINE) {
-            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch='.urlencode($this->searchstring) : '');
+            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch=' . urlencode($this->searchstring) : '');
             $links['email_desc'] = $SEARCHENGINE->query_description_long();
         }
 
@@ -293,7 +293,7 @@ 
             $search_engine = new \SEARCHENGINE($filter_ss);
             $links['email_section'] = $links['email'];
             $links['email_desc_section'] = $links['email_desc'];
-            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch='.urlencode($filter_ss) : '');
+            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch=' . urlencode($filter_ss) : '');
             $links['email_desc'] = $search_engine->query_description_long();
         }
 

classes/Utility/Hansard.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
         $parts = parse_url($url);
         parse_str($parts['query'], $query);
 
-        if ( $query['id'] ) {
+        if ($query['id']) {
             if (strpos($parts['path'], 'lords') !== false) {
                 $gid = 'uk.org.publicwhip/lords/';
             } elseif (strpos($parts['path'], 'whall') !== false) {
@@ -30,13 +30,13 @@ 
 
 
     public static function gid_to_url($gid) {
-        if ( !$gid ) {
+        if (!$gid) {
             return '';
         }
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ))->first();
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid))->first();
         $url_gid = fix_gid_from_db($gid);
         $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
         $url->insert(array('id' => $url_gid));

classes/Model/Banner.php

Spacing +4 added lines, -4 removed lines

@@ -28,12 +28,12 @@ 
     public function get_text() {
         $text = $this->mem->get('banner');
 
-        if ( $text === false ) {
+        if ($text === false) {
             $q = $this->db->query("SELECT value FROM editorial WHERE item = 'banner'")->first();
 
             if ($q) {
                 $text = $q['value'];
-                if ( trim($text) == '' ) {
+                if (trim($text) == '') {
                     $text = NULL;
                 }
                 $this->mem->set('banner', $text, 86400);
@@ -50,8 +50,8 @@ 
             )
         );
 
-        if ( $q->success() ) {
-            if ( trim($text) == '' ) {
+        if ($q->success()) {
+            if (trim($text) == '') {
                 $text = NULL;
             }
             $this->mem->set('banner', $text, 86400);

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

@@ -34,7 +34,7 @@ 
             if ($q) {
                 $text = $q['value'];
                 if ( trim($text) == '' ) {
-                    $text = NULL;
+                    $text = null;
                 }
                 $this->mem->set('banner', $text, 86400);
             }
@@ -52,7 +52,7 @@ 
 
         if ( $q->success() ) {
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
             $this->mem->set('banner', $text, 86400);
             return true;

www/docs/admin/index.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreportlist.php");
+include_once (INCLUDESPATH . "easyparliament/commentreportlist.php");
 
 $this_page = "admin_home";
 
@@ -18,9 +18,9 @@ 
 
 $confirmedusers = $db->query("SELECT COUNT(*) AS count FROM users WHERE confirmed = '1'")->first()['count'];
 $unconfirmedusers = $db->query("SELECT COUNT(*) AS count FROM users WHERE confirmed = '0'")->first()['count'];
-$olddate = gmdate("Y-m-d H:i:s", time()-86400);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400);
 $dayusers = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'")->first()['count'];
-$olddate = gmdate("Y-m-d H:i:s", time()-86400*7);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400 * 7);
 $weekusers = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'")->first()['count'];
 ?>
 <ul>
@@ -73,7 +73,7 @@ 
         $name = _htmlspecialchars($row['firstname'] . ' ' . $row['lastname']);
     }
 
-    $rows[] = array (
+    $rows[] = array(
         $name,
         '<a href="mailto:' . $row['email'] . '">' . $row['email'] . '</a>',
         $confirmed,
@@ -81,8 +81,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Email',
         'Confirmed?',

www/docs/admin/badusers.php

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreportlist.php");
+include_once (INCLUDESPATH . "easyparliament/commentreportlist.php");
 
 $this_page = "admin_badusers";
 
@@ -42,7 +42,7 @@ 
 
     $totalcomments = $r['totalcount'];
 
-    $percentagedeleted = ( $row['deletedcount'] / $totalcomments ) * 100;
+    $percentagedeleted = ($row['deletedcount'] / $totalcomments) * 100;
 
 
     // Get complaints made about this user's comments, but not upheld.
@@ -57,17 +57,17 @@ 
 
     $USERURL->insert(array('u'=>$user_id));
 
-    $rows[] = array (
+    $rows[] = array(
         '<a href="' . $USERURL->generate() . '">' . $row['firstname'] . ' ' . $row['lastname'] . '</a>',
         $totalcomments,
         $row['deletedcount'],
-        $percentagedeleted.'%',
+        $percentagedeleted . '%',
         $notupheldcount
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Total comments',
         'Number deleted',
@@ -114,15 +114,15 @@ 
                     WHERE	user_id = '$user_id'
                     AND		upheld = '1'")->first();
 
-    $rows[] = array (
+    $rows[] = array(
         '<a href="' . $USERURL->generate() . '">' . $row['firstname'] . ' ' . $row['lastname'] . '</a>',
         $row['rejectedcount'],
         $r['upheldcount']
     );
 
 }
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Reports not upheld',
         'Reports upheld'

www/docs/admin/reporting_stats.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'alerts', 'title'=>'Reporting Statistics'));
+$PAGE->block_start(array('id'=>'alerts', 'title'=>'Reporting Statistics'));
 $db = new ParlDB;
 $q = $db->query('select year(created) as the_year, month(created) as the_month, count(*) as c from alerts where confirmed and not deleted group by year(created) desc, month(created) desc');
 print '<h3>Alert signups per month</h3> <table>';