mysociety / theyworkforyou

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

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

www/docs/admin/alert_stats.php

Spacing +13 added lines, -13 removed lines

@@ -7,7 +7,7 @@ 
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'alerts', 'title'=>'Alert Statistics'));
+$PAGE->block_start(array('id'=>'alerts', 'title'=>'Alert Statistics'));
 $db = new ParlDB;
 
 $q_confirmed = $db->query('select count(*) as c from alerts where confirmed and not deleted')->first()['c'];
@@ -18,13 +18,13 @@ 
 
 print '<h3>Headline stats</h3> <table>';
 $data = array(
-    'header' => array( 'Alert Type', 'Count' ),
+    'header' => array('Alert Type', 'Count'),
     'rows' => array(
-        array( 'Confirmed', $q_confirmed ),
-        array( 'Not Confirmed', $q_not_confirmed ),
-        array( 'Deleted', $q_deleted ),
-        array( 'For a Speaker<sup>*</sup>', $q_speaker ),
-        array( 'For a Keyword', $q_keyword ),
+        array('Confirmed', $q_confirmed),
+        array('Not Confirmed', $q_not_confirmed),
+        array('Deleted', $q_deleted),
+        array('For a Speaker<sup>*</sup>', $q_speaker),
+        array('For a Keyword', $q_keyword),
     )
 );
 
@@ -40,7 +40,7 @@ 
     $criteria = $row['criteria'];
     $rows[] = array($id, $critera);
 }
-$data = array( 'rows' => $rows );
+$data = array('rows' => $rows);
 $PAGE->display_table($data);
 
 $q = $db->query('select count(*) as c, criteria from alerts where criteria like "speaker:%" and confirmed and not deleted group by criteria order by c desc');
@@ -70,15 +70,15 @@ 
     }
 }
 
-$people_header = array( 'Name', 'Confirmed', 'Unconfirmed');
+$people_header = array('Name', 'Confirmed', 'Unconfirmed');
 print '<h3>Alert signups by MP/Peer</h3>';
 $rows = array();
 foreach ($tots as $person_id => $c) {
     $u = isset($unconfirmed[$person_id]) ? $unconfirmed[$person_id] : 0;
-    $rows[] = array( $name[$person_id], $c, $u );
+    $rows[] = array($name[$person_id], $c, $u);
 }
 $data = array(
-    'header' => array( 'Name', 'Confirmed', 'Unconfirmed'),
+    'header' => array('Name', 'Confirmed', 'Unconfirmed'),
     'rows' => $rows
 );
 $PAGE->display_table($data);
@@ -105,10 +105,10 @@ 
 foreach ($total as $criteria => $tot) {
     $c = isset($confirmed[$criteria]) ? $confirmed[$criteria] : 0;
     $u = isset($unconfirmed[$criteria]) ? $unconfirmed[$criteria] : 0;
-    $rows[] = array( $criteria, $c, $u );
+    $rows[] = array($criteria, $c, $u);
 }
 $data = array(
-    'header' => array( 'Criteria', 'Confirmed', 'Unconfirmed'),
+    'header' => array('Criteria', 'Confirmed', 'Unconfirmed'),
     'rows' => $rows
 );
 $PAGE->display_table($data);

www/docs/api/api_getMembers.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
             'person_id' => $pid,
             'name' => html_entity_decode(member_full_name($row['house'], $row['title'],
                 $row['given_name'], $row['family_name'],
-                $row['lordofname'] )),
+                $row['lordofname'])),
             'party' => isset($parties[$row['party']]) ? $parties[$row['party']] : $row['party'],
         );
         if ($row['house'] != HOUSE_TYPE_LORDS) {

www/docs/api/api_convertURL.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
     $fragment = '';
     if ($id_data['htype'] == '11' || $id_data['htype'] == '10') {
-        $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
+        $LISTURL->insert(array('id' => $id_data['gid']));
     } else {
         $parent_epobject_id = $id_data['subsection_id'];
         $parent_gid = '';
@@ -53,7 +53,7 @@ 
             $parent_gid = fix_gid_from_db($r['gid']);
         }
         if ($parent_gid != '') {
-            $LISTURL->insert( array( 'id' => $parent_gid ) );
+            $LISTURL->insert(array('id' => $parent_gid));
             $fragment = '#g' . gid_to_anchor($id_data['gid']);
         }
     }

www/docs/images/mps/photo-status.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         array_push($out['none'], '<li>' . $row['person_id'] . ' (' . $row['party'] . ')' . ', ' . $row['constituency']);
     }
 }
-print '<h3>Missing completely ('.count($out['none']).')</h3> <ul>';
+print '<h3>Missing completely (' . count($out['none']) . ')</h3> <ul>';
 print join($out['none'], "\n");
 print '</ul>';
 print '<h3>Large and small</h3> <p>';