DakuTree / manga-tracker

application/models/Tracker/Tracker_Admin_Model.php

Indentation +30 added lines, -30 removed lines

@@ -88,8 +88,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 {
@@ -103,8 +103,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 " - (No chapters found?)\n";
 						} else {
@@ -182,8 +182,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 {
@@ -207,10 +207,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) {
@@ -227,8 +227,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 {
@@ -257,13 +257,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) {
@@ -274,8 +274,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 {
@@ -323,8 +323,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 {
@@ -334,8 +334,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");
@@ -351,14 +351,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/Tracker/Tracker_List_Model.php

Spacing +10 added lines, -10 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_List_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -33,13 +33,13 @@ 
 			];
 		}
 		if($result->num_rows() > 0) {
-			foreach ($result->result() as $row) {
+			foreach($result->result() as $row) {
 				$is_unread = intval((is_null($row->latest_chapter)) || ($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 = [
 					'id' => $row->id,
 					'generated_current_data' => $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->current_chapter),
-					'generated_latest_data'  => !is_null($row->latest_chapter) ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->latest_chapter) : ['url' => '#', 'number' => 'No chapters found'] ,
+					'generated_latest_data'  => !is_null($row->latest_chapter) ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->latest_chapter) : ['url' => '#', 'number' => 'No chapters found'],
 					'generated_ignore_data'  => ($row->ignore_chapter ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->ignore_chapter) : NULL),
 
 					'full_title_url'        => $this->sites->{$row->site_class}->getFullTitleURL($row->title_url),
@@ -89,8 +89,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']}");
 
@@ -104,8 +104,8 @@ 
 					break;
 
 				case 'unread_latest':
-					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 = $a['new_chapter_exists'];
 							$b_text = $b['new_chapter_exists'];
 
@@ -126,7 +126,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']}");
@@ -141,7 +141,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']}");
@@ -156,7 +156,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 = new DateTime("{$a['title_data']['last_updated']}");
 							$b_text = new DateTime("{$b['title_data']['last_updated']}");

application/models/Tracker/Tracker_Sites_Model.php

Spacing +14 added lines, -14 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_Sites_Model
@@ -164,7 +164,7 @@ 
 
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			curl_setopt($ch, CURLOPT_ENCODING , "gzip");
+			curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 			//curl_setopt($ch, CURLOPT_VERBOSE, 1);
 			curl_setopt($ch, CURLOPT_HEADER, 1);
 
@@ -186,8 +186,8 @@ 
 			curl_setopt($ch, CURLOPT_URL, $url);
 
 			if($isPost) {
-				curl_setopt($ch,CURLOPT_POST, count($postFields));
-				curl_setopt($ch,CURLOPT_POSTFIELDS, http_build_query($postFields));
+				curl_setopt($ch, CURLOPT_POST, count($postFields));
+				curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postFields));
 			}
 
 			$response = curl_exec($ch);
@@ -234,7 +234,7 @@ 
 			$result = shell_exec('python '.APPPATH.'../_scripts/get_cloudflare_cookie.py '.escapeshellarg(json_encode($urlData)));
 			$cookieData = json_decode($result, TRUE);
 
-			$this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'],  31536000 /* 1 year, or until we renew it */);
+			$this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'], 31536000 /* 1 year, or until we renew it */);
 			log_message('debug', "Saving CloudFlare Cookies for {$this->site}");
 
 			$refresh = TRUE;
@@ -286,7 +286,7 @@ 
 
 				$dom = new DOMDocument();
 				libxml_use_internal_errors(TRUE);
-				$dom->loadHTML('<?xml encoding="utf-8" ?>' . $data);
+				$dom->loadHTML('<?xml encoding="utf-8" ?>'.$data);
 				libxml_use_internal_errors(FALSE);
 
 				$xpath = new DOMXPath($dom);
@@ -295,7 +295,7 @@ 
 				if($nodes_title->length === 1) {
 					if($nodes_row->length === 1) {
 						$firstRow      = $nodes_row->item(0);
-						$nodes_latest  = $xpath->query($node_latest_string,  $firstRow);
+						$nodes_latest  = $xpath->query($node_latest_string, $firstRow);
 
 						if($node_chapter_string !== '') {
 							$nodes_chapter = $xpath->query($node_chapter_string, $firstRow);
@@ -501,7 +501,7 @@ 
 		$chapter_parts = explode('/', $chapter); //returns #LANG#/#VOLUME#/#CHAPTER#/#CHAPTER_EXTRA#(/#PAGE#/)
 		return [
 			'url'    => $this->getChapterURL($title_url, $chapter),
-			'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '') . "c{$chapter_parts[2]}" . (isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/
+			'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '')."c{$chapter_parts[2]}".(isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/
 		];
 	}
 	public function getChapterURL(string $title_url, string $chapter) : string {
@@ -683,9 +683,9 @@ 
 
 							$dateString = str_replace('/', '-', trim($nodes_latest->item(0)->nodeValue)); //NOTE: We replace slashes here as it stops strtotime interpreting the date as US date format.
 							if($dateString == 'T') {
-								$dateString = date("Y-m-d",now());
+								$dateString = date("Y-m-d", now());
 							}
-							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString . ' 00:00'));
+							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString.' 00:00'));
 
 							$titleDataList[$title_url] = $titleData;
 						}
@@ -740,7 +740,7 @@ 
 			//For whatever reason, DOMDocument breaks the <link> element we need to grab the chapter, so we have to grab it elsewhere.
 			$titleData['latest_chapter'] = preg_replace('/^.*? - ([0-9\.]+) - .*?$/', '$1', trim($data['nodes_chapter']->textContent));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->textContent));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->textContent));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);
@@ -842,11 +842,11 @@ 
 			""
 		);
 		if($data) {
-			$titleData['title'] = trim(preg_replace('/ Added on .*$/','', $data['nodes_title']->textContent));
+			$titleData['title'] = trim(preg_replace('/ Added on .*$/', '', $data['nodes_title']->textContent));
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9\.]+)$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$dateString = preg_replace('/^Added (?:on )?/', '',$data['nodes_latest']->textContent);
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime($dateString));
+			$dateString = preg_replace('/^Added (?:on )?/', '', $data['nodes_latest']->textContent);
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString));
 		}
 		return (!empty($titleData) ? $titleData : NULL);
 	}

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();
 	}