X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fldapmanager%2Faddons%2Fldapmanager%2Fmain.inc;h=48f8290f55319b7c2afbe22ec4d867fc0f184e2e;hb=467520bbf0bf655353d2f937661d2f2dd512f878;hp=0c7904b399ecdb1a50773fd3584e754577833bf9;hpb=7997a5c7fecafe190100e42f666cedc82184cfe4;p=gosa.git

diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
index 0c7904b39..48f8290f5 100644
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
@@ -19,17 +19,24 @@
 */
 
 
-/* Remove classes and variables from session
- */
+/* Remove locks created by this plugin
+*/
+if ($remove_lock){
+  if(session::is_set('ldif')){
+    // Nothing to unlock here
+  }
+}
+
+/* Remove this plugin from session
+*/
 if ( $cleanup ){
   session::un_set('ldif');
-}
+}else{
 
-if (!$remove_lock){
 	/* Create phonelist object on demand */
-	if (!session::is_set('ldif') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+	if (!session::is_set('ldif')){
 		$ldif= new ldif ($config);
-		$ldif->set_acl_category("logview");
+		$ldif->set_acl_category("ldapmanager");
 		session::set('ldif',$ldif);
 	}
 	$ldif = session::get('ldif');
@@ -38,9 +45,6 @@ if (!$remove_lock){
 	$display= $ldif->execute ();
 	$display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
-	/* Page header*/
-	$display= print_header(get_template_path('plugins/ldapmanager/images/ldif.png'), _("LDAP manager")).$display;
-
 	/* Store changes  in session */
 	session::set('ldif',$ldif);
 }