DakuTree / manga-tracker

application/models/Tracker/Sites/DokiFansubs.php

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 DokiFansubs extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'https://kobato.hologfx.com/reader';

application/models/Tracker/Tracker_Sites_Model.php

Spacing +9 added lines, -9 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 extends CI_Model {
 	public function __construct() {
@@ -39,7 +39,7 @@ 
 
 	abstract public function getChapterData(string $title_url, string $chapter) : array;
 
-	abstract public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array;
+	abstract public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array;
 
 	final public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match($this->titleFormat, $title_url);
@@ -55,7 +55,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);
 
@@ -73,8 +73,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);
@@ -130,7 +130,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);
@@ -138,7 +138,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);
@@ -266,11 +266,11 @@ 
 		$chapter_parts = explode('/', $chapter); //returns #LANG#/#VOLUME#/#CHAPTER#/#CHAPTER_EXTRA#(/#PAGE#/)
 		return [
 			'url'    => "{$this->baseURL}/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]}" : '')/*)*/
 		];
 	}
 
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$titleData = [];
 
 		$jsonURL = "{$this->baseURL}/api/reader/comic/stub/{$title_url}/format/json";

application/models/Tracker/Sites/JaiminisBox.php

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
-<?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 JaiminisBox extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'https://jaiminisbox.com/reader';
 
 	//NOTE: Jaimini's Box appears to have disabled API support for some reason. Fallback to using the old method.
-	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ?array {
+	public function getTitleData(string $title_url, bool $firstGet = FALSE) : ? array {
 		$fullURL = $this->getFullTitleURL($title_url);
 		$titleData = [];
 		if($content = $this->get_content($fullURL, "", "", FALSE, TRUE, ['adult' => 'true'])) {

application/controllers/User/Auth/Forgot_Password.php

Spacing +6 added lines, -6 removed lines

@@ -16,12 +16,12 @@ 
 		$this->header_data['page']  = "forgot_password";
 
 		//TODO (RESEARCH): Should we allow username here too?
-		$this->form_validation->set_rules('email', 'Email',  'required|valid_email', array(
+		$this->form_validation->set_rules('email', 'Email', 'required|valid_email', array(
 			'required'    => 'Please enter your email.',
 			'valid_email' => 'The email your entered is invalid.'
 		));
 
-		if ($this->form_validation->run() === TRUE) {
+		if($this->form_validation->run() === TRUE) {
 			//form is valid
 
 			$identity = $this->ion_auth->where('email', $this->input->post('email'))->users()->row();
@@ -71,21 +71,21 @@ 
 		$this->header_data['page'] = "reset-password";
 
 		$user = $this->ion_auth->forgotten_password_check($code);
-		if ($user) {
+		if($user) {
 			//code is valid, show reset form or process reset
 			$min_password_length = $this->config->item('min_password_length', 'ion_auth');
 			$max_password_length = $this->config->item('max_password_length', 'ion_auth');
-			$this->form_validation->set_rules('new_password',         "Password",         'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']');
+			$this->form_validation->set_rules('new_password', "Password", 'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']');
 			$this->form_validation->set_rules('new_password_confirm', "Password Confirm", 'required|matches[new_password]');
 
-			if ($this->form_validation->run() === TRUE) {
+			if($this->form_validation->run() === TRUE) {
 				//form is valid, process the password reset request
 				//TODO (Research): The original ion_auth auth.php sent the userid to the form, then matched it on return, is there any point to this?
 
 				$identity = $user->{'email'};
 				$change   = $this->ion_auth->reset_password($identity, $this->input->post('new_password'));
 
-				if ($change) {
+				if($change) {
 					//password changed successfully, redirect to login
 					$this->session->set_flashdata('notices', $this->ion_auth->messages());
 					redirect("user/login", 'refresh');

application/models/Tracker/Sites/WorldThree.php

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 WorldThree extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'http://www.slide.world-three.org';

application/models/Tracker/Sites/WhiteCloudPavillion.php

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 WhiteCloudPavillion extends Base_FoolSlide_Site_Model {
 	public $baseURL = 'https://archangelscans.com/free';

application/models/History_Model.php

Spacing +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 History_Model extends CI_Model {
 	public function __construct() {
@@ -49,7 +49,7 @@ 
 			foreach($result as $row) {
 				$arrRow = [];
 
-				$arrRow['updated_at']  = $row->updated_at;
+				$arrRow['updated_at'] = $row->updated_at;
 
 				$newChapterData = $this->Tracker->sites->{$row->site_class}->getChapterData($row->title_url, $row->new_chapter);
 				$arrRow['new_chapter']      = "<a href=\"{$newChapterData['url']}\">{$newChapterData['number']}</a>";

application/models/User_Options_Model.php

Spacing +4 added lines, -4 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 User_Options_Model extends CI_Model {
 	public $options = array(
@@ -200,7 +200,7 @@ 
 			$query = $this->db->select('value_str, value_int')
 			                  ->from('user_options')
 			                  ->where('user_id', $userID)
-			                  ->where('name',    $option)
+			                  ->where('name', $option)
 			                  ->limit(1);
 			$data = $query->get()->row_array();
 		} else {
@@ -208,7 +208,7 @@ 
 				$query = $this->db->select('value_str, value_int')
 				                  ->from('user_options')
 				                  ->where('user_id', $userID)
-				                  ->where('name',    $option)
+				                  ->where('name', $option)
 				                  ->limit(1);
 				$data = $query->get()->row_array();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
@@ -261,7 +261,7 @@ 
 			);
 			//FIXME: Get a better solution than str_replace for removing special characters
 			$elements = array();
-			foreach (array_values($this->options[$option]['valid_options']) as $valid_option) {
+			foreach(array_values($this->options[$option]['valid_options']) as $valid_option) {
 				$elements[$option.'_'.str_replace(',', '_', $valid_option)] = array_merge($base_attributes, array(
 					'value' => $valid_option
 				));

application/models/Tracker/Tracker_List_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_List_Model extends Tracker_Base_Model {
 	public function __construct() {
@@ -29,7 +29,7 @@ 
 			];
 		}
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$is_unread = intval(($row->latest_chapter == $row->ignore_chapter) || ($row->latest_chapter == $row->current_chapter) ? '1' : '0');
 				$arr['series'][$row->category]['unread_count'] = (($arr['series'][$row->category]['unread_count'] ?? 0) + !$is_unread);
 				$data = [
@@ -84,8 +84,8 @@ 
 			$sortOrder = $this->User_Options->get('list_sort_order', $userID);
 			switch($this->User_Options->get('list_sort_type', $userID)) {
 				case 'unread':
-					foreach (array_keys($arr['series']) as $category) {
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
+					foreach(array_keys($arr['series']) as $category) {
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}");
 							$b_text = strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}");
 
@@ -99,8 +99,8 @@ 
 					break;
 
 				case 'unread_latest':
-					foreach (array_keys($arr['series']) as $category) {
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
+					foreach(array_keys($arr['series']) as $category) {
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = $a['new_chapter_exists'];
 							$b_text = $b['new_chapter_exists'];
 
@@ -121,7 +121,7 @@ 
 					break;
 
 				case 'alphabetical':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['title_data']['title']}");
 							$b_text = strtolower("{$b['title_data']['title']}");
@@ -136,7 +136,7 @@ 
 					break;
 
 				case 'my_status':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = strtolower("{$a['generated_current_data']['number']}");
 							$b_text = strtolower("{$b['generated_current_data']['number']}");
@@ -151,7 +151,7 @@ 
 					break;
 
 				case 'latest':
-					foreach (array_keys($arr['series']) as $category) {
+					foreach(array_keys($arr['series']) as $category) {
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
 							$a_text = new DateTime("{$a['title_data']['last_updated']}");
 							$b_text = new DateTime("{$b['title_data']['last_updated']}");
@@ -283,7 +283,7 @@ 
 		return $status;
 	}
 
-	public function getMalID(int $userID, int $titleID) : ?array{
+	public function getMalID(int $userID, int $titleID) : ? array{
 		$malIDArr = NULL;
 
 		//NEW METHOD
@@ -321,7 +321,7 @@ 
 			                  ->get('tracker_chapters');
 
 			if($queryC2->num_rows() > 0 && ($tag_string = $queryC2->row()->tags) && !is_null($tag_string)) {
-				$arr   = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
+				$arr = preg_grep('/^mal:([0-9]+|none)$/', explode(',', $tag_string));
 				if(!empty($arr)) {
 					$malIDArr = [
 						'id'   => explode(':', $arr[0])[1],