DakuTree / manga-tracker

application/core/MY_Config.php

Spacing +9 added lines, -9 removed lines

@@ -18,26 +18,26 @@ 
 		$file = ($file === '') ? 'config' : str_replace('.php', '', $file);
 		$loaded = FALSE;
 
-		foreach ($this->_config_paths as $path)
+		foreach($this->_config_paths as $path)
 		{
-			foreach (array($file, '_secure'.DIRECTORY_SEPARATOR.$file, ENVIRONMENT.DIRECTORY_SEPARATOR.$file) as $location)
+			foreach(array($file, '_secure'.DIRECTORY_SEPARATOR.$file, ENVIRONMENT.DIRECTORY_SEPARATOR.$file) as $location)
 			{
 				$file_path = $path.'config/'.$location.'.php';
-				if (in_array($file_path, $this->is_loaded, TRUE))
+				if(in_array($file_path, $this->is_loaded, TRUE))
 				{
 					return TRUE;
 				}
 
-				if ( ! file_exists($file_path))
+				if(!file_exists($file_path))
 				{
 					continue;
 				}
 
 				include($file_path);
 
-				if ( ! isset($config) OR ! is_array($config))
+				if(!isset($config) OR !is_array($config))
 				{
-					if ($fail_gracefully === TRUE)
+					if($fail_gracefully === TRUE)
 					{
 						return FALSE;
 					}
@@ -45,7 +45,7 @@ 
 					show_error('Your '.$file_path.' file does not appear to contain a valid configuration array.');
 				}
 
-				if ($use_sections === TRUE)
+				if($use_sections === TRUE)
 				{
 					$this->config[$file] = isset($this->config[$file])
 						? array_merge($this->config[$file], $config)
@@ -63,11 +63,11 @@ 
 			}
 		}
 
-		if ($loaded === TRUE)
+		if($loaded === TRUE)
 		{
 			return TRUE;
 		}
-		elseif ($fail_gracefully === TRUE)
+		elseif($fail_gracefully === TRUE)
 		{
 			return FALSE;
 		}

application/core/MY_Log.php

Spacing +16 added lines, -16 removed lines

@@ -48,22 +48,22 @@ 
 	public function __construct() {
 		$file_path = APPPATH.'config/monolog.php';
 		$found = FALSE;
-		if (file_exists($file_path)) {
+		if(file_exists($file_path)) {
 			$found = TRUE;
 			require($file_path);
 		}
 
 		// Is the config file in the environment folder?
-		if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) {
+		if(file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/monolog.php')) {
 			require($file_path);
-		} elseif (!$found) {
+		} elseif(!$found) {
 			exit('monolog.php config does not exist');
 		}
 
 		// Is the config file in the _secure folder?
-		if (file_exists($file_path = APPPATH.'config/_secure/monolog.php')) {
+		if(file_exists($file_path = APPPATH.'config/_secure/monolog.php')) {
 			require($file_path);
-		} elseif (!$found) {
+		} elseif(!$found) {
 			exit('monolog.php config does not exist');
 		}
 
@@ -74,7 +74,7 @@ 
 		// detect and register all PHP errors in this log hence forth
 		ErrorHandler::register($this->log);
 
-		if ($this->config['introspection_processor'])
+		if($this->config['introspection_processor'])
 		{
 			// add controller and line number info to each log message
 			// 2 = depth in the stacktrace to ignore. This gives us the file
@@ -83,9 +83,9 @@ 
 		}
 
 		// decide which handler(s) to use
-		foreach ($this->config['handlers'] as $value)
+		foreach($this->config['handlers'] as $value)
 		{
-			switch ($value)
+			switch($value)
 			{
 				case 'file':
 					$handler = new RotatingFileHandler($this->config['file_logfile']);
@@ -130,7 +130,7 @@ 
 					break;
 
 				default:
-					exit('log handler not supported: ' . $value . "\n");
+					exit('log handler not supported: '.$value."\n");
 			}
 
 			$this->log->pushHandler($handler);
@@ -152,19 +152,19 @@ 
 		$level = strtoupper($level);
 
 		// verify error level
-		if (!isset($this->_levels[$level]))
+		if(!isset($this->_levels[$level]))
 		{
-			$this->log->addError('unknown error level: ' . $level);
+			$this->log->addError('unknown error level: '.$level);
 			$level = 'ALL';
 		}
 
 		// filter out anything in $this->config['exclusion_list']
-		if (!empty($this->config['exclusion_list']))
+		if(!empty($this->config['exclusion_list']))
 		{
-			foreach ($this->config['exclusion_list'] as $findme)
+			foreach($this->config['exclusion_list'] as $findme)
 			{
 				$pos = strpos($msg, $findme);
-				if ($pos !== false)
+				if($pos !== false)
 				{
 					// just exit now - we don't want to log this error
 					return true;
@@ -172,9 +172,9 @@ 
 			}
 		}
 
-		if ($this->_levels[$level] <= $this->config['threshold'])
+		if($this->_levels[$level] <= $this->config['threshold'])
 		{
-			switch ($level)
+			switch($level)
 			{
 				case 'ERROR':
 					$this->log->addError($msg);

application/config/routes.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 $route['ajax/hide_notice']['post']     = 'Ajax/TrackerInline/hide_notice';
 $route['ajax/set_mal_id']['post']      = 'Ajax/TrackerInline/set_mal_id';
 
-$route['export_list']                 = 'Ajax/TrackerInline/export';
+$route['export_list'] = 'Ajax/TrackerInline/export';
 //$route['import_list']['post']         = 'Ajax/TrackerInline/import';
 
 $route['import_amr'] = 'Import_AMR';

application/core/MY_Controller.php

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 	protected $footer_data = array();
 	public    $global_data = array();
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 
 		//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing.
@@ -17,13 +17,13 @@ 
 
 		$this->global_data['theme'] = $this->User_Options->get('theme');
 		if(ENVIRONMENT === 'production') {
-			$this->global_data['compiled_css_path'] = function () {
+			$this->global_data['compiled_css_path'] = function() {
 				$css_path = "css/main.{$this->global_data['theme']}";
-				return asset_url() . $css_path . '.' . filemtime(APPPATH . "../public/assets/{$css_path}.css") . '.css';
+				return asset_url().$css_path.'.'.filemtime(APPPATH."../public/assets/{$css_path}.css").'.css';
 			};
 
 			$js_path = 'js/compiled.min';
-			$this->global_data['compiled_js_path'] = asset_url() . $js_path . '.' . filemtime(APPPATH . "../public/assets/{$js_path}.js") . '.js';
+			$this->global_data['compiled_js_path'] = asset_url().$js_path.'.'.filemtime(APPPATH."../public/assets/{$js_path}.js").'.js';
 		}
 	}
 
@@ -54,7 +54,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/config/email.php

Spacing +2 added lines, -2 removed lines

@@ -40,6 +40,6 @@
 
 $config['dsn'] = TRUE;
 
-if(file_exists(APPPATH . 'config/_secure/email.php')) {
-	include APPPATH . 'config/_secure/email.php'; //CI BUG: For some odd reason, this isn't picked up by MY_Config. Possibly due to MY_Config not being loaded yet?
+if(file_exists(APPPATH.'config/_secure/email.php')) {
+	include APPPATH.'config/_secure/email.php'; //CI BUG: For some odd reason, this isn't picked up by MY_Config. Possibly due to MY_Config not being loaded yet?
 }

application/models/Tracker/Tracker_Admin_Model.php

Spacing +6 added lines, -6 removed lines

@@ -79,8 +79,8 @@ 
 		if($query->num_rows() > 0) {
 			$hardRateLimit  = 500; //This is to avoid any possible IP bans by cache breaking again.
 			$siteRateLimits = [];
-			foreach ($query->result() as $row) {
-				if(!array_key_exists($row->site_class,$siteRateLimits)) {
+			foreach($query->result() as $row) {
+				if(!array_key_exists($row->site_class, $siteRateLimits)) {
 					$siteRateLimits[$row->site_class] = 0;
 				}
 				$siteRateLimits[$row->site_class]++;
@@ -142,7 +142,7 @@ 
 		$query = $query->get();
 
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$this->handleUpdate($row);
 			}
 		}
@@ -220,10 +220,10 @@ 
 		                  ->get();
 
 		$sites = $query->result_array();
-		foreach ($sites as $site) {
+		foreach($sites as $site) {
 			$siteClass = $this->sites->{$site['site_class']};
 			if($titleDataList = $siteClass->doCustomUpdate()) {
-				foreach ($titleDataList as $titleURL => $titleData) {
+				foreach($titleDataList as $titleURL => $titleData) {
 					$titleURL = (string) $titleURL; //Number only keys get converted to int for some reason, so we need to fix that.
 					print "> {$titleData['title']} <{$site['site_class']}>"; //Print this prior to doing anything so we can more easily find out if something went wrong
 					if(is_array($titleData) && !is_null($titleData['latest_chapter'])) {
@@ -266,7 +266,7 @@ 
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title_url, tracker_sites.site_class')
 		                  ->from('tracker_titles')
 		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
-		                  ->where('tracker_titles.followed','N')
+		                  ->where('tracker_titles.followed', 'N')
 		                  ->where('tracker_titles !=', '255')
 		                  ->where('tracker_sites.status', 'enabled')
 		                  ->where('tracker_sites.use_custom', 'Y')

_scripts/setup.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 (PHP_SAPI !== 'cli' || isset($_SERVER['HTTP_USER_AGENT'])) && die('CLI only.');
 
-chdir(__DIR__ . '/../'); //Just to make things easier, change dir to project root.
+chdir(__DIR__.'/../'); //Just to make things easier, change dir to project root.
 
 function setup() {
 	vendor_copy();
@@ -10,7 +10,7 @@ 
 	chmod_files();
 
 	//Make sure .gitkeep file is recreated
-	touch(getcwd() . '/application/tests/_ci_phpunit_test/.gitkeep');
+	touch(getcwd().'/application/tests/_ci_phpunit_test/.gitkeep');
 }
 
 /**********************************************************************************************************************/
@@ -21,7 +21,7 @@ 
 }
 
 function chmod_files() {
-	$directory = new RecursiveDirectoryIterator(getcwd() . '/application/config');
+	$directory = new RecursiveDirectoryIterator(getcwd().'/application/config');
 	$flattened = new RecursiveIteratorIterator($directory);
 
 	$files = new RegexIterator($flattened, '/^(.*\/)?(database|database_password|config|email|recaptcha|sites)\.php/');

_scripts/SpritesheetGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -38,10 +38,10 @@ 
 		imagealphablending($sheetImage, FALSE);
 		imagesavealpha($sheetImage, TRUE);
 
-		imagefill($sheetImage,0,0,0x7fff0000);
+		imagefill($sheetImage, 0, 0, 0x7fff0000);
 
 		$x = 0;
-		foreach ($this->fileList as $filename) {
+		foreach($this->fileList as $filename) {
 			$iconImage = imagecreatefrompng("{$this->iconFolder}/{$filename}");
 			imagealphablending($iconImage, TRUE);
 
@@ -52,7 +52,7 @@ 
 			$x++;
 		}
 
-		imagepng($sheetImage, ASSET_FOLDER . "/img/{$this->type}s.png");
+		imagepng($sheetImage, ASSET_FOLDER."/img/{$this->type}s.png");
 		say('Updated spritesheet!');
 	}
 	private function generateLESS(string $filename, int $dst_x) : void {
@@ -78,7 +78,7 @@ 
 				"	.sprite();\n".
 				"	background: url('../../img/{$this->type}s.@{cache-version}.png') no-repeat;\n\n".
 				"	{$newIconLESS}\n".
-				"} //end sprite-{$this->type}",$oldLESS);
+				"} //end sprite-{$this->type}", $oldLESS);
 
 			file_put_contents($icons_file, $newLESS);
 			say('Updated LESS!');

application/models/Tracker/Tracker_Favourites_Model.php

Spacing +6 added lines, -6 removed lines

@@ -14,8 +14,8 @@ 
 			          tf.chapter, tf.page, tf.updated_at', FALSE)
 			->from('tracker_favourites AS tf')
 			->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
-			->join('tracker_titles AS tt',   'tc.title_id = tt.id',   'left')
-			->join('tracker_sites AS ts',    'tt.site_id = ts.id',    'left')
+			->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left')
+			->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left')
 			->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites?
 			->order_by('tf.id DESC')
 			->limit($rowsPerPage, ($rowsPerPage * ($page - 1)))
@@ -57,8 +57,8 @@ 
 			          tf.chapter, tf.page, tf.updated_at', FALSE)
 			->from('tracker_favourites AS tf')
 			->join('tracker_chapters AS tc', 'tf.chapter_id = tc.id', 'left')
-			->join('tracker_titles AS tt',   'tc.title_id = tt.id',   'left')
-			->join('tracker_sites AS ts',    'tt.site_id = ts.id',    'left')
+			->join('tracker_titles AS tt', 'tc.title_id = tt.id', 'left')
+			->join('tracker_sites AS ts', 'tt.site_id = ts.id', 'left')
 			->where('tc.user_id', $this->User->id) //CHECK: Is this inefficient? Would it be better to have a user_id column in tracker_favourites?
 			->order_by('tf.id DESC')
 			->get();
@@ -145,7 +145,7 @@ 
 
 						if($isSuccess) {
 							$success = array(
-								'status' => 'Unfavourited' . ($page ? " page {$page}" : ''),
+								'status' => 'Unfavourited'.($page ? " page {$page}" : ''),
 								'bool'   => TRUE
 							);
 							$this->History->userRemoveFavourite((int) $idCQueryRow->id, $chapter);
@@ -167,7 +167,7 @@ 
 
 					if($isSuccess) {
 						$success = array(
-							'status' => 'Favourited' . ($page ? " page {$page}" : ''),
+							'status' => 'Favourited'.($page ? " page {$page}" : ''),
 							'bool'   => TRUE
 						);
 						$this->History->userAddFavourite((int) $idCQueryRow->id, $chapter);