DakuTree / manga-tracker

public/index.php

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/tests/Bootstrap.php

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

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

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');
 

application/controllers/User/Auth/Login.php

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 {

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->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/migrations/003_setup_signup_verification.php

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
 		$this->dbforge->create_table('auth_signup_verification');
 	}
 
-	public function down()
-	{
+	public function down() {
 		$this->dbforge->drop_table('auth_signup_verification', TRUE);
 	}
 }