Starbugstone / blogoc

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

App/Controllers/Ajax/Category.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
             $send[$item->name] = $item->value;
         }
 
-        if(!$this->slug->isSlugValid($send["categories_slug"]))
+        if (!$this->slug->isSlugValid($send["categories_slug"]))
         {
             $result["success"] = false;
             $result["errorMessage"] = "Invalid Slug";
@@ -73,7 +73,7 @@ 
         foreach ($categoryUpdate as $item) {
             $send[$item->name] = $item->value;
         }
-        if(!$this->slug->isSlugValid($send["categories_slug"]))
+        if (!$this->slug->isSlugValid($send["categories_slug"]))
         {
             $result["success"] = false;
             $result["errorMessage"] = "Invalid Slug";
@@ -81,7 +81,7 @@ 
             die();
         }
 
-        if(!$this->isInt($send["idcategories"])){
+        if (!$this->isInt($send["idcategories"])) {
             $result["success"] = false;
             $result["errorMessage"] = "Invalid ID";
             echo json_encode($result);
@@ -117,7 +117,7 @@ 
             $send[$item->name] = $item->value;
         }
 
-        if(!$this->isInt($send["idcategories"])){
+        if (!$this->isInt($send["idcategories"])) {
             $result["success"] = false;
             $result["errorMessage"] = "Invalid ID";
             echo json_encode($result);

App/Modules/Slug.php

Spacing +2 added lines, -2 removed lines

@@ -5,12 +5,12 @@
 use Cocur\Slugify\Slugify;
 use Core\Modules\Module;
 
-class Slug extends Module{
+class Slug extends Module {
     public function isSlugValid(string $slug):bool
     {
         $slugify = new Slugify();
         $validSlug = $slugify->slugify($slug);
-        if($slug !== $validSlug)
+        if ($slug !== $validSlug)
         {
             return false;
         }

App/Controllers/Ajax/postModification.php

Spacing +4 added lines, -4 removed lines

@@ -26,8 +26,8 @@ 
     {
         $this->onlyAdmin();
         $this->onlyPost();
-        $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);
@@ -44,8 +44,8 @@ 
     {
         $this->onlyAdmin();
         $this->onlyPost();
-        $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->setOnFrontPage(!$state, $postId);

Core/Traits/StringFunctions.php

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
 
         //Searching for the page break tag
         $breakTagPosition = strpos($text, "<!-- EndOfExcerptBlogOc -->");
-        if($breakTagPosition > 0){
+        if ($breakTagPosition > 0) {
             return $this->completeDom(substr($text, 0, $breakTagPosition));
         }
 
@@ -91,7 +91,7 @@ 
         $string = preg_split('/(<img[^>]+\>)|(<p[^>]+\>)|(<span[^>]+\>)|\s/', $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
         //The preg split can return false, probably will never happen but just in case.
-        if(!$string)
+        if (!$string)
         {
             throw new \Error("excerpt generation failed");
         }
@@ -104,7 +104,7 @@ 
             $trimed .= $string[$wordCounter];
             if ($wordCounter < $count - 1) {
                 $trimed .= " ";
-            } else {
+            }else {
                 $trimed .= "[...]";
             }
         }
@@ -155,7 +155,7 @@ 
         $result = true;
         foreach ($strings as $string)
         {
-            if(!$this->isAlphaNum($string))
+            if (!$this->isAlphaNum($string))
             {
                 $result = false;
             }
@@ -170,7 +170,7 @@ 
      */
     public function isHexa(string $string):bool
     {
-        return preg_match("/[\da-f]/",$string);
+        return preg_match("/[\da-f]/", $string);
     }
 
     /**

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):void
     {
-        setcookie($name, "", time()-3600); //expire the cookie
+        setcookie($name, "", time() - 3600); //expire the cookie
     }
 
     /**

App/Controllers/Login.php

Spacing +10 added lines, -10 removed lines

@@ -76,7 +76,7 @@ 
     private function populateUserFromId(int $userId)
     {
         $result = $this->userModel->getUserDetailsById($userId);
-        $this->populateUser((array)$result);
+        $this->populateUser((array) $result);
     }
 
     /**
@@ -97,7 +97,7 @@ 
      */
     public function index()
     {
-        if($this->session->isParamSet("user"))
+        if ($this->session->isParamSet("user"))
         {
             //we are already connected, redirect
             $this->response->redirect();
@@ -126,7 +126,7 @@ 
      */
     public function register()
     {
-        if($this->session->isParamSet("user"))
+        if ($this->session->isParamSet("user"))
         {
             //we are already connected, redirect
             $this->response->redirect();
@@ -183,7 +183,7 @@ 
             }
 
             $authUser = $this->userModel->authenticateUser($email, $password);
-            if(!$authUser->success)
+            if (!$authUser->success)
             {
                 $error = true;
                 $loginErrors->global = $authUser->message;
@@ -202,14 +202,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->rememberedLoginModel->setToken(); //generate a new token
             $rememberMeToken = $this->rememberedLoginModel->rememberMe($this->user->idusers);
-            if($rememberMeToken->success)
+            if ($rememberMeToken->success)
             {
                 //set cookie
                 $this->cookie->setCookie("rememberMe", $rememberMeToken->token, $rememberMeToken->expiry_timestamp);
@@ -292,10 +292,10 @@ 
         $baseUrl = $this->request->getBaseUrl();
         $redirectUrl = $this->removeFromBeginning($refererUrl, $baseUrl);
 
-        if($redirectUrl === "login/register")
+        if ($redirectUrl === "login/register")
         {
             //if we were already on the register page, go to home page
-            $redirectUrl="";
+            $redirectUrl = "";
         }
 
         $this->alertBox->setAlert('Account created, please check your mailbox to activate account');
@@ -308,7 +308,7 @@ 
     public function disconnect()
     {
         $userId = $this->session->get("userId");
-        if($userId)
+        if ($userId)
         {
             $userHash = $this->rememberedLoginModel->getTokenHashFromId($userId);
             $this->rememberedLoginModel->deleteToken($userHash);