DakuTree / manga-tracker

application/models/Auth_Model.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +3 added lines, -3 removed lines

@@ -77,9 +77,9 @@
 	public function verification_check(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) {

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') or exit('No direct script access allowed');
 
 class Auth_Model extends CI_Model {
 	public function __construct() {
@@ -60,7 +60,7 @@ 
 			}
 
 			$success = TRUE;
-		} catch (Exception $e) {
+		} catch(Exception $e) {
 			//echo 'Caught exception: ',  $e->getMessage(), "\n";
 
 			//revert verification
@@ -91,7 +91,7 @@ 
 				//TODO: Remove from DB, send user error that verification expired.
 			} else {
 				//not expired, verification is valid, return email
-				$return =  $result->email;
+				$return = $result->email;
 			}
 		}
 		return $return;

public/index.php

Indentation +4 added lines, -4 removed lines

@@ -210,10 +210,10 @@
 {
 	// Ensure there's a trailing slash
 	$system_path = strtr(
-		               rtrim($system_path, '/\\'),
-		               '/\\',
-		               DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
-	               ).DIRECTORY_SEPARATOR;
+					   rtrim($system_path, '/\\'),
+					   '/\\',
+					   DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
+				   ).DIRECTORY_SEPARATOR;
 }
 
 // Is the system path correct?

Spacing +12 added lines, -12 removed lines

@@ -63,7 +63,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);
@@ -79,7 +79,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);
 		}
@@ -197,12 +197,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;
 }
@@ -217,7 +217,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);
@@ -242,9 +242,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;
 	}
@@ -257,7 +257,7 @@ 
 		);
 	}
 }
-elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 {
 	$application_folder = BASEPATH.strtr(
 			trim($application_folder, '/\\'),
@@ -275,13 +275,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;
 	}
@@ -294,7 +294,7 @@ 
 		);
 	}
 }
-elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 {
 	$view_folder = APPPATH.strtr(
 			trim($view_folder, '/\\'),

Braces +18 added lines, -45 removed lines

@@ -63,8 +63,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);
 		ini_set('display_errors', 1);
@@ -79,12 +78,9 @@ 
 	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);
-		}
-		else
-		{
+		} else {
 			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 		}
 		break;
@@ -197,17 +193,13 @@ 
  */
 
 // 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;
-}
-else
-{
+} else {
 	// Ensure there's a trailing slash
 	$system_path = strtr(
 		               rtrim($system_path, '/\\'),
@@ -217,8 +209,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);
 	exit(3); // EXIT_CONFIG
@@ -242,31 +233,23 @@ 
 define('SYSDIR', basename(BASEPATH));
 
 // The path to the "application" directory
-if (is_dir($application_folder))
-{
-	if (($_temp = realpath($application_folder)) !== FALSE)
-	{
+if (is_dir($application_folder)) {
+	if (($_temp = realpath($application_folder)) !== FALSE) {
 		$application_folder = $_temp;
-	}
-	else
-	{
+	} else {
 		$application_folder = strtr(
 			rtrim($application_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
 	}
-}
-elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
-{
+} elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) {
 	$application_folder = BASEPATH.strtr(
 			trim($application_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
-}
-else
-{
+} else {
 	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 	echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
 	exit(3); // EXIT_CONFIG
@@ -275,35 +258,25 @@ 
 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))
-{
-	if (($_temp = realpath($view_folder)) !== FALSE)
-	{
+} elseif (is_dir($view_folder)) {
+	if (($_temp = realpath($view_folder)) !== FALSE) {
 		$view_folder = $_temp;
-	}
-	else
-	{
+	} else {
 		$view_folder = strtr(
 			rtrim($view_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
 	}
-}
-elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
-{
+} elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) {
 	$view_folder = APPPATH.strtr(
 			trim($view_folder, '/\\'),
 			'/\\',
 			DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
 		);
-}
-else
-{
+} else {
 	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 	echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
 	exit(3); // EXIT_CONFIG

application/controllers/About.php

Braces +1 added lines, -2 removed lines

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

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
 {

application/controllers/User/Auth/Forgot_Password.php

Braces +4 added lines, -2 removed lines

@@ -89,12 +89,14 @@
 					//password changed successfully, redirect to login
 					$this->session->set_flashdata('notices', $this->ion_auth->messages());
 					redirect("user/login", 'refresh');
-				} else { //@codeCoverageIgnore
+				} else {
+//@codeCoverageIgnore
 					//password changed unsuccessfully, refresh page.
 					$this->session->set_flashdata('notices', $this->ion_auth->errors());
 					redirect('user/reset_password/'.$code, 'refresh');
 				}
-			} else { //@codeCoverageIgnore
+			} else {
+//@codeCoverageIgnore
 				//form is invalid OR first-time viewing page
 				$this->global_data['notices'] = (validation_errors()) ? validation_errors() : $this->session->flashdata('notices');
 

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 Forgot_Password extends No_Auth_Controller {
 	public function __construct() {

Spacing +6 added lines, -6 removed lines

@@ -16,12 +16,12 @@ 
 		$this->header_data['page']  = "forgot_password";
 
 		//TODO (RESEARCH): Should we allow username here too?
-		$this->form_validation->set_rules('email', 'Email',  'required|valid_email', array(
+		$this->form_validation->set_rules('email', 'Email', 'required|valid_email', array(
 			'required'    => 'Please enter your email.',
 			'valid_email' => 'The email your entered is invalid.'
 		));
 
-		if ($this->form_validation->run() === TRUE) {
+		if($this->form_validation->run() === TRUE) {
 			//form is valid
 
 			$identity = $this->ion_auth->where('email', $this->input->post('email'))->users()->row();
@@ -71,21 +71,21 @@ 
 		$this->header_data['page'] = "reset-password";
 
 		$user = $this->ion_auth->forgotten_password_check($code);
-		if ($user) {
+		if($user) {
 			//code is valid, show reset form or process reset
 			$min_password_length = $this->config->item('min_password_length', 'ion_auth');
 			$max_password_length = $this->config->item('max_password_length', 'ion_auth');
-			$this->form_validation->set_rules('new_password',         "Password",         'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']');
+			$this->form_validation->set_rules('new_password', "Password", 'required|min_length['.$min_password_length.']|max_length['.$max_password_length.']');
 			$this->form_validation->set_rules('new_password_confirm', "Password Confirm", 'required|matches[new_password]');
 
-			if ($this->form_validation->run() === TRUE) {
+			if($this->form_validation->run() === TRUE) {
 				//form is valid, process the password reset request
 				//TODO (Research): The original ion_auth auth.php sent the userid to the form, then matched it on return, is there any point to this?
 
 				$identity = $user->{'email'};
 				$change   = $this->ion_auth->reset_password($identity, $this->input->post('new_password'));
 
-				if ($change) {
+				if($change) {
 					//password changed successfully, redirect to login
 					$this->session->set_flashdata('notices', $this->ion_auth->messages());
 					redirect("user/login", 'refresh');

application/controllers/User/Auth/Login.php

Spacing +4 added lines, -4 removed lines

@@ -15,17 +15,17 @@ 
 		$this->header_data['title'] = "Login";
 		$this->header_data['page']  = "login";
 
-		$this->form_validation->set_rules('identity', 'Identity',  'required|max_length[254]', array(
+		$this->form_validation->set_rules('identity', 'Identity', 'required|max_length[254]', array(
 			'required'   => 'Please enter your username or email.',
 			'max_length' => 'Invalid username.'
 
 		));
-		$this->form_validation->set_rules('password', 'Password',  'required|max_length[64]', array(
+		$this->form_validation->set_rules('password', 'Password', 'required|max_length[64]', array(
 			'required'   => 'Please enter your password.',
 			'max_length' => 'Invalid password.'
 		));
 
-		if ($isValid = $this->form_validation->run() === TRUE) {
+		if($isValid = $this->form_validation->run() === TRUE) {
 			//form is valid
 
 			//check if identity is email, if not then attempt to use grab from DB
@@ -63,7 +63,7 @@ 
 			$this->body_data['notices'] = validation_errors() ? validation_errors() : $this->session->flashdata('notices');
 			//$errors = $this->form_validation->error_array();
 
-			$this->body_data['form_create'] = array (
+			$this->body_data['form_create'] = array(
 				'action' => 'user/login',
 
 				'role'   => 'form'

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 Login extends No_Auth_Controller {
 	public function __construct() {

Braces +2 added lines, -1 removed lines

@@ -53,7 +53,8 @@
 					$this->session->keep_flashdata('referred_from');
 					if($prevURL = $this->session->flashdata('referred_from')) {
 						redirect($prevURL);
-					} else { //@codeCoverageIgnore
+					} else {
+//@codeCoverageIgnore
 						redirect('/'); //TODO (CHECK): Should this be refresh?
 					} //@codeCoverageIgnore
 				} else {

application/controllers/User/Auth/Logout.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 Logout extends User_Controller {
 	//we shouldn't care if the user is logged in or not, since ion_auth will take care of things

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->parse_email($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->global_data['notices'] = (validation_errors() ? validation_errors() : ($this->ion_auth->errors() ? $this->ion_auth->errors() : $this->session->flashdata('message')));
@@ -92,14 +92,14 @@ 
 		if(!($email = $this->Auth->verification_check($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');
 
@@ -123,7 +123,7 @@ 
 		}
 
 		//signup wasn't valid, failed, or this is a fresh signup attempt
-		if(!$isValid){
+		if(!$isValid) {
 			//display the create user form
 
 			$this->global_data['notices'] = (validation_errors() ? validation_errors() : ($this->ion_auth->errors() ? $this->ion_auth->errors() : $this->session->flashdata('message')));

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->global_data['notices'] = (validation_errors() ? validation_errors() : ($this->ion_auth->errors() ? $this->ion_auth->errors() : $this->session->flashdata('message')));
@@ -89,7 +89,9 @@ 
 	//This continued signup occurs after the user clicks the verification link in their email.
 	private function _continue_signup($verificationCode) {
 		//check if validation is valid, if so return email, if not redirect to signup
-		if(!($email = $this->Auth->verification_check($verificationCode))) redirect('user/signup');
+		if(!($email = $this->Auth->verification_check($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');
@@ -113,7 +115,8 @@ 
 				$this->Auth->verification_complete($email);
 
 				redirect('help');
-			} else { //@codeCoverageIgnore
+			} else {
+//@codeCoverageIgnore
 				//Signup failed.
 
 				$this->session->set_flashdata('notices', $this->ion_auth->errors());
@@ -123,7 +126,7 @@ 
 		}
 
 		//signup wasn't valid, failed, or this is a fresh signup attempt
-		if(!$isValid){
+		if(!$isValid) {
 			//display the create user form
 
 			$this->global_data['notices'] = (validation_errors() ? validation_errors() : ($this->ion_auth->errors() ? $this->ion_auth->errors() : $this->session->flashdata('message')));

application/controllers/AdminCLI.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 AdminCLI extends CLI_Controller {
 	public function __construct() {

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 		print "Testing site\n";
 		switch($type) {
 			case 'update':
-				if(!is_null($extra )) {
+				if(!is_null($extra)) {
 					print_r($this->Tracker->sites->{$site}->getTitleData($extra));
 				}
 				break;

application/controllers/IndexC.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 IndexC extends User_Controller {
 	public function __construct() {