mirror of
https://github.com/GAM-team/GAM.git
synced 2026-07-03 12:21:35 +00:00
Update NL handling in doSignature and doVacation (#330)
This commit is contained in:
@@ -6102,9 +6102,9 @@ def doSignature(users):
|
|||||||
if sys.argv[i].lower() == u'file':
|
if sys.argv[i].lower() == u'file':
|
||||||
filename = sys.argv[i+1]
|
filename = sys.argv[i+1]
|
||||||
i, encoding = getCharSet(i+2)
|
i, encoding = getCharSet(i+2)
|
||||||
signature = readFile(filename, encoding=encoding).replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
|
signature = readFile(filename, encoding=encoding).replace(u'\\n', u'<br/>')
|
||||||
else:
|
else:
|
||||||
signature = getString(i, u'String', emptyOK=True).replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
|
signature = getString(i, u'String', emptyOK=True).replace(u'\\n', u'<br/>')
|
||||||
i += 1
|
i += 1
|
||||||
body = {}
|
body = {}
|
||||||
while i < len(sys.argv):
|
while i < len(sys.argv):
|
||||||
@@ -6200,7 +6200,7 @@ def doVacation(users):
|
|||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
if message:
|
if message:
|
||||||
if responseBodyType == u'responseBodyHtml':
|
if responseBodyType == u'responseBodyHtml':
|
||||||
message = message.replace(u'\\n', u'<br/>').replace(u'\n', u'<br/>')
|
message = message.replace(u'\\n', u'<br/>')
|
||||||
else:
|
else:
|
||||||
message = message.replace(u'\\n', u'\n')
|
message = message.replace(u'\\n', u'\n')
|
||||||
if tagReplacements:
|
if tagReplacements:
|
||||||
|
|||||||
Reference in New Issue
Block a user