@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $table = $reflect->getShortName(); //this is to only get the model name, otherwise we get the full namespace |
140 | 140 | //since our models all end with Model, we should remove it. |
141 | 141 | $table = $this->removeFromEnd($table, 'Model'); |
142 | - $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 |
|
142 | + $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 |
|
143 | 143 | $table = strtolower($table); //the database names are in lowercase |
144 | 144 | } |
145 | 145 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | //if we are here, then table doesn't exist, check for view |
165 | - $view = 'v_' . $table; |
|
165 | + $view = 'v_'.$table; |
|
166 | 166 | $stmt->bindValue(':table', $view, PDO::PARAM_STR); |
167 | 167 | $stmt->execute(); |
168 | 168 | $exists = $stmt->rowCount() > 0; //will return 1 if table exists or 0 if non existant |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | protected function getTablePrefix($table) |
187 | 187 | { |
188 | 188 | if (Config::TABLE_PREFIX != '') { |
189 | - $table = Config::TABLE_PREFIX . '_' . $table; |
|
189 | + $table = Config::TABLE_PREFIX.'_'.$table; |
|
190 | 190 | } |
191 | 191 | return $table; |
192 | 192 | } |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | protected function getRowById($rowId, $table = null) |
256 | 256 | { |
257 | 257 | $tableName = $this->getTable($table); |
258 | - $idName = 'id' . $tableName; |
|
258 | + $idName = 'id'.$tableName; |
|
259 | 259 | $sql = "SELECT * FROM $tableName WHERE $idName = :rowId"; |
260 | 260 | $this->query($sql); |
261 | 261 | $this->bind(':rowId', $rowId); |
@@ -211,10 +211,12 @@ |
||
211 | 211 | $this->alertBox->setAlert("empty slug not allowed", "error"); |
212 | 212 | } |
213 | 213 | |
214 | - if ($postSlug != $originalPostSlug) //if the slug has been updated |
|
214 | + if ($postSlug != $originalPostSlug) { |
|
215 | + //if the slug has been updated |
|
215 | 216 | { |
216 | 217 | if (!$this->postModel->isPostSlugUnique($postSlug)) { |
217 | 218 | $error = true; |
219 | + } |
|
218 | 220 | $originalPostSlug = $this->postModel->getPostSlugFromId($postId); |
219 | 221 | $this->alertBox->setAlert("Slug not unique", "error"); |
220 | 222 | } |
@@ -166,10 +166,10 @@ discard block |
||
166 | 166 | |
167 | 167 | //checking result and redirecting |
168 | 168 | if ($postId != null) { |
169 | - $this->alertBox->setAlert("Post " . $title . " Created"); |
|
170 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
169 | + $this->alertBox->setAlert("Post ".$title." Created"); |
|
170 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
171 | 171 | } |
172 | - $this->alertBox->setAlert("Error creating " . $title, "error"); |
|
172 | + $this->alertBox->setAlert("Error creating ".$title, "error"); |
|
173 | 173 | $this->container->getResponse()->redirect("admin/post/new"); |
174 | 174 | |
175 | 175 | } |
@@ -237,11 +237,11 @@ discard block |
||
237 | 237 | |
238 | 238 | //checking result and redirecting |
239 | 239 | if ($postUpdate) { |
240 | - $this->alertBox->setAlert("Post " . $title . " Updated"); |
|
241 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
240 | + $this->alertBox->setAlert("Post ".$title." Updated"); |
|
241 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
242 | 242 | } |
243 | - $this->alertBox->setAlert("Error updating " . $title, "error"); |
|
244 | - $this->container->getResponse()->redirect("admin/post/modify/" . $originalPostSlug); |
|
243 | + $this->alertBox->setAlert("Error updating ".$title, "error"); |
|
244 | + $this->container->getResponse()->redirect("admin/post/modify/".$originalPostSlug); |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | $removedPost = $this->postModel->deletePost($postId); |
259 | 259 | |
260 | 260 | if ($removedPost) { |
261 | - $this->alertBox->setAlert("Post " . $postTitle . " deleted"); |
|
261 | + $this->alertBox->setAlert("Post ".$postTitle." deleted"); |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | $this->response->redirect("admin/post/list/"); |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | |
104 | 104 | //checking result and redirecting |
105 | 105 | if ($categoryUpdate) { |
106 | - $this->alertBox->setAlert("Category " . $categoryName . " updated"); |
|
106 | + $this->alertBox->setAlert("Category ".$categoryName." updated"); |
|
107 | 107 | $this->container->getResponse()->redirect("/admin/category/list/"); |
108 | 108 | } |
109 | - $this->alertBox->setAlert("Error updating " . $categoryName, "error"); |
|
109 | + $this->alertBox->setAlert("Error updating ".$categoryName, "error"); |
|
110 | 110 | $this->container->getResponse()->redirect("/admin/category/list/"); |
111 | 111 | } |
112 | 112 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $removedCategory = $this->categoryModel->delete($categoryId); |
124 | 124 | |
125 | 125 | if ($removedCategory) { |
126 | - $this->alertBox->setAlert("Category " . $categoryName . " deleted"); |
|
126 | + $this->alertBox->setAlert("Category ".$categoryName." deleted"); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | $this->response->redirect("/admin/category/list/"); |
@@ -168,10 +168,10 @@ discard block |
||
168 | 168 | |
169 | 169 | //checking result and redirecting |
170 | 170 | if ($categoryNew) { |
171 | - $this->alertBox->setAlert("Category " . $categoryName . " created"); |
|
171 | + $this->alertBox->setAlert("Category ".$categoryName." created"); |
|
172 | 172 | $this->container->getResponse()->redirect("/admin/category/list/"); |
173 | 173 | } |
174 | - $this->alertBox->setAlert("Error creating " . $categoryName, "error"); |
|
174 | + $this->alertBox->setAlert("Error creating ".$categoryName, "error"); |
|
175 | 175 | $this->container->getResponse()->redirect("/admin/category/list/"); |
176 | 176 | } |
177 | 177 | } |
178 | 178 | \ No newline at end of file |
@@ -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 |
@@ -15,7 +15,7 @@ |
||
15 | 15 | */ |
16 | 16 | public function index() |
17 | 17 | { |
18 | - if(!$this->auth->isUser()){ |
|
18 | + if (!$this->auth->isUser()) { |
|
19 | 19 | $this->alertBox->setAlert("You must be connected to access the admin interface", 'warning'); |
20 | 20 | $this->container->getResponse()->redirect(); |
21 | 21 | } |
@@ -36,9 +36,11 @@ |
||
36 | 36 | |
37 | 37 | $data = $postModel->isPostSlugUnique($postSlug); |
38 | 38 | |
39 | - if ($data === false) //slug is not unique, but could be from the same post |
|
39 | + if ($data === false) { |
|
40 | + //slug is not unique, but could be from the same post |
|
40 | 41 | { |
41 | 42 | $slugOfId = $postModel->getPostSlugFromId($postId); |
43 | + } |
|
42 | 44 | if ($slugOfId === $postSlug) { |
43 | 45 | //it's the same post, return true |
44 | 46 | $data = true; |
@@ -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 |
@@ -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,7 +25,7 @@ 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 | } |
@@ -92,7 +92,7 @@ |
||
92 | 92 | * return the entire session superglobal. |
93 | 93 | * @return mixed |
94 | 94 | */ |
95 | - public function getAllSessionVars(){ |
|
95 | + public function getAllSessionVars() { |
|
96 | 96 | return $_SESSION; |
97 | 97 | } |
98 | 98 |