@@ -204,9 +204,11 @@ |
||
204 | 204 | |
205 | 205 | $user = $this->getUserDetailsByEmail($email); |
206 | 206 | |
207 | - if ($user === false) //no user exists |
|
207 | + if ($user === false) { |
|
208 | + //no user exists |
|
208 | 209 | { |
209 | 210 | $response->message = "email doesn't exist, register a new account?"; |
211 | + } |
|
210 | 212 | return $response; |
211 | 213 | } |
212 | 214 |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | //check if email is valid for sanity |
172 | 172 | if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { |
173 | 173 | $email = htmlspecialchars($email); |
174 | - throw new BlogocException("invalid email " . $email); |
|
174 | + throw new BlogocException("invalid email ".$email); |
|
175 | 175 | } |
176 | 176 | $sql = $this->baseSqlSelect(); |
177 | 177 | $sql .= " |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | $this->bind(':roles_idroles', 1); //we set to one, should probably get from database and config |
215 | 215 | $this->execute(); |
216 | 216 | |
217 | - return (int)$this->dbh->lastInsertId(); |
|
217 | + return (int) $this->dbh->lastInsertId(); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | /** |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | } |
246 | 246 | |
247 | 247 | if ($this->isAccountPasswordBlocked($user)) { |
248 | - $response->message = "too many bad passwords, account is blocked for " . Constant::LOCKOUT_MINUTES . " minutes"; |
|
248 | + $response->message = "too many bad passwords, account is blocked for ".Constant::LOCKOUT_MINUTES." minutes"; |
|
249 | 249 | return $response; |
250 | 250 | } |
251 | 251 |
@@ -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) |
23 | 23 | { |
24 | - setcookie($name, "", time()-3600); //expire the cookie |
|
24 | + setcookie($name, "", time() - 3600); //expire the cookie |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
@@ -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,13 +68,13 @@ 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 | ]; |
77 | - $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt);; |
|
77 | + $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt); ; |
|
78 | 78 | return $this->dbh; |
79 | 79 | } |
80 | 80 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function getCookie(): Dependency\Cookie |
122 | 122 | { |
123 | - if(!$this->cookie){ |
|
123 | + if (!$this->cookie) { |
|
124 | 124 | $this->cookie = new Cookie(); |
125 | 125 | } |
126 | 126 | return $this->cookie; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | { |
28 | 28 | if ($token_value) { |
29 | 29 | $this->token = $token_value; |
30 | - } else { |
|
30 | + }else { |
|
31 | 31 | $this->token = $this->generateToken(); |
32 | 32 | } |
33 | 33 | } |
@@ -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 | /** |
@@ -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 | ; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | $message = "<a href=\"".$url."\">Define new password</a>"; |
68 | 68 | |
69 | - $this->send($to, "Define Password", $message ); |
|
69 | + $this->send($to, "Define Password", $message); |
|
70 | 70 | |
71 | 71 | } |
72 | 72 | } |
73 | 73 | \ No newline at end of file |
@@ -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'); //TODO test this element |
|
48 | - $postId = (int)$this->request->getData("postId"); |
|
47 | + $state = (bool) ($this->request->getData("state") === 'true'); //TODO test this element |
|
48 | + $postId = (int) $this->request->getData("postId"); |
|
49 | 49 | |
50 | 50 | $result = array(); |
51 | 51 | $result["success"] = $this->postModule->setOnFrontPage(!$state, $postId); |
@@ -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"; |