DakuTree / manga-tracker

application/models/Site_Model.php

Spacing +29 added lines, -29 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) {
 		$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);
 
@@ -108,7 +108,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);
 				$nodes_chapter = $xpath->query($node_chapter_string, $firstRow);
 
 				if($nodes_latest->length === 1 && $nodes_chapter->length === 1) {
@@ -231,8 +231,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);
@@ -276,8 +276,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);
@@ -308,7 +308,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]
 		];
 	}
@@ -344,13 +344,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)));
 		}
 
 		return (!empty($titleData) ? $titleData : NULL);
@@ -389,7 +389,7 @@ 
 		*/
 
 		$chapterData = [
-			'url'    => 'http://dynasty-scans.com/chapters/' . $title_parts[0].'_'.$chapter,
+			'url'    => 'http://dynasty-scans.com/chapters/'.$title_parts[0].'_'.$chapter,
 			'number' => ''
 		];
 
@@ -430,14 +430,14 @@ 
 
 			preg_match('/<b>.*<\/b>/', $data, $matchesT);
 			preg_match('/\/doujins\/[^"]+">(.+)?(?=<\/a>)<\/a>/', $data, $matchesD);
-			$titleData['title'] = (!empty($matchesD) ? (substr($matchesD[1], 0, -7) !== 'Original' ? substr($matchesD[1], 0, -7).' - ' : '') : '') . substr($matchesT[0], 3, -4);
+			$titleData['title'] = (!empty($matchesD) ? (substr($matchesD[1], 0, -7) !== 'Original' ? substr($matchesD[1], 0, -7).' - ' : '') : '').substr($matchesT[0], 3, -4);
 
 			$data = preg_replace('/^[\S\s]*(<dl class=\'chapter-list\'>[\S\s]*<\/dl>)[\S\s]*$/', '$1', $data);
 			preg_match_all('/<dd>[\s\S]+?(?=<\/dd>)<\/dd>/', $data, $matches);
 			$latest_chapter_html = array_pop($matches[0]);
 
 			preg_match('/\/chapters\/([^"]+)/', $latest_chapter_html, $matches);
-			$titleData['latest_chapter'] = substr($matches[1], strlen($title_url)+1);
+			$titleData['latest_chapter'] = substr($matches[1], strlen($title_url) + 1);
 			//FIXME: THIS IS A TEMP FIX, SEE https://github.com/DakuTree/manga-tracker/issues/58
 			if(!$titleData['latest_chapter']) {
 				log_message('error', 'DynastyScans::getTitleData cannot parse title properly as it contains oneshot. || URL: '.$title_url);
@@ -445,14 +445,14 @@ 
 			}
 
 			preg_match('/<small>released (.*)<\/small>/', $latest_chapter_html, $matches);
-			$titleData['last_updated']   = date("Y-m-d H:i:s", strtotime(str_replace('\'', '', $matches[1])));
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime(str_replace('\'', '', $matches[1])));
 		} elseif($title_parts[1] == '1') {
 			$content = $this->get_content('http://dynasty-scans.com/chapters/'.$title_url);
 			$data = $content['body'];
 
 			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
 
@@ -506,7 +506,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);
@@ -550,7 +550,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);
@@ -606,8 +606,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}");
@@ -678,13 +678,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;
@@ -712,7 +712,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]}" : '')/*)*/
 		];
 	}
 
@@ -762,11 +762,11 @@ 
 
 				$firstRow      = $nodes_row->item(0);
 				$nodes_latest  = $xpath->query("p[@class='author']/span|p[@class='author']/abbr", $firstRow);
-				$nodes_chapter = $xpath->query("p[@class='text_work']/a",                         $firstRow);
+				$nodes_chapter = $xpath->query("p[@class='text_work']/a", $firstRow);
 
 				$link = (string) $nodes_chapter->item(0)->getAttribute('href');
 				$titleData['latest_chapter'] = preg_replace('/^projects\/.*?\/(.*?)\/$/', '$1', $link);
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", (int) $nodes_latest->item(0)->getAttribute('data-time'));
+				$titleData['last_updated'] = date("Y-m-d H:i:s", (int) $nodes_latest->item(0)->getAttribute('data-time'));
 			} else {
 				log_message('error', "GameOfScanlation: Unable to find nodes.");
 				return NULL;
@@ -820,7 +820,7 @@ 
 
 				$link = (string) $nodes_chapter->item(0)->getAttribute('href');
 				$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9]+)\/$/', '$1', $link);
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) substr($nodes_latest->item(0)->getAttribute('title'), 13)));
+				$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) substr($nodes_latest->item(0)->getAttribute('title'), 13)));
 			} else {
 				log_message('error', "MangaCow: Unable to find nodes.");
 				return NULL;
@@ -847,7 +847,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]}" : '')/*)*/
 		];
 	}
 
@@ -871,7 +871,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]}" : '')/*)*/
 		];
 	}
 
@@ -895,7 +895,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]}" : '')/*)*/
 		];
 	}
 

Braces +17 added lines, -6 removed lines

@@ -20,12 +20,16 @@ 
 
 	public function isValidTitleURL(string $title_url, string $regex) : bool {
 		$success = (bool) preg_match($regex, $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, string $regex) : bool {
 		$success = (bool) preg_match($regex, $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');
@@ -600,7 +610,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);

Upper-Lower-Casing +7 added lines, -7 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          = '';
@@ -666,9 +666,9 @@ 
 				$data = preg_replace('/^[\S\s]*(<div id="leftside">[\S\s]*)<div id="rightside">[\S\s]*$/', '$1', $data);
 
 				$dom = new DOMDocument();
-				libxml_use_internal_errors(true);
+				libxml_use_internal_errors(TRUE);
 				$dom->loadHTML($data);
-				libxml_use_internal_errors(false);
+				libxml_use_internal_errors(FALSE);
 
 				$xpath = new DOMXPath($dom);
 
@@ -749,9 +749,9 @@ 
 			//$data = preg_replace('/^[\S\s]*(<ol[\S\s]*)<\/ol>[\S\s]*$/', '$1', $data);
 
 			$dom = new DOMDocument();
-			libxml_use_internal_errors(true);
+			libxml_use_internal_errors(TRUE);
 			$dom->loadHTML($data);
-			libxml_use_internal_errors(false);
+			libxml_use_internal_errors(FALSE);
 
 			$xpath = new DOMXPath($dom);
 
@@ -804,9 +804,9 @@ 
 		$data = $content['body'];
 		if(strpos($data, '404 Page Not Found') === FALSE) {
 			$dom = new DOMDocument();
-			libxml_use_internal_errors(true);
+			libxml_use_internal_errors(TRUE);
 			$dom->loadHTML($data);
-			libxml_use_internal_errors(false);
+			libxml_use_internal_errors(FALSE);
 
 			$xpath = new DOMXPath($dom);