DakuTree / manga-tracker

application/controllers/TitleHistory.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 			$this->body_data['totalPages']  = $historyData['totalPages'];
 			$this->body_data['titleID']     = (int) $titleID;
 
-			if($page > $this->body_data['totalPages'] && $page > 1) redirect("/history/{$titleID}/1");
+			if($page > $this->body_data['totalPages'] && $page > 1) {
+				redirect("/history/{$titleID}/1");
+			}
 
 			$this->_render_page("TitleHistory");
 

_scripts/generate_foolslide.php

Braces +10 added lines, -4 removed lines

@@ -1,6 +1,8 @@ 
 <?php declare(strict_types=1);
 
-if(!extension_loaded('gd')) die('GD ext is required to run this!');
+if(!extension_loaded('gd')) {
+	die('GD ext is required to run this!');
+}
 
 chdir(dirname(__FILE__).'/../'); //Just to make things easier, change dir to project root.
 
@@ -9,7 +11,7 @@ 
 	private $className;
 
 	public function __construct() {
-		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3){
+		if(isset($_SERVER['argv']) && count($_SERVER['argv']) === 3) {
 			$this->baseURL   = rtrim($_SERVER['argv'][1], '/');
 			$this->className = $_SERVER['argv'][2];
 
@@ -98,7 +100,9 @@ 
 		$baseFile = file_get_contents($baseFileName);
 
 		$parse = parse_url($this->baseURL);
-		if(strpos($baseFile, $parse['host']) !== false) die("Domain already exists in userscript?");
+		if(strpos($baseFile, $parse['host']) !== false) {
+			die("Domain already exists in userscript?");
+		}
 
 		preg_match('/\@updated      ([0-9\-]+)[\r\n]+.*?\@version      ([0-9\.]+)/s', $baseFile, $matches);
 
@@ -188,7 +192,9 @@ 
 			}
 		}
 
-		if(empty($titleArr)) die("API isn't returning any titles?");
+		if(empty($titleArr)) {
+			die("API isn't returning any titles?");
+		}
 		return $titleArr;
 	}
 }

application/core/MY_Log.php

Braces +10 added lines, -20 removed lines

@@ -67,8 +67,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
 			// making the call to log_message();
@@ -76,10 +75,8 @@ 
 		}
 
 		// decide which handler(s) to use
-		foreach ($this->config['handlers'] as $value)
-		{
-			switch ($value)
-			{
+		foreach ($this->config['handlers'] as $value) {
+			switch ($value) {
 				case 'file':
 					$handler = new RotatingFileHandler($this->config['file_logfile']);
 					$formatter = new LineFormatter(null, null, $config['file_multiline']);
@@ -140,35 +137,28 @@ 
 	 * @param $msg
 	 * @return bool
 	 */
-	public function write_log($level = 'error', $msg)
-	{
+	public function write_log($level = 'error', $msg) {
 		$level = strtoupper($level);
 
 		// verify error level
-		if (!isset($this->_levels[$level]))
-		{
+		if (!isset($this->_levels[$level])) {
 			$this->log->addError('unknown error level: ' . $level);
 			$level = 'ALL';
 		}
 
 		// filter out anything in $this->config['exclusion_list']
-		if (!empty($this->config['exclusion_list']))
-		{
-			foreach ($this->config['exclusion_list'] as $findme)
-			{
+		if (!empty($this->config['exclusion_list'])) {
+			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;
 				}
 			}
 		}
 
-		if ($this->_levels[$level] <= $this->config['threshold'])
-		{
-			switch ($level)
-			{
+		if ($this->_levels[$level] <= $this->config['threshold']) {
+			switch ($level) {
 				case 'ERROR':
 					$this->log->addError($msg);
 					break;

application/models/Tracker/Tracker_Sites_Model.php

Braces +36 added lines, -12 removed lines

@@ -125,7 +125,9 @@ 
 	 */
 	final public function isValidTitleURL(string $title_url) : bool {
 		$success = (bool) preg_match($this->titleFormat, $title_url);
-		if(!$success) log_message('error', "Invalid Title URL ({$this->site}): {$title_url}");
+		if(!$success) {
+			log_message('error', "Invalid Title URL ({$this->site}): {$title_url}");
+		}
 		return $success;
 	}
 
@@ -139,7 +141,9 @@ 
 	 */
 	final public function isValidChapter(string $chapter) : bool {
 		$success = (bool) preg_match($this->chapterFormat, $chapter);
-		if(!$success) log_message('error', "Invalid Chapter ({$this->site}): {$chapter}");
+		if(!$success) {
+			log_message('error', "Invalid Chapter ({$this->site}): {$chapter}");
+		}
 		return $success;
 	}
 
@@ -168,14 +172,20 @@ 
 			//curl_setopt($ch, CURLOPT_VERBOSE, 1);
 			curl_setopt($ch, CURLOPT_HEADER, 1);
 
-			if($follow_redirect)        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);
+			if($follow_redirect) {
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);
+			}
 
 			if($cookies = $this->cache->get("cloudflare_{$this->site}")) {
 				$cookie_string .= "; {$cookies}";
 			}
 
-			if(!empty($cookie_string))  curl_setopt($ch, CURLOPT_COOKIE, $cookie_string);
-			if(!empty($cookiejar_path)) curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiejar_path);
+			if(!empty($cookie_string)) {
+				curl_setopt($ch, CURLOPT_COOKIE, $cookie_string);
+			}
+			if(!empty($cookiejar_path)) {
+				curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiejar_path);
+			}
 
 			//Some sites check the useragent for stuff, use a pre-defined user-agent to avoid stuff.
 			curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
@@ -206,7 +216,9 @@ 
 			$body        = substr($response, $header_size);
 			curl_close($ch);
 
-			if($status_code === 503) $refresh = $this->handleCloudFlare($url, $body);
+			if($status_code === 503) {
+				$refresh = $this->handleCloudFlare($url, $body);
+			}
 		}
 
 		return [
@@ -312,7 +324,9 @@ 
 								'nodes_chapter' => $nodes_chapter->item(0)
 							];
 
-							if(is_callable($extraCall)) $extraCall($xpath, $returnData);
+							if(is_callable($extraCall)) {
+								$extraCall($xpath, $returnData);
+							}
 
 							return $returnData;
 						} else {
@@ -326,7 +340,9 @@ 
 						$noChaptersCall($data, $xpath, $returnData);
 
 						if(is_array($returnData)) {
-							if(is_callable($extraCall) && is_array($returnData)) $extraCall($xpath, $returnData);
+							if(is_callable($extraCall) && is_array($returnData)) {
+								$extraCall($xpath, $returnData);
+							}
 						} else {
 							log_message('error', "{$this->site} : {$title_url} | canHaveNoChapters set, but doesn't match possible checks! XPath is probably broken.");
 						}
@@ -461,8 +477,12 @@ 
 		$status = FALSE;
 
 		//Make sure we have a volume element
-		if(count($oldChapterSegments) === 1) array_unshift($oldChapterSegments, 'v0');
-		if(count($newChapterSegments) === 1) array_unshift($newChapterSegments, 'v0');
+		if(count($oldChapterSegments) === 1) {
+			array_unshift($oldChapterSegments, 'v0');
+		}
+		if(count($newChapterSegments) === 1) {
+			array_unshift($newChapterSegments, 'v0');
+		}
 
 		$oldCount = count($oldChapterSegments);
 		$newCount = count($newChapterSegments);
@@ -475,8 +495,12 @@ 
 				$newVolume = substr(array_shift($newChapterSegments), 1);
 
 				//Forcing volume to 0 as TBD might not be the latest (although it can be, but that is covered by other checks)
-				if(in_array($oldVolume, ['TBD', 'TBA', 'NA', 'LMT'])) $oldVolume = 0;
-				if(in_array($newVolume, ['TBD', 'TBA', 'NA', 'LMT'])) $newVolume = 0;
+				if(in_array($oldVolume, ['TBD', 'TBA', 'NA', 'LMT'])) {
+					$oldVolume = 0;
+				}
+				if(in_array($newVolume, ['TBD', 'TBA', 'NA', 'LMT'])) {
+					$newVolume = 0;
+				}
 
 				$oldVolume = floatval($oldVolume);
 				$newVolume = floatval($newVolume);

application/models/Auth_Model.php

Braces +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 			if($query->num_rows() > 0) {
 				//username exists, grab email
 				$email = $query->row('email');
-			}else{
+			} else {
 				//username doesn't exist, return FALSE
 				$email = NULL;
 			}

application/controllers/User/Auth/Signup.php

Braces +7 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 		}
 
 		//login wasn't valid, failed, or this is a fresh login attempt
-		if(!$isValid){
+		if(!$isValid) {
 			//display the email validation form
 			$this->body_data['form_email'] = array(
 					'name'        => 'email',
@@ -86,7 +86,9 @@ 
 	//This continued signup occurs after the user clicks the verification link in their email.
 	private function _continue_signup($verificationCode) : void {
 		//check if validation is valid, if so return email, if not redirect to signup
-		if(!($email = $this->Auth->verificationCheck($verificationCode))) redirect('user/signup');
+		if(!($email = $this->Auth->verificationCheck($verificationCode))) {
+			redirect('user/signup');
+		}
 
 		//validation is valid, proceed as normal
 		$this->form_validation->set_rules('username',         'Username',           'required|min_length[4]|max_length[15]|valid_username|is_unique_username');
@@ -110,14 +112,15 @@ 
 				$this->Auth->verificationComplete($email);
 
 				redirect('help');
-			} else { //@codeCoverageIgnore
+			} else {
+//@codeCoverageIgnore
 				//Signup failed.
 				$isValid = FALSE;
 			}
 		}
 
 		//signup wasn't valid, failed, or this is a fresh signup attempt
-		if(!$isValid){
+		if(!$isValid) {
 			//display the create user form
 			$this->body_data['verificationCode'] = $verificationCode;
 

application/controllers/User/Auth/Forgot_Password.php

Braces +4 added lines, -2 removed lines

@@ -83,11 +83,13 @@
 				if ($change) {
 					//password changed successfully, redirect to login
 					redirect('user/login', 'refresh');
-				} else { //@codeCoverageIgnore
+				} else {
+//@codeCoverageIgnore
 					//password changed unsuccessfully, refresh page.
 					redirect('user/reset_password/'.$code, 'refresh');
 				}
-			} else { //@codeCoverageIgnore
+			} else {
+//@codeCoverageIgnore
 				//form is invalid OR first-time viewing page
 				$this->body_data['reset_code']    = $code;
 				$this->body_data['form_password'] = array(

application/libraries/MY_Form_validation.php

Braces +2 added lines, -3 removed lines

@@ -43,8 +43,7 @@ 
 	public function valid_password(string $password) : bool {
 		if(!($isValid = $this->min_length($password, $this->CI->config->item('min_password_length', 'ion_auth')))) {
 			$this->set_message('valid_password', 'The password is too short!');
-		}
-		elseif(!($isValid = $this->max_length($password, $this->CI->config->item('max_password_length', 'ion_auth')))) {
+		} elseif(!($isValid = $this->max_length($password, $this->CI->config->item('max_password_length', 'ion_auth')))) {
 			$this->set_message('valid_password', 'The password is too long!');
 		}
 		return $isValid;
@@ -108,7 +107,7 @@ 
 	 */
 	public function isRuleValid(string $ruleName) : bool {
 		$isValid = FALSE;
-		if(is_string($ruleName) && $this->has_rule($ruleName)){
+		if(is_string($ruleName) && $this->has_rule($ruleName)) {
 			$isValid = !array_key_exists($ruleName, $this->error_array());
 		}
 		return $isValid;

application/core/MY_Config.php

Braces +11 added lines, -24 removed lines

@@ -13,46 +13,36 @@ 
 	 * @param	bool	$fail_gracefully	Whether to just return FALSE or display an error message
 	 * @return	bool	TRUE if the file was loaded correctly or FALSE on failure
 	 */
-	public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
-	{
+	public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
 		$file = ($file === '') ? 'config' : str_replace('.php', '', $file);
 		$loaded = FALSE;
 
-		foreach ($this->_config_paths as $path)
-		{
-			foreach (array($file, '_secure'.DIRECTORY_SEPARATOR.$file, ENVIRONMENT.DIRECTORY_SEPARATOR.$file) as $location)
-			{
+		foreach ($this->_config_paths as $path) {
+			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 ($fail_gracefully === TRUE)
-					{
+				if ( ! isset($config) OR ! is_array($config)) {
+					if ($fail_gracefully === TRUE) {
 						return FALSE;
 					}
 
 					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)
 						: $config;
-				}
-				else
-				{
+				} else {
 					$this->config = array_merge($this->config, $config);
 				}
 
@@ -63,12 +53,9 @@ 
 			}
 		}
 
-		if ($loaded === TRUE)
-		{
+		if ($loaded === TRUE) {
 			return TRUE;
-		}
-		elseif ($fail_gracefully === TRUE)
-		{
+		} elseif ($fail_gracefully === TRUE) {
 			return FALSE;
 		}