mysociety / theyworkforyou

classes/AlertView/Simple.php

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
     public function display() {
         $data = array();
         $data['recent_election'] = false;
-        if ( $this->user->loggedin() ) {
+        if ($this->user->loggedin()) {
             $data['user_signed_in'] = true;
         }
 
@@ -17,21 +17,21 @@ 
             $data['postcode'] = get_http_var('postcode');
 
             $result = $this->createAlertForPostCode($data['email'], $data['postcode']);
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update')) {
             $result = $this->getNewMP(get_http_var('update'));
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update-alert')) {
-            $success = $this->replaceAlert( get_http_var('confirmation') );
+            $success = $this->replaceAlert(get_http_var('confirmation'));
             $data['confirmation_received'] = $success;
         } elseif (get_http_var('confirmed')) {
-            $success = $this->confirmAlert( get_http_var('confirmed') );
+            $success = $this->confirmAlert(get_http_var('confirmed'));
             $data['confirmation_received'] = $success;
         } else {
             $data['email'] = $this->user->email() ? $this->user->email() : '';
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
-            if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
+            if ($this->isEmailSignedUpForPostCode($data['email'], $data['postcode'])) {
                 $data['already_signed_up'] = True;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
@@ -66,13 +66,13 @@ 
     }
 
     private function createAlertForPostCode($email, $postcode) {
-        if ( !$this->validateDetails($email, $postcode) ) {
+        if (!$this->validateDetails($email, $postcode)) {
             return array('invalid-postcode-or-email' => True);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
-        } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (\MySociety\TheyWorkForYou\MemberException $e) {
             return array('bad-constituency' => True);
         }
 
@@ -89,7 +89,7 @@ 
 
         switch ($result) {
             case self::ALERT_EXISTS:
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
@@ -102,7 +102,7 @@ 
                 $data['error'] = True;
                 break;
             default: // alert created
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     $data['confirmation_sent'] = True;
                 } else {
                     $data['signedup_no_confirm'] = True;
@@ -116,8 +116,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $old_mp_id ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $old_mp_id));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -141,7 +141,7 @@ 
                 'pid' => $new_mp->person_id,
                 'pc' => '',
             );
-            if ( $other_criteria ) {
+            if ($other_criteria) {
                 $details['keyword'] = $other_criteria;
             }
 
@@ -158,11 +158,11 @@ 
     private function isEmailSignedUpForPostCode($email, $postcode) {
         $is_signed_up = false;
 
-        if ( $email && $postcode ) {
+        if ($email && $postcode) {
             try {
                 $person = $this->getPersonFromPostcode($postcode);
                 $is_signed_up = $this->alert->fetch_by_mp($email, $person->person_id);
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $is_signed_up = false;
             }
         }
@@ -178,10 +178,10 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $criteria ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $criteria));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
-        if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
+        if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = array(
                 'already_signed_up' => True,
                 'old_mp' => $old_mp->full_name(),

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

@@ -32,7 +32,7 @@ 
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
             if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
-                $data['already_signed_up'] = True;
+                $data['already_signed_up'] = true;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
             }
@@ -67,13 +67,13 @@ 
 
     private function createAlertForPostCode($email, $postcode) {
         if ( !$this->validateDetails($email, $postcode) ) {
-            return array('invalid-postcode-or-email' => True);
+            return array('invalid-postcode-or-email' => true);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
         } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
-            return array('bad-constituency' => True);
+            return array('bad-constituency' => true);
         }
 
         $details = array(
@@ -93,19 +93,19 @@ 
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['already_signed_up'] = True;
+                    $data['already_signed_up'] = true;
                 }
                 break;
             case self::CREATE_FAILED:
-                $data['error'] = True;
+                $data['error'] = true;
                 break;
             default: // alert created
                 if ( $not_logged_in ) {
-                    $data['confirmation_sent'] = True;
+                    $data['confirmation_sent'] = true;
                 } else {
-                    $data['signedup_no_confirm'] = True;
+                    $data['signedup_no_confirm'] = true;
                 }
         }
 
@@ -146,11 +146,11 @@ 
             }
 
             $this->alert->delete($row['alert_id'] . '::' . $row['registrationtoken']);
-            $this->alert->add($details, False);
+            $this->alert->add($details, false);
         }
 
         return array(
-            'signedup_no_confirm' => True,
+            'signedup_no_confirm' => true,
             'new_mp' => $new_mp->full_name(),
         );
     }
@@ -183,7 +183,7 @@ 
 
         if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
             $data = array(
-                'already_signed_up' => True,
+                'already_signed_up' => true,
                 'old_mp' => $old_mp->full_name(),
                 'mp_name' => $new_mp->full_name(),
             );
@@ -194,7 +194,7 @@ 
             );
         }
 
-        $data['update'] = True;
+        $data['update'] = true;
         $data['confirmation'] = $confirmation;
 
         return $data;

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

Indentation +15 added lines, -15 removed lines

@@ -41,15 +41,15 @@ 
     }
 
     public function getTopic($topic_name) {
-      $q = $this->db->query(
-          "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug",
-          array(':slug' => $topic_name)
-      )->first();
-      if ($q) {
-          return new Topic($q);
-      }
+        $q = $this->db->query(
+            "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug",
+            array(':slug' => $topic_name)
+        )->first();
+        if ($q) {
+            return new Topic($q);
+        }
 
-      return NULL;
+        return NULL;
     }
 
     public function getFrontPageTopics() {
@@ -60,15 +60,15 @@ 
         // PDO doesn't cope with arrays so we have to do this by hand :|
         $quoted = array();
         if ($topics) {
-          foreach ($topics as $topic) {
-              $quoted[] = $this->db->quote($topic);
-          }
-          $topics_str = implode(',', $quoted);
+            foreach ($topics as $topic) {
+                $quoted[] = $this->db->quote($topic);
+            }
+            $topics_str = implode(',', $quoted);
 
-          $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
-          $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
+            $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
+            $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
         } else {
-          $this->db->query("UPDATE topics SET front_page = FALSE");
+            $this->db->query("UPDATE topics SET front_page = FALSE");
         }
 
         return true;

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

@@ -49,7 +49,7 @@
           return new Topic($q);
       }
 
-      return NULL;
+      return null;
     }
 
     public function getFrontPageTopics() {

scripts/video-check.php

Indentation +7 added lines, -7 removed lines

@@ -10,12 +10,12 @@
 	order by hdate, hpos');
 $last = array('hdate'=>'');
 foreach ($q as $row) {
-	if ($row['hdate'] != $last['hdate'])
-		$last = array();
-	if ($last && $row['atime'] < $last['atime']-5) {
-		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
-		print "  Last was $last[gid] $last[hdate] $last[atime]\n";
-	}
-	$last = $row;
+    if ($row['hdate'] != $last['hdate'])
+        $last = array();
+    if ($last && $row['atime'] < $last['atime']-5) {
+        print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
+        print "  Last was $last[gid] $last[hdate] $last[atime]\n";
+    }
+    $last = $row;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 foreach ($q as $row) {
 	if ($row['hdate'] != $last['hdate'])
 		$last = array();
-	if ($last && $row['atime'] < $last['atime']-5) {
+	if ($last && $row['atime'] < $last['atime'] - 5) {
 		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
 		print "  Last was $last[gid] $last[hdate] $last[atime]\n";
 	}

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 	order by hdate, hpos');
 $last = array('hdate'=>'');
 foreach ($q as $row) {
-	if ($row['hdate'] != $last['hdate'])
-		$last = array();
+	if ($row['hdate'] != $last['hdate']) {
+			$last = array();
+	}
 	if ($last && $row['atime'] < $last['atime']-5) {
 		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
 		print "  Last was $last[gid] $last[hdate] $last[atime]\n";

scripts/wranstats.php

Indentation +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
 $db = new ParlDB;
 
 $q = $db->query(
-	'select person_id,
+    'select person_id,
 		count(hansard.epobject_id) as wrans,
 		sum(yes_votes) + IFNULL((select sum(vote) from uservotes, hansard as hansard2
 				  where uservotes.epobject_id=hansard2.epobject_id
@@ -20,23 +20,23 @@ 
 	group by person_id');
 
 foreach ($q as $row) {
-	$p_id = $row['person_id'];
-	$name = $row['first_name'] . ' ' . $row['last_name'];
-	$con = $row['constituency'];
-	$wrans = $row['wrans'];
-	$yes = $row['yes'];
-	$no = $row['no'];
-	if ($p_id) {
-	$qq = $db->query('(select hansard.epobject_id from hansard, uservotes
+    $p_id = $row['person_id'];
+    $name = $row['first_name'] . ' ' . $row['last_name'];
+    $con = $row['constituency'];
+    $wrans = $row['wrans'];
+    $yes = $row['yes'];
+    $no = $row['no'];
+    if ($p_id) {
+    $qq = $db->query('(select hansard.epobject_id from hansard, uservotes
 			where hansard.epobject_id=uservotes.epobject_id
             and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())
 		union
 			(select hansard.epobject_id from hansard,member,anonvotes
 			 where hansard.epobject_id=anonvotes.epobject_id
              and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
-	$wrans_with_votes = $qq->rows();
-	} else {
-		$wrans_with_votes = '';
-	}
-	print "$name\t$con\t$wrans\t$wrans_with_votes\t$yes\t$no\n";
+    $wrans_with_votes = $qq->rows();
+    } else {
+        $wrans_with_votes = '';
+    }
+    print "$name\t$con\t$wrans\t$wrans_with_votes\t$yes\t$no\n";
 }

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
 	if ($p_id) {
 	$qq = $db->query('(select hansard.epobject_id from hansard, uservotes
 			where hansard.epobject_id=uservotes.epobject_id
-            and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())
+            and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())
 		union
 			(select hansard.epobject_id from hansard,member,anonvotes
 			 where hansard.epobject_id=anonvotes.epobject_id
-             and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
+             and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())');
 	$wrans_with_votes = $qq->rows();
 	} else {
 		$wrans_with_votes = '';

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;

classes/Model/Featured.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q) {
             $text = $q['value'];
-            if ( trim($text) == '' ) {
+            if (trim($text) == '') {
                 $text = NULL;
             }
         }
@@ -73,7 +73,7 @@ 
     }
 
     private function _set($key, $value) {
-        if ( trim($value) == '' ) {
+        if (trim($value) == '') {
             $value = NULL;
         }
         $check_q = $this->db->query(
@@ -82,7 +82,7 @@ 
                 ':key' => $key
             )
         );
-        if ( $check_q->rows() ) {
+        if ($check_q->rows()) {
             $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key",
                 array(
                     ':key' => $key,
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ( $set_q->success() ) {
+        if ($set_q->success()) {
             return true;
         }
         return false;

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

@@ -53,7 +53,7 @@ 
     }
 
     private function _get($key) {
-        $text = NULL;
+        $text = null;
 
         $q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",
@@ -65,7 +65,7 @@ 
         if ($q) {
             $text = $q['value'];
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
         }
 
@@ -74,7 +74,7 @@ 
 
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
-            $value = NULL;
+            $value = null;
         }
         $check_q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",

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