francis94c / blog

views/post_edit.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
   </textarea>
 </div>
 <?php
-$ci =& get_instance();
+$ci = & get_instance();
 $ci->load->splint("francis94c/ci-parsedown", "+Parsedown", null, "parsedown");
 ?>
 <div class="w3-padding w3-margin w3-border w3-round" id="preview">
@@ -76,7 +76,7 @@ 
  * @return [type] [description]
  */
 function saveAndPublish() {
-  document.getElementById("action").value = <?=$type == "edit" ? "\"publish\"" : "\"createAndPublish\"";?>;
+  document.getElementById("action").value = <?=$type == "edit" ? "\"publish\"" : "\"createAndPublish\""; ?>;
   document.getElementById("postForm").submit();
 }
 /**
@@ -104,7 +104,7 @@ 
 </script>
 <input type="hidden" name="id" value="<?=$type == "edit" ? $id : ""?>"/>
 <input id="action" type="hidden" name="action" value="publish"/>
-<?=form_close();?>
+<?=form_close(); ?>
 <button onclick="save();" class="w3-margin w3-button w3-teal w3-round w3-hover-theme"><?=$type == "edit" ? "Save" : "Create"?></button>
 <button onclick="promptPublish();" class="w3-margin w3-button w3-teal w3-hover-theme w3-round"><?=$type == "edit" ? "Save and Publish" : "Create and Publish"?></button>
 <?php if ($type == "edit") {?>

Braces +9 added lines, -3 removed lines

@@ -1,7 +1,13 @@
 <?php
-if (!isset($title)) $title = "";
-if (!isset($content)) $content = "";
-if (!isset($prompt_color)) $prompt_color = "w3-green";
+if (!isset($title)) {
+  $title = "";
+}
+if (!isset($content)) {
+  $content = "";
+}
+if (!isset($prompt_color)) {
+  $prompt_color = "w3-green";
+}
 ?>
 <div id="publishModal" class="w3-modal w3-animate-opacity">
   <div class="w3-modal-content">

models/BlogManager.php

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
 
   function __construct() {
     parent::__construct();
-    $this->ci =& get_instance();
+    $this->ci = & get_instance();
     $this->ci->load->database();
   }
   /**
@@ -44,7 +44,7 @@ 
    *                         database. Returns 0 if the post couldn't be
    *                         created.
    */
-  function createPost(string $title, string $content, int $adminId=null): int {
+  function createPost(string $title, string $content, int $adminId = null): int {
     $this->ci->load->helper("url");
     $data = array(
       "title"   => $title,
@@ -63,7 +63,7 @@ 
    * @param  [type] $adminId [description]
    * @return [type]          [description]
    */
-  function createAndPublishPost($title, $content, $adminId=null) {
+  function createAndPublishPost($title, $content, $adminId = null) {
     $data = array(
       "title"          => $title,
       "content"        => $content,
@@ -86,7 +86,7 @@ 
    * @param  boolean $hits   order by hits.
    * @return array           Array of posts for a given page.
    */
-  function getPosts($page=1, $limit=5, $filter=false, $hits=false) {
+  function getPosts($page = 1, $limit = 5, $filter = false, $hits = false) {
     if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit);
     if ($filter) $this->db->where("published", 1);
     if ($hits) {
@@ -102,7 +102,7 @@ 
    * @param  boolean $filter [description]
    * @return [type]          [description]
    */
-  function getRecentPosts($limit=5, $filter=false) {
+  function getRecentPosts($limit = 5, $filter = false) {
     if ($limit != null && $limit != null) $this->db->limit($limit);
     if ($filter) $this->db->where("published", 1);
     $this->db->order_by("id", "DESC");
@@ -117,7 +117,7 @@ 
    * @return bool            True on success, False if not.
    */
   function savePost($postId, $title, $content): bool {
-    $data = array (
+    $data = array(
       "title"   => $title,
       "content" => $content,
       "slug"    => url_title($title)
@@ -131,7 +131,7 @@ 
    * @param  int   $postId ID of the post to retrieve.
    * @return array An associative array for the Posts's data.
    */
-  function getPost($postId, $hit=true) {
+  function getPost($postId, $hit = true) {
     if (is_numeric($postId)) {
       $this->db->where("id", $postId);
     } else {
@@ -147,7 +147,7 @@ 
           $this->db->update($this->table_name);
         }
       }
-      $post =  $query->result_array()[0];
+      $post = $query->result_array()[0];
       $images = array();
       // Fetch all images in post.
       preg_match("/<img\s[^>]*?src\s*=\s*['\"]([^'\"]*?)['\"][^>]*?>/", $post["content"], $images);
@@ -210,7 +210,7 @@ 
    * @param  boolean $filter [description]
    * @return [type]          [description]
    */
-  function searchPosts($words, $page, $limit=0, $filter=false) {
+  function searchPosts($words, $page, $limit = 0, $filter = false) {
     if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit);
     if ($filter) $this->db->where("published", 1);
     $this->db->like("title", $words);

Braces +42 added lines, -14 removed lines

@@ -51,9 +51,15 @@ 
       "content" => $content,
       "slug"    => url_title($title)
     );
-    if (is_numeric($title)) $data["slug"] = "_" . $data["slug"];
-    if ($adminId !== null) $data["poster_id"] = $adminId;
-    if ($this->db->insert($this->table_name, $data)) return $this->db->insert_id();
+    if (is_numeric($title)) {
+      $data["slug"] = "_" . $data["slug"];
+    }
+    if ($adminId !== null) {
+      $data["poster_id"] = $adminId;
+    }
+    if ($this->db->insert($this->table_name, $data)) {
+      return $this->db->insert_id();
+    }
     return 0;
   }
   /**
@@ -71,9 +77,15 @@ 
       "published"      => 1,
       "date_published" => date("Y-m-d H:i:s")
     );
-    if (is_numeric($title)) $data["slug"] = "_" . $data["slug"];
-    if ($adminId != null) $data["poster_id"] = $adminId;
-    if ($this->db->insert($this->table_name, $data)) return $this->db->insert_id();
+    if (is_numeric($title)) {
+      $data["slug"] = "_" . $data["slug"];
+    }
+    if ($adminId != null) {
+      $data["poster_id"] = $adminId;
+    }
+    if ($this->db->insert($this->table_name, $data)) {
+      return $this->db->insert_id();
+    }
     return false;
   }
   /**
@@ -87,8 +99,12 @@ 
    * @return array           Array of posts for a given page.
    */
   function getPosts($page=1, $limit=5, $filter=false, $hits=false) {
-    if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit);
-    if ($filter) $this->db->where("published", 1);
+    if ($limit != 0) {
+      $this->db->limit($limit, ($page * $limit) - $limit);
+    }
+    if ($filter) {
+      $this->db->where("published", 1);
+    }
     if ($hits) {
       $this->db->order_by("hits", "DESC");
     } else {
@@ -103,8 +119,12 @@ 
    * @return [type]          [description]
    */
   function getRecentPosts($limit=5, $filter=false) {
-    if ($limit != null && $limit != null) $this->db->limit($limit);
-    if ($filter) $this->db->where("published", 1);
+    if ($limit != null && $limit != null) {
+      $this->db->limit($limit);
+    }
+    if ($filter) {
+      $this->db->where("published", 1);
+    }
     $this->db->order_by("id", "DESC");
     return $this->db->get($this->table_name)->result_array();
   }
@@ -156,7 +176,9 @@ 
       $src = array();
       // Get the contents of the src tag.
       preg_match("/(http|https):\/\/[a-zA-Z0-9-._\/]+/", $share_image, $src);
-      if (count($src) == 0) return $post;
+      if (count($src) == 0) {
+        return $post;
+      }
       $post["share_image"] = $src[0];
       return $post;
     }
@@ -170,7 +192,9 @@ 
   function getHits($postId) {
     $this->db->where("id", $postId);
     $query = $this->db->get($this->table_name);
-    if ($query->num_rows() > 0) return $query->result()[0]->hits;
+    if ($query->num_rows() > 0) {
+      return $query->result()[0]->hits;
+    }
     return 0;
   }
   /**
@@ -211,8 +235,12 @@ 
    * @return [type]          [description]
    */
   function searchPosts($words, $page, $limit=0, $filter=false) {
-    if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit);
-    if ($filter) $this->db->where("published", 1);
+    if ($limit != 0) {
+      $this->db->limit($limit, ($page * $limit) - $limit);
+    }
+    if ($filter) {
+      $this->db->where("published", 1);
+    }
     $this->db->like("title", $words);
     $this->db->or_like("content", $words);
     return $this->db->get($this->table_name)->result_array();

libraries/Blogger.php

Indentation -1 removed lines

@@ -284,7 +284,6 @@
    *  submited form.]
    *
    * @param  int    $posterId ID of the publishing Admin.
-
    * @return string           Action reached while processing form inputs.
    */
   private function handlePublishPost(int $posterId=null): string {

Spacing +13 added lines, -13 removed lines

@@ -74,8 +74,8 @@ 
    * Constructor
    * @param mixed $params associative array of parameters. See README.md
    */
-  function __construct($params=null) {
-    $this->ci =& /** @scrutinizer ignore-call */ get_instance();
+  function __construct($params = null) {
+    $this->ci = & /** @scrutinizer ignore-call */ get_instance();
     $this->ci->load->database();
     $this->table_name = self::TABLE_PREFIX . (isset($params["name"]) ? "_" . $params["name"] : "");
     $this->ci->load->database();
@@ -99,7 +99,7 @@ 
    *
    * @return bool                            True on Success, False if Not.
    */
-  public function install(string $blogName=null, string $adminTableName=null, string $adminIdColumnName=null, int $adminIdColumnConstraint=null): bool {
+  public function install(string $blogName = null, string $adminTableName = null, string $adminIdColumnName = null, int $adminIdColumnConstraint = null): bool {
     $blogName = $blogName === null ? $this->table_name : self::TABLE_PREFIX . "_" . $blogName;
     $this->ci->load->dbforge();
     $this->ci->dbforge->add_field("id");
@@ -215,7 +215,7 @@ 
    *
    * @return bool              True  if sucessfull without errors, false if not.
    */
-  public function loadEditor(string $callback, int $postId=null, bool $w3css=true): bool {
+  public function loadEditor(string $callback, int $postId = null, bool $w3css = true): bool {
     $this->loadScripts($w3css);
     $this->ci->load->helper("form");
     $data = array(
@@ -245,7 +245,7 @@ 
    *                       inputs. These are public string constants declared in
    *                       this file.
    */
-  public function savePost(int $posterId=null): string {
+  public function savePost(int $posterId = null): string {
     $action = $this->ci->security->xss_clean($this->ci->input->post("action"));
     switch ($action) {
       case "save":
@@ -269,7 +269,7 @@ 
    *
    * @return string             Action taken during the pocess; Blogger::CREATE Or Blogger::EDIT
    */
-  private function handleSavePost(int $posterId=null): string {
+  private function handleSavePost(int $posterId = null): string {
     $id = $this->ci->security->xss_clean($this->ci->input->post("id"));
     if ($id != "") {
       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 @@ 
 
    * @return string           Action reached while processing form inputs.
    */
-  private function handlePublishPost(int $posterId=null): string {
+  private function handlePublishPost(int $posterId = null): string {
     $id = $this->ci->security->xss_clean($this->ci->input->post("id"));
     if ($id == "") return self::ABORT;
     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 @@ 
    *
    * @return array           Array of posts for a given page.
    */
-  public function getPosts(int $page, int $limit, bool $filter=false, bool $hits=false): array {
+  public function getPosts(int $page, int $limit, bool $filter = false, bool $hits = false): array {
     return $this->ci->bmanager->getPosts($page, $limit, $filter, $hits);
   }
   /**
@@ -335,7 +335,7 @@ 
    *
    * @return bool                True if successful, false if not.
    */
-  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 {
+  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 {
     if ($view === null || $empty_view === null) $this->ci->load->bind("francis94c/blog", $blogger);
     $posts = $this->getPosts($page, $limit, $filter, $hits);
     if (count($posts) == 0) {
@@ -364,7 +364,7 @@ 
    *
    * @return array          [description]
    */
-  public function getRecentPosts($limit=5, $filter=false): array {
+  public function getRecentPosts($limit = 5, $filter = false): array {
     return $this->ci->bmanager->getRecentPosts($limit, $filter);
   }
   /**
@@ -378,7 +378,7 @@ 
    *
    * @return bool             True if successful, false if not.
    */
-  public function renderPost($post, $view=null): bool {
+  public function renderPost($post, $view = null): bool {
     if (!is_array($post)) $post = $this->ci->bmanager->getPost($post);
     if (!$post) return false;
     $post["content"] = $this->ci->parsedown->text($post["content"]);
@@ -423,7 +423,7 @@ 
    * @param  [type] $postId [description]
    * @return [type]         [description]
    */
-  public function getPost($postId, $hit=true) {
+  public function getPost($postId, $hit = true) {
     return $this->ci->bmanager->getPost($postId, $hit);
   }
   /**
@@ -459,7 +459,7 @@ 
    * @param  boolean $filter [description]
    * @return [type]          [description]
    */
-  public function searchPosts($words, $page, $limit=0, $filter=false) {
+  public function searchPosts($words, $page, $limit = 0, $filter = false) {
     return $this->ci->bmanager->searchPosts($words, $page, $limit, $filter);
   }
 }

Braces +36 added lines, -12 removed lines

@@ -139,7 +139,9 @@ 
     }
     $this->ci->dbforge->add_field("date_created TIMESTAMP DEFAULT CURRENT_TIMESTAMP");
     $attributes = array('ENGINE' => 'InnoDB');
-    if (!$this->ci->dbforge->create_table($blogName, true, $attributes)) return false;
+    if (!$this->ci->dbforge->create_table($blogName, true, $attributes)) {
+      return false;
+    }
     return true;
   }
   /**
@@ -253,10 +255,14 @@ 
       case "publish":
         return $this->handlePublishPost($posterId);
       case "createAndPublish":
-        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;
+        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;
+        }
         return self::ABORT;
       case "delete":
-        if ($this->ci->bmanager->deletePost($this->ci->security->xss_clean($this->ci->input->post("id")))) return self::DELETE;
+        if ($this->ci->bmanager->deletePost($this->ci->security->xss_clean($this->ci->input->post("id")))) {
+          return self::DELETE;
+        }
         return self::ABORT;
       default:
         return self::NO_ACTION;
@@ -272,10 +278,14 @@ 
   private function handleSavePost(int $posterId=null): string {
     $id = $this->ci->security->xss_clean($this->ci->input->post("id"));
     if ($id != "") {
-      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;
+      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;
+      }
       return self::EDIT;
     } else {
-      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;
+      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;
+      }
       return self::CREATE;
     }
   }
@@ -289,9 +299,15 @@ 
    */
   private function handlePublishPost(int $posterId=null): string {
     $id = $this->ci->security->xss_clean($this->ci->input->post("id"));
-    if ($id == "") return self::ABORT;
-    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;
-    if (!$this->ci->bmanager->publishPost($id, true)) return self::ABORT;
+    if ($id == "") {
+      return self::ABORT;
+    }
+    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;
+    }
+    if (!$this->ci->bmanager->publishPost($id, true)) {
+      return self::ABORT;
+    }
     return self::PUBLISH;
   }
   /**
@@ -336,7 +352,9 @@ 
    * @return bool                True if successful, false if not.
    */
   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 {
-    if ($view === null || $empty_view === null) $this->ci->load->bind("francis94c/blog", $blogger);
+    if ($view === null || $empty_view === null) {
+      $this->ci->load->bind("francis94c/blog", $blogger);
+    }
     $posts = $this->getPosts($page, $limit, $filter, $hits);
     if (count($posts) == 0) {
       if ($empty_view === null) { $blogger->load->view("empty"); } else {
@@ -379,8 +397,12 @@ 
    * @return bool             True if successful, false if not.
    */
   public function renderPost($post, $view=null): bool {
-    if (!is_array($post)) $post = $this->ci->bmanager->getPost($post);
-    if (!$post) return false;
+    if (!is_array($post)) {
+      $post = $this->ci->bmanager->getPost($post);
+    }
+    if (!$post) {
+      return false;
+    }
     $post["content"] = $this->ci->parsedown->text($post["content"]);
     if ($view === null) {
       $this->ci->load->splint("francis94c/blog", "-post_item", $post);
@@ -403,7 +425,9 @@ 
     $data = array();
     $data["title"] = $post["title"];
     $data["description"] = substr($post["content"], 0, 154);
-    if (isset($post["share_image"])) $data["image_link"] = $post["share_image"];
+    if (isset($post["share_image"])) {
+      $data["image_link"] = $post["share_image"];
+    }
     $data["url"] = current_url();
     // Load Meta OG view.
     return $this->ci->load->splint(self::PACKAGE, "-meta_og", $data, true);

unit_tests/BlogTest.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
    * Prerquisites for the Unit Tests.
    */
   public static function setUpBeforeClass(): void {
-    self::$ci =& get_instance();
+    self::$ci = & get_instance();
     self::$ci->load->database('mysqli://root@localhost/test_db');
     $queries = [
       "CREATE TABLE IF NOT EXISTS admins (id INT(7) AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20) NOT NULL, password TEXT NOT NULL) Engine=InnoDB;",
@@ -66,7 +66,7 @@ 
    */
   public function testEmptyBlog(): void {
     self::$ci->blogger->setBlog("test_blog");
-    $this->setOutputCallback(function ($output) {
+    $this->setOutputCallback(function($output) {
       $this->assertRegExp("/<h3 class=\"w3-center w3-margin\">No Posts.<\/h3>/", $output);
       $this->assertRegExp("/<div class=\"w3-padding\">/", $output);
     });
@@ -84,7 +84,7 @@ 
   public function testEditor(): void {
 
     // === Collect Output ===
-    $this->setOutputCallback(function () {});
+    $this->setOutputCallback(function() {});
     $this->assertTrue(self::$ci->blogger->loadEditor("my_callback")); // Outputs Editor HTML.
     $o = $this->getActualOutput();
     // ==/ Collect Output ===
@@ -97,7 +97,7 @@ 
     $this->assertRegExp("/\/my_callback/", $o);
 
     // Reset Output Callback.
-    $this->setOutputCallback(function ($o) { return $o;});
+    $this->setOutputCallback(function($o) { return $o; });
 
     $this->expectOutputRegex("/value=\"1\"\/>/");
     $this->assertTrue(self::$ci->blogger->loadEditor("my_callback", 1)); // Outputs Editor HTML.
@@ -225,7 +225,7 @@ 
    */
   public function testEditPostUI(): void {
     // === Collect Output ===
-    $this->setOutputCallback(function () {});
+    $this->setOutputCallback(function() {});
     $this->assertTrue(self::$ci->blogger->loadEditor("a_callback", 1)); // Outputs Editor HTML.
     $o = $this->getActualOutput();
     // ==/ Collect Output ===