DakuTree / manga-tracker

application/models/Tracker/Tracker_Favourites_Model.php

Indentation +10 added lines, -10 removed lines

@@ -71,32 +71,32 @@
 
 			////We need the series to be tracked
 			$idCQuery = $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(!($idCQuery->num_rows() > 0)) {
 				//NOTE: This pretty much repeats a lot of what we already did above. Is there a better way to do this?
 				$this->Tracker->list->update($userID, $site, $title, $chapter, FALSE);
 
 				$idCQuery = $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($idCQuery->num_rows() > 0) {
 				$idCQueryRow = $idCQuery->row();
 
 				//Check if it is already favourited
 				$idFQuery = $this->db->select('id')
-				                     ->where('chapter_id', $idCQueryRow->id)
-				                     ->where('chapter', $chapter)
-				                     ->get('tracker_favourites');
+									 ->where('chapter_id', $idCQueryRow->id)
+									 ->where('chapter', $chapter)
+									 ->get('tracker_favourites');
 				if($idFQuery->num_rows() > 0) {
 					//Chapter is already favourited, so remove it from DB
 					$idFQueryRow = $idFQuery->row();
 
 					$isSuccess = (bool) $this->db->where('id', $idFQueryRow->id)
-					                             ->delete('tracker_favourites');
+												 ->delete('tracker_favourites');
 
 					if($isSuccess) {
 						$success = array(

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

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,21 +101,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
@@ -128,8 +128,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;
 	}
@@ -141,9 +141,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/models/Tracker/Tracker_Admin_Model.php

Indentation +28 added lines, -28 removed lines

@@ -74,8 +74,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->title_id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->title_id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					} else {
@@ -152,8 +152,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->title_id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->title_id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					} else {
@@ -177,10 +177,10 @@ 
 	 */
 	public function updateCustom() {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('status', 'enabled')
-		                  ->where('tracker_sites.use_custom', 'Y')
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('status', 'enabled')
+						  ->where('tracker_sites.use_custom', 'Y')
+						  ->get();
 
 		$sites = $query->result_array();
 		foreach ($sites as $site) {
@@ -196,8 +196,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 {
@@ -224,13 +224,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) {
@@ -241,8 +241,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 {
@@ -290,8 +290,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 {
@@ -301,8 +301,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");
@@ -318,14 +318,14 @@ 
 		$date = $temp_now->format('Y-m-d');
 
 		$query = $this->db->select('1')
-		                  ->from('site_stats')
-		                  ->where('date', $date)
-		                  ->get();
+						  ->from('site_stats')
+						  ->where('date', $date)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$this->db->set('total_requests', 'total_requests+1', FALSE)
-			         ->where('date', $date)
-			         ->update('site_stats');
+					 ->where('date', $date)
+					 ->update('site_stats');
 		} else {
 			$this->db->insert('site_stats', [
 				'date'           => $date,

application/models/User_Model.php

Indentation +20 added lines, -20 removed lines

@@ -45,9 +45,9 @@ 
 		$this->load->database();
 
 		$query = $this->db->select('*')
-		                  ->from('auth_users')
-		                  ->where('username', $username)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('username', $username)
+						  ->get();
 
 		return (bool) $query->num_rows();
 	}
@@ -69,9 +69,9 @@ 
 			$this->load->database();
 
 			$query = $this->db->select('email')
-			                  ->from('auth_users')
-			                  ->where('username', $identity)
-			                  ->get();
+							  ->from('auth_users')
+							  ->where('username', $identity)
+							  ->get();
 
 			if($query->num_rows() > 0) {
 				//username exists, grab email
@@ -89,9 +89,9 @@ 
 		$user = NULL;
 
 		$query = $this->db->select('*')
-		                  ->from('auth_users')
-		                  ->where('username', $username)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('username', $username)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$user = $query->row();
@@ -120,12 +120,12 @@ 
 		$api_key = NULL;
 		if($this->logged_in()) {
 			$this->db->select('api_key')
-			         ->where('id', $this->User->id)
-			         ->get('auth_users');
+					 ->where('id', $this->User->id)
+					 ->get('auth_users');
 
 			$query = $this->db->select('api_key')
-			                  ->where('id', $this->User->id)
-			                  ->get('auth_users');
+							  ->where('id', $this->User->id)
+							  ->get('auth_users');
 
 			if($query->num_rows() > 0) {
 				$api_key = $query->row('api_key');
@@ -137,9 +137,9 @@ 
 	
 	public function get_id_from_api_key(string $api_key) {
 		$query = $this->db->select('id')
-		                  ->from('auth_users')
-		                  ->where('api_key', $api_key)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('api_key', $api_key)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$userID = $query->row('id');
@@ -201,12 +201,12 @@ 
 	}
 	public function hideLatestNotice() {
 		$idQuery = $this->db->select('1')
-		                    ->where('user_id', $this->User->id)
-		                    ->get('tracker_user_notices');
+							->where('user_id', $this->User->id)
+							->get('tracker_user_notices');
 		if($idQuery->num_rows() > 0) {
 			$success = (bool) $this->db->set('hidden_notice_id', '(SELECT id FROM tracker_notices ORDER BY id DESC LIMIT 1)', FALSE)
-			                           ->where('user_id', $this->User->id)
-			                           ->update('tracker_user_notices');
+									   ->where('user_id', $this->User->id)
+									   ->update('tracker_user_notices');
 		} else {
 			$success = (bool) $this->db->insert('tracker_user_notices', [
 				'user_id'           => $this->User->id,

application/models/Tracker/Tracker_Issue_Model.php

Indentation +3 added lines, -3 removed lines

@@ -11,9 +11,9 @@
 
 		//This is pretty barebones issue reporting, and honestly not a great way to do it, but it works for now (until the Github is public).
 		$body = "".
-		        (!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : "").
-		        "Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n".
-		        "<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000));
+				(!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : "").
+				"Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n".
+				"<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000));
 
 		$success = TRUE;
 		$this->email->from('no-reply@trackr.moe', $this->config->item('site_title', 'ion_auth'));