@@ -1,7 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | -if (!isset($title)) $title = ""; |
|
| 3 | -if (!isset($content)) $content = ""; |
|
| 4 | -if (!isset($prompt_color)) $prompt_color = "w3-green"; |
|
| 2 | +if (!isset($title)) { |
|
| 3 | + $title = ""; |
|
| 4 | +} |
|
| 5 | +if (!isset($content)) { |
|
| 6 | + $content = ""; |
|
| 7 | +} |
|
| 8 | +if (!isset($prompt_color)) { |
|
| 9 | + $prompt_color = "w3-green"; |
|
| 10 | +} |
|
| 5 | 11 | ?> |
| 6 | 12 | <div id="publishModal" class="w3-modal w3-animate-opacity"> |
| 7 | 13 | <div class="w3-modal-content"> |
@@ -284,7 +284,6 @@ |
||
| 284 | 284 | * submited form.] |
| 285 | 285 | * |
| 286 | 286 | * @param int $posterId ID of the publishing Admin. |
| 287 | - |
|
| 288 | 287 | * @return string Action reached while processing form inputs. |
| 289 | 288 | */ |
| 290 | 289 | private function handlePublishPost(int $posterId=null): string { |
@@ -139,7 +139,9 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | $this->ci->dbforge->add_field("date_created TIMESTAMP DEFAULT CURRENT_TIMESTAMP"); |
| 141 | 141 | $attributes = array('ENGINE' => 'InnoDB'); |
| 142 | - if (!$this->ci->dbforge->create_table($blogName, true, $attributes)) return false; |
|
| 142 | + if (!$this->ci->dbforge->create_table($blogName, true, $attributes)) { |
|
| 143 | + return false; |
|
| 144 | + } |
|
| 143 | 145 | return true; |
| 144 | 146 | } |
| 145 | 147 | /** |
@@ -253,10 +255,14 @@ discard block |
||
| 253 | 255 | case "publish": |
| 254 | 256 | return $this->handlePublishPost($posterId); |
| 255 | 257 | case "createAndPublish": |
| 256 | - if ($this->ci->bmanager->createAndPublishPost($this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId) !== false) return self::CREATE_AND_PUBLISH; |
|
| 258 | + if ($this->ci->bmanager->createAndPublishPost($this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId) !== false) { |
|
| 259 | + return self::CREATE_AND_PUBLISH; |
|
| 260 | + } |
|
| 257 | 261 | return self::ABORT; |
| 258 | 262 | case "delete": |
| 259 | - if ($this->ci->bmanager->deletePost($this->ci->security->xss_clean($this->ci->input->post("id")))) return self::DELETE; |
|
| 263 | + if ($this->ci->bmanager->deletePost($this->ci->security->xss_clean($this->ci->input->post("id")))) { |
|
| 264 | + return self::DELETE; |
|
| 265 | + } |
|
| 260 | 266 | return self::ABORT; |
| 261 | 267 | default: |
| 262 | 268 | return self::NO_ACTION; |
@@ -272,10 +278,14 @@ discard block |
||
| 272 | 278 | private function handleSavePost(int $posterId=null): string { |
| 273 | 279 | $id = $this->ci->security->xss_clean($this->ci->input->post("id")); |
| 274 | 280 | if ($id != "") { |
| 275 | - if (!$this->ci->bmanager->savePost($this->ci->input->post("id"), $this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId)) return self::ABORT; |
|
| 281 | + if (!$this->ci->bmanager->savePost($this->ci->input->post("id"), $this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId)) { |
|
| 282 | + return self::ABORT; |
|
| 283 | + } |
|
| 276 | 284 | return self::EDIT; |
| 277 | 285 | } else { |
| 278 | - if ($this->ci->bmanager->createPost($this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId) == 0) return self::ABORT; |
|
| 286 | + if ($this->ci->bmanager->createPost($this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId) == 0) { |
|
| 287 | + return self::ABORT; |
|
| 288 | + } |
|
| 279 | 289 | return self::CREATE; |
| 280 | 290 | } |
| 281 | 291 | } |
@@ -289,9 +299,15 @@ discard block |
||
| 289 | 299 | */ |
| 290 | 300 | private function handlePublishPost(int $posterId=null): string { |
| 291 | 301 | $id = $this->ci->security->xss_clean($this->ci->input->post("id")); |
| 292 | - if ($id == "") return self::ABORT; |
|
| 293 | - if (!$this->ci->bmanager->savePost($id, $this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId)) return self::ABORT; |
|
| 294 | - if (!$this->ci->bmanager->publishPost($id, true)) return self::ABORT; |
|
| 302 | + if ($id == "") { |
|
| 303 | + return self::ABORT; |
|
| 304 | + } |
|
| 305 | + if (!$this->ci->bmanager->savePost($id, $this->ci->security->xss_clean($this->ci->input->post("title")), $this->ci->security->xss_clean($this->ci->input->post("editor")), $posterId)) { |
|
| 306 | + return self::ABORT; |
|
| 307 | + } |
|
| 308 | + if (!$this->ci->bmanager->publishPost($id, true)) { |
|
| 309 | + return self::ABORT; |
|
| 310 | + } |
|
| 295 | 311 | return self::PUBLISH; |
| 296 | 312 | } |
| 297 | 313 | /** |
@@ -336,7 +352,9 @@ discard block |
||
| 336 | 352 | * @return bool True if successful, false if not. |
| 337 | 353 | */ |
| 338 | 354 | public function renderPostItems(string $view=null, string $callback=null, string $empty_view=null, int $page=1, int $limit=5, bool $filter=false, bool $hits=false, bool $slug=true): bool { |
| 339 | - if ($view === null || $empty_view === null) $this->ci->load->bind("francis94c/blog", $blogger); |
|
| 355 | + if ($view === null || $empty_view === null) { |
|
| 356 | + $this->ci->load->bind("francis94c/blog", $blogger); |
|
| 357 | + } |
|
| 340 | 358 | $posts = $this->getPosts($page, $limit, $filter, $hits); |
| 341 | 359 | if (count($posts) == 0) { |
| 342 | 360 | if ($empty_view === null) { $blogger->load->view("empty"); } else { |
@@ -379,8 +397,12 @@ discard block |
||
| 379 | 397 | * @return bool True if successful, false if not. |
| 380 | 398 | */ |
| 381 | 399 | public function renderPost($post, string $view=null): bool { |
| 382 | - if (!is_array($post)) $post = $this->ci->bmanager->getPost($post); |
|
| 383 | - if (!$post) return false; |
|
| 400 | + if (!is_array($post)) { |
|
| 401 | + $post = $this->ci->bmanager->getPost($post); |
|
| 402 | + } |
|
| 403 | + if (!$post) { |
|
| 404 | + return false; |
|
| 405 | + } |
|
| 384 | 406 | $post["content"] = $this->ci->parsedown->text($post["content"]); |
| 385 | 407 | if ($view === null) { |
| 386 | 408 | $this->ci->load->splint("francis94c/blog", "-post_item", $post); |
@@ -403,7 +425,9 @@ discard block |
||
| 403 | 425 | $data = array(); |
| 404 | 426 | $data["title"] = $post["title"]; |
| 405 | 427 | $data["description"] = substr($post["content"], 0, 154); |
| 406 | - if (isset($post["share_image"])) $data["image_link"] = $post["share_image"]; |
|
| 428 | + if (isset($post["share_image"])) { |
|
| 429 | + $data["image_link"] = $post["share_image"]; |
|
| 430 | + } |
|
| 407 | 431 | $data["url"] = current_url(); |
| 408 | 432 | // Return Meta OG View String. |
| 409 | 433 | return $this->ci->load->splint(self::PACKAGE, "-meta_og", $data, true); |
@@ -51,9 +51,15 @@ discard block |
||
| 51 | 51 | "content" => $content, |
| 52 | 52 | "slug" => url_title($title) |
| 53 | 53 | ); |
| 54 | - if (is_numeric($title)) $data["slug"] = "_" . $data["slug"]; |
|
| 55 | - if ($adminId !== null) $data["poster_id"] = $adminId; |
|
| 56 | - if ($this->db->insert($this->table_name, $data)) return $this->db->insert_id(); |
|
| 54 | + if (is_numeric($title)) { |
|
| 55 | + $data["slug"] = "_" . $data["slug"]; |
|
| 56 | + } |
|
| 57 | + if ($adminId !== null) { |
|
| 58 | + $data["poster_id"] = $adminId; |
|
| 59 | + } |
|
| 60 | + if ($this->db->insert($this->table_name, $data)) { |
|
| 61 | + return $this->db->insert_id(); |
|
| 62 | + } |
|
| 57 | 63 | return 0; |
| 58 | 64 | } |
| 59 | 65 | /** |
@@ -71,9 +77,15 @@ discard block |
||
| 71 | 77 | "published" => 1, |
| 72 | 78 | "date_published" => date("Y-m-d H:i:s") |
| 73 | 79 | ); |
| 74 | - if (is_numeric($title)) $data["slug"] = "_" . $data["slug"]; |
|
| 75 | - if ($adminId != null) $data["poster_id"] = $adminId; |
|
| 76 | - if ($this->db->insert($this->table_name, $data)) return $this->db->insert_id(); |
|
| 80 | + if (is_numeric($title)) { |
|
| 81 | + $data["slug"] = "_" . $data["slug"]; |
|
| 82 | + } |
|
| 83 | + if ($adminId != null) { |
|
| 84 | + $data["poster_id"] = $adminId; |
|
| 85 | + } |
|
| 86 | + if ($this->db->insert($this->table_name, $data)) { |
|
| 87 | + return $this->db->insert_id(); |
|
| 88 | + } |
|
| 77 | 89 | return false; |
| 78 | 90 | } |
| 79 | 91 | /** |
@@ -92,8 +104,12 @@ discard block |
||
| 92 | 104 | * @return array Array of posts for a given page. |
| 93 | 105 | */ |
| 94 | 106 | function getPosts(int $page=1, int $limit=5, bool $filter=false, bool $hits=false): array { |
| 95 | - if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit); |
|
| 96 | - if ($filter) $this->db->where("published", 1); |
|
| 107 | + if ($limit != 0) { |
|
| 108 | + $this->db->limit($limit, ($page * $limit) - $limit); |
|
| 109 | + } |
|
| 110 | + if ($filter) { |
|
| 111 | + $this->db->where("published", 1); |
|
| 112 | + } |
|
| 97 | 113 | if ($hits) { |
| 98 | 114 | $this->db->order_by("hits", "DESC"); |
| 99 | 115 | } else { |
@@ -108,8 +124,12 @@ discard block |
||
| 108 | 124 | * @return [type] [description] |
| 109 | 125 | */ |
| 110 | 126 | function getRecentPosts($limit=5, $filter=false) { |
| 111 | - if ($limit != null && $limit != null) $this->db->limit($limit); |
|
| 112 | - if ($filter) $this->db->where("published", 1); |
|
| 127 | + if ($limit != null && $limit != null) { |
|
| 128 | + $this->db->limit($limit); |
|
| 129 | + } |
|
| 130 | + if ($filter) { |
|
| 131 | + $this->db->where("published", 1); |
|
| 132 | + } |
|
| 113 | 133 | $this->db->order_by("id", "DESC"); |
| 114 | 134 | return $this->db->get($this->table_name)->result_array(); |
| 115 | 135 | } |
@@ -147,7 +167,9 @@ discard block |
||
| 147 | 167 | if ($hit) { |
| 148 | 168 | if ($this->ci->config->item("blogger_hits") === null || |
| 149 | 169 | $this->ci->config->item("blogger_hits") === true) { |
| 150 | - if (!is_numeric($postId)) $postId = $query->result()[0]->id; |
|
| 170 | + if (!is_numeric($postId)) { |
|
| 171 | + $postId = $query->result()[0]->id; |
|
| 172 | + } |
|
| 151 | 173 | $this->db->where("id", $postId); |
| 152 | 174 | $this->db->set("hits", "hits+1", FALSE); |
| 153 | 175 | $this->db->update($this->table_name); |
@@ -162,7 +184,9 @@ discard block |
||
| 162 | 184 | $src = array(); |
| 163 | 185 | // Get the contents of the src tag. |
| 164 | 186 | preg_match("/(http|https):\/\/[a-zA-Z0-9-._\/]+/", $share_image, $src); |
| 165 | - if (count($src) == 0) return $post; |
|
| 187 | + if (count($src) == 0) { |
|
| 188 | + return $post; |
|
| 189 | + } |
|
| 166 | 190 | $post["share_image"] = $src[0]; |
| 167 | 191 | return $post; |
| 168 | 192 | } |
@@ -176,7 +200,9 @@ discard block |
||
| 176 | 200 | function getHits(int $postId): int { |
| 177 | 201 | $this->db->where("id", $postId); |
| 178 | 202 | $query = $this->db->get($this->table_name); |
| 179 | - if ($query->num_rows() > 0) return $query->result()[0]->hits; |
|
| 203 | + if ($query->num_rows() > 0) { |
|
| 204 | + return $query->result()[0]->hits; |
|
| 205 | + } |
|
| 180 | 206 | return 0; |
| 181 | 207 | } |
| 182 | 208 | /** |
@@ -196,7 +222,9 @@ discard block |
||
| 196 | 222 | * @return [type] [description] |
| 197 | 223 | */ |
| 198 | 224 | function getPostsCount(bool $filter=true): int { |
| 199 | - if ($filter) $this->db->where("published", 1); |
|
| 225 | + if ($filter) { |
|
| 226 | + $this->db->where("published", 1); |
|
| 227 | + } |
|
| 200 | 228 | $this->db->select("COUNT(title) as posts"); |
| 201 | 229 | return (int) $this->db->get($this->table_name)->result()[0]->posts; |
| 202 | 230 | } |
@@ -218,8 +246,12 @@ discard block |
||
| 218 | 246 | * @return [type] [description] |
| 219 | 247 | */ |
| 220 | 248 | function searchPosts($words, $page, $limit=0, $filter=false) { |
| 221 | - if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit); |
|
| 222 | - if ($filter) $this->db->where("published", 1); |
|
| 249 | + if ($limit != 0) { |
|
| 250 | + $this->db->limit($limit, ($page * $limit) - $limit); |
|
| 251 | + } |
|
| 252 | + if ($filter) { |
|
| 253 | + $this->db->where("published", 1); |
|
| 254 | + } |
|
| 223 | 255 | $this->db->like("title", $words); |
| 224 | 256 | $this->db->or_like("content", $words); |
| 225 | 257 | return $this->db->get($this->table_name)->result_array(); |