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

Cleaning code

Browse source
This commit is contained in:
Antonio de la Rosa 2025-10-24 00:20:46 +02:00
parent ffdf81ec07
commit f50aa1dfdc
1 changed files with 1 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

45
dashboard.py
View file

@ -67,9 +67,6 @@ def get_phpservers():
ajax=AjaxList(db, fields, arr_order_fields, count_query, str_query)
#ajax.func_fields['id']=options_server
#ajax.func_fields['ip']=options_ip
#ajax.func_fields['select_id']=options_selected
ajax.func_fields['id']=options_options
ajax.limit=0
@ -79,10 +76,6 @@ def options_options(row_id, row):
arr_options=[]
#arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', server_id=row_id), I18n.lang('dbservermariadb', 'server_users', 'Server users'))]
#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('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')))
@ -98,7 +91,6 @@ def delete_php(php_server_id):
if arr_server:
#select * 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=19
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 AND virtualhost.php=%s', [php_server_id, arr_server['version']]) as cursor:
num_php_vhosts=cursor.fetchone()['num_php_vhosts']
@ -124,18 +116,9 @@ def delete_php_task(php_server_id):
if arr_server:
sshtask=SSHTask(db)
#user=config_task.remote_user
ssh_key_priv='./ssh/id_rsa'
#run_task(self, server, path, name_task, codename_task, description_task, data={}, user='', password='', where_sql_server='', url='', ssh_key_priv='', ssh_key_password='', send_task=True)
# user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url='', data=data, send_task=True
#root_dir='/home/'+username+'/sites/'+domain
#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('phpserver_app.php_dashboard'), ssh_key_priv=ssh_key_priv, ssh_key_password='', send_task=True, ssh_port=arr_server['ssh_port']):
error=1
@ -152,9 +135,6 @@ def php_progress(php_server_id):
db=g.connection
#Webservers list >> Web users >> Virtual Hosts
#cursor=db.query('select `usersftp`.`id` from `usersftp`')
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='phpserver_app.php_dashboard')
@ -168,8 +148,6 @@ def php_edit_server(php_server_id):
arr_server=cursor.fetchone()
if arr_server:
#arr_form=BaseForm
return t.load_template('edit_phpserver.phtml', title=_('Edit PHP FPM server'), path_module='phpserver_app.php_dashboard', domain=arr_server['hostname'], php_server_id=php_server_id)
@ -190,19 +168,7 @@ def get_php_server(php_server_id):
if arr_server:
sshtask=SSHTask(db)
#user=config_task.remote_user
#run_task(self, server, path, name_task, codename_task, description_task, data={}, user='', password='', where_sql_server='', url='', ssh_key_priv='', ssh_key_password='', send_task=True)
# user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url='', data=data, send_task=True
#root_dir='/home/'+username+'/sites/'+domain
#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('phpserver_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.get_php_ini', 'Get PHP.ini from server', 'get_php_ini', 'Task for get php.ini config 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=config_task.ssh_private_key, ssh_key_password=config_task.ssh_private_key_password, send_task=True, ssh_port=arr_server['ssh_port']):
error=1
@ -239,15 +205,6 @@ def get_php_server(php_server_id):
if not error:
with db.query('select * from resulttask where task_id=%s', [task_id]) as cursor:
result=cursor.fetchone()
# PHP configuration
#
#config=configparser.ConfigParser()
#print(json.loads(result['message'])['file'])
#config.read_string(json.loads(result['message'])['file'])
#print(config['PHP']['display_errors'])
return {'error': error, 'error_form': error_form, 'log': arr_log, 'result': result, 'task_id': task_id}