Starbugstone / blogoc

App/Models/UserModel.php

Spacing +6 added lines, -6 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;
         }
 
@@ -240,7 +240,7 @@ 
     {
         if ($token_value) {
             $this->token = $token_value;
-        } else {
+        }else {
             $this->token = bin2hex(random_bytes(16));
         }
     }
@@ -301,9 +301,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);

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

App/Controllers/Login.php

Spacing +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
 
         // Create the Transport for mail sending
         $config = $this->siteConfig->getSiteConfig();
-        $this->transport = (new Swift_SmtpTransport($config["SMTP_server"], (int)$config["SMTP_port"]))
+        $this->transport = (new Swift_SmtpTransport($config["SMTP_server"], (int) $config["SMTP_port"]))
             ->setUsername($config["SMTP_user"])
             ->setPassword($config["SMTP_pass"])
         ;
@@ -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->userModel->setToken(); //generate a new token
             $rememberMeToken = $this->userModel->rememberMe($this->user->idusers);
-            if($rememberMeToken->success)
+            if ($rememberMeToken->success)
             {
                 //set cookie
                 $this->cookie->setCookie("rememberMe", $rememberMeToken->token, $rememberMeToken->expiry_timestamp);

App/Modules/SiteConfig.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,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;
@@ -60,11 +60,11 @@ 
         $session = $this->container->getSession();
 
         $userToken = $cookie->getCookie("rememberMe");
-        if($userToken)
+        if ($userToken)
         {
             //we have a rememberMe Hash, login
             $rememberedLogin = $userModel->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

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;