DakuTree / manga-tracker

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

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();
 
 		$this->load->driver('cache', array('adapter' => 'file', 'backup' => 'apc')); //Sadly we can't autoload this with params
@@ -88,7 +88,9 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		if($this->ion_auth->logged_in()) redirect('/');
+		if($this->ion_auth->logged_in()) {
+			redirect('/');
+		}
 	}
 }
 

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 	protected $footer_data = array();
 	public    $global_data = array();
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 
 		$this->load->driver('cache', array('adapter' => 'file', 'backup' => 'apc')); //Sadly we can't autoload this with params
@@ -20,10 +20,10 @@ 
 		$this->global_data['analytics_tracking_id'] = $this->config->item('tracking_id');
 
 		$css_path = "css/main.{$this->User_Options->get('theme')}";
-		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH . "../public/assets/{$css_path}.css").".css";
+		$this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH."../public/assets/{$css_path}.css").".css";
 
 		$js_path = 'js/compiled.min';
-		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH . "../public/assets/{$js_path}.js").".js";
+		$this->global_data['complied_js_path']  = asset_url()."{$js_path}.".filemtime(APPPATH."../public/assets/{$js_path}.js").".js";
 	}
 
 	public function _render_page(/*(array) $paths*/) : void {
@@ -47,7 +47,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

Spacing +3 added lines, -3 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;
@@ -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;
 			}
@@ -103,7 +103,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]);

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 +16 added lines, -16 removed lines

@@ -40,9 +40,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();
 	}
@@ -64,9 +64,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
@@ -84,9 +84,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();
@@ -114,9 +114,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');
@@ -150,12 +150,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,

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

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

application/config/profiler.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/ion_auth.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');
 /**
 * Name:  Ion Auth
 *

Spacing +23 added lines, -23 removed lines

@@ -66,8 +66,8 @@ 
  | salt_prefix: Used for bcrypt. Versions of PHP before 5.3.7 only support "$2a$" as the salt prefix
  | Versions 5.3.7 or greater should use the default of "$2y$".
  */
-$config['hash_method']    = 'bcrypt';	// sha1 or bcrypt, bcrypt is STRONGLY recommended
-$config['default_rounds'] = 8;		// This does not apply if random_rounds is set to true
+$config['hash_method']    = 'bcrypt'; // sha1 or bcrypt, bcrypt is STRONGLY recommended
+$config['default_rounds'] = 8; // This does not apply if random_rounds is set to true
 $config['random_rounds']  = FALSE;
 $config['min_rounds']     = 5;
 $config['max_rounds']     = 9;
@@ -82,22 +82,22 @@ 
  | The controller should check this function and act
  | appropriately. If this variable set to 0, there is no maximum.
  */
-$config['site_title']                 = "Manga Tracker";        // Site Title, example.com
-$config['admin_email']                = "no-reply@trackr.moe";  // Admin Email, admin@example.com //FIXME: This is being used for a lot of things it shouldn't be. We need a diff config option.
-$config['default_group']              = 'members';              // Default group, use name
-$config['admin_group']                = 'admin';                // Default administrators group, use name
-$config['identity']                   = 'email';                // [NOTE: username can be used too] You can use any unique column in your table as identity column. The values in this column, alongside password, will be used for login purposes
-$config['min_password_length']        = 6;                      // Minimum Required Length of Password
-$config['max_password_length']        = 64;                     // Maximum Allowed Length of Password
-$config['email_activation']           = FALSE;                  // Email Activation for registration
-$config['manual_activation']          = FALSE;                  // Manual Activation for registration
-$config['remember_users']             = TRUE;                   // Allow users to be remembered and enable auto-login
-$config['user_expire']                = 86500;                  // How long to remember the user (seconds). Set to zero for no expiration
-$config['user_extend_on_login']       = TRUE;                   // Extend the users cookies every time they auto-login
-$config['track_login_attempts']       = FALSE;                  // Track the number of failed login attempts for each user or ip. //CHECK: Should this be true?
-$config['track_login_ip_address']     = TRUE;                   // Track login attempts by IP Address, if FALSE will track based on identity. (Default: TRUE)
-$config['maximum_login_attempts']     = 3;                      // The maximum number of failed login attempts.
-$config['lockout_time']               = 600;                    // The number of seconds to lockout an account due to exceeded attempts
+$config['site_title']                 = "Manga Tracker"; // Site Title, example.com
+$config['admin_email']                = "no-reply@trackr.moe"; // Admin Email, admin@example.com //FIXME: This is being used for a lot of things it shouldn't be. We need a diff config option.
+$config['default_group']              = 'members'; // Default group, use name
+$config['admin_group']                = 'admin'; // Default administrators group, use name
+$config['identity']                   = 'email'; // [NOTE: username can be used too] You can use any unique column in your table as identity column. The values in this column, alongside password, will be used for login purposes
+$config['min_password_length']        = 6; // Minimum Required Length of Password
+$config['max_password_length']        = 64; // Maximum Allowed Length of Password
+$config['email_activation']           = FALSE; // Email Activation for registration
+$config['manual_activation']          = FALSE; // Manual Activation for registration
+$config['remember_users']             = TRUE; // Allow users to be remembered and enable auto-login
+$config['user_expire']                = 86500; // How long to remember the user (seconds). Set to zero for no expiration
+$config['user_extend_on_login']       = TRUE; // Extend the users cookies every time they auto-login
+$config['track_login_attempts']       = FALSE; // Track the number of failed login attempts for each user or ip. //CHECK: Should this be true?
+$config['track_login_ip_address']     = TRUE; // Track login attempts by IP Address, if FALSE will track based on identity. (Default: TRUE)
+$config['maximum_login_attempts']     = 3; // The maximum number of failed login attempts.
+$config['lockout_time']               = 600; // The number of seconds to lockout an account due to exceeded attempts
 $config['forgot_password_expiration'] = 43200000; /*12HR*/      // The number of milliseconds after which a forgot password request will expire. If set to 0, forgot password requests will not expire.
 
 /*
@@ -175,11 +175,11 @@ 
  | Message Delimiters.
  | -------------------------------------------------------------------------
  */
-$config['delimiters_source']       = 'config'; 	// "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
-$config['message_start_delimiter'] = '<p>'; 	// Message start delimiter
-$config['message_end_delimiter']   = '</p>'; 	// Message end delimiter
-$config['error_start_delimiter']   = '<p>';		// Error message start delimiter
-$config['error_end_delimiter']     = '</p>';	// Error message end delimiter
+$config['delimiters_source']       = 'config'; // "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
+$config['message_start_delimiter'] = '<p>'; // Message start delimiter
+$config['message_end_delimiter']   = '</p>'; // Message end delimiter
+$config['error_start_delimiter']   = '<p>'; // Error message start delimiter
+$config['error_end_delimiter']     = '</p>'; // Error message end delimiter
 
 /* End of file ion_auth.php */
 /* Location: ./application/config/ion_auth.php */

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