X-Git-Url: http://git.dj3c1t.com/index.cgi?a=blobdiff_plain;f=mw%2Fenv%2Fmodules%2Fmw_env_run.php;h=a2b9b78ea12c1d575eef1140c8f47321dd5c87cb;hb=HEAD;hp=f88acd35fe5883f577fa62c6cc73b0dbf492d41f;hpb=0ada6496e6c552c473a5816734b38896ccdd345b;p=mtweb

diff --git a/mw/env/modules/mw_env_run.php b/mw/env/modules/mw_env_run.php
index f88acd3..a2b9b78 100644
--- a/mw/env/modules/mw_env_run.php
+++ b/mw/env/modules/mw_env_run.php
@@ -2,15 +2,15 @@
 
   class mw_env_run extends mw_env{
 
-    var $etat;
-    var $controllers;
+    public $etat;
+    public $controllers;
 
-    function user(){
+    public function user(){
       if(!($data = $this->data())) return array();
       return $data->get_session_user();
     }
 
-    function set_etat($etat, $valid_role = true){
+    public function set_etat($etat, $valid_role = true){
       if(($this->etat = $this->valid_etat($etat)) !== false){
         if(!$valid_role || $this->action_allowed($this->etat, false)){
           return $this->etat;
@@ -25,7 +25,7 @@
       return false;
     }
 
-    function valid_etat($etat){
+    public function valid_etat($etat){
       $_etat = array(
         "mod" => "",
         "controller" => "",
@@ -77,11 +77,11 @@
       return false;
     }
 
-    function etat_is_valid(){
+    public function etat_is_valid(){
       return $this->valid_etat($this->etat);
     }
 
-    function action_allowed($etat, $CHECK_FORMAT = true){
+    public function action_allowed($etat, $CHECK_FORMAT = true){
       if(!$this->bdd("sgbd")) return false;
       $data = $this->data();
       if($CHECK_FORMAT) $etat = $this->valid_etat($etat);
@@ -117,28 +117,24 @@
                (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;
       }
       return $OK;
     }
 
-    function run($etat, $params = array(), $valid_role = true){
+    public function run($etat, $params = array(), $valid_role = true){
       if($this->set_etat($etat, $valid_role)){
         if($controller = $this->get_controller($this->etat("mod")."/".$this->etat("controller"))){
           $action_method = $this->etat("action");
@@ -175,7 +171,7 @@
       }
     }
 
-    function is_running($etat){
+    public function is_running($etat){
       $_etat = array();
       if(is_array($etat)){
         if(isset($etat["mod"])){
@@ -208,12 +204,12 @@
       return $IS_RUNNING;
     }
 
-    function etat($name = null){
+    public function etat($name = null){
       if(!isset($name)) return $this->etat;
       return $this->etat[$name];
     }
 
-    function get_controller($controller_path){
+    public function get_controller($controller_path){
       if($etat = $this->valid_etat($controller_path)){
         if(!isset($this->controllers)) $this->controllers = array();
         if(!isset($this->controllers[$etat["mod"]])) $this->controllers[$etat["mod"]] = array();
@@ -236,26 +232,28 @@
 
   }
 
-  class mw_controller{
+  // -------------------------------------------------------------------------------------------
+  //                                                                         class mw_controller
+  //
+
+  abstract class mw_controller{
 
-    var $env;
+    public $env;
 
-    function set_env(&$env){
+    public function set_env(&$env){
       $this->env = &$env;
     }
 
-    function env(){
+    public function env(){
       return $this->env;
     }
 
-    function validate(){
+    public function validate(){
       return true;
     }
 
-    function prepare_inputs(){
+    public function prepare_inputs(){
       return true;
     }
 
   }
-
-?>
\ No newline at end of file