Starbugstone / blogoc

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/Controllers/Ajax/ImageUpload.php

Spacing +9 added lines, -9 removed lines

@@ -44,24 +44,24 @@ 
     private function getFilename(string $folder, string $file): string
     {
         //slugify the file name to avoid security errors or bugs with special characters.
-        $fileName = pathinfo($file, PATHINFO_FILENAME );
-        $fileExtension = pathinfo($file, PATHINFO_EXTENSION );
+        $fileName = pathinfo($file, PATHINFO_FILENAME);
+        $fileExtension = pathinfo($file, PATHINFO_EXTENSION);
         $slugify = new Slugify();
         $fileName = $slugify->slugify($fileName);
         //if the filename has only special chars, the slugify will be empty, create a unique ID
-        if($fileName ==="")
+        if ($fileName === "")
         {
             $fileName = uniqid();
         }
         $file = $fileName.".".$fileExtension;
-        $fileUrl = $folder . $file;
+        $fileUrl = $folder.$file;
         $docRoot = $this->request->getDocumentRoot();
-        $filePath = $docRoot . "/public/" . $fileUrl;
+        $filePath = $docRoot."/public/".$fileUrl;
         if (file_exists($filePath) !== 1) {
             $fileNum = 0;
             while (file_exists($filePath)) {
-                $fileUrl = $folder . $fileNum . "_" . $file;
-                $filePath = $docRoot . "/public/" . $fileUrl;
+                $fileUrl = $folder.$fileNum."_".$file;
+                $filePath = $docRoot."/public/".$fileUrl;
                 $fileNum += 1;
             }
         }
@@ -85,7 +85,7 @@ 
 
             // Respond to the successful upload with JSON.
             echo json_encode(array('location' => $filetowrite));
-        } else {
+        }else {
             // Notify editor that the upload failed
             echo json_encode(array('error' => 'Upload failed, file might be too big'));
 
@@ -119,7 +119,7 @@ 
 
             // Respond to the successful upload with JSON.
             echo json_encode(array('location' => $filetowrite));
-        } else {
+        }else {
             // Notify editor that the upload failed
             header("HTTP/1.1 500 Server Error");
         }

App/Models/UserModel.php

Braces +3 added lines, -1 removed lines

@@ -204,9 +204,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 +4 added lines, -4 removed lines

@@ -146,7 +146,7 @@ 
         $user = $this->fetch();
         $linkValidTime = strtotime($user->reset_password_hash_generation_datetime);
         $currentTime = time();
-        if($currentTime-$linkValidTime > Constant::PASSWORD_RESET_DURATION*60)
+        if ($currentTime - $linkValidTime > Constant::PASSWORD_RESET_DURATION * 60)
         {
             //token is no longer valid
             return false;
@@ -166,7 +166,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 .= "
@@ -214,7 +214,7 @@ 
         $this->bind(':roles_idroles', 1);
         $this->execute();
 
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
     }
 
     /**
@@ -245,7 +245,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;
         }
 

Core/Dependency/Cookie.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace Core\Dependency;
 
-class Cookie{
+class Cookie {
 
     /**
      * set a cookie
@@ -21,7 +21,7 @@ 
      */
     public function deleteCookie(string $name)
     {
-        setcookie($name, "", time()-3600); //expire the cookie
+        setcookie($name, "", time() - 3600); //expire the cookie
     }
 
     /**

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,13 +68,13 @@ 
         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
         ];
-        $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;
     }
 
@@ -120,7 +120,7 @@ 
      */
     public function getCookie(): Dependency\Cookie
     {
-        if(!$this->cookie){
+        if (!$this->cookie) {
             $this->cookie = new Cookie();
         }
         return $this->cookie;

App/Modules/SiteConfig.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
         $categories = $categoryModel->getCategories();
         foreach ($categories as $category) {
             $data += [
-                $category->category_name => '/category/posts/' . $category->categories_slug
+                $category->category_name => '/category/posts/'.$category->categories_slug
             ];
         }
         return $data;
@@ -66,11 +66,11 @@ 
         $session = $this->container->getSession();
 
         $userToken = $cookie->getCookie("rememberMe");
-        if($userToken)
+        if ($userToken)
         {
             //we have a rememberMe Hash, login
             $rememberedLogin = $rememberedLoginModel->findByToken($userToken);
-            if($rememberedLogin){
+            if ($rememberedLogin) {
                 //we have a hash, login
                 $user = $userModel->getUserDetailsById($rememberedLogin->users_idusers);
                 $session->regenerateSessionId(); //regenerate the ID to avoid session ghosting

App/Models/Remembered_loginModel.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     {
         if ($token_value) {
             $this->token = $token_value;
-        } else {
+        }else {
             $this->token = $this->generateToken();
         }
     }

App/Controllers/Login.php

Spacing +7 added lines, -7 removed lines

@@ -79,7 +79,7 @@ 
     private function populateUserFromId(int $userId)
     {
         $result = $this->userModel->getUserDetailsById($userId);
-        $this->populateUser((array)$result);
+        $this->populateUser((array) $result);
     }
 
     /**
@@ -100,7 +100,7 @@ 
      */
     public function index()
     {
-        if($this->session->isParamSet("user"))
+        if ($this->session->isParamSet("user"))
         {
             //we are already connected, redirect
             $this->response->redirect();
@@ -129,7 +129,7 @@ 
      */
     public function register()
     {
-        if($this->session->isParamSet("user"))
+        if ($this->session->isParamSet("user"))
         {
             //we are already connected, redirect
             $this->response->redirect();
@@ -189,7 +189,7 @@ 
             }
 
             $authUser = $this->userModel->authenticateUser($email, $password);
-            if(!$authUser->success)
+            if (!$authUser->success)
             {
                 $error = true;
                 $loginErrors->global = $authUser->message;
@@ -208,14 +208,14 @@ 
         //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)
+        if ($rememberMe)
         {
             $this->rememberedLoginModel->setToken(); //generate a new token
             $rememberMeToken = $this->rememberedLoginModel->rememberMe($this->user->idusers);
-            if($rememberMeToken->success)
+            if ($rememberMeToken->success)
             {
                 //set cookie
                 $this->cookie->setCookie("rememberMe", $rememberMeToken->token, $rememberMeToken->expiry_timestamp);