Starbugstone / blogoc

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

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 === "") //referer can return null, set default
+        if ($refererUrl === "") //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 === "") //referer can return null, set default
+        if($refererUrl === "") {
+            //referer can return null, set default
         {
             $refererUrl = "admin/comments/view-comments";
         }
+        }
         $baseUrl = $this->request->getBaseUrl();
         $redirectUrl = $this->removeFromBeginning($refererUrl, $baseUrl);
 

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/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;

App/Modules/Slug.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use Cocur\Slugify\Slugify;
 use Core\Modules\Module;
 
-class Slug extends Module{
+class Slug extends Module {
     public function isSlugValid(string $slug):bool
     {
         $slugify = new Slugify();

Core/Container.php

Spacing +5 added lines, -5 removed lines

@@ -50,10 +50,10 @@ 
         $twigOptions = [];
         if (!Config::DEV_ENVIRONMENT) {
             $twigOptions = [
-                'cache' => dirname(__DIR__) . '/Cache'
+                'cache' => dirname(__DIR__).'/Cache'
             ];
         }
-        $loader = new \Twig_Loader_Filesystem(dirname(__DIR__) . '/App/Views');
+        $loader = new \Twig_Loader_Filesystem(dirname(__DIR__).'/App/Views');
         $twig = new \Twig_Environment($loader, $twigOptions);
 
         return $twig;
@@ -68,14 +68,14 @@ 
         if ($this->dbh) {
             return $this->dbh;
         }
-        $dsn = "mysql:host=" . Config::DB_HOST . ";dbname=" . Config::DB_NAME . ";charset=utf8"; //Creating the Data Source name
+        $dsn = "mysql:host=".Config::DB_HOST.";dbname=".Config::DB_NAME.";charset=utf8"; //Creating the Data Source name
         $opt = [
             PDO::ATTR_PERSISTENT => true,
             PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
             PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ,
             PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true
         ];
-        $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt);;
+        $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt); ;
         return $this->dbh;
     }
 
@@ -121,7 +121,7 @@ 
      */
     public function getCookie(): Dependency\Cookie
     {
-        if(!$this->cookie){
+        if (!$this->cookie) {
             $this->cookie = new Cookie();
         }
         return $this->cookie;

App/Controllers/Home.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
         $this->config = $this->siteConfig->getSiteConfig();
         $this->userModel = new UserModel($this->container);
-        if($this->auth->isuser())
+        if ($this->auth->isuser())
         {
             $this->data["user"] = $this->userModel->getUserDetailsById($this->session->get("userId"));
         }

App/Controllers/Admin/Home.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
      */
     private function checkOriginalAdmin(): bool
     {
-        $userId = (int)$this->user->userId;
+        $userId = (int) $this->user->userId;
         //The admin selector should be disables and not sent so forcing default role
         $userLockedOut = $this->user->userLockedOut ?? 0;
         $userRoleSelector = $this->user->userRoleSelector ?? 2;
@@ -60,7 +60,7 @@ 
         }
 
         //forcing the default values
-        if($userId === 1){
+        if ($userId === 1) {
             $this->user->userRoleSelector = 2;
             $this->user->userLockedOut = 0;
         }
@@ -173,14 +173,14 @@ 
         $this->onlyUser();
         $this->onlyPost();
 
-        $this->user = (object)$this->request->getDataFull();
+        $this->user = (object) $this->request->getDataFull();
         $redirectUrl = "/admin";
 
         if ($this->user->userId !== $this->session->get("userId") || isset($this->user->userRoleSelector) || isset($this->user->locked_out)) {
             //an admin is trying to update a user or form tampered with
             $this->onlyAdmin();
-            $redirectUrl = "/admin/home/view-user/" . $this->user->userId;
-        } else {
+            $redirectUrl = "/admin/home/view-user/".$this->user->userId;
+        }else {
             //set the role to the original state for update
             $beforeUser = $this->userModel->getUserDetailsById($this->user->userId);
             $this->user->userRoleSelector = $beforeUser->roles_idroles;