DakuTree / manga-tracker

public/index.php

Indentation +4 added lines, -4 removed lines

@@ -210,10 +210,10 @@
 {
 	// Ensure there's a trailing slash
 	$system_path = strtr(
-		               rtrim($system_path, '/\\'),
-		               '/\\',
-		               DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-	               ).DIRECTORY_SEPARATOR;
+					   rtrim($system_path, '/\\'),
+					   '/\\',
+					   DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+				   ).DIRECTORY_SEPARATOR;
 }
 
 // Is the system path correct?

application/libraries/MY_DB_cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
 	}
 
 	/**
-	 * @param $md5
+	 * @param string $md5
 	 *
 	 * @return array
 	 */

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) {

application/models/Tracker/Tracker_Category_Model.php

Indentation +8 added lines, -8 removed lines

@@ -7,9 +7,9 @@ 
 
 	public function setByID(int $userID, int $chapterID, string $category) : bool {
 		$success = $this->db->set(['category' => $category, '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');
 
 		return (bool) $success;
 	}
@@ -40,11 +40,11 @@ 
 
 	public function getUsed(int $userID) : array {
 		$query = $this->db->distinct()
-		                  ->select('category')
-		                  ->from('tracker_chapters')
-		                  ->where('tracker_chapters.active', 'Y')
-		                  ->where('user_id', $userID)
-		                  ->get();
+						  ->select('category')
+						  ->from('tracker_chapters')
+						  ->where('tracker_chapters.active', 'Y')
+						  ->where('user_id', $userID)
+						  ->get();
 
 		return array_column($query->result_array(), 'category');
 	}

application/models/User_Options_Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 	 * @param string   $option
 	 * @param int|null $userID
 	 *
-	 * @return mixed Returns option value as STRING, or FALSE if option does not exist.
+	 * @return string Returns option value as STRING, or FALSE if option does not exist.
 	 */
 	public function get(string $option, ?int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);

Indentation +8 added lines, -8 removed lines

@@ -188,18 +188,18 @@
 		//FIXME: Query duplication.
 		if($this->User->id !== $userID) {
 			$query = $this->db->select('value_str, value_int')
-			                  ->from('user_options')
-			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
-			                  ->limit(1);
+							  ->from('user_options')
+							  ->where('user_id', $userID)
+							  ->where('name',    $option)
+							  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
 			if(!($data = $this->session->tempdata("option_{$option}"))) {
 				$query = $this->db->select('value_str, value_int')
-				                  ->from('user_options')
-				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
-				                  ->limit(1);
+								  ->from('user_options')
+								  ->where('user_id', $userID)
+								  ->where('name',    $option)
+								  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
 			}

application/models/Tracker/Tracker_Title_Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	/**
 	 * @param string $site_url
 	 *
-	 * @return stdClass|object|null
+	 * @return string
 	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('*')

Indentation +30 added lines, -30 removed lines

@@ -17,11 +17,11 @@ 
 	 */
 	public function getID(string $titleURL, int $siteID, bool $create = TRUE, bool $returnData = FALSE) {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title, tracker_titles.title_url, tracker_titles.latest_chapter, tracker_titles.status, tracker_sites.site_class, (tracker_titles.last_checked > DATE_SUB(NOW(), INTERVAL 3 DAY)) AS active', FALSE)
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.title_url', $titleURL)
-		                  ->where('tracker_titles.site_id', $siteID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->where('tracker_titles.title_url', $titleURL)
+						  ->where('tracker_titles.site_id', $siteID)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$id = (int) $query->row('id');
@@ -35,8 +35,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateTitleById?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $id)
-						         ->update('tracker_titles');
+								 ->where('id', $id)
+								 ->update('tracker_titles');
 					}
 				} else {
 					log_message('error', "{$siteClass} | {$query->row('title')} ({$query->row('title_url')}) | Failed to update.");
@@ -76,9 +76,9 @@ 
 	 */
 	private function addTitle(string $titleURL, int $siteID) : int {
 		$query = $this->db->select('site, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('id', $siteID)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('id', $siteID)
+						  ->get();
 
 		$titleData = $this->sites->{$query->row()->site_class}->getTitleData($titleURL, TRUE);
 
@@ -104,21 +104,21 @@ 
 	public function updateByID(int $titleID, ?string $latestChapter) : bool {
 		//FIXME: Really not too happy with how we're doing history stuff here, it just feels messy.
 		$query = $this->db->select('latest_chapter AS current_chapter')
-		                  ->from('tracker_titles')
-		                  ->where('id', $titleID)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $titleID)
+						  ->get();
 		$row = $query->row();
 
 		//TODO (CHECK): If failed_checks changes won't that trigger affected_rows?
 		$success = $this->db->set(['latest_chapter' => $latestChapter, 'failed_checks' => 0]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		if($this->db->affected_rows() > 0) {
 			//Clear hidden latest chapter
 			$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
-			         ->where('title_id', $titleID)
-			         ->update('tracker_chapters');
+					 ->where('title_id', $titleID)
+					 ->update('tracker_chapters');
 		}
 
 		//Update History
@@ -135,20 +135,20 @@ 
 		if(!array_diff(array_keys($data), TITLEDATA_COLUMNS)) {
 			$newData = array_merge($data, ['failed_checks' => 0]);
 			$oldData = $this->db->select('latest_chapter AS current_chapter')
-			                    ->from('tracker_titles')
-			                    ->where('id', $titleID)
-			                    ->get()->row_array();
+								->from('tracker_titles')
+								->where('id', $titleID)
+								->get()->row_array();
 
 
 			$success = $this->db->set($newData) //last_updated gets updated via a trigger if something changes
-			                    ->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-			                    ->where('id', $titleID)
-			                    ->update('tracker_titles');
+								->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
+								->where('id', $titleID)
+								->update('tracker_titles');
 			if(in_array('latest_chapter', $newData, TRUE) && $newData['latest_chapter'] !== $oldData['current_chapter'] && $this->db->affected_rows() > 0) {
 				//Clear hidden latest chapter
 				$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
-				         ->where('title_id', $titleID)
-				         ->update('tracker_chapters');
+						 ->where('title_id', $titleID)
+						 ->update('tracker_chapters');
 			}
 
 			//Update History
@@ -164,8 +164,8 @@ 
 
 	public function updateFailedChecksByID(int $titleID) : bool {
 		$success = $this->db->set('failed_checks', 'failed_checks + 1', FALSE)
-		                    ->where('id', $titleID)
-		                    ->update('tracker_titles');
+							->where('id', $titleID)
+							->update('tracker_titles');
 
 		return $success;
 	}
@@ -177,9 +177,9 @@ 
 	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		return $query->row();
 	}

application/controllers/AdminPanel.php

Indentation +6 added lines, -6 removed lines

@@ -40,12 +40,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) {

application/controllers/Ajax/Userscript.php

Indentation +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@
 				];
 
 				$this->output
-				     ->set_status_header('200')
-				     ->set_content_type('application/json', 'utf-8')
-				     ->set_output(json_encode($json));
+					 ->set_status_header('200')
+					 ->set_content_type('application/json', 'utf-8')
+					 ->set_output(json_encode($json));
 			} else {
 				//TODO: We should probably try and have more verbose errors here. Return via JSON or something.
 				$this->output->set_status_header('400', 'Unable to update?');

application/models/Tracker/Tracker_List_Model.php

Indentation +24 added lines, -24 removed lines

@@ -203,14 +203,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();
@@ -236,9 +236,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);
@@ -248,9 +248,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);
@@ -263,9 +263,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;
 	}
@@ -295,10 +295,10 @@ 
 		//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)
-		                   ->where('mal_id IS NOT NULL', NULL, FALSE)
-		                   ->get('tracker_chapters');
+						   ->where('user_id', $userID)
+						   ->where('title_id', $titleID)
+						   ->where('mal_id IS NOT NULL', NULL, FALSE)
+						   ->get('tracker_chapters');
 
 		if($queryC->num_rows() > 0 && ($rowC = $queryC->row())) {
 			$malIDArr = [
@@ -307,8 +307,8 @@ 
 			];
 		} else {
 			$queryT = $this->db->select('mal_id')
-			                   ->where('id', $titleID)
-			                   ->get('tracker_titles');
+							   ->where('id', $titleID)
+							   ->get('tracker_titles');
 
 			if($queryT->num_rows() > 0 && ($rowT = $queryT->row())) {
 				$malIDArr = [
@@ -341,9 +341,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