@@ -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"; |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | $this->onlyUser(); |
84 | 84 | |
85 | 85 | //get the session userId |
86 | - $userId = (int)$this->session->get("userId"); |
|
87 | - $comment = (string)$this->request->getData("newComment"); |
|
88 | - $postId = (int)$this->request->getData("postId"); |
|
86 | + $userId = (int) $this->session->get("userId"); |
|
87 | + $comment = (string) $this->request->getData("newComment"); |
|
88 | + $postId = (int) $this->request->getData("postId"); |
|
89 | 89 | |
90 | 90 | //check if we are admin, Admins do not need moderation |
91 | 91 | $admin = $this->session->get('user_role_level') >= Constant::ADMIN_LEVEL; |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | $siteConfig = $this->siteConfig->getSiteConfig(); |
98 | 98 | $post = $this->postModel->getSinglePost($postId); |
99 | 99 | |
100 | - $emailMessage = "<h1>New comment on post " . $post->title . "</a></h1>"; |
|
101 | - $emailMessage .= "<p>Check it out <a href='" . $baseUrl . "admin/comments/moderate-comment/" . $commentId . "'>here</a> </p>"; |
|
100 | + $emailMessage = "<h1>New comment on post ".$post->title."</a></h1>"; |
|
101 | + $emailMessage .= "<p>Check it out <a href='".$baseUrl."admin/comments/moderate-comment/".$commentId."'>here</a> </p>"; |
|
102 | 102 | |
103 | 103 | $this->sendMail->send($siteConfig["admin_email_address"], "New comment added", $emailMessage); |
104 | 104 |
@@ -92,9 +92,11 @@ |
||
92 | 92 | $commentId = $this->commentModel->addComment($postId, $userId, $comment, $admin); |
93 | 93 | |
94 | 94 | |
95 | - if (!$admin) //if we are not an admin, send an email to alert and add an alertBox |
|
95 | + if (!$admin) { |
|
96 | + //if we are not an admin, send an email to alert and add an alertBox |
|
96 | 97 | { |
97 | 98 | $siteConfig = $this->siteConfig->getSiteConfig(); |
99 | + } |
|
98 | 100 | $post = $this->postModel->getSinglePost($postId); |
99 | 101 | |
100 | 102 | $emailMessage = "<h1>New comment on post " . $post->title . "</a></h1>"; |
@@ -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) { |
@@ -282,9 +282,11 @@ |
||
282 | 282 | //all set, redirect and set message |
283 | 283 | $redirectUrl = ""; |
284 | 284 | $refererUrl = $this->request->getReferer(); |
285 | - if ($refererUrl != "")//getReferer can return null if client isn't configured |
|
285 | + if ($refererUrl != "") { |
|
286 | + //getReferer can return null if client isn't configured |
|
286 | 287 | { |
287 | 288 | $baseUrl = $this->request->getBaseUrl(); |
289 | + } |
|
288 | 290 | $redirectUrl = $this->removeFromBeginning($refererUrl, $baseUrl); |
289 | 291 | } |
290 | 292 |
@@ -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,17 +36,17 @@ 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 | - $result["success"]=false; |
|
43 | + $result["success"] = false; |
|
44 | 44 | $data = array(); |
45 | 45 | |
46 | 46 | $data["comments"] = $this->commentModel->getCommentsListOnPost($postId, $commentOffset); |
47 | - if($data["comments"] != false) |
|
47 | + if ($data["comments"] != false) |
|
48 | 48 | { |
49 | - $result["success"]=true; |
|
49 | + $result["success"] = true; |
|
50 | 50 | $twig = $this->container->getTemplate(); |
51 | 51 | $html = $twig->render('Includes/LoadComments.twig', $data); |
52 | 52 |
@@ -32,7 +32,7 @@ |
||
32 | 32 | $this->onlyPost(); |
33 | 33 | |
34 | 34 | $postSlug = $this->request->getData("postSlug"); |
35 | - $postId = (int)$this->request->getData("postId"); |
|
35 | + $postId = (int) $this->request->getData("postId"); |
|
36 | 36 | |
37 | 37 | $data = false; |
38 | 38 | if (!$this->slug->isSlugValid($postSlug) || !$this->isInt($postId)) { |
@@ -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; |