X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_glpiAttachmentPool.inc;h=d36409ea5f25dabe808c4ebccb1fe006c4d1ff3c;hb=14a1125842be8515bd8b8f7117081e00f40470b5;hp=fb1d5618dd0569ba02dd31cf062c0ba3ea7fa34d;hpb=41d0abcb92bcc85642dfeb928b5db201c0b8bf09;p=gosa.git

diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc
index fb1d5618d..d36409ea5 100644
--- a/plugins/admin/systems/class_glpiAttachmentPool.inc
+++ b/plugins/admin/systems/class_glpiAttachmentPool.inc
@@ -2,11 +2,6 @@
 
 class glpiAttachmentPool extends plugin
 {
-  /* CLI vars */
-  var $cli_summary= "Manage server basic objects";
-  var $cli_description= "Some longer text\nfor help";
-  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
   /* attribute list for save action */
   var $ignore_account = TRUE;
   var $attributes     = array("name","comment","mime","filename","date_mod");
@@ -113,7 +108,7 @@ class glpiAttachmentPool extends plugin
 
       }else{
         $this->parent->handle->deleteAttachment($this->delAttach);
-        @unlink("/etc/gosa/glpi/".$this->filename);
+        @unlink(CONFIG_DIR."/glpi/".$this->filename);
         $attach     = $this->parent->handle->getAttachments();
       }
     }
@@ -130,10 +125,10 @@ class glpiAttachmentPool extends plugin
           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{
-              $filen = "/etc/gosa/glpi/".$FILE['name'];
+              $filen = CONFIG_DIR."/glpi/".$FILE['name'];
               if(file_exists($filen)){
                 print_red(_("There is already a file with the same name uploaded."));
               }else{
@@ -182,7 +177,7 @@ class glpiAttachmentPool extends plugin
         $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.");
@@ -326,7 +321,9 @@ class glpiAttachmentPool extends plugin
   /* Simple check */
   function check()
   {
-    $message = array();
+    /* Call common method to give check the hook */
+    $message= plugin::check();
+
     if($this->edit){
     
       /* check if given name is already in use */