mysociety / theyworkforyou

www/docs/addcomment/index.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 if (get_http_var("submitcomment") != '') {
     // We're submitting a comment.
 
-    $data = array (
+    $data = array(
         'epobject_id' => get_http_var('epobject_id'),
         'body'	=> get_http_var('body')
     );
@@ -58,7 +58,7 @@ 
 
         // Preview the comment.
         // Mock up a data array for the comment listing template.
-        $data['comments'][0] = array (
+        $data['comments'][0] = array(
             'body' => $body,
             'firstname' => $THEUSER->firstname(),
             'lastname' => $THEUSER->lastname(),
@@ -75,7 +75,7 @@ 
 
 
         // Show the populated comment form.
-        $commendata = array (
+        $commendata = array(
             'epobject_id' => get_http_var('epobject_id'),
             'gid' => get_http_var('gid'),
             'body'	=> get_http_var('body'),
@@ -85,7 +85,7 @@ 
 
 
         // Show all comments for this epobject.
-        $args = array (
+        $args = array(
             'epobject_id' => get_http_var('epobject_id')
         );
 

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

@@ -64,7 +64,7 @@
             'lastname' => $THEUSER->lastname(),
             'user_id' => $THEUSER->user_id(),
             'posted' => date('Y-m-d H:i:s', time()),
-            'modflagged' => NULL,
+            'modflagged' => null,
             'visible' => 1,
             'preview' => true	// Extra tag so we know this is just a preview.
         );

www/includes/easyparliament/comment.php

Spacing +22 added lines, -22 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();
@@ -142,7 +142,7 @@ 
         }
 
         if (!$THEUSER->is_able_to('addcomment')) {
-            $message = 	array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => 'You are not allowed to post annotations.'
             );
@@ -150,8 +150,8 @@ 
             return false;
         }
 
-        if (!is_numeric ($data['epobject_id'])) {
-            $message = array (
+        if (!is_numeric($data['epobject_id'])) {
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "We don't have an epobject id."
             );
@@ -160,7 +160,7 @@ 
         }
 
         if ($data['body'] == '') {
-            $message = array (
+            $message = array(
                 'title' => 'Whoops!',
                 'text' => "You haven't entered an annotation!"
             );
@@ -223,12 +223,12 @@ 
 
         if ($q->success()) {
             // Set the object varibales up.
-            $this->comment_id 	= $q->insert_id();
-            $this->user_id	  	= $THEUSER->user_id();
-            $this->epobject_id 	= $data['epobject_id'];
-            $this->body			= $data['body'];
-            $this->posted		= $posted;
-            $this->visible		= 1;
+            $this->comment_id = $q->insert_id();
+            $this->user_id = $THEUSER->user_id();
+            $this->epobject_id = $data['epobject_id'];
+            $this->body = $data['body'];
+            $this->posted = $posted;
+            $this->visible = 1;
 
             return $this->comment_id();
 
@@ -238,8 +238,8 @@ 
     }
 
 
-    public function display($format='html', $template='comments') {
-        $data['comments'][0] =  [
+    public function display($format = 'html', $template = 'comments') {
+        $data['comments'][0] = [
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -287,7 +287,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message =  [
+            $message = [
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag.",
             ];
@@ -309,7 +309,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message =  [
+                $message = [
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation.",
                 ];
@@ -318,7 +318,7 @@ 
             }
 
         } else {
-            $message =  [
+            $message = [
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations.",
             ];

www/includes/easyparliament/user.php

Spacing +24 added lines, -24 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,
         ];
 
@@ -438,13 +438,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)) {
@@ -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(),
@@ -687,7 +687,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;
 
@@ -1031,7 +1031,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;
@@ -1427,7 +1427,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

www/includes/easyparliament/page.php

Spacing +9 added lines, -9 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)
@@ -1065,9 +1065,9 @@ 
 
             // The URLs to login / join pages.
             $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-            $LOGINURL->insert(array('ret'=>$THISPAGEURL->generate().'#addcomment'));
+            $LOGINURL->insert(array('ret'=>$THISPAGEURL->generate() . '#addcomment'));
             $JOINURL = new \MySociety\TheyWorkForYou\Url('userjoin');
-            $JOINURL->insert(array('ret'=>$THISPAGEURL->generate().'#addcomment'));
+            $JOINURL->insert(array('ret'=>$THISPAGEURL->generate() . '#addcomment'));
 
             ?>
                 <p><a href="<?php echo $LOGINURL->generate(); ?>">Sign in</a> or <a href="<?php echo $JOINURL->generate(); ?>">join</a> to post a public annotation.</p>
@@ -1192,7 +1192,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] =  [
+                $tabledata['rows'][] = [
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1274,11 +1274,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',
         ];
 

tests/CommentTest.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     /**
      * Tests adding a new comment, testing HTML cleaning.
      */
-	public function testHTMLCleaningAddComment()
+    public function testHTMLCleaningAddComment()
     {
 
         global $THEUSER;