DakuTree / manga-tracker

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?

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

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, '/\\'),

application/controllers/User/Auth/Forgot_Password.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 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();
@@ -67,20 +67,20 @@ 
 		$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
 
 				$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
 					redirect('user/login', 'refresh');
 				} else { //@codeCoverageIgnore

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/controllers/User/Auth/Login.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 Login extends No_Auth_Controller {
 	public function __construct() {

Spacing +4 added lines, -4 removed lines

@@ -13,17 +13,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
@@ -65,7 +65,7 @@ 
 
 		//login wasn't valid, failed, or this is a fresh login attempt
 		if(!$isValid) {
-			$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('/user/dashboard', '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/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/views/User/Forgot_Password.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 			<div class="row">
 				<div class="col-xs-12 col-md-12">
-					<?=form_submit($form_submit);?>
+					<?=form_submit($form_submit); ?>
 				</div>
 			</div>
 		</form>

application/views/User/Login.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 				<div class="row">
 					<div class="col-xs-6 col-sm-6 col-md-6">
-						<?=form_submit($form_submit);?>
+						<?=form_submit($form_submit); ?>
 					</div>
 					<div class="col-xs-6 col-sm-6 col-md-6">
 						<a href="<?=base_url('user/signup')?>" class="btn btn-lg btn-primary btn-block">Create an account</a>

application/views/errors/html/error_404.php

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

@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?><!DOCTYPE html>
 <html lang="en">
 <head>

application/views/errors/html/error_php.php

Spacing +3 added lines, -3 removed lines

@@ -11,12 +11,12 @@
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 	<p>Backtrace:</p>
-	<?php foreach (debug_backtrace() as $error): ?>
+	<?php foreach(debug_backtrace() as $error): ?>
 
-		<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+		<?php if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 
 			<p style="margin-left:10px">
 			File: <?php echo $error['file'] ?><br />

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

@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?>
 
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">