Replaced /etc/gosa with CONFIG_DIR

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5360 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/get_attachment.php b/html/get_attachment.php
index b95caec39a81764110311b0e45756aa93b3a1eb8..58bab226ba7b70656e4075a2cfe669b5eb7e9733 100644 (file)
--- a/html/get_attachment.php
+++ b/html/get_attachment.php
@@ -65,10 +65,10 @@ if(count($att)== 0){
   return;
 }
 
-if(!is_readable("/etc/gosa/glpi/".$att['filename'])){
-  print sprintf(_("Can't open file '%s'."),"/etc/gosa/glpi/".$att['filename']);
+if(!is_readable(CONFIG_DIR."/glpi/".$att['filename'])){
+  print sprintf(_("Can't open file '%s'."),CONFIG_DIR."/glpi/".$att['filename']);
 }
-$data = file_get_contents("/etc/gosa/glpi/".$att['filename']);
+$data = file_get_contents(CONFIG_DIR."/glpi/".$att['filename']);
 
 /* force download dialog */
 header("Content-type: ".$att['mime']."\n");

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 088c3c04b60457cd54cc240b3af84dd5f68d41b2..51df0c833059591b5a09707b3f16296f4c146749 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -262,7 +262,7 @@ class faiPackage extends plugin
 
     /* Configuration dialog open*/
     if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'])) && $this->acl_is_writeable("FAIdebconfInfo")){
-      $path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d";
+      $path = CONFIG_DIR."/fai/".$this->FAIdebianRelease."/debconf.d";
       $pkg_config = array();
       $pkg = $_POST['usedPackages'][0];
 
@@ -432,7 +432,7 @@ class faiPackage extends plugin
       $this->buffer=array();
       $a_ret = array();
       foreach($this->FAIdebianSection as $sec){
-        $strID= "/etc/gosa/fai/".$this->FAIdebianRelease."/".$sec;
+        $strID= CONFIG_DIR."/fai/".$this->FAIdebianRelease."/".$sec;
 
         if(!is_file($strID)){
           print_red(sprintf(_("Package file '%s' does not exist."),$strID));

diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc
index 8b0300d6f65669bbe48af73d96e160f2e94938d8..0d1ae07ff97a01880517908c81bf59d62d6ca887 100644 (file)
--- a/plugins/admin/systems/class_glpiAttachmentPool.inc
+++ b/plugins/admin/systems/class_glpiAttachmentPool.inc
@@ -113,7 +113,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 +130,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 +182,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.");

diff --git a/plugins/admin/systems/class_servNfs.inc b/plugins/admin/systems/class_servNfs.inc
index c0ec3b286b6acdb9c749954fc3fb0313b45cac79..c7b05c3621f7a1fe0e7aa8781fee7acf93982569 100644 (file)
--- a/plugins/admin/systems/class_servNfs.inc
+++ b/plugins/admin/systems/class_servNfs.inc
@@ -42,13 +42,13 @@ class servnfs extends plugin
 
     $this->charsets = array();
 
-    if(!file_exists("/etc/gosa/encodings")){
-      print_red(_("The file '/etc/gosa/encodings' does not exist, can't get supported charsets."));
+    if(!file_exists(CONFIG_DIR."/encodings")){
+      print_red(sprintf(_("The file '%s/encodings' does not exist, can't get supported charsets."),CONFIG_DIR));
     }else{
-      if(!is_readable("/etc/gosa/encodings")){
-        print_red(_("Can't read '/etc/gosa/encodings', please check permissions."));
+      if(!is_readable(CONFIG_DIR."/encodings")){
+        print_red(sprintf(_("Can't read '%s/encodings', please check permissions."),CONFIG_DIR));
       }else{
-        $fp = fopen("/etc/gosa/encodings","r");
+        $fp = fopen(CONFIG_DIR."/encodings","r");
         $i = 100;
         while(!feof($fp)&&$i){
           $i -- ;

diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index fa8450efb208058620d6855d8f59bad2d7a4f4c5..5a24d156a0a42366af1fc8367e8aab8e0ba5e6c1 100644 (file)
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -114,7 +114,7 @@ class termservice extends plugin
       $this->XKbModels[$type] = $type;
     }
 
-    /* Additional values will be extracted from /etc/gosa/keyboardLayouts */
+    /* Additional values will be extracted from CONFIG_DIR.keyboardLayouts */
     $this->XKbLayouts= array ("default"=>"["._("inherited")."]","de"=> "de","intl" =>"intl","us" =>"us");
     $this->XKbVariants= array ("default"=>"["._("inherited")."]", "nodeadkeys"=>"nodeadkeys", "basic"=>"basic");
 

diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index fbf151eb2b6301b112b358e1b1184801d82bf51f..a5fae17b8bbdd799c21d40206f7d5e59daa484f4 100644 (file)
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -112,7 +112,7 @@ class workservice extends plugin
                              "/dev/ttyS1"       => "/dev/ttyS1",          "/dev/psaux"  =>"/dev/psaux", 
                              "/dev/input/mice"  => "/dev/input/mice");
 
-    /* Additional values will be extracted from /etc/gosa/keyboardLayouts */
+    /* Additional values will be extracted from CONFIG_DIR./keyboardLayouts */
     $this->XKbLayouts= array ("de"=> "de","intl" =>"intl","us" =>"us");
     $this->XKbVariants= array ("nodeadkeys"=>"nodeadkeys", "basic"=>"basic");
 

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 7aa75d779cc164bfdebca27a42f440a9a98d9ba0..b512d2db46a1111efb2c088e4a780d4cb1dfc342 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -177,9 +177,9 @@ class posixAccount extends plugin
     /* Convert to seconds */
     $this->shadowExpire= $this->convertToSeconds($this->shadowExpire);
 
-    /* Generate shell list from /etc/gosa/shells */
-    if (file_exists('/etc/gosa/shells')){
-      $shells = file ('/etc/gosa/shells');
+    /* Generate shell list from CONFIG_DIR./shells */
+    if (file_exists(CONFIG_DIR.'/shells')){
+      $shells = file (CONFIG_DIR.'/shells');
       foreach ($shells as $line){
         if (!preg_match ("/^#/", $line)){
           $this->loginShellList[]= trim($line);