From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 10 Jul 2006 10:53:42 +0000 (+0000)
Subject: Updated acl handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a4fc9ca2d8ce95761f34400e79a7b44b09a23fb6;p=gosa.git

Updated acl handling


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4070 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/plugins/admin/acl/class_acl.inc b/plugins/admin/acl/class_acl.inc
index e730cd6fd..bbfdefc4b 100644
--- a/plugins/admin/acl/class_acl.inc
+++ b/plugins/admin/acl/class_acl.inc
@@ -745,6 +745,12 @@ class acl extends plugin
     show_ldap_error($ldap->get_error(), sprintf(_("Saving ACLs with dn '%s' failed."),$this->dn));
   }
 
+
+  function remove_from_parent()
+  {
+    echo "remove_from_parent() called";
+  }
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/plugins/admin/acl/main.inc b/plugins/admin/acl/main.inc
index bb40d6ce7..a1c2296f6 100644
--- a/plugins/admin/acl/main.inc
+++ b/plugins/admin/acl/main.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of GOsa (https://gosa.gonicus.de)
-  Copyright (C) 2005  Cajus Pollmeier
+  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
@@ -18,33 +18,41 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-if (!$remove_lock){
-	/* Create message object on demand */
-	if (!isset($_SESSION['aclplug']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-		$_SESSION['aclplug']= new acl ($config, 'ou=Direktorium,o=Landeshauptstadt München,c=de');
-	}
-	$aclplug= $_SESSION['aclplug'];
-
-	/* Set permissions */
-	$acl= get_permissions ($ui->dn, $ui->subtreeACL);
-	$aclplug->acl= get_module_permission($acl, "acl", $ui->dn);
-
-	/* save changes back to object */
-	if (isset ($_POST['target'])){
-	  $aclplug->save_object ();
-	}
-
-	/* Execute formular */
-	if ($aclplug->aclPostHandler()){
-		echo "Saved... But this is not the way it goes normally!";
-	}
-	$display= $aclplug->execute();
-	$display.= "<input type=\"hidden\" name=\"ignore\">\n";
-
-	/* Page header*/
-	$display= print_header(get_template_path('images/acl.png'), _("Access control")).$display;
-
-	/* Store changes  in session */
-	$_SESSION['aclplug']= $aclplug;
+if ($remove_lock){
+        if(isset($_SESSION['macl'])){
+                $macl= $_SESSION['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 (!isset($_SESSION['macl']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+#		$_SESSION['macl']= new aclManagement($config, $ui);
+#	}
+#	$macl= $_SESSION['macl'];
+#	
+#	/* Show and save dialog */
+#	$macl->save_object();
+#	$output= $macl->execute();
+#
+#	/* Page header*/
+#	if (isset($_SESSION['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['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');
+#	}
+#
+#	$display.= $output;
+#	$_SESSION['macl']= $macl;
 }
+
 ?>