Skip to content
Snippets Groups Projects
Commit 859a7be9 authored by Jonas Leder's avatar Jonas Leder
Browse files

same as before

parent b247cb95
No related branches found
No related tags found
No related merge requests found
...@@ -136,10 +136,10 @@ def grecaptcha_verify(request): #This function is used to verify the google reca ...@@ -136,10 +136,10 @@ def grecaptcha_verify(request): #This function is used to verify the google reca
def home_get(): def home_get():
try: try:
userID = request.cookies.get('userID') userID = request.cookies.get('userID')
loginbar = "Hello " + request.cookies.get('username') + ' (<a href="/logout" style="color:white">logout</a>)' loginbar = "Hello " + request.cookies.get('username') + ' (<a href="/user/logout" style="color:white">logout</a>)'
except: except:
userID = "null" userID = "null"
loginbar = '<a href="/login" style="color:white">login</a>' loginbar = '<a href="/user/login" style="color:white">login</a>'
return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar) #return the default site to create a new shorten link return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar) #return the default site to create a new shorten link
...@@ -151,10 +151,10 @@ def home_post(): ...@@ -151,10 +151,10 @@ def home_post():
try: try:
userID = request.cookies.get('userID') userID = request.cookies.get('userID')
loginbar = "Hello " + request.cookies.get('username') + ' (<a href="/logout" style="color:white">logout</a>)' loginbar = "Hello " + request.cookies.get('username') + ' (<a href="/user/logout" style="color:white">logout</a>)'
except: except:
userID = "null" userID = "null"
loginbar = '<a href="/login" style="color:white">login</a>' loginbar = '<a href="/user/login" style="color:white">login</a>'
if (request.form.get('url').replace(" ", "") == ""): if (request.form.get('url').replace(" ", "") == ""):
return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, snackbar="Please enter a url to short, before submitting this form", long_url_prefilled=request.form.get('url'), short_url_prefilled=request.form.get('short').lower(), domain_prefilled=domain_to_index[request.form.get('domain')], recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar) #return the user the prefilled form with an error message, because no url to short was provided return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, snackbar="Please enter a url to short, before submitting this form", long_url_prefilled=request.form.get('url'), short_url_prefilled=request.form.get('short').lower(), domain_prefilled=domain_to_index[request.form.get('domain')], recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar) #return the user the prefilled form with an error message, because no url to short was provided
...@@ -232,7 +232,7 @@ def authorized(oauth_token): ...@@ -232,7 +232,7 @@ def authorized(oauth_token):
@app.route('/user/logout') @app.route('/user/logout')
def logout(): def logout():
resp = make_response("logout successfull") resp = make_response("logout successful")
resp.set_cookie('userID', "", max_age=0) resp.set_cookie('userID', "", max_age=0)
resp.set_cookie('username', "", max_age=0) resp.set_cookie('username', "", max_age=0)
return resp return resp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment