@@ -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); |
@@ -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 | /** |
@@ -6,7 +6,7 @@ |
||
6 | 6 | use Core\Container; |
7 | 7 | use Core\Model; |
8 | 8 | |
9 | -class RoleModel extends Model{ |
|
9 | +class RoleModel extends Model { |
|
10 | 10 | |
11 | 11 | private $roleTbl; |
12 | 12 |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | use Swift_Message; |
9 | 9 | use Swift_SmtpTransport; |
10 | 10 | |
11 | -class SendMail extends Module{ |
|
11 | +class SendMail extends Module { |
|
12 | 12 | |
13 | 13 | private $siteConfig; |
14 | 14 | |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | // Create the Transport for mail sending |
26 | 26 | //$config = $this->siteConfig->getSiteConfig(); |
27 | - $this->transport = (new Swift_SmtpTransport($this->siteConfig["SMTP_server"], (int)$this->siteConfig["SMTP_port"])) |
|
27 | + $this->transport = (new Swift_SmtpTransport($this->siteConfig["SMTP_server"], (int) $this->siteConfig["SMTP_port"])) |
|
28 | 28 | ->setUsername($this->siteConfig["SMTP_user"]) |
29 | 29 | ->setPassword($this->siteConfig["SMTP_pass"]) |
30 | 30 | ; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | ->setBody($message, 'text/html') |
52 | 52 | ; |
53 | 53 | |
54 | - if($from === null) |
|
54 | + if ($from === null) |
|
55 | 55 | { |
56 | 56 | //if we haven't set a from, get the config value |
57 | 57 | $from = $this->siteConfig["SMTP_from"]; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $message = "<h1>Message from <a href='".$this->container->getRequest()->getBaseUrl()."'>".$this->siteConfig["site_name"]."</a></h1>"; |
78 | 78 | $message .= "<p>You have asked to reset your password, please click <a href=\"".$url."\">Here</a> to define a new password</p>"; |
79 | 79 | |
80 | - $this->send($to, "Define New Password", $message ); |
|
80 | + $this->send($to, "Define New Password", $message); |
|
81 | 81 | |
82 | 82 | } |
83 | 83 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $message .= "<p>You have sucsessfuly created an account, now all you need to do is <a href=\"".$url."\">Create your new password</a></p>"; |
98 | 98 | $message .= "<p>Have fun</p>"; |
99 | 99 | |
100 | - $this->send($to, "Define Password at ".$this->siteConfig["site_name"], $message ); |
|
100 | + $this->send($to, "Define Password at ".$this->siteConfig["site_name"], $message); |
|
101 | 101 | |
102 | 102 | } |
103 | 103 | } |
104 | 104 | \ No newline at end of file |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | use HTMLPurifier; |
9 | 9 | use HTMLPurifier_Config; |
10 | 10 | |
11 | -class CommentModel extends Model{ |
|
11 | +class CommentModel extends Model { |
|
12 | 12 | |
13 | 13 | private $commentTbl; |
14 | 14 | private $userTbl; |
@@ -154,10 +154,10 @@ discard block |
||
154 | 154 | * @return int |
155 | 155 | * @throws \Exception |
156 | 156 | */ |
157 | - public function addComment(int $postId, int $userId, string $comment, bool $admin=false):int |
|
157 | + public function addComment(int $postId, int $userId, string $comment, bool $admin = false):int |
|
158 | 158 | { |
159 | 159 | $comment = $this->purifyHtml($comment); |
160 | - $sql=" |
|
160 | + $sql = " |
|
161 | 161 | INSERT INTO $this->commentTbl (users_idusers, posts_idposts, comment, approved) |
162 | 162 | VALUES (:userId, :postId, :comment, :approved) |
163 | 163 | "; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $this->bind(':approved', $admin); |
169 | 169 | |
170 | 170 | $this->execute(); |
171 | - return (int)$this->dbh->lastInsertId(); |
|
171 | + return (int) $this->dbh->lastInsertId(); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | |
202 | 202 | $comment = $this->purifyHtml($comment); |
203 | 203 | |
204 | - $sql=" |
|
204 | + $sql = " |
|
205 | 205 | UPDATE $this->commentTbl |
206 | 206 | SET |
207 | 207 | comment = :comment, |
@@ -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 |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $this->session->remove("registrationErrors"); |
52 | 52 | |
53 | 53 | $userId = $this->session->get("userId"); |
54 | - if($userId === null) |
|
54 | + if ($userId === null) |
|
55 | 55 | { |
56 | 56 | //this should never happen but scrutinizer thows an alert |
57 | 57 | throw new \Exception("Session error, no ID"); |
@@ -102,14 +102,14 @@ discard block |
||
102 | 102 | $this->onlyUser(); |
103 | 103 | $this->onlyPost(); |
104 | 104 | |
105 | - $user = (object)$this->request->getDataFull(); |
|
105 | + $user = (object) $this->request->getDataFull(); |
|
106 | 106 | $redirectUrl = "/admin"; |
107 | 107 | |
108 | 108 | if ($user->userId !== $this->session->get("userId") || isset($user->userRoleSelector) || isset($user->locked_out)) { |
109 | 109 | //an admin is trying to update a user or form tampered with |
110 | 110 | $this->onlyAdmin(); |
111 | - $redirectUrl = "/admin/home/view-user/" . $user->userId; |
|
112 | - } else { |
|
111 | + $redirectUrl = "/admin/home/view-user/".$user->userId; |
|
112 | + }else { |
|
113 | 113 | //set the role to the original state for update |
114 | 114 | $beforeUser = $this->userModel->getUserDetailsById($user->userId); |
115 | 115 | $user->userRoleSelector = $beforeUser->roles_idroles; |
@@ -123,13 +123,13 @@ discard block |
||
123 | 123 | $error = false; |
124 | 124 | $registerErrors = new \stdClass(); |
125 | 125 | |
126 | - if($userId == 1 && $user->userLockedOut == 1) |
|
126 | + if ($userId == 1 && $user->userLockedOut == 1) |
|
127 | 127 | { |
128 | 128 | $error = true; |
129 | 129 | $this->alertBox->setAlert("Original admin may not be deactivated", "error"); |
130 | 130 | } |
131 | 131 | |
132 | - if($userId == 1 && $user->userRoleSelector != 2) |
|
132 | + if ($userId == 1 && $user->userRoleSelector != 2) |
|
133 | 133 | { |
134 | 134 | $error = true; |
135 | 135 | $this->alertBox->setAlert("Original admin must stay admin", "error"); |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | throw new \Exception("Error in passed ID"); |
217 | 217 | } |
218 | 218 | |
219 | - if($userId === 1) |
|
219 | + if ($userId === 1) |
|
220 | 220 | { |
221 | 221 | $this->alertBox->setAlert('Original Admin can not be deleted', "error"); |
222 | 222 | $this->response->redirect("/admin/home/list-users"); |
@@ -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; |