Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-1' of https://github.com/BlauFeuer/evennia into BlauFeuer-patch-1

Browse source
This commit is contained in:
Griatch 2016-11-05 22:14:57 +01:00
commit 3de2e649a1
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/server/portal/mxp.py
View file

@ -21,7 +21,7 @@ LINKS_SUB = re.compile(r'\|lc(.*?)\|lt(.*?)\|le', re.DOTALL)
MXP = "\x5B" MXP = "\x5B"
MXP_TEMPSECURE = "\x1B[4z" MXP_TEMPSECURE = "\x1B[4z"
MXP_SEND = MXP_TEMPSECURE + \ MXP_SEND = MXP_TEMPSECURE + \
"<SEND HREF='\\1'>" + \ "<SEND HREF=\"\\1\">" + \
"\\2" + \ "\\2" + \
MXP_TEMPSECURE + \ MXP_TEMPSECURE + \
"</SEND>" "</SEND>"
@ -38,6 +38,7 @@ def mxp_parse(text):
""" """
text = text.replace("&", "&amp;") \ text = text.replace("&", "&amp;") \
.replace('"', "&quot;") \
.replace("<", "&lt;") \ .replace("<", "&lt;") \
.replace(">", "&gt;") .replace(">", "&gt;")

4
evennia/utils/text2html.py
View file

@ -234,7 +234,7 @@ class TextToHTMLparser(object):
def convert_links(self, text): def convert_links(self, text):
""" """
Replaces links with HTML code. Replaces MXP links with HTML code.
Args: Args:
text (str): Text to process. text (str): Text to process.
@ -243,7 +243,7 @@ class TextToHTMLparser(object):
text (str): Processed text. text (str): Processed text.
""" """
return self.re_mxplink.sub(r"""<a id='mxplink' href='#' onclick='Evennia.msg("text",["\1"],{}); return false;'>\2</a>""", text) return self.re_mxplink.sub(r'''<a id="mxplink" href="#" onclick="Evennia.msg(&quot;text&quot;,[&quot;\1&quot;],{}); return false;">\2</a>''', text)
def do_sub(self, match): def do_sub(self, match):
""" """