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

Braces +42 added lines, -14 removed lines

@@ -46,9 +46,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 false;
   }
   /**
@@ -66,9 +72,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;
   }
   /**
@@ -82,8 +94,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 {
@@ -98,8 +114,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();
   }
@@ -151,7 +171,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;
     }
@@ -165,7 +187,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;
   }
   /**
@@ -206,8 +230,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();

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();
   }
   /**
@@ -40,7 +40,7 @@ 
    *                         database. Returns false if the post couldn't be
    *                         created.
    */
-  function createPost($title, $content, $adminId=null) {
+  function createPost($title, $content, $adminId = null) {
     $this->ci->load->helper("url");
     $data = array(
       "title"   => $title,
@@ -59,7 +59,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,
@@ -82,7 +82,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) {
@@ -98,7 +98,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");
@@ -113,7 +113,7 @@ 
    * @return bool            True on success, False if not.
    */
   function savePost($postId, $title, $content) {
-    $data = array (
+    $data = array(
       "title"   => $title,
       "content" => $content,
       "slug"    => url_title($title)
@@ -127,7 +127,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 {
@@ -143,7 +143,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);
@@ -206,7 +206,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);

libraries/Blogger.php

Spacing +11 added lines, -11 removed lines

@@ -27,8 +27,8 @@ 
 
   const ABORT = "abortAction";
 
-  function __construct($params=null) {
-    $this->ci =& get_instance();
+  function __construct($params = null) {
+    $this->ci = & get_instance();
     $this->ci->load->database();
     $this->table_name = self::TABLE_PREFIX . (isset($params["name"]) ? "_" . $params["name"] : "");
     $this->ci->load->database();
@@ -45,7 +45,7 @@ 
    * @param  [type] $adminIdColumnConstraint [description]
    * @return [type]                          [description]
    */
-  public function install($blogName=null, $adminTableName = null, $adminIdColumnName = null, $adminIdColumnConstraint = null) {
+  public function install($blogName = null, $adminTableName = null, $adminIdColumnName = null, $adminIdColumnConstraint = null) {
     $blogName = $blogName == null ? $this->table_name : self::TABLE_PREFIX . "_" . $blogName;
     $this->ci->load->dbforge();
     $this->ci->dbforge->add_field("id");
@@ -147,7 +147,7 @@ 
    * @param  boolean $w3css    [description]
    * @return [type]            [description]
    */
-  public function loadEditor($callback, $postId=null, $w3css=true) {
+  public function loadEditor($callback, $postId = null, $w3css = true) {
     $this->loadScripts($w3css);
     $this->ci->load->helper("form");
     $data = array(
@@ -169,7 +169,7 @@ 
    * @param  [type] $posterId [description]
    * @return [type]           [description]
    */
-  public function savePost($posterId=null) {
+  public function savePost($posterId = null) {
     $action = $this->ci->security->xss_clean($this->ci->input->post("action"));
     if ($action == "save") {
       $id = $this->ci->security->xss_clean($this->ci->input->post("id"));
@@ -205,7 +205,7 @@ 
    *                         return all posts. false by default.
    * @return array Array of posts for a given page.
    */
-  public function getPosts($page, $limit, $filter=false, $hits=false) {
+  public function getPosts($page, $limit, $filter = false, $hits = false) {
     return $this->ci->bmanager->getPosts($page, $limit, $filter, $hits);
   }
   /**
@@ -218,7 +218,7 @@ 
    * @param  boolean $hits       [description]
    * @return [type]              [description]
    */
-  public function renderPostItems($view=null, $callback=null, $empty_view=null, $page=1, $limit=5, $filter=false, $hits=false, $slug=true) {
+  public function renderPostItems($view = null, $callback = null, $empty_view = null, $page = 1, $limit = 5, $filter = false, $hits = false, $slug = true) {
     if ($view == null || $empty_view == null) $this->ci->load->bind("francis94c/blog", $blogger);
     $posts = $this->getPosts($page, $limit, $filter, $hits);
     if (count($posts) == 0) {
@@ -244,7 +244,7 @@ 
    * @param  boolean $filter [description]
    * @return [type]          [description]
    */
-  public function getRecentPosts($limit=5, $filter=false) {
+  public function getRecentPosts($limit = 5, $filter = false) {
     return $this->ci->bmanager->getRecentPosts($limit, $filter);
   }
   /**
@@ -253,7 +253,7 @@ 
    * @param  [type] $view [description]
    * @return [type]       [description]
    */
-  public function renderPost($post, $view=null) {
+  public function renderPost($post, $view = null) {
     if (!is_array($post)) $post = $this->ci->bmanager->getPost($post);
     if (!$post) return false;
     $post["content"] = $this->ci->parsedown->text($post["content"]);
@@ -289,7 +289,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);
   }
   /**
@@ -325,7 +325,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 +21 added lines, -7 removed lines

@@ -89,7 +89,9 @@ 
     $this->ci->dbforge->add_field($fields);
     $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;
   }
   /**
@@ -183,7 +185,9 @@ 
     } elseif ($action == "publish" || $action == "createAndPublish") {
       if ($action == "publish") {
         $id = $this->ci->security->xss_clean($this->ci->input->post("id"));
-        if ($id == "") return self::ABORT;
+        if ($id == "") {
+          return self::ABORT;
+        }
         $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);
         $this->ci->bmanager->publishPost($id, true);
         return self::PUBLISH;
@@ -192,7 +196,9 @@ 
         return self::CREATE_AND_PUBLISH;
       }
     } elseif ($action == "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 false;
   }
@@ -219,7 +225,9 @@ 
    * @return [type]              [description]
    */
   public function renderPostItems($view=null, $callback=null, $empty_view=null, $page=1, $limit=5, $filter=false, $hits=false, $slug=true) {
-    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 {
@@ -254,8 +262,12 @@ 
    * @return [type]       [description]
    */
   public function renderPost($post, $view=null) {
-    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);
@@ -273,7 +285,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();
     return $this->ci->load->splint(self::PACKAGE, "-meta_og", $data, true);
   }

unit_tests/BlogTest.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
    * [setUp description]
    */
   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;",