X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-useradd;h=c183dca36247f2e474d94c3a39d6393ab14e2065;hb=refs%2Ftags%2Fuserdir-ldap-0.3.73;hp=62e4f4d61ef1c5622c2697cdb6aef50d08331732;hpb=ecc535d579851f8463aa231bb428d1041c9cf730;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-useradd b/ud-useradd
index 62e4f4d..c183dca 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -20,9 +20,7 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import re, time, ldap, getopt, sys, os, pwd;
-import email
-import email.base64mime
-import email.quoprimime
+import email.Header
 
 from userdir_ldap import *;
 from userdir_gpg import *;
@@ -157,7 +155,9 @@ Res = raw_input("First name [" + cn + "]? ");
 if Res != "":
    cn = Res;
 Res = raw_input("Middle name [" + mn + "]? ");
-if Res != "":
+if Res == " ":
+   mn = ""
+elif Res != "":
    mn = Res;
 Res = raw_input("Last name [" + sn + "]? ");
 if Res != "":
@@ -237,25 +237,18 @@ if Res != "yes":
 # Initialize the substitution Map
 Subst = {}
 
-emailstring = FullName + " " + emailaddr
 encto = ''
 try:
-  encto = emailstring.encode('us-ascii')
-except UnicodeDecodeError:
-  if email.base64mime.base64_len(emailstring) < email.quoprimime.header_quopri_len(emailstring):
-    encto = email.base64mime.header_encode(emailstring, 'us-ascii')
-  else:
-    encto = email.quoprimime.header_encode(emailstring, 'us-ascii')
+  encto = FullName.decode('us-ascii')
+except UnicodeError:
+  encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
 
 subjstring = "New Debian Maintainer " + FullName
 encsubj = ''
 try:
-  encsubj = subjstring.encode('us-ascii')
-except UnicodeDecodeError:
-  if email.base64mime.base64_len(subjstring) < email.quoprimime.header_quopri_len(subjstring):
-    encsubj = email.base64mime.header_encode(subjstring, 'us-ascii')
-  else:
-    encsubj = email.quoprimime.header_encode(subjstring, 'us-ascii')
+  encsubj = subjstring.decode('us-ascii')
+except UnicodeError:
+  encsubj = str(email.Header.Header(subjstring, 'utf-8', 200))
 
 Subst["__HEADER_SUBJ__"] = encsubj
 Subst["__HEADER_EMAIL"] = encto
@@ -333,7 +326,7 @@ if Update == 1 and ForceMail == 0:
 
 # Send the Welcome message
 print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % gidNumber, "r").read())
+Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % int(gidNumber), "r").read())
 Child = os.popen("/usr/sbin/sendmail -t","w");
 #Child = os.popen("cat","w");
 Child.write(Reply);