|
|
|
@ -767,12 +767,13 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def isServiceSetup(self, service):
|
|
|
|
|
def isServiceSetup(self, service, printError=True):
|
|
|
|
|
"""Проверяет установлен ли сервис"""
|
|
|
|
|
if self.clVars:
|
|
|
|
|
if self.clVars.Get("sr_%s_set"%service) == "on":
|
|
|
|
|
return True
|
|
|
|
|
self.printERROR(_("Service %s is not installed")%service + " ...")
|
|
|
|
|
if printError:
|
|
|
|
|
self.printERROR(_("Service %s is not installed")%service + " ...")
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
def copyDir(self, destDir, srcDir):
|
|
|
|
@ -3874,7 +3875,9 @@ class servJabber(shareLdap):
|
|
|
|
|
if options.has_key('c'):
|
|
|
|
|
fullNameUser = options['c']
|
|
|
|
|
else:
|
|
|
|
|
if self.isServiceSetup("unix"):
|
|
|
|
|
# Проверяем установку сервиса не печатая ошибку в случае
|
|
|
|
|
# если сервис не установлен
|
|
|
|
|
if self.isServiceSetup("unix",False):
|
|
|
|
|
# Cоздаем обеъкт сервиса Unix
|
|
|
|
|
servUnixObj = servUnix()
|
|
|
|
|
resUnix = servUnixObj.searchUnixUser(userName)
|
|
|
|
|