diff --git a/__init__.py b/__init__.py index f4f7e0f..02be382 100644 --- a/__init__.py +++ b/__init__.py @@ -1,17 +1,17 @@ from flask import Blueprint, g from paramecio2.modules.admin.libraries.admin_auth import admin_prepare, admin_finished -php_app=Blueprint('php_app', __name__) +phpserver_app=Blueprint('phpserver_app', __name__) #@admin_app.before_request #def admin_prepare(): -@php_app.before_request +@phpserver_app.before_request def admin_prepare_php(): return admin_prepare() -@php_app.after_request +@phpserver_app.after_request def admin_finished_php(response): return admin_finished(response) diff --git a/dashboard.py b/dashboard.py index 47c33c8..e934855 100644 --- a/dashboard.py +++ b/dashboard.py @@ -1,4 +1,4 @@ -from modules.phpserver import php_app +from modules.phpserver import phpserver_app from settings import config from flask import g, url_for, request, session, make_response, abort from paramecio2.libraries.generate_admin_class import GenerateAdminClass @@ -39,12 +39,12 @@ t.env.directories=admin_t.env.directories t.env.directories.insert(1, os.path.dirname(__file__).replace('/admin', '')+'/templates/admin') t.env.directories.insert(2, '../pastafari2/templates/admin') -@php_app.route('/phpserver/servers') +@phpserver_app.route('/phpserver/servers') def php_dashboard(): - return t.load_template('phpservers.phtml', title=_('PHP Servers'), path_module='php_app.php_dashboard') + return t.load_template('phpservers.phtml', title=_('PHP Servers'), path_module='phpserver_app.php_dashboard') -@php_app.route('/phpserver/get_phpservers', methods=['POST']) +@phpserver_app.route('/phpserver/get_phpservers', methods=['POST']) def get_phpservers(): @@ -80,12 +80,12 @@ def options_options(row_id, row): #arr_options=['{}'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), _('Websites'))] # #arr_options.append('{}'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports'))) - arr_options.append('{}'.format(url_for('php_app.php_edit_server', php_server_id=row_id), _('Edit'))) - arr_options.append('{}'.format(url_for('php_app.delete_php', php_server_id=row_id), _('Delete'))) + arr_options.append('{}'.format(url_for('phpserver_app.php_edit_server', php_server_id=row_id), _('Edit'))) + arr_options.append('{}'.format(url_for('phpserver_app.delete_php', php_server_id=row_id), _('Delete'))) return '
'.join(arr_options) -@php_app.route('/phpserver/delete_php/') +@phpserver_app.route('/phpserver/delete_php/') def delete_php(php_server_id): db=g.connection @@ -99,11 +99,11 @@ def delete_php(php_server_id): with db.query('select count(*) as num_php_vhosts from virtualhost, webserver, serverdbtask, phpserver where virtualhost.webserver_id=webserver.id AND serverdbtask.id=webserver.server_id AND phpserver.server_id=serverdbtask.id AND phpserver.id=%s', [php_server_id]) as cursor: num_php_vhosts=cursor.fetchone()['num_php_vhosts'] - return t.load_template('del_phpserver.phtml', title=_('Remove PHP FPM server'), path_module='php_app.php_dashboard', php_server_id=php_server_id, domain=arr_server['hostname'], num_php_vhosts=num_php_vhosts) + return t.load_template('del_phpserver.phtml', title=_('Remove PHP FPM server'), path_module='phpserver_app.php_dashboard', php_server_id=php_server_id, domain=arr_server['hostname'], num_php_vhosts=num_php_vhosts) abort(404) -@php_app.route('/phpserver/delete_php_task/', methods=['POST']) +@phpserver_app.route('/phpserver/delete_php_task/', methods=['POST']) def delete_php_task(php_server_id): db=g.connection @@ -132,7 +132,7 @@ def delete_php_task(php_server_id): #ftp_user=arr_user['user'] - if not sshtask.run_task(arr_server['ip'], 'modules.phpserver.tasks.php.php.delete_php', 'Delete PHP server', 'delete_phpserver', 'Task for delete php-fpm server from server', {'version': arr_server['version'], 'php_server_id': php_server_id}, config_task.remote_user, '', '', url_for('php_app.php_dashboard'), ssh_key_priv=ssh_key_priv, ssh_key_password='', send_task=True, ssh_port=arr_server['ssh_port']): + if not sshtask.run_task(arr_server['ip'], 'modules.phpserver.tasks.php.php.delete_php', 'Delete PHP server', 'delete_phpserver', 'Task for delete php-fpm server from server', {'version': arr_server['version'], 'php_server_id': php_server_id}, config_task.remote_user, '', '', url_for('phpserver_app.php_dashboard'), ssh_key_priv=ssh_key_priv, ssh_key_password='', send_task=True, ssh_port=arr_server['ssh_port']): error=1 @@ -143,7 +143,7 @@ def delete_php_task(php_server_id): return {'error': error, 'error_form': error_form, 'task_id': task_id} -@php_app.route('/phpserver/progress//') +@phpserver_app.route('/phpserver/progress//') def php_progress(php_server_id): db=g.connection @@ -151,11 +151,11 @@ def php_progress(php_server_id): #Webservers list >> Web users >> Virtual Hosts #cursor=db.query('select `usersftp`.`id` from `usersftp`') - return_tree='

'+_('PHP servers list')+'

' + return_tree='

'+_('PHP servers list')+'

' - return load_progress(db, t, return_tree=return_tree, path_module='php_app.php_dashboard') + return load_progress(db, t, return_tree=return_tree, path_module='phpserver_app.php_dashboard') -@php_app.route('/phpserver/edit_server//') +@phpserver_app.route('/phpserver/edit_server//') def php_edit_server(php_server_id): db=g.connection @@ -166,11 +166,11 @@ def php_edit_server(php_server_id): if arr_server: - return t.load_template('edit_phpserver.phtml', title=_('Edit PHP FPM server'), path_module='php_app.php_dashboard', domain=arr_server['hostname']) + return t.load_template('edit_phpserver.phtml', title=_('Edit PHP FPM server'), path_module='phpserver_app.php_dashboard', domain=arr_server['hostname']) return {} -@php_app.route('/phpserver/get_php_server//') +@phpserver_app.route('/phpserver/get_php_server//') def get_php_server(php_server_id): diff --git a/settings/config_admin.py b/settings/config_admin.py index b1b7b87..4644c38 100644 --- a/settings/config_admin.py +++ b/settings/config_admin.py @@ -12,4 +12,4 @@ def php(): config_admin.append(['PHP']) -config_admin.append([php(), 'modules.phpserver.dashboard', 'php_app.php_dashboard', '']) +config_admin.append([php(), 'modules.phpserver.dashboard', 'phpserver_app.php_dashboard', '']) diff --git a/templates/admin/del_phpserver.phtml b/templates/admin/del_phpserver.phtml index 5696977..d9a8e04 100644 --- a/templates/admin/del_phpserver.phtml +++ b/templates/admin/del_phpserver.phtml @@ -1,6 +1,6 @@ <%inherit file="dashboard.phtml"/> <%block name="content"> -

${_('PHP servers list')} >> ${_('Delete php server')}

+

${_('PHP servers list')} >> ${_('Delete php server')}

${domain}

@@ -13,7 +13,7 @@ % endif
-

${_('PHP servers list')} >> ${_('Delete php server')}

+

${_('PHP servers list')} >> ${_('Delete php server')}

<%block name="jscript_block"> @@ -21,9 +21,9 @@ /* options: url: url to post, loading: dom id, success: func, pre_callback, separated_data:boolean, upload: {progressbar: '#progressbar', 'total_loader': '#total_loader', 'status': '#status'} */ -options={'url': '${url_for("php_app.delete_php_task", php_server_id=php_server_id)}', 'loading': '#layer_loading', 'success': function (data) { +options={'url': '${url_for("phpserver_app.delete_php_task", php_server_id=php_server_id)}', 'loading': '#layer_loading', 'success': function (data) { - location.href="${url_for('php_app.php_progress', php_server_id=php_server_id)}?task_id="+data.task_id; + location.href="${url_for('phpserver_app.php_progress', php_server_id=php_server_id)}?task_id="+data.task_id; } }; diff --git a/templates/admin/phpservers.phtml b/templates/admin/phpservers.phtml index cb9dce6..3d807c7 100644 --- a/templates/admin/phpservers.phtml +++ b/templates/admin/phpservers.phtml @@ -8,7 +8,7 @@