DakuTree / manga-tracker

application/models/User_Options_Model.php

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_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

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) {
@@ -83,8 +83,8 @@ 
 					$new_tags = implode(',', array_diff( explode(',', $row->tags), [$matches[0]]));
 
 					$this->db->set(['mal_id' => $malID, 'tags' => $new_tags, 'last_updated' => NULL])
-					         ->where('id', $row->id)
-					         ->update('tracker_chapters');
+							 ->where('id', $row->id)
+							 ->update('tracker_chapters');
 				}
 			}
 		}

application/models/Tracker/Tracker_Admin_Model.php

Indentation +20 added lines, -20 removed lines

@@ -75,8 +75,8 @@ 
 						//Make sure last_checked is always updated on successful run.
 						//CHECK: Is there a reason we aren't just doing this in updateByID?
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					} else {
@@ -96,9 +96,9 @@ 
 	 */
 	public function updateCustom() {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('status', 'enabled')
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('status', 'enabled')
+						  ->get();
 
 		$sites = $query->result_array();
 		foreach ($sites as $site) {
@@ -113,8 +113,8 @@ 
 									//Make sure last_checked is always updated on successful run.
 									//CHECK: Is there a reason we aren't just doing this in updateByID?
 									$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-									         ->where('id', $titleID)
-									         ->update('tracker_titles');
+											 ->where('id', $titleID)
+											 ->update('tracker_titles');
 
 									print " - ({$titleData['latest_chapter']})\n";
 								} else {
@@ -138,13 +138,13 @@ 
 
 	public function refollowCustom() {
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title_url, tracker_sites.site_class')
-		                  ->from('tracker_titles')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.followed','N')
-		                  ->where('tracker_titles !=', '255')
-		                  ->where('tracker_sites.status', 'enabled')
-		                  ->where('tracker_sites.use_custom', 'Y')
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->where('tracker_titles.followed','N')
+						  ->where('tracker_titles !=', '255')
+						  ->where('tracker_sites.status', 'enabled')
+						  ->where('tracker_sites.use_custom', 'Y')
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			foreach($query->result() as $row) {
@@ -155,8 +155,8 @@ 
 
 					if(!empty($titleData)) {
 						$this->db->set($titleData)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						print "> {$row->site_class}:{$row->id}:{$row->title_url} FOLLOWED\n";
 					} else {
@@ -204,8 +204,8 @@ 
 				if($titleData['title'] && is_array($titleData) && !is_null($titleData['latest_chapter'])) {
 					if($titleData['title'] !== $row->title) {
 						$this->db->set('title', $titleData['title'])
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 						//TODO: Add to history somehow?
 						print " - NEW TITLE ({$titleData['title']})\n";
 					} else {
@@ -215,8 +215,8 @@ 
 					//We might as well try to update as well.
 					if($this->Tracker->title->updateByID((int) $row->id, $titleData['latest_chapter'])) {
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
-						         ->where('id', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 					}
 				} else {
 					log_message('error', "{$row->title} failed to update title successfully");

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_Title_Model.php

Indentation +22 added lines, -22 removed lines

@@ -15,11 +15,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');
@@ -32,8 +32,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', "{$query->row('title')} failed to update successfully");
@@ -73,9 +73,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);
 
@@ -101,20 +101,20 @@ 
 	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();
 
 		$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
@@ -127,8 +127,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;
 	}
@@ -140,9 +140,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();
 	}