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

Fixes in flask app

Browse source
This commit is contained in:
Antonio de la Rosa 2025-10-09 23:15:19 +02:00
parent 25776fd02a
commit ff9a221ed0
5 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dashboard.py
View file

@ -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=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), _('Websites'))]
#
#arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('php_app.php_edit_server', php_server_id=row_id), _('Edit')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('php_app.delete_php', php_server_id=row_id), _('Delete')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('phpserver_app.php_edit_server', php_server_id=row_id), _('Edit')))
arr_options.append('<a href="{}">{}</a>'.format(url_for('phpserver_app.delete_php', php_server_id=row_id), _('Delete')))
return '<br />'.join(arr_options)
@php_app.route('/phpserver/delete_php/<int:php_server_id>')
@phpserver_app.route('/phpserver/delete_php/<int:php_server_id>')
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/<int:php_server_id>', methods=['POST'])
@phpserver_app.route('/phpserver/delete_php_task/<int:php_server_id>', 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/<int:php_server_id>/')
@phpserver_app.route('/phpserver/progress/<int:php_server_id>/')
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='<p><a href="'+url_for('php_app.php_dashboard')+'">'+_('PHP servers list')+'</a></p>'
return_tree='<p><a href="'+url_for('phpserver_app.php_dashboard')+'">'+_('PHP servers list')+'</a></p>'
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/<int:php_server_id>/')
@phpserver_app.route('/phpserver/edit_server/<int:php_server_id>/')
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/<int:php_server_id>/')
@phpserver_app.route('/phpserver/get_php_server/<int:php_server_id>/')
def get_php_server(php_server_id):