Starbugstone / blogoc

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

App/Controllers/Admin/Home.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
      */
     private function checkOriginalAdmin(): bool
     {
-        $userId = (int)$this->user->userId;
+        $userId = (int) $this->user->userId;
         //The admin selector should be disables and not sent so forcing default role
         $userLockedOut = $this->user->userLockedOut ?? 0;
         $userRoleSelector = $this->user->userRoleSelector ?? 2;
@@ -60,7 +60,7 @@ 
         }
 
         //forcing the default values
-        if($userId === 1){
+        if ($userId === 1) {
             $this->user->userRoleSelector = 2;
             $this->user->userLockedOut = 0;
         }
@@ -173,14 +173,14 @@ 
         $this->onlyUser();
         $this->onlyPost();
 
-        $this->user = (object)$this->request->getDataFull();
+        $this->user = (object) $this->request->getDataFull();
         $redirectUrl = "/admin";
 
         if ($this->user->userId !== $this->session->get("userId") || isset($this->user->userRoleSelector) || isset($this->user->locked_out)) {
             //an admin is trying to update a user or form tampered with
             $this->onlyAdmin();
-            $redirectUrl = "/admin/home/view-user/" . $this->user->userId;
-        } else {
+            $redirectUrl = "/admin/home/view-user/".$this->user->userId;
+        }else {
             //set the role to the original state for update
             $beforeUser = $this->userModel->getUserDetailsById($this->user->userId);
             $this->user->userRoleSelector = $beforeUser->roles_idroles;

App/Controllers/Home.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $this->config = $this->siteConfig->getSiteConfig();
         $this->userModel = new UserModel($this->container);
         $this->postModel = new PostModel($this->container);
-        if($this->auth->isuser())
+        if ($this->auth->isuser())
         {
             $this->data["user"] = $this->userModel->getUserDetailsById($this->session->get("userId"));
         }

App/Controllers/Ajax/Config.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
             if (!$this->configModel->updateConfig($update->name, $update->value)) {
                 $result['success'] = false;
                 $result['errorId'][] = $update->name;
-            } else {
+            }else {
                 $result['successId'][] = $update->name;
             }
         }

App/Modules/SendMail.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
         // Create the Transport for mail sending
         //$config = $this->siteConfig->getSiteConfig();
         $this->transport = (new Swift_SmtpTransport($this->siteConfig["SMTP_server"],
-            (int)$this->siteConfig["SMTP_port"]))
+            (int) $this->siteConfig["SMTP_port"]))
             ->setUsername($this->siteConfig["SMTP_user"])
             ->setPassword($this->siteConfig["SMTP_pass"]);
 
@@ -68,11 +68,11 @@ 
     public function sendResetPasswordMail(string $to, string $token, int $userId)
     {
         $url = $this->container->getRequest()->getBaseUrl();
-        $url .= "password/reset/get?token=" . $token;
-        $url .= "&userId=" . $userId;
+        $url .= "password/reset/get?token=".$token;
+        $url .= "&userId=".$userId;
 
-        $message = "<h1>Message from <a href='" . $this->container->getRequest()->getBaseUrl() . "'>" . $this->siteConfig["site_name"] . "</a></h1>";
-        $message .= "<p>You have asked to reset your password, please click <a href=\"" . $url . "\">Here</a> to define a new password</p>";
+        $message = "<h1>Message from <a href='".$this->container->getRequest()->getBaseUrl()."'>".$this->siteConfig["site_name"]."</a></h1>";
+        $message .= "<p>You have asked to reset your password, please click <a href=\"".$url."\">Here</a> to define a new password</p>";
 
         $this->send($to, "Define New Password", $message);
     }
@@ -86,13 +86,13 @@ 
     public function sendNewPasswordMail(string $to, string $token, int $userId)
     {
         $url = $this->container->getRequest()->getBaseUrl();
-        $url .= "password/reset/get?token=" . $token;
-        $url .= "&userId=" . $userId;
-        $message = "<h1>Message from <a href='" . $this->container->getRequest()->getBaseUrl() . "'>" . $this->siteConfig["site_name"] . "</a></h1>";
+        $url .= "password/reset/get?token=".$token;
+        $url .= "&userId=".$userId;
+        $message = "<h1>Message from <a href='".$this->container->getRequest()->getBaseUrl()."'>".$this->siteConfig["site_name"]."</a></h1>";
         $message .= "<h2>Welcome to the site</h2>";
-        $message .= "<p>You have sucsessfuly created an account, now all you need to do is <a href=\"" . $url . "\">Create your new password</a></p>";
+        $message .= "<p>You have sucsessfuly created an account, now all you need to do is <a href=\"".$url."\">Create your new password</a></p>";
         $message .= "<p>Have fun</p>";
 
-        $this->send($to, "Define Password at " . $this->siteConfig["site_name"], $message);
+        $this->send($to, "Define Password at ".$this->siteConfig["site_name"], $message);
     }
 }
\ No newline at end of file

App/Modules/SiteConfig.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
         $categories = $this->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;
@@ -76,11 +76,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 = $this->rememberedLoginModel->findByToken($userToken);
-            if($rememberedLogin){
+            if ($rememberedLogin) {
                 //we have a hash, login
                 $user = $this->userModel->getUserDetailsById($rememberedLogin->users_idusers);
                 $session->regenerateSessionId(); //regenerate the ID to avoid session ghosting

App/Models/CommentModel.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 use HTMLPurifier;
 use HTMLPurifier_Config;
 
-class CommentModel extends Model{
+class CommentModel extends Model {
 
     private $commentTbl;
     private $userTbl;
@@ -166,10 +166,10 @@ 
      * @return int
      * @throws \Exception
      */
-    public function addComment(int $postId, int $userId, string $comment, bool $admin=false):int
+    public function addComment(int $postId, int $userId, string $comment, bool $admin = false):int
     {
         $comment = $this->purifyHtml($comment);
-        $sql="
+        $sql = "
             INSERT INTO $this->commentTbl (users_idusers, posts_idposts, comment, approved, comment_date)
             VALUES (:userId, :postId, :comment, :approved, NOW();)
         ";
@@ -180,7 +180,7 @@ 
         $this->bind(':approved', $admin);
 
         $this->execute();
-        return (int)$this->dbh->lastInsertId();
+        return (int) $this->dbh->lastInsertId();
     }
 
     /**
@@ -212,7 +212,7 @@ 
     {
         $comment = $this->purifyHtml($comment);
 
-        $sql="
+        $sql = "
             UPDATE $this->commentTbl 
             SET
               comment = :comment,

Core/Model.php

Spacing +4 added lines, -4 removed lines

@@ -159,7 +159,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
         }
 
@@ -182,7 +182,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
@@ -206,7 +206,7 @@ 
     protected function getTablePrefix($table)
     {
         if (Config::TABLE_PREFIX != '') {
-            $table = Config::TABLE_PREFIX . '_' . $table;
+            $table = Config::TABLE_PREFIX.'_'.$table;
         }
         return $table;
     }
@@ -275,7 +275,7 @@ 
     protected function getRowById($rowId, $table = null)
     {
         $tableName = $this->getTable($table);
-        $idName = 'id' . str_replace(Config::TABLE_PREFIX."_","",$tableName);
+        $idName = 'id'.str_replace(Config::TABLE_PREFIX."_", "", $tableName);
         $sql = "SELECT * FROM $tableName WHERE $idName = :rowId";
         $this->query($sql);
         $this->bind(':rowId', $rowId);