mysociety / theyworkforyou

classes/GlossaryView/AtoZView.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $url->insert(['gl' => $glossary->next_term['glossary_id']]);
         $next_link = $url->generate('url');
 
-        $nextprev =  [
+        $nextprev = [
             'next'	=>  [
                 'url'	=> $next_link,
                 'title'	=> 'Next term',

www/includes/easyparliament/templates/html/glossary/addterm_matches.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
             <p>It seems we already have <?= ngettext('a definition', 'some definitions', $glossary->num_search_matches) ?> for that. Would you care to see <?= ngettext('it', 'them', $glossary->num_search_matches) ?>?</p>
             <ul class="glossary">
             <?php
-              foreach ($glossary->search_matches as $match) {
-                  $URL = new \MySociety\TheyWorkForYou\Url('glossary');
-                  $URL->insert(['gl' => $match['glossary_id']]);
-                  $URL->remove(['g']);
-                  $term_link = $URL->generate('url');
-                  ?>
+                foreach ($glossary->search_matches as $match) {
+                    $URL = new \MySociety\TheyWorkForYou\Url('glossary');
+                    $URL->insert(['gl' => $match['glossary_id']]);
+                    $URL->remove(['g']);
+                    $term_link = $URL->generate('url');
+                    ?>
                   <li>
                     <a href="<?= $term_link ?>"><?= $match['title']?></a>
                   </li>

classes/GlossaryView/TermView.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $url->insert(['gl' => $glossary->next_term['glossary_id']]);
         $next_link = $url->generate('url');
 
-        $nextprev =  [
+        $nextprev = [
             'next'	=>  [
                 'url'	=> $next_link,
                 'title'	=> 'Next term',

www/includes/easyparliament/page.php

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
                 $THISPAGE = new \MySociety\TheyWorkForYou\Url($this_page);
 
                 $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-                $LOGINURL->insert(['ret' => $THISPAGE->generate('none') ]);
+                $LOGINURL->insert(['ret' => $THISPAGE->generate('none')]);
 
                 $text = "<a href=\"" . $LOGINURL->generate() . '">' . gettext('You’d better sign in!') . '</a>';
             } else {
@@ -391,7 +391,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message =  [
+            $message = [
                 'text' => $message,
             ];
         }
@@ -405,7 +405,7 @@ 
             if (!isset($page_errors)) {
                 $page_errors = [];
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -1022,7 +1022,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] =  [
+                $tabledata['rows'][] = [
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1104,11 +1104,11 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages =  ['admin_home',
+        $pages = ['admin_home',
             'admin_comments', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
             'alert_stats', 'admin_statistics', 'admin_reportstats',
             'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',
-            'admin_profile_message', 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_announcement','admin_featured', 'admin_topics',
+            'admin_profile_message', 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_announcement', 'admin_featured', 'admin_topics',
             'admin_wikipedia',
         ];
 

www/includes/easyparliament/user.php

Spacing +21 added lines, -21 removed lines

@@ -55,23 +55,23 @@ 
 */
 
 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 $can_annotate = false;  // Can the user add annotations
-    public $organisation = '';     // The organisation the user belongs to
+    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 $can_annotate = false; // Can the user add annotations
+    public $organisation = ''; // The organisation the user belongs to
     // Don't use the status to check access privileges - use the is_able_to() function.
     public $status = "Viewer";
 
@@ -324,12 +324,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,
         ];
 
@@ -367,12 +367,12 @@ 
         }
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to'        => $details['email'],
             'template'  => 'join_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'    => $confirmurl,
         ];
 
@@ -504,14 +504,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(),
@@ -683,7 +683,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;
 
@@ -1027,7 +1027,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;
@@ -1423,7 +1423,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