@@ -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(); |
@@ -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)) { |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | public function viewPost(string $slug, string $page = "page-1", int $linesPerPage = Constant::COMMENTS_PER_PAGE) |
43 | 43 | { |
44 | 44 | |
45 | - $postId = (int)$this->postModel->getPostIdFromSlug($slug); |
|
45 | + $postId = (int) $this->postModel->getPostIdFromSlug($slug); |
|
46 | 46 | |
47 | 47 | $posts = $this->postModel->getSinglePost($postId); |
48 | 48 | |
49 | - if($posts === false) |
|
49 | + if ($posts === false) |
|
50 | 50 | { |
51 | 51 | throw new \Exception("Page no longer exists", "404"); |
52 | 52 | } |
@@ -89,9 +89,9 @@ discard block |
||
89 | 89 | $this->onlyUser(); |
90 | 90 | |
91 | 91 | //get the session userId |
92 | - $userId = (int)$this->session->get("userId"); |
|
93 | - $comment = (string)$this->request->getData("newComment"); |
|
94 | - $postId = (int)$this->request->getData("postId"); |
|
92 | + $userId = (int) $this->session->get("userId"); |
|
93 | + $comment = (string) $this->request->getData("newComment"); |
|
94 | + $postId = (int) $this->request->getData("postId"); |
|
95 | 95 | |
96 | 96 | //check if we are admin, Admins do not need moderation |
97 | 97 | $admin = $this->session->get('user_role_level') >= Constant::ADMIN_LEVEL; |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | $post = $this->postModel->getSinglePost($postId); |
104 | 104 | $baseUrl = $this->request->getBaseUrl(); |
105 | 105 | |
106 | - $emailMessage = "<h1>New comment on post " . $post->title . "</a></h1>"; |
|
107 | - $emailMessage .= "<p>Check it out <a href='" . $baseUrl . "admin/comments/moderate-comment/" . $commentId . "'>here</a> </p>"; |
|
106 | + $emailMessage = "<h1>New comment on post ".$post->title."</a></h1>"; |
|
107 | + $emailMessage .= "<p>Check it out <a href='".$baseUrl."admin/comments/moderate-comment/".$commentId."'>here</a> </p>"; |
|
108 | 108 | |
109 | 109 | $this->sendMail->send($siteConfig["admin_email_address"], "New comment added", $emailMessage); |
110 | 110 | |
@@ -113,6 +113,6 @@ discard block |
||
113 | 113 | |
114 | 114 | $postSlug = $this->postModel->getPostSlugFromId($postId); |
115 | 115 | |
116 | - $this->response->redirect("/post/view-post/" . $postSlug); |
|
116 | + $this->response->redirect("/post/view-post/".$postSlug); |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | \ No newline at end of file |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $this->onlyPost(); |
118 | 118 | |
119 | 119 | $posts = $this->request->getDataFull(); |
120 | - $userSessionId = (int)$this->session->get("userId"); |
|
120 | + $userSessionId = (int) $this->session->get("userId"); |
|
121 | 121 | |
122 | 122 | |
123 | 123 | $title = trim($posts["postTitle"]); |
@@ -163,10 +163,10 @@ discard block |
||
163 | 163 | |
164 | 164 | //checking result and redirecting |
165 | 165 | if ($postId != null) { |
166 | - $this->alertBox->setAlert("Post " . $title . " Created"); |
|
167 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
166 | + $this->alertBox->setAlert("Post ".$title." Created"); |
|
167 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
168 | 168 | } |
169 | - $this->alertBox->setAlert("Error creating " . $title, "error"); |
|
169 | + $this->alertBox->setAlert("Error creating ".$title, "error"); |
|
170 | 170 | $this->container->getResponse()->redirect("admin/post/new"); |
171 | 171 | |
172 | 172 | } |
@@ -231,11 +231,11 @@ discard block |
||
231 | 231 | |
232 | 232 | //checking result and redirecting |
233 | 233 | if ($postUpdate) { |
234 | - $this->alertBox->setAlert("Post " . $title . " Updated"); |
|
235 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
234 | + $this->alertBox->setAlert("Post ".$title." Updated"); |
|
235 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
236 | 236 | } |
237 | - $this->alertBox->setAlert("Error updating " . $title, "error"); |
|
238 | - $this->container->getResponse()->redirect("admin/post/modify/" . $originalPostSlug); |
|
237 | + $this->alertBox->setAlert("Error updating ".$title, "error"); |
|
238 | + $this->container->getResponse()->redirect("admin/post/modify/".$originalPostSlug); |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | $removedPost = $this->postModel->deletePost($postId); |
253 | 253 | |
254 | 254 | if ($removedPost) { |
255 | - $this->alertBox->setAlert("Post " . $postTitle . " deleted"); |
|
255 | + $this->alertBox->setAlert("Post ".$postTitle." deleted"); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | $this->response->redirect("admin/post/list/"); |
@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | $twigOptions = []; |
51 | 51 | if (!Config::DEV_ENVIRONMENT) { |
52 | 52 | $twigOptions = [ |
53 | - 'cache' => dirname(__DIR__) . '/Cache' |
|
53 | + 'cache' => dirname(__DIR__).'/Cache' |
|
54 | 54 | ]; |
55 | 55 | } |
56 | - $loader = new \Twig_Loader_Filesystem(dirname(__DIR__) . '/App/Views'); |
|
56 | + $loader = new \Twig_Loader_Filesystem(dirname(__DIR__).'/App/Views'); |
|
57 | 57 | $twig = new \Twig_Environment($loader, $twigOptions); |
58 | 58 | |
59 | 59 | return $twig; |
@@ -68,14 +68,14 @@ discard block |
||
68 | 68 | if ($this->dbh) { |
69 | 69 | return $this->dbh; |
70 | 70 | } |
71 | - $dsn = "mysql:host=" . Config::DB_HOST . ";dbname=" . Config::DB_NAME . ";charset=utf8"; //Creating the Data Source name |
|
71 | + $dsn = "mysql:host=".Config::DB_HOST.";dbname=".Config::DB_NAME.";charset=utf8"; //Creating the Data Source name |
|
72 | 72 | $opt = [ |
73 | 73 | PDO::ATTR_PERSISTENT => true, |
74 | 74 | PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, |
75 | 75 | PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ, |
76 | 76 | PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true |
77 | 77 | ]; |
78 | - $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt);; |
|
78 | + $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt); ; |
|
79 | 79 | return $this->dbh; |
80 | 80 | } |
81 | 81 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function getCookie(): Dependency\Cookie |
123 | 123 | { |
124 | - if(!$this->cookie){ |
|
124 | + if (!$this->cookie) { |
|
125 | 125 | $this->cookie = new Cookie(); |
126 | 126 | } |
127 | 127 | return $this->cookie; |