@@ -91,7 +91,7 @@ |
||
91 | 91 | * return the entire session superglobal. mainly for debugging purposes |
92 | 92 | * @return mixed |
93 | 93 | */ |
94 | - public function getAllSessionVars(){ |
|
94 | + public function getAllSessionVars() { |
|
95 | 95 | return $_SESSION; |
96 | 96 | } |
97 | 97 |
@@ -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): array |
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); |
@@ -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 acces the admin interface", 'warning'); |
13 | 13 | $this->container->getResponse()->redirect(); |
14 | 14 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | } |
37 | 37 | if ($success) { |
38 | 38 | $this->alertBox->setAlert('Configuration updates successfully'); |
39 | - } else { |
|
39 | + }else { |
|
40 | 40 | $this->alertBox->setAlert('error in configuration update', 'error'); |
41 | 41 | } |
42 | 42 | $this->container->getResponse()->redirect('admin/config'); |
@@ -38,7 +38,7 @@ |
||
38 | 38 | if (!$configModel->updateConfig($update->name, $update->value)) { |
39 | 39 | $result['success'] = false; |
40 | 40 | $result['errorId'][] = $update->name; |
41 | - } else { |
|
41 | + }else { |
|
42 | 42 | $result['successId'][] = $update->name; |
43 | 43 | } |
44 | 44 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | { |
25 | 25 | $this->session->set('user_role_name', 'Admin'); |
26 | 26 | $this->session->set('user_role_level', 2); |
27 | - $this->session->set('user_id',1); |
|
27 | + $this->session->set('user_id', 1); |
|
28 | 28 | $this->alertBox->setAlert('Connected as admin'); |
29 | 29 | $this->container->getResponse()->redirect('/admin/'); |
30 | 30 | } |
@@ -21,11 +21,11 @@ discard block |
||
21 | 21 | { |
22 | 22 | |
23 | 23 | if (!$this->isAlphaNum($table)) { |
24 | - throw new \ErrorException("Invalid table name " . $table); |
|
24 | + throw new \ErrorException("Invalid table name ".$table); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | if (!$this->isAlphaNum($columnName)) { |
28 | - throw new \ErrorException("Invalid Column name " . $columnName); |
|
28 | + throw new \ErrorException("Invalid Column name ".$columnName); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | $slugTbl = $this->getTablePrefix($table); |
@@ -49,15 +49,15 @@ discard block |
||
49 | 49 | public function getIdFromSlug(string $slug, string $table, string $columnName, string $idColumn): int |
50 | 50 | { |
51 | 51 | if (!$this->isAlphaNum($table)) { |
52 | - throw new \ErrorException("Invalid table name " . $table); |
|
52 | + throw new \ErrorException("Invalid table name ".$table); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | if (!$this->isAlphaNum($columnName)) { |
56 | - throw new \ErrorException("Invalid Slug Column name " . $columnName); |
|
56 | + throw new \ErrorException("Invalid Slug Column name ".$columnName); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | if (!$this->isAlphaNum($idColumn)) { |
60 | - throw new \ErrorException("Invalid ID Column name " . $columnName); |
|
60 | + throw new \ErrorException("Invalid ID Column name ".$columnName); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $slugTbl = $this->getTablePrefix($table); |
@@ -85,15 +85,15 @@ discard block |
||
85 | 85 | public function getSlugFromId(int $searchId, string $table, string $columnName, string $slugColumn): string |
86 | 86 | { |
87 | 87 | if (!$this->isAlphaNum($table)) { |
88 | - throw new \ErrorException("Invalid table name " . $table); |
|
88 | + throw new \ErrorException("Invalid table name ".$table); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | if (!$this->isAlphaNum($columnName)) { |
92 | - throw new \ErrorException("Invalid Slug Column name " . $columnName); |
|
92 | + throw new \ErrorException("Invalid Slug Column name ".$columnName); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | if (!$this->isAlphaNum($slugColumn)) { |
96 | - throw new \ErrorException("Invalid ID Column name " . $columnName); |
|
96 | + throw new \ErrorException("Invalid ID Column name ".$columnName); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $slugTbl = $this->getTablePrefix($table); |
@@ -174,10 +174,12 @@ |
||
174 | 174 | $this->alertBox->setAlert("empty slug not allowed", "error"); |
175 | 175 | } |
176 | 176 | |
177 | - if ($postSlug != $originalPostSlug) //if the slug has been updated |
|
177 | + if ($postSlug != $originalPostSlug) { |
|
178 | + //if the slug has been updated |
|
178 | 179 | { |
179 | 180 | if (!$slugModel->isUnique($postSlug, "posts", "posts_slug")) { |
180 | 181 | $error = true; |
182 | + } |
|
181 | 183 | $originalPostSlug = $slugModel->getSlugFromId($postId, "posts", "idposts", "posts_slug"); |
182 | 184 | $this->alertBox->setAlert("Slug not unique", "error"); |
183 | 185 | } |
@@ -124,10 +124,10 @@ discard block |
||
124 | 124 | |
125 | 125 | //checking result and redirecting |
126 | 126 | if ($postId != null) { |
127 | - $this->alertBox->setAlert("Post " . $title . " Created"); |
|
128 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
127 | + $this->alertBox->setAlert("Post ".$title." Created"); |
|
128 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
129 | 129 | } |
130 | - $this->alertBox->setAlert("Error creating " . $title, "error"); |
|
130 | + $this->alertBox->setAlert("Error creating ".$title, "error"); |
|
131 | 131 | $this->container->getResponse()->redirect("admin/post/new"); |
132 | 132 | |
133 | 133 | } |
@@ -206,10 +206,10 @@ discard block |
||
206 | 206 | |
207 | 207 | //checking result and redirecting |
208 | 208 | if ($postUpdate) { |
209 | - $this->alertBox->setAlert("Post " . $title . " Updated"); |
|
210 | - $this->container->getResponse()->redirect("admin/post/modify/" . $postSlug); |
|
209 | + $this->alertBox->setAlert("Post ".$title." Updated"); |
|
210 | + $this->container->getResponse()->redirect("admin/post/modify/".$postSlug); |
|
211 | 211 | } |
212 | - $this->alertBox->setAlert("Error updating " . $title, "error"); |
|
213 | - $this->container->getResponse()->redirect("admin/post/modify/" . $originalPostSlug); |
|
212 | + $this->alertBox->setAlert("Error updating ".$title, "error"); |
|
213 | + $this->container->getResponse()->redirect("admin/post/modify/".$originalPostSlug); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 | \ No newline at end of file |
@@ -22,5 +22,5 @@ |
||
22 | 22 | const FRONT_PAGE_POSTS = 3; |
23 | 23 | const POSTS_PER_PAGE = 4; |
24 | 24 | |
25 | - const EXCERPT_WORD_COUNT =50; |
|
25 | + const EXCERPT_WORD_COUNT = 50; |
|
26 | 26 | } |
27 | 27 | \ No newline at end of file |