clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-21 10:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev

Browse Source
This commit is contained in:
envoyr 2022-04-21 18:20:13 +02:00
commit e638511826
No known key found for this signature in database
GPG Key ID: 5A16F49AF96F462F
31 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
customer_extras.php
View File

@ -292,8 +292,7 @@ if ($page == 'overview' || $page == 'htpasswds') {
// check whether there is a backup-job for this customer
try {
$backup_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.backups.php';
$collection = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\CustomerBackups::class, $userinfo))
->withPagination($backup_list_data['backup_list']['columns']);
$collection = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\CustomerBackups::class, $userinfo));
} catch (Exception $e) {
\Froxlor\UI\Response::dynamic_error($e->getMessage());
}

1
lib/formfields/admin/admin/formfield.admin_add.php
View File

@ -21,6 +21,7 @@ return array(
'admin_add' => array(
'title' => $lng['admin']['admin_add'],
'image' => 'fa-solid fa-user-plus',
'self_overview' => ['section' => 'admins', 'page' => 'admins'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['accountdata'],

1
lib/formfields/admin/admin/formfield.admin_edit.php
View File

@ -18,6 +18,7 @@ return array(
'admin_edit' => array(
'title' => $lng['admin']['admin_edit'],
'image' => 'fa-solid fa-user-pen',
'self_overview' => ['section' => 'admins', 'page' => 'admins'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['accountdata'],

1
lib/formfields/admin/customer/formfield.customer_add.php
View File

@ -18,6 +18,7 @@ return array(
'customer_add' => array(
'title' => $lng['admin']['customer_add'],
'image' => 'fa-solid fa-user-plus',
'self_overview' => ['section' => 'customers', 'page' => 'customers'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['accountdata'],

1
lib/formfields/admin/customer/formfield.customer_edit.php
View File

@ -18,6 +18,7 @@ return array(
'customer_edit' => array(
'title' => $lng['admin']['customer_edit'],
'image' => 'fa-solid fa-user-pen',
'self_overview' => ['section' => 'customers', 'page' => 'customers'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['accountdata'],

1
lib/formfields/admin/domains/formfield.domains_add.php
View File

@ -21,6 +21,7 @@ return array(
'domain_add' => array(
'title' => $lng['admin']['domain_add'],
'image' => 'fa-solid fa-globe',
'self_overview' => ['section' => 'domains', 'page' => 'domains'],
'sections' => array(
'section_a' => array(
'title' => $lng['domains']['domainsettings'],

1
lib/formfields/admin/domains/formfield.domains_edit.php
View File

@ -18,6 +18,7 @@ return array(
'domain_edit' => array(
'title' => $lng['admin']['domain_edit'],
'image' => 'fa-solid fa-globe',
'self_overview' => ['section' => 'domains', 'page' => 'domains'],
'sections' => array(
'section_a' => array(
'title' => $lng['domains']['domainsettings'],

1
lib/formfields/admin/domains/formfield.domains_import.php
View File

@ -18,6 +18,7 @@ return array(
'domain_import' => array(
'title' => $lng['domains']['domain_import'],
'image' => 'fa-solid fa-file-import',
'self_overview' => ['section' => 'domains', 'page' => 'domains'],
'sections' => array(
'section_a' => array(
'title' => $lng['domains']['domain_import'],

1
lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
View File

@ -18,6 +18,7 @@ return array(
'ipsandports_add' => array(
'title' => $lng['admin']['ipsandports']['add'],
'image' => 'fa-solid fa-plus',
'self_overview' => ['section' => 'ipsandports', 'page' => 'ipsandports'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['ipsandports']['ipandport'],

1
lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
View File

@ -18,6 +18,7 @@ return array(
'ipsandports_edit' => array(
'title' => $lng['admin']['ipsandports']['edit'],
'image' => 'fa-solid fa-pen',
'self_overview' => ['section' => 'ipsandports', 'page' => 'ipsandports'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['ipsandports']['ipandport'],

1
lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php
View File

@ -18,6 +18,7 @@ return array(
'fpmconfig_add' => array(
'title' => $lng['admin']['phpsettings']['addsettings'],
'image' => 'fa-solid fa-plus',
'self_overview' => ['section' => 'phpsettings', 'page' => 'fpmdaemons'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['phpsettings']['addsettings'],

1
lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php
View File

@ -18,6 +18,7 @@ return array(
'fpmconfig_edit' => array(
'title' => $lng['admin']['phpsettings']['editsettings'],
'image' => 'fa-solid fa-pen',
'self_overview' => ['section' => 'phpsettings', 'page' => 'fpmdaemons'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['phpsettings']['editsettings'],

1
lib/formfields/admin/phpconfig/formfield.phpconfig_add.php
View File

@ -18,6 +18,7 @@ return array(
'phpconfig_add' => array(
'title' => $lng['admin']['phpsettings']['addsettings'],
'image' => 'fa-solid fa-plus',
'self_overview' => ['section' => 'phpsettings', 'page' => 'overview'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['phpsettings']['addsettings'],

1
lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php
View File

@ -18,6 +18,7 @@ return array(
'phpconfig_edit' => array(
'title' => $lng['admin']['phpsettings']['editsettings'],
'image' => 'fa-solid fa-pen',
'self_overview' => ['section' => 'phpsettings', 'page' => 'overview'],
'sections' => array(
'section_a' => array(
'title' => $lng['admin']['phpsettings']['editsettings'],

1
lib/formfields/customer/domains/formfield.domains_add.php
View File

@ -21,6 +21,7 @@ return array(
'domain_add' => array(
'title' => $lng['domains']['subdomain_add'],
'image' => 'fa-solid fa-plus',
'self_overview' => ['section' => 'domains', 'page' => 'domains'],
'sections' => array(
'section_a' => array(
'title' => $lng['domains']['subdomain_add'],

1
lib/formfields/customer/domains/formfield.domains_edit.php
View File

@ -18,6 +18,7 @@ return array(
'domain_edit' => array(
'title' => $lng['domains']['subdomain_edit'],
'image' => 'fa-solid fa-pen',
'self_overview' => ['section' => 'domains', 'page' => 'domains'],
'sections' => array(
'section_a' => array(
'title' => $lng['domains']['subdomain_edit'],

1
lib/formfields/customer/email/formfield.emails_add.php
View File

@ -18,6 +18,7 @@ return array(
'emails_add' => array(
'title' => $lng['emails']['emails_add'],
'image' => 'fa-solid fa-plus',
'self_overview' => ['section' => 'email', 'page' => 'emails'],
'sections' => array(
'section_a' => array(
'title' => $lng['emails']['emails_add'],

1
lib/formfields/customer/email/formfield.emails_edit.php
View File

@ -18,6 +18,7 @@ return array(
'emails_edit' => array(
'title' => $lng['emails']['emails_edit'],
'image' => 'fa-solid fa-pen',
'self_overview' => ['section' => 'email', 'page' => 'emails'],
'sections' => array(
'section_a' => array(
'title' => $lng['emails']['emails_edit'],

1
lib/formfields/customer/extras/formfield.htaccess_add.php
View File

@ -18,6 +18,7 @@ return array(
'htaccess_add' => array(
'title' => $lng['extras']['pathoptions_add'],
'image' => 'fa-solid fa-folder',
'self_overview' => ['section' => 'extras', 'page' => 'htaccess'],
'sections' => array(
'section_a' => array(
'title' => $lng['extras']['pathoptions_add'],

1
lib/formfields/customer/extras/formfield.htaccess_edit.php
View File

@ -18,6 +18,7 @@ return array(
'htaccess_edit' => array(
'title' => $lng['extras']['pathoptions_edit'],
'image' => 'fa-solid fa-folder',
'self_overview' => ['section' => 'extras', 'page' => 'htaccess'],
'sections' => array(
'section_a' => array(
'title' => $lng['extras']['pathoptions_edit'],

1
lib/formfields/customer/extras/formfield.htpasswd_add.php
View File

@ -18,6 +18,7 @@ return array(
'htpasswd_add' => array(
'title' => $lng['extras']['directoryprotection_add'],
'image' => 'fa-solid fa-lock',
'self_overview' => ['section' => 'extras', 'page' => 'htpasswds'],
'sections' => array(
'section_a' => array(
'title' => $lng['extras']['directoryprotection_add'],

1
lib/formfields/customer/extras/formfield.htpasswd_edit.php
View File

@ -18,6 +18,7 @@ return array(
'htpasswd_edit' => array(
'title' => $lng['extras']['directoryprotection_edit'],
'image' => 'fa-solid fa-lock',
'self_overview' => ['section' => 'extras', 'page' => 'htpasswds'],
'sections' => array(
'section_a' => array(
'title' => $lng['extras']['directoryprotection_edit'],

1
lib/formfields/customer/ftp/formfield.ftp_add.php
View File

@ -17,6 +17,7 @@ return array(
'ftp_add' => array(
'title' => $lng['ftp']['account_add'],
'image' => 'icons/user_add.png',
'self_overview' => ['section' => 'ftp', 'page' => 'accounts'],
'sections' => array(
'section_a' => array(
'title' => $lng['ftp']['account_add'],

1
lib/formfields/customer/ftp/formfield.ftp_edit.php
View File

@ -17,6 +17,7 @@ return array(
'ftp_edit' => array(
'title' => $lng['ftp']['account_edit'],
'image' => 'icons/user_edit.png',
'self_overview' => ['section' => 'ftp', 'page' => 'accounts'],
'sections' => array(
'section_a' => array(
'title' => $lng['ftp']['account_edit'],

1
lib/formfields/customer/mysql/formfield.mysql_add.php
View File

@ -19,6 +19,7 @@ return array(
'mysql_add' => array(
'title' => $lng['mysql']['database_create'],
'image' => 'icons/mysql_add.png',
'self_overview' => ['section' => 'mysql', 'page' => 'mysqls'],
'sections' => array(
'section_a' => array(
'title' => $lng['mysql']['database_create'],

1
lib/formfields/customer/mysql/formfield.mysql_edit.php
View File

@ -17,6 +17,7 @@ return array(
'mysql_edit' => array(
'title' => $lng['mysql']['database_edit'],
'image' => 'icons/mysql_edit.png',
'self_overview' => ['section' => 'mysql', 'page' => 'mysqls'],
'sections' => array(
'section_a' => array(
'title' => $lng['mysql']['database_edit'],

4
lib/tablelisting/customer/tablelisting.ftps.php
View File

@ -57,7 +57,7 @@ return [
'title' => $lng['panel']['edit'],
'href' => [
'section' => 'ftp',
'page' => 'ftps',
'page' => 'accounts',
'action' => 'edit',
'id' => ':id'
],
@ -68,7 +68,7 @@ return [
'class' => 'btn-danger',
'href' => [
'section' => 'ftp',
'page' => 'ftps',
'page' => 'accounts',
'action' => 'delete',
'id' => ':id'
],

1
lib/tablelisting/customer/tablelisting.htaccess.php
View File

@ -24,6 +24,7 @@ return [
'htaccess_list' => [
'title' => $lng['menue']['extras']['pathoptions'],
'icon' => 'fa-solid fa-folder',
'self_overview' => ['section' => 'extras', 'page' => 'htaccess'],
'columns' => [
'path' => [
'label' => $lng['panel']['path'],

1
lib/tablelisting/customer/tablelisting.htpasswd.php
View File

@ -23,6 +23,7 @@ return [
'htpasswd_list' => [
'title' => $lng['menue']['extras']['directoryprotection'],
'icon' => 'fa-solid fa-lock',
'self_overview' => ['section' => 'extras', 'page' => 'htpasswds'],
'columns' => [
'username' => [
'label' => $lng['login']['username'],

2
templates/Froxlor/user/form-datatable.html.twig
View File

@ -1,7 +1,7 @@
{% extends "Froxlor/user/form.html.twig" %}
{% block content %}
{% if tabledata is not empty and tabledata is iterable %}
{% if tabledata.table.tr is not empty and tabledata.table.tr is iterable %}
<div class="row mb-2">
{% set type = 'warning' %}
{% set alert_msg = lng('error.customerhasongoingbackupjob') %}

8
templates/Froxlor/user/form.html.twig
View File

@ -20,6 +20,13 @@
{% block actions %}
{% if formdata.self_overview is defined and formdata.self_overview is iterable %}
{% if action_links is not defined %}{% set actions_links = [] %}{% endif %}
{% set actions_tmp = actions_links %}
{% set actions_links = {'href': linker(formdata.self_overview), 'icon': 'fa fa-reply','label': lng('panel.backtooverview')} %}
{% set actions_links = {actions_links}|merge(actions_tmp) %}
{% endif %}
{% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}
<div>
{% if actions_links is iterable %}
@ -38,6 +45,7 @@
#}
</div>
{% endif %}
{% endblock %}
{% block content %}