DakuTree / manga-tracker

application/models/User_Options_Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 	 * @param string   $option
 	 * @param int|null $userID
 	 *
-	 * @return mixed Returns option value as STRING, or FALSE if option does not exist.
+	 * @return string Returns option value as STRING, or FALSE if option does not exist.
 	 */
 	public function get(string $option, ?int $userID = NULL) {
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);

Indentation +6 added lines, -6 removed lines

@@ -190,16 +190,16 @@
 		//FIXME: Query duplication.
 		if($this->User->id !== $userID) {
 			$query = $this->db->select("options->\"$.{$option}\" AS value", FALSE)
-			                  ->from('auth_users')
-			                  ->where('id', $userID)
-			                  ->limit(1);
+							  ->from('auth_users')
+							  ->where('id', $userID)
+							  ->limit(1);
 			$data = $query->get()->row_object();
 		} else {
 			//if(!($data = $this->session->tempdata("option_{$option}"))) {
 				$query = $this->db->select("options->\"$.{$option}\" AS value", FALSE)
-				                  ->from('auth_users')
-				                  ->where('id', $userID)
-				                  ->limit(1);
+								  ->from('auth_users')
+								  ->where('id', $userID)
+								  ->limit(1);
 				$data = $query->get()->row_object();
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
 			//}

Spacing +1 added lines, -1 removed lines

@@ -237,7 +237,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
 				));

Braces +10 added lines, -3 removed lines

@@ -154,7 +154,9 @@ 
 				//CI doesn't have any nice way of using the query builder with JSON columns.
 				$sql = 'UPDATE `auth_users` SET `options` = JSON_SET(COALESCE(`options`, \'{}\'), ?, ?) WHERE `id` = ?';
 				if($success = $this->db->query($sql, ["$.{$option}", $parsedValue, $this->User->id])) {
-					if($success) $this->session->unset_tempdata("option_{$option}");
+					if($success) {
+						$this->session->unset_tempdata("option_{$option}");
+					}
 				}
 			}
 		}
@@ -177,7 +179,9 @@ 
 			}
 
 			//Overall fallback method.
-			if(!isset($value)) $value = $this->options[$option]['default'];
+			if(!isset($value)) {
+				$value = $this->options[$option]['default'];
+			}
 		} else {
 			$value = FALSE;
 		}
@@ -224,7 +228,10 @@ 
 				//This should never happen.
 				break;
 		}
-		if(!isset($value)) $value = FALSE; //FIXME: This won't play nice with BOOL type false?
+		if(!isset($value)) {
+			$value = FALSE;
+		}
+		//FIXME: This won't play nice with BOOL type false?
 		return $value;
 	}
 

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/controllers/AdminPanel.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 AdminPanel extends Admin_Controller {
 	public function __construct() {

Indentation +6 added lines, -6 removed lines

@@ -40,12 +40,12 @@
 
 	private function _list_complete_titles() {
 		$query = $this->db->select('tracker_titles.id, tracker_sites.site_class, tracker_titles.title, tracker_titles.title_url')
-		                  ->from('tracker_chapters')
-		                  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->like('tracker_chapters.tags', 'complete')
-		                  ->where('tracker_titles.status', 0)
-		                  ->get();
+						  ->from('tracker_chapters')
+						  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
+						  ->like('tracker_chapters.tags', 'complete')
+						  ->where('tracker_titles.status', 0)
+						  ->get();
 
 		$completeList = [];
 		if($query->num_rows() > 0) {

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

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/User/History.php

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
 	}
 
 	public function index(int $page = 1) : void {
-		if($page === 0) redirect('user/history/1');
+		if($page === 0) {
+			redirect('user/history/1');
+		}
 
 		$this->header_data['title'] = "History";
 		$this->header_data['page']  = "history";
@@ -16,7 +18,9 @@ 
 		$this->body_data['currentPage'] = (int) $page;
 		$this->body_data['totalPages']  = $historyData['totalPages'];
 
-		if($page > $this->body_data['totalPages'] && $page > 1) redirect('user/history/1');
+		if($page > $this->body_data['totalPages'] && $page > 1) {
+			redirect('user/history/1');
+		}
 
 		$this->_render_page('User/History');
 	}

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 
 			case 'csv':
 				$this->output->set_content_type('text/csv', 'utf-8');
-				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($historyData, 'Date/Time,Title,URL,Site,Status'), 'csv',TRUE, 'tracker-history');
+				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($historyData, 'Date/Time,Title,URL,Site,Status'), 'csv', TRUE, 'tracker-history');
 				break;
 
 			default:

application/controllers/User/PublicList.php

Braces +3 added lines, -1 removed lines

@@ -60,7 +60,9 @@
 			$show_404 = TRUE;
 		}
 
-		if($show_404) show_404();
+		if($show_404) {
+			show_404();
+		}
 	}
 
 	private function _walk_recursive_remove (array $array, callable $callback) : array {

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 				//	break;
 
 				case 'html':
-					$this->body_data['trackerData']  = $trackerData['series'];
+					$this->body_data['trackerData'] = $trackerData['series'];
 
 					$this->header_data['show_header'] = FALSE;
 					$this->footer_data['show_footer'] = FALSE;
@@ -62,12 +62,12 @@ 
 		if($show_404) show_404();
 	}
 
-	private function _walk_recursive_remove (array $array, callable $callback) : array {
-		foreach ($array as $k => $v) {
-			if (is_array($v)) {
+	private function _walk_recursive_remove(array $array, callable $callback) : array {
+		foreach($array as $k => $v) {
+			if(is_array($v)) {
 				$array[$k] = $this->_walk_recursive_remove($v, $callback);
 			} else {
-				if ($callback($v, $k)) {
+				if($callback($v, $k)) {
 					unset($array[$k]);
 				}
 			}

application/controllers/User/Favourites.php

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
 	}
 
 	public function index(int $page = 1) : void {
-		if($page === 0) redirect('user/favourites/1');
+		if($page === 0) {
+			redirect('user/favourites/1');
+		}
 
 		$this->header_data['title'] = "Favourites";
 		$this->header_data['page']  = "favourites";
@@ -16,7 +18,9 @@ 
 		$this->body_data['currentPage'] = $page;
 		$this->body_data['totalPages']  = $favouriteData['totalPages'];
 
-		if($page > $this->body_data['totalPages'] && $page <= 1) redirect('user/favourites/1');
+		if($page > $this->body_data['totalPages'] && $page <= 1) {
+			redirect('user/favourites/1');
+		}
 
 		$this->_render_page('User/Favourites');
 	}

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 
 			case 'csv':
 				$this->output->set_content_type('text/csv', 'utf-8');
-				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($favouriteData, 'Date/Time,Title,Manga URL,Site,Chapter,Chapter Number, Chapter URL'), 'csv',TRUE, 'tracker-favourite');
+				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($favouriteData, 'Date/Time,Title,Manga URL,Site,Chapter,Chapter Number, Chapter URL'), 'csv', TRUE, 'tracker-favourite');
 				break;
 
 			default:

application/helpers/generic_helper.php

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;
 				}

Spacing +14 added lines, -14 removed lines

@@ -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;
 				}
 			}
@@ -66,19 +66,19 @@ 
 	} elseif($notices = $CI->session->flashdata('errors')) {
 		$CI->session->unset_userdata('errors'); //Sometimes we call this flashdata without redirecting, so make sure we remove it
 		if(is_string($notices)) {
-			$notice_str = $CI->config->item('error_start_delimiter', 'ion_auth') . $notices . $CI->config->item('error_end_delimiter', 'ion_auth');
+			$notice_str = $CI->config->item('error_start_delimiter', 'ion_auth').$notices.$CI->config->item('error_end_delimiter', 'ion_auth');
 		} elseif(is_array($notices)) {
 			foreach($notices as $notice) {
-				$notice_str .= $CI->config->item('error_start_delimiter', 'ion_auth') . $notice . $CI->config->item('error_end_delimiter', 'ion_auth');
+				$notice_str .= $CI->config->item('error_start_delimiter', 'ion_auth').$notice.$CI->config->item('error_end_delimiter', 'ion_auth');
 			}
 		}
 	} elseif($notices = $CI->session->flashdata('notices')) {
 		$CI->session->unset_userdata('notices'); //Sometimes we call this flashdata without redirecting, so make sure we remove it
 		if(is_string($notices)) {
-			$notice_str = $CI->config->item('message_start_delimiter', 'ion_auth') . $notices . $CI->config->item('message_end_delimiter', 'ion_auth');
+			$notice_str = $CI->config->item('message_start_delimiter', 'ion_auth').$notices.$CI->config->item('message_end_delimiter', 'ion_auth');
 		} elseif(is_array($notices)) {
 			foreach($notices as $notice) {
-				$notice_str .= $CI->config->item('message_start_delimiter', 'ion_auth') . $notice . $CI->config->item('message_end_delimiter', 'ion_auth');
+				$notice_str .= $CI->config->item('message_start_delimiter', 'ion_auth').$notice.$CI->config->item('message_end_delimiter', 'ion_auth');
 			}
 		}
 	}