浏览代码

Merge pull request #438 from nabinhait/hotfix

Scrub (encode) url of print html
version-14
Nabin Hait 11 年前
父节点
当前提交
b1b6e62a25
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. +2
    -0
      core/doctype/communication/communication.py
  2. +1
    -1
      webnotes/utils/__init__.py

+ 2
- 0
core/doctype/communication/communication.py 查看文件

@@ -3,6 +3,7 @@

from __future__ import unicode_literals
import webnotes
from webnotes.utils import scrub_urls

class DocType():
def __init__(self, doc, doclist=[]):
@@ -108,6 +109,7 @@ def send_comm_email(d, name, sent_via=None, print_html=None, attachments='[]', s
mail.cc.append(webnotes.conn.get_value("Profile", webnotes.session.user, "email"))
if print_html:
print_html = scrub_urls(print_html)
mail.add_attachment(name.replace(' ','').replace('/','-') + '.html', print_html)

for a in loads(attachments):


+ 1
- 1
webnotes/utils/__init__.py 查看文件

@@ -933,7 +933,7 @@ def expand_relative_urls(html):
def quote_urls(html):
def _quote_url(match):
groups = list(match.groups())
groups[2] = urllib.quote(groups[2], safe="/:")
groups[2] = urllib.quote(groups[2], safe="~@#$&()*!+=:;,.?/'")
return "".join(groups)
return re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?:http)[^\'">]+)([\'"]?)',
_quote_url, html)

正在加载...
取消
保存