mirror of
https://github.com/GAM-team/GAM.git
synced 2025-07-10 14:43:34 +00:00
Cleanup signature/vacation processing
This commit is contained in:
37
src/gam.py
37
src/gam.py
@ -5018,6 +5018,15 @@ def _processTags(tagReplacements, message):
|
|||||||
message = re.sub(match.group(0), tagReplacements.get(match.group(1), u''), message)
|
message = re.sub(match.group(0), tagReplacements.get(match.group(1), u''), message)
|
||||||
return message
|
return message
|
||||||
|
|
||||||
|
def _processSignature(tagReplacements, signature, html):
|
||||||
|
if signature:
|
||||||
|
signature = signature.replace(u'\r', u'').replace(u'\\n', u'<br/>')
|
||||||
|
if tagReplacements:
|
||||||
|
signature = _processTags(tagReplacements, signature)
|
||||||
|
if not html:
|
||||||
|
signature = signature.replace(u'\n', u'<br/>')
|
||||||
|
return signature
|
||||||
|
|
||||||
def getSendAsAttributes(i, myarg, body, tagReplacements, command):
|
def getSendAsAttributes(i, myarg, body, tagReplacements, command):
|
||||||
if myarg == u'replace':
|
if myarg == u'replace':
|
||||||
matchTag = getString(i+1, u'Tag')
|
matchTag = getString(i+1, u'Tag')
|
||||||
@ -5067,24 +5076,17 @@ def addUpdateSendAs(users, i, addCmd):
|
|||||||
if myarg in [u'signature', u'sig']:
|
if myarg in [u'signature', u'sig']:
|
||||||
signature = sys.argv[i+1]
|
signature = sys.argv[i+1]
|
||||||
i += 2
|
i += 2
|
||||||
if signature == u'file':
|
if signature.lower() == u'file':
|
||||||
filename = sys.argv[i]
|
filename = sys.argv[i]
|
||||||
i, encoding = getCharSet(i+1)
|
i, encoding = getCharSet(i+1)
|
||||||
signature = readFile(filename, encoding=encoding).replace(u'\\n', u'<br/>')
|
signature = readFile(filename, encoding=encoding)
|
||||||
else:
|
|
||||||
signature = signature.replace(u'\\n', u'<br/>')
|
|
||||||
elif myarg == u'html':
|
elif myarg == u'html':
|
||||||
html = True
|
html = True
|
||||||
i += 1
|
i += 1
|
||||||
else:
|
else:
|
||||||
i = getSendAsAttributes(i, myarg, body, tagReplacements, command)
|
i = getSendAsAttributes(i, myarg, body, tagReplacements, command)
|
||||||
if signature is not None:
|
if signature is not None:
|
||||||
if signature:
|
body[u'signature'] = _processSignature(tagReplacements, signature, html)
|
||||||
if tagReplacements:
|
|
||||||
signature = _processTags(tagReplacements, signature)
|
|
||||||
if not html:
|
|
||||||
signature = signature.replace(u'\n', u'<br/>')
|
|
||||||
body[u'signature'] = signature
|
|
||||||
kwargs = {u'body': body}
|
kwargs = {u'body': body}
|
||||||
if not addCmd:
|
if not addCmd:
|
||||||
kwargs[u'sendAsEmail'] = emailAddress
|
kwargs[u'sendAsEmail'] = emailAddress
|
||||||
@ -6108,9 +6110,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/>')
|
signature = readFile(filename, encoding=encoding)
|
||||||
else:
|
else:
|
||||||
signature = getString(i, u'String', emptyOK=True).replace(u'\\n', u'<br/>')
|
signature = getString(i, u'String', emptyOK=True)
|
||||||
i += 1
|
i += 1
|
||||||
body = {}
|
body = {}
|
||||||
html = False
|
html = False
|
||||||
@ -6121,12 +6123,7 @@ def doSignature(users):
|
|||||||
i += 1
|
i += 1
|
||||||
else:
|
else:
|
||||||
i = getSendAsAttributes(i, myarg, body, tagReplacements, u'signature')
|
i = getSendAsAttributes(i, myarg, body, tagReplacements, u'signature')
|
||||||
if signature:
|
body[u'signature'] = _processSignature(tagReplacements, signature, html)
|
||||||
if tagReplacements:
|
|
||||||
signature = _processTags(tagReplacements, signature)
|
|
||||||
if not html:
|
|
||||||
signature = signature.replace(u'\n', u'<br/>')
|
|
||||||
body[u'signature'] = signature
|
|
||||||
i = 0
|
i = 0
|
||||||
count = len(users)
|
count = len(users)
|
||||||
for user in users:
|
for user in users:
|
||||||
@ -6213,9 +6210,9 @@ 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/>')
|
message = message.replace(u'\r', u'').replace(u'\\n', u'<br/>')
|
||||||
else:
|
else:
|
||||||
message = message.replace(u'\\n', u'\n')
|
message = message.replace(u'\r', u'').replace(u'\\n', u'\n')
|
||||||
if tagReplacements:
|
if tagReplacements:
|
||||||
message = _processTags(tagReplacements, message)
|
message = _processTags(tagReplacements, message)
|
||||||
body[responseBodyType] = message
|
body[responseBodyType] = message
|
||||||
|
Reference in New Issue
Block a user