Atk getEnvironment()

Sintattica · Aug 25, 2016 · c888709 · c888709
1 parent 388325b
commit c888709
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/src/Core/Atk.php b/src/Core/Atk.php
@@ -3,12 +3,12 @@
 namespace Sintattica\Atk\Core;
 
 use App\Modules\App\Module;
-use Sintattica\Atk\Security\SqlWhereclauseBlacklistChecker;
+use Dotenv\Dotenv;
+use Sintattica\Atk\Handlers\ActionHandler;
 use Sintattica\Atk\Security\SecurityManager;
+use Sintattica\Atk\Security\SqlWhereclauseBlacklistChecker;
 use Sintattica\Atk\Session\SessionManager;
 use Sintattica\Atk\Ui\IndexPage;
-use Sintattica\Atk\Handlers\ActionHandler;
-use Dotenv\Dotenv;
 
 class Atk
 {
@@ -21,6 +21,7 @@ class Atk
     public $g_moduleRepository = [];
     public $g_nodeHandlers = [];
     public $g_nodeListeners = [];
+    private $environment;
 
     /** @var $s_instance self */
     public static $s_instance = null;
@@ -36,8 +37,10 @@ public function __construct($environment, $basedir)
 
         self::$s_instance = $this;
 
+        $this->environment = $environment;
+
         //load .env variables only in development environment
-        if (file_exists($basedir.'.env') && (!$environment || in_array(strtolower($environment), ['dev', 'develop', 'development']))) {
+        if (file_exists($basedir.'.env') && in_array(strtolower($environment), ['dev', 'develop', 'development'])) {
             $dotEnv = new Dotenv($basedir);
             $dotEnv->load();
         }
@@ -69,7 +72,7 @@ public function __construct($environment, $basedir)
         $debug = 'Created a new Atk ('.self::VERSION.') instance.';
         $debug .= ' Environment: '.$environment.'.';
 
-        if(isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_ADDR'])) {
+        if (isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_ADDR'])) {
             $debug .= ' Server info: '.$_SERVER['SERVER_NAME'].' ('.$_SERVER['SERVER_ADDR'].')';
         }
 
@@ -104,14 +107,14 @@ public function run()
         $sessionManager = SessionManager::getInstance();
         $sessionManager->start();
 
-        if(Config::getGlobal('session_autorefresh') && array_key_exists(Config::getGlobal('session_autorefresh_key'), $_GET)){
+        if (Config::getGlobal('session_autorefresh') && array_key_exists(Config::getGlobal('session_autorefresh_key'), $_GET)) {
             die(session_id());
         }
 
         $securityManager = SecurityManager::getInstance();
         if ($securityManager->authenticate()) {
 
-            foreach($this->g_moduleRepository as $module) {
+            foreach ($this->g_moduleRepository as $module) {
                 $module->boot();
             }
 
@@ -266,13 +269,13 @@ public function atkGetNodeHandler($nodeUri, $action)
     {
         if (isset($this->g_nodeHandlers[$nodeUri][$action])) {
             $handler = $this->g_nodeHandlers[$nodeUri][$action];
-            if(!is_object($handler)){
+            if (!is_object($handler)) {
                 $handler = new $handler();
                 $this->g_nodeHandlers[$nodeUri][$action] = $handler;
             }
         } elseif (isset($this->g_nodeHandlers['*'][$action])) {
             $handler = $this->g_nodeHandlers['*'][$action];
-            if(!is_object($handler)){
+            if (!is_object($handler)) {
                 $handler = new $handler();
                 $this->g_nodeHandlers['*'][$action] = $handler;
             }
@@ -320,4 +323,9 @@ public function registerModule($moduleClass)
             $module->register();
         }
     }
+
+    public function getEnvironment()
+    {
+        return $this->environment;
+    }
 }