xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

revert

Browse Source
This commit is contained in:
Philip Sargent 2022-04-27 23:43:15 +03:00
parent cafde67c02
commit 322d454d41
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/views/expo.py
View File

@ -130,18 +130,13 @@ def expowebpage(request, expowebpath, path):
html = o.read() html = o.read()
except: except:
try: try:
with open(os.path.normpath(expowebpath / path), "r", encoding='iso-8859-1') as o: with open(os.path.normpath(expowebpath / path), "rb") as o:
html = o.read() html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ")
html = str(o.read()).replace("<h1>","<h1>ISO-8859-1 characters here - ") html = html.replace("\\n","\n")
html = html.replace("\\t","\t")
html = html.replace("\\'","\'")
except: except:
try: return HttpResponse(default_head + '<h3>UTF-8 Parsing Failure:<br>Page could not be parsed using UTF-8:<br>failure detected in expowebpage in views.expo.py</h3> Please edit this <var>:expoweb:</var> page to replace dubious umlauts and &pound; symbols with correct HTML entities e.g. <em>&amp;pound;;</em>. </body' )
with open(os.path.normpath(expowebpath / path), "rb") as o:
html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ")
html = html.replace("\\n","\n")
html = html.replace("\\t","\t")
html = html.replace("\\'","\'")
except:
return HttpResponse(default_head + '<h3>UTF-8 Parsing Failure:<br>Page could not be parsed using UTF-8:<br>failure detected in expowebpage in views.expo.py</h3> Please edit this <var>:expoweb:</var> page to replace dubious umlauts and &pound; symbols with correct HTML entities e.g. <em>&amp;pound;;</em>. </body' )
m = re.search(r'(.*)<\s*head([^>]*)>(.*)<\s*/head\s*>(.*)<\s*body([^>]*)>(.*)<\s*/body\s*>(.*)', html, re.DOTALL + re.IGNORECASE) m = re.search(r'(.*)<\s*head([^>]*)>(.*)<\s*/head\s*>(.*)<\s*body([^>]*)>(.*)<\s*/body\s*>(.*)', html, re.DOTALL + re.IGNORECASE)
if m: if m: