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

Fixes in sql and ausers

Browse source
This commit is contained in:
absurdo 2023-07-19 00:31:01 +02:00
parent 06b42239d9
commit 3d2eb64808
6 changed files with 71 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
paramecio2/libraries/db/sqlalchemy.py
View file

@ -97,18 +97,22 @@ class SqlClass:
pymysql.install_as_MySQLdb
SqlClass.pymysql_install=True
self.conn=pymysql.connect(self.connection['host'],
user=self.connection['user'],
passwd=self.connection['password'],
db=self.connection['db'],
"""
connection = pymysql.connect(host='localhost',
user='user',
password='passwd',
database='db',
charset='utf8mb4',
cursorclass=pymysql.cursors.DictCursor)
"""
self.conn=pymysql.connect(host=self.connection['host'], user=self.connection['user'], passwd=self.connection['password'], db=self.connection['db'], charset='utf8mb4', cursorclass=pymysql.cursors.DictCursor)
else:
import MySQLdb.cursors
self.conn=MySQLdb.connect(self.connection['host'],
self.conn=MySQLdb.connect(host=self.connection['host'],
user=self.connection['user'],
passwd=self.connection['password'],
db=self.connection['db'],

14
paramecio2/modules/admin/admin/ausers.py
View file

@ -18,10 +18,18 @@ def ausers():
user_admin.fields['privileges'].name_form=SelectForm
user_admin.create_forms(['username', 'password', 'email', 'privileges', 'lang'])
user_admin.fields['disabled'].name_form=SelectForm
user_admin.fields['double_auth'].name_form=SelectForm
user_admin.create_forms(['username', 'password', 'email', 'privileges', 'lang', 'disabled', 'double_auth'])
user_admin.forms['privileges'].arr_select={0: I18n.lang('admin', 'without_privileges', 'Without privileges'), 1: I18n.lang('admin', 'selected_privileges', 'Selected privileges'), 2: I18n.lang('admin', 'administrator', 'Administrator')}
user_admin.forms['disabled'].arr_select={0: I18n.lang('admin', 'user_enabled', 'User enabled'), 1: I18n.lang('admin', 'user_disabled', 'User disabled')}
user_admin.forms['double_auth'].arr_select={0: I18n.lang('admin', 'no', 'No'), 1: I18n.lang('admin', 'yes', 'Yes')}
user_admin.fields['password'].protected=False
user_admin.check_user=False
@ -31,11 +39,11 @@ def ausers():
admin=GenerateAdminClass(user_admin, url, t)
admin.list.fields_showed=['username', 'privileges']
admin.list.fields_showed=['username']
admin.list.search_fields=['username']
admin.arr_fields_edit=['username', 'password', 'repeat_password', 'email', 'privileges', 'lang']
admin.arr_fields_edit=['username', 'password', 'repeat_password', 'email', 'lang', 'double_auth', 'disabled']
form_admin=admin.show()

10
paramecio2/modules/admin/app.py
View file

@ -96,7 +96,7 @@ for app_load in config_admin:
@admin_app.route('/admin/')
def admin():
return t.load_template('home.phtml', title=I18n.lang('admin', 'paramecio_admin', 'Paramecio admin'))
return t.load_template('home.phtml', title=I18n.lang('admin', 'admin', 'Admin'))
"""
@admin_app.route('/admin/')
@ -183,6 +183,8 @@ def login():
if user_admin.fields['password'].verify(password, arr_user['password']):
if not arr_user['disabled']:
session['login_admin']=True
resp = make_response({'error': 0})
@ -203,6 +205,12 @@ def login():
return resp
else:
resp = make_response({'error': 1, 'disable': 1})
return resp
else:

4
paramecio2/modules/admin/models/admin.py
View file

@ -82,12 +82,16 @@ class UserAdmin(UserModel):
self.register(corefields.CharField('token_login'))
self.register(corefields.CharField('token_auth'))
self.register(PrivilegesField('privileges'))
self.register(LangField('lang', 20))
self.register(corefields.BooleanField('disabled'))
self.register(corefields.BooleanField('double_auth'))
self.register(corefields.IntegerField('num_tries', 1))
"""

13
paramecio2/modules/admin/templates/dashboard.phtml
View file

@ -31,7 +31,18 @@ ${load_js()|n}
<div id="center_body">
<div id="header">
<a href="#nav" id="toggle"><i class="fa fa-bars" aria-hidden="true"></i><span>Menu</span></a>
<%block name="title_admin"><span id="title_phango">Paramecio</span> <span id="title_framework">Framework!</span></%block>
<%block name="title_admin">
<%
from settings import config
portal_admin_name_set=('Paramecio', 'Framework!')
#if hasattr(config, 'portal_admin_name_set'):
%>
<span id="title_phango">${portal_admin_name_set[0]}</span> <span id="title_framework">${portal_admin_name_set[1]}</span>
</%block>
</div>
<div class="content_admin">
<nav id="menu" class="nav-collapse">

8
paramecio2/modules/admin/templates/login.phtml
View file

@ -52,10 +52,18 @@
$('#loading').hide('slow');
if(data.hasOwnProperty('disable')) {
$('#username_error').html("${lang('common', 'error_disabled', 'Error, your user is disabled, you need support of web administration')}");
} else {
$('#username_error').html("${lang('common', 'error_login', 'Error, wrong username or password')}");
}
}
});
return false;