Update

tr

Author: Jakiboy

src/BackendController.php

@@ -31,10 +31,8 @@ public function __construct(array $content = [])
 		// Set view global content
 		$id = (int)$this->getSession('userId');
 		$content = $this->mergeArray([
-			[
-				'user'      => (new User)->get($id),
-				'execution' => Debugger::getExecutionTime()
-			]
+			'user'      => (new User)->get($id),
+			'execution' => Debugger::getExecutionTime()
 		], $content);
 		$this->setContent($content);
 

src/Base.php

@@ -21,11 +21,11 @@ class Base
 {
 	use TraitConfiguration,
 		TraitException,
-		\FloatPHP\Helpers\Framework\inc\TraitHookable,
-		\FloatPHP\Helpers\Framework\inc\TraitPermissionable,
-		\FloatPHP\Helpers\Framework\inc\TraitRequestable,
-		\FloatPHP\Helpers\Framework\inc\TraitThrowable,
-		\FloatPHP\Helpers\Framework\inc\TraitAuthenticatable;
+		\FloatPHP\Helpers\Framework\tr\TraitHookable,
+		\FloatPHP\Helpers\Framework\tr\TraitPermissionable,
+		\FloatPHP\Helpers\Framework\tr\TraitRequestable,
+		\FloatPHP\Helpers\Framework\tr\TraitThrowable,
+		\FloatPHP\Helpers\Framework\tr\TraitAuthenticatable;
 
 	/**
 	 * Get token (CSRF).

src/BaseController.php

@@ -39,38 +39,31 @@ public function redirectIndex() : void
 	public function hasAccess() : bool
 	{
 		$ip = $this->getServerIp();
-		$access = false;
 
 		// Allow local access
-		if ( $this->hasString(['127.0.0.1', '::1'], $ip) ) {
-			$access = true;
+		if ( $this->isDebug() && $this->hasString(['127.0.0.1', '::1'], $ip) ) {
+			return true;
+		}
+
+		// Check allowed IPs
+		$access = false;
+		$allowed = $this->getAllowedAccess();
+		$allowed = $this->applyFilter('access-allowed-ip', $allowed);
+
+		if ( !empty($allowed) ) {
+			$access = $this->hasString($allowed, $ip);
 
 		} else {
 
-			// Check allowed IPs
-			$allowed = $this->applyFilter('access-allowed-ip', $this->getAllowedAccess());
-			if ( !empty($allowed) ) {
-				if ( $this->hasString($allowed, $ip) ) {
-					$access = true;
-
-				} else {
-					$access = false;
-				}
-
-			} else {
-				// Deny access
-				$denied = $this->applyFilter('access-denied-ip', $this->getDeniedAccess());
-				if ( $this->hasString($denied, $ip) ) {
-					$access = false;
-
-				} else {
-					$access = true;
-				}
-			}
+			// Deny access
+			$denied = $this->getDeniedAccess();
+			$denied = $this->applyFilter('access-denied-ip', $denied);
+			$access = !$this->hasString($denied, $ip);
 		}
 
 		$data = ['ip' => $ip, 'access' => $access];
 		$this->doAction('ip-access', $data);
+
 		return $access;
 	}
 

src/Core.php

@@ -21,8 +21,8 @@
 final class Core
 {
 	use TraitException,
-		\FloatPHP\Helpers\Framework\inc\TraitDatable,
-		\FloatPHP\Helpers\Framework\inc\TraitSessionable;
+		\FloatPHP\Helpers\Framework\tr\TraitDatable,
+		\FloatPHP\Helpers\Framework\tr\TraitSessionable;
 
 	/**
 	 * Init Core.

src/Orm.php

@@ -23,7 +23,7 @@
 class Orm implements OrmInterface
 {
 	use TraitConfiguration,
-		\FloatPHP\Helpers\Framework\inc\TraitConnectable;
+		\FloatPHP\Helpers\Framework\tr\TraitConnectable;
 
 	/**
 	 * @access private

src/TraitConfiguration.php

@@ -20,8 +20,8 @@
 
 trait TraitConfiguration
 {
-	use \FloatPHP\Helpers\Framework\inc\TraitIO,
-		\FloatPHP\Helpers\Framework\inc\TraitFormattable;
+	use \FloatPHP\Helpers\Framework\tr\TraitIO,
+		\FloatPHP\Helpers\Framework\tr\TraitFormattable;
 
 	/**
 	 * @access private

src/TraitException.php

@@ -17,8 +17,8 @@
 
 trait TraitException
 {
-	use \FloatPHP\Helpers\Framework\inc\TraitFormattable,
-		\FloatPHP\Helpers\Framework\inc\TraitRequestable;
+	use \FloatPHP\Helpers\Framework\tr\TraitFormattable,
+		\FloatPHP\Helpers\Framework\tr\TraitRequestable;
 
 	/**
 	 * Throw error controller.

src/View.php

@@ -34,7 +34,7 @@
  */
 class View extends Base implements ViewInterface
 {
-    use \FloatPHP\Helpers\Framework\inc\TraitViewable;
+    use \FloatPHP\Helpers\Framework\tr\TraitViewable;
 
     /**
      * @access private