DakuTree / manga-tracker

application/core/MY_Controller.php

Braces +4 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	protected $footer_data = array();
 	public    $global_data = array();
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 
 		//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing.
@@ -80,7 +80,9 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		if($this->ion_auth->logged_in()) redirect('/');
+		if($this->ion_auth->logged_in()) {
+			redirect('/');
+		}
 	}
 }
 

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 	protected $footer_data = array();
 	public    $global_data = array();
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 
 		//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing.
@@ -18,10 +18,10 @@ 
 
 		$this->global_data['theme'] = $this->User_Options->get('theme');
 		$css_path = "css/main.{$this->User_Options->get('theme')}";
-		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH . "../public/assets/{$css_path}.css").".css";
+		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH."../public/assets/{$css_path}.css").".css";
 
 		$js_path = 'js/compiled.min';
-		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH . "../public/assets/{$js_path}.js").".js";
+		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH."../public/assets/{$js_path}.js").".js";
 	}
 
 	public function _render_page(/*(array) $paths*/) : void {
@@ -45,7 +45,7 @@ 
 		$json = is_array($json_input) ? json_encode($json_input) : $json_input;
 
 		$this->output->set_content_type('application/json', 'utf-8');
-		$this->_render_content($json,'json', $download, $filenamePrefix);
+		$this->_render_content($json, 'json', $download, $filenamePrefix);
 	}
 	public function _render_content(string $content, string $filenameExt, bool $download = FALSE, string $filenamePrefix = 'tracker') : void {
 		if($download) {

application/libraries/Cacher.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
-<?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');
 
 //Because we can't autoload the cache driver with params - https://forum.codeigniter.com/thread-62217-post-319687.html#pid319687
 class Cacher {
 	protected $CI;
 
 	public function __construct() {
-		$this->CI =& get_instance(); //grab an instance of CI
+		$this->CI = & get_instance(); //grab an instance of CI
 		$this->initiate_cache();
 	}
 

application/models/Tracker/Tracker_Sites_Model.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');
 
 /**
  * Class Tracker_Sites_Model
@@ -102,7 +102,7 @@ 
 	 * @param bool   $firstGet
 	 * @return array|null [title,latest_chapter,last_updated,followed?]
 	 */
-	abstract public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array;
+	abstract public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array;
 
 	/**
 	 * Validates given $title_url against titleFormat.
@@ -151,7 +151,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);
 
@@ -173,8 +173,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);
@@ -217,7 +217,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 */);
 			$refresh = TRUE;
 		} else {
 			//Either site doesn't have CloudFlare or we have bypassed it. Either is good!
@@ -266,7 +266,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);
@@ -274,7 +274,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);
@@ -462,14 +462,14 @@ 
 		$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 {
 		return "{$this->baseURL}/read/{$title_url}/{$chapter}/";
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$jsonURL = $this->getJSONTitleURL($title_url);
@@ -589,7 +589,7 @@ 
 		return $this->getFullTitleURL($title_url).'/'.$chapter;
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$fullURL = $this->getFullTitleURL($title_url);

Braces +30 added lines, -10 removed lines

@@ -114,7 +114,9 @@ 
 	 */
 	final 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;
 	}
 
@@ -128,7 +130,9 @@ 
 	 */
 	final 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;
 	}
 
@@ -155,14 +159,20 @@ 
 			//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(($cookies = $this->cache->get("cloudflare_{$this->site}"))) {
 				$cookie_string .= "; {$cookies}";
 			}
 
-			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, $this->userAgent);
@@ -190,7 +200,9 @@ 
 			$body        = substr($response, $header_size);
 			curl_close($ch);
 
-			if($status_code === 503) $refresh = $this->handleCloudFlare($url, $body);
+			if($status_code === 503) {
+				$refresh = $this->handleCloudFlare($url, $body);
+			}
 		}
 
 		return [
@@ -400,8 +412,12 @@ 
 		$status = FALSE;
 
 		//Make sure we have a volume element
-		if(count($oldChapterSegments) === 1) array_unshift($oldChapterSegments, 'v0');
-		if(count($newChapterSegments) === 1) array_unshift($newChapterSegments, 'v0');
+		if(count($oldChapterSegments) === 1) {
+			array_unshift($oldChapterSegments, 'v0');
+		}
+		if(count($newChapterSegments) === 1) {
+			array_unshift($newChapterSegments, 'v0');
+		}
 
 		$oldCount = count($oldChapterSegments);
 		$newCount = count($newChapterSegments);
@@ -414,8 +430,12 @@ 
 				$newVolume = substr(array_shift($newChapterSegments), 1);
 
 				//Forcing volume to 0 as TBD might not be the latest (although it can be, but that is covered by other checks)
-				if(in_array($oldVolume, ['TBD', 'TBA', 'NA', 'LMT'])) $oldVolume = 0;
-				if(in_array($newVolume, ['TBD', 'TBA', 'NA', 'LMT'])) $newVolume = 0;
+				if(in_array($oldVolume, ['TBD', 'TBA', 'NA', 'LMT'])) {
+					$oldVolume = 0;
+				}
+				if(in_array($newVolume, ['TBD', 'TBA', 'NA', 'LMT'])) {
+					$newVolume = 0;
+				}
 
 				$oldVolume = floatval($oldVolume);
 				$newVolume = floatval($newVolume);

Upper-Lower-Casing +2 added lines, -2 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
@@ -203,7 +203,7 @@ 
 	final private function handleCloudFlare(string $url, string $body) : bool {
 		$refresh = FALSE;
 
-		if(strpos($body, 'DDoS protection by Cloudflare') !== false) {
+		if(strpos($body, 'DDoS protection by Cloudflare') !== FALSE) {
 			if(!$this->hasCloudFlare) {
 				//TODO: Site appears to have enabled CloudFlare, disable it and contact admin.
 				//      We'll continue to bypass CloudFlare as this may occur in a loop.

application/models/Tracker/Sites/LHTranslation.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@ 
-<?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 LHTranslation extends Base_Site_Model {
 	public $titleFormat   = '/^[a-zA-Z0-9_\-.]+$/';
 	public $chapterFormat = '/^[0-9\.]+$/';
 
 	public function getFullTitleURL(string $title_url) : string {
-		$title_url = str_replace('.','', $title_url);
+		$title_url = str_replace('.', '', $title_url);
 		return "http://lhtranslation.com/{$title_url}";
 	}
 
@@ -17,17 +17,17 @@ 
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
-		$title_url = str_replace('.','', $title_url);
+		$title_url = str_replace('.', '', $title_url);
 		$title_url = $this->_fixTitle($title_url);
 		$fullURL = "http://lhtranslation.com/{$title_url}/feed/";
 		$content = $this->get_content($fullURL);
 
 		$data = $content['body'];
 		$xml = simplexml_load_string($data) or die("Error: Cannot create object");
-		if(((string) $xml->{'channel'}->title) !== 'Comments on: '){
+		if(((string) $xml->{'channel'}->title) !== 'Comments on: ') {
 			if(isset($xml->{'channel'}->item[0])) {
 				if($title = (string) $xml->{'channel'}->item[0]->category) {
 					$titleData['title'] = trim($title);