maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more tablelistings and php-related formfields

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-02-28 10:51:19 +01:00
parent bebdb3a93f
commit 5133d26f6f
19 changed files with 241 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin_admins.php
View File

@@ -200,7 +200,8 @@ if ($page == 'admins' && $userinfo['change_serversettings'] == '1') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'admins', 'id' => $id)),
'formdata' => $admin_edit_data['admin_edit']
'formdata' => $admin_edit_data['admin_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

3
admin_customers.php
View File

@@ -310,7 +310,8 @@ if ($page == 'customers' && $userinfo['customers'] != '0') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'customers', 'id' => $id)),
'formdata' => $customer_edit_data['customer_edit']
'formdata' => $customer_edit_data['customer_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

3
admin_ipsandports.php
View File

@@ -131,7 +131,8 @@ if ($page == 'ipsandports' || $page == 'overview') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'ipsandports', 'id' => $id)),
'formdata' => $ipsandports_edit_data['ipsandports_edit']
'formdata' => $ipsandports_edit_data['ipsandports_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

113
admin_phpsettings.php
View File

@@ -20,9 +20,10 @@
const AREA = 'admin';
require __DIR__ . '/lib/init.php';
use Froxlor\Api\Commands\FpmDaemons as FpmDaemons;
use Froxlor\Api\Commands\PhpSettings as PhpSettings;
use Froxlor\Api\Commands\FpmDaemons;
use Froxlor\Api\Commands\PhpSettings;
use Froxlor\Database\Database;
use Froxlor\UI\Panel\UI;
use Froxlor\UI\Request;
$id = (int) Request::get('id');
@@ -32,35 +33,21 @@ if ($page == 'overview') {
if ($action == '') {
try {
$json_result = PhpSettings::getLocal($userinfo, array(
'with_subdomains' => true
))->listing();
$phpconf_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.phpconfigs.php';
$collection = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\PhpSettings::class, $userinfo, ['with_subdomains' => true]))
->withPagination($phpconf_list_data['phpconf_list']['columns']);
} catch (Exception $e) {
\Froxlor\UI\Response::dynamic_error($e->getMessage());
}
$result = json_decode($json_result, true)['data'];
$tablecontent = '';
$count = 0;
if (isset($result['count']) && $result['count'] > 0) {
foreach ($result['list'] as $row) {
if (isset($row['is_default']) && $row['is_default'] == true) {
$row['description'] = "<b>" . $row['description'] . "</b>";
}
$domains = "";
$subdomains_count = count($row['subdomains']);
foreach ($row['domains'] as $configdomain) {
$domains .= $idna_convert->decode($configdomain) . "<br>";
}
$count ++;
if ($subdomains_count == 0 && empty($domains)) {
$domains = $lng['admin']['phpsettings']['notused'];
}
eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_overview") . "\";");
}
}
eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview") . "\";");
UI::twigBuffer('user/table.html.twig', [
'listing' => \Froxlor\UI\Listing::format($collection, $phpconf_list_data['phpconf_list']),
'actions_links' => [[
'href' => $linker->getLink(['section' => 'phpsettings', 'page' => $page, 'action' => 'add']),
'label' => $lng['admin']['phpsettings']['addnew']
]]
]);
UI::twigOutputBuffer();
}
if ($action == 'add') {
@@ -80,9 +67,9 @@ if ($page == 'overview') {
} else {
if (file_exists(\Froxlor\Froxlor::getInstallDir() . '/templates/misc/php/default.ini.php')) {
require_once \Froxlor\Froxlor::getInstallDir() . '/templates/misc/php/default.ini.php';
include \Froxlor\Froxlor::getInstallDir() . '/templates/misc/php/default.ini.php';
$result = [
'phpsettings' => DEFAULT_PHPINI
'phpsettings' => $phpini
];
} else {
// use first php-config as fallback
@@ -90,23 +77,19 @@ if ($page == 'overview') {
$result = $result_stmt->fetch(PDO::FETCH_ASSOC);
}
$fpmconfigs = '';
$fpmconfigs = [];
$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], 1, true, true);
$fpmconfigs[$row['id']] = $row['description'];;
}
$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', 'dynamic', true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', 'dynamic', true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', 'dynamic', true, true);
$phpconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
$phpconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($phpconfig_add_data);
$title = $phpconfig_add_data['phpconfig_add']['title'];
$image = $phpconfig_add_data['phpconfig_add']['image'];
eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_add") . "\";");
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'phpsettings')),
'formdata' => $phpconfig_add_data['phpconfig_add']
]);
UI::twigOutputBuffer();
}
} else {
\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
@@ -176,23 +159,20 @@ if ($page == 'overview') {
));
} else {
$fpmconfigs = '';
$fpmconfigs = [];
$configs = Database::query("SELECT * FROM `" . TABLE_PANEL_FPMDAEMONS . "` ORDER BY `description` ASC");
while ($row = $configs->fetch(PDO::FETCH_ASSOC)) {
$fpmconfigs .= \Froxlor\UI\HTML::makeoption($row['description'], $row['id'], $result['fpmsettingid'], true, true);
$fpmconfigs[$row['id']] = $row['description'];
}
$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', $result['pm'], true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', $result['pm'], true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', $result['pm'], true, true);
$phpconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
$phpconfig_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($phpconfig_edit_data);
$title = $phpconfig_edit_data['phpconfig_edit']['title'];
$image = $phpconfig_edit_data['phpconfig_edit']['image'];
eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_edit") . "\";");
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'phpsettings', 'id' => $id)),
'formdata' => $phpconfig_edit_data['phpconfig_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}
} else {
\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
@@ -217,7 +197,7 @@ if ($page == 'overview') {
foreach ($row['configs'] as $configused) {
$configs .= $configused . "<br>";
}
$count ++;
$count++;
eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmdaemons_overview") . "\";");
}
}
@@ -240,17 +220,13 @@ if ($page == 'overview') {
));
} else {
$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', 'dynamic', true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', 'dynamic', true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', 'dynamic', true, true);
$fpmconfig_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php';
$fpmconfig_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($fpmconfig_add_data);
$title = $fpmconfig_add_data['fpmconfig_add']['title'];
$image = $fpmconfig_add_data['fpmconfig_add']['image'];
eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmconfig_add") . "\";");
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'phpsettings', 'page' => 'fpmdaemons')),
'formdata' => $fpmconfig_add_data['fpmconfig_add']
]);
UI::twigOutputBuffer();
}
} else {
\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');
@@ -321,17 +297,14 @@ if ($page == 'overview') {
));
} else {
$pm_select = \Froxlor\UI\HTML::makeoption('static', 'static', $result['pm'], true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', $result['pm'], true, true);
$pm_select .= \Froxlor\UI\HTML::makeoption('ondemand', 'ondemand', $result['pm'], true, true);
$fpmconfig_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php';
$fpmconfig_edit_form = \Froxlor\UI\HtmlForm::genHTMLForm($fpmconfig_edit_data);
$title = $fpmconfig_edit_data['fpmconfig_edit']['title'];
$image = $fpmconfig_edit_data['fpmconfig_edit']['image'];
eval("echo \"" . \Froxlor\UI\Template::getTemplate("phpconfig/fpmconfig_edit") . "\";");
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'phpsettings', 'page' => 'fpmdaemons', 'id' => $id)),
'formdata' => $fpmconfig_edit_data['fpmconfig_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}
} else {
\Froxlor\UI\Response::standard_error('nopermissionsorinvalidid');

3
admin_plans.php
View File

@@ -228,7 +228,8 @@ if ($page == '' || $page == 'overview') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'plans', 'id' => $id)),
'formdata' => $plans_add_data['plans_add']
'formdata' => $plans_edit_data['plans_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

3
customer_domains.php
View File

@@ -349,7 +349,8 @@ if ($page == 'overview' || $page == 'domains') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'domains', 'id' => $id)),
'formdata' => $subdomain_edit_data['domain_edit']
'formdata' => $subdomain_edit_data['domain_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

3
customer_email.php
View File

@@ -195,7 +195,8 @@ if ($page == 'overview' || $page == 'emails') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'email')),
'formdata' => $email_edit_data['emails_edit']
'formdata' => $email_edit_data['emails_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

6
customer_extras.php
View File

@@ -149,7 +149,8 @@ if ($page == 'overview' || $page == 'htpasswds') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'extras', 'id' => $id)),
'formdata' => $htpasswd_edit_data['htpasswd_edit']
'formdata' => $htpasswd_edit_data['htpasswd_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}
@@ -269,7 +270,8 @@ if ($page == 'overview' || $page == 'htpasswds') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'extras', 'id' => $id)),
'formdata' => $htaccess_edit_data['htaccess_edit']
'formdata' => $htaccess_edit_data['htaccess_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

3
customer_ftp.php
View File

@@ -179,7 +179,8 @@ if ($page == 'overview' || $page == 'accounts') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'ftp', 'id' => $id)),
'formdata' => $ftp_edit_data['ftp_edit']
'formdata' => $ftp_edit_data['ftp_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

3
customer_mysql.php
View File

@@ -185,7 +185,8 @@ if ($page == 'overview' || $page == 'mysqls') {
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'mysql', 'id' => $id)),
'formdata' => $mysql_edit_data['mysql_edit']
'formdata' => $mysql_edit_data['mysql_edit'],
'editid' => $id
]);
UI::twigOutputBuffer();
}

62
lib/Froxlor/UI/Callbacks/PHPConf.php Normal file
View File

@@ -0,0 +1,62 @@
<?php
namespace Froxlor\UI\Callbacks;
use Froxlor\Idna\IdnaWrapper;
use Froxlor\UI\Panel\UI;
/**
* 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
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Froxlor\UI\Callbacks
*
*/
class PHPConf
{
public static function domainList(array $attributes)
{
$idna = new IdnaWrapper;
$domains = "";
$subdomains_count = count($attributes['fields']['subdomains']);
foreach ($attributes['fields']['domains'] as $configdomain) {
$domains .= $idna->decode($configdomain) . "<br>";
}
if ($subdomains_count == 0 && empty($domains)) {
$domains = UI::getLng('admin.phpsettings.notused');
} else {
$domains .= (!empty($domains) ? '+ ' : '') . $subdomains_count . ' ' . UI::getLng(('customer.subdomains'));
}
return $domains;
}
public static function isNotDefault(array $attributes)
{
return $attributes['fields']['id'] != 1;
}
public static function fpmConfLink(array $attributes)
{
$linker = UI::getLinker();
return [
'type' => 'link',
'data' => [
'text' => $attributes['data'],
'href' => $linker->getLink([
'section' => 'phpsettings',
'page' => 'fpmdaemons',
'action' => 'edit',
'id' => $attributes['fields']['fpmsettingid'],
]),
]
];
}
}

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

@@ -43,8 +43,11 @@ return array(
'pm' => array(
'label' => $lng['serversettings']['phpfpm_settings']['pm'],
'type' => 'select',
'select_var' => $pm_select,
'selected' => '@TODO'
'select_var' => [
'static' => 'static',
'dynamic' => 'dynamic',
'ondemand' => 'ondemand'
]
),
'max_children' => array(
'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],

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

@@ -44,8 +44,12 @@ return array(
'pm' => array(
'label' => $lng['serversettings']['phpfpm_settings']['pm'],
'type' => 'select',
'select_var' => $pm_select,
'selected' => '@TODO'
'select_var' => [
'static' => 'static',
'dynamic' => 'dynamic',
'ondemand' => 'ondemand'
],
'selected' => $result['pm']
),
'max_children' => array(
'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],

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

@@ -40,7 +40,7 @@ return array(
'label' => $lng['admin']['phpsettings']['fpmdesc'],
'type' => 'select',
'select_var' => $fpmconfigs,
'selected' => '@TODO'
'selected' => 1
),
'file_extensions' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
@@ -107,8 +107,11 @@ return array(
'label' => $lng['serversettings']['phpfpm_settings']['pm'],
'desc' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'select',
'select_var' => $pm_select,
'selected' => '@TODO'
'select_var' => [
'static' => 'static',
'dynamic' => 'dynamic',
'ondemand' => 'ondemand'
]
),
'max_children' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),

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

@@ -41,7 +41,7 @@ return array(
'label' => $lng['admin']['phpsettings']['fpmdesc'],
'type' => 'select',
'select_var' => $fpmconfigs,
'selected' => '@TODO'
'selected' => $result['fpmsettingid']
),
'file_extensions' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
@@ -55,13 +55,13 @@ return array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_starter']['title'],
'type' => 'number',
'value' => ((int) $result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '')
'value' => ((int) $result['mod_fcgid_starter'] != -1 ? $result['mod_fcgid_starter'] : '')
),
'mod_fcgid_maxrequests' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
'type' => 'number',
'value' => ((int) $result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '')
'value' => ((int) $result['mod_fcgid_maxrequests'] != -1 ? $result['mod_fcgid_maxrequests'] : '')
),
'mod_fcgid_umask' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
@@ -109,8 +109,12 @@ return array(
'label' => $lng['serversettings']['phpfpm_settings']['pm'],
'desc' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'select',
'select_var' => $pm_select,
'selected' => '@TODO'
'select_var' => [
'static' => 'static',
'dynamic' => 'dynamic',
'ondemand' => 'ondemand'
],
'selected' => $result['pm']
),
'max_children' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),

85
lib/tablelisting/admin/tablelisting.phpconfigs.php Normal file
View File

@@ -0,0 +1,85 @@
<?php
/**
* 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
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @author Maurice Preuß <hello@envoyr.com>
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Tabellisting
*
*/
use Froxlor\UI\Callbacks\PHPConf;
use Froxlor\UI\Listing;
use Froxlor\Settings;
return [
'phpconf_list' => [
'title' => $lng['menue']['phpsettings']['maintitle'],
'icon' => 'fa-brands fa-php',
'columns' => [
'c.description' => [
'label' => $lng['admin']['phpsettings']['description'],
'field' => 'description',
],
'domains' => [
'label' => $lng['admin']['phpsettings']['activedomains'],
'field' => 'domains',
'text' => [PHPConf::class, 'domainList']
],
'fpmdesc' => [
'label' => $lng['admin']['phpsettings']['fpmdesc'],
'field' => 'fpmdesc',
'visible' => (bool) Settings::Get('phpfpm.enabled'),
'format_callback' => [PHPConf::class, 'fpmConfLink']
],
'c.binary' => [
'label' => $lng['admin']['phpsettings']['binary'],
'field' => 'binary',
'visible' => !(bool) Settings::Get('phpfpm.enabled')
],
'c.file_extensions' => [
'label' => $lng['admin']['phpsettings']['file_extensions'],
'field' => 'file_extensions',
],
],
'visible_columns' => Listing::getVisibleColumnsForListing('phpconf_list', [
'c.description',
'domains',
'fpmdesc',
'c.binary',
'c.file_extensions'
]),
'actions' => [
'edit' => [
'icon' => 'fa fa-edit',
'title' => $lng['panel']['edit'],
'href' => [
'section' => 'phpsettings',
'page' => 'overview',
'action' => 'edit',
'id' => ':id'
],
],
'delete' => [
'icon' => 'fa fa-trash',
'title' => $lng['panel']['delete'],
'class' => 'text-danger',
'href' => [
'section' => 'phpsettings',
'page' => 'overview',
'action' => 'delete',
'id' => ':id'
],
'visible' => [PHPConf::class, 'isNotDefault']
]
]
]
];

5
templates/Froxlor/form/form.html.twig
View File

@@ -1,4 +1,4 @@
{% macro form(form_data, formaction, title = "") %}
{% macro form(form_data, formaction, title = "", hiddenid = "") %}
{% import "Froxlor/form/formfields.html.twig" as formfields %}
@@ -33,6 +33,9 @@
<!-- submit buttons -->
<div class="card mb-3">
<div class="card-body">
{% if hiddenid is not empty %}
<input type="hidden" name="id" value="{{ hiddenid }}"/>
{% endif %}
<input type="hidden" name="s" value="{{ s }}"/>
<input type="hidden" name="page" value="{{ page }}"/>
<input type="hidden" name="action" value="{{ action }}"/>

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

@@ -4,6 +4,6 @@
{% import "Froxlor/form/form.html.twig" as form %}
{{ form.form(formdata, formaction|default('#'), formdata.title) }}
{{ form.form(formdata, formaction|default('#'), formdata.title, editid|default('')) }}
{% endblock %}

2
templates/misc/php/default.ini.php
View File

@@ -70,5 +70,3 @@ upload_tmp_dir = "{TMP_DIR}"
variables_order = "GPCS"
opcache.restrict_api = "{DOCUMENT_ROOT}"
EOINI;
define('DEFAULT_PHPINI', $phpini);