@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | use Core\Container; |
| 10 | 10 | use Core\Traits\StringFunctions; |
| 11 | 11 | |
| 12 | -class Comments extends AdminController{ |
|
| 12 | +class Comments extends AdminController { |
|
| 13 | 13 | |
| 14 | 14 | use StringFunctions; |
| 15 | 15 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | //update comment |
| 117 | - if($this->commentModel->update($commentId, $comment["commentTextArea"], $comment["commentApproved"])) |
|
| 117 | + if ($this->commentModel->update($commentId, $comment["commentTextArea"], $comment["commentApproved"])) |
|
| 118 | 118 | { |
| 119 | 119 | $this->alertBox->setAlert("Comment updated"); |
| 120 | 120 | } |
@@ -24,13 +24,13 @@ |
||
| 24 | 24 | const LIST_PER_PAGE = 10; |
| 25 | 25 | const COMMENTS_PER_PAGE = 2; |
| 26 | 26 | |
| 27 | - const EXCERPT_WORD_COUNT =50; |
|
| 27 | + const EXCERPT_WORD_COUNT = 50; |
|
| 28 | 28 | |
| 29 | 29 | //login security |
| 30 | 30 | const NUMBER_OF_BAD_PASSWORD_TRIES = 3; |
| 31 | 31 | const LOCKOUT_MINUTES = 5; |
| 32 | 32 | |
| 33 | - const PASSWORD_RESET_DURATION = 240;//number of minutes the reset password link is valid |
|
| 33 | + const PASSWORD_RESET_DURATION = 240; //number of minutes the reset password link is valid |
|
| 34 | 34 | |
| 35 | 35 | const HASH_KEY = "1337blogOcPass159758348ShaQpiss"; |
| 36 | 36 | } |
| 37 | 37 | \ No newline at end of file |
@@ -45,27 +45,27 @@ 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 | } |
| 52 | 52 | |
| 53 | 53 | //grab the token and ID |
| 54 | 54 | $token = $this->request->getData("token"); |
| 55 | - $userId = (int)$this->request->getData("userId"); |
|
| 55 | + $userId = (int) $this->request->getData("userId"); |
|
| 56 | 56 | |
| 57 | - if($token === null) |
|
| 57 | + if ($token === null) |
|
| 58 | 58 | { |
| 59 | 59 | throw new \Exception("Null Token"); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | //verify if token is valid |
| 63 | - if(!$this->isHexa($token)|| !$this->isInt($userId)) |
|
| 63 | + if (!$this->isHexa($token) || !$this->isInt($userId)) |
|
| 64 | 64 | { |
| 65 | 65 | $this->alertBox->setAlert('Badly formatted Token', 'error'); |
| 66 | 66 | $this->response->redirect(); |
| 67 | 67 | } |
| 68 | - if(!$this->userModel->getUserDetailsByToken($token, $userId)) |
|
| 68 | + if (!$this->userModel->getUserDetailsByToken($token, $userId)) |
|
| 69 | 69 | { |
| 70 | 70 | $this->alertBox->setAlert('Invalid reset token, please request a new password', 'error'); |
| 71 | 71 | $this->response->redirect(); |
@@ -88,14 +88,14 @@ discard block |
||
| 88 | 88 | $token = $request["token"]; |
| 89 | 89 | $userId = $request["userId"]; |
| 90 | 90 | |
| 91 | - if(!$this->isHexa($token) || !$this->isInt($userId) ) |
|
| 91 | + if (!$this->isHexa($token) || !$this->isInt($userId)) |
|
| 92 | 92 | { |
| 93 | 93 | throw new \Exception("Bad Token or ID request"); |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | $error = false; |
| 97 | 97 | $registerErrors = new \stdClass(); |
| 98 | - if($password !== $confirm) |
|
| 98 | + if ($password !== $confirm) |
|
| 99 | 99 | { |
| 100 | 100 | $error = true; |
| 101 | 101 | $registerErrors->forgotPassword = "password and confirmation do not match"; |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | use Core\JsonException; |
| 9 | 9 | use Core\Traits\StringFunctions; |
| 10 | 10 | |
| 11 | -class User extends AjaxController{ |
|
| 11 | +class User extends AjaxController { |
|
| 12 | 12 | |
| 13 | 13 | use StringFunctions; |
| 14 | 14 | |
@@ -25,12 +25,12 @@ discard block |
||
| 25 | 25 | //the router needs a parameter with get functions else throsw a wobbly |
| 26 | 26 | //we pass a get variable and call the /controller/function/get?bla |
| 27 | 27 | //for better use and security, we must pass "get" as the parameter |
| 28 | - if(!$this->startsWith(strtolower($get),"get")) |
|
| 28 | + if (!$this->startsWith(strtolower($get), "get")) |
|
| 29 | 29 | { |
| 30 | 30 | throw new JsonException("invalid call"); |
| 31 | 31 | } |
| 32 | 32 | $email = $this->request->getData("email"); |
| 33 | - if($email === null) |
|
| 33 | + if ($email === null) |
|
| 34 | 34 | { |
| 35 | 35 | throw new JsonException("Empty email"); |
| 36 | 36 | } |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | { |
| 52 | 52 | $this->onlyAdmin(); |
| 53 | 53 | $this->onlyPost(); |
| 54 | - $state = (bool)($this->request->getData("state") === 'true'); |
|
| 55 | - $userId = (int)$this->request->getData("userId"); |
|
| 54 | + $state = (bool) ($this->request->getData("state") === 'true'); |
|
| 55 | + $userId = (int) $this->request->getData("userId"); |
|
| 56 | 56 | |
| 57 | 57 | $result = array(); |
| 58 | 58 | $result["success"] = false; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $result["userId"] = $userId; |
| 61 | 61 | |
| 62 | 62 | // we can not update the Original Admin activation state |
| 63 | - if($userId !== 1) |
|
| 63 | + if ($userId !== 1) |
|
| 64 | 64 | { |
| 65 | 65 | $result["success"] = $this->userModel->activateUser(!$state, $userId); |
| 66 | 66 | $result["state"] = !$state; |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | //Searching for the page break tag |
| 87 | 87 | $breakTagPosition = strpos($text, "<!-- EndOfExcerptBlogOc -->"); |
| 88 | - if($breakTagPosition > 0){ |
|
| 88 | + if ($breakTagPosition > 0) { |
|
| 89 | 89 | return $this->completeDom(substr($text, 0, $breakTagPosition)); |
| 90 | 90 | } |
| 91 | 91 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $string = preg_split('/(<img[^>]+\>)|(<p[^>]+\>)|(<span[^>]+\>)|\s/', $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE); |
| 94 | 94 | |
| 95 | 95 | //The preg split can return false, probably will never happen but just in case. |
| 96 | - if(!$string) |
|
| 96 | + if (!$string) |
|
| 97 | 97 | { |
| 98 | 98 | throw new \Error("excerpt generation failed"); |
| 99 | 99 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $trimmed .= $string[$wordCounter]; |
| 107 | 107 | if ($wordCounter < $count - 1) { |
| 108 | 108 | $trimmed .= " "; |
| 109 | - } else { |
|
| 109 | + }else { |
|
| 110 | 110 | $trimmed .= "[...]"; |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $result = true; |
| 147 | 147 | foreach ($strings as $string) |
| 148 | 148 | { |
| 149 | - if(!$this->isAlphaNum($string)) |
|
| 149 | + if (!$this->isAlphaNum($string)) |
|
| 150 | 150 | { |
| 151 | 151 | $result = false; |
| 152 | 152 | } |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | */ |
| 162 | 162 | public function isHexa(string $string):bool |
| 163 | 163 | { |
| 164 | - return preg_match("/[\da-f]/",$string) === 1; |
|
| 164 | + return preg_match("/[\da-f]/", $string) === 1; |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | //check if email is valid for sanity |
| 193 | 193 | if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { |
| 194 | 194 | $email = htmlspecialchars($email); |
| 195 | - throw new BlogocException("invalid email " . $email); |
|
| 195 | + throw new BlogocException("invalid email ".$email); |
|
| 196 | 196 | } |
| 197 | 197 | $sql = $this->baseSqlSelect(); |
| 198 | 198 | $sql .= " |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | $this->bind(':roles_idroles', 1); //we set to one, should probably get from database and config |
| 236 | 236 | $this->execute(); |
| 237 | 237 | |
| 238 | - return (int)$this->dbh->lastInsertId(); |
|
| 238 | + return (int) $this->dbh->lastInsertId(); |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | /** |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | public function updateUser(\stdClass $user):void |
| 247 | 247 | { |
| 248 | - $sql=" |
|
| 248 | + $sql = " |
|
| 249 | 249 | UPDATE $this->userTbl |
| 250 | 250 | SET |
| 251 | 251 | name=:name, |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | if ($this->isAccountPasswordBlocked($user)) { |
| 299 | - $response->message = "too many bad passwords, account is blocked for " . Constant::LOCKOUT_MINUTES . " minutes"; |
|
| 299 | + $response->message = "too many bad passwords, account is blocked for ".Constant::LOCKOUT_MINUTES." minutes"; |
|
| 300 | 300 | return $response; |
| 301 | 301 | } |
| 302 | 302 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | private function populateUserFromId(int $userId) |
| 75 | 75 | { |
| 76 | 76 | $result = $this->userModel->getUserDetailsById($userId); |
| 77 | - $this->populateUser((array)$result); |
|
| 77 | + $this->populateUser((array) $result); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | //we are authenticated here |
| 198 | 198 | |
| 199 | 199 | //populate the user object with returned data |
| 200 | - $this->populateUser((array)$authUser->user); |
|
| 200 | + $this->populateUser((array) $authUser->user); |
|
| 201 | 201 | |
| 202 | 202 | //if the user wanted to be remembered |
| 203 | 203 | if ($rememberMe) { |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | |
| 226 | 226 | $register = $this->request->getDataFull(); |
| 227 | 227 | |
| 228 | - if($register === null) |
|
| 228 | + if ($register === null) |
|
| 229 | 229 | { |
| 230 | 230 | throw new \Exception("Error no data passed"); |
| 231 | 231 | } |
@@ -24,8 +24,8 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | $this->onlyAdmin(); |
| 26 | 26 | $this->onlyPost(); |
| 27 | - $state = (bool)($this->request->getData("state") === 'true'); |
|
| 28 | - $commentId = (int)$this->request->getData("commentId"); |
|
| 27 | + $state = (bool) ($this->request->getData("state") === 'true'); |
|
| 28 | + $commentId = (int) $this->request->getData("commentId"); |
|
| 29 | 29 | |
| 30 | 30 | $result = array(); |
| 31 | 31 | $result["success"] = $this->commentModel->setApproved(!$state, $commentId); |
@@ -36,8 +36,8 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | public function loadComments() |
| 38 | 38 | { |
| 39 | - $commentOffset = (int)$this->request->getData("commentOffset"); |
|
| 40 | - $postId = (int)$this->request->getData("postId"); |
|
| 39 | + $commentOffset = (int) $this->request->getData("commentOffset"); |
|
| 40 | + $postId = (int) $this->request->getData("postId"); |
|
| 41 | 41 | |
| 42 | 42 | $result = array(); |
| 43 | 43 | $result["success"] = false; |
@@ -5,7 +5,7 @@ |
||
| 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(); |