Add nickname in vcard

[platal.git] / bin / lists.rpc.py

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index ade8a0e..30a9b25 100755 (executable)
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -52,6 +52,7 @@ class AuthFailed(Exception): pass
 #------------------------------------------------
 
 config = ConfigParser.ConfigParser()
+config.read(os.path.dirname(__file__)+'/../configs/platal.ini')
 config.read(os.path.dirname(__file__)+'/../configs/platal.conf')
 
 def get_config(sec, val, default=None):
@@ -64,7 +65,6 @@ def get_config(sec, val, default=None):
         else:
             return default
 
-BASEURL        = get_config('Core', 'baseurl')
 MYSQL_USER     = get_config('Core', 'dbuser')
 MYSQL_PASS     = get_config('Core', 'dbpwd')
 
@@ -171,8 +171,8 @@ def quote(s, is_header=False):
         h = Utils.oneline(s, 'iso-8859-1')
     else:
         h = s
-    h = str('').join(re.split('[\x00-\x1f]+', s))
-    return Utils.uquote(h.replace('&', '&amp;').replace('>', '&gt;').replace('<', '&lt;'))
+    h = str('').join(re.split('[\x00-\x09\x0B-\x1f]+', h))
+    return Utils.uquote(h.replace('&', '&amp;').replace('>', '&gt;').replace('<', '&lt;')) 
 
 def to_forlife(email):
     try: