Starbugstone / blogoc

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

@@ -171,7 +171,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); //we set to one, should probably get from database and config
         $this->execute();
 
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
     }
 
     /**
@@ -224,7 +224,7 @@ 
      */
     public function updateUser(\stdClass $user)
     {
-        $sql="
+        $sql = "
             UPDATE $this->userTbl
             SET
               name=:name,
@@ -274,7 +274,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/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/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();
         }
     }

Core/Constant.php

Spacing +2 added lines, -2 removed lines

@@ -23,13 +23,13 @@
     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;
     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

Core/Controller.php

Spacing +14 added lines, -14 removed lines

@@ -109,12 +109,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;
     }
@@ -131,23 +131,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');
 
     }
 
@@ -172,7 +172,7 @@ 
     public function getView($template)
     {
         $twig = $this->container->getTemplate();
-        return $twig->render($template . '.twig', $this->data);
+        return $twig->render($template.'.twig', $this->data);
     }
 
     /**
@@ -198,7 +198,7 @@ 
         }
 
         $twig = $this->container->getTemplate();
-        $twig->display($template . '.twig', $this->data);
+        $twig->display($template.'.twig', $this->data);
     }
 
     /**

App/Controllers/Password.php

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
     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");
         }
@@ -55,12 +55,12 @@ 
         $userId = $this->request->getData("userId");
 
         //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();
@@ -83,14 +83,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/Modules/SiteConfig.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,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;
@@ -68,11 +68,11 @@ 
         $session = $this->container->getSession();
 
         $userToken = $cookie->getCookie("rememberMe");
-        if($userToken && $this->isHexa($userToken))
+        if ($userToken && $this->isHexa($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