Starbugstone / blogoc

App/Modules/SendMail.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 use Swift_Message;
 use Swift_SmtpTransport;
 
-class SendMail extends Module{
+class SendMail extends Module {
 
     private $siteConfig;
 
@@ -24,7 +24,7 @@ 
 
         // Create the Transport for mail sending
         //$config = $this->siteConfig->getSiteConfig();
-        $this->transport = (new Swift_SmtpTransport($this->siteConfig["SMTP_server"], (int)$this->siteConfig["SMTP_port"]))
+        $this->transport = (new Swift_SmtpTransport($this->siteConfig["SMTP_server"], (int) $this->siteConfig["SMTP_port"]))
             ->setUsername($this->siteConfig["SMTP_user"])
             ->setPassword($this->siteConfig["SMTP_pass"])
         ;
@@ -51,7 +51,7 @@ 
             ->setBody($message, 'text/html')
         ;
 
-        if($from === null)
+        if ($from === null)
         {
             //if we haven't set a from, get the config value
             $from = $this->siteConfig["SMTP_from"];
@@ -77,7 +77,7 @@ 
         $message = "<h1>Message from <a href='".$this->container->getRequest()->getBaseUrl()."'>".$this->siteConfig["site_name"]."</a></h1>";
         $message .= "<p>You have asked to reset your password, please click <a href=\"".$url."\">Here</a> to define a new password</p>";
 
-        $this->send($to, "Define New Password", $message );
+        $this->send($to, "Define New Password", $message);
 
     }
 
@@ -97,7 +97,7 @@ 
         $message .= "<p>You have sucsessfuly created an account, now all you need to do is <a href=\"".$url."\">Create your new password</a></p>";
         $message .= "<p>Have fun</p>";
 
-        $this->send($to, "Define Password at ".$this->siteConfig["site_name"], $message );
+        $this->send($to, "Define Password at ".$this->siteConfig["site_name"], $message);
 
     }
 }
\ No newline at end of file

Core/Traits/StringFunctions.php

Spacing +5 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
 
         //Searching for the page break tag
         $breakTagPosition = strpos($text, "<!-- EndOfExcerptBlogOc -->");
-        if($breakTagPosition > 0){
+        if ($breakTagPosition > 0) {
             return $this->completeDom(substr($text, 0, $breakTagPosition));
         }
 
@@ -93,7 +93,7 @@ 
         $string = preg_split('/(<img[^>]+\>)|(<p[^>]+\>)|(<span[^>]+\>)|\s/', $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
         //The preg split can return false, probably will never happen but just in case.
-        if(!$string)
+        if (!$string)
         {
             throw new \Error("excerpt generation failed");
         }
@@ -106,7 +106,7 @@ 
             $trimmed .= $string[$wordCounter];
             if ($wordCounter < $count - 1) {
                 $trimmed .= " ";
-            } else {
+            }else {
                 $trimmed .= "[...]";
             }
         }
@@ -146,7 +146,7 @@ 
         $result = true;
         foreach ($strings as $string)
         {
-            if(!$this->isAlphaNum($string))
+            if (!$this->isAlphaNum($string))
             {
                 $result = false;
             }
@@ -161,7 +161,7 @@ 
      */
     public function isHexa(string $string):bool
     {
-        return preg_match("/[\da-f]/",$string);
+        return preg_match("/[\da-f]/", $string);
     }
 
     /**

App/Models/CommentModel.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 use HTMLPurifier;
 use HTMLPurifier_Config;
 
-class CommentModel extends Model{
+class CommentModel extends Model {
 
     private $commentTbl;
     private $userTbl;
@@ -154,10 +154,10 @@ 
      * @return int
      * @throws \Exception
      */
-    public function addComment(int $postId, int $userId, string $comment, bool $admin=false):int
+    public function addComment(int $postId, int $userId, string $comment, bool $admin = false):int
     {
         $comment = $this->purifyHtml($comment);
-        $sql="
+        $sql = "
             INSERT INTO $this->commentTbl (users_idusers, posts_idposts, comment, approved)
             VALUES (:userId, :postId, :comment, :approved)
         ";
@@ -168,7 +168,7 @@ 
         $this->bind(':approved', $admin);
 
         $this->execute();
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
     }
 
     /**
@@ -201,7 +201,7 @@ 
 
         $comment = $this->purifyHtml($comment);
 
-        $sql="
+        $sql = "
             UPDATE $this->commentTbl 
             SET
               comment = :comment,

App/Controllers/Post.php

Spacing +4 added lines, -4 removed lines

@@ -83,9 +83,9 @@ 
         $this->onlyUser();
 
         //get the session userId
-        $userId = (int)$this->session->get("userId");
+        $userId = (int) $this->session->get("userId");
         $comment = $this->request->getData("newComment");
-        $postId = (int)$this->request->getData("postId");
+        $postId = (int) $this->request->getData("postId");
 
         //check if we are admin, Admins do not need moderation
         $admin = $this->session->get('user_role_level') >= Constant::ADMIN_LEVEL;
@@ -101,8 +101,8 @@ 
             $siteConfig = $this->siteConfig->getSiteConfig();
             $post = $this->postModel->getSinglePost($postId);
 
-            $emailMessage = "<h1>New comment on post " . $post->title . "</a></h1>";
-            $emailMessage .= "<p>Check it out <a href='" . $baseUrl . "admin/comments/moderate-comment/" . $commentId . "'>here</a> </p>";
+            $emailMessage = "<h1>New comment on post ".$post->title."</a></h1>";
+            $emailMessage .= "<p>Check it out <a href='".$baseUrl."admin/comments/moderate-comment/".$commentId."'>here</a> </p>";
 
             $this->sendMail->send($siteConfig["admin_email_address"], "New comment added", $emailMessage);
 

Braces +3 added lines, -1 removed lines

@@ -96,9 +96,11 @@
         $baseUrl = $this->request->getBaseUrl();
         $redirectUrl = $this->removeFromBeginning($refererUrl, $baseUrl);
 
-        if (!$admin) //if we are not an admin, send an email to alert and add an alertBox
+        if (!$admin) {
+            //if we are not an admin, send an email to alert and add an alertBox
         {
             $siteConfig = $this->siteConfig->getSiteConfig();
+        }
             $post = $this->postModel->getSinglePost($postId);
 
             $emailMessage = "<h1>New comment on post " . $post->title . "</a></h1>";

Core/Constant.php

Spacing +2 added lines, -2 removed lines

@@ -24,13 +24,13 @@
     const LIST_PER_PAGE = 10;
     const COMMENTS_PER_PAGE = 2;
 
-    const EXCERPT_WORD_COUNT =50;
+    const EXCERPT_WORD_COUNT = 50;
 
     //login security
     const NUMBER_OF_BAD_PASSWORD_TRIES = 3;
     const LOCKOUT_MINUTES = 5;
 
-    const PASSWORD_RESET_DURATION = 240;//number of minutes the reset password link is valid
+    const PASSWORD_RESET_DURATION = 240; //number of minutes the reset password link is valid
 
     const HASH_KEY = "1337blogOcPass159758348ShaQpiss";
 }
\ No newline at end of file

App/Controllers/Ajax/Comment.php

Spacing +7 added lines, -7 removed lines

@@ -24,8 +24,8 @@ 
     {
         $this->onlyAdmin();
         $this->onlyPost();
-        $state = (bool)($this->request->getData("state") === 'true');
-        $commentId = (int)$this->request->getData("commentId");
+        $state = (bool) ($this->request->getData("state") === 'true');
+        $commentId = (int) $this->request->getData("commentId");
 
         $result = array();
         $result["success"] = $this->commentModel->setApproved(!$state, $commentId);
@@ -36,17 +36,17 @@ 
 
     public function loadComments()
     {
-        $commentOffset = (int)$this->request->getData("commentOffset");
-        $postId = (int)$this->request->getData("postId");
+        $commentOffset = (int) $this->request->getData("commentOffset");
+        $postId = (int) $this->request->getData("postId");
 
         $result = array();
-        $result["success"]=false;
+        $result["success"] = false;
         $data = array();
 
         $data["comments"] = $this->commentModel->getCommentsListOnPost($postId, $commentOffset);
-        if($data["comments"])
+        if ($data["comments"])
         {
-            $result["success"]=true;
+            $result["success"] = true;
             $twig = $this->container->getTemplate();
             $html = $twig->render('Includes/LoadComments.twig', $data);
 

App/Controllers/Ajax/PostVerification.php

Braces +3 added lines, -1 removed lines

@@ -44,9 +44,11 @@
 
         $data = $postModel->isPostSlugUnique(/** @scrutinizer ignore-type */$postSlug); //we have checked that slug is valid so no type error
 
-        if ($data === false) //slug is not unique, but could be from the same post
+        if ($data === false) {
+            //slug is not unique, but could be from the same post
         {
             $slugOfId = $postModel->getPostSlugFromId($postId);
+        }
             if ($slugOfId === $postSlug) {
                 //it's the same post, return true
                 $data = true;

App/Controllers/Admin/Comments.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 use Core\Container;
 use Core\Traits\StringFunctions;
 
-class Comments extends AdminController{
+class Comments extends AdminController {
 
     use StringFunctions;
 
@@ -121,7 +121,7 @@ 
         }
 
         $refererUrl = $this->request->getReferer();
-        if($refererUrl === null) //referer can return null, set default
+        if ($refererUrl === null) //referer can return null, set default
         {
             $refererUrl = "admin/comments/view-comments";
         }
@@ -152,7 +152,7 @@ 
         }
 
         //update comment
-        if($this->commentModel->update($commentId, $comment["commentTextArea"], $comment["commentApproved"]))
+        if ($this->commentModel->update($commentId, $comment["commentTextArea"], $comment["commentApproved"]))
         {
             $this->alertBox->setAlert("Comment updated");
         }

Braces +3 added lines, -1 removed lines

@@ -121,10 +121,12 @@
         }
 
         $refererUrl = $this->request->getReferer();
-        if($refererUrl === null) //referer can return null, set default
+        if($refererUrl === null) {
+            //referer can return null, set default
         {
             $refererUrl = "admin/comments/view-comments";
         }
+        }
         $baseUrl = $this->request->getBaseUrl();
         $redirectUrl = $this->removeFromBeginning($refererUrl, $baseUrl);
 

App/Controllers/Admin/Home.php

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
         $this->session->remove("registrationErrors");
 
         $userId = $this->session->get("userId");
-        if($userId === null)
+        if ($userId === null)
         {
             //this should never happen but scrutinizer thows an alert
             throw new \Exception("Session error, no ID");
@@ -102,14 +102,14 @@ 
         $this->onlyUser();
         $this->onlyPost();
 
-        $user = (object)$this->request->getDataFull();
+        $user = (object) $this->request->getDataFull();
         $redirectUrl = "/admin";
 
         if ($user->userId !== $this->session->get("userId") || isset($user->userRoleSelector) || isset($user->locked_out)) {
             //an admin is trying to update a user or form tampered with
             $this->onlyAdmin();
-            $redirectUrl = "/admin/home/view-user/" . $user->userId;
-        } else {
+            $redirectUrl = "/admin/home/view-user/".$user->userId;
+        }else {
             //set the role to the original state for update
             $beforeUser = $this->userModel->getUserDetailsById($user->userId);
             $user->userRoleSelector = $beforeUser->roles_idroles;
@@ -123,13 +123,13 @@ 
         $error = false;
         $registerErrors = new \stdClass();
 
-        if($userId == 1 && $user->userLockedOut == 1)
+        if ($userId == 1 && $user->userLockedOut == 1)
         {
             $error = true;
             $this->alertBox->setAlert("Original admin may not be deactivated", "error");
         }
 
-        if($userId == 1 && $user->userRoleSelector != 2)
+        if ($userId == 1 && $user->userRoleSelector != 2)
         {
             $error = true;
             $this->alertBox->setAlert("Original admin must stay admin", "error");
@@ -216,7 +216,7 @@ 
             throw new \Exception("Error in passed ID");
         }
 
-        if($userId === 1)
+        if ($userId === 1)
         {
             $this->alertBox->setAlert('Original Admin can not be deleted', "error");
             $this->response->redirect("/admin/home/list-users");