diff --git a/paramecio/citoplasma/templates/utils/admin.phtml b/paramecio/citoplasma/templates/utils/admin.phtml index 8d2b954..1ef7bf2 100644 --- a/paramecio/citoplasma/templates/utils/admin.phtml +++ b/paramecio/citoplasma/templates/utils/admin.phtml @@ -1,4 +1,4 @@ ${show_flash_message()|n}

${admin.title}

${lang('common', 'add_item', 'Add new item')} -${admin.list.show()|n} \ No newline at end of file +${admin.list.show()|n} diff --git a/paramecio/cromosoma/extrafields/passwordfield.py b/paramecio/cromosoma/extrafields/passwordfield.py index 0a2b01c..bfa10a5 100644 --- a/paramecio/cromosoma/extrafields/passwordfield.py +++ b/paramecio/cromosoma/extrafields/passwordfield.py @@ -1,6 +1,7 @@ from paramecio.cromosoma.corefields import PhangoField from paramecio.cromosoma.coreforms import PasswordForm -from passlib.hash import bcrypt +#from passlib.hash import bcrypt +from passlib.hash import bcrypt_sha256 class PasswordField(PhangoField): @@ -36,7 +37,7 @@ class PasswordField(PhangoField): self.error=True else: - value = bcrypt.encrypt(value) + value = bcrypt_sha256.encrypt(value) return value @@ -44,6 +45,6 @@ class PasswordField(PhangoField): @staticmethod def verify( password, h): - return bcrypt.verify(password, h) + return bcrypt_sha256.verify(password, h) diff --git a/paramecio/modules/admin/templates/admin/register.phtml b/paramecio/modules/admin/templates/admin/register.phtml index 3642dbe..05d7a63 100644 --- a/paramecio/modules/admin/templates/admin/register.phtml +++ b/paramecio/modules/admin/templates/admin/register.phtml @@ -9,7 +9,7 @@ url: "${make_url('admin/register')}", method: "POST", dataType: "json", - data: {'username': $('#username_form').val(), 'email': $('#email_form').val(), 'password': $('#password_form').val(), 'repeat_password': $('#repeat_password_form').val()} + data: {'username': $('#username_form').val(), 'email': $('#email_form').val(), 'password': $('#password_form').val(), 'repeat_password': $('#repeat_password_form').val(), 'csrf_token': $('#csrf_token').val()} }).done(function(data) { //$( this ).addClass( "done" ); //Redirect if register