Res = raw_input("Group ID Number (default group is %s, new usergroup %s) [%s]" % (DefaultGID, generatedGID, gidNumber));
if Res != "":
if Res.isdigit():
- gidNumber = Res;
+ gidNumber = int(Res);
else:
gidNumber = Group2GID(l, Res);
try:
encto = FullName.decode('us-ascii')
except UnicodeError:
- encto = email.Header.Header(FullName, 'utf-8', 200) + " " + emailaddr
+ encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
subjstring = "New Debian Maintainer " + FullName
encsubj = ''
try:
encsubj = subjstring.decode('us-ascii')
except UnicodeError:
- encsubj = email.Header.Header(subjstring, 'utf-8', 200)
+ encsubj = str(email.Header.Header(subjstring, 'utf-8', 200))
Subst["__HEADER_SUBJ__"] = encsubj
Subst["__HEADER_EMAIL"] = encto
Details.append(("mn",mn));
if privsub != " ":
Details.append(("privateSub",privsub))
+ l.add_s(Dn,Details);
#Add user group if needed, then the actual user:
if UserGroup == 1:
Dn = "gid=" + account + "," + BaseDn;
l.add_s(Dn,[("gid",account), ("gidNumber",str(gidNumber)), ("objectClass", GroupObjectClasses)])
-
- l.add_s(Dn,Details);
else:
# Modification
Rec = [(ldap.MOD_REPLACE,"uidNumber",str(uidNumber)),
# Send the Welcome message
print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % int(gidNumber), "r").read())
+templatepath = TemplatesDir + "/welcome-message-%d" % int(gidNumber)
+if not os.path.exists(templatepath):
+ templatepath = TemplatesDir + "/welcome-message"
+Reply = TemplateSubst(Subst,open(templatepath, "r").read())
Child = os.popen("/usr/sbin/sendmail -t","w");
#Child = os.popen("cat","w");
Child.write(Reply);