X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_tabs.inc;h=e0e8dbe422b0bf555c7fe25940a04bdf3b5aa0bf;hb=365b69553ef4d084fd7bc6bd4fd8aada5918c0ec;hp=cda88a02cff2fcb2f5cfbd0826ec8ebd27cc6876;hpb=ad960225d3962b0a94f6504af46e2b97fd4d5479;p=gosa.git

diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index cda88a02c..e0e8dbe42 100644
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -175,6 +175,15 @@ class tabs
 
   function delete()
   {
+	/* Check if all plugins will ACK for deletion */
+	foreach (array_reverse($this->by_object) as $key => $obj){
+		$reason= $obj->allow_remove();
+		if ($reason != ""){
+			print_red(sprintf(_("Delete process has been canceled by plugin '%s': %s"), $key, $reason));
+			return;
+		}
+	}
+
 	/* Delete for all plugins */
 	foreach (array_reverse($this->by_object) as $key => $obj){
 		$obj->remove_from_parent();
@@ -272,7 +281,7 @@ class tabs
 				  $this->SubDialog = true;
 	              return($tmp['string']);
 	     	  }else{
-                 $ret .= "<br>".$tmp['string'];
+                 $ret .= $tmp['string'];
 			  }
 		  }
 	  }