1
0
mirror of https://github.com/r4sas/py-i2phosts synced 2025-01-22 20:44:55 +00:00

web/jump/views.py: fix original GET params order

Before this requesting /jump/example.i2p/foo?a=b&c=d produced redirect
as http://example.i2p/?i2paddresshelper=key/foo?a=b&c=d

Now it http://example.i2p/foo?a=b&c=d&i2paddresshelper=key
This commit is contained in:
Hidden Z 2010-10-27 17:02:54 +00:00
parent 376c9bb80b
commit 349cb809a2

View File

@ -22,13 +22,23 @@ def jumper(request, host):
return render_to_response('jump-unknown.html', {
'title': settings.SITE_NAME,
})
url = 'http://' + hostname + '/?i2paddresshelper=' + key
# begin forming url
url = 'http://' + hostname
# get params from requst string, e.g. from 'example.i2p/smth/1?a=b&c=d' get 'smth/1?a=b&c=d'
pattern = host + r'/(.+)'
m = re.search(pattern, request.get_full_path())
if m:
params = m.group(1)
url += '/' + params
# determine how we should pass i2paddresshelper
# http://zzz.i2p/oldnews.html#jump
if params.find('?') == -1:
suffix = '?'
else:
suffix = '&'
url += suffix + 'i2paddresshelper=' + key
else:
url += '/?i2paddresshelper=' + key
return render_to_response('jump.html', {
'title': settings.SITE_NAME,
'url': url,