From af318ad7150a54780f3912d7fbf805c7382b2785 Mon Sep 17 00:00:00 2001 From: dj3c1t Date: Fri, 9 May 2014 17:28:10 +0200 Subject: [PATCH] algo action_allowed --- mw/env/modules/mw_env_run.php | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/mw/env/modules/mw_env_run.php b/mw/env/modules/mw_env_run.php index f88acd3..10a4022 100644 --- a/mw/env/modules/mw_env_run.php +++ b/mw/env/modules/mw_env_run.php @@ -117,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; } -- 2.1.4