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 {
@@ -32,19 +32,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 (string $raw_headers) : array {
+if(!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
+	function http_parse_headers(string $raw_headers) : array {
 		$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 +6 added lines, -5 removed lines

@@ -32,18 +32,19 @@
 	return $time_string;
 }
 
-if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
+if (!function_exists('http_parse_headers')) {
+#http://www.php.net/manual/en/function.http-parse-headers.php#112917
 	function http_parse_headers (string $raw_headers) : array {
 		$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/controllers/Ajax/Userscript.php

Indentation +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@
 				];
 
 				$this->output
-				     ->set_status_header('200')
-				     ->set_content_type('application/json', 'utf-8')
-				     ->set_output(json_encode($json));
+					 ->set_status_header('200')
+					 ->set_content_type('application/json', 'utf-8')
+					 ->set_output(json_encode($json));
 			} else {
 				//TODO: We should probably try and have more verbose errors here. Return via JSON or something.
 				$this->output->set_status_header('400', 'Unable to update?');

_scripts/generate_spritesheet.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 if(!extension_loaded('gd')) die('GD ext is required to run this!');
 
@@ -23,11 +23,11 @@ 
 		imagealphablending($sheetImage, FALSE);
 		imagesavealpha($sheetImage, TRUE);
 
-		imagefill($sheetImage,0,0,0x7fff0000);
+		imagefill($sheetImage, 0, 0, 0x7fff0000);
 
 		$x = 0;
-		foreach ($this->fileList as $filename) {
-			$siteImage = imagecreatefrompng(ICON_FOLDER. "/{$filename}");
+		foreach($this->fileList as $filename) {
+			$siteImage = imagecreatefrompng(ICON_FOLDER."/{$filename}");
 			imagealphablending($siteImage, TRUE);
 
 			$dst_x = ((16 + 2) * $x);
@@ -57,7 +57,7 @@ 
 		if(preg_match('/\.sprite-site.*\@cache-version: ([0-9]+);/s', $oldLESS, $cvMatches)) {
 			$cacheVersion = ((int) $cvMatches[1]) + 1;
 
-			$newLESS = preg_replace('/\.sprite-site.*/s', '',$oldLESS);
+			$newLESS = preg_replace('/\.sprite-site.*/s', '', $oldLESS);
 			$newLESS .= ''.
 				".sprite-site {\n".
 				"	.sprite();\n".

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-if(!extension_loaded('gd')) die('GD ext is required to run this!');
+if(!extension_loaded('gd')) {
+	die('GD ext is required to run this!');
+}
 
 chdir(dirname(__FILE__).'/../'); //Just to make things easier, change dir to project root.
 const ASSET_FOLDER = 'public/assets';

application/core/MY_Config.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 class MY_Config extends CI_Config {
 	public function __construct() {

application/views/User/Dashboard.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 						|
 						<a href="#" class="set-mal-id" data-mal-id="<?=$row['mal_id']?>" data-mal-type="<?=$row['mal_type']?>">Set MAL ID</a> <?php if(!is_null($row['mal_id']) && $row['mal_type'] == 'chapter') { ?><span>(<small><?=($row['mal_id'] !== '0' ? $row['mal_id'] : 'none')?></small>)</span><?php } ?>
 						|
-						Tags (<a href="#" class="edit-tags small">Edit</a>): <span class="text-lowercase tag-list"><?=($row['has_tags'] ? implode("", array_map(function ($str) { return "<i class='tag'>{$str}</i>"; }, explode(",", $row['tag_list']))) : "none")?></span>
+						Tags (<a href="#" class="edit-tags small">Edit</a>): <span class="text-lowercase tag-list"><?=($row['has_tags'] ? implode("", array_map(function($str) { return "<i class='tag'>{$str}</i>"; }, explode(",", $row['tag_list']))) : "none")?></span>
 						<div class="input-group hidden tag-edit">
 							<input type="text" class="form-control" placeholder="tag1,tag2,tag3" maxlength="255" pattern='[a-z0-9-_,]{0,255}' value="<?=$row['tag_list']?>">
 							<span class="input-group-btn">

application/models/Tracker/Tracker_Sites_Model.php

Upper-Lower-Casing +1 added lines, -1 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

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;
 	}
 
@@ -157,14 +161,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);
@@ -192,7 +202,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 [
@@ -405,8 +417,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);
@@ -419,8 +435,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);

Spacing +14 added lines, -14 removed lines

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

application/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_Issue_Model.php

Indentation +3 added lines, -3 removed lines

@@ -11,9 +11,9 @@
 
 		//This is pretty barebones issue reporting, and honestly not a great way to do it, but it works for now (until the Github is public).
 		$body = "".
-		        (!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : "").
-		        "Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n".
-		        "<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000));
+				(!is_null($url) && !empty($url) ? "URL: ".htmlspecialchars(substr($url, 0, 255))."<br>\n" : "").
+				"Submitted by: ".$this->input->ip_address().(!is_null($userID) ? "| {$userID}" : "")."<br>\n".
+				"<br>Bug report: ".htmlspecialchars(substr($text, 0, 1000));
 
 		$success = TRUE;
 		$this->email->from('no-reply@trackr.moe', $this->config->item('site_title', 'ion_auth'));

Spacing +1 added lines, -1 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_Issue_Model extends Tracker_Base_Model {
 	public function __construct() {

Upper-Lower-Casing +1 added lines, -1 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_Issue_Model extends Tracker_Base_Model {
 	public function __construct() {

application/controllers/ReportIssue.php

Spacing +2 added lines, -2 removed lines

@@ -12,12 +12,12 @@
 		$this->header_data['page']  = "report-issue";
 
 		$this->form_validation->set_rules('issue_description', 'Description', 'required|max_length[255]');
-		$this->form_validation->set_rules('issue_url',         'URL',         'valid_url');
+		$this->form_validation->set_rules('issue_url', 'URL', 'valid_url');
 
 		$this->body_data['issue_submitted'] = FALSE;
 		if($isValid = $this->form_validation->run() === TRUE) {
 			//send report
-			$this->body_data['issue_submitted'] = $this->Tracker->issue->report("USERID:" . $this->User->id . " ||| " . $this->input->post('issue_description'), NULL, $this->input->post('issue_url'));
+			$this->body_data['issue_submitted'] = $this->Tracker->issue->report("USERID:".$this->User->id." ||| ".$this->input->post('issue_description'), NULL, $this->input->post('issue_url'));
 		}
 
 		if(!$isValid) {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 class ReportIssue extends MY_Controller {
 	public function __construct() {