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/core/MY_Controller.php

Braces +4 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	protected $footer_data = array();
 	public    $global_data = array();
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 
 		//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing.
@@ -80,7 +80,9 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		if($this->ion_auth->logged_in()) redirect('/');
+		if($this->ion_auth->logged_in()) {
+			redirect('/');
+		}
 	}
 }
 

application/models/User_Model.php

Braces +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 			if($query->num_rows() > 0) {
 				//username exists, grab email
 				$email = $query->row('email');
-			}else{
+			} else {
 				//username doesn't exist, return FALSE
 				$email = FALSE;
 			}

application/models/User_Options_Model.php

Braces +10 added lines, -3 removed lines

@@ -137,7 +137,9 @@ 
 				}
 
 				$success = $this->set_db($idData, $valueData);
-				if($success) $this->session->unset_tempdata("option_{$option}");
+				if($success) {
+					$this->session->unset_tempdata("option_{$option}");
+				}
 			} else {
 				$success = FALSE;
 			}
@@ -164,7 +166,9 @@ 
 			}
 
 			//Overall fallback method.
-			if(!isset($value)) $value = $this->options[$option]['default'];
+			if(!isset($value)) {
+				$value = $this->options[$option]['default'];
+			}
 		} else {
 			$value = FALSE;
 		}
@@ -215,7 +219,10 @@ 
 				//This should never happen.
 				break;
 		}
-		if(!isset($value)) $value = FALSE; //FIXME: This won't play nice with BOOL type false?
+		if(!isset($value)) {
+			$value = FALSE;
+		}
+		//FIXME: This won't play nice with BOOL type false?
 
 		return $value;
 	}

application/models/Tracker/Tracker_Title_Model.php

Braces +6 added lines, -2 removed lines

@@ -35,9 +35,13 @@
 			$titleID = $id;
 		} else {
 			//TODO: Check if title is valid URL!
-			if($create) $titleID = $this->addTitle($titleURL, $siteID);
+			if($create) {
+				$titleID = $this->addTitle($titleURL, $siteID);
+			}
+		}
+		if(!isset($titleID) || !$titleID) {
+			$titleID = 0;
 		}
-		if(!isset($titleID) || !$titleID) $titleID = 0;
 
 		return ($returnData && $titleID !== 0 ? $query->row_array() : $titleID);
 	}

application/controllers/User/History.php

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
 	}
 
 	public function index(int $page = 1) : void {
-		if($page === 0) redirect('user/history/1');
+		if($page === 0) {
+			redirect('user/history/1');
+		}
 
 		$this->header_data['title'] = "History";
 		$this->header_data['page']  = "history";
@@ -16,7 +18,9 @@ 
 		$this->body_data['currentPage'] = (int) $page;
 		$this->body_data['totalPages']  = $historyData['totalPages'];
 
-		if($page > $this->body_data['totalPages'] && $page > 1) redirect('user/history/1');
+		if($page > $this->body_data['totalPages'] && $page > 1) {
+			redirect('user/history/1');
+		}
 
 		$this->_render_page('User/History');
 	}

application/controllers/User/PublicList.php

Braces +3 added lines, -1 removed lines

@@ -60,7 +60,9 @@
 			$show_404 = TRUE;
 		}
 
-		if($show_404) show_404();
+		if($show_404) {
+			show_404();
+		}
 	}
 
 	private function _walk_recursive_remove (array $array, callable $callback) : array {

application/controllers/User/Favourites.php

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
 	}
 
 	public function index(int $page = 1) : void {
-		if($page === 0) redirect('user/favourites/1');
+		if($page === 0) {
+			redirect('user/favourites/1');
+		}
 
 		$this->header_data['title'] = "Favourites";
 		$this->header_data['page']  = "favourites";
@@ -16,7 +18,9 @@ 
 		$this->body_data['currentPage'] = $page;
 		$this->body_data['totalPages']  = $favouriteData['totalPages'];
 
-		if($page > $this->body_data['totalPages'] && $page <= 1) redirect('user/favourites/1');
+		if($page > $this->body_data['totalPages'] && $page <= 1) {
+			redirect('user/favourites/1');
+		}
 
 		$this->_render_page('User/Favourites');
 	}

application/helpers/generic_helper.php

Braces +6 added lines, -5 removed lines

@@ -32,18 +32,19 @@
 	return $time_string;
 }
 
-if (!function_exists('http_parse_headers')) { #http://www.php.net/manual/en/function.http-parse-headers.php#112917
+if (!function_exists('http_parse_headers')) {
+#http://www.php.net/manual/en/function.http-parse-headers.php#112917
 	function http_parse_headers (string $raw_headers) : array {
 		$headers = array(); // $headers = [];
 		foreach (explode("\n", $raw_headers) as $i => $h) {
 			$h = explode(':', $h, 2);
-			if (isset($h[1])){
-				if(!isset($headers[$h[0]])){
+			if (isset($h[1])) {
+				if(!isset($headers[$h[0]])) {
 					$headers[$h[0]] = trim($h[1]);
-				}else if(is_array($headers[$h[0]])){
+				} else if(is_array($headers[$h[0]])) {
 					$tmp = array_merge($headers[$h[0]],array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
-				}else{
+				} else {
 					$tmp = array_merge(array($headers[$h[0]]),array(trim($h[1])));
 					$headers[$h[0]] = $tmp;
 				}