@@ -74,8 +74,8 @@ discard block |
||
| 74 | 74 | * Constructor |
| 75 | 75 | * @param mixed $params associative array of parameters. See README.md |
| 76 | 76 | */ |
| 77 | - function __construct($params=null) { |
|
| 78 | - $this->ci =& /** @scrutinizer ignore-call */ get_instance(); |
|
| 77 | + function __construct($params = null) { |
|
| 78 | + $this->ci = & /** @scrutinizer ignore-call */ get_instance(); |
|
| 79 | 79 | $this->ci->load->database(); |
| 80 | 80 | $this->table_name = self::TABLE_PREFIX . (isset($params["name"]) ? "_" . $params["name"] : ""); |
| 81 | 81 | $this->ci->load->database(); |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * |
| 100 | 100 | * @return bool True on Success, False if Not. |
| 101 | 101 | */ |
| 102 | - public function install(string $blogName=null, string $adminTableName=null, string $adminIdColumnName=null, int $adminIdColumnConstraint=null): bool { |
|
| 102 | + public function install(string $blogName = null, string $adminTableName = null, string $adminIdColumnName = null, int $adminIdColumnConstraint = null): bool { |
|
| 103 | 103 | $blogName = $blogName === null ? $this->table_name : self::TABLE_PREFIX . "_" . $blogName; |
| 104 | 104 | $this->ci->load->dbforge(); |
| 105 | 105 | $this->ci->dbforge->add_field("id"); |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | * |
| 216 | 216 | * @return bool True if sucessfull without errors, false if not. |
| 217 | 217 | */ |
| 218 | - public function loadEditor(string $callback, int $postId=null, bool $w3css=true): bool { |
|
| 218 | + public function loadEditor(string $callback, int $postId = null, bool $w3css = true): bool { |
|
| 219 | 219 | $this->loadScripts($w3css); |
| 220 | 220 | $this->ci->load->helper("form"); |
| 221 | 221 | $data = array( |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | * inputs. These are public string constants declared in |
| 246 | 246 | * this file. |
| 247 | 247 | */ |
| 248 | - public function savePost(int $posterId=null): string { |
|
| 248 | + public function savePost(int $posterId = null): string { |
|
| 249 | 249 | $action = $this->ci->security->xss_clean($this->ci->input->post("action")); |
| 250 | 250 | switch ($action) { |
| 251 | 251 | case "save": |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | * |
| 270 | 270 | * @return string Action taken during the pocess; Blogger::CREATE Or Blogger::EDIT |
| 271 | 271 | */ |
| 272 | - private function handleSavePost(int $posterId=null): string { |
|
| 272 | + private function handleSavePost(int $posterId = null): string { |
|
| 273 | 273 | $id = $this->ci->security->xss_clean($this->ci->input->post("id")); |
| 274 | 274 | if ($id != "") { |
| 275 | 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; |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | |
| 288 | 288 | * @return string Action reached while processing form inputs. |
| 289 | 289 | */ |
| 290 | - private function handlePublishPost(int $posterId=null): string { |
|
| 290 | + private function handlePublishPost(int $posterId = null): string { |
|
| 291 | 291 | $id = $this->ci->security->xss_clean($this->ci->input->post("id")); |
| 292 | 292 | if ($id == "") return self::ABORT; |
| 293 | 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; |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | * |
| 310 | 310 | * @return array Array of posts for a given page. |
| 311 | 311 | */ |
| 312 | - public function getPosts(int $page, int $limit, bool $filter=false, bool $hits=false): array { |
|
| 312 | + public function getPosts(int $page, int $limit, bool $filter = false, bool $hits = false): array { |
|
| 313 | 313 | return $this->ci->bmanager->getPosts($page, $limit, $filter, $hits); |
| 314 | 314 | } |
| 315 | 315 | /** |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | * |
| 336 | 336 | * @return bool True if successful, false if not. |
| 337 | 337 | */ |
| 338 | - 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 { |
|
| 338 | + 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 | 339 | if ($view === null || $empty_view === null) $this->ci->load->bind("francis94c/blog", $blogger); |
| 340 | 340 | $posts = $this->getPosts($page, $limit, $filter, $hits); |
| 341 | 341 | if (count($posts) == 0) { |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | * |
| 365 | 365 | * @return array [description] |
| 366 | 366 | */ |
| 367 | - public function getRecentPosts($limit=5, $filter=false): array { |
|
| 367 | + public function getRecentPosts($limit = 5, $filter = false): array { |
|
| 368 | 368 | return $this->ci->bmanager->getRecentPosts($limit, $filter); |
| 369 | 369 | } |
| 370 | 370 | /** |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | * @param [type] $view [description] |
| 374 | 374 | * @return [type] [description] |
| 375 | 375 | */ |
| 376 | - public function renderPost($post, $view=null) { |
|
| 376 | + public function renderPost($post, $view = null) { |
|
| 377 | 377 | if (!is_array($post)) $post = $this->ci->bmanager->getPost($post); |
| 378 | 378 | if (!$post) return false; |
| 379 | 379 | $post["content"] = $this->ci->parsedown->text($post["content"]); |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | * @param [type] $postId [description] |
| 410 | 410 | * @return [type] [description] |
| 411 | 411 | */ |
| 412 | - public function getPost($postId, $hit=true) { |
|
| 412 | + public function getPost($postId, $hit = true) { |
|
| 413 | 413 | return $this->ci->bmanager->getPost($postId, $hit); |
| 414 | 414 | } |
| 415 | 415 | /** |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | * @param boolean $filter [description] |
| 446 | 446 | * @return [type] [description] |
| 447 | 447 | */ |
| 448 | - public function searchPosts($words, $page, $limit=0, $filter=false) { |
|
| 448 | + public function searchPosts($words, $page, $limit = 0, $filter = false) { |
|
| 449 | 449 | return $this->ci->bmanager->searchPosts($words, $page, $limit, $filter); |
| 450 | 450 | } |
| 451 | 451 | } |
@@ -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 { |
@@ -374,8 +392,12 @@ discard block |
||
| 374 | 392 | * @return [type] [description] |
| 375 | 393 | */ |
| 376 | 394 | public function renderPost($post, $view=null) { |
| 377 | - if (!is_array($post)) $post = $this->ci->bmanager->getPost($post); |
|
| 378 | - if (!$post) return false; |
|
| 395 | + if (!is_array($post)) { |
|
| 396 | + $post = $this->ci->bmanager->getPost($post); |
|
| 397 | + } |
|
| 398 | + if (!$post) { |
|
| 399 | + return false; |
|
| 400 | + } |
|
| 379 | 401 | $post["content"] = $this->ci->parsedown->text($post["content"]); |
| 380 | 402 | if ($view == null) { |
| 381 | 403 | $this->ci->load->splint("francis94c/blog", "-post_item", $post); |
@@ -393,7 +415,9 @@ discard block |
||
| 393 | 415 | $data = array(); |
| 394 | 416 | $data["title"] = $post["title"]; |
| 395 | 417 | $data["description"] = substr($post["content"], 0, 154); |
| 396 | - if (isset($post["share_image"])) $data["image_link"] = $post["share_image"]; |
|
| 418 | + if (isset($post["share_image"])) { |
|
| 419 | + $data["image_link"] = $post["share_image"]; |
|
| 420 | + } |
|
| 397 | 421 | $data["url"] = current_url(); |
| 398 | 422 | return $this->ci->load->splint(self::PACKAGE, "-meta_og", $data, true); |
| 399 | 423 | } |