Starbugstone / blogoc

App/Controllers/Admin/Comments.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 use Core\Container;
 use Core\Traits\StringFunctions;
 
-class Comments extends AdminController{
+class Comments extends AdminController {
 
     use StringFunctions;
 
@@ -114,7 +114,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");
         }

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/Password.php

Spacing +7 added lines, -7 removed lines

@@ -45,27 +45,27 @@ 
     public function reset($get)
     {
         //only get messages here
-        if(!$this->startsWith(strtolower($get),"get"))
+        if (!$this->startsWith(strtolower($get), "get"))
         {
             throw new \Exception("invalid call");
         }
 
         //grab the token and ID
         $token = $this->request->getData("token");
-        $userId = (int)$this->request->getData("userId");
+        $userId = (int) $this->request->getData("userId");
 
-        if($token === null)
+        if ($token === null)
         {
             throw new \Exception("Null Token");
         }
 
         //verify if token is valid
-        if(!$this->isHexa($token)|| !$this->isInt($userId))
+        if (!$this->isHexa($token) || !$this->isInt($userId))
         {
             $this->alertBox->setAlert('Badly formatted Token', 'error');
             $this->response->redirect();
         }
-        if(!$this->userModel->getUserDetailsByToken($token, $userId))
+        if (!$this->userModel->getUserDetailsByToken($token, $userId))
         {
             $this->alertBox->setAlert('Invalid reset token, please request a new password', 'error');
             $this->response->redirect();
@@ -88,14 +88,14 @@ 
         $token = $request["token"];
         $userId = $request["userId"];
 
-        if(!$this->isHexa($token) || !$this->isInt($userId) )
+        if (!$this->isHexa($token) || !$this->isInt($userId))
         {
             throw new \Exception("Bad Token or ID request");
         }
 
         $error = false;
         $registerErrors = new \stdClass();
-        if($password !== $confirm)
+        if ($password !== $confirm)
         {
             $error = true;
             $registerErrors->forgotPassword = "password and confirmation do not match";

App/Controllers/Login.php

Braces +3 added lines, -1 removed lines

@@ -282,9 +282,11 @@
         //all set, redirect and set message
         $redirectUrl = "";
         $refererUrl = $this->request->getReferer();
-        if ($refererUrl != "")//getReferer can return null if client isn't configured
+        if ($refererUrl != "") {
+            //getReferer can return null if client isn't configured
         {
             $baseUrl = $this->request->getBaseUrl();
+        }
             $redirectUrl = $this->removeFromBeginning($refererUrl, $baseUrl);
         }
 

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
     private function populateUserFromId(int $userId)
     {
         $result = $this->userModel->getUserDetailsById($userId);
-        $this->populateUser((array)$result);
+        $this->populateUser((array) $result);
     }
 
     /**
@@ -197,7 +197,7 @@ 
         //we are authenticated here
 
         //populate the user object with returned data
-        $this->populateUser((array)$authUser->user);
+        $this->populateUser((array) $authUser->user);
 
         //if the user wanted to be remembered
         if ($rememberMe) {
@@ -225,7 +225,7 @@ 
 
         $register = $this->request->getDataFull();
 
-        if($register === null)
+        if ($register === null)
         {
             throw new \Exception("Error no data passed");
         }

App/Controllers/Ajax/User.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 use Core\JsonException;
 use Core\Traits\StringFunctions;
 
-class User  extends AjaxController{
+class User  extends AjaxController {
 
     use StringFunctions;
 
@@ -25,12 +25,12 @@ 
         //the router needs a parameter with get functions else throsw a wobbly
         //we pass a get variable and call the /controller/function/get?bla
         //for better use and security, we must pass "get" as the parameter
-        if(!$this->startsWith(strtolower($get),"get"))
+        if (!$this->startsWith(strtolower($get), "get"))
         {
             throw new JsonException("invalid call");
         }
         $email = $this->request->getData("email");
-        if($email === null)
+        if ($email === null)
         {
             throw new JsonException("Empty email");
         }
@@ -51,8 +51,8 @@ 
     {
         $this->onlyAdmin();
         $this->onlyPost();
-        $state = (bool)($this->request->getData("state") === 'true');
-        $userId = (int)$this->request->getData("userId");
+        $state = (bool) ($this->request->getData("state") === 'true');
+        $userId = (int) $this->request->getData("userId");
 
         $result = array();
         $result["success"] = false;
@@ -60,7 +60,7 @@ 
         $result["userId"] = $userId;
 
         // we can not update the Original Admin activation state
-        if($userId !== 1)
+        if ($userId !== 1)
         {
             $result["success"] = $this->userModel->activateUser(!$state, $userId);
             $result["state"] = !$state;

App/Controllers/Post.php

Braces +3 added lines, -1 removed lines

@@ -91,9 +91,11 @@
         $admin = $this->session->get('user_role_level') >= Constant::ADMIN_LEVEL;
         $commentId = $this->commentModel->addComment($postId, $userId, $comment, $admin);
 
-        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);
             $baseUrl = $this->request->getBaseUrl();
 

Spacing +8 added lines, -8 removed lines

@@ -42,11 +42,11 @@ 
     public function viewPost(string $slug, string $page = "page-1", int $linesPerPage = Constant::COMMENTS_PER_PAGE)
     {
 
-        $postId = (int)$this->postModel->getPostIdFromSlug($slug);
+        $postId = (int) $this->postModel->getPostIdFromSlug($slug);
 
         $posts = $this->postModel->getSinglePost($postId);
 
-        if($posts === false)
+        if ($posts === false)
         {
             throw new \Exception("Page no longer exists", "404");
         }
@@ -89,9 +89,9 @@ 
         $this->onlyUser();
 
         //get the session userId
-        $userId = (int)$this->session->get("userId");
-        $comment = (string)$this->request->getData("newComment");
-        $postId = (int)$this->request->getData("postId");
+        $userId = (int) $this->session->get("userId");
+        $comment = (string) $this->request->getData("newComment");
+        $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;
@@ -103,8 +103,8 @@ 
             $post = $this->postModel->getSinglePost($postId);
             $baseUrl = $this->request->getBaseUrl();
 
-            $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);
 
@@ -113,6 +113,6 @@ 
 
         $postSlug = $this->postModel->getPostSlugFromId($postId);
 
-        $this->response->redirect("/post/view-post/" . $postSlug);
+        $this->response->redirect("/post/view-post/".$postSlug);
     }
 }
\ 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) === 1;
+        return preg_match("/[\da-f]/", $string) === 1;
     }
 
     /**

App/Models/UserModel.php

Spacing +4 added lines, -4 removed lines

@@ -192,7 +192,7 @@ 
         //check if email is valid for sanity
         if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
             $email = htmlspecialchars($email);
-            throw new BlogocException("invalid email " . $email);
+            throw new BlogocException("invalid email ".$email);
         }
         $sql = $this->baseSqlSelect();
         $sql .= "
@@ -235,7 +235,7 @@ 
         $this->bind(':roles_idroles', 1); //we set to one, should probably get from database and config
         $this->execute();
 
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
     }
 
     /**
@@ -245,7 +245,7 @@ 
      */
     public function updateUser(\stdClass $user):void
     {
-        $sql="
+        $sql = "
             UPDATE $this->userTbl
             SET
               name=:name,
@@ -296,7 +296,7 @@ 
         }
 
         if ($this->isAccountPasswordBlocked($user)) {
-            $response->message = "too many bad passwords, account is blocked for " . Constant::LOCKOUT_MINUTES . " minutes";
+            $response->message = "too many bad passwords, account is blocked for ".Constant::LOCKOUT_MINUTES." minutes";
             return $response;
         }
 

App/Controllers/Ajax/Comment.php

Spacing +4 added lines, -4 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,8 +36,8 @@ 
 
     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;