@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $postSlug = $this->request->getData("postSlug"); |
| 27 | 27 | |
| 28 | 28 | $data = false; |
| 29 | - if($this->isAlphaNum($postSlug)) |
|
| 29 | + if ($this->isAlphaNum($postSlug)) |
|
| 30 | 30 | { |
| 31 | 31 | $slugModel = new SlugModel($this->container); |
| 32 | 32 | |
@@ -43,13 +43,13 @@ discard block |
||
| 43 | 43 | private function getFilename(string $folder, string $file):string |
| 44 | 44 | { |
| 45 | 45 | |
| 46 | - $fileUrl = $folder . $file; |
|
| 46 | + $fileUrl = $folder.$file; |
|
| 47 | 47 | $docRoot = $this->request->getDocumentRoot(); |
| 48 | 48 | $filePath = $docRoot."/public/".$fileUrl; |
| 49 | - if(file_exists($filePath) !== 1) |
|
| 49 | + if (file_exists($filePath) !== 1) |
|
| 50 | 50 | { |
| 51 | 51 | $fileNum = 0; |
| 52 | - while(file_exists($filePath)) |
|
| 52 | + while (file_exists($filePath)) |
|
| 53 | 53 | { |
| 54 | 54 | $fileUrl = $folder.$fileNum."_".$file; |
| 55 | 55 | $filePath = $docRoot."/public/".$fileUrl; |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | // Respond to the successful upload with JSON. |
| 78 | 78 | echo json_encode(array('location' => $filetowrite)); |
| 79 | - } else { |
|
| 79 | + }else { |
|
| 80 | 80 | // Notify editor that the upload failed |
| 81 | 81 | echo json_encode(array('error' => 'Upload failed, file might be too big')); |
| 82 | 82 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | // Respond to the successful upload with JSON. |
| 112 | 112 | echo json_encode(array('location' => $filetowrite)); |
| 113 | - } else { |
|
| 113 | + }else { |
|
| 114 | 114 | // Notify editor that the upload failed |
| 115 | 115 | header("HTTP/1.1 500 Server Error"); |
| 116 | 116 | } |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | use Core\Controller; |
| 9 | 9 | use Core\Container; |
| 10 | 10 | |
| 11 | -class Post extends Controller{ |
|
| 11 | +class Post extends Controller { |
|
| 12 | 12 | |
| 13 | 13 | protected $siteConfig; |
| 14 | 14 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * @throws \Twig_Error_Runtime |
| 27 | 27 | * @throws \Twig_Error_Syntax |
| 28 | 28 | */ |
| 29 | - public function viewPost(string $slug){ |
|
| 29 | + public function viewPost(string $slug) { |
|
| 30 | 30 | |
| 31 | 31 | $tagModel = new TagModel($this->container); |
| 32 | 32 | $postModel = new PostModel($this->container); |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Core\Model; |
| 6 | 6 | |
| 7 | -class UserModel extends Model{ |
|
| 7 | +class UserModel extends Model { |
|
| 8 | 8 | |
| 9 | 9 | public function getAuthorDetails(int $authorId) |
| 10 | 10 | { |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | $this->query($sql); |
| 68 | 68 | $this->bind(":tag", $tag); |
| 69 | 69 | $this->execute(); |
| 70 | - return (int)$this->dbh->lastInsertId(); |
|
| 70 | + return (int) $this->dbh->lastInsertId(); |
|
| 71 | 71 | |
| 72 | 72 | } |
| 73 | 73 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * fetches the result from an executed query |
| 102 | 102 | * @return array |
| 103 | 103 | */ |
| 104 | - protected function fetchAll(){ |
|
| 104 | + protected function fetchAll() { |
|
| 105 | 105 | return $this->stmt->fetchAll(); |
| 106 | 106 | } |
| 107 | 107 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | * returns a single line from the executed query |
| 110 | 110 | * @return mixed |
| 111 | 111 | */ |
| 112 | - protected function fetch(){ |
|
| 112 | + protected function fetch() { |
|
| 113 | 113 | return $this->stmt->fetch(); |
| 114 | 114 | } |
| 115 | 115 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | $table = $reflect->getShortName(); //this is to only get the model name, otherwise we get the full namespace |
| 137 | 137 | //since our models all end with Model, we should remove it. |
| 138 | 138 | $table = $this->removeFromEnd($table, 'Model'); |
| 139 | - $table = $table . 's'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s |
|
| 139 | + $table = $table.'s'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s |
|
| 140 | 140 | $table = strtolower($table); //the database names are in lowercase |
| 141 | 141 | } |
| 142 | 142 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | //if we are here, then table doesn't exist, check for view |
| 158 | - $view = 'v_' . $table; |
|
| 158 | + $view = 'v_'.$table; |
|
| 159 | 159 | $stmt->bindValue(':table', $view, PDO::PARAM_STR); |
| 160 | 160 | $stmt->execute(); |
| 161 | 161 | $exists = $stmt->rowCount() > 0; //will return 1 if table exists or 0 if non existant |
@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | * @param $table string the table name |
| 177 | 177 | * @return string |
| 178 | 178 | */ |
| 179 | - protected function getTablePrefix($table){ |
|
| 180 | - if(Config::TABLE_PREFIX != '') |
|
| 179 | + protected function getTablePrefix($table) { |
|
| 180 | + if (Config::TABLE_PREFIX != '') |
|
| 181 | 181 | { |
| 182 | 182 | $table = Config::TABLE_PREFIX.'_'.$table; |
| 183 | 183 | } |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | protected function getRowById($rowId, $table = null) |
| 249 | 249 | { |
| 250 | 250 | $tableName = $this->getTable($table); |
| 251 | - $idName = 'id' . $tableName; |
|
| 251 | + $idName = 'id'.$tableName; |
|
| 252 | 252 | $sql = "SELECT * FROM $tableName WHERE $idName = :rowId"; |
| 253 | 253 | $this->query($sql); |
| 254 | 254 | $this->bind(':rowId', $rowId); |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | throw new \Exception("Pagination Error", "404"); |
| 27 | 27 | } |
| 28 | 28 | $pageNo = $this->removeFromBeginning($page, "page-"); |
| 29 | - if(!filter_var($pageNo, FILTER_VALIDATE_INT)){ |
|
| 29 | + if (!filter_var($pageNo, FILTER_VALIDATE_INT)) { |
|
| 30 | 30 | throw new \Exception("Invalid page number"); |
| 31 | 31 | } |
| 32 | 32 | $offset = ($pageNo - 1) * $rowsPerPage; |
@@ -196,10 +196,12 @@ |
||
| 196 | 196 | $this->alertBox->setAlert("empty slug not allowed", "error"); |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - if ($postSlug != $originalPostSlug) //if the slug has been updated |
|
| 199 | + if ($postSlug != $originalPostSlug) { |
|
| 200 | + //if the slug has been updated |
|
| 200 | 201 | { |
| 201 | 202 | if (!$this->slugModel->isUnique($postSlug, "posts", "posts_slug")) { |
| 202 | 203 | $error = true; |
| 204 | + } |
|
| 203 | 205 | $originalPostSlug = $this->slugModel->getSlugFromId($postId, "posts", "idposts", "posts_slug"); |
| 204 | 206 | $this->alertBox->setAlert("Slug not unique", "error"); |
| 205 | 207 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $totalPosts = $this->postModel->totalNumberFullPosts(); |
| 82 | 82 | $pagination = $this->pagination->getPagination($page, $totalPosts, $postsPerPage); |
| 83 | 83 | |
| 84 | - if($postsPerPage !== $defaultPostsPerpage){ |
|
| 84 | + if ($postsPerPage !== $defaultPostsPerpage) { |
|
| 85 | 85 | $this->data['paginationPostsPerPage'] = $postsPerPage; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | $onFrontpage = $posts["isOnFrontPage"]; |
| 137 | 137 | $idUser = $userSessionId; |
| 138 | 138 | |
| 139 | - if(!is_int($idUser) || $idUser === null) |
|
| 139 | + if (!is_int($idUser) || $idUser === null) |
|
| 140 | 140 | { |
| 141 | 141 | throw new \Error("Invalid userID"); |
| 142 | 142 | } |
@@ -170,10 +170,10 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | //checking result and redirecting |
| 172 | 172 | if ($postId != null) { |
| 173 | - $this->alertBox->setAlert("Post " . $title . " Created"); |
|
| 174 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
| 173 | + $this->alertBox->setAlert("Post ".$title." Created"); |
|
| 174 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
| 175 | 175 | } |
| 176 | - $this->alertBox->setAlert("Error creating " . $title, "error"); |
|
| 176 | + $this->alertBox->setAlert("Error creating ".$title, "error"); |
|
| 177 | 177 | $this->container->getResponse()->redirect("admin/post/new"); |
| 178 | 178 | |
| 179 | 179 | } |
@@ -242,11 +242,11 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | //checking result and redirecting |
| 244 | 244 | if ($postUpdate) { |
| 245 | - $this->alertBox->setAlert("Post " . $title . " Updated"); |
|
| 246 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
| 245 | + $this->alertBox->setAlert("Post ".$title." Updated"); |
|
| 246 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
| 247 | 247 | } |
| 248 | - $this->alertBox->setAlert("Error updating " . $title, "error"); |
|
| 249 | - $this->container->getResponse()->redirect("admin/post/modify/" . $originalPostSlug); |
|
| 248 | + $this->alertBox->setAlert("Error updating ".$title, "error"); |
|
| 249 | + $this->container->getResponse()->redirect("admin/post/modify/".$originalPostSlug); |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | $this->tagModel->removeTagsOnPost($postId); |
| 263 | 263 | $removedPost = $this->postModel->deletePost($postId); |
| 264 | 264 | |
| 265 | - if($removedPost) |
|
| 265 | + if ($removedPost) |
|
| 266 | 266 | { |
| 267 | 267 | $this->alertBox->setAlert("Post ".$postTitle." deleted"); |
| 268 | 268 | } |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | { |
| 9 | 9 | public function index() |
| 10 | 10 | { |
| 11 | - if(!$this->auth->isUser()){ |
|
| 11 | + if (!$this->auth->isUser()) { |
|
| 12 | 12 | $this->alertBox->setAlert("You must be connected to access the admin interface", 'warning'); |
| 13 | 13 | $this->container->getResponse()->redirect(); |
| 14 | 14 | } |