diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc
index 2d96528ec12db25488908fdca6083d8920271392..40a7c3e13bad835e9e00768eb51a9d0bf88046a2 100644 (file)
if((isset($_POST['delete_glpi_confirm']))&&(isset($attach[$this->delAttach]))){
if($this->parent->handle->is_attachmentUsed($this->delAttach)){
- print_red(_("Can't delete this attachment, it is still in use."));
+ $tmp = $this->parent->handle->is_attachmentUsed($this->delAttach);
+
+ $names = "";
+ foreach($tmp as $name){
+ $names .= ", ".$name;
+ }
+ $names = preg_replace("/^, /","",$names);
+ $names = trim($names);
+ if(count($tmp) == 3){
+ $names .= " ...";
+ }
+ print_red(sprintf(_("You can't delete this attachment, it is still in use by these system(s) '%s'"),$names));
+
}else{
$this->parent->handle->deleteAttachment($this->delAttach);
$attach = $this->parent->handle->getAttachments();
*/
if($this->edit == true){
foreach($this->attributes as $attr){
- $smarty->assign($attr,htmlentities($this->$attr));
+ $smarty->assign($attr,htmlentities(utf8_decode($this->$attr)));
}
if(!empty($this->filename)){
if(is_readable("/etc/gosa/glpi/".$this->filename)){
{
$message = array();
if($this->edit){
+
+ /* check if given name is already in use */
+ $att = $this->parent->handle->getAttachments();
+ $ok = true;
$this->name=trim($this->name);
+
+ foreach($att as $val){
+ if(!isset($this->entry['ID'])){
+ if($val['name'] == $this->name){
+ $ok = false;
+ }
+ }else{
+ if(($val['name'] == $this->name)&&($this->entry['ID'] != $val['ID'])){
+ $ok = false;
+ }
+ }
+ }
+ if(!$ok){
+ $message[] = _("This name is already in use.");
+ }
if(empty($this->name)){
$message[] = _("Please specify a valid name for this attachment.");
}