mysociety / theyworkforyou

www/includes/test/utility_test.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 class UtilityTest extends UnitTestCase {
     public function testVerpEnvelopeSenderCanCreateStandardSender() {
         $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
-        $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
+        $expected_sender = 'twfy+aperson=a.nother.dom@' +EMAILDOMAIN;
         $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
     }
 

www/includes/easyparliament/page.php

Spacing +7 added lines, -7 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) {
@@ -811,7 +811,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
         // Print out a nice list of lettered links to glossary pages
 
-        $letters =  [];
+        $letters = [];
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -1109,7 +1109,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] =  [
+                $tabledata['rows'][] = [
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1191,11 +1191,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/commentreport.php

Spacing +17 added lines, -17 removed lines

@@ -26,12 +26,12 @@ 
     public $firstname = '';
     public $lastname = '';
     public $body = '';
-    public $reported = null;	// datetime
-    public $resolved = null; 	// datetime
-    public $resolvedby = ''; 	// user_id
-    public $locked = null; 	// datetime
-    public $lockedby = '';		// user_id
-    public $upheld = ''; 		// boolean
+    public $reported = null; // datetime
+    public $resolved = null; // datetime
+    public $resolvedby = ''; // user_id
+    public $locked = null; // datetime
+    public $lockedby = ''; // user_id
+    public $upheld = ''; // boolean
 
     // If the user was logged in, this will be set:
     public $user_id = '';
@@ -256,19 +256,19 @@ 
 
         if ($q->success()) {
             // Inserted OK, so set up this object's variables.
-            $this->report_id 	= $q->insert_id();
-            $this->comment_id 	= $COMMENT->comment_id();
-            $this->body			= $body;
-            $this->reported		= $time;
+            $this->report_id = $q->insert_id();
+            $this->comment_id = $COMMENT->comment_id();
+            $this->body = $body;
+            $this->reported = $time;
 
             if ($THEUSER->isloggedin()) {
-                $this->user_id		= $THEUSER->user_id();
+                $this->user_id = $THEUSER->user_id();
                 $this->firstname	= $THEUSER->firstname();
                 $this->lastname		= $THEUSER->lastname();
             } else {
-                $this->email		= $reportdata['email'];
-                $this->firstname 	= $reportdata['firstname'];
-                $this->lastname		= $reportdata['lastname'];
+                $this->email = $reportdata['email'];
+                $this->firstname = $reportdata['firstname'];
+                $this->lastname = $reportdata['lastname'];
             }
 
 
@@ -300,11 +300,11 @@ 
                 $email = $this->email();
             }
 
-            $data =  [
+            $data = [
                 'to' 			=> $email,
                 'template' 		=> 'report_acknowledge',
             ];
-            $merge =  [
+            $merge = [
                 'COMMENTURL' 	=> "https://" . DOMAIN . $COMMENT->url(),
                 'REPORTBODY' 	=> strip_tags($this->body()),
             ];
@@ -326,7 +326,7 @@ 
         $data = [];
 
         if (is_numeric($this->report_id)) {
-            $data =  [
+            $data = [
                 'report_id' 	=> $this->report_id(),
                 'comment_id' 	=> $this->comment_id(),
                 'user_id' 		=> $this->user_id(),

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'],