major refactoring of almost all files

This commit is contained in:
envoyr
2022-04-28 20:48:00 +02:00
parent a2e95b960f
commit 4f4c71d79b
285 changed files with 21716 additions and 18766 deletions

View File

@@ -6,57 +6,60 @@
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* COPYING file online at https://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 https://files.froxlor.org/misc/COPYING.txt
* @package Formfields
*
*/
return array(
'backup' => array(
'title' => $lng['extras']['backup'],
use Froxlor\Settings;
return [
'backup' => [
'title' => lng('extras.backup'),
'image' => 'fa-solid fa-server',
'sections' => array(
'section_a' => array(
'title' => $lng['extras']['backup'],
'sections' => [
'section_a' => [
'title' => lng('extras.backup'),
'image' => 'icons/backup_big.png',
'fields' => array(
'path' => array(
'label' => $lng['panel']['backuppath']['title'],
'desc' => $lng['panel']['backuppath']['description'] . '<br>' . (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null),
'fields' => [
'path' => [
'label' => lng('panel.backuppath.title'),
'desc' => lng('panel.backuppath.description') . '<br>' . (Settings::Get('panel.pathedit') != 'Dropdown' ? lng('panel.pathDescription') : null),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['select_var'] ?? '',
'value' => $pathSelect['value'],
'note' => $pathSelect['note'] ?? '',
),
'path_protection_info' => array(
'label' => $lng['extras']['path_protection_label'],
],
'path_protection_info' => [
'label' => lng('extras.path_protection_label'),
'type' => 'infotext',
'value' => $lng['extras']['path_protection_info'],
'value' => lng('extras.path_protection_info'),
'classes' => 'fw-bold text-danger'
),
'backup_web' => array(
'label' => $lng['extras']['backup_web'],
],
'backup_web' => [
'label' => lng('extras.backup_web'),
'type' => 'checkbox',
'value' => '1',
'checked' => true
),
'backup_mail' => array(
'label' => $lng['extras']['backup_mail'],
],
'backup_mail' => [
'label' => lng('extras.backup_mail'),
'type' => 'checkbox',
'value' => '1',
'checked' => true
),
'backup_dbs' => array(
'label' => $lng['extras']['backup_dbs'],
],
'backup_dbs' => [
'label' => lng('extras.backup_dbs'),
'type' => 'checkbox',
'value' => '1',
'checked' => true
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,66 +4,77 @@
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'htaccess_add' => array(
'title' => $lng['extras']['pathoptions_add'],
use Froxlor\Settings;
return [
'htaccess_add' => [
'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'],
'sections' => [
'section_a' => [
'title' => lng('extras.pathoptions_add'),
'image' => 'icons/htpasswd_add.png',
'fields' => array(
'path' => array(
'label' => $lng['panel']['path'],
'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null),
'fields' => [
'path' => [
'label' => lng('panel.path'),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? lng('panel.pathDescription') : null),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['select_var'] ?? '',
'value' => $pathSelect['value'],
'note' => $pathSelect['note'] ?? '',
),
'options_indexes' => array(
'label' => $lng['extras']['directory_browsing'],
],
'options_indexes' => [
'label' => lng('extras.directory_browsing'),
'type' => 'checkbox',
'value' => '1',
'checked' => false
),
'error404path' => array(
'label' => $lng['extras']['errordocument404path'],
'desc' => $lng['panel']['descriptionerrordocument'],
],
'error404path' => [
'label' => lng('extras.errordocument404path'),
'desc' => lng('panel.descriptionerrordocument'),
'type' => 'text'
),
'error403path' => array(
'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument403path'],
'desc' => $lng['panel']['descriptionerrordocument'],
],
'error403path' => [
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => lng('extras.errordocument403path'),
'desc' => lng('panel.descriptionerrordocument'),
'type' => 'text'
),
'error500path' => array(
'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument500path'],
'desc' => $lng['panel']['descriptionerrordocument'],
],
'error500path' => [
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => lng('extras.errordocument500path'),
'desc' => lng('panel.descriptionerrordocument'),
'type' => 'text'
),
'options_cgi' => array(
],
'options_cgi' => [
'visible' => ($cperlenabled == 1),
'label' => $lng['extras']['execute_perl'],
'label' => lng('extras.execute_perl'),
'type' => 'checkbox',
'value' => '1',
'checked' => false
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,66 +4,77 @@
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'htaccess_edit' => array(
'title' => $lng['extras']['pathoptions_edit'],
use Froxlor\Settings;
return [
'htaccess_edit' => [
'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'],
'sections' => [
'section_a' => [
'title' => lng('extras.pathoptions_edit'),
'image' => 'icons/htpasswd_edit.png',
'fields' => array(
'path' => array(
'label' => $lng['panel']['path'],
'fields' => [
'path' => [
'label' => lng('panel.path'),
'type' => 'label',
'value' => $result['path']
),
'options_indexes' => array(
'label' => $lng['extras']['directory_browsing'],
],
'options_indexes' => [
'label' => lng('extras.directory_browsing'),
'type' => 'checkbox',
'value' => '1',
'checked' => $result['options_indexes']
),
'error404path' => array(
'label' => $lng['extras']['errordocument404path'],
'desc' => $lng['panel']['descriptionerrordocument'],
],
'error404path' => [
'label' => lng('extras.errordocument404path'),
'desc' => lng('panel.descriptionerrordocument'),
'type' => 'text',
'value' => $result['error404path']
),
'error403path' => array(
'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument403path'],
'desc' => $lng['panel']['descriptionerrordocument'],
],
'error403path' => [
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => lng('extras.errordocument403path'),
'desc' => lng('panel.descriptionerrordocument'),
'type' => 'text',
'value' => $result['error403path']
),
'error500path' => array(
'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
'label' => $lng['extras']['errordocument500path'],
'desc' => $lng['panel']['descriptionerrordocument'],
],
'error500path' => [
'visible' => (Settings::Get('system.webserver') == 'apache2'),
'label' => lng('extras.errordocument500path'),
'desc' => lng('panel.descriptionerrordocument'),
'type' => 'text',
'value' => $result['error500path']
),
'options_cgi' => array(
],
'options_cgi' => [
'visible' => ($cperlenabled == 1),
'label' => $lng['extras']['execute_perl'],
'label' => lng('extras.execute_perl'),
'type' => 'checkbox',
'value' => '1',
'checked' => $result['options_cgi']
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,55 +4,67 @@
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'htpasswd_add' => array(
'title' => $lng['extras']['directoryprotection_add'],
use Froxlor\Settings;
use Froxlor\System\Crypt;
return [
'htpasswd_add' => [
'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'],
'sections' => [
'section_a' => [
'title' => lng('extras.directoryprotection_add'),
'image' => 'icons/htpasswd_add.png',
'fields' => array(
'path' => array(
'label' => $lng['panel']['path'],
'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null),
'fields' => [
'path' => [
'label' => lng('panel.path'),
'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? lng('panel.pathDescription') : null),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['select_var'] ?? '',
'value' => $pathSelect['value'],
'note' => $pathSelect['note'] ?? '',
),
'username' => array(
'label' => $lng['login']['username'],
],
'username' => [
'label' => lng('login.username'),
'type' => 'text'
),
'directory_password' => array(
'label' => $lng['login']['password'],
],
'directory_password' => [
'label' => lng('login.password'),
'type' => 'password',
'autocomplete' => 'off'
),
'directory_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
],
'directory_password_suggestion' => [
'label' => lng('customer.generated_pwd'),
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword()
),
'directory_authname' => array(
'label' => $lng['extras']['htpasswdauthname'],
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => Crypt::generatePassword()
],
'directory_authname' => [
'label' => lng('extras.htpasswdauthname'),
'type' => 'text'
)
)
)
)
)
);
]
]
]
]
]
];

View File

@@ -4,54 +4,66 @@
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Formfields
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
return array(
'htpasswd_edit' => array(
'title' => $lng['extras']['directoryprotection_edit'],
use Froxlor\Settings;
use Froxlor\System\Crypt;
return [
'htpasswd_edit' => [
'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'],
'sections' => [
'section_a' => [
'title' => lng('extras.directoryprotection_edit'),
'image' => 'icons/htpasswd_edit.png',
'fields' => array(
'path' => array(
'label' => $lng['panel']['path'],
'fields' => [
'path' => [
'label' => lng('panel.path'),
'type' => 'label',
'value' => $result['path']
),
'username' => array(
'label' => $lng['login']['username'],
],
'username' => [
'label' => lng('login.username'),
'type' => 'label',
'value' => $result['username']
),
'directory_password' => array(
'label' => $lng['login']['password'],
],
'directory_password' => [
'label' => lng('login.password'),
'type' => 'password',
'autocomplete' => 'off'
),
'directory_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
],
'directory_password_suggestion' => [
'label' => lng('customer.generated_pwd'),
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword()
),
'directory_authname' => array(
'label' => $lng['extras']['htpasswdauthname'],
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => Crypt::generatePassword()
],
'directory_authname' => [
'label' => lng('extras.htpasswdauthname'),
'type' => 'text',
'value' => $result['authname']
)
)
)
)
)
);
]
]
]
]
]
];