forked from MarseyWorld/MarseyWorld
bbb
parent
7a9a78c027
commit
f20c8ae2a4
|
@ -113,7 +113,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False):
|
||||||
else:
|
else:
|
||||||
sanitized = re.sub('(^|\s|\n|<p>)\/?((r|u)\/\w{3,25})', r'\1<a href="https://old.reddit.com/\2" rel="nofollow noopener noreferrer">\2</a>', sanitized)
|
sanitized = re.sub('(^|\s|\n|<p>)\/?((r|u)\/\w{3,25})', r'\1<a href="https://old.reddit.com/\2" rel="nofollow noopener noreferrer">\2</a>', sanitized)
|
||||||
|
|
||||||
for i in re.finditer('(^|\s|\n|<p>)@((\w|-){1,25})($|\s|\n|<\p>)', sanitized):
|
for i in re.finditer('(^|\s|\n|<p>)@((\w|-){1,25})($|\s|\n|<\\p>)', sanitized):
|
||||||
u = get_user(i.group(2), graceful=True)
|
u = get_user(i.group(2), graceful=True)
|
||||||
|
|
||||||
if u and (not g.v.any_block_exists(u) or g.v.admin_level > 1):
|
if u and (not g.v.any_block_exists(u) or g.v.admin_level > 1):
|
||||||
|
|
|
@ -14,7 +14,7 @@ def login_get(v):
|
||||||
|
|
||||||
redir = request.values.get("redirect")
|
redir = request.values.get("redirect")
|
||||||
if redir:
|
if redir:
|
||||||
redir = replace("/logged_out", "").strip()
|
redir = redir.replace("/logged_out", "").strip()
|
||||||
if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = None
|
if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = None
|
||||||
|
|
||||||
if v and redir: return redirect(redir)
|
if v and redir: return redirect(redir)
|
||||||
|
@ -142,7 +142,7 @@ def login_post():
|
||||||
|
|
||||||
redir = request.values.get("redirect")
|
redir = request.values.get("redirect")
|
||||||
if redir:
|
if redir:
|
||||||
redir = replace("/logged_out", "").strip()
|
redir = redir.replace("/logged_out", "").strip()
|
||||||
if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = '/'
|
if not redir.startswith(request.host_url) and not redir.startswith('/'): redir = '/'
|
||||||
|
|
||||||
return redirect(redir)
|
return redirect(redir)
|
||||||
|
|
Loading…
Reference in New Issue