DakuTree / manga-tracker

application/models/User_Options_Model.php

Spacing +5 added lines, -5 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(
@@ -116,7 +116,7 @@ 
 	 *
 	 * @return mixed Returns option value as STRING, or FALSE if option does not exist.
 	 */
-	public function get(string $option, ?int $userID = NULL) {
+	public function get(string $option, ? int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);
 
 		return $this->get_by_userid($option, $userID);
@@ -190,7 +190,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 {
@@ -198,7 +198,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);
@@ -251,7 +251,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/controllers/User/Options.php

Spacing +9 added lines, -9 removed lines

@@ -16,16 +16,16 @@ 
 		$usedCategories   = $this->Tracker->category->getUsed($this->User->id);
 
 		//NOTE: The checkbox validation is handled in run()
-		$this->form_validation->set_rules('category_custom_1_text',  'Custom Category 1 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_2_text',  'Custom Category 2 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_3_text',  'Custom Category 3 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_1_text', 'Custom Category 1 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_2_text', 'Custom Category 2 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_3_text', 'Custom Category 3 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
 		$this->form_validation->set_rules('default_series_category', 'Default Series Category', 'required|is_valid_option_value[default_series_category]');
-		$this->form_validation->set_rules('list_sort_type',          'List Sort Type',          'required|is_valid_option_value[list_sort_type]');
-		$this->form_validation->set_rules('list_sort_order',         'List Sort Order',         'required|is_valid_option_value[list_sort_order]');
-		$this->form_validation->set_rules('theme',                   'Theme',                   'required|is_valid_option_value[theme]');
-		$this->form_validation->set_rules('mal_sync',                'MAL Sync',                'required|is_valid_option_value[mal_sync]');
+		$this->form_validation->set_rules('list_sort_type', 'List Sort Type', 'required|is_valid_option_value[list_sort_type]');
+		$this->form_validation->set_rules('list_sort_order', 'List Sort Order', 'required|is_valid_option_value[list_sort_order]');
+		$this->form_validation->set_rules('theme', 'Theme', 'required|is_valid_option_value[theme]');
+		$this->form_validation->set_rules('mal_sync', 'MAL Sync', 'required|is_valid_option_value[mal_sync]');
 
-		if ($isValid = $this->form_validation->run() === TRUE) {
+		if($isValid = $this->form_validation->run() === TRUE) {
 			foreach($customCategories as $categoryK => $category) {
 				if(!in_array($categoryK, $usedCategories)) {
 					$this->User_Options->set($category, $this->input->post($category) ? 'enabled' : 'disabled');
@@ -38,7 +38,7 @@ 
 
 			$this->User_Options->set('enable_live_countdown_timer', $this->input->post('enable_live_countdown_timer'));
 
-			$this->User_Options->set('list_sort_type',  $this->input->post('list_sort_type'));
+			$this->User_Options->set('list_sort_type', $this->input->post('list_sort_type'));
 			$this->User_Options->set('list_sort_order', $this->input->post('list_sort_order'));
 			
 			$this->User_Options->set('theme', $this->input->post('theme'));

application/models/Tracker/Tracker_Base_Model.php

Spacing +3 added lines, -3 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_Base_Model extends CI_Model {
 	public $sites;
@@ -26,7 +26,7 @@ 
 			$this->enabledCategories['custom3'] = $this->User_Options->get('category_custom_3_text');
 		}
 
-		foreach (glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
+		foreach(glob(APPPATH.'models/Tracker/Sites/*.php') as $filename) {
 			/** @noinspection PhpIncludeInspection */
 			include_once $filename;
 		}
@@ -34,7 +34,7 @@ 
 
 	}
 
-	public function getEnabledCategories(?int $userID = NULL) : array {
+	public function getEnabledCategories(? int $userID = NULL) : array {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);
 
 		$enabledCategories = [];

application/controllers/User/History.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 
 			case 'csv':
 				$this->output->set_content_type('text/csv', 'utf-8');
-				$this->_render_content($this->arrayToCSVRecursive($historyData), 'csv',TRUE, 'tracker-history');
+				$this->_render_content($this->arrayToCSVRecursive($historyData), 'csv', TRUE, 'tracker-history');
 				break;
 
 			default:
@@ -50,15 +50,15 @@ 
 		$enclosure_esc = preg_quote($enclosure, '/');
 
 		$output = array();
-		foreach ($fields as $field) {
-			if ($field === NULL && $nullToMysqlNull) {
+		foreach($fields as $field) {
+			if($field === NULL && $nullToMysqlNull) {
 				$output[] = 'NULL';
 				continue;
 			}
 
 			// Enclose fields containing $delimiter, $enclosure or whitespace
-			if ($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
-				$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
+			if($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field)) {
+				$output[] = $enclosure.str_replace($enclosure, $enclosure.$enclosure, $field).$enclosure;
 			} else {
 				$output[] = $field;
 			}
@@ -70,10 +70,10 @@ 
 		$csvArr = [
 			'Date/Time,Title,URL,Site,Status'
 		];
-		foreach ($fields as $field) {
-			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure,$encloseAll,$nullToMysqlNull);
+		foreach($fields as $field) {
+			$csvArr[] = $this->arrayToCSV($field, $delimiter, $enclosure, $encloseAll, $nullToMysqlNull);
 		}
 
-		return implode(PHP_EOL,$csvArr);
+		return implode(PHP_EOL, $csvArr);
 	}
 }

application/controllers/UpdateStatus.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 UpdateStatus extends MY_Controller {
 	public function __construct() {

application/controllers/AdminPanel.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 AdminPanel extends Admin_Controller {
 	public function __construct() {
@@ -80,7 +80,7 @@ 
 
 				if(!empty($matches)) {
 					$malID = ($matches[1] !== 'none' ? $matches[1] : '0');
-					$new_tags = implode(',', array_diff( explode(',', $row->tags), [$matches[0]]));
+					$new_tags = implode(',', array_diff(explode(',', $row->tags), [$matches[0]]));
 
 					$this->db->set(['mal_id' => $malID, 'tags' => $new_tags, 'last_updated' => NULL])
 					         ->where('id', $row->id)

application/core/MY_Controller.php

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();
 
 		$this->load->driver('cache', array('adapter' => 'file', 'backup' => 'apc')); //Sadly we can't autoload this with params
@@ -20,10 +20,10 @@ 
 		$this->global_data['analytics_tracking_id'] = $this->config->item('tracking_id');
 
 		$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 {
@@ -47,7 +47,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/controllers/Ajax/TrackerInline.php

Spacing +8 added lines, -8 removed lines

@@ -26,8 +26,8 @@ 
 	 * URL:        /ajax/update_inline
 	 */
 	public function update() : void {
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
 
 		if($this->form_validation->run() === TRUE) {
 			$success = $this->Tracker->list->updateByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -122,7 +122,7 @@ 
 	 * URL:        /tag_update
 	 */
 	public function tag_update() : void {
-		$this->form_validation->set_rules('id',         'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
 		$this->form_validation->set_rules('tag_string', 'Tag String', 'max_length[255]|is_valid_tag_string|not_equals[none]');
 
 		if($this->form_validation->run() === TRUE) {
@@ -169,7 +169,7 @@ 
 	 * URL:        /set_category
 	 */
 	public function set_category() : void {
-		$this->form_validation->set_rules('id[]',     'List of IDs',   'required|ctype_digit');
+		$this->form_validation->set_rules('id[]', 'List of IDs', 'required|ctype_digit');
 		$this->form_validation->set_rules('category', 'Category Name', 'required|is_valid_category');
 
 		if($this->form_validation->run() === TRUE) {
@@ -215,8 +215,8 @@ 
 	 * URL:        /ajax/ignore_inline
 	 */
 	public function ignore() : void {
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
 
 		if($this->form_validation->run() === TRUE) {
 			$success = $this->Tracker->list->ignoreByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -238,8 +238,8 @@ 
 	 * URL:        /set_mal_id
 	 */
 	public function set_mal_id() : void {
-		$this->form_validation->set_rules('id',     'Chapter ID', 'required|ctype_digit');
-		$this->form_validation->set_rules('mal_id', 'MAL ID',     'regex_match[/^[0-9]*$/]');
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
+		$this->form_validation->set_rules('mal_id', 'MAL ID', 'regex_match[/^[0-9]*$/]');
 
 		if($this->form_validation->run() === TRUE) {
 			$malID = (is_numeric($this->input->post('mal_id')) ? $this->input->post('mal_id') : NULL);

application/controllers/Ajax/Userscript.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	public function report_bug() : void {
 		$this->load->library('user_agent');
 		if($this->output->is_custom_header_set()) { $this->output->reset_status_header(); return; }
-		$this->form_validation->set_rules('bug[url]',  'Bug [URL]',  'required');
+		$this->form_validation->set_rules('bug[url]', 'Bug [URL]', 'required');
 		$this->form_validation->set_rules('bug[text]', 'Bug [Text]', 'required');
 
 		if($this->form_validation->run() === TRUE) {