@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * Prerquisites for the Unit Tests. |
20 | 20 | */ |
21 | 21 | public static function setUpBeforeClass(): void { |
22 | - self::$ci =& get_instance(); |
|
22 | + self::$ci = & get_instance(); |
|
23 | 23 | self::$ci->load->database('mysqli://root@localhost/test_db'); |
24 | 24 | $queries = [ |
25 | 25 | "CREATE TABLE IF NOT EXISTS admins (id INT(7) AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20) NOT NULL, password TEXT NOT NULL) Engine=InnoDB;", |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public function testEmptyBlog(): void { |
80 | 80 | self::$ci->blogger->setBlog("test_blog"); |
81 | - $this->setOutputCallback(function ($output) { |
|
81 | + $this->setOutputCallback(function($output) { |
|
82 | 82 | $this->assertRegExp("/<h3 class=\"w3-center w3-margin\">No Posts.<\/h3>/", $output); |
83 | 83 | $this->assertRegExp("/<div class=\"w3-padding\">/", $output); |
84 | 84 | }); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | public function testEditor(): void { |
97 | 97 | |
98 | 98 | // === Collect Output === |
99 | - $this->setOutputCallback(function () {}); |
|
99 | + $this->setOutputCallback(function() {}); |
|
100 | 100 | $this->assertTrue(self::$ci->blogger->loadEditor("my_callback")); // Outputs Editor HTML. |
101 | 101 | $o = $this->getActualOutput(); |
102 | 102 | // ==/ Collect Output === |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $this->assertRegExp("/\/my_callback/", $o); |
110 | 110 | |
111 | 111 | // Reset Output Callback. |
112 | - $this->setOutputCallback(function ($o) { return $o;}); |
|
112 | + $this->setOutputCallback(function($o) { return $o; }); |
|
113 | 113 | |
114 | 114 | $this->expectOutputRegex("/value=\"1\"\/>/"); |
115 | 115 | $this->assertTrue(self::$ci->blogger->loadEditor("my_callback", 1)); // Outputs Editor HTML. |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | public function testEditPostUI(): void { |
239 | 239 | // === Collect Output === |
240 | - $this->setOutputCallback(function () {}); |
|
240 | + $this->setOutputCallback(function() {}); |
|
241 | 241 | $this->assertTrue(self::$ci->blogger->loadEditor("a_callback", 1)); // Outputs Editor HTML. |
242 | 242 | $o = $this->getActualOutput(); |
243 | 243 | // ==/ Collect Output === |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | */ |
371 | 371 | public function testRenderPostItems(): void { |
372 | 372 | // === Collect Output === |
373 | - $this->setOutputCallback(function () {}); |
|
373 | + $this->setOutputCallback(function() {}); |
|
374 | 374 | $this->assertTrue(self::$ci->blogger->renderPostItems("../splints/" . self::PACKAGE . "/phpunit/views/test_post_card_item", "the_gunners")); |
375 | 375 | $o = $this->getActualOutput(); |
376 | 376 | // ==/ Collect Output === |
@@ -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 Array of posts ordered by ID (Most recent first). |
366 | 366 | */ |
367 | - public function getRecentPosts(int $limit=5, bool $filter=false): array { |
|
367 | + public function getRecentPosts(int $limit = 5, bool $filter = false): array { |
|
368 | 368 | return $this->ci->bmanager->getRecentPosts($limit, $filter); |
369 | 369 | } |
370 | 370 | /** |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | * |
379 | 379 | * @return bool True if successful, false if not. |
380 | 380 | */ |
381 | - public function renderPost($post, string $view=null): bool { |
|
381 | + public function renderPost($post, string $view = null): bool { |
|
382 | 382 | if (!is_array($post)) $post = $this->ci->bmanager->getPost($post); |
383 | 383 | if (!$post) return false; |
384 | 384 | $post["content"] = $this->ci->parsedown->text($post["content"]); |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | * |
418 | 418 | * @return int Posts count. |
419 | 419 | */ |
420 | - public function getPostsCount(bool $filter=true): int { |
|
420 | + public function getPostsCount(bool $filter = true): int { |
|
421 | 421 | return $this->ci->bmanager->getPostsCount($filter); |
422 | 422 | } |
423 | 423 | /** |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | * |
430 | 430 | * @return array An associative array of a single post. |
431 | 431 | */ |
432 | - public function getPost($postId, $hit=true) { |
|
432 | + public function getPost($postId, $hit = true) { |
|
433 | 433 | return $this->ci->bmanager->getPost($postId, $hit); |
434 | 434 | } |
435 | 435 | /** |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | * |
477 | 477 | * @return array Array of matched posts. |
478 | 478 | */ |
479 | - public function searchPosts(string $words, int $page, int $limit=5, bool $filter=false): array { |
|
479 | + public function searchPosts(string $words, int $page, int $limit = 5, bool $filter = false): array { |
|
480 | 480 | return $this->ci->bmanager->searchPosts($words, $page, $limit, $filter); |
481 | 481 | } |
482 | 482 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | function __construct() { |
13 | 13 | parent::__construct(); |
14 | - $this->ci =& get_instance(); |
|
14 | + $this->ci = & get_instance(); |
|
15 | 15 | $this->ci->load->database(); |
16 | 16 | } |
17 | 17 | /** |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * database. Returns 0 if the post couldn't be |
45 | 45 | * created. |
46 | 46 | */ |
47 | - function createPost(string $title, string $content, int $adminId=null): int { |
|
47 | + function createPost(string $title, string $content, int $adminId = null): int { |
|
48 | 48 | $this->ci->load->helper("url"); |
49 | 49 | $data = array( |
50 | 50 | "title" => $title, |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * @param [type] $adminId [description] |
64 | 64 | * @return [type] [description] |
65 | 65 | */ |
66 | - function createAndPublishPost($title, $content, $adminId=null) { |
|
66 | + function createAndPublishPost($title, $content, $adminId = null) { |
|
67 | 67 | $data = array( |
68 | 68 | "title" => $title, |
69 | 69 | "content" => $content, |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * |
92 | 92 | * @return array Array of posts for a given page. |
93 | 93 | */ |
94 | - function getPosts(int $page=1, int $limit=5, bool $filter=false, bool $hits=false): array { |
|
94 | + function getPosts(int $page = 1, int $limit = 5, bool $filter = false, bool $hits = false): array { |
|
95 | 95 | if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit); |
96 | 96 | if ($filter) $this->db->where("published", 1); |
97 | 97 | if ($hits) { |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * @param boolean $filter [description] |
108 | 108 | * @return [type] [description] |
109 | 109 | */ |
110 | - function getRecentPosts($limit=5, $filter=false) { |
|
110 | + function getRecentPosts($limit = 5, $filter = false) { |
|
111 | 111 | if ($limit != null && $limit != null) $this->db->limit($limit); |
112 | 112 | if ($filter) $this->db->where("published", 1); |
113 | 113 | $this->db->order_by("id", "DESC"); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * @return bool True on success, False if not. |
123 | 123 | */ |
124 | 124 | function savePost($postId, $title, $content): bool { |
125 | - $data = array ( |
|
125 | + $data = array( |
|
126 | 126 | "title" => $title, |
127 | 127 | "content" => $content, |
128 | 128 | "slug" => url_title($title) |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | * @param int $postId ID of the post to retrieve. |
137 | 137 | * @return array An associative array for the Posts's data. |
138 | 138 | */ |
139 | - function getPost($postId, $hit=true) { |
|
139 | + function getPost($postId, $hit = true) { |
|
140 | 140 | if (is_numeric($postId)) { |
141 | 141 | $this->db->where("id", $postId); |
142 | 142 | } else { |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $this->db->update($this->table_name); |
154 | 154 | } |
155 | 155 | } |
156 | - $post = $query->result_array()[0]; |
|
156 | + $post = $query->result_array()[0]; |
|
157 | 157 | $images = array(); |
158 | 158 | // Fetch all images in post. |
159 | 159 | preg_match("/<img\s[^>]*?src\s*=\s*['\"]([^'\"]*?)['\"][^>]*?>/", $post["content"], $images); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * [getPostsCount get the total number of posts in the database.] |
196 | 196 | * @return [type] [description] |
197 | 197 | */ |
198 | - function getPostsCount(bool $filter=true): int { |
|
198 | + function getPostsCount(bool $filter = true): int { |
|
199 | 199 | if ($filter) $this->db->where("published", 1); |
200 | 200 | $this->db->select("COUNT(title) as posts"); |
201 | 201 | return (int) $this->db->get($this->table_name)->result()[0]->posts; |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | * @param boolean $filter [description] |
218 | 218 | * @return [type] [description] |
219 | 219 | */ |
220 | - function searchPosts($words, $page, $limit=5, $filter=false) { |
|
220 | + function searchPosts($words, $page, $limit = 5, $filter = false) { |
|
221 | 221 | if ($limit != 0) $this->db->limit($limit, ($page * $limit) - $limit); |
222 | 222 | if ($filter) $this->db->where("published", 1); |
223 | 223 | $this->db->like("title", $words); |
@@ -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=5, $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(); |