@@ -23,13 +23,13 @@ |
||
| 23 | 23 | const POSTS_PER_PAGE = 4; |
| 24 | 24 | const LIST_PER_PAGE = 10; |
| 25 | 25 | |
| 26 | - const EXCERPT_WORD_COUNT =50; |
|
| 26 | + const EXCERPT_WORD_COUNT = 50; |
|
| 27 | 27 | |
| 28 | 28 | //login security |
| 29 | 29 | const NUMBER_OF_BAD_PASSWORD_TRIES = 3; |
| 30 | 30 | const LOCKOUT_MINUTES = 5; |
| 31 | 31 | |
| 32 | - const PASSWORD_RESET_DURATION = 240;//number of minutes the reset password link is valid |
|
| 32 | + const PASSWORD_RESET_DURATION = 240; //number of minutes the reset password link is valid |
|
| 33 | 33 | |
| 34 | 34 | const HASH_KEY = "1337blogOcPass159758348ShaQpiss"; |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -109,12 +109,12 @@ discard block |
||
| 109 | 109 | $loadModuleObj = $this->getModuleNamespace($loadModule); |
| 110 | 110 | //Modules must be children of the Module template |
| 111 | 111 | if (!is_subclass_of($loadModuleObj, 'Core\Modules\Module')) { |
| 112 | - throw new \ErrorException('Module ' . $loadModuleName . ' must be a sub class of module'); |
|
| 112 | + throw new \ErrorException('Module '.$loadModuleName.' must be a sub class of module'); |
|
| 113 | 113 | } |
| 114 | 114 | $loadedModule = new $loadModuleObj($this->container); |
| 115 | 115 | //we are not allowed to create public modules, they must be a placeholder ready |
| 116 | 116 | if (!property_exists($this, $loadModuleName)) { |
| 117 | - throw new \ErrorException('the protected or private variable of ' . $loadModuleName . ' is not present'); |
|
| 117 | + throw new \ErrorException('the protected or private variable of '.$loadModuleName.' is not present'); |
|
| 118 | 118 | } |
| 119 | 119 | $this->$loadModuleName = $loadedModule; |
| 120 | 120 | } |
@@ -131,23 +131,23 @@ discard block |
||
| 131 | 131 | $childClass = new \ReflectionClass(get_class($this)); |
| 132 | 132 | $childClassNamespace = $childClass->getNamespaceName(); |
| 133 | 133 | //check in classNameSpace |
| 134 | - if (class_exists($childClassNamespace . '\\Modules\\' . $loadModule)) { |
|
| 135 | - $this->addToDevHelper('module ' . $loadModule . ' loaded', $childClassNamespace . '\\' . $loadModule); |
|
| 136 | - return $childClassNamespace . '\\' . $loadModule; |
|
| 134 | + if (class_exists($childClassNamespace.'\\Modules\\'.$loadModule)) { |
|
| 135 | + $this->addToDevHelper('module '.$loadModule.' loaded', $childClassNamespace.'\\'.$loadModule); |
|
| 136 | + return $childClassNamespace.'\\'.$loadModule; |
|
| 137 | 137 | } |
| 138 | 138 | //check in app |
| 139 | - if (class_exists('App\\Modules\\' . $loadModule)) { |
|
| 140 | - $this->addToDevHelper('module ' . $loadModule . ' loaded', 'App\\Modules\\' . $loadModule); |
|
| 141 | - return 'App\\Modules\\' . $loadModule; |
|
| 139 | + if (class_exists('App\\Modules\\'.$loadModule)) { |
|
| 140 | + $this->addToDevHelper('module '.$loadModule.' loaded', 'App\\Modules\\'.$loadModule); |
|
| 141 | + return 'App\\Modules\\'.$loadModule; |
|
| 142 | 142 | } |
| 143 | 143 | //check in core, send error popup if overcharged |
| 144 | - if (class_exists('Core\\Modules\\' . $loadModule)) { |
|
| 145 | - $this->addToDevHelper('module ' . $loadModule . ' loaded', 'Core\\Modules\\' . $loadModule); |
|
| 146 | - return 'Core\\Modules\\' . $loadModule; |
|
| 144 | + if (class_exists('Core\\Modules\\'.$loadModule)) { |
|
| 145 | + $this->addToDevHelper('module '.$loadModule.' loaded', 'Core\\Modules\\'.$loadModule); |
|
| 146 | + return 'Core\\Modules\\'.$loadModule; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | //if we are here then no module found |
| 150 | - throw new \ErrorException('module ' . $loadModule . ' does not exist or not loaded'); |
|
| 150 | + throw new \ErrorException('module '.$loadModule.' does not exist or not loaded'); |
|
| 151 | 151 | |
| 152 | 152 | } |
| 153 | 153 | |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | public function getView($template) |
| 173 | 173 | { |
| 174 | 174 | $twig = $this->container->getTemplate(); |
| 175 | - return $twig->render($template . '.twig', $this->data); |
|
| 175 | + return $twig->render($template.'.twig', $this->data); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | /** |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $twig = $this->container->getTemplate(); |
| 201 | - $twig->display($template . '.twig', $this->data); |
|
| 201 | + $twig->display($template.'.twig', $this->data); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | /** |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | public function reset($get) |
| 46 | 46 | { |
| 47 | 47 | //only get messages here |
| 48 | - if(!$this->startsWith(strtolower($get),"get")) |
|
| 48 | + if (!$this->startsWith(strtolower($get), "get")) |
|
| 49 | 49 | { |
| 50 | 50 | throw new \Exception("invalid call"); |
| 51 | 51 | } |
@@ -55,12 +55,12 @@ discard block |
||
| 55 | 55 | $userId = $this->request->getData("userId"); |
| 56 | 56 | |
| 57 | 57 | //verify if token is valid |
| 58 | - if(!$this->isHexa($token)|| !$this->isInt($userId)) |
|
| 58 | + if (!$this->isHexa($token) || !$this->isInt($userId)) |
|
| 59 | 59 | { |
| 60 | 60 | $this->alertBox->setAlert('Badly formatted Token', 'error'); |
| 61 | 61 | $this->response->redirect(); |
| 62 | 62 | } |
| 63 | - if(!$this->userModel->getUserDetailsByToken($token, $userId)) |
|
| 63 | + if (!$this->userModel->getUserDetailsByToken($token, $userId)) |
|
| 64 | 64 | { |
| 65 | 65 | $this->alertBox->setAlert('Invalid reset token, please request a new password', 'error'); |
| 66 | 66 | $this->response->redirect(); |
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | $token = $request["token"]; |
| 84 | 84 | $userId = $request["userId"]; |
| 85 | 85 | |
| 86 | - if(!$this->isHexa($token) || !$this->isInt($userId) ) |
|
| 86 | + if (!$this->isHexa($token) || !$this->isInt($userId)) |
|
| 87 | 87 | { |
| 88 | 88 | throw new \Exception("Bad Token or ID request"); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | $error = false; |
| 92 | 92 | $registerErrors = new \stdClass(); |
| 93 | - if($password !== $confirm) |
|
| 93 | + if ($password !== $confirm) |
|
| 94 | 94 | { |
| 95 | 95 | $error = true; |
| 96 | 96 | $registerErrors->forgotPassword = "password and confirmation do not match"; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $categories = $categoryModel->getCategories(); |
| 51 | 51 | foreach ($categories as $category) { |
| 52 | 52 | $data += [ |
| 53 | - $category->category_name => '/category/posts/' . $category->categories_slug |
|
| 53 | + $category->category_name => '/category/posts/'.$category->categories_slug |
|
| 54 | 54 | ]; |
| 55 | 55 | } |
| 56 | 56 | return $data; |
@@ -68,11 +68,11 @@ discard block |
||
| 68 | 68 | $session = $this->container->getSession(); |
| 69 | 69 | |
| 70 | 70 | $userToken = $cookie->getCookie("rememberMe"); |
| 71 | - if($userToken && $this->isHexa($userToken)) |
|
| 71 | + if ($userToken && $this->isHexa($userToken)) |
|
| 72 | 72 | { |
| 73 | 73 | //we have a rememberMe Hash, login |
| 74 | 74 | $rememberedLogin = $rememberedLoginModel->findByToken($userToken); |
| 75 | - if($rememberedLogin){ |
|
| 75 | + if ($rememberedLogin) { |
|
| 76 | 76 | //we have a hash, login |
| 77 | 77 | $user = $userModel->getUserDetailsById($rememberedLogin->users_idusers); |
| 78 | 78 | $session->regenerateSessionId(); //regenerate the ID to avoid session ghosting |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $send[$item->name] = $item->value; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - if(!$this->slug->isSlugValid($send["categories_slug"])) |
|
| 43 | + if (!$this->slug->isSlugValid($send["categories_slug"])) |
|
| 44 | 44 | { |
| 45 | 45 | $result["success"] = false; |
| 46 | 46 | $result["errorMessage"] = "Invalid Slug"; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | foreach ($categoryUpdate as $item) { |
| 74 | 74 | $send[$item->name] = $item->value; |
| 75 | 75 | } |
| 76 | - if(!$this->slug->isSlugValid($send["categories_slug"])) |
|
| 76 | + if (!$this->slug->isSlugValid($send["categories_slug"])) |
|
| 77 | 77 | { |
| 78 | 78 | $result["success"] = false; |
| 79 | 79 | $result["errorMessage"] = "Invalid Slug"; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | die(); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - if(!$this->isInt($send["idcategories"])){ |
|
| 84 | + if (!$this->isInt($send["idcategories"])) { |
|
| 85 | 85 | $result["success"] = false; |
| 86 | 86 | $result["errorMessage"] = "Invalid ID"; |
| 87 | 87 | echo json_encode($result); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $send[$item->name] = $item->value; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - if(!$this->isInt($send["idcategories"])){ |
|
| 120 | + if (!$this->isInt($send["idcategories"])) { |
|
| 121 | 121 | $result["success"] = false; |
| 122 | 122 | $result["errorMessage"] = "Invalid ID"; |
| 123 | 123 | echo json_encode($result); |
@@ -5,12 +5,12 @@ |
||
| 5 | 5 | use Cocur\Slugify\Slugify; |
| 6 | 6 | use Core\Modules\Module; |
| 7 | 7 | |
| 8 | -class Slug extends Module{ |
|
| 8 | +class Slug extends Module { |
|
| 9 | 9 | public function isSlugValid(string $slug):bool |
| 10 | 10 | { |
| 11 | 11 | $slugify = new Slugify(); |
| 12 | 12 | $validSlug = $slugify->slugify($slug); |
| 13 | - if($slug !== $validSlug) |
|
| 13 | + if ($slug !== $validSlug) |
|
| 14 | 14 | { |
| 15 | 15 | return false; |
| 16 | 16 | } |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | { |
| 27 | 27 | $this->onlyAdmin(); |
| 28 | 28 | $this->onlyPost(); |
| 29 | - $state = (bool)($this->request->getData("state") === 'true'); |
|
| 30 | - $postId = (int)$this->request->getData("postId"); |
|
| 29 | + $state = (bool) ($this->request->getData("state") === 'true'); |
|
| 30 | + $postId = (int) $this->request->getData("postId"); |
|
| 31 | 31 | |
| 32 | 32 | $result = array(); |
| 33 | 33 | $result["success"] = $this->postModule->setPublished(!$state, $postId); |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | { |
| 45 | 45 | $this->onlyAdmin(); |
| 46 | 46 | $this->onlyPost(); |
| 47 | - $state = (bool)($this->request->getData("state") === 'true'); |
|
| 48 | - $postId = (int)$this->request->getData("postId"); |
|
| 47 | + $state = (bool) ($this->request->getData("state") === 'true'); |
|
| 48 | + $postId = (int) $this->request->getData("postId"); |
|
| 49 | 49 | |
| 50 | 50 | $result = array(); |
| 51 | 51 | $result["success"] = $this->postModule->setOnFrontPage(!$state, $postId); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | //Searching for the page break tag |
| 85 | 85 | $breakTagPosition = strpos($text, "<!-- EndOfExcerptBlogOc -->"); |
| 86 | - if($breakTagPosition > 0){ |
|
| 86 | + if ($breakTagPosition > 0) { |
|
| 87 | 87 | return $this->completeDom(substr($text, 0, $breakTagPosition)); |
| 88 | 88 | } |
| 89 | 89 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $string = preg_split('/(<img[^>]+\>)|(<p[^>]+\>)|(<span[^>]+\>)|\s/', $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE); |
| 92 | 92 | |
| 93 | 93 | //The preg split can return false, probably will never happen but just in case. |
| 94 | - if(!$string) |
|
| 94 | + if (!$string) |
|
| 95 | 95 | { |
| 96 | 96 | throw new \Error("excerpt generation failed"); |
| 97 | 97 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $trimed .= $string[$wordCounter]; |
| 105 | 105 | if ($wordCounter < $count - 1) { |
| 106 | 106 | $trimed .= " "; |
| 107 | - } else { |
|
| 107 | + }else { |
|
| 108 | 108 | $trimed .= "[...]"; |
| 109 | 109 | } |
| 110 | 110 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | $result = true; |
| 156 | 156 | foreach ($strings as $string) |
| 157 | 157 | { |
| 158 | - if(!$this->isAlphaNum($string)) |
|
| 158 | + if (!$this->isAlphaNum($string)) |
|
| 159 | 159 | { |
| 160 | 160 | $result = false; |
| 161 | 161 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | public function isHexa(string $string):bool |
| 172 | 172 | { |
| 173 | - return preg_match("/[\da-f]/",$string); |
|
| 173 | + return preg_match("/[\da-f]/", $string); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | /** |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace Core\Dependency; |
| 4 | 4 | |
| 5 | -class Cookie{ |
|
| 5 | +class Cookie { |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * set a cookie |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function deleteCookie(string $name):void |
| 23 | 23 | { |
| 24 | - setcookie($name, "", time()-3600); //expire the cookie |
|
| 24 | + setcookie($name, "", time() - 3600); //expire the cookie |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |