DakuTree / manga-tracker

application/tests/Bootstrap.php

Switch Indentation +22 added lines, -22 removed lines

@@ -69,28 +69,28 @@
  */
 switch (ENVIRONMENT)
 {
-	case 'testing':
-	case 'development':
-		error_reporting(-1);
-		ini_set('display_errors', 1);
-	break;
-
-	case 'production':
-		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
-		{
-			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
-		}
-	break;
-
-	default:
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
-		echo 'The application environment is not set correctly.';
-		exit(1); // EXIT_ERROR
+		case 'testing':
+		case 'development':
+			error_reporting(-1);
+			ini_set('display_errors', 1);
+		break;
+
+		case 'production':
+			ini_set('display_errors', 0);
+			if (version_compare(PHP_VERSION, '5.3', '>='))
+			{
+				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
+			}
+			else
+			{
+				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
+			}
+		break;
+
+		default:
+			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
+			echo 'The application environment is not set correctly.';
+			exit(1); // EXIT_ERROR
 }
 
 /*

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  */
 // This is needed for @runInSeparateProcess
-if (! defined('ENVIRONMENT'))
+if(!defined('ENVIRONMENT'))
 {
 	define('ENVIRONMENT', 'testing');
 }
@@ -67,7 +67,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 'testing':
 	case 'development':
@@ -77,7 +77,7 @@ 
 
 	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);
 		}
@@ -200,7 +200,7 @@ 
 		chdir(dirname(__FILE__));
 //	}
 
-	if (($_temp = realpath($system_path)) !== FALSE)
+	if(($_temp = realpath($system_path)) !== FALSE)
 	{
 		$system_path = $_temp.'/';
 	}
@@ -211,7 +211,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);
@@ -236,9 +236,9 @@ 
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
 	// The path to the "application" folder
-	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;
 		}
@@ -247,7 +247,7 @@ 
 	}
 	else
 	{
-		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+		if(!is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 		{
 			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;
@@ -258,13 +258,13 @@ 
 	}
 
 	// The path to the "views" folder
-	if ( ! is_dir($view_folder))
+	if(!is_dir($view_folder))
 	{
-		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+		if(!empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 		{
 			$view_folder = APPPATH.$view_folder;
 		}
-		elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+		elseif(!is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
 		{
 			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;
@@ -276,7 +276,7 @@ 
 		}
 	}
 
-	if (($_temp = realpath($view_folder)) !== FALSE)
+	if(($_temp = realpath($view_folder)) !== FALSE)
 	{
 		$view_folder = $_temp.DIRECTORY_SEPARATOR;
 	}
@@ -327,5 +327,5 @@ 
  *  Added for CI PHPUnit Test
  * -------------------------------------------------------------------
  */
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
 CIPHPUnitTest::init();

Braces +17 added lines, -40 removed lines

@@ -54,8 +54,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  */
 // This is needed for @runInSeparateProcess
-if (! defined('ENVIRONMENT'))
-{
+if (! defined('ENVIRONMENT')) {
 	define('ENVIRONMENT', 'testing');
 }
 
@@ -67,8 +66,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 'testing':
 	case 'development':
 		error_reporting(-1);
@@ -77,12 +75,9 @@ 
 
 	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;
@@ -200,19 +195,15 @@ 
 		chdir(dirname(__FILE__));
 //	}
 
-	if (($_temp = realpath($system_path)) !== FALSE)
-	{
+	if (($_temp = realpath($system_path)) !== FALSE) {
 		$system_path = $_temp.'/';
-	}
-	else
-	{
+	} else {
 		// Ensure there's a trailing slash
 		$system_path = rtrim($system_path, '/').'/';
 	}
 
 	// 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
@@ -236,19 +227,14 @@ 
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
 	// The path to the "application" folder
-	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;
 		}
 
 		define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
-	}
-	else
-	{
-		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
-		{
+	} else {
+		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) {
 			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
@@ -258,30 +244,21 @@ 
 	}
 
 	// The path to the "views" folder
-	if ( ! is_dir($view_folder))
-	{
-		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
-		{
+	if ( ! is_dir($view_folder)) {
+		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) {
 			$view_folder = APPPATH.$view_folder;
-		}
-		elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
-		{
+		} elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) {
 			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
-		}
-		else
-		{
+		} else {
 			$view_folder = APPPATH.'views';
 		}
 	}
 
-	if (($_temp = realpath($view_folder)) !== FALSE)
-	{
+	if (($_temp = realpath($view_folder)) !== FALSE) {
 		$view_folder = $_temp.DIRECTORY_SEPARATOR;
-	}
-	else
-	{
+	} else {
 		$view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR;
 	}
 

application/tests/mocks/autoloader.php

Spacing +11 added lines, -11 removed lines

@@ -60,49 +60,49 @@ 
 
 	$ci_drivers = array('Session', 'Cache');
 
-	if (strpos($class, 'Mock_') === 0)
+	if(strpos($class, 'Mock_') === 0)
 	{
 		$class = strtolower(str_replace(array('Mock_', '_'), array('', DIRECTORY_SEPARATOR), $class));
 	}
-	elseif (strpos($class, 'CI_') === 0)
+	elseif(strpos($class, 'CI_') === 0)
 	{
 		$subclass = substr($class, 3);
 
-		if (in_array($subclass, $ci_core))
+		if(in_array($subclass, $ci_core))
 		{
 			$dir = SYSTEM_PATH.'core'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
 		}
-		elseif (in_array($subclass, $ci_libraries))
+		elseif(in_array($subclass, $ci_libraries))
 		{
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR;
 			$class = ($subclass === 'Driver_Library') ? 'Driver' : $subclass;
 		}
-		elseif (in_array($subclass, $ci_drivers))
+		elseif(in_array($subclass, $ci_drivers))
 		{
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$subclass.DIRECTORY_SEPARATOR;
 			$class = $subclass;
 		}
-		elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
+		elseif(in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$parent.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
 		}
-		elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4)
+		elseif(preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4)
 		{
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR.'subdrivers'.DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'_'.$m[3].'.php';
 		}
-		elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3)
+		elseif(preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3)
 		{
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'.php';
 		}
-		elseif (strpos($class, 'CI_DB') === 0)
+		elseif(strpos($class, 'CI_DB') === 0)
 		{
 			$dir = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR;
-			$file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php';
+			$file = $dir.str_replace(array('CI_DB', 'active_record'), array('DB', 'active_rec'), $subclass).'.php';
 		}
 		else
 		{
@@ -112,7 +112,7 @@ 
 
 	$file = isset($file) ? $file : $dir.$class.'.php';
 
-	if ( ! file_exists($file))
+	if(!file_exists($file))
 	{
 		return FALSE;
 	}

Braces +12 added lines, -31 removed lines

@@ -11,8 +11,7 @@ 
 // $mock_table = new Mock_Libraries_Table(); 			// Will load ./mocks/libraries/table.php
 // $mock_database_driver = new Mock_Database_Driver();	// Will load ./mocks/database/driver.php
 // and so on...
-function autoload($class)
-{
+function autoload($class) {
 	$dir = realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR;
 
 	$ci_core = array(
@@ -60,60 +59,42 @@ 
 
 	$ci_drivers = array('Session', 'Cache');
 
-	if (strpos($class, 'Mock_') === 0)
-	{
+	if (strpos($class, 'Mock_') === 0) {
 		$class = strtolower(str_replace(array('Mock_', '_'), array('', DIRECTORY_SEPARATOR), $class));
-	}
-	elseif (strpos($class, 'CI_') === 0)
-	{
+	} elseif (strpos($class, 'CI_') === 0) {
 		$subclass = substr($class, 3);
 
-		if (in_array($subclass, $ci_core))
-		{
+		if (in_array($subclass, $ci_core)) {
 			$dir = SYSTEM_PATH.'core'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (in_array($subclass, $ci_libraries))
-		{
+		} elseif (in_array($subclass, $ci_libraries)) {
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR;
 			$class = ($subclass === 'Driver_Library') ? 'Driver' : $subclass;
-		}
-		elseif (in_array($subclass, $ci_drivers))
-		{
+		} elseif (in_array($subclass, $ci_drivers)) {
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$subclass.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
+		} elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$parent.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4)
-		{
+		} elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4) {
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR.'subdrivers'.DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'_'.$m[3].'.php';
-		}
-		elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3)
-		{
+		} elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3) {
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'.php';
-		}
-		elseif (strpos($class, 'CI_DB') === 0)
-		{
+		} elseif (strpos($class, 'CI_DB') === 0) {
 			$dir = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR;
 			$file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php';
-		}
-		else
-		{
+		} else {
 			$class = strtolower($class);
 		}
 	}
 
 	$file = isset($file) ? $file : $dir.$class.'.php';
 
-	if ( ! file_exists($file))
-	{
+	if ( ! file_exists($file)) {
 		return FALSE;
 	}
 

application/tests/mocks/libraries/email.php

Braces +9 added lines, -18 removed lines

@@ -8,8 +8,7 @@ 
  * @link       https://github.com/kenjis/ci-phpunit-test
  */
 
-class Mock_Libraries_Email
-{
+class Mock_Libraries_Email {
 	private $data = [];
 
 	/**
@@ -17,43 +16,35 @@ 
 	 */
 	public $return_send = TRUE;
 
-	public function initialize()
-	{
+	public function initialize() {
 		
 	}
 
-	public function from($from)
-	{
+	public function from($from) {
 		$this->data['from'] = $from;
 	}
 
-	public function to($to)
-	{
+	public function to($to) {
 		$this->data['to'] = $to;
 	}
 
-	public function bcc($bcc)
-	{
+	public function bcc($bcc) {
 		$this->data['bcc'] = $bcc;
 	}
 
-	public function subject($subject)
-	{
+	public function subject($subject) {
 		$this->data['subject'] = $subject;
 	}
 
-	public function message($message)
-	{
+	public function message($message) {
 		$this->data['message'] = $message;
 	}
 
-	public function send()
-	{
+	public function send() {
 		return $this->return_send;
 	}
 
-	public function _get_data()
-	{
+	public function _get_data() {
 		return $this->data;
 	}
 }

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');
 
 /**
  * Rate Limiter Configuration

application/controllers/User/Options.php

Spacing +5 added lines, -5 removed lines

@@ -16,13 +16,13 @@
 		$usedCategories   = $this->Tracker->getUsedCategories($this->User->id);
 
 		//NOTE: The checkbox validation is handled in run()
-		$this->form_validation->set_rules('category_custom_1_text',      'Custom Category 1 Text',      'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_2_text',      'Custom Category 2 Text',      'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('category_custom_3_text',      'Custom Category 3 Text',      'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
-		$this->form_validation->set_rules('default_series_category',     'Default Series Category',     'required|is_valid_option_value[default_series_category]');
+		$this->form_validation->set_rules('category_custom_1_text', 'Custom Category 1 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_2_text', 'Custom Category 2 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('category_custom_3_text', 'Custom Category 3 Text', 'trim|regex_match[/^[a-zA-Z0-9-_\\s]{0,16}$/]');
+		$this->form_validation->set_rules('default_series_category', 'Default Series Category', 'required|is_valid_option_value[default_series_category]');
 		$this->form_validation->set_rules('enable_live_countdown_timer', 'Enable Live Countdown Timer', 'required|is_valid_option_value[enable_live_countdown_timer]');
 
-		if ($isValid = $this->form_validation->run() === TRUE) {
+		if($isValid = $this->form_validation->run() === TRUE) {
 			foreach($customCategories as $categoryK => $category) {
 				if(!in_array($categoryK, $usedCategories)) {
 					$this->User_Options->set($category, $this->input->post($category) ? 'enabled' : 'disabled');

application/controllers/User/Auth/Forgot_Password.php

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[password]');
 
-			if ($this->form_validation->run() === TRUE) {
+			if($this->form_validation->run() === TRUE) {
 				//form is valid, process the password reset request
 				//TODO (Reaearch): 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');

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');
 
 /**
  * Rate Limiter Configuration

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'

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,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 {

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');
 
 /**
  * Rate Limiter Configuration

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/Ajax/Userscript.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	public function report_bug() {
 		$this->load->library('user_agent');
 		if($this->output->is_custom_header_set()) { $this->output->reset_status_header(); return; }
-		$this->form_validation->set_rules('bug[url]',  'Bug [URL]',  'required');
+		$this->form_validation->set_rules('bug[url]', 'Bug [URL]', 'required');
 		$this->form_validation->set_rules('bug[text]', 'Bug [Text]', 'required');
 
 		if($this->form_validation->run() === TRUE) {