DakuTree / manga-tracker

application/libraries/Cacher.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 	protected $CI;
 
 	public function __construct() {
-		$this->CI =& get_instance(); //grab an instance of CI
+		$this->CI = & get_instance(); //grab an instance of CI
 		$this->initiate_cache();
 	}
 

application/config/development/monolog.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /* GENERAL OPTIONS */
 $config['handlers'] = array('file', 'cli'); // valid handlers are ci_file | file | new_relic | hipchat | stderr | papertrail

application/core/MY_Config.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 	 * @param	string	$file			Configuration file name
 	 * @param	bool	$use_sections		Whether configuration values should be loaded into their own section
 	 * @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
+	 * @return	boolean|null	TRUE if the file was loaded correctly or FALSE on failure
 	 */
 	public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 	{

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

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

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 class MY_Config extends CI_Config {
 	public function __construct() {
@@ -35,7 +35,7 @@ 
 
 				include($file_path);
 
-				if ( ! isset($config) OR ! is_array($config))
+				if ( ! isset($config) or ! is_array($config))
 				{
 					if ($fail_gracefully === TRUE)
 					{

application/models/Auth_Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 
 	/**
 	 * @param string $verificationCode
-	 * @return mixed
+	 * @return string
 	 */
 	public function verificationCheck(string $verificationCode) {
 		//user is trying to validate their email for signup, check if verification code is still valid/exists

Indentation +7 added lines, -7 removed lines

@@ -76,9 +76,9 @@ 
 	public function verificationCheck(string $verificationCode) {
 		//user is trying to validate their email for signup, check if verification code is still valid/exists
 		$query = $this->db->select('email, verification_code_time')
-		                  ->from('auth_signup_verification')
-		                  ->where(array('verification_code' => $verificationCode))
-		                  ->get();
+						  ->from('auth_signup_verification')
+						  ->where(array('verification_code' => $verificationCode))
+						  ->get();
 
 		$return = FALSE;
 		if($query->num_rows() > 0) {
@@ -89,7 +89,7 @@ 
 
 				$this->session->set_flashdata('errors', 'Verification code expired. Please re-submit signup.');
 				$this->db->delete('auth_signup_verification')
-				         ->where(array('verification_code' => $verificationCode));
+						 ->where(array('verification_code' => $verificationCode));
 			} else {
 				//not expired, verification is valid, return email
 				$return =  $result->email;
@@ -125,9 +125,9 @@ 
 			$this->load->database();
 
 			$query = $this->db->select('email')
-			                  ->from('auth_users')
-			                  ->where('username', $identity)
-			                  ->get();
+							  ->from('auth_users')
+							  ->where('username', $identity)
+							  ->get();
 
 			if($query->num_rows() > 0) {
 				//username exists, grab email

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 			}
 
 			$success = TRUE;
-		} catch (Exception $e) {
+		} catch(Exception $e) {
 			//echo 'Caught exception: ',  $e->getMessage(), "\n";
 
 			//revert verification
@@ -92,7 +92,7 @@ 
 				         ->where(array('verification_code' => $verificationCode));
 			} else {
 				//not expired, verification is valid, return email
-				$return =  $result->email;
+				$return = $result->email;
 			}
 		}
 		return $return;
@@ -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;
 			}

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

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 			'is_unique_email' => 'Email already exists.'
 		));
 
-		if ($isValid = ($this->form_validation->run() === TRUE)) {
+		if($isValid = ($this->form_validation->run() === TRUE)) {
 			$email = $this->Auth->parseEmail($this->input->post('email'));
 
 			$this->body_data['email'] = $email;
@@ -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',
@@ -89,14 +89,14 @@ 
 		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');
-		$this->form_validation->set_rules('password',         'Password',           'required|valid_password');
-		$this->form_validation->set_rules('password_confirm', 'Confirm Password',   'required|matches[password]');
-		$this->form_validation->set_rules('terms',            'Terms & Conditions', 'required');
+		$this->form_validation->set_rules('username', 'Username', 'required|min_length[4]|max_length[15]|valid_username|is_unique_username');
+		$this->form_validation->set_rules('password', 'Password', 'required|valid_password');
+		$this->form_validation->set_rules('password_confirm', 'Confirm Password', 'required|matches[password]');
+		$this->form_validation->set_rules('terms', 'Terms & Conditions', 'required');
 		//TODO: timezone
 		//TODO: receive email
 
-		if ($isValid = ($this->form_validation->run() === TRUE)) {
+		if($isValid = ($this->form_validation->run() === TRUE)) {
 			$username = $this->input->post('username');
 			$password = $this->input->post('password');
 
@@ -117,7 +117,7 @@ 
 		}
 
 		//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;
 

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/About.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 class About extends MY_Controller {
 	public function __construct() {

application/libraries/CustomParsedown.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
 
-require_once APPPATH . '../vendor/erusev/parsedown/Parsedown.php';
+require_once APPPATH.'../vendor/erusev/parsedown/Parsedown.php';
 class CustomParsedown extends Parsedown {
 	public function __construct() {
 		$this->setSafeMode(TRUE);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 		$link = parent::inlineLink($excerpt);
 
 		if(!isset($link)) {
-			return null;
+			return NULL;
 		}
 
 		//Make title attribute the same as link

application/libraries/MY_Form_validation.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,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;

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/config/production/database.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 include APPPATH.'config/database.php'; //CI doesn't do this by default?