@@ -89,10 +89,10 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | //checking result and redirecting |
| 91 | 91 | if ($tagUpdate) { |
| 92 | - $this->alertBox->setAlert("Tag " . $tagName . " updated"); |
|
| 92 | + $this->alertBox->setAlert("Tag ".$tagName." updated"); |
|
| 93 | 93 | $this->response->redirect("/admin/tag/list/"); |
| 94 | 94 | } |
| 95 | - $this->alertBox->setAlert("Error updating " . $tagName, "error"); |
|
| 95 | + $this->alertBox->setAlert("Error updating ".$tagName, "error"); |
|
| 96 | 96 | $this->response->redirect("/admin/tag/list/"); |
| 97 | 97 | } |
| 98 | 98 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $removedTag = $this->tagModel->delete($tagId); |
| 110 | 110 | |
| 111 | 111 | if ($removedTag) { |
| 112 | - $this->alertBox->setAlert("Tag " . $tagName . " deleted"); |
|
| 112 | + $this->alertBox->setAlert("Tag ".$tagName." deleted"); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $this->response->redirect("/admin/tag/list/"); |
@@ -145,10 +145,10 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | //checking result and redirecting |
| 147 | 147 | if ($tagNew) { |
| 148 | - $this->alertBox->setAlert("Tag " . $tagName . " created"); |
|
| 148 | + $this->alertBox->setAlert("Tag ".$tagName." created"); |
|
| 149 | 149 | $this->response->redirect("/admin/tag/list/"); |
| 150 | 150 | } |
| 151 | - $this->alertBox->setAlert("Error creating " . $tagName, "error"); |
|
| 151 | + $this->alertBox->setAlert("Error creating ".$tagName, "error"); |
|
| 152 | 152 | $this->response->redirect("/admin/tag/list/"); |
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | \ No newline at end of file |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | //make sure we have the right type or throw an error |
| 30 | 30 | |
| 31 | 31 | if (!in_array($type, $this->allowedTypes)) { |
| 32 | - throw new \Exception("Invalid toastr alert type " . $type); |
|
| 32 | + throw new \Exception("Invalid toastr alert type ".$type); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | $message = htmlspecialchars($message); //avoid any injection |
@@ -44,24 +44,24 @@ discard block |
||
| 44 | 44 | private function getFilename(string $folder, string $file): string |
| 45 | 45 | { |
| 46 | 46 | //slugify the file name to avoid security errors or bugs with special characters. |
| 47 | - $fileName = pathinfo($file, PATHINFO_FILENAME ); |
|
| 48 | - $fileExtension = pathinfo($file, PATHINFO_EXTENSION ); |
|
| 47 | + $fileName = pathinfo($file, PATHINFO_FILENAME); |
|
| 48 | + $fileExtension = pathinfo($file, PATHINFO_EXTENSION); |
|
| 49 | 49 | $slugify = new Slugify(); |
| 50 | 50 | $fileName = $slugify->slugify($fileName); |
| 51 | 51 | //if the filename has only special chars, the slugify will be empty, create a unique ID |
| 52 | - if($fileName ==="") |
|
| 52 | + if ($fileName === "") |
|
| 53 | 53 | { |
| 54 | 54 | $fileName = uniqid(); |
| 55 | 55 | } |
| 56 | 56 | $file = $fileName.".".$fileExtension; |
| 57 | - $fileUrl = $folder . $file; |
|
| 57 | + $fileUrl = $folder.$file; |
|
| 58 | 58 | $docRoot = $this->request->getDocumentRoot(); |
| 59 | - $filePath = $docRoot . "/public/" . $fileUrl; |
|
| 59 | + $filePath = $docRoot."/public/".$fileUrl; |
|
| 60 | 60 | if (file_exists($filePath) !== 1) { |
| 61 | 61 | $fileNum = 0; |
| 62 | 62 | while (file_exists($filePath)) { |
| 63 | - $fileUrl = $folder . $fileNum . "_" . $file; |
|
| 64 | - $filePath = $docRoot . "/public/" . $fileUrl; |
|
| 63 | + $fileUrl = $folder.$fileNum."_".$file; |
|
| 64 | + $filePath = $docRoot."/public/".$fileUrl; |
|
| 65 | 65 | $fileNum += 1; |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | // Respond to the successful upload with JSON. |
| 87 | 87 | echo json_encode(array('location' => $filetowrite)); |
| 88 | - } else { |
|
| 88 | + }else { |
|
| 89 | 89 | // Notify editor that the upload failed |
| 90 | 90 | echo json_encode(array('error' => 'Upload failed, file might be too big')); |
| 91 | 91 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | // Respond to the successful upload with JSON. |
| 121 | 121 | echo json_encode(array('location' => $filetowrite)); |
| 122 | - } else { |
|
| 122 | + }else { |
|
| 123 | 123 | // Notify editor that the upload failed |
| 124 | 124 | header("HTTP/1.1 500 Server Error"); |
| 125 | 125 | } |
@@ -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 | |
@@ -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 | |
@@ -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 | } |
@@ -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 | /** |
@@ -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 | |
@@ -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 | } |