Starbugstone / blogoc

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

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/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 +3 added lines, -3 removed lines

@@ -138,7 +138,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 .= "
@@ -186,7 +186,7 @@ 
         $this->bind(':roles_idroles', 1);
         $this->execute();
 
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
     }
 
     /**
@@ -217,7 +217,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/Models/Remembered_loginsModel.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 use Core\Container;
 use Core\Model;
 
-class Remembered_loginsModel extends Model{
+class Remembered_loginsModel extends Model {
 
     private $token;
     private $rememberedLoginTbl;
@@ -25,7 +25,7 @@ 
     {
         if ($token_value) {
             $this->token = $token_value;
-        } else {
+        }else {
             $this->token = bin2hex(random_bytes(16));
         }
     }
@@ -86,9 +86,9 @@ 
         $this->execute();
         $result = $this->fetch();
 
-        if($result)
+        if ($result)
         {
-            if(strtotime($result->expires_at) < time())
+            if (strtotime($result->expires_at) < time())
             {
                 //token has expired
                 $this->deleteToken($hashedToken);
@@ -148,7 +148,7 @@ 
      */
     public function cleanUpTokens()
     {
-        $sql="
+        $sql = "
             DELETE FROM $this->rememberedLoginTbl
             WHERE expires_at < :time
         ";