- from-incoming.py uses Base{FtpTree,Pkg}; now I can implement sending errors

[projects/pld-ftp-admin.git] / modules / config.py

diff --git a/modules/config.py b/modules/config.py
index 7866145e00d5c289da6c4f39196e14826adbe60f..68eaaa10048f83a864d10515f5893e9e780a8506 100644 (file)
--- a/modules/config.py
+++ b/modules/config.py
@@ -2,10 +2,15 @@
 
 import string, os
 
-f=open(os.environ['HOME']+'/.ftpadmrc', 'r')
-
 value={}
 
+if os.environ.has_key('HOME'):
+    path=os.environ['HOME']
+else:
+    path='../../' # cgi-bin interface
+
+f=open(path+'/.ftpadmrc', 'r')
+
 for line in f.readlines():
     if line[0] == '#' or string.find(line, '=') == -1:
         continue
@@ -14,8 +19,11 @@ for line in f.readlines():
         value[string.strip(tuple[0])]=tuple[1][1:-1]
     else:
         value[string.strip(tuple[0])]=string.strip(tuple[1])
-    
 
 f.close()
 
+ftp_dir=value['ftp_dir']+'/'
+incoming_dir=value['ftp_dir']+'/'+value['incoming_dir']+'/'
+default_to=value['ftp_dir']+'/'+value['default_to']+'/'
+ftp_archs=value['ftp_archs'].split(' ')