DakuTree / manga-tracker

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

_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);

public/index.php

Spacing +13 added lines, -13 removed lines

@@ -39,7 +39,7 @@ 
 // Maintenance Mode
 define('MAINTENANCE', FALSE);
 if(MAINTENANCE && PHP_SAPI !== 'cli') {
-	require_once __DIR__ . DIRECTORY_SEPARATOR . '../application/views/common/maintenance.php'; ## call view
+	require_once __DIR__.DIRECTORY_SEPARATOR.'../application/views/common/maintenance.php'; ## call view
 	exit();
 }
 
@@ -81,7 +81,7 @@ 
  * Different environments will require different levels of error reporting.
  * By default development will show errors but testing and live will hide them.
  */
-switch (ENVIRONMENT)
+switch(ENVIRONMENT)
 {
 	case 'development':
 		error_reporting(-1);
@@ -94,7 +94,7 @@ 
 	case 'testing':
 	case 'production':
 		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
+		if(version_compare(PHP_VERSION, '5.3', '>='))
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 		}
@@ -212,12 +212,12 @@ 
  */
 
 // Set the current directory correctly for CLI requests
-if (defined('STDIN'))
+if(defined('STDIN'))
 {
 	chdir(dirname(__FILE__));
 }
 
-if (($_temp = realpath($system_path)) !== FALSE)
+if(($_temp = realpath($system_path)) !== FALSE)
 {
 	$system_path = $_temp.DIRECTORY_SEPARATOR;
 }
@@ -232,7 +232,7 @@ 
 }
 
 // Is the system path correct?
-if ( ! is_dir($system_path))
+if(!is_dir($system_path))
 {
 	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 	echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
@@ -257,9 +257,9 @@ 
 define('SYSDIR', basename(BASEPATH));
 
 // The path to the "application" directory
-if (is_dir($application_folder))
+if(is_dir($application_folder))
 {
-	if (($_temp = realpath($application_folder)) !== FALSE)
+	if(($_temp = realpath($application_folder)) !== FALSE)
 	{
 		$application_folder = $_temp;
 	}
@@ -272,7 +272,7 @@ 
 		);
 	}
 }
-elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 {
 	$application_folder = BASEPATH.strtr(
 			trim($application_folder, '/\\'),
@@ -290,13 +290,13 @@ 
 define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
 
 // The path to the "views" directory
-if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+if(!isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
 {
 	$view_folder = APPPATH.'views';
 }
-elseif (is_dir($view_folder))
+elseif(is_dir($view_folder))
 {
-	if (($_temp = realpath($view_folder)) !== FALSE)
+	if(($_temp = realpath($view_folder)) !== FALSE)
 	{
 		$view_folder = $_temp;
 	}
@@ -309,7 +309,7 @@ 
 		);
 	}
 }
-elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 {
 	$view_folder = APPPATH.strtr(
 			trim($view_folder, '/\\'),

_scripts/deploy.php

Spacing +7 added lines, -7 removed lines

@@ -106,15 +106,15 @@ 
 	)');
 });
 
-task('deploy:copy_files', function () {
+task('deploy:copy_files', function() {
 	$sharedPath = '{{deploy_path}}/shared';
-	foreach (get('copy_files') as $file) {
+	foreach(get('copy_files') as $file) {
 		$dirname = dirname(parse($file));
 		// Create dir of shared file
-		run("mkdir -p $sharedPath/" . $dirname);
+		run("mkdir -p $sharedPath/".$dirname);
 		// Check if shared file does not exist in shared.
 		// and file exist in release
-		if (!test("[ -f $sharedPath/$file ]") && test("[ -f {{release_path}}/$file ]")) {
+		if(!test("[ -f $sharedPath/$file ]") && test("[ -f {{release_path}}/$file ]")) {
 			// Copy file in shared dir if not present
 			run("cp -rv {{release_path}}/$file $sharedPath/$file");
 		}
@@ -129,7 +129,7 @@ 
 	}
 });
 
-task('deploy:migrate_db', function () {
+task('deploy:migrate_db', function() {
 	// Migration is disabled by default on production, so we need to toggle it temporally.
 	run('( \
 		cd {{release_path}} && \
@@ -139,7 +139,7 @@ 
 	)');
 });
 
-task('deploy:maintenance_enable', function () {
+task('deploy:maintenance_enable', function() {
 	//define('MAINTENANCE', FALSE);
 	run('( \
 		cd {{previous_release}} && \
@@ -150,7 +150,7 @@ 
 		sed -i -r "s/(\'MAINTENANCE\',) FALSE/\1 TRUE/" public/index.php \
 	)');
 });
-task('deploy:maintenance_disable', function () {
+task('deploy:maintenance_disable', function() {
 	//define('MAINTENANCE', FALSE);
 	run('( \
 		cd {{release_path}} && \

application/views/ReportIssue.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 		<?=form_input($form_url)?>
 	</div>
 
-	<?=form_input('website','', ['id' => 'website'])?>
+	<?=form_input('website', '', ['id' => 'website'])?>
 
 	<?=validation_errors()?><?=($issue_submitted ? 'Issue successfully submitted' : "")?>
 	<button type="submit" class="btn btn-primary">Submit</button> | Alternatively, post an issue on our <?=anchor('https://github.com/DakuTree/manga-tracker/issues/new', 'Github page')?>.

application/controllers/ReportIssue.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 		$this->header_data['page']  = 'report-issue';
 
 		$this->form_validation->set_rules('issue_description', 'Description', 'required|max_length[1000]');
-		$this->form_validation->set_rules('issue_url',         'URL',         'valid_url');
+		$this->form_validation->set_rules('issue_url', 'URL', 'valid_url');
 
 
 		$this->body_data['issue_submitted'] = FALSE;
@@ -21,9 +21,9 @@ 
 
 			if(!empty($this->input->post('website'))) {
 				$this->body_data['issue_submitted'] = FALSE;
-				log_message('error', 'Bot attempting to spam report issue form: "' . $this->input->post('issue_description') . '"');
+				log_message('error', 'Bot attempting to spam report issue form: "'.$this->input->post('issue_description').'"');
 			} else {
-				$this->body_data['issue_submitted'] = $this->Tracker->issue->report('USERID:' . $this->User->id . ' ||| ' . $this->input->post('issue_description'), NULL, $this->input->post('issue_url'));
+				$this->body_data['issue_submitted'] = $this->Tracker->issue->report('USERID:'.$this->User->id.' ||| '.$this->input->post('issue_description'), NULL, $this->input->post('issue_url'));
 			}
 		}
 

application/models/Tracker/Tracker_Sites_Model.php

Spacing +17 added lines, -17 removed lines

@@ -118,7 +118,7 @@ 
 				//We don't want double trailing slashes, so fix this when possible.
 				$pageSeparator = '';
 			}
-			$pageURL = $chapterData['url'] . $pageSeparator . $page;
+			$pageURL = $chapterData['url'].$pageSeparator.$page;
 		}
 		return $pageURL;
 	}
@@ -212,7 +212,7 @@ 
 
 			$ch = curl_init();
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			curl_setopt($ch, CURLOPT_ENCODING , "gzip");
+			curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 			//curl_setopt($ch, CURLOPT_VERBOSE, 1);
 			curl_setopt($ch, CURLOPT_HEADER, 1);
 
@@ -234,8 +234,8 @@ 
 			curl_setopt($ch, CURLOPT_URL, $url);
 
 			if($isPost) {
-				curl_setopt($ch,CURLOPT_POST, count($postFields));
-				curl_setopt($ch,CURLOPT_POSTFIELDS, http_build_query($postFields));
+				curl_setopt($ch, CURLOPT_POST, count($postFields));
+				curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postFields));
 			}
 
 			$response = curl_exec($ch);
@@ -282,7 +282,7 @@ 
 			$result = shell_exec('python '.APPPATH.'../_scripts/get_cloudflare_cookie.py '.escapeshellarg(json_encode($urlData)));
 			$cookieData = json_decode($result, TRUE);
 
-			$this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'],  31536000 /* 1 year, or until we renew it */);
+			$this->cache->save("cloudflare_{$this->site}", $cookieData['cookies'], 31536000 /* 1 year, or until we renew it */);
 			log_message('debug', "Saving CloudFlare Cookies for {$this->site}");
 
 			$refresh = TRUE;
@@ -340,7 +340,7 @@ 
 
 				$dom = new DOMDocument();
 				libxml_use_internal_errors(TRUE);
-				$dom->loadHTML('<?xml encoding="utf-8" ?>' . $data);
+				$dom->loadHTML('<?xml encoding="utf-8" ?>'.$data);
 				libxml_use_internal_errors(FALSE);
 
 				$xpath = new DOMXPath($dom);
@@ -349,7 +349,7 @@ 
 				if($nodes_title->length === 1) {
 					if($nodes_row->length === 1) {
 						$firstRow      = $nodes_row->item(0);
-						$nodes_latest  = $xpath->query($node_latest_string,  $firstRow);
+						$nodes_latest  = $xpath->query($node_latest_string, $firstRow);
 
 						if($node_chapter_string !== '') {
 							$nodes_chapter = $xpath->query($node_chapter_string, $firstRow);
@@ -565,7 +565,7 @@ 
 	final private function _setSiteRateLimit(?int $rateLimit = NULL) : bool {
 		//We would just use increment(), but we can't set ttl with it...
 		$currentRateLimit = $rateLimit ?: $this->_getSiteRateLimit();
-		return $this->cache->save("{$this->site}_ratelimit", $currentRateLimit + 1,3600);
+		return $this->cache->save("{$this->site}_ratelimit", $currentRateLimit + 1, 3600);
 	}
 }
 
@@ -583,7 +583,7 @@ 
 		$chapter_parts = explode('/', $chapter); //returns #LANG#/#VOLUME#/#CHAPTER#/#CHAPTER_EXTRA#(/#PAGE#/)
 		return [
 			'url'    => $this->getChapterURL($title_url, $chapter),
-			'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '') . "c{$chapter_parts[2]}" . (isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/
+			'number' => ($chapter_parts[1] !== '0' ? "v{$chapter_parts[1]}/" : '')."c{$chapter_parts[2]}".(isset($chapter_parts[3]) ? ".{$chapter_parts[3]}" : '')/*)*/
 		];
 	}
 	public function getChapterURL(string $title_url, string $chapter) : string {
@@ -768,9 +768,9 @@ 
 
 							$dateString = str_replace('/', '-', trim($nodes_latest->item(0)->nodeValue)); //NOTE: We replace slashes here as it stops strtotime interpreting the date as US date format.
 							if($dateString == 'T') {
-								$dateString = date("Y-m-d",now());
+								$dateString = date("Y-m-d", now());
 							}
-							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString . ' 00:00'));
+							$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString.' 00:00'));
 
 							$titleDataList[$title_url] = $titleData;
 						}
@@ -935,11 +935,11 @@ 
 			""
 		);
 		if($data) {
-			$titleData['title'] = trim(preg_replace('/ Added on .*$/','', $data['nodes_title']->textContent));
+			$titleData['title'] = trim(preg_replace('/ Added on .*$/', '', $data['nodes_title']->textContent));
 			$titleData['latest_chapter'] = preg_replace('/^.*\/([0-9\.]+)$/', '$1', (string) $data['nodes_chapter']->getAttribute('href'));
 
-			$dateString = preg_replace('/^Added (?:on )?/', '',$data['nodes_latest']->textContent);
-			$titleData['last_updated'] =  date("Y-m-d H:i:s", strtotime($dateString));
+			$dateString = preg_replace('/^Added (?:on )?/', '', $data['nodes_latest']->textContent);
+			$titleData['last_updated'] = date("Y-m-d H:i:s", strtotime($dateString));
 		}
 		return (!empty($titleData) ? $titleData : NULL);
 	}
@@ -1017,9 +1017,9 @@ 
 	public function getChapterData(string $title_url, string $chapter) : array {
 		if(strpos($chapter, '/')) {
 			$chapterArr = explode('/', $chapter);
-			$chapterN   = "v{$chapterArr[0]}/c".str_replace('chapter_','',$chapterArr[1]);
-		} else if (ctype_digit($chapter)) {
-			$chapterN = 'c'.str_replace('chapter_','', $chapter);
+			$chapterN   = "v{$chapterArr[0]}/c".str_replace('chapter_', '', $chapterArr[1]);
+		} else if(ctype_digit($chapter)) {
+			$chapterN = 'c'.str_replace('chapter_', '', $chapter);
 		}
 		return [
 			'url'    => $this->getChapterURL($title_url, $chapter),