cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AO issue part 2: unescaped evidence

Browse Source
This commit is contained in:
Mauricio 2021-03-12 18:45:56 -04:00
parent a2a661b681
commit 81e707989d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mainmenu.py
View File

@ -7,6 +7,11 @@ AOpath = "base/"
AO2XPpath = "AO2XPbase/" AO2XPpath = "AO2XPbase/"
#AOpath = "I:/aovanilla1.7.5/client/base/" #AOpath = "I:/aovanilla1.7.5/client/base/"
def decode_ao_str(text):
return text.replace("<percent>", "%").replace("<pound>", "#").replace("<num>", "#").replace("<and>", "&").replace("<dollar>", "$")
def encode_ao_str(text):
return text.replace("%", "<percent>").replace("#", "<pound>").replace("&", "<and>").replace("$", "<dollar>")
class PicButton(QtGui.QAbstractButton): class PicButton(QtGui.QAbstractButton):
def __init__(self, pixmap, parent=None): def __init__(self, pixmap, parent=None):
super(PicButton, self).__init__(parent) super(PicButton, self).__init__(parent)
@ -438,6 +443,7 @@ class AOServerInfo(QtCore.QThread):
joinooc = [] joinooc = []
areas = [[], [], [], []] areas = [[], [], [], []]
features = [] features = []
evidence = []
pingtimer = 150 pingtimer = 150
readytick = -1 readytick = -1
@ -566,19 +572,16 @@ class AOServerInfo(QtCore.QThread):
del network[0] del network[0]
del network[len(network)-1] del network[len(network)-1]
if len(network) > 0: if len(network) > 0:
if "<and>" in network[0]: #The Next Chapter actually does this sorcery... evidence = [evi.split("&") for evi in network]
evidence = [evi.split("<and>") for evi in network]
else:
evidence = [evi.split("&") for evi in network]
else: else:
evidence = [] evidence = []
for evi in evidence: for evi in evidence:
while len(evi) < 3: # new AO 2.9 bug where they never correctly escaped evidence name/desc/image on FantaProtocol... while len(evi) < 3: # new AO 2.9 bug where they never correctly escaped evidence name/desc/image on FantaProtocol
evi += [""] evi += [""]
evi[0] = evi[0].decode("utf-8") evi[0] = decode_ao_str(evi[0].decode("utf-8"))
evi[1] = evi[1].decode("utf-8") evi[1] = decode_ao_str(evi[1].decode("utf-8"))
evi[2] = evi[2].decode("utf-8") evi[2] = decode_ao_str(evi[2].decode("utf-8"))
print '[client]', 'received evidence' print '[client]', 'received evidence'
elif header == 'HP': elif header == 'HP':