Removed passwordHook

[gosa.git] / gosa-core / plugins / admin / acl / main.inc

diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc
index 23461bb133ecd4c431503704e765cde434f9c864..0b9182f99770bcac5ae8689cfca20c1b409b43d2 100644 (file)
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -20,37 +20,37 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/* Remove locks created by this plugin
+*/
 if ($remove_lock){
-        if(session::is_set('macl')){
-                $macl = session::get('macl');
-                $macl->remove_lock();
-        }
-} else {
-       $display= "No headpage yet for this module";
+  if(session::is_set('aclManagement')){
+      $macl = session::get('aclManagement');
+      $macl->remove_lock();
+  }
+}
 
-       /* Create usermanagement object on demand */
-if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-               session::set('macl',new aclManagement($config, $ui));
-       }
-       $macl = session::get('macl');
-       
-       /* Show and save dialog */
-       $macl->save_object();
-       $output= $macl->execute();
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('aclManagement');
+}else{
 
-       /* Page header*/
-       if (get_object_info() != ""){
-               $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(get_object_info()));
-       } else {
-               $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"));
-       }
+  /* Create usermanagement object on demand */
+  if (!session::is_set('aclManagement')){
+    $aclManagement= new aclManagement ($config, $ui);
+    session::set('aclManagement',$aclManagement);
+  }
+  $aclManagement = session::get('aclManagement');
+  $display= $aclManagement->execute();
 
-       /* Reset requested? */
-       if (isset($_GET['reset']) && $_GET['reset'] == 1){
-               session::un_set ('macl');
-       }
+  /* Reset requested? */
+  if (isset($_GET['reset']) && $_GET['reset'] == 1){
+    session::un_set ('aclManagement');
+  }
 
-       $display.= $output;
-       session::set('macl',$macl);
+  /* Show and save dialog */
+  session::set('aclManagement',$aclManagement);
 }
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>