mysociety / theyworkforyou

www/includes/easyparliament/user.php

Spacing +22 added lines, -22 removed lines

@@ -55,21 +55,21 @@ 
 */
 
 class USER {
-    public $user_id = "0";         // So we have an ID for non-logged in users reporting comments etc.
-    public $firstname = "Guest";   // So we have something to print for non-logged in users.
+    public $user_id = "0"; // So we have an ID for non-logged in users reporting comments etc.
+    public $firstname = "Guest"; // So we have something to print for non-logged in users.
     public $lastname = "";
-    public $password = "";         // This will be a hashed version of a plaintext pw.
+    public $password = ""; // This will be a hashed version of a plaintext pw.
     public $email = "";
     public $postcode = "";
     public $url = "";
-    public $lastvisit = "";        // Last time the logged-in user loaded a page (GMT).
+    public $lastvisit = ""; // Last time the logged-in user loaded a page (GMT).
     public $registrationtime = ""; // When they registered (GMT).
-    public $registrationip = "";   // Where they registered from.
-    public $optin = "";            // Int containing multiple binary opt-ins. (See top of User.php)
-    public $deleted = "";          // User can't log in or have their info displayed.
-    public $confirmed = '';        // boolean - Has the user confirmed via email?
-    public $facebook_id = '';      // Facebook ID for users who login with FB
-    public $facebook_token = '';   // Facebook token for users who login with FB
+    public $registrationip = ""; // Where they registered from.
+    public $optin = ""; // Int containing multiple binary opt-ins. (See top of User.php)
+    public $deleted = ""; // User can't log in or have their info displayed.
+    public $confirmed = ''; // boolean - Has the user confirmed via email?
+    public $facebook_id = ''; // Facebook ID for users who login with FB
+    public $facebook_token = ''; // Facebook token for users who login with FB
     // Don't use the status to check access privileges - use the is_able_to() function.
     public $status = "Viewer";
 
@@ -318,12 +318,12 @@ 
         $confirmurl = 'https://' . DOMAIN . '/E/' . $urltoken;
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to'        => $details['email'],
             'template'  => 'email_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'    => $confirmurl,
         ];
 
@@ -361,12 +361,12 @@ 
         }
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to'        => $details['email'],
             'template'  => 'join_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'    => $confirmurl,
         ];
 
@@ -432,13 +432,13 @@ 
                 // Generates the password ....
                 for ($x = 0; $x < 6;) {
                     $y = rand(1, 1000);
-                    if($y > 350 && $y < 601) {
+                    if ($y > 350 && $y < 601) {
                         $d = chr(rand(48, 57));
                     }
-                    if($y < 351) {
+                    if ($y < 351) {
                         $d = chr(rand(65, 90));
                     }
-                    if($y > 600) {
+                    if ($y > 600) {
                         $d = chr(rand(97, 122));
                     }
                     if ($d != $o && !preg_match('#[O01lI]#', $d)) {
@@ -498,14 +498,14 @@ 
             return false;
         }
 
-        $data =  [
+        $data = [
             'to'            => $this->email(),
             'template'      => 'new_password',
         ];
 
         $URL = new \MySociety\TheyWorkForYou\Url("userlogin");
 
-        $merge =  [
+        $merge = [
             'EMAIL'         => $this->email(),
             'LOGINURL'      => "https://" . DOMAIN . $URL->generate(),
             'PASSWORD'      => $this->password(),
@@ -659,7 +659,7 @@ 
         // Maybe there's a way of fetching these from the DB,
         // so we don't duplicate them here...?
 
-        $statuses =  ["Viewer", "User", "Moderator", "Administrator", "Superuser"];
+        $statuses = ["Viewer", "User", "Moderator", "Administrator", "Superuser"];
 
         return $statuses;
 
@@ -988,7 +988,7 @@ 
             $date_now = gmdate("Y-m-d H:i:s");
             $this->db->query(
                 "UPDATE users SET lastvisit = :lastvisit WHERE user_id = :user_id",
-                [ ':lastvisit' => $date_now, ':user_id' => $this->user_id() ]
+                [':lastvisit' => $date_now, ':user_id' => $this->user_id()]
             );
 
             $this->lastvisit = $date_now;
@@ -1384,7 +1384,7 @@ 
 
             twfy_debug("THEUSER", "User with ID found to confirm: " . $this->user_id());
             // We'll need these to be set before logging the user in.
-            $this->email    = $q['email'];
+            $this->email = $q['email'];
 
             // Set that they're confirmed in the DB.
             $r = $this->db->query("UPDATE users

Braces +4 added lines, -2 removed lines

@@ -1430,7 +1430,8 @@ 
         // not-logged-in users.
 
         $this->postcode = $pc;
-        if (!headers_sent()) { // if in debug mode
+        if (!headers_sent()) {
+// if in debug mode
             setcookie(POSTCODE_COOKIE, $pc, time() + 7 * 86400, "/", COOKIEDOMAIN);
         }
 
@@ -1438,7 +1439,8 @@ 
     }
 
     public function unset_postcode_cookie() {
-        if (!headers_sent()) { // if in debug mode
+        if (!headers_sent()) {
+// if in debug mode
             setcookie(POSTCODE_COOKIE, '', time() - 3600, '/', COOKIEDOMAIN);
         }
     }

www/includes/easyparliament/comment.php

Spacing +11 added lines, -11 removed lines

@@ -30,8 +30,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = null;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = null; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -70,12 +70,12 @@ 
             if ($q) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q['user_id'];
+                $this->user_id = $q['user_id'];
                 $this->epobject_id	= $q['epobject_id'];
-                $this->body			= $q['body'];
-                $this->posted		= $q['posted'];
-                $this->visible		= $q['visible'];
-                $this->modflagged	= $q['modflagged'];
+                $this->body = $q['body'];
+                $this->posted = $q['posted'];
+                $this->visible = $q['visible'];
+                $this->modflagged = $q['modflagged'];
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -131,7 +131,7 @@ 
 
     public function display($format = 'html', $template = 'comments') {
 
-        $data['comments'][0] =  [
+        $data['comments'][0] = [
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -179,7 +179,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message =  [
+            $message = [
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag.",
             ];
@@ -201,7 +201,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message =  [
+                $message = [
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation.",
                 ];
@@ -210,7 +210,7 @@ 
             }
 
         } else {
-            $message =  [
+            $message = [
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations.",
             ];

www/includes/easyparliament/metadata.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 
 */
 
-$page =  [
+$page = [
 
     // Things used on EVERY page, unless overridden for a page:
     'default' =>  [
@@ -1295,7 +1295,7 @@ 
 // The text displayed on the page itself will also be this,
 // UNLESS the section has a 'heading', in which case that's used instead.
 
-$section =  [
+$section = [
 
 
     'about' =>  [

www/includes/easyparliament/templates/html/mp/header.php

Indentation +40 added lines, -40 removed lines

@@ -20,39 +20,39 @@ 
                 <p class="person-header__about__position">
                 <?php
                     $lat = $latest_membership['party'] == 'Bishop' ? '' : $latest_membership['party'];
-                  if ($latest_membership['current']) {
-                      if ($latest_membership['constituency']) {
-                          # First %s is party, second is type of rep (e.g. MS), third is constituency name
-                          printf(
-                              gettext('<span class="person-header__about__position__role">%s %s</span> for <span class="person-header__about__position__constituency">%s</span>'),
-                              $lat,
-                              $latest_membership['rep_name'],
-                              $latest_membership['constituency']
-                          );
-                      } else {
-                          printf(
-                              gettext('<span class="person-header__about__position__role">%s %s</span>'),
-                              $lat,
-                              $latest_membership['rep_name']
-                          );
-                      }
-                  } else {
-                      if ($latest_membership['constituency']) {
-                          printf(
-                              gettext('<span class="person-header__about__position__role">Former %s %s</span> for <span class="person-header__about__position__constituency">%s</span>'),
-                              $lat,
-                              $latest_membership['rep_name'],
-                              $latest_membership['constituency']
-                          );
-                      } else {
-                          printf(
-                              gettext('<span class="person-header__about__position__role">Former %s %s</span>'),
-                              $lat,
-                              $latest_membership['rep_name']
-                          );
-                      }
-                  }
-                  ?>
+                    if ($latest_membership['current']) {
+                        if ($latest_membership['constituency']) {
+                            # First %s is party, second is type of rep (e.g. MS), third is constituency name
+                            printf(
+                                gettext('<span class="person-header__about__position__role">%s %s</span> for <span class="person-header__about__position__constituency">%s</span>'),
+                                $lat,
+                                $latest_membership['rep_name'],
+                                $latest_membership['constituency']
+                            );
+                        } else {
+                            printf(
+                                gettext('<span class="person-header__about__position__role">%s %s</span>'),
+                                $lat,
+                                $latest_membership['rep_name']
+                            );
+                        }
+                    } else {
+                        if ($latest_membership['constituency']) {
+                            printf(
+                                gettext('<span class="person-header__about__position__role">Former %s %s</span> for <span class="person-header__about__position__constituency">%s</span>'),
+                                $lat,
+                                $latest_membership['rep_name'],
+                                $latest_membership['constituency']
+                            );
+                        } else {
+                            printf(
+                                gettext('<span class="person-header__about__position__role">Former %s %s</span>'),
+                                $lat,
+                                $latest_membership['rep_name']
+                            );
+                        }
+                    }
+                    ?>
                 </p>
               <?php } ?>
               <?php if (count($social_links) > 0) { ?>
@@ -77,13 +77,13 @@ 
           <?php if ($current_member_anywhere) { ?>
             <div class="person-header__actions">
               <?php if ($this_page != 'royal') {
-                  $wtt_url = 'https://www.writetothem.com/';
-                  if ($current_member[HOUSE_TYPE_LORDS]) {
-                      $wtt_url = $wtt_url . "?person=uk.org.publicwhip/person/$person_id";
-                  } elseif ($the_users_mp) {
-                      $wtt_url = $wtt_url . "?a=WMC&amp;pc=" . _htmlentities(urlencode($user_postcode));
-                  }
-                  ?>
+                    $wtt_url = 'https://www.writetothem.com/';
+                    if ($current_member[HOUSE_TYPE_LORDS]) {
+                        $wtt_url = $wtt_url . "?person=uk.org.publicwhip/person/$person_id";
+                    } elseif ($the_users_mp) {
+                        $wtt_url = $wtt_url . "?a=WMC&amp;pc=" . _htmlentities(urlencode($user_postcode));
+                    }
+                    ?>
                 <a href="<?= $wtt_url ?>" class="button" onclick="trackLinkClick(this, 'link_click', 'WriteToThem', 'Person'); return false;"><?= gettext('Send a message') ?></a>
               <?php } ?>
               <?php if ($has_email_alerts) { ?>

www/includes/easyparliament/templates/html/mp/votes_svg.php

Indentation +9 added lines, -9 removed lines

@@ -44,15 +44,15 @@
     <text font-size="24" font-weight="normal" fill="#000000">
         <?php foreach ($lines as $j => $line) { ?>
             <tspan x="40" y="<?= $stance_y + $stance_padding_top + $stance_baseline_offset + ($stance_lineheight * $j) ?>"><?php
-               if (strpos($line, '*') !== false) {
-                   echo preg_replace(
-                       '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
-                       '$1',
-                       $line
-                   );
-               } else {
-                   echo $line;
-               }
+                if (strpos($line, '*') !== false) {
+                    echo preg_replace(
+                        '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
+                        '$1',
+                        $line
+                    );
+                } else {
+                    echo $line;
+                }
             ?></tspan>
         <?php } ?>
     </text>

www/includes/easyparliament/commentreportlist.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 
         $data = [];
         foreach ($q as $row) {
-            $data[] =  [
+            $data[] = [
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],
@@ -107,7 +107,7 @@ 
             ];
         }
         foreach ($r as $row) {
-            $data[] =  [
+            $data[] = [
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],

www/includes/easyparliament/alert.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,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;
 
@@ -71,7 +71,7 @@ 
             $contents = ['criteria' => $row['criteria'], 'count' => $row['cnt']];
             $data[] = $contents;
         }
-        $data =  ['alerts' => $data];
+        $data = ['alerts' => $data];
         return $data;
     }
 
@@ -99,7 +99,7 @@ 
 
         $data = $q->fetchAll();
         $info = "Alert";
-        $data =  ['info' => $info, 'data' => $data];
+        $data = ['info' => $info, 'data' => $data];
 
         return $data;
     }
@@ -254,12 +254,12 @@ 
         }
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'	=> $confirmurl,
             'CRITERIA'	=> $this->criteria_pretty(),
         ];
@@ -273,7 +273,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data =  [
+        $data = [
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup',
         ];
@@ -281,7 +281,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge =  [
+        $merge = [
             'CRITERIA'	=> $this->criteria_pretty(),
         ];
 

www/includes/easyparliament/member.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 
         # All the following only happen if the house to display isn't yet set.
         # TODO: This relies on interpreting the default value of 0 as a false, which may be error-prone.
-        if (! (bool) $this->house_disp) {
+        if (!(bool) $this->house_disp) {
             if ($house == HOUSE_TYPE_LONDON_ASSEMBLY # London Assembly
                 || $house == HOUSE_TYPE_SCOTLAND     # MSPs and
                 || $house == HOUSE_TYPE_WALES        # MSs and
@@ -251,7 +251,7 @@ 
             $policiesList = new Policies($policyID);
         }
         $rel_agreements = $policiesList->all_policy_agreements[$policyID] ?? [];
-        $rel_agreements = array_filter($rel_agreements, function ($agreement) use ($house) {
+        $rel_agreements = array_filter($rel_agreements, function($agreement) use ($house) {
             return $this->date_in_memberships($house, $agreement['date']);
         });
         return $rel_agreements;
@@ -526,7 +526,7 @@ 
         }
 
         if ($display && array_key_exists('register_member_interests_html', $this->extra_info) && ($this->extra_info['register_member_interests_html'] != '')) {
-            $args =  [
+            $args = [
                 "sort" => "regexp_replace",
             ];
             $GLOSSARY = new GLOSSARY($args);

www/includes/easyparliament/glossary.php

Spacing +6 added lines, -6 removed lines

@@ -24,12 +24,12 @@ 
 include_once INCLUDESPATH . "easyparliament/searchengine.php";
 
 class GLOSSARY {
-    public $num_terms;			// how many glossary entries do we have
+    public $num_terms; // how many glossary entries do we have
     // (changes depending on how GLOSSARY is called
-    public $hansard_count;		// how many times does the phrase appear in hansard?
-    public $query;				// search term
-    public $glossary_id;		// if this is set then we only have 1 glossary term
-    public $current_term;		// will only be set if we have a valid epobject_id
+    public $hansard_count; // how many times does the phrase appear in hansard?
+    public $query; // search term
+    public $glossary_id; // if this is set then we only have 1 glossary term
+    public $current_term; // will only be set if we have a valid epobject_id
     public $current_letter;
 
     // constructor...
@@ -72,7 +72,7 @@ 
 
         // These stop stupid submissions.
         // everything should be lowercase.
-        $this->stopwords = [ "the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate" ];
+        $this->stopwords = ["the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate"];
 
     }