Starbugstone / blogoc

App/Controllers/Ajax/PostVerification.php

Braces +3 added lines, -1 removed lines

@@ -36,9 +36,11 @@
 
         $data = $postModel->isPostSlugUnique($postSlug);
 
-        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;

Core/Modules/AlertBox.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         //make sure we have the right type or throw an error
 
         if (!in_array($type, $this->allowedTypes)) {
-            throw new \Exception("Invalid toastr alert type " . $type);
+            throw new \Exception("Invalid toastr alert type ".$type);
         }
 
         $message = htmlspecialchars($message); //avoid any injection

App/Controllers/Ajax/User.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 use Core\JsonException;
 use Core\Traits\StringFunctions;
 
-class User  extends AjaxController{
+class User  extends AjaxController {
 
     use StringFunctions;
 
@@ -25,7 +25,7 @@ 
         //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");
         }

Core/Controller.php

Spacing +15 added lines, -15 removed lines

@@ -106,12 +106,12 @@ 
         $loadModuleObj = $this->getModuleNamespace($loadModule);
         //Modules must be children of the Module template
         if (!is_subclass_of($loadModuleObj, 'Core\Modules\Module')) {
-            throw new \ErrorException('Module ' . $loadModuleName . ' must be a sub class of module');
+            throw new \ErrorException('Module '.$loadModuleName.' must be a sub class of module');
         }
         $loadedModule = new $loadModuleObj($this->container);
         //we are not allowed to create public modules, they must be a placeholder ready
         if (!property_exists($this, $loadModuleName)) {
-            throw new \ErrorException('the protected or private variable of ' . $loadModuleName . ' is not present');
+            throw new \ErrorException('the protected or private variable of '.$loadModuleName.' is not present');
         }
         $this->$loadModuleName = $loadedModule;
     }
@@ -128,23 +128,23 @@ 
         $childClass = new \ReflectionClass(get_class($this));
         $childClassNamespace = $childClass->getNamespaceName();
         //check in classNameSpace
-        if (class_exists($childClassNamespace . '\\Modules\\' . $loadModule)) {
-            $this->addToDevHelper('module ' . $loadModule . ' loaded', $childClassNamespace . '\\' . $loadModule);
-            return $childClassNamespace . '\\' . $loadModule;
+        if (class_exists($childClassNamespace.'\\Modules\\'.$loadModule)) {
+            $this->addToDevHelper('module '.$loadModule.' loaded', $childClassNamespace.'\\'.$loadModule);
+            return $childClassNamespace.'\\'.$loadModule;
         }
         //check in app
-        if (class_exists('App\\Modules\\' . $loadModule)) {
-            $this->addToDevHelper('module ' . $loadModule . ' loaded', 'App\\Modules\\' . $loadModule);
-            return 'App\\Modules\\' . $loadModule;
+        if (class_exists('App\\Modules\\'.$loadModule)) {
+            $this->addToDevHelper('module '.$loadModule.' loaded', 'App\\Modules\\'.$loadModule);
+            return 'App\\Modules\\'.$loadModule;
         }
         //check in core, send error popup if overcharged
-        if (class_exists('Core\\Modules\\' . $loadModule)) {
-            $this->addToDevHelper('module ' . $loadModule . ' loaded', 'Core\\Modules\\' . $loadModule);
-            return 'Core\\Modules\\' . $loadModule;
+        if (class_exists('Core\\Modules\\'.$loadModule)) {
+            $this->addToDevHelper('module '.$loadModule.' loaded', 'Core\\Modules\\'.$loadModule);
+            return 'Core\\Modules\\'.$loadModule;
         }
 
         //if we are here then no module found
-        throw new \ErrorException('module ' . $loadModule . ' does not exist or not loaded');
+        throw new \ErrorException('module '.$loadModule.' does not exist or not loaded');
 
     }
 
@@ -169,7 +169,7 @@ 
     public function getView($template)
     {
         $twig = $this->container->getTemplate();
-        return $twig->render($template . '.twig', $this->data);
+        return $twig->render($template.'.twig', $this->data);
     }
 
     /**
@@ -195,7 +195,7 @@ 
         }
 
         $twig = $this->container->getTemplate();
-        $twig->display($template . '.twig', $this->data);
+        $twig->display($template.'.twig', $this->data);
     }
 
     /**
@@ -227,7 +227,7 @@ 
     protected function addToDevHelper($name, $var)
     {
         //only populate if in dev environment
-        if (Config::DEV_ENVIRONMENT){
+        if (Config::DEV_ENVIRONMENT) {
             $classMethods = [];
             $classMethods[$name] = $var;
             if (!isset($this->data['dev_info'])) {

App/Controllers/Ajax/postModification.php

Spacing +4 added lines, -4 removed lines

@@ -28,8 +28,8 @@ 
         if (!$this->container->getRequest()->isPost()) {
             throw new \Core\JsonException('Call is not post');
         }
-        $state = (bool)($this->request->getData("state") === 'true');
-        $postId = (int)$this->request->getData("postId");
+        $state = (bool) ($this->request->getData("state") === 'true');
+        $postId = (int) $this->request->getData("postId");
 
         $result = array();
         $result["success"] = $this->postModule->setPublished(!$state, $postId);
@@ -48,8 +48,8 @@ 
         if (!$this->container->getRequest()->isPost()) {
             throw new \Core\JsonException('Call is not post');
         }
-        $state = (bool)($this->request->getData("state") === 'true'); //TODO test this element
-        $postId = (int)$this->request->getData("postId");
+        $state = (bool) ($this->request->getData("state") === 'true'); //TODO test this element
+        $postId = (int) $this->request->getData("postId");
 
         $result = array();
         $result["success"] = $this->postModule->setOnFrontPage(!$state, $postId);

Core/Dependency/Session.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      * return the entire session superglobal.
      * @return mixed
      */
-    public function getAllSessionVars(){
+    public function getAllSessionVars() {
         return $_SESSION;
     }
 

App/Models/UserModel.php

Indentation +6 added lines, -6 removed lines

@@ -157,12 +157,12 @@
         return $this->getUserDetailsByEmail($email) !== false;
     }
 
-     /**
-     * register a new user
-     * @param \stdClass $userData
-     * @return int
-     * @throws \Exception
-     */
+        /**
+         * register a new user
+         * @param \stdClass $userData
+         * @return int
+         * @throws \Exception
+         */
     public function registerUser(\stdClass $userData): int
     {
 

Braces +3 added lines, -1 removed lines

@@ -200,9 +200,11 @@
 
         $user = $this->getUserDetailsByEmail($email);
 
-        if($user === false) //no user exists
+        if($user === false) {
+            //no user exists
         {
             $response->message = "email doesn't exist, register a new account?";
+        }
             return $response;
         }
 

Spacing +10 added lines, -10 removed lines

@@ -55,8 +55,8 @@ 
      */
     private function addToBadLoginTries($user):void
     {
-        $badLoginTries = $user->bad_login_tries +1;
-        $sql ="
+        $badLoginTries = $user->bad_login_tries + 1;
+        $sql = "
             UPDATE $this->userTbl
             SET
               bad_login_time = NOW(),
@@ -76,7 +76,7 @@ 
      */
     private function resetBadLogin($user):void
     {
-        $sql="
+        $sql = "
             UPDATE $this->userTbl
             SET
               bad_login_tries = 0
@@ -89,14 +89,14 @@ 
 
     private function isAccountPasswordBlocked($user)
     {
-        if($user->bad_login_tries < Constant::NUMBER_OF_BAD_PASSWORD_TRIES) {
+        if ($user->bad_login_tries < Constant::NUMBER_OF_BAD_PASSWORD_TRIES) {
             //not enough bad tries yet
             return false;
         }
 
         $blockTime = strtotime($user->bad_login_time);
         $currentTime = time();
-        if($currentTime-$blockTime > Constant::LOCKOUT_MINUTES*60)
+        if ($currentTime - $blockTime > Constant::LOCKOUT_MINUTES * 60)
         {
             //we have outlived the timeout, connection authorised
             return false;
@@ -134,7 +134,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 .= "
@@ -182,7 +182,7 @@ 
         $this->bind(':roles_idroles', 1);
         $this->execute();
 
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
     }
 
     /**
@@ -200,20 +200,20 @@ 
 
         $user = $this->getUserDetailsByEmail($email);
 
-        if($user === false) //no user exists
+        if ($user === false) //no user exists
         {
             $response->message = "email doesn't exist, register a new account?";
             return $response;
         }
 
         //check if the user has validated his email
-        if($user->locked_out)
+        if ($user->locked_out)
         {
             $response->message = "the email has not been verified, please check your inbox or click on 'reset your password'";
             return $response;
         }
 
-        if($this->isAccountPasswordBlocked($user))
+        if ($this->isAccountPasswordBlocked($user))
         {
             $response->message = "too many bad passwords, account is blocked for ".Constant::LOCKOUT_MINUTES." minutes";
             return $response;

Core/Constant.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     const POSTS_PER_PAGE = 4;
     const LIST_PER_PAGE = 10;
 
-    const EXCERPT_WORD_COUNT =50;
+    const EXCERPT_WORD_COUNT = 50;
 
     //login security
     const NUMBER_OF_BAD_PASSWORD_TRIES = 3;

App/Controllers/Login.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
 
         // Create the Transport for mail sending
         $config = $this->siteConfig->getSiteConfig();
-        $this->transport = (new Swift_SmtpTransport($config["SMTP_server"], (int)$config["SMTP_port"]))
+        $this->transport = (new Swift_SmtpTransport($config["SMTP_server"], (int) $config["SMTP_port"]))
             ->setUsername($config["SMTP_user"])
             ->setPassword($config["SMTP_pass"])
         ;
@@ -78,7 +78,7 @@ 
     private function populateUserFromId(int $userId)
     {
         $result = $this->userModel->getUserDetailsById($userId);
-        $this->populateUser((array)$result);
+        $this->populateUser((array) $result);
     }
 
     /**
@@ -99,7 +99,7 @@ 
      */
     public function index()
     {
-        if($this->session->isParamSet("user"))
+        if ($this->session->isParamSet("user"))
         {
             //we are already connected, redirect
             $this->response->redirect();
@@ -128,7 +128,7 @@ 
      */
     public function register()
     {
-        if($this->session->isParamSet("user"))
+        if ($this->session->isParamSet("user"))
         {
             //we are already connected, redirect
             $this->response->redirect();
@@ -187,7 +187,7 @@ 
             }
 
             $authUser = $this->userModel->authenticateUser($email, $password);
-            if(!$authUser->success)
+            if (!$authUser->success)
             {
                 $error = true;
                 $loginErrors->global = $authUser->message;
@@ -206,7 +206,7 @@ 
         //we are authenticated here
 
         //populate the user object with returned data
-        $this->populateUser((array)$authUser->user);
+        $this->populateUser((array) $authUser->user);
         $this->setUserSession();
 
         //if all is valid, redirect to user admin page