paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed regression in login admin

Browse source
This commit is contained in:
Antonio de la Rosa 2017-02-21 23:34:49 +01:00
parent 0e9fd35db6
commit 7a5704e63d
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
paramecio/cromosoma/formsutils.py
View file

@ -63,9 +63,7 @@ def show_form(post, arr_form, t, yes_error=True, pass_values=True, modelform_tpl
# Create csrf_token in session # Create csrf_token in session
s=get_session() generate_csrf()
s['csrf_token']=create_key_encrypt()
if pass_values==True: if pass_values==True:
pass_values_to_form(post, arr_form, yes_error) pass_values_to_form(post, arr_form, yes_error)

16
paramecio/modules/admin/index.py
View file

@ -142,7 +142,7 @@ def home(module='', submodule=''):
title_module=content_index[0] title_module=content_index[0]
content_index=content_index[1] content_index=content_index[1]
connection.close() connection.close()
return t.render_template('admin/content.html', title=title_module, content_index=content_index, menu=menu, lang_selected=lang_selected, arr_i18n=I18n.dict_i18n) return t.load_template('admin/content.html', title=title_module, content_index=content_index, menu=menu, lang_selected=lang_selected, arr_i18n=I18n.dict_i18n)
else: else:
connection.close() connection.close()
@ -152,7 +152,7 @@ def home(module='', submodule=''):
else: else:
connection.close() connection.close()
return t.render_template('admin/index.html', title=I18n.lang('admin', 'welcome_to_paramecio', 'Welcome to Paramecio Admin!!!'), menu=menu, lang_selected=lang_selected, arr_i18n=I18n.dict_i18n) return t.load_template('admin/index.html', title=I18n.lang('admin', 'welcome_to_paramecio', 'Welcome to Paramecio Admin!!!'), menu=menu, lang_selected=lang_selected, arr_i18n=I18n.dict_i18n)
connection.close() connection.close()
return "" return ""
@ -214,7 +214,7 @@ def home(module='', submodule=''):
connection.close() connection.close()
return t.render_template('admin/login.phtml', forms=forms, yes_recovery_login=yes_recovery_login) return t.load_template('admin/login.phtml', forms=forms, yes_recovery_login=yes_recovery_login)
else: else:
@ -226,7 +226,7 @@ def home(module='', submodule=''):
connection.close() connection.close()
return t.render_template('admin/register.phtml', forms=forms) return t.load_template('admin/register.phtml', forms=forms)
connection.close() connection.close()
@ -445,7 +445,7 @@ def recovery_password():
#connection.close() #connection.close()
connection.close() connection.close()
return t.render_template('admin/recovery.phtml', forms=forms) return t.load_template('admin/recovery.phtml', forms=forms)
@app.post('/'+config.admin_folder+'/recovery_password') @app.post('/'+config.admin_folder+'/recovery_password')
def send_password(): def send_password():
@ -494,7 +494,7 @@ def send_password():
send_mail=SendMail() send_mail=SendMail()
content_mail=t.render_template('admin/recovery_mail.phtml', token=token) content_mail=t.load_template('admin/recovery_mail.phtml', token=token)
if not send_mail.send(email_address, [email], I18n.lang('admin', 'send_email', 'Email for recovery your password'), content_mail): if not send_mail.send(email_address, [email], I18n.lang('admin', 'send_email', 'Email for recovery your password'), content_mail):
return {'email': 'Error: i cannot send mail', 'error': 1} return {'email': 'Error: i cannot send mail', 'error': 1}
@ -508,7 +508,7 @@ def send_password():
def check_token(): def check_token():
t=PTemplate(env) t=PTemplate(env)
return t.render_template('admin/check_token.phtml') return t.load_template('admin/check_token.phtml')
@app.post('/'+config.admin_folder+'/check_token') @app.post('/'+config.admin_folder+'/check_token')
def check_code_token(): def check_code_token():
@ -551,7 +551,7 @@ def check_code_token():
send_mail=SendMail() send_mail=SendMail()
content_mail=t.render_template('admin/recovery_password.phtml', password=new_password) content_mail=t.load_template('admin/recovery_password.phtml', password=new_password)
if not send_mail.send(email_address, [arr_user['email']], I18n.lang('admin', 'send_password_email', 'Your new password'), content_mail): if not send_mail.send(email_address, [arr_user['email']], I18n.lang('admin', 'send_password_email', 'Your new password'), content_mail):
return {'token': 'Error: i cannot send mail', 'error': 1} return {'token': 'Error: i cannot send mail', 'error': 1}

4
paramecio/modules/admin/templates/admin/login.phtml
View file

@ -17,9 +17,7 @@
$('#loading').show(); $('#loading').show();
//alert($("input[id=csrf_token]").val()); data_form={'username': $('#username_form').val(), 'password': $('#password_form').val(), 'csrf_token': $("#csrf_token").val()};
data_form={'username': $('#username_form').val(), 'password': $('#password_form').val(), 'csrf_token': $("input[id=csrf_token]").val()};
if($('#remember_login:checked').val()) if($('#remember_login:checked').val())
{ {