DakuTree / manga-tracker

application/views/errors/cli/error_php.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
 Filename:    <?php echo $filepath, "\n"; ?>
 Line Number: <?php echo $line; ?>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 Backtrace:
-<?php	foreach (debug_backtrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	foreach(debug_backtrace() as $error): ?>
+<?php		if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 	File: <?php echo $error['file'], "\n"; ?>
 	Line: <?php echo $error['line'], "\n"; ?>
 	Function: <?php echo $error['function'], "\n\n"; ?>

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'); ?>
 
 A PHP Error was encountered
 

application/views/errors/cli/error_exception.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
 Filename:    <?php echo $exception->getFile(), "\n"; ?>
 Line Number: <?php echo $exception->getLine(); ?>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
 
 Backtrace:
-<?php	foreach ($exception->getTrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	foreach($exception->getTrace() as $error): ?>
+<?php		if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 	File: <?php echo $error['file'], "\n"; ?>
 	Line: <?php echo $error['line'], "\n"; ?>
 	Function: <?php echo $error['function'], "\n\n"; ?>

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'); ?>
 
 An uncaught Exception was encountered
 

application/views/errors/cli/error_db.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');
 
 echo "\nDatabase error: ",
 	$heading,

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

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 MY_Controller extends CI_Controller {
 	protected $header_data = array();

Spacing +5 added lines, -5 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.
@@ -17,13 +17,13 @@ 
 
 		$this->global_data['theme'] = $this->User_Options->get('theme');
 		if(ENVIRONMENT === 'production') {
-			$this->global_data['compiled_css_path'] = function () {
+			$this->global_data['compiled_css_path'] = function() {
 				$css_path = "css/main.{$this->global_data['theme']}";
-				return asset_url() . $css_path . '.' . filemtime(APPPATH . "../public/assets/{$css_path}.css") . '.css';
+				return asset_url().$css_path.'.'.filemtime(APPPATH."../public/assets/{$css_path}.css").'.css';
 			};
 
 			$js_path = 'js/compiled.min';
-			$this->global_data['compiled_js_path'] = asset_url() . $js_path . '.' . filemtime(APPPATH . "../public/assets/{$js_path}.js") . '.js';
+			$this->global_data['compiled_js_path'] = asset_url().$js_path.'.'.filemtime(APPPATH."../public/assets/{$js_path}.js").'.js';
 		}
 	}
 
@@ -54,7 +54,7 @@ 
 		$json = is_array($json_input) ? json_encode($json_input) : $json_input;
 
 		$this->output->set_content_type('application/json', 'utf-8');
-		$this->_render_content($json ?? '{}','json', $download, $filenamePrefix);
+		$this->_render_content($json ?? '{}', 'json', $download, $filenamePrefix);
 	}
 	public function _render_content(string $content, string $filenameExt, bool $download = FALSE, string $filenamePrefix = 'tracker') : void {
 		if($download) {

application/core/MY_Output.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 MY_Output extends CI_Output {
 	protected $current_header = [

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

Upper-Lower-Casing +1 added lines, -1 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 User_Model extends CI_Model {
 	public $id;

Indentation +20 added lines, -20 removed lines

@@ -45,9 +45,9 @@ 
 		$this->load->database();
 
 		$query = $this->db->select('*')
-		                  ->from('auth_users')
-		                  ->where('username', $username)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('username', $username)
+						  ->get();
 
 		return (bool) $query->num_rows();
 	}
@@ -69,9 +69,9 @@ 
 			$this->load->database();
 
 			$query = $this->db->select('email')
-			                  ->from('auth_users')
-			                  ->where('username', $identity)
-			                  ->get();
+							  ->from('auth_users')
+							  ->where('username', $identity)
+							  ->get();
 
 			if($query->num_rows() > 0) {
 				//username exists, grab email
@@ -89,9 +89,9 @@ 
 		$user = NULL;
 
 		$query = $this->db->select('*')
-		                  ->from('auth_users')
-		                  ->where('username', $username)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('username', $username)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$user = $query->row();
@@ -120,12 +120,12 @@ 
 		$api_key = NULL;
 		if($this->logged_in()) {
 			$this->db->select('api_key')
-			         ->where('id', $this->User->id)
-			         ->get('auth_users');
+					 ->where('id', $this->User->id)
+					 ->get('auth_users');
 
 			$query = $this->db->select('api_key')
-			                  ->where('id', $this->User->id)
-			                  ->get('auth_users');
+							  ->where('id', $this->User->id)
+							  ->get('auth_users');
 
 			if($query->num_rows() > 0) {
 				$api_key = $query->row('api_key');
@@ -137,9 +137,9 @@ 
 	
 	public function get_id_from_api_key(string $api_key) {
 		$query = $this->db->select('id')
-		                  ->from('auth_users')
-		                  ->where('api_key', $api_key)
-		                  ->get();
+						  ->from('auth_users')
+						  ->where('api_key', $api_key)
+						  ->get();
 
 		if($query->num_rows() > 0) {
 			$userID = $query->row('id');
@@ -201,12 +201,12 @@ 
 	}
 	public function hideLatestNotice() {
 		$idQuery = $this->db->select('1')
-		                    ->where('user_id', $this->User->id)
-		                    ->get('tracker_user_notices');
+							->where('user_id', $this->User->id)
+							->get('tracker_user_notices');
 		if($idQuery->num_rows() > 0) {
 			$success = (bool) $this->db->set('hidden_notice_id', '(SELECT id FROM tracker_notices ORDER BY id DESC LIMIT 1)', FALSE)
-			                           ->where('user_id', $this->User->id)
-			                           ->update('tracker_user_notices');
+									   ->where('user_id', $this->User->id)
+									   ->update('tracker_user_notices');
 		} else {
 			$success = (bool) $this->db->insert('tracker_user_notices', [
 				'user_id'           => $this->User->id,

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 			if($query->num_rows() > 0) {
 				//username exists, grab email
 				$email = $query->row('email');
-			}else{
+			} else {
 				//username doesn't exist, return FALSE
 				$email = FALSE;
 			}
@@ -108,7 +108,7 @@ 
 	public function get_new_api_key() : string {
 		$api_key = NULL;
 		if($this->logged_in()) {
-			$api_key = substr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", mt_rand(0, 51), 1) . substr(md5((string) time()), 1);
+			$api_key = substr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", mt_rand(0, 51), 1).substr(md5((string) time()), 1);
 
 			$this->db->where('id', $this->id);
 			$this->db->update('auth_users', ['api_key' => $api_key]);

application/config/email.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');
 
 /*
 | -------------------------------------------------------------------

Spacing +2 added lines, -2 removed lines

@@ -40,6 +40,6 @@
 
 $config['dsn'] = TRUE;
 
-if(file_exists(APPPATH . 'config/_secure/email.php')) {
-	include APPPATH . 'config/_secure/email.php'; //CI BUG: For some odd reason, this isn't picked up by MY_Config. Possibly due to MY_Config not being loaded yet?
+if(file_exists(APPPATH.'config/_secure/email.php')) {
+	include APPPATH.'config/_secure/email.php'; //CI BUG: For some odd reason, this isn't picked up by MY_Config. Possibly due to MY_Config not being loaded yet?
 }

application/config/migration.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');
 
 /*
 |--------------------------------------------------------------------------

application/config/testing/migration.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');
 
 /*
 |--------------------------------------------------------------------------