Completed
Push — master ( 6b5c10...3d94b7 )
by Angus
08:54
created
application/models/Tracker/Tracker_Issue_Model.php 1 patch
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 Tracker_Issue_Model extends Tracker_Base_Model {
4 4
 	public function __construct() {
Please login to merge, or discard this patch.
application/config/routes.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 //TEMP
80 80
 $route['user/dashboard_beta'] = 'User/DashboardBeta';
81 81
 
82
-$route['api/internal/get_list']                                                  = 'API/Internal/GetList';
82
+$route['api/internal/get_list'] = 'API/Internal/GetList';
83 83
 $route['api/internal/get_list/(all|reading|on-hold|plan-to-read|(custom(?:1|2|3)))'] = 'API/Internal/GetList/index/$1';
84 84
 
85 85
 $route['ajax/username_check']['post'] = 'Ajax/UsernameCheck'; //rate limited
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 
102 102
 $route['import_amr']                  = 'Import_AMR';
103 103
 
104
-$route['report_issue']      = 'ReportIssue';
104
+$route['report_issue'] = 'ReportIssue';
105 105
 
106 106
 $route['stats']       = 'Stats';
107 107
 $route['help']        = 'Help';
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Stats_Model.php 1 patch
Spacing   +2 added lines, -2 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
 class Tracker_Stats_Model extends Tracker_Base_Model {
4 4
 	public function __construct() {
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 				], FALSE)
29 29
 				->from('tracker_chapters')
30 30
 				->join('tracker_titles', 'tracker_titles.id = tracker_chapters.title_id', 'left')
31
-				->join('tracker_sites','tracker_titles.site_id = tracker_sites.id', 'left')
31
+				->join('tracker_sites', 'tracker_titles.site_id = tracker_sites.id', 'left')
32 32
 				->where('tracker_sites.status', 'enabled')
33 33
 				->group_by('tracker_chapters.title_id')
34 34
 				->having('count > 1')
Please login to merge, or discard this patch.
_scripts/generate_foolslide.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php declare(strict_types=1);
1
+<?php declare(strict_types = 1);
2 2
 
3 3
 if(!extension_loaded('gd')) die('GD ext is required to run this!');
4 4
 
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 	private $className;
10 10
 
11 11
 	public function __construct() {
12
-		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3){
12
+		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3) {
13 13
 			$this->baseURL   = rtrim($_SERVER['argv'][1], '/');
14 14
 			$this->className = $_SERVER['argv'][2];
15 15
 
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 		$this->updateDocs();
31 31
 
32
-		$domain =  preg_replace('#^https?://(.*?)(?:/.*?)?$#', '$1', $this->baseURL);
32
+		$domain = preg_replace('#^https?://(.*?)(?:/.*?)?$#', '$1', $this->baseURL);
33 33
 		say("\nAdmin SQL:");
34 34
 		say("INSERT INTO `mangatracker_development`.`tracker_sites` (`id`, `site`, `site_class`, `status`, `use_custom`) VALUES (NULL, '{$domain}', '{$this->className}', 'enabled', 'Y');");
35 35
 		say("INSERT INTO `mangatracker_production`.`tracker_sites` (`id`, `site`, `site_class`, `status`, `use_custom`) VALUES (NULL, '{$domain}', '{$this->className}', 'enabled', 'Y');");
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 
98 98
 		//Update @updated
99 99
 		$currentDate = date("Y-m-d", time());
100
-		$baseFile = str_replace("@updated      {$matches[1]}","@updated      {$currentDate}", $baseFile);
100
+		$baseFile = str_replace("@updated      {$matches[1]}", "@updated      {$currentDate}", $baseFile);
101 101
 
102 102
 		//Update @version
103 103
 		$currentVersion = explode('.', $matches[2]);
104
-		$newVersion = "{$currentVersion[0]}.{$currentVersion[1]}.". (((int) $currentVersion[2]) + 1);
105
-		$baseFile = str_replace("@version      {$matches[2]}","@version      {$newVersion}", $baseFile);
104
+		$newVersion = "{$currentVersion[0]}.{$currentVersion[1]}.".(((int) $currentVersion[2]) + 1);
105
+		$baseFile = str_replace("@version      {$matches[2]}", "@version      {$newVersion}", $baseFile);
106 106
 
107 107
 		//Add @require
108 108
 		// @resource     fontAwesome
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_List_Model.php 1 patch
Spacing   +10 added lines, -10 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
 class Tracker_List_Model extends Tracker_Base_Model {
4 4
 	public function __construct() {
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 			];
34 34
 		}
35 35
 		if($result->num_rows() > 0) {
36
-			foreach ($result->result() as $row) {
36
+			foreach($result->result() as $row) {
37 37
 				$is_unread = intval((is_null($row->latest_chapter)) || ($row->latest_chapter == $row->ignore_chapter) || ($row->latest_chapter == $row->current_chapter) ? '1' : '0');
38 38
 				$arr['series'][$row->category]['unread_count'] = (($arr['series'][$row->category]['unread_count'] ?? 0) + !$is_unread);
39 39
 				$data = [
40 40
 					'id' => $row->id,
41 41
 					'generated_current_data' => $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->current_chapter),
42
-					'generated_latest_data'  => !is_null($row->latest_chapter) ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->latest_chapter) : ['url' => '#', 'number' => 'No chapters found'] ,
42
+					'generated_latest_data'  => !is_null($row->latest_chapter) ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->latest_chapter) : ['url' => '#', 'number' => 'No chapters found'],
43 43
 					'generated_ignore_data'  => ($row->ignore_chapter ? $this->sites->{$row->site_class}->getChapterData($row->title_url, $row->ignore_chapter) : NULL),
44 44
 
45 45
 					'full_title_url'        => $this->sites->{$row->site_class}->getFullTitleURL($row->title_url),
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
 			$sortOrder = $this->User_Options->get('list_sort_order', $userID);
90 90
 			switch($this->User_Options->get('list_sort_type', $userID)) {
91 91
 				case 'unread':
92
-					foreach (array_keys($arr['series']) as $category) {
93
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
92
+					foreach(array_keys($arr['series']) as $category) {
93
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
94 94
 							$a_text = strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}");
95 95
 							$b_text = strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}");
96 96
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 					break;
105 105
 
106 106
 				case 'unread_latest':
107
-					foreach (array_keys($arr['series']) as $category) {
108
-						usort($arr['series'][$category]['manga'], function ($a, $b) use($sortOrder) {
107
+					foreach(array_keys($arr['series']) as $category) {
108
+						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
109 109
 							$a_text = $a['new_chapter_exists'];
110 110
 							$b_text = $b['new_chapter_exists'];
111 111
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 					break;
127 127
 
128 128
 				case 'alphabetical':
129
-					foreach (array_keys($arr['series']) as $category) {
129
+					foreach(array_keys($arr['series']) as $category) {
130 130
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
131 131
 							$a_text = strtolower("{$a['title_data']['title']}");
132 132
 							$b_text = strtolower("{$b['title_data']['title']}");
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 					break;
142 142
 
143 143
 				case 'my_status':
144
-					foreach (array_keys($arr['series']) as $category) {
144
+					foreach(array_keys($arr['series']) as $category) {
145 145
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
146 146
 							$a_text = strtolower("{$a['generated_current_data']['number']}");
147 147
 							$b_text = strtolower("{$b['generated_current_data']['number']}");
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 					break;
157 157
 
158 158
 				case 'latest':
159
-					foreach (array_keys($arr['series']) as $category) {
159
+					foreach(array_keys($arr['series']) as $category) {
160 160
 						usort($arr['series'][$category]['manga'], function($a, $b) use($sortOrder) {
161 161
 							$a_text = new DateTime("{$a['title_data']['last_updated']}");
162 162
 							$b_text = new DateTime("{$b['title_data']['last_updated']}");
Please login to merge, or discard this patch.
application/core/MY_Log.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -48,15 +48,15 @@  discard block
 block discarded – undo
48 48
 	public function __construct() {
49 49
 		$file_path = APPPATH.'config/monolog.php';
50 50
 		$found = FALSE;
51
-		if (file_exists($file_path)) {
51
+		if(file_exists($file_path)) {
52 52
 			$found = TRUE;
53 53
 			require($file_path);
54 54
 		}
55 55
 
56 56
 		// Is the config file in the environment folder?
57
-		if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) {
57
+		if(file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) {
58 58
 			require($file_path);
59
-		} elseif (!$found) {
59
+		} elseif(!$found) {
60 60
 			exit('monolog.php config does not exist');
61 61
 		}
62 62
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 		// detect and register all PHP errors in this log hence forth
68 68
 		ErrorHandler::register($this->log);
69 69
 
70
-		if ($this->config['introspection_processor'])
70
+		if($this->config['introspection_processor'])
71 71
 		{
72 72
 			// add controller and line number info to each log message
73 73
 			// 2 = depth in the stacktrace to ignore. This gives us the file
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 		}
77 77
 
78 78
 		// decide which handler(s) to use
79
-		foreach ($this->config['handlers'] as $value)
79
+		foreach($this->config['handlers'] as $value)
80 80
 		{
81
-			switch ($value)
81
+			switch($value)
82 82
 			{
83 83
 				case 'file':
84 84
 					$handler = new RotatingFileHandler($this->config['file_logfile']);
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 					break;
124 124
 
125 125
 				default:
126
-					exit('log handler not supported: ' . $value . "\n");
126
+					exit('log handler not supported: '.$value."\n");
127 127
 			}
128 128
 
129 129
 			$this->log->pushHandler($handler);
@@ -145,19 +145,19 @@  discard block
 block discarded – undo
145 145
 		$level = strtoupper($level);
146 146
 
147 147
 		// verify error level
148
-		if (!isset($this->_levels[$level]))
148
+		if(!isset($this->_levels[$level]))
149 149
 		{
150
-			$this->log->addError('unknown error level: ' . $level);
150
+			$this->log->addError('unknown error level: '.$level);
151 151
 			$level = 'ALL';
152 152
 		}
153 153
 
154 154
 		// filter out anything in $this->config['exclusion_list']
155
-		if (!empty($this->config['exclusion_list']))
155
+		if(!empty($this->config['exclusion_list']))
156 156
 		{
157
-			foreach ($this->config['exclusion_list'] as $findme)
157
+			foreach($this->config['exclusion_list'] as $findme)
158 158
 			{
159 159
 				$pos = strpos($msg, $findme);
160
-				if ($pos !== false)
160
+				if($pos !== false)
161 161
 				{
162 162
 					// just exit now - we don't want to log this error
163 163
 					return true;
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 			}
166 166
 		}
167 167
 
168
-		if ($this->_levels[$level] <= $this->config['threshold'])
168
+		if($this->_levels[$level] <= $this->config['threshold'])
169 169
 		{
170
-			switch ($level)
170
+			switch($level)
171 171
 			{
172 172
 				case 'ERROR':
173 173
 					$this->log->addError($msg);
Please login to merge, or discard this patch.
application/config/config.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -134,9 +134,9 @@
 block discarded – undo
134 134
 $config['composer_autoload'] = FALSE;
135 135
 
136 136
 //NOTE: This doesn't work in autoload.php as it is loaded after we need it.
137
-spl_autoload_register(function ($class) {
138
-	$fileMono = APPPATH . '../vendor/monolog/monolog/src/'.strtr($class, '\\', '/').'.php';
139
-	$filePsr  = APPPATH . '../vendor/psr/log/'.strtr($class, '\\', '/').'.php';
137
+spl_autoload_register(function($class) {
138
+	$fileMono = APPPATH.'../vendor/monolog/monolog/src/'.strtr($class, '\\', '/').'.php';
139
+	$filePsr  = APPPATH.'../vendor/psr/log/'.strtr($class, '\\', '/').'.php';
140 140
 	if(file_exists($fileMono)) {
141 141
 		require $fileMono;
142 142
 		return TRUE;
Please login to merge, or discard this patch.
application/config/monolog.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 $config['file_multiline'] = TRUE; //add newlines to the output
32 32
 
33 33
 /* NEW RELIC OPTIONS */
34
-$config['new_relic_app_name'] = 'APP NAME - ' . ENVIRONMENT;
34
+$config['new_relic_app_name'] = 'APP NAME - '.ENVIRONMENT;
35 35
 
36 36
 /* HIPCHAT OPTIONS */
37 37
 $config['hipchat_app_token'] = ''; //HipChat API Token
Please login to merge, or discard this patch.
application/core/MY_Controller.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 	protected $footer_data = array();
7 7
 	public    $global_data = array();
8 8
 
9
-	public function __construct(){
9
+	public function __construct() {
10 10
 		parent::__construct();
11 11
 
12 12
 		//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing.
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 
19 19
 		$this->global_data['theme'] = $this->User_Options->get('theme');
20 20
 		$css_path = "css/main.{$this->User_Options->get('theme')}";
21
-		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH . "../public/assets/{$css_path}.css").".css";
21
+		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH."../public/assets/{$css_path}.css").".css";
22 22
 
23 23
 		$js_path = 'js/compiled.min';
24
-		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH . "../public/assets/{$js_path}.js").".js";
24
+		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH."../public/assets/{$js_path}.js").".js";
25 25
 	}
26 26
 
27 27
 	public function _render_page(/*(array) $paths*/) : void {
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		$json = is_array($json_input) ? json_encode($json_input) : $json_input;
46 46
 
47 47
 		$this->output->set_content_type('application/json', 'utf-8');
48
-		$this->_render_content($json ?? '{}','json', $download, $filenamePrefix);
48
+		$this->_render_content($json ?? '{}', 'json', $download, $filenamePrefix);
49 49
 	}
50 50
 	public function _render_content(string $content, string $filenameExt, bool $download = FALSE, string $filenamePrefix = 'tracker') : void {
51 51
 		if($download) {
Please login to merge, or discard this patch.