DakuTree / manga-tracker

application/helpers/generic_helper.php

Spacing +11 added lines, -11 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');
 
 /**
  * Checks if view file exists.
@@ -6,7 +6,7 @@ 
  * @return bool
  */
 function view_exists(string $path) : bool {
-	return file_exists(APPPATH . "/views/{$path}.php");
+	return file_exists(APPPATH."/views/{$path}.php");
 }
 
 function get_time_class(string $time_string) : string {
@@ -29,19 +29,19 @@ 
 	return $time_string;
 }
 
-if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
-	function http_parse_headers ($raw_headers){
+if(!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
+	function http_parse_headers($raw_headers) {
 		$headers = array(); // $headers = [];
-		foreach (explode("\n", $raw_headers) as $i => $h) {
+		foreach(explode("\n", $raw_headers) as $i => $h) {
 			$h = explode(':', $h, 2);
-			if (isset($h[1])){
-				if(!isset($headers[$h[0]])){
+			if(isset($h[1])) {
+				if(!isset($headers[$h[0]])) {
 					$headers[$h[0]] = trim($h[1]);
-				}else if(is_array($headers[$h[0]])){
-					$tmp = array_merge($headers[$h[0]],array(trim($h[1])));
+				} else if(is_array($headers[$h[0]])) {
+					$tmp = array_merge($headers[$h[0]], array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
-				}else{
-					$tmp = array_merge(array($headers[$h[0]]),array(trim($h[1])));
+				} else {
+					$tmp = array_merge(array($headers[$h[0]]), array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
 				}
 			}

Braces +7 added lines, -6 removed lines

@@ -29,18 +29,19 @@
 	return $time_string;
 }
 
-if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
-	function http_parse_headers ($raw_headers){
+if (!function_exists('http_parse_headers')) {
+#http://www.php.net/manual/en/function.http-parse-headers.php#112917
+	function http_parse_headers ($raw_headers) {
 		$headers = array(); // $headers = [];
 		foreach (explode("\n", $raw_headers) as $i => $h) {
 			$h = explode(':', $h, 2);
-			if (isset($h[1])){
-				if(!isset($headers[$h[0]])){
+			if (isset($h[1])) {
+				if(!isset($headers[$h[0]])) {
 					$headers[$h[0]] = trim($h[1]);
-				}else if(is_array($headers[$h[0]])){
+				} else if(is_array($headers[$h[0]])) {
 					$tmp = array_merge($headers[$h[0]],array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
-				}else{
+				} else {
 					$tmp = array_merge(array($headers[$h[0]]),array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
 				}

application/models/Site_Model.php

Spacing +42 added lines, -42 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 function __construct() {
@@ -20,7 +20,7 @@ 
 	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);
 
@@ -79,7 +79,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) {
@@ -178,8 +178,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);
@@ -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);
@@ -271,7 +271,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]
 		];
 	}
@@ -287,8 +287,8 @@ 
 		//Bato.to is annoying and locks stuff behind auth. See: https://github.com/DakuTree/manga-tracker/issues/14#issuecomment-233830855
 		$cookies = [
 			"lang_option={$title_lang}",
-			"member_id=" . $this->config->item('batoto_cookie_member_id'),
-			"pass_hash=" . $this->config->item('batoto_cookie_pass_hash')
+			"member_id=".$this->config->item('batoto_cookie_member_id'),
+			"pass_hash=".$this->config->item('batoto_cookie_pass_hash')
 		];
 		$content = $this->get_content($title_url, implode("; ", $cookies), "", TRUE);
 		$data = $content['body'];
@@ -322,13 +322,13 @@ 
 					preg_match('/^(?:Vol\.(?<volume>\S+) )?(?:Ch.(?<chapter>[^\s:]+)(?:\s?-\s?(?<extra>[0-9]+))?):?.*/', trim($chapter_element->nodeValue), $text);
 
 					$titleData['title']          = html_entity_decode(trim($xpath->query('//h1[@class="ipsType_pagetitle"]')->item(0)->nodeValue));
-					$titleData['latest_chapter'] = substr($chapter_element->getAttribute('href'), 22) . ':--:' . ((!empty($text['volume']) ? 'v'.$text['volume'].'/' : '') . 'c'.$text['chapter'] . (!empty($text['extra']) ? '-'.$text['extra'] : ''));
+					$titleData['latest_chapter'] = substr($chapter_element->getAttribute('href'), 22).':--:'.((!empty($text['volume']) ? 'v'.$text['volume'].'/' : '').'c'.$text['chapter'].(!empty($text['extra']) ? '-'.$text['extra'] : ''));
 
 					$dateString = $updated_element->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)));
 				} else {
 					log_message('error', "Batoto: Regex missing <td> ({$title_url})");
 					return NULL;
@@ -376,7 +376,7 @@ 
 		*/
 
 		$chapterData = [
-			'url'    => 'http://dynasty-scans.com/chapters/' . $title_parts[0].'_'.$chapter,
+			'url'    => 'http://dynasty-scans.com/chapters/'.$title_parts[0].'_'.$chapter,
 			'number' => ''
 		];
 
@@ -417,14 +417,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);
@@ -432,14 +432,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
 
@@ -503,11 +503,11 @@ 
 				$titleData['title'] = $nodes_title->item(0)->nodeValue;
 
 				$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);
 
 				$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9]+)$/', '$1', (string) $nodes_chapter->item(0)->getAttribute('href'));
-				$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));
 			}
 		} else {
 			log_message('error', "Series missing? (MangaPanda): {$title_url}");
@@ -564,11 +564,11 @@ 
 				$titleData['title'] = $nodes_title->item(0)->nodeValue;
 
 				$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);
 
 				$titleData['latest_chapter'] = preg_replace('/^.*\/(.*?\/[0-9]+)\/[0-9]+$/', '$1', (string) $nodes_chapter->item(0)->getAttribute('href'));
-				$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));
 			}
 		} else {
 			log_message('error', "Series missing? (MangaStream): {$title_url}");
@@ -635,8 +635,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}");
@@ -714,13 +714,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;
@@ -755,7 +755,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]}" : '')/*)*/
 		];
 	}
 
@@ -783,12 +783,12 @@ 
 				$titleData['title'] = trim($nodes_title->item(0)->textContent);
 
 				$firstRow      = $nodes_row->item(0);
-				$nodes_latest  = $xpath->query("div[@class='meta_r']",  $firstRow);
+				$nodes_latest  = $xpath->query("div[@class='meta_r']", $firstRow);
 				$nodes_chapter = $xpath->query("div[@class='title']/a", $firstRow);
 
 				$link = (string) $nodes_chapter->item(0)->getAttribute('href');
 				$titleData['latest_chapter'] = preg_replace('/.*\/read\/.*?\/(.*?)\/$/', '$1', $link);
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest->item(0)->textContent)[1])));
+				$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest->item(0)->textContent)[1])));
 			}
 		} else {
 			//TODO: Throw ERRORS;
@@ -845,11 +845,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;
@@ -910,7 +910,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;
@@ -944,7 +944,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]}" : '')/*)*/
 		];
 	}
 
@@ -971,18 +971,18 @@ 
 			//SOO sometimes uses volume groups which are above recent chapters (if they haven't been grouped yet), so make sure we check for both.
 			$nodes_row   = $xpath->query("//div[@class='list']/div[@class='group']/div[@class='title' and text() = 'Chapters']/following-sibling::div[@class='element'][1]");
 			if($nodes_row->length !== 1) {
-				$nodes_row   = $xpath->query("//div[@class='list']/div[@class='group'][1]/div[@class='element'][1]");
+				$nodes_row = $xpath->query("//div[@class='list']/div[@class='group'][1]/div[@class='element'][1]");
 			}
 			if($nodes_title->length === 1 && $nodes_row->length === 1) {
 				$titleData['title'] = trim($nodes_title->item(0)->textContent);
 
 				$firstRow = $nodes_row->item(0);
-				$nodes_latest  = $xpath->query("div[@class='meta_r']",  $firstRow);
+				$nodes_latest  = $xpath->query("div[@class='meta_r']", $firstRow);
 				$nodes_chapter = $xpath->query("div[@class='title']/a", $firstRow);
 
 				$link = (string) $nodes_chapter->item(0)->getAttribute('href');
 				$titleData['latest_chapter'] = preg_replace('/.*\/read\/.*?\/(.*?)\/$/', '$1', $link);
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest[0]->textContent)[1])));
+				$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest[0]->textContent)[1])));
 			}
 		} else {
 			//TODO: Throw ERRORS;
@@ -1013,7 +1013,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]}" : '')/*)*/
 		];
 	}
 
@@ -1038,7 +1038,7 @@ 
 			$nodes_title = $xpath->query("//div[@class='large comic']/h1[@class='title']");
 			$nodes_row   = $xpath->query("//div[@class='list']/div[@class='group']/div[@class='title' and text() = 'Chapters']/following-sibling::div[@class='element'][1]");
 			if($nodes_row->length !== 1) {
-				$nodes_row   = $xpath->query("//div[@class='list']/div[@class='group'][1]/div[@class='element'][1]");
+				$nodes_row = $xpath->query("//div[@class='list']/div[@class='group'][1]/div[@class='element'][1]");
 			}
 			if($nodes_title->length === 1 && $nodes_row->length === 1) {
 				$titleData['title'] = trim($nodes_title->item(0)->textContent);
@@ -1049,7 +1049,7 @@ 
 
 				$link = (string) $nodes_chapter->item(0)->getAttribute('href');
 				$titleData['latest_chapter'] = preg_replace('/.*\/read\/.*?\/(.*?)\/$/', '$1', $link);
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest->item(0)->textContent)[1])));
+				$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest->item(0)->textContent)[1])));
 			}
 		} else {
 			//TODO: Throw ERRORS;
@@ -1080,7 +1080,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]}" : '')/*)*/
 		];
 	}
 
@@ -1105,7 +1105,7 @@ 
 			$nodes_title = $xpath->query("//div[@class='large comic']/h1[@class='title']");
 			$nodes_row   = $xpath->query("//div[@class='list']/div[@class='group']/div[@class='title' and text() = 'Chapters']/following-sibling::div[@class='element'][1]");
 			if($nodes_row->length !== 1) {
-				$nodes_row   = $xpath->query("//div[@class='list']/div[@class='group'][1]/div[@class='element'][1]");
+				$nodes_row = $xpath->query("//div[@class='list']/div[@class='group'][1]/div[@class='element'][1]");
 			}
 			if($nodes_title->length === 1 && $nodes_row->length === 1) {
 				$titleData['title'] = trim($nodes_title->item(0)->textContent);
@@ -1115,7 +1115,7 @@ 
 
 				$link = (string) $nodes_chapter->item(0)->getAttribute('href');
 				$titleData['latest_chapter'] = preg_replace('/.*\/read\/.*?\/(.*?)\/$/', '$1', $link);
-				$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest->item(0)->textContent)[1])));
+				$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime((string) str_replace('.', '', explode(',', $nodes_latest->item(0)->textContent)[1])));
 			}
 		} else {
 			//TODO: Throw ERRORS;

Braces +97 added lines, -33 removed lines

@@ -24,10 +24,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');
@@ -141,12 +147,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+$/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (MangaFox): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (MangaFox): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^(?:v[0-9a-zA-Z]+\/)?c[0-9\.]+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (MangaFox): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (MangaFox): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -193,12 +203,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+$/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (MangaFox): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (MangaFox): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^(?:v[0-9]+\/)?c[0-9]+(?:\.[0-9]+)?$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (MangaFox): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (MangaFox): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -254,7 +268,9 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[0-9]+:--:(?:English|Spanish|French|German|Portuguese|Turkish|Indonesian|Greek|Filipino|Italian|Polish|Thai|Malay|Hungarian|Romanian|Arabic|Hebrew|Russian|Vietnamese|Dutch)$/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (Batoto): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (Batoto): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
@@ -262,7 +278,9 @@ 
 		//       Preferably we'd just use /^[0-9a-z]+:--:(v[0-9]+\/)?c[0-9]+(\.[0-9]+)?$/
 
 		$success = (bool) preg_match('/^[0-9a-z]+:--:.+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (Batoto): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (Batoto): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -357,12 +375,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+:--:(?:0|1)$/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (DynastyScans): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (DynastyScans): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^[0-9a-z_]+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (DynastyScans): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (DynastyScans): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -470,12 +492,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9-]+$/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (MangaPanda): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (MangaPanda): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^[0-9]+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (MangaPanda): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (MangaPanda): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -525,12 +551,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+$/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (MangaStream): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (MangaStream): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^(.*?)\/[0-9]+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (MangaStream): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (MangaStream): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -548,7 +578,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.
 			//$data = preg_replace('/^[\S\s]*(<body id="body">[\S\s]*<\/body>)[\S\s]*$/', '$1', $data);
 
 			$dom = new DOMDocument();
@@ -602,12 +633,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[0-9]+:--:(?:en|zh-hant|zh-hans|th|id):--:[a-z0-9-]+:--:(?:drama|fantasy|comedy|action|slice-of-life|romance|superhero|thriller|sports|sci-fi)$/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (WebToons): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (WebToons): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^[0-9]+:--:.*$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (WebToons): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (WebToons): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -629,7 +664,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);
@@ -666,12 +702,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[A-Za-z0-9-]+/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (KissManga): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (KissManga): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^.*?:--:[0-9]+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (KissManga): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (KissManga): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -741,12 +781,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (KireiCake): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (KireiCake): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^en\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+)?)?)?$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (KireiCake): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (KireiCake): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -805,12 +849,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9-]+/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (GameOfScanlation): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (GameOfScanlation): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^[a-z0-9\.-]+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (GameOfScanlation): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (GameOfScanlation): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -869,12 +917,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-zA-Z0-9_]+/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (MangaCow): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (MangaCow): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^[0-9]+$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (MangaCow): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (MangaCow): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -930,12 +982,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (SeaOtterScans): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (SeaOtterScans): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^en\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+)?)?)?$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (SeaOtterScans): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (SeaOtterScans): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -999,12 +1055,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (HelveticaScans): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (HelveticaScans): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^en\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+)?)?)?$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (HelveticaScans): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (HelveticaScans): '.$chapter);
+		}
 		return $success;
 	}
 
@@ -1066,12 +1126,16 @@ 
 
 	public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match('/^[a-z0-9_]+/', $title_url);
-		if(!$success) log_message('error', "Invalid Title URL (SenseScans): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL (SenseScans): {$title_url}");
+		}
 		return $success;
 	}
 	public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match('/^en\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+(?:\/[0-9]+)?)?)?$/', $chapter);
-		if(!$success) log_message('error', 'Invalid Chapter (SenseScans): '.$chapter);
+		if(!$success) {
+			log_message('error', 'Invalid Chapter (SenseScans): '.$chapter);
+		}
 		return $success;
 	}
 

Upper-Lower-Casing +21 added lines, -21 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 function __construct() {
@@ -303,9 +303,9 @@ 
 		if(strpos($data, '>Register now<') === FALSE) {
 			//Auth was successful
 			$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);
 			$nodes = $xpath->query("(//div/div)[last()]/table/tbody/tr[2]");
@@ -490,9 +490,9 @@ 
 			//$data = preg_replace('/^[\S\s]*(<body id="body">[\S\s]*<\/body>)[\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);
 
@@ -552,9 +552,9 @@ 
 			//$data = preg_replace('/^[\S\s]*(<body id="body">[\S\s]*<\/body>)[\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);
 
@@ -702,9 +702,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);
 
@@ -771,9 +771,9 @@ 
 			$data = preg_replace('/^[\S\s]*(<article>[\S\s]*)<\/article>[\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);
 
@@ -832,9 +832,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);
 
@@ -894,9 +894,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);
 
@@ -960,9 +960,9 @@ 
 			$data = preg_replace('/^[\S\s]*(<article[\S\s]*)<\/article>[\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);
 
@@ -1029,9 +1029,9 @@ 
 			$data = preg_replace('/^[\S\s]*(<article[\S\s]*)<\/article>[\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);
 
@@ -1096,9 +1096,9 @@ 
 			$data = preg_replace('/^[\S\s]*(<article[\S\s]*)<\/article>[\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);