mysociety / theyworkforyou

scripts/alertmailer.php

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

@@ -339,7 +339,7 @@
 
     $data .= '====================';
     $sentemails++;
-    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    mlog("send $sentemails : Sending email to $current[email] ... ");
     $d = array('to' => $current['email'], 'template' => $template);
     $m = array(
         'DATA' => $data,

Spacing +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
         #        unset($SEARCHENGINE);
         $total_results = $data['info']['total_results'];
         $queries++;
-        mlog(", hits " . $total_results . ", time " . (getmicrotime()-$start) . "\n");
+        mlog(", hits " . $total_results . ", time " . (getmicrotime() - $start) . "\n");
     } else {
         mlog("  ACTION $active/$outof CACHE HIT : Using cached result for '$criteria_batch'\n");
         $data = $results[$criteria_batch];

www/includes/easyparliament/alert.php

Braces +30 added lines, -13 removed lines

@@ -340,17 +340,20 @@ 
     }
 
     public function check_token($token) {
-        if (!is_null($this->token_checked))
-            return $this->token_checked;
+        if (!is_null($this->token_checked)) {
+                    return $this->token_checked;
+        }
 
         $arg = strstr($token, '::') ? '::' : '-';
         $token_parts = explode($arg, $token);
-        if (count($token_parts) != 2)
-            return false;
+        if (count($token_parts) != 2) {
+                    return false;
+        }
 
         list($alert_id, $registrationtoken) = $token_parts;
-        if (!is_numeric($alert_id) || !$registrationtoken)
-            return false;
+        if (!is_numeric($alert_id) || !$registrationtoken) {
+                    return false;
+        }
 
         $q = $this->db->query("SELECT alert_id, email, criteria
                         FROM alerts
@@ -398,7 +401,9 @@ 
     // If all goes well the alert will be confirmed.
     // The alert will be active when scripts run each day to send the actual emails.
     public function confirm($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $this->criteria = $alert['criteria'];
         $this->email = $alert['email'];
         $r = $this->db->query("UPDATE alerts SET confirmed = 1, deleted = 0 WHERE alert_id = :alert_id", array(
@@ -412,7 +417,9 @@ 
     // and the deletion page has passed the token from the URL to here.
     // If all goes well the alert will be deleted.
     public function delete($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("DELETE FROM alerts WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -421,7 +428,9 @@ 
     }
 
     public function delete_all($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("DELETE FROM alerts WHERE email = :email", array(
             ':email' => $alert['email']
             ));
@@ -430,7 +439,9 @@ 
     }
 
     public function suspend($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("UPDATE alerts SET deleted = 2 WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -439,7 +450,9 @@ 
     }
 
     public function resume($token) {
-        if (!($alert = $this->check_token($token))) return false;
+        if (!($alert = $this->check_token($token))) {
+            return false;
+        }
         $r = $this->db->query("UPDATE alerts SET deleted = 0 WHERE alert_id = :alert_id", array(
             ':alert_id' => $alert['id']
             ));
@@ -460,8 +473,12 @@ 
             }
         }
         $criteria = '';
-        if (count($words)) $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
-        if ($spokenby) $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        if (count($words)) {
+            $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
+        }
+        if ($spokenby) {
+            $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        }
         return $criteria;
     }
 

Indentation +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@
 // FUNCTION: fetch_between
 
     public function fetch_between($confirmed, $deleted, $start_date, $end_date) {
-      // Return summary data on all the alerts that were created between $start_date
-      // and $end_date (inclusive) and whose confirmed and deleted values match the booleans
-      // passed in $confirmed and $deleted
+        // Return summary data on all the alerts that were created between $start_date
+        // and $end_date (inclusive) and whose confirmed and deleted values match the booleans
+        // passed in $confirmed and $deleted
         $q = $this->db->query("SELECT   criteria, count(*) as cnt
             FROM     alerts
             WHERE    confirmed = :confirmed

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
     public $token_checked = null;
     private $alert_id = "";
     public $email = "";
-    public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $criteria = ""; // Sets the terms that are used to produce the search results.
 
     private $db;
 
@@ -72,7 +72,7 @@ 
             $contents = array('criteria' => $row['criteria'], 'count' => $row['cnt']);
             $data[] = $contents;
         }
-        $data = array ('alerts' => $data);
+        $data = array('alerts' => $data);
         return $data;
     }
 
@@ -111,12 +111,12 @@ 
             $data[] = $contents;
         }
         $info = "Alert";
-        $data = array ('info' => $info, 'data' => $data);
+        $data = array('info' => $info, 'data' => $data);
 
         return $data;
     }
 
-    public function add($details, $confirmation_email=false, $instantly_confirm=true) {
+    public function add($details, $confirmation_email = false, $instantly_confirm = true) {
 
         // Adds a new alert's info into the database.
         // Then calls another function to send them a confirmation email.
@@ -179,7 +179,7 @@ 
             // This gives a code for their email address which is then joined
             // to the timestamp so as to provide a unique ID for each alert.
 
-            $token = substr( password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16 );
+            $token = substr(password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16);
 
             // Full stops don't work well at the end of URLs in emails,
             // so replace them. We won't be doing anything clever with the hash
@@ -252,19 +252,19 @@ 
 
         $urltoken = $this->alert_id . '-' . $this->registrationtoken;
 
-        if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
+        if (isset($details['confirm_base']) && $details['confirm_base'] !== '') {
             $confirmurl = $details['confirm_base'] . $urltoken;
         } else {
             $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
         }
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME' 	=> 'THEY WORK FOR YOU',
             'LASTNAME' 		=> ' ALERT CONFIRMATION',
             'CONFIRMURL'	=> $confirmurl,
@@ -280,7 +280,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup'
         );
@@ -288,7 +288,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME' 	=> 'THEY WORK FOR YOU',
             'LASTNAME' 		=> ' ALERT ALREADY SIGNED UP',
             'CRITERIA'	=> $this->criteria_pretty()
@@ -448,17 +448,17 @@ 
     public function email() { return $this->email; }
     public function criteria() { return $this->criteria; }
     public function criteria_pretty($html = false) {
-        $criteria = explode(' ',$this->criteria);
+        $criteria = explode(' ', $this->criteria);
         $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($this->criteria));
         $words = array();
         foreach ($criteria as $c) {
-            if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $words[] = $c;
             }
         }
         $criteria = '';
-        if (count($words)) $criteria .= ($html?'<li>':'* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html?'</li>':'') . "\n";
-        if ($spokenby) $criteria .= ($html?'<li>':'* ') . "Things by " . implode(' or ', $spokenby) . ($html?'</li>':'') . "\n";
+        if (count($words)) $criteria .= ($html ? '<li>' : '* ') . 'Mentions of [' . implode(' ', $words) . ']' . ($html ? '</li>' : '') . "\n";
+        if ($spokenby) $criteria .= ($html ? '<li>' : '* ') . "Things by " . implode(' or ', $spokenby) . ($html ? '</li>' : '') . "\n";
         return $criteria;
     }
 

www/docs/divisions/division.php

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

@@ -58,7 +58,7 @@
 if ($data['division']['house'] == 'pbc') {
     $location = '– in a Public Bill Committee';
 }
-$data['debate_time_human'] = False;
+$data['debate_time_human'] = false;
 $data['debate_day_human'] = format_date($data['division']['date'], LONGDATEFORMAT);
 $data['col_country'] = $country;
 $data['location'] = $location;

Indentation +5 added lines, -5 removed lines

@@ -45,11 +45,11 @@
             $data['mp_vote']['with_majority'] = true;
         }
     } else {
-      if ($data['division']['date'] < $MEMBER->entered_house($division_votes['house_number'])['date']) {
-          $data['before_mp'] = true;
-      } else if ($data['division']['date'] > $MEMBER->left_house($division_votes['house_number'])['date']) {
-          $data['after_mp'] = true;
-      }
+        if ($data['division']['date'] < $MEMBER->entered_house($division_votes['house_number'])['date']) {
+            $data['before_mp'] = true;
+        } else if ($data['division']['date'] > $MEMBER->left_house($division_votes['house_number'])['date']) {
+            $data['after_mp'] = true;
+        }
     }
 
     $mp_data = array(

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

Indentation +8 added lines, -8 removed lines

@@ -38,20 +38,20 @@
 
 $vote_sets = array(
     'yes_votes' => array(
-      'title' => 'Aye',
-      'anchor' => 'for',
+        'title' => 'Aye',
+        'anchor' => 'for',
     ),
     'no_votes' => array(
-      'title' => 'No',
-      'anchor' => 'against',
+        'title' => 'No',
+        'anchor' => 'against',
     ),
     'absent_votes' => array(
-      'title' => 'Absent',
-      'anchor' => 'absent',
+        'title' => 'Absent',
+        'anchor' => 'absent',
     ),
     'both_votes' => array(
-      'title' => 'Abstained',
-      'anchor' => 'both',
+        'title' => 'Abstained',
+        'anchor' => 'both',
     ),
 );
 

Spacing +2 added lines, -2 removed lines

@@ -24,9 +24,9 @@
 });
 $sections_with_votes = array_values($sections_with_votes);
 
-for ($i=0; $i<count($sections_with_votes); $i+=2) {
+for ($i = 0; $i < count($sections_with_votes); $i += 2) {
     $l = $sections_with_votes[$i];
-    $r = $i+1 < count($sections_with_votes) ? $sections_with_votes[$i+1] : null;
+    $r = $i + 1 < count($sections_with_votes) ? $sections_with_votes[$i + 1] : null;
 
     $vote_title = $vote_sets[$l]['title'];
     $anchor = $vote_sets[$l]['anchor'];

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

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) {
+/* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if (!isset($main_vote_mp) || !$main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>
@@ -9,7 +9,7 @@ 
     </div>
   <?php } ?>
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
-      <?php if ( isset($mp_vote) ) { ?>
+      <?php if (isset($mp_vote)) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
           switch ($mp_vote['vote']) {
               case 'aye':
@@ -33,7 +33,7 @@ 
                   echo 'N/A';
           }
         ?></span>
-      <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
+      <?php } else if (isset($before_mp) || isset($after_mp)) { ?>
         <span class="your-mp__vote">N/A</span>
       <?php } ?>
         <img class="your-mp__image" src="<?= $data['mp_data']['image'] ?>">
@@ -41,7 +41,7 @@ 
             <h2 class="people-list__person__name"><?= $data['mp_data']['name'] ?></h2>
             <p class="people-list__person__memberships">
                 <span class="people-list__person__constituency"><?= $data['mp_data']['constituency'] ?></span>
-                <span class="people-list__person__party <?= slugify( $data['mp_data']['party'] ) ?>"><?= $data['mp_data']['party'] ?></span>
+                <span class="people-list__person__party <?= slugify($data['mp_data']['party']) ?>"><?= $data['mp_data']['party'] ?></span>
             </p>
         </div>
     </a>

Indentation +15 added lines, -15 removed lines

@@ -11,28 +11,28 @@
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
       <?php if ( isset($mp_vote) ) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
-          switch ($mp_vote['vote']) {
-              case 'aye':
+            switch ($mp_vote['vote']) {
+                case 'aye':
                   echo 'Aye';
-                  break;
-              case 'no':
+                    break;
+                case 'no':
                   echo 'No';
-                  break;
-              case 'absent':
+                    break;
+                case 'absent':
                   echo 'Absent';
-                  break;
-              case 'both':
+                    break;
+                case 'both':
                   echo 'Abstain';
-                  break;
-              case 'tellaye':
+                    break;
+                case 'tellaye':
                   echo 'Aye (Teller)';
-                  break;
-              case 'tellno':
+                    break;
+                case 'tellno':
                   echo 'No (Teller)';
-                  break;
-              default:
+                    break;
+                default:
                   echo 'N/A';
-          }
+            }
         ?></span>
       <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
         <span class="your-mp__vote">N/A</span>

www/includes/easyparliament/templates/html/alert/_list.php

Spacing +3 added lines, -3 removed lines

@@ -1,14 +1,14 @@
 <h3>Your current email alerts</h3>
 
 <ul class="alerts-manage__list">
-  <?php foreach ( $alerts as $alert ) { ?>
+  <?php foreach ($alerts as $alert) { ?>
     <li>
         When <?= _htmlspecialchars($alert['criteria']) ?>.
         <form action="<?= $actionurl ?>" method="POST">
             <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-          <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
+          <?php if ($alert['status'] == 'unconfirmed') { ?>
             <input type="submit" class="button small" name="action" value="Confirm">
-          <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+          <?php } elseif ($alert['status'] == 'suspended') { ?>
             <input type="submit" class="button small" name="action" value="Resume">
           <?php } else { ?>
             <input type="submit" class="button button--secondary small" name="action" value="Suspend">

classes/Utility/Alert.php

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
         }
 
         if (!empty($details['pid'])) {
-            $criteria[] = 'speaker:'.$details['pid'];
+            $criteria[] = 'speaker:' . $details['pid'];
         }
 
         $criteria = join(' ', $criteria);
@@ -41,9 +41,9 @@ 
             $token = $row['alert_id'] . '-' . $row['registrationtoken'];
 
             $status = 'confirmed';
-            if ( !$row['confirmed'] ) {
+            if (!$row['confirmed']) {
                 $status = 'unconfirmed';
-            } elseif ( $row['deleted'] == 2 ) {
+            } elseif ($row['deleted'] == 2) {
                 $status = 'suspended';
             }
 
@@ -60,21 +60,21 @@ 
 
     public static function prettifyCriteria($alert_criteria) {
         $text = '';
-        if ( $alert_criteria ) {
+        if ($alert_criteria) {
             $criteria = explode(' ', $alert_criteria);
             $words = array();
             $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria));
 
             foreach ($criteria as $c) {
-                if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+                if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                     $words[] = $c;
                 }
             }
-            if ( $spokenby && count($words) ) {
+            if ($spokenby && count($words)) {
                 $text = implode(' or ', $spokenby) . ' mentions [' . implode(' ', $words) . ']';
-            } else if ( count( $words ) ) {
+            } else if (count($words)) {
                 $text = '[' . implode(' ', $words) . ']' . ' is mentioned';
-            } else if ( $spokenby ) {
+            } else if ($spokenby) {
                 $text = implode(' or ', $spokenby) . " speaks";
             }
         }

www/docs/section.php

Spacing +2 added lines, -2 removed lines

@@ -21,14 +21,14 @@
     if (isset($THEUSER) && $THEUSER->postcode_is_set()) {
         try {
             $MEMBER = new MySociety\TheyWorkForYou\Member(array('postcode' => $THEUSER->postcode(), 'house' => \MySociety\TheyWorkForYou\Utility\House::majorToHouse($view->major)[0]));
-        } catch ( MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (MySociety\TheyWorkForYou\MemberException $e) {
             $MEMBER = null;
         }
     }
 
     $data = $view->display();
     if ($data) {
-        if ( !empty($data['template']) ) {
+        if (!empty($data['template'])) {
             $template = $data['template'];
         } else {
             $template = 'section/section';

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

@@ -13,7 +13,7 @@
 }
 
 if ($type = ucfirst(get_http_var('type'))) {
-    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
+    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
     $view = new $class_name();
 
     // use this for generating member vote data

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 } ?>