DakuTree / manga-tracker

application/models/Tracker_Model.php

Indentation +99 added lines, -99 removed lines

@@ -157,9 +157,9 @@ 
 
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('id, site_class')
-		                  ->from('tracker_sites')
-		                  ->where('site', $site_url)
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('site', $site_url)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$siteData = $query->row();
@@ -170,11 +170,11 @@ 
 
 	public function getTitleID(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');
@@ -187,8 +187,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");
@@ -227,14 +227,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])
-				                    ->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();
@@ -259,9 +259,9 @@ 
 
 	public function updateTrackerByID(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);
@@ -274,23 +274,23 @@ 
 		//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;
 	}
 	private function updateTitleById(int $id, string $latestChapter) {
 		//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', $id)
-		                  ->get();
+						  ->from('tracker_titles')
+						  ->where('id', $id)
+						  ->get();
 		$row = $query->row();
 
 		$success = $this->db->set(['latest_chapter' => $latestChapter]) //last_updated gets updated via a trigger if something changes
-		                    ->where('id', $id)
-		                    ->update('tracker_titles');
+							->where('id', $id)
+							->update('tracker_titles');
 
 		//Update History
 		//NOTE: To avoid doing another query to grab the last_updated time, we just use time() which <should> get the same thing.
@@ -301,16 +301,16 @@ 
 	}
 	private function updateTitleDataById(int $id, array $titleData) {
 		$success = $this->db->set($titleData)
-		                    ->where('id', $id)
-		                    ->update('tracker_titles');
+							->where('id', $id)
+							->update('tracker_titles');
 
 		return (bool) $success;
 	}
 	private function addTitle(string $titleURL, int $siteID) {
 		$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);
 
@@ -371,8 +371,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', $row->id)
-						         ->update('tracker_titles');
+								 ->where('id', $row->id)
+								 ->update('tracker_titles');
 
 						print " - ({$titleData['latest_chapter']})\n";
 					}
@@ -398,8 +398,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', $titleID)
-									         ->update('tracker_titles');
+											 ->where('id', $titleID)
+											 ->update('tracker_titles');
 
 									print " - ({$titleData['latest_chapter']})\n";
 								} else {
@@ -526,9 +526,9 @@ 
 	}
 	public function setCategoryTrackerByID(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;
 	}
@@ -537,9 +537,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) {
@@ -577,23 +577,23 @@ 
 
 			//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) {
 				$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(
@@ -664,20 +664,20 @@ 
 
 	public function getSites() : array {
 		$query = $this->db->select('*')
-		                  ->from('tracker_sites')
-		                  ->where('status', 'enabled')
-		                  ->get();
+						  ->from('tracker_sites')
+						  ->where('status', 'enabled')
+						  ->get();
 
 		return $query->result_array();
 	}
 
 	public function getUsedCategories(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');
 	}
@@ -688,51 +688,51 @@ 
 
 			//CHECK: Is it possible to merge some of these queries?
 			$queryUsers = $this->db->select([
-			                            'COUNT(*) AS total_users',
-			                            'SUM(CASE WHEN api_key IS NOT NULL THEN 1 ELSE 0 END) AS validated_users',
-			                            'SUM(CASE WHEN (api_key IS NOT NULL AND from_unixtime(last_login) > DATE_SUB(NOW(), INTERVAL 7 DAY)) THEN 1 ELSE 0 END) AS active_users'
-			                       ], FALSE)
-			                       ->from('auth_users')
-			                       ->get();
+										'COUNT(*) AS total_users',
+										'SUM(CASE WHEN api_key IS NOT NULL THEN 1 ELSE 0 END) AS validated_users',
+										'SUM(CASE WHEN (api_key IS NOT NULL AND from_unixtime(last_login) > DATE_SUB(NOW(), INTERVAL 7 DAY)) THEN 1 ELSE 0 END) AS active_users'
+								   ], FALSE)
+								   ->from('auth_users')
+								   ->get();
 			$stats = array_merge($stats, $queryUsers->result_array()[0]);
 
 			$queryCounts = $this->db->select([
-			                             'tracker_titles.title',
-			                             'COUNT(tracker_chapters.title_id) AS count'
-			                        ], FALSE)
-			                        ->from('tracker_chapters')
-			                        ->join('tracker_titles', 'tracker_titles.id = tracker_chapters.title_id', 'left')
-			                        ->group_by('tracker_chapters.title_id')
-			                        ->having('count > 1')
-			                        ->order_by('count DESC')
-			                        ->get();
+										 'tracker_titles.title',
+										 'COUNT(tracker_chapters.title_id) AS count'
+									], FALSE)
+									->from('tracker_chapters')
+									->join('tracker_titles', 'tracker_titles.id = tracker_chapters.title_id', 'left')
+									->group_by('tracker_chapters.title_id')
+									->having('count > 1')
+									->order_by('count DESC')
+									->get();
 			$stats['titles_tracked_more'] = count($queryCounts->result_array());
 			$stats['top_title_name']  = $queryCounts->result_array()[0]['title'] ?? 'N/A';
 			$stats['top_title_count'] = $queryCounts->result_array()[0]['count'] ?? 'N/A';
 
 			$queryTitles = $this->db->select([
-			                             'COUNT(DISTINCT tracker_titles.id) AS total_titles',
-			                             'COUNT(DISTINCT tracker_titles.site_id) AS total_sites',
-			                             'SUM(CASE WHEN from_unixtime(auth_users.last_login) > DATE_SUB(NOW(), INTERVAL 120 HOUR) IS NOT NULL THEN 0 ELSE 1 END) AS inactive_titles',
-			                             'SUM(CASE WHEN (tracker_titles.last_updated > DATE_SUB(NOW(), INTERVAL 24 HOUR)) THEN 1 ELSE 0 END) AS updated_titles'
-			                        ], FALSE)
-			                        ->from('tracker_titles')
-			                        ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-			                        ->join('tracker_chapters', 'tracker_titles.id = tracker_chapters.title_id', 'left')
-			                        ->join('auth_users', 'tracker_chapters.user_id = auth_users.id', 'left')
-			                        ->get();
+										 'COUNT(DISTINCT tracker_titles.id) AS total_titles',
+										 'COUNT(DISTINCT tracker_titles.site_id) AS total_sites',
+										 'SUM(CASE WHEN from_unixtime(auth_users.last_login) > DATE_SUB(NOW(), INTERVAL 120 HOUR) IS NOT NULL THEN 0 ELSE 1 END) AS inactive_titles',
+										 'SUM(CASE WHEN (tracker_titles.last_updated > DATE_SUB(NOW(), INTERVAL 24 HOUR)) THEN 1 ELSE 0 END) AS updated_titles'
+									], FALSE)
+									->from('tracker_titles')
+									->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+									->join('tracker_chapters', 'tracker_titles.id = tracker_chapters.title_id', 'left')
+									->join('auth_users', 'tracker_chapters.user_id = auth_users.id', 'left')
+									->get();
 			$stats = array_merge($stats, $queryTitles->result_array()[0]);
 
 			$querySites = $this->db->select([
-			                           'tracker_sites.site',
-			                           'COUNT(*) AS count'
-			                       ], FALSE)
-			                       ->from('tracker_titles')
-			                       ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-			                       ->group_by('tracker_titles.site_id')
-			                       ->order_by('count DESC')
-			                       ->limit(3)
-			                       ->get();
+									   'tracker_sites.site',
+									   'COUNT(*) AS count'
+								   ], FALSE)
+								   ->from('tracker_titles')
+								   ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+								   ->group_by('tracker_titles.site_id')
+								   ->order_by('count DESC')
+								   ->limit(3)
+								   ->get();
 			$querySitesResult = $querySites->result_array();
 			$stats['rank1_site']       = $querySitesResult[0]['site'];
 			$stats['rank1_site_count'] = $querySitesResult[0]['count'];
@@ -742,17 +742,17 @@ 
 			$stats['rank3_site_count'] = $querySitesResult[2]['count'];
 
 			$queryTitlesU = $this->db->select([
-			                             'COUNT(*) AS title_updated_count'
-			                         ], FALSE)
-			                         ->from('tracker_titles_history')
-			                         ->get();
+										 'COUNT(*) AS title_updated_count'
+									 ], FALSE)
+									 ->from('tracker_titles_history')
+									 ->get();
 			$stats = array_merge($stats, $queryTitlesU->result_array()[0]);
 
 			$queryUsersU = $this->db->select([
-			                            'COUNT(*) AS user_updated_count'
-			                        ], FALSE)
-			                        ->from('tracker_user_history')
-			                        ->get();
+										'COUNT(*) AS user_updated_count'
+									], FALSE)
+									->from('tracker_user_history')
+									->get();
 			$stats = array_merge($stats, $queryUsersU->result_array()[0]);
 
 			$stats['live_time'] = timespan(/*2016-09-10T03:17:19*/ 1473477439, time(), 2);

Braces +9 added lines, -3 removed lines

@@ -82,7 +82,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'];
+				}
 			}
 
 			//CHECK: Is this good for speed?
@@ -198,9 +200,13 @@ 
 			$titleID = $id;
 		} else {
 			//TODO: Check if title is valid URL!
-			if($create) $titleID = $this->addTitle($titleURL, $siteID);
+			if($create) {
+				$titleID = $this->addTitle($titleURL, $siteID);
+			}
+		}
+		if(!isset($titleID) || !$titleID) {
+			$titleID = 0;
 		}
-		if(!isset($titleID) || !$titleID) $titleID = 0;
 
 		return ($returnData && $titleID !== 0 ? $query->row_array() : $titleID);
 	}

application/models/Site_Model.php

Spacing +34 added lines, -34 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');
 
 abstract class Site_Model extends CI_Model {
 	public $site          = '';
@@ -32,7 +32,7 @@ 
 	final protected function get_content(string $url, string $cookie_string = "", string $cookiejar_path = "", bool $follow_redirect = FALSE, bool $isPost = FALSE, array $postFields = []) {
 		$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);
 
@@ -50,8 +50,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);
@@ -118,7 +118,7 @@ 
 				$nodes_row   = $xpath->query($node_row_string);
 				if($nodes_title->length === 1 && $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);
@@ -254,8 +254,8 @@ 
 
 			$link = preg_replace('/^(.*\/)(?:[0-9]+\.html)?$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 			$chapterURLSegments = explode('/', $link);
-			$titleData['latest_chapter'] = $chapterURLSegments[5] . (isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
+			$titleData['latest_chapter'] = $chapterURLSegments[5].(isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
 
 			if($firstGet) {
 				$this->doCustomFollow($content['body']);
@@ -333,9 +333,9 @@ 
 
 							$link = preg_replace('/^(.*\/)(?:[0-9]+\.html)?$/', '$1', (string) $nodes_chapter->item(0)->getAttribute('href'));
 							$chapterURLSegments = explode('/', $link);
-							$titleData['latest_chapter'] = $chapterURLSegments[5] . (isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
+							$titleData['latest_chapter'] = $chapterURLSegments[5].(isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
 
-							$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $nodes_latest->item(0)->nodeValue));
+							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $nodes_latest->item(0)->nodeValue));
 
 							$title_url = explode('/', $title->getAttribute('href'))[4];
 							$titleDataList[$title_url] = $titleData;
@@ -426,8 +426,8 @@ 
 
 			$link = preg_replace('/^(.*\/)(?:[0-9]+\.html)?$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 			$chapterURLSegments = explode('/', $link);
-			$titleData['latest_chapter'] = $chapterURLSegments[5] . (isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
+			$titleData['latest_chapter'] = $chapterURLSegments[5].(isset($chapterURLSegments[6]) && !empty($chapterURLSegments[6]) ? "/{$chapterURLSegments[6]}" : "");
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);
@@ -458,7 +458,7 @@ 
 
 		$chapter_parts = explode(':--:', $chapter);
 		return [
-			'url'    => "http://bato.to/reader#" . $chapter_parts[0],
+			'url'    => "http://bato.to/reader#".$chapter_parts[0],
 			'number' => $chapter_parts[1]
 		];
 	}
@@ -493,13 +493,13 @@ 
 
 			///^(?:Vol\.(?<volume>\S+) )?(?:Ch.(?<chapter>[^\s:]+)(?:\s?-\s?(?<extra>[0-9]+))?):?.*/
 			preg_match('/^(?:Vol\.(?<volume>\S+) )?(?:Ch.(?<chapter>[^\s:]+)(?:\s?-\s?(?<extra>[0-9]+))?):?.*/', trim($data['nodes_chapter']->nodeValue), $text);
-			$titleData['latest_chapter'] = substr($data['nodes_chapter']->getAttribute('href'), 22) . ':--:' . ((!empty($text['volume']) ? 'v'.$text['volume'].'/' : '') . 'c'.$text['chapter'] . (!empty($text['extra']) ? '-'.$text['extra'] : ''));
+			$titleData['latest_chapter'] = substr($data['nodes_chapter']->getAttribute('href'), 22).':--:'.((!empty($text['volume']) ? 'v'.$text['volume'].'/' : '').'c'.$text['chapter'].(!empty($text['extra']) ? '-'.$text['extra'] : ''));
 
 			$dateString = $data['nodes_latest']->nodeValue;
 			if($dateString == 'An hour ago') {
 				$dateString = '1 hour ago';
 			}
-			$titleData['last_updated']   = date("Y-m-d H:i:s", strtotime(preg_replace('/ (-|\[A\]).*$/', '', $dateString)));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime(preg_replace('/ (-|\[A\]).*$/', '', $dateString)));
 
 			if($firstGet && $lang == 'English') {
 				//FIXME: English is forced due for now. See #78.
@@ -602,7 +602,7 @@ 
 
 									$chapter = $nodes_chapter->item(0);
 									preg_match('/^(?:Vol\.(?<volume>\S+) )?(?:Ch.(?<chapter>[^\s:]+)(?:\s?-\s?(?<extra>[0-9]+))?):?.*/', trim($chapter->nodeValue), $text);
-									$titleData['latest_chapter'] = substr($chapter->getAttribute('href'), 8) . ':--:' . ((!empty($text['volume']) ? 'v' . $text['volume'] . '/' : '') . 'c' . $text['chapter'] . (!empty($text['extra']) ? '-' . $text['extra'] : ''));
+									$titleData['latest_chapter'] = substr($chapter->getAttribute('href'), 8).':--:'.((!empty($text['volume']) ? 'v'.$text['volume'].'/' : '').'c'.$text['chapter'].(!empty($text['extra']) ? '-'.$text['extra'] : ''));
 
 									$dateString = $nodes_latest->item(0)->nodeValue;
 									if($dateString == 'An hour ago') {
@@ -651,7 +651,7 @@ 
 		*/
 
 		$chapterData = [
-			'url'    => 'http://dynasty-scans.com/chapters/' . $title_parts[0].'_'.$chapter,
+			'url'    => 'http://dynasty-scans.com/chapters/'.$title_parts[0].'_'.$chapter,
 			'number' => ''
 		];
 
@@ -706,13 +706,13 @@ 
 					}
 
 					$chapterURLSegments = explode('/', (string) $data['nodes_chapter']->getAttribute('href'));
-					if (strpos($chapterURLSegments[2], $title_parts[0]) !== false) {
+					if(strpos($chapterURLSegments[2], $title_parts[0]) !== false) {
 						$titleData['latest_chapter'] = substr($chapterURLSegments[2], strlen($title_parts[0]) + 1);
 					} else {
 						$titleData['latest_chapter'] = $chapterURLSegments[2];
 					}
 
-					$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime(str_replace("'", '', substr((string) $data['nodes_latest']->textContent, 9))));
+					$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime(str_replace("'", '', substr((string) $data['nodes_latest']->textContent, 9))));
 				}
 				break;
 
@@ -722,7 +722,7 @@ 
 
 				preg_match('/<b>.*<\/b>/', $data, $matchesT);
 				preg_match('/\/doujins\/[^"]+">(.+)?(?=<\/a>)<\/a>/', $data, $matchesD);
-				$titleData['title'] = (!empty($matchesD) ? ($matchesD[1] !== 'Original' ? $matchesD[1].' - ' : '') : '') . substr($matchesT[0], 3, -4);
+				$titleData['title'] = (!empty($matchesD) ? ($matchesD[1] !== 'Original' ? $matchesD[1].' - ' : '') : '').substr($matchesT[0], 3, -4);
 
 				$titleData['latest_chapter'] = 'oneshot'; //This will never change
 
@@ -777,7 +777,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9]+)$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);
@@ -820,7 +820,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^.*\/(.*?\/[0-9]+)\/[0-9]+$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $data['nodes_latest']->nodeValue));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);
@@ -879,8 +879,8 @@ 
 				$titleData['title'] = trim((string) $xml->{'channel'}->title);
 
 				$chapterURLSegments = explode('/', ((string) $xml->{'channel'}->item[0]->link));
-				$titleData['latest_chapter'] = preg_replace('/^.*?([0-9]+)$/', '$1', $chapterURLSegments[7]) . ':--:' . $chapterURLSegments[6];
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $xml->{'channel'}->item[0]->pubDate));
+				$titleData['latest_chapter'] = preg_replace('/^.*?([0-9]+)$/', '$1', $chapterURLSegments[7]).':--:'.$chapterURLSegments[6];
+				$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $xml->{'channel'}->item[0]->pubDate));
 			}
 		} else {
 			log_message('error', "Series missing? (WebToons): {$title_url}");
@@ -951,13 +951,13 @@ 
 					$titleData['title'] = $nodes_title->item(0)->textContent;
 
 					$firstRow      = $nodes_row->item(0);
-					$nodes_latest  = $xpath->query("td[2]",   $firstRow);
+					$nodes_latest  = $xpath->query("td[2]", $firstRow);
 					$nodes_chapter = $xpath->query("td[1]/a", $firstRow);
 
 					$link = (string) $nodes_chapter->item(0)->getAttribute('href');
 					$chapterURLSegments = explode('/', preg_replace('/\?.*$/', '', $link));
-					$titleData['latest_chapter'] = $chapterURLSegments[3] . ':--:' . preg_replace('/.*?([0-9]+)$/', '$1', $link);
-					$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) $nodes_latest->item(0)->textContent));
+					$titleData['latest_chapter'] = $chapterURLSegments[3].':--:'.preg_replace('/.*?([0-9]+)$/', '$1', $link);
+					$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) $nodes_latest->item(0)->textContent));
 				}
 			} else {
 				//TODO: Throw ERRORS;
@@ -981,7 +981,7 @@ 
 		         The bad thing is these are interchangeable, despite them showing the exact same listing page.
 		         Thankfully the title_url of manga which use /forums/ seem to be appended with ".%ID%" which means we can easily check them. */
 
-		if (strpos($title_url, '.') !== FALSE) {
+		if(strpos($title_url, '.') !== FALSE) {
 			$format = "https://gameofscanlation.moe/forums/{$title_url}/";
 		} else {
 			$format = "https://gameofscanlation.moe/projects/{$title_url}/";
@@ -1016,7 +1016,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^projects\/.*?\/(.*?)\/$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s",(int) $data['nodes_latest']->getAttribute('title'));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", (int) $data['nodes_latest']->getAttribute('title'));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);
@@ -1060,7 +1060,7 @@ 
 
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9]+)\/$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) substr($data['nodes_latest']->getAttribute('title'), 13)));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) substr($data['nodes_latest']->getAttribute('title'), 13)));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);
@@ -1083,7 +1083,7 @@ 
 		$chapter_parts = explode('/', $chapter);
 		return [
 			'url'    => "https://reader.kireicake.com/read/{$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]}" : '')/*)*/
 		];
 	}
 
@@ -1107,7 +1107,7 @@ 
 		$chapter_parts = explode('/', $chapter);
 		return [
 			'url'    => "https://reader.seaotterscans.com/read/{$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]}" : '')/*)*/
 		];
 	}
 
@@ -1131,7 +1131,7 @@ 
 		$chapter_parts = explode('/', $chapter);
 		return [
 			'url'    => "http://helveticascans.com/reader/read/{$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]}" : '')/*)*/
 		];
 	}
 
@@ -1155,7 +1155,7 @@ 
 		$chapter_parts = explode('/', $chapter);
 		return [
 			'url'    => "http://reader.sensescans.com/read/{$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]}" : '')/*)*/
 		];
 	}
 
@@ -1179,7 +1179,7 @@ 
 		$chapter_parts = explode('/', $chapter);
 		return [
 			'url'    => "https://jaiminisbox.com/reader/read/{$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]}" : '')/*)*/
 		];
 	}
 

Braces +23 added lines, -8 removed lines

@@ -20,12 +20,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match($this->titleFormat, $title_url);
-		if(!$success) log_message('error', "Invalid Title URL ({$this->site}): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL ({$this->site}): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match($this->chapterFormat, $chapter);
-		if(!$success) log_message('error', "Invalid Chapter ({$this->site}): {$chapter}");
+		if(!$success) {
+			log_message('error', "Invalid Chapter ({$this->site}): {$chapter}");
+		}
 		return $success;
 	}
 
@@ -36,10 +40,16 @@ 
 		//curl_setopt($ch, CURLOPT_VERBOSE, 1);
 		curl_setopt($ch, CURLOPT_HEADER, 1);
 
-		if($follow_redirect)        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);
+		if($follow_redirect) {
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);
+		}
 
-		if(!empty($cookie_string))  curl_setopt($ch, CURLOPT_COOKIE, $cookie_string);
-		if(!empty($cookiejar_path)) curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiejar_path);
+		if(!empty($cookie_string)) {
+			curl_setopt($ch, CURLOPT_COOKIE, $cookie_string);
+		}
+		if(!empty($cookiejar_path)) {
+			curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiejar_path);
+		}
 
 		//Some sites check the useragent for stuff, use a pre-defined user-agent to avoid stuff.
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2824.0 Safari/537.36');
@@ -365,8 +375,12 @@ 
 				$oldVolume = substr(array_shift($oldChapterSegments), 1);
 				$newVolume = substr(array_shift($newChapterSegments), 1);
 
-				if(in_array($oldVolume, ['TBD', 'TBA', 'NA'])) $oldVolume = 999;
-				if(in_array($newVolume, ['TBD', 'TBA', 'NA'])) $newVolume = 999;
+				if(in_array($oldVolume, ['TBD', 'TBA', 'NA'])) {
+					$oldVolume = 999;
+				}
+				if(in_array($newVolume, ['TBD', 'TBA', 'NA'])) {
+					$newVolume = 999;
+				}
 
 				$oldVolume = floatval($oldVolume);
 				$newVolume = floatval($newVolume);
@@ -873,7 +887,8 @@ 
 
 		$content = $this->get_content($fullURL);
 		$data = $content['body'];
-		if($data !== 'Can\'t find the manga series.') { //FIXME: We should check for he proper error here.
+		if($data !== 'Can\'t find the manga series.') {
+//FIXME: We should check for he proper error here.
 			$xml = simplexml_load_string($data) or die("Error: Cannot create object");
 			if(isset($xml->{'channel'}->item[0])) {
 				$titleData['title'] = trim((string) $xml->{'channel'}->title);