DakuTree / manga-tracker

application/models/Tracker/Tracker_Tag_Model.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 		$success = FALSE;
 		if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) {
 			$success = (bool) $this->db->set(['tags' => $tag_string, 'active' => 'Y', 'last_updated' => NULL])
-			                           ->where('user_id', $userID)
-			                           ->where('id', $chapterID)
-			                           ->update('tracker_chapters');
+									   ->where('user_id', $userID)
+									   ->where('id', $chapterID)
+									   ->update('tracker_chapters');
 		}
 
 		if($success) {

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Tracker_Tag_Model extends Tracker_Base_Model {
 	public function __construct() {

application/migrations/025_tracker_add_mal_id.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	}
 
 	public function down() {
-		$this->dbforge->drop_column('tracker_titles',   'mal_id');
+		$this->dbforge->drop_column('tracker_titles', 'mal_id');
 		$this->dbforge->drop_column('tracker_chapters', 'mal_id');
 
 	}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 class Migration_Tracker_Add_MAL_id extends CI_Migration {
 	public function __construct() {

application/models/Tracker/Tracker_List_Model.php

Indentation +26 added lines, -26 removed lines

@@ -171,14 +171,14 @@ 
 			}
 
 			$idQuery = $this->db->select('id')
-			                    ->where('user_id', $userID)
-			                    ->where('title_id', $titleID)
-			                    ->get('tracker_chapters');
+								->where('user_id', $userID)
+								->where('title_id', $titleID)
+								->get('tracker_chapters');
 			if($idQuery->num_rows() > 0) {
 				$success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL, 'ignore_chapter' => NULL])
-				                           ->where('user_id', $userID)
-				                           ->where('title_id', $titleID)
-				                           ->update('tracker_chapters');
+										   ->where('user_id', $userID)
+										   ->where('title_id', $titleID)
+										   ->update('tracker_chapters');
 
 				if($success) {
 					$idQueryRow = $idQuery->row();
@@ -204,9 +204,9 @@ 
 	}
 	public function updateByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = (bool) $this->db->set(['current_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL])
-		                           ->where('user_id', $userID)
-		                           ->where('id', $chapterID)
-		                           ->update('tracker_chapters');
+								   ->where('user_id', $userID)
+								   ->where('id', $chapterID)
+								   ->update('tracker_chapters');
 
 		if($success) {
 			$this->History->userUpdateTitle($chapterID, $chapter);
@@ -216,9 +216,9 @@ 
 
 	public function ignoreByID(int $userID, int $chapterID, string $chapter) : bool {
 		$success = (bool) $this->db->set(['ignore_chapter' => $chapter, 'active' => 'Y', 'last_updated' => NULL])
-		                           ->where('user_id', $userID)
-		                           ->where('id', $chapterID)
-		                           ->update('tracker_chapters');
+								   ->where('user_id', $userID)
+								   ->where('id', $chapterID)
+								   ->update('tracker_chapters');
 
 		if($success) {
 			$this->History->userIgnoreTitle($chapterID, $chapter);
@@ -231,9 +231,9 @@ 
 		//This is to allow user history to function properly.
 
 		$success = $this->db->set(['active' => 'N', 'last_updated' => NULL])
-		                    ->where('user_id', $userID)
-		                    ->where('id', $chapterID)
-		                    ->update('tracker_chapters');
+							->where('user_id', $userID)
+							->where('id', $chapterID)
+							->update('tracker_chapters');
 
 		return (bool) $success;
 	}
@@ -263,9 +263,9 @@ 
 		//TODO: OPTION, USE BACKEND MAL ID DB WHERE POSSIBLE (DEFAULT TRUE)
 
 		$queryC = $this->db->select('mal_id')
-		                   ->where('user_id', $userID)
-		                   ->where('title_id', $titleID)
-		                   ->get('tracker_chapters');
+						   ->where('user_id', $userID)
+						   ->where('title_id', $titleID)
+						   ->get('tracker_chapters');
 
 		if($queryC->num_rows() > 0 && ($rowC = $queryC->row())) {
 			$malIDArr = [
@@ -274,8 +274,8 @@ 
 			];
 		} else {
 			$queryT = $this->db->select('mal_id')
-			                   ->where('title_id', $titleID)
-			                   ->get('tracker_titles');
+							   ->where('title_id', $titleID)
+							   ->get('tracker_titles');
 
 			if($queryT->num_rows() > 0 && ($rowT = $queryT->row())) {
 				$malIDArr = [
@@ -289,9 +289,9 @@ 
 		//TODO: Remove after a few weeks!
 		if(is_null($malIDArr)) {
 			$queryC2 = $this->db->select('tags')
-			                  ->where('user_id', $userID)
-			                  ->where('title_id', $titleID)
-			                  ->get('tracker_chapters');
+							  ->where('user_id', $userID)
+							  ->where('title_id', $titleID)
+							  ->get('tracker_chapters');
 
 			if($queryC2->num_rows() > 0 && ($tag_string = $queryC2->row()->tags) && !is_null($tag_string)) {
 				$arr   = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
@@ -309,9 +309,9 @@ 
 	public function setMalID(int $userID, int $chapterID, ?int $malID) : bool {
 		//TODO: Handle NULL?
 		$success = (bool) $this->db->set(['mal_id' => $malID, 'active' => 'Y', 'last_updated' => NULL])
-		                           ->where('user_id', $userID)
-		                           ->where('id', $chapterID)
-		                           ->update('tracker_chapters');
+								   ->where('user_id', $userID)
+								   ->where('id', $chapterID)
+								   ->update('tracker_chapters');
 
 		if($success) {
 			//MAL id update was successful, update history

Spacing +11 added lines, -11 removed lines

@@ -1,11 +1,11 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Tracker_List_Model extends Tracker_Base_Model {
 	public function __construct() {
 		parent::__construct();
 	}
 
-	public function get(?int $userID = NULL) {
+	public function get(? int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);
 
 		$query = $this->db
@@ -29,7 +29,7 @@ 
 			];
 		}
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$is_unread = intval(($row->latest_chapter == $row->ignore_chapter) || ($row->latest_chapter == $row->current_chapter) ? '1' : '0');
 				$arr['series'][$row->category]['unread_count'] = (($arr['series'][$row->category]['unread_count'] ?? 0) + !$is_unread);
 				$data = [
@@ -79,8 +79,8 @@ 
 			$sortOrder = $this->User_Options->get('list_sort_order', $userID);
 			switch($this->User_Options->get('list_sort_type', $userID)) {
 				case 'unread':
-					foreach (array_keys($arr['series']) as $category) {
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
+					foreach(array_keys($arr['series']) as $category) {
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}");
 							$b_text = strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}");
 
@@ -94,7 +94,7 @@ 
 					break;
 
 				case 'alphabetical':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['title_data']['title']}");
 							$b_text = strtolower("{$b['title_data']['title']}");
@@ -109,7 +109,7 @@ 
 					break;
 
 				case 'my_status':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['generated_current_data']['number']}");
 							$b_text = strtolower("{$b['generated_current_data']['number']}");
@@ -124,7 +124,7 @@ 
 					break;
 
 				case 'latest':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['generated_latest_data']['number']}");
 							$b_text = strtolower("{$b['generated_latest_data']['number']}");
@@ -256,7 +256,7 @@ 
 		return $status;
 	}
 
-	public function getMalID(int $userID, int $titleID) : ?array{
+	public function getMalID(int $userID, int $titleID) : ? array{
 		$malIDArr = NULL;
 
 		//NEW METHOD
@@ -294,7 +294,7 @@ 
 			                  ->get('tracker_chapters');
 
 			if($queryC2->num_rows() > 0 && ($tag_string = $queryC2->row()->tags) && !is_null($tag_string)) {
-				$arr   = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
+				$arr = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
 				if(!empty($arr)) {
 					$malIDArr = [
 						'id'   => explode(':', $arr[0])[1],
@@ -306,7 +306,7 @@ 
 
 		return $malIDArr;
 	}
-	public function setMalID(int $userID, int $chapterID, ?int $malID) : bool {
+	public function setMalID(int $userID, int $chapterID, ? int $malID) : bool {
 		//TODO: Handle NULL?
 		$success = (bool) $this->db->set(['mal_id' => $malID, 'active' => 'Y', 'last_updated' => NULL])
 		                           ->where('user_id', $userID)

Braces +3 added lines, -1 removed lines

@@ -70,7 +70,9 @@
 
 				$arr['series'][$row->category]['manga'][] = $data;
 
-				if(!$arr['has_inactive']) $arr['has_inactive'] = !$data['title_data']['active'];
+				if(!$arr['has_inactive']) {
+					$arr['has_inactive'] = !$data['title_data']['active'];
+				}
 			}
 
 			//FIXME: This is not good for speed, but we're kind of required to do this for UX purposes.

application/models/History_Model.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class History_Model extends CI_Model {
 	public function __construct() {
@@ -46,7 +46,7 @@ 
 			foreach($query->result() as $row) {
 				$arrRow = [];
 
-				$arrRow['updated_at']  = $row->updated_at;
+				$arrRow['updated_at'] = $row->updated_at;
 
 				$newChapterData = $this->Tracker->sites->{$row->site_class}->getChapterData($row->title_url, $row->new_chapter);
 				$arrRow['new_chapter']      = "<a href=\"{$newChapterData['url']}\">{$newChapterData['number']}</a>";
@@ -168,7 +168,7 @@ 
 
 		return $success;
 	}
-	public function userSetMalID(int $chapterID, ?int $malID) : bool {
+	public function userSetMalID(int $chapterID, ? int $malID) : bool {
 		$success = $this->db->insert('tracker_user_history', [
 			'chapter_id'  => $chapterID,
 

application/controllers/Ajax/TrackerInline.php

Spacing +8 added lines, -8 removed lines

@@ -26,8 +26,8 @@ 
 	 * URL:        /ajax/update_inline
 	 */
 	public function update() {
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
 
 		if($this->form_validation->run() === TRUE) {
 			$success = $this->Tracker->list->updateByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -122,7 +122,7 @@ 
 	 * URL:        /tag_update
 	 */
 	public function tag_update() {
-		$this->form_validation->set_rules('id',         'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
 		$this->form_validation->set_rules('tag_string', 'Tag String', 'max_length[255]|is_valid_tag_string|not_equals[none]');
 
 		if($this->form_validation->run() === TRUE) {
@@ -163,7 +163,7 @@ 
 	 * URL:        /set_category
 	 */
 	public function set_category() {
-		$this->form_validation->set_rules('id[]',     'List of IDs',   'required|ctype_digit');
+		$this->form_validation->set_rules('id[]', 'List of IDs', 'required|ctype_digit');
 		$this->form_validation->set_rules('category', 'Category Name', 'required|is_valid_category');
 
 		if($this->form_validation->run() === TRUE) {
@@ -209,8 +209,8 @@ 
 	 * URL:        /ajax/ignore_inline
 	 */
 	public function ignore() {
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
 
 		if($this->form_validation->run() === TRUE) {
 			$success = $this->Tracker->list->ignoreByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -232,8 +232,8 @@ 
 	 * URL:        /set_mal_id
 	 */
 	public function set_mal_id() {
-		$this->form_validation->set_rules('id',     'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('mal_id', 'MAL ID',     'regex_match[/^[0-9]*$/]');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('mal_id', 'MAL ID', 'regex_match[/^[0-9]*$/]');
 
 		if($this->form_validation->run() === TRUE) {
 			$malID = (is_numeric($this->input->post('mal_id')) ? $this->input->post('mal_id') : NULL);

application/controllers/AdminPanel.php

Indentation +12 added lines, -12 removed lines

@@ -44,12 +44,12 @@ 
 
 	private function _list_complete_titles() {
 		$query = $this->db->select('tracker_titles.id, tracker_sites.site_class, tracker_titles.title, tracker_titles.title_url')
-		                  ->from('tracker_chapters')
-		                  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->like('tracker_chapters.tags', 'complete')
-		                  ->where('tracker_titles.status', 0)
-		                  ->get();
+						  ->from('tracker_chapters')
+						  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->like('tracker_chapters.tags', 'complete')
+						  ->where('tracker_titles.status', 0)
+						  ->get();
 
 		$completeList = [];
 		if($query->num_rows() > 0) {
@@ -68,10 +68,10 @@ 
 
 	private function _update_mal_id() : void {
 		$query = $this->db->select('id, tags')
-		                  ->from('tracker_chapters')
-		                  ->where('tags REGEXP "[[:<:]]mal:([0-9]+|none)[[:>:]]"', NULL, FALSE)
-		                  ->where('mal_id', NULL)
-		                  ->get();
+						  ->from('tracker_chapters')
+						  ->where('tags REGEXP "[[:<:]]mal:([0-9]+|none)[[:>:]]"', NULL, FALSE)
+						  ->where('mal_id', NULL)
+						  ->get();
 
 
 		if($query->num_rows() > 0) {
@@ -82,8 +82,8 @@ 
 					$malID = ($matches[1] !== 'none' ? $matches[1] : '0');
 
 					$this->db->set(['mal_id' => $malID, 'last_updated' => NULL])
-					         ->where('id', $row->id)
-					         ->update('tracker_chapters');
+							 ->where('id', $row->id)
+							 ->update('tracker_chapters');
 				}
 			}
 		}