variable js mw_path_url dans head.php

[mtweb] / mw / env / modules / mw_env_run.php

diff --git a/mw/env/modules/mw_env_run.php b/mw/env/modules/mw_env_run.php
index c0a97a2..10a4022 100644 (file)
--- a/mw/env/modules/mw_env_run.php
+++ b/mw/env/modules/mw_env_run.php
@@ -6,7 +6,7 @@
     var $controllers;
 
     function user(){
-      $data = $this->data();
+      if(!($data = $this->data())) return array();
       return $data->get_session_user();
     }
 
@@ -82,6 +82,7 @@
     }
 
     function action_allowed($etat, $CHECK_FORMAT = true){
+      if(!$this->bdd("sgbd")) return false;
       $data = $this->data();
       if($CHECK_FORMAT) $etat = $this->valid_etat($etat);
       if($etat === false){
@@ -116,21 +117,17 @@
                (isset($action_roles[$action][0]) && $action_roles[$action][0])
             || (isset($action_roles[$action][$id_role]) && $action_roles[$action][$id_role]);
         }
-        if(!$OK){
-          $action = $etat["mod"]."/".$etat["controller"];
-          if(isset($action_roles[$action])){
-            $OK =
-                 (isset($action_roles[$action][0]) && $action_roles[$action][0])
-              || (isset($action_roles[$action][$id_role]) && $action_roles[$action][$id_role]);
-          }
+        $action = $etat["mod"]."/".$etat["controller"];
+        if(isset($action_roles[$action])){
+          $OK =
+               (isset($action_roles[$action][0]) && $action_roles[$action][0])
+            || (isset($action_roles[$action][$id_role]) && $action_roles[$action][$id_role]);
         }
-        if(!$OK){
-          $action = $etat["mod"]."/".$etat["controller"]."/".$etat["action"];
-          if(isset($action_roles[$action])){
-            $OK =
-                 (isset($action_roles[$action][0]) && $action_roles[$action][0])
-              || (isset($action_roles[$action][$id_role]) && $action_roles[$action][$id_role]);
-          }
+        $action = $etat["mod"]."/".$etat["controller"]."/".$etat["action"];
+        if(isset($action_roles[$action])){
+          $OK =
+               (isset($action_roles[$action][0]) && $action_roles[$action][0])
+            || (isset($action_roles[$action][$id_role]) && $action_roles[$action][$id_role]);
         }
         if($OK) break;
       }