|
|
|
@ -2841,7 +2841,7 @@ class servMail(shareLdap):
|
|
|
|
|
servReplObj = servRepl()
|
|
|
|
|
if not servReplObj.delReplMailAlias(userName):
|
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
|
_("Cannot delete email alias\
|
|
|
|
|
_("Cannot delete email alias \
|
|
|
|
|
for user %s in 'Replicatinon/Mail' branch ...") %str(userName) + " ...")
|
|
|
|
|
return False
|
|
|
|
|
# Удаляем пользователя из групп
|
|
|
|
@ -2959,6 +2959,17 @@ for user %s in 'Replicatinon/Mail' branch ...") %str(userName) + " ...")
|
|
|
|
|
delDN = self.addDN("cn="+groupName, self.relGroupsDN)
|
|
|
|
|
res = self.delDN(delDN)
|
|
|
|
|
if res:
|
|
|
|
|
# В случае почтовой репликации удаляем алиас в ветке
|
|
|
|
|
# Replication/Mail
|
|
|
|
|
# Проверяем на включение почтовой репликации
|
|
|
|
|
if self.clVars.Get("ld_repl_mail_set") == "on":
|
|
|
|
|
# Объект сервис репликации
|
|
|
|
|
servReplObj = servRepl()
|
|
|
|
|
if not servReplObj.delReplMailAlias(groupName):
|
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
|
_("Cannot delete email alias \
|
|
|
|
|
for group %s in 'Replicatinon/Mail' branch ...") %str(userName) + " ...")
|
|
|
|
|
return False
|
|
|
|
|
self.printSUCCESS( _("Mail group %s is deleted")%groupName + \
|
|
|
|
|
" ...")
|
|
|
|
|
return True
|
|
|
|
@ -3167,11 +3178,13 @@ in 'Replicatinon/Mail' branch ...") %groupName)
|
|
|
|
|
primaryMail = ""
|
|
|
|
|
altMails = []
|
|
|
|
|
if options.has_key('e'):
|
|
|
|
|
# Удаляем предыдущие адреса
|
|
|
|
|
self.delAlternateAddress(userName)
|
|
|
|
|
altMails = options['e'].split(",")
|
|
|
|
|
for altMail in altMails:
|
|
|
|
|
if "@" in altMail:
|
|
|
|
|
if len(altMail.split("@")) != 2:
|
|
|
|
|
self.printERROR(_("Incorrect alternate adresses \
|
|
|
|
|
option '-e'"))
|
|
|
|
|
return False
|
|
|
|
|
mail = altMail
|
|
|
|
|
else:
|
|
|
|
|
mail = "%s@%s" %(altMail,self.clVars.Get("sr_mail_host"))
|
|
|
|
@ -3184,6 +3197,8 @@ in 'Replicatinon/Mail' branch ...") %groupName)
|
|
|
|
|
" ...")
|
|
|
|
|
return False
|
|
|
|
|
modAttrs.append((ldap.MOD_ADD, 'mailAlternateAddress', mail))
|
|
|
|
|
# Удаляем предыдущие адреса
|
|
|
|
|
self.delAlternateAddress(userName)
|
|
|
|
|
# Изменяем основной почтовый адрес
|
|
|
|
|
if primaryMail:
|
|
|
|
|
if not self.servUnixObj.setUserMail(userName, primaryMail):
|
|
|
|
@ -3239,11 +3254,10 @@ for user %s in 'Replicatinon/Mail' branch ...") %userName)
|
|
|
|
|
altMails = options['e'].split(",")
|
|
|
|
|
for altMail in altMails:
|
|
|
|
|
if "@" in altMail:
|
|
|
|
|
if "@" in altMail:
|
|
|
|
|
if altMail.split("@") != 2:
|
|
|
|
|
self.printERROR(_("Incorrect alternate adresses \
|
|
|
|
|
if len(altMail.split("@")) != 2:
|
|
|
|
|
self.printERROR(_("Incorrect alternate adresses \
|
|
|
|
|
option '-e'"))
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
mail = altMail
|
|
|
|
|
else:
|
|
|
|
|
mail = "%s@%s" %(altMail,self.clVars.Get("sr_mail_host"))
|
|
|
|
@ -3503,7 +3517,7 @@ for user %s in 'Replicatinon/Mail' branch ...") %str(primaryMail))
|
|
|
|
|
altMails = options['e'].split(",")
|
|
|
|
|
for altMail in altMails:
|
|
|
|
|
if "@" in altMail:
|
|
|
|
|
if altMail.split("@") != 2:
|
|
|
|
|
if len(altMail.split("@")) != 2:
|
|
|
|
|
self.printERROR(_("Incorrect alternate adresses option \
|
|
|
|
|
'-e'"))
|
|
|
|
|
return False
|
|
|
|
|