Starbugstone / blogoc

Core/Model.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
             $table = $reflect->getShortName(); //this is to only get the model name, otherwise we get the full namespace
             //since our models all end with Model, we should remove it.
             $table = $this->removeFromEnd($table, 'Model');
-            $table = $table . 's'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s
+            $table = $table.'s'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s
             $table = strtolower($table); //the database names are in lowercase
         }
 
@@ -162,7 +162,7 @@ 
         }
 
         //if we are here, then table doesn't exist, check for view
-        $view = 'v_' . $table;
+        $view = 'v_'.$table;
         $stmt->bindValue(':table', $view, PDO::PARAM_STR);
         $stmt->execute();
         $exists = $stmt->rowCount() > 0; //will return 1 if table exists or 0 if non existant
@@ -186,7 +186,7 @@ 
     protected function getTablePrefix($table)
     {
         if (Config::TABLE_PREFIX != '') {
-            $table = Config::TABLE_PREFIX . '_' . $table;
+            $table = Config::TABLE_PREFIX.'_'.$table;
         }
         return $table;
     }
@@ -255,7 +255,7 @@ 
     protected function getRowById($rowId, $table = null)
     {
         $tableName = $this->getTable($table);
-        $idName = 'id' . $tableName;
+        $idName = 'id'.$tableName;
         $sql = "SELECT * FROM $tableName WHERE $idName = :rowId";
         $this->query($sql);
         $this->bind(':rowId', $rowId);

App/Controllers/Admin/Post.php

Braces +3 added lines, -1 removed lines

@@ -211,10 +211,12 @@
             $this->alertBox->setAlert("empty slug not allowed", "error");
         }
 
-        if ($postSlug != $originalPostSlug) //if the slug has been updated
+        if ($postSlug != $originalPostSlug) {
+            //if the slug has been updated
         {
             if (!$this->postModel->isPostSlugUnique($postSlug)) {
                 $error = true;
+        }
                 $originalPostSlug = $this->postModel->getPostSlugFromId($postId);
                 $this->alertBox->setAlert("Slug not unique", "error");
             }

Spacing +9 added lines, -9 removed lines

@@ -117,7 +117,7 @@ 
         $this->onlyPost();
 
         $posts = $this->request->getDataFull();
-        $userSessionId = (int)$this->session->get("userId");
+        $userSessionId = (int) $this->session->get("userId");
 
 
         $title = trim($posts["postTitle"]);
@@ -163,10 +163,10 @@ 
 
         //checking result and redirecting
         if ($postId != null) {
-            $this->alertBox->setAlert("Post " . $title . " Created");
-            $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug);
+            $this->alertBox->setAlert("Post ".$title." Created");
+            $this->container->getResponse()->redirect("admin/post/modify/".$postSlug);
         }
-        $this->alertBox->setAlert("Error creating " . $title, "error");
+        $this->alertBox->setAlert("Error creating ".$title, "error");
         $this->container->getResponse()->redirect("admin/post/new");
 
     }
@@ -231,11 +231,11 @@ 
 
         //checking result and redirecting
         if ($postUpdate) {
-            $this->alertBox->setAlert("Post " . $title . " Updated");
-            $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug);
+            $this->alertBox->setAlert("Post ".$title." Updated");
+            $this->container->getResponse()->redirect("admin/post/modify/".$postSlug);
         }
-        $this->alertBox->setAlert("Error updating " . $title, "error");
-        $this->container->getResponse()->redirect("admin/post/modify/" . $originalPostSlug);
+        $this->alertBox->setAlert("Error updating ".$title, "error");
+        $this->container->getResponse()->redirect("admin/post/modify/".$originalPostSlug);
     }
 
 
@@ -252,7 +252,7 @@ 
         $removedPost = $this->postModel->deletePost($postId);
 
         if ($removedPost) {
-            $this->alertBox->setAlert("Post " . $postTitle . " deleted");
+            $this->alertBox->setAlert("Post ".$postTitle." deleted");
         }
 
         $this->response->redirect("admin/post/list/");

App/Controllers/Admin/Category.php

Spacing +5 added lines, -5 removed lines

@@ -103,10 +103,10 @@ 
 
         //checking result and redirecting
         if ($categoryUpdate) {
-            $this->alertBox->setAlert("Category " . $categoryName . " updated");
+            $this->alertBox->setAlert("Category ".$categoryName." updated");
             $this->container->getResponse()->redirect("/admin/category/list/");
         }
-        $this->alertBox->setAlert("Error updating " . $categoryName, "error");
+        $this->alertBox->setAlert("Error updating ".$categoryName, "error");
         $this->container->getResponse()->redirect("/admin/category/list/");
     }
 
@@ -123,7 +123,7 @@ 
         $removedCategory = $this->categoryModel->delete($categoryId);
 
         if ($removedCategory) {
-            $this->alertBox->setAlert("Category " . $categoryName . " deleted");
+            $this->alertBox->setAlert("Category ".$categoryName." deleted");
         }
 
         $this->response->redirect("/admin/category/list/");
@@ -168,10 +168,10 @@ 
 
         //checking result and redirecting
         if ($categoryNew) {
-            $this->alertBox->setAlert("Category " . $categoryName . " created");
+            $this->alertBox->setAlert("Category ".$categoryName." created");
             $this->container->getResponse()->redirect("/admin/category/list/");
         }
-        $this->alertBox->setAlert("Error creating " . $categoryName, "error");
+        $this->alertBox->setAlert("Error creating ".$categoryName, "error");
         $this->container->getResponse()->redirect("/admin/category/list/");
     }
 }
\ No newline at end of file

App/Controllers/Admin/Tag.php

Spacing +5 added lines, -5 removed lines

@@ -89,10 +89,10 @@ 
 
         //checking result and redirecting
         if ($tagUpdate) {
-            $this->alertBox->setAlert("Tag " . $tagName . " updated");
+            $this->alertBox->setAlert("Tag ".$tagName." updated");
             $this->response->redirect("/admin/tag/list/");
         }
-        $this->alertBox->setAlert("Error updating " . $tagName, "error");
+        $this->alertBox->setAlert("Error updating ".$tagName, "error");
         $this->response->redirect("/admin/tag/list/");
     }
 
@@ -109,7 +109,7 @@ 
         $removedTag = $this->tagModel->delete($tagId);
 
         if ($removedTag) {
-            $this->alertBox->setAlert("Tag " . $tagName . " deleted");
+            $this->alertBox->setAlert("Tag ".$tagName." deleted");
         }
 
         $this->response->redirect("/admin/tag/list/");
@@ -145,10 +145,10 @@ 
 
         //checking result and redirecting
         if ($tagNew) {
-            $this->alertBox->setAlert("Tag " . $tagName . " created");
+            $this->alertBox->setAlert("Tag ".$tagName." created");
             $this->response->redirect("/admin/tag/list/");
         }
-        $this->alertBox->setAlert("Error creating " . $tagName, "error");
+        $this->alertBox->setAlert("Error creating ".$tagName, "error");
         $this->response->redirect("/admin/tag/list/");
     }
 }
\ No newline at end of file

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

@@ -192,7 +192,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 .= "
@@ -235,7 +235,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();
     }
 
     /**
@@ -245,7 +245,7 @@ 
      */
     public function updateUser(\stdClass $user):void
     {
-        $sql="
+        $sql = "
             UPDATE $this->userTbl
             SET
               name=:name,
@@ -296,7 +296,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;
         }
 

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/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);
     }
 
     /**