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 abdbb345159cdfe27db2da24f4abfabca36026ca..0b9182f99770bcac5ae8689cfca20c1b409b43d2 100644 (file)
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -1,57 +1,56 @@
 <?php
 /*
-  This code is part of GOsa (https://gosa.gonicus.de)
-  Copyright (C) 2006  Cajus Pollmeier
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * 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();
-                del_lock ($ui->dn);
-                sess_del ('macl');
-        }
-} else {
-       $display= "No headpage yet for this module";
-
-       /* 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();
-
-       /* Page header*/
-       if (session::is_set('objectinfo')){
-               $display= print_header(get_template_path('images/acl.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
-       } else {
-               $display= print_header(get_template_path('images/acl.png'), _("ACL management"));
-       }
-
-       /* Reset requested? */
-       if (isset($_GET['reset']) && $_GET['reset'] == 1){
-               del_lock ($ui->dn);
-               sess_del ('macl');
-       }
+  if(session::is_set('aclManagement')){
+      $macl = session::get('aclManagement');
+      $macl->remove_lock();
+  }
+}
 
-       $display.= $output;
-       session::set('macl',$macl);
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('aclManagement');
+}else{
+
+  /* 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 ('aclManagement');
+  }
+
+  /* Show and save dialog */
+  session::set('aclManagement',$aclManagement);
 }
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>