diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc
index 8a2da67d74eb07e6d80477e3824b467e81b66269..0d1ae07ff97a01880517908c81bf59d62d6ca887 100644 (file)
if((isset($_POST['delete_glpi_confirm']))&&(isset($attach[$this->delAttach]))){
if($this->parent->handle->is_attachmentUsed($this->delAttach)){
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);
}else{
$this->parent->handle->deleteAttachment($this->delAttach);
+ @unlink(CONFIG_DIR."/glpi/".$this->filename);
$attach = $this->parent->handle->getAttachments();
}
}
$attach = $this->parent->handle->getAttachments();
}
}
if($FILE['error']!=0) {
print_red(_("Upload wasn't successfull."));
}else{
if($FILE['error']!=0) {
print_red(_("Upload wasn't successfull."));
}else{
- if(!is_dir("/etc/gosa/glpi/")){
- print_red(_("Missing directory '/etc/gosa/glpi/' to store glpi uploads."));
+ if(!is_dir(CONFIG_DIR."/glpi/")){
+ print_red(sprintf(_("Missing directory '%s/glpi/' to store glpi uploads."),CONFIG_DIR));
}else{
}else{
- $filen = "/etc/gosa/glpi/".$FILE['name'];
- $fh = fopen($filen,"w");
- if(!$fh){
- print_red(sprintf(_("Can't create file '%s'."),$filen));
+ $filen = CONFIG_DIR."/glpi/".$FILE['name'];
+ if(file_exists($filen)){
+ print_red(_("There is already a file with the same name uploaded."));
}else{
}else{
- $str = file_get_contents($FILE['tmp_name']);
- fwrite($fh,$str,strlen($str));
- fclose($fh);
- $this->mime = $FILE['type'];
- $this->filename = $FILE['name'];
- }
+ $fh = fopen($filen,"w");
+ if(!$fh){
+ print_red(sprintf(_("Can't create file '%s'."),$filen));
+ }else{
+ $str = file_get_contents($FILE['tmp_name']);
+ fwrite($fh,$str,strlen($str));
+ fclose($fh);
+ $this->mime = $FILE['type'];
+ $this->filename = $FILE['name'];
+ }
+ } // File already exists
}
} // Check if any error occured
} // check if valid filename was uploaded
}
} // Check if any error occured
} // check if valid filename was uploaded
$smarty->assign($attr,htmlentities(utf8_decode($this->$attr)));
}
if(!empty($this->filename)){
$smarty->assign($attr,htmlentities(utf8_decode($this->$attr)));
}
if(!empty($this->filename)){
- if(is_readable("/etc/gosa/glpi/".$this->filename)){
+ if(is_readable(CONFIG_DIR."/glpi/".$this->filename)){
$status =_("File is available.");
}else{
$status =_("File is not readable, possibly the file is missing.");
$status =_("File is available.");
}else{
$status =_("File is not readable, possibly the file is missing.");
$listhead = "<div style='background:#F0F0F9;padding:5px;'>".
" <input class='center' type='image'
$listhead = "<div style='background:#F0F0F9;padding:5px;'>".
" <input class='center' type='image'
- src='images/new.png' align='middle' title='"._("Create new attachment")."'
+ src='images/fai_new_template.png' align='middle' title='"._("Create new attachment")."'
name='new_attach' alt='"._("New Attachment"). "'> ".
"</div>";
name='new_attach' alt='"._("New Attachment"). "'> ".
"</div>";
$smarty->assign("search_image", get_template_path('images/search.png'));
$smarty->assign("searchu_image", get_template_path('images/search_user.png'));
$smarty->assign("tree_image", get_template_path('images/tree.png'));
$smarty->assign("search_image", get_template_path('images/search.png'));
$smarty->assign("searchu_image", get_template_path('images/search_user.png'));
$smarty->assign("tree_image", get_template_path('images/tree.png'));
- $smarty->assign("infoimage", get_template_path('images/info.png'));
- $smarty->assign("launchimage", get_template_path('images/launch.png'));
+ $smarty->assign("infoimage", get_template_path('images/info_small.png'));
+ $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
$smarty->assign("apply", apply_filter());
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("attachment_regex", $_SESSION['GlpiAttachmentFilter']['filter']);
$smarty->assign("apply", apply_filter());
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("attachment_regex", $_SESSION['GlpiAttachmentFilter']['filter']);
/* Simple check */
function check()
{
/* Simple check */
function check()
{
- $message = array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+
if($this->edit){
if($this->edit){
+
+ /* check if given name is already in use */
+ $att = $this->parent->handle->getAttachments();
+ $ok = true;
$this->name=trim($this->name);
$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.");
}
if(empty($this->name)){
$message[] = _("Please specify a valid name for this attachment.");
}