Completed
Push — master ( 99bd6d...8143e9 )
by Angus
03:18
created
application/controllers/User/Options.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
16 16
 		$usedCategories   = $this->Tracker->category->getUsed($this->User->id);
17 17
 
18 18
 		//NOTE: The checkbox validation is handled in run()
19
-		$this->form_validation->set_rules('category_custom_1_text',  'Custom Category 1 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
20
-		$this->form_validation->set_rules('category_custom_2_text',  'Custom Category 2 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
21
-		$this->form_validation->set_rules('category_custom_3_text',  'Custom Category 3 Text',  'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
19
+		$this->form_validation->set_rules('category_custom_1_text', 'Custom Category 1 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
20
+		$this->form_validation->set_rules('category_custom_2_text', 'Custom Category 2 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
21
+		$this->form_validation->set_rules('category_custom_3_text', 'Custom Category 3 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
22 22
 		$this->form_validation->set_rules('default_series_category', 'Default Series Category', 'required|is_valid_option_value[default_series_category]');
23
-		$this->form_validation->set_rules('list_sort_type',          'List Sort Type',          'required|is_valid_option_value[list_sort_type]');
24
-		$this->form_validation->set_rules('list_sort_order',         'List Sort Order',         'required|is_valid_option_value[list_sort_order]');
25
-		$this->form_validation->set_rules('theme',                   'Theme',                   'required|is_valid_option_value[theme]');
26
-		$this->form_validation->set_rules('mal_sync',                'MAL Sync',                'required|is_valid_option_value[mal_sync]');
23
+		$this->form_validation->set_rules('list_sort_type', 'List Sort Type', 'required|is_valid_option_value[list_sort_type]');
24
+		$this->form_validation->set_rules('list_sort_order', 'List Sort Order', 'required|is_valid_option_value[list_sort_order]');
25
+		$this->form_validation->set_rules('theme', 'Theme', 'required|is_valid_option_value[theme]');
26
+		$this->form_validation->set_rules('mal_sync', 'MAL Sync', 'required|is_valid_option_value[mal_sync]');
27 27
 
28
-		if ($isValid = $this->form_validation->run() === TRUE) {
28
+		if($isValid = $this->form_validation->run() === TRUE) {
29 29
 			foreach($customCategories as $categoryK => $category) {
30 30
 				if(!in_array($categoryK, $usedCategories)) {
31 31
 					$this->User_Options->set($category, $this->input->post($category) ? 'enabled' : 'disabled');
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
 			$this->User_Options->set('enable_live_countdown_timer', $this->input->post('enable_live_countdown_timer'));
40 40
 
41
-			$this->User_Options->set('list_sort_type',  $this->input->post('list_sort_type'));
41
+			$this->User_Options->set('list_sort_type', $this->input->post('list_sort_type'));
42 42
 			$this->User_Options->set('list_sort_order', $this->input->post('list_sort_order'));
43 43
 			
44 44
 			$this->User_Options->set('theme', $this->input->post('theme'));
Please login to merge, or discard this patch.
application/core/MY_Security.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 class MY_Security extends CI_Security {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
application/controllers/AdminPanel.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
2 2
 
3 3
 class AdminPanel extends Admin_Controller {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 class AdminPanel extends Admin_Controller {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,12 +40,12 @@
 block discarded – undo
40 40
 
41 41
 	private function _list_complete_titles() {
42 42
 		$query = $this->db->select('tracker_titles.id, tracker_sites.site_class, tracker_titles.title, tracker_titles.title_url')
43
-		                  ->from('tracker_chapters')
44
-		                  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
45
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
46
-		                  ->like('tracker_chapters.tags', 'complete')
47
-		                  ->where('tracker_titles.status', 0)
48
-		                  ->get();
43
+						  ->from('tracker_chapters')
44
+						  ->join('tracker_titles', 'tracker_chapters.title_id = tracker_titles.id', 'left')
45
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
46
+						  ->like('tracker_chapters.tags', 'complete')
47
+						  ->where('tracker_titles.status', 0)
48
+						  ->get();
49 49
 
50 50
 		$completeList = [];
51 51
 		if($query->num_rows() > 0) {
Please login to merge, or discard this patch.
application/controllers/UpdateStatus.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
2 2
 
3 3
 class UpdateStatus extends MY_Controller {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
1
+<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 class UpdateStatus extends MY_Controller {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
application/controllers/Ajax/TrackerInline.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 * URL:        /ajax/update_inline
27 27
 	 */
28 28
 	public function update() : void {
29
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
30
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
29
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
30
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
31 31
 
32 32
 		if($this->form_validation->run() === TRUE) {
33 33
 			$success = $this->Tracker->list->updateByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 * URL:        /tag_update
123 123
 	 */
124 124
 	public function tag_update() : void {
125
-		$this->form_validation->set_rules('id',         'Chapter ID', 'required|ctype_digit');
125
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
126 126
 		$this->form_validation->set_rules('tag_string', 'Tag String', 'max_length[255]|is_valid_tag_string|not_equals[none]');
127 127
 
128 128
 		if($this->form_validation->run() === TRUE) {
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	 * URL:        /set_category
170 170
 	 */
171 171
 	public function set_category() : void {
172
-		$this->form_validation->set_rules('id[]',     'List of IDs',   'required|ctype_digit');
172
+		$this->form_validation->set_rules('id[]', 'List of IDs', 'required|ctype_digit');
173 173
 		$this->form_validation->set_rules('category', 'Category Name', 'required|is_valid_category');
174 174
 
175 175
 		if($this->form_validation->run() === TRUE) {
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
 	 * URL:        /ajax/ignore_inline
216 216
 	 */
217 217
 	public function ignore() : void {
218
-		$this->form_validation->set_rules('id',      'Chapter ID', 'required|ctype_digit');
219
-		$this->form_validation->set_rules('chapter', 'Chapter',    'required');
218
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
219
+		$this->form_validation->set_rules('chapter', 'Chapter', 'required');
220 220
 
221 221
 		if($this->form_validation->run() === TRUE) {
222 222
 			$success = $this->Tracker->list->ignoreByID($this->userID, $this->input->post('id'), $this->input->post('chapter'));
@@ -238,8 +238,8 @@  discard block
 block discarded – undo
238 238
 	 * URL:        /set_mal_id
239 239
 	 */
240 240
 	public function set_mal_id() : void {
241
-		$this->form_validation->set_rules('id',     'Chapter ID', 'required|ctype_digit');
242
-		$this->form_validation->set_rules('mal_id', 'MAL ID',     'regex_match[/^[0-9]*$/]');
241
+		$this->form_validation->set_rules('id', 'Chapter ID', 'required|ctype_digit');
242
+		$this->form_validation->set_rules('mal_id', 'MAL ID', 'regex_match[/^[0-9]*$/]');
243 243
 
244 244
 		if($this->form_validation->run() === TRUE) {
245 245
 			$malID = (is_numeric($this->input->post('mal_id')) ? $this->input->post('mal_id') : NULL);
Please login to merge, or discard this patch.
application/controllers/User/History.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,9 @@  discard block
 block discarded – undo
6 6
 	}
7 7
 
8 8
 	public function index(int $page = 1) : void {
9
-		if($page === 0) redirect('user/history/1');
9
+		if($page === 0) {
10
+			redirect('user/history/1');
11
+		}
10 12
 
11 13
 		$this->header_data['title'] = "History";
12 14
 		$this->header_data['page']  = "history";
@@ -16,7 +18,9 @@  discard block
 block discarded – undo
16 18
 		$this->body_data['currentPage'] = (int) $page;
17 19
 		$this->body_data['totalPages']  = $historyData['totalPages'];
18 20
 
19
-		if($page > $this->body_data['totalPages'] && $page > 1) redirect('user/history/1');
21
+		if($page > $this->body_data['totalPages'] && $page > 1) {
22
+			redirect('user/history/1');
23
+		}
20 24
 
21 25
 		$this->_render_page('User/History');
22 26
 	}
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 
32 32
 			case 'csv':
33 33
 				$this->output->set_content_type('text/csv', 'utf-8');
34
-				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($historyData, 'Date/Time,Title,URL,Site,Status'), 'csv',TRUE, 'tracker-history');
34
+				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($historyData, 'Date/Time,Title,URL,Site,Status'), 'csv', TRUE, 'tracker-history');
35 35
 				break;
36 36
 
37 37
 			default:
Please login to merge, or discard this patch.
application/controllers/User/PublicList.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,9 @@
 block discarded – undo
60 60
 			$show_404 = TRUE;
61 61
 		}
62 62
 
63
-		if($show_404) show_404();
63
+		if($show_404) {
64
+			show_404();
65
+		}
64 66
 	}
65 67
 
66 68
 	private function _walk_recursive_remove (array $array, callable $callback) : array {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 				//	break;
27 27
 
28 28
 				case 'html':
29
-					$this->body_data['trackerData']  = $trackerData['series'];
29
+					$this->body_data['trackerData'] = $trackerData['series'];
30 30
 
31 31
 					$this->header_data['show_header'] = FALSE;
32 32
 					$this->footer_data['show_footer'] = FALSE;
@@ -62,12 +62,12 @@  discard block
 block discarded – undo
62 62
 		if($show_404) show_404();
63 63
 	}
64 64
 
65
-	private function _walk_recursive_remove (array $array, callable $callback) : array {
66
-		foreach ($array as $k => $v) {
67
-			if (is_array($v)) {
65
+	private function _walk_recursive_remove(array $array, callable $callback) : array {
66
+		foreach($array as $k => $v) {
67
+			if(is_array($v)) {
68 68
 				$array[$k] = $this->_walk_recursive_remove($v, $callback);
69 69
 			} else {
70
-				if ($callback($v, $k)) {
70
+				if($callback($v, $k)) {
71 71
 					unset($array[$k]);
72 72
 				}
73 73
 			}
Please login to merge, or discard this patch.
application/controllers/User/Favourites.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,9 @@  discard block
 block discarded – undo
6 6
 	}
7 7
 
8 8
 	public function index(int $page = 1) : void {
9
-		if($page === 0) redirect('user/favourites/1');
9
+		if($page === 0) {
10
+			redirect('user/favourites/1');
11
+		}
10 12
 
11 13
 		$this->header_data['title'] = "Favourites";
12 14
 		$this->header_data['page']  = "favourites";
@@ -16,7 +18,9 @@  discard block
 block discarded – undo
16 18
 		$this->body_data['currentPage'] = $page;
17 19
 		$this->body_data['totalPages']  = $favouriteData['totalPages'];
18 20
 
19
-		if($page > $this->body_data['totalPages'] && $page <= 1) redirect('user/favourites/1');
21
+		if($page > $this->body_data['totalPages'] && $page <= 1) {
22
+			redirect('user/favourites/1');
23
+		}
20 24
 
21 25
 		$this->_render_page('User/Favourites');
22 26
 	}
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 
32 32
 			case 'csv':
33 33
 				$this->output->set_content_type('text/csv', 'utf-8');
34
-				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($favouriteData, 'Date/Time,Title,Manga URL,Site,Chapter,Chapter Number, Chapter URL'), 'csv',TRUE, 'tracker-favourite');
34
+				$this->_render_content($this->Tracker->portation->arrayToCSVRecursive($favouriteData, 'Date/Time,Title,Manga URL,Site,Chapter,Chapter Number, Chapter URL'), 'csv', TRUE, 'tracker-favourite');
35 35
 				break;
36 36
 
37 37
 			default:
Please login to merge, or discard this patch.
application/helpers/generic_helper.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
1
+<?php declare(strict_types = 1); defined('BASEPATH') or exit('No direct script access allowed');
2 2
 
3 3
 /**
4 4
  * Checks if view file exists.
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @return bool
7 7
  */
8 8
 function view_exists(string $path) : bool {
9
-	return file_exists(APPPATH . "/views/{$path}.php");
9
+	return file_exists(APPPATH."/views/{$path}.php");
10 10
 }
11 11
 
12 12
 function get_time_class(string $time_string) : string {
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 	return $time_string;
33 33
 }
34 34
 
35
-if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
36
-	function http_parse_headers (string $raw_headers) : array {
35
+if(!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
36
+	function http_parse_headers(string $raw_headers) : array {
37 37
 		$headers = array(); // $headers = [];
38
-		foreach (explode("\n", $raw_headers) as $i => $h) {
38
+		foreach(explode("\n", $raw_headers) as $i => $h) {
39 39
 			$h = explode(':', $h, 2);
40
-			if (isset($h[1])){
41
-				if(!isset($headers[$h[0]])){
40
+			if(isset($h[1])) {
41
+				if(!isset($headers[$h[0]])) {
42 42
 					$headers[$h[0]] = trim($h[1]);
43
-				}else if(is_array($headers[$h[0]])){
44
-					$tmp = array_merge($headers[$h[0]],array(trim($h[1])));
43
+				} else if(is_array($headers[$h[0]])) {
44
+					$tmp = array_merge($headers[$h[0]], array(trim($h[1])));
45 45
 					$headers[$h[0]] = $tmp;
46
-				}else{
47
-					$tmp = array_merge(array($headers[$h[0]]),array(trim($h[1])));
46
+				} else {
47
+					$tmp = array_merge(array($headers[$h[0]]), array(trim($h[1])));
48 48
 					$headers[$h[0]] = $tmp;
49 49
 				}
50 50
 			}
Please login to merge, or discard this patch.
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,18 +32,19 @@
 block discarded – undo
32 32
 	return $time_string;
33 33
 }
34 34
 
35
-if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
35
+if (!function_exists('http_parse_headers')) {
36
+#http://www.php.net/manual/en/function.http-parse-headers.php#112917
36 37
 	function http_parse_headers (string $raw_headers) : array {
37 38
 		$headers = array(); // $headers = [];
38 39
 		foreach (explode("\n", $raw_headers) as $i => $h) {
39 40
 			$h = explode(':', $h, 2);
40
-			if (isset($h[1])){
41
-				if(!isset($headers[$h[0]])){
41
+			if (isset($h[1])) {
42
+				if(!isset($headers[$h[0]])) {
42 43
 					$headers[$h[0]] = trim($h[1]);
43
-				}else if(is_array($headers[$h[0]])){
44
+				} else if(is_array($headers[$h[0]])) {
44 45
 					$tmp = array_merge($headers[$h[0]],array(trim($h[1])));
45 46
 					$headers[$h[0]] = $tmp;
46
-				}else{
47
+				} else {
47 48
 					$tmp = array_merge(array($headers[$h[0]]),array(trim($h[1])));
48 49
 					$headers[$h[0]] = $tmp;
49 50
 				}
Please login to merge, or discard this patch.