From c2ec309a01588f02c1e2fc0241ded1467ae07e57 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 09:52:35 +0100 Subject: [PATCH 01/13] more work on tablelisting Signed-off-by: Michael Kaufmann --- customer_domains.php | 70 ++------- lib/Froxlor/UI/Callbacks/Domain.php | 47 ++++++ lib/Froxlor/UI/Callbacks/Text.php | 40 ++--- lib/Froxlor/UI/Collection.php | 17 ++- lib/Froxlor/UI/Panel/UI.php | 17 +++ lib/Froxlor/User.php | 2 +- .../domains/formfield.domains_add.php | 19 ++- lib/init.php | 1 + .../admin/tablelisting.customers.php | 137 ++++++++--------- .../admin/tablelisting.domains.php | 144 +++++++++--------- .../customer/tablelisting.domains.php | 79 ++++++++++ 11 files changed, 336 insertions(+), 237 deletions(-) create mode 100644 lib/Froxlor/UI/Callbacks/Domain.php create mode 100644 lib/tablelisting/customer/tablelisting.domains.php diff --git a/customer_domains.php b/customer_domains.php index 6c30cb57..8d250987 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -39,69 +39,23 @@ if ($page == 'overview') { } elseif ($page == 'domains') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains"); - $fields = array( - 'd.domain_ace' => $lng['domains']['domainname'], - 'd.aliasdomain' => $lng['domains']['aliasdomain'] - ); + + $parentdomain_id = (int) Request::get('pid', '0'); + try { - // get total count - $json_result = SubDomains::getLocal($userinfo)->listingCount(); - $result = json_decode($json_result, true)['data']; - // initialize pagination and filtering - $paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result); - // get list - $json_result = SubDomains::getLocal($userinfo, $paging->getApiCommandParams())->listing(); + $domain_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.domains.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\SubDomains::class, $userinfo)) +// ->addParam(['sql_search' => ['d.parentdomainid' => $parentdomain_id]]) + ->withPagination($domain_list_data['domain_list']['columns']) + ->getList(); } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - $result = json_decode($json_result, true)['data']; - $sortcode = $paging->getHtmlSortCode($lng); - $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); - $searchcode = $paging->getHtmlSearchCode($lng); - $pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s); - $domains = ''; - $parentdomains_count = 0; - $domains_count = $paging->getEntries(); - $domain_array = array(); - - foreach ($result['list'] as $row) { - formatDomainEntry($row, $idna_convert); - if ($row['parentdomainid'] == '0' && $row['caneditdomain'] == '1') { - $parentdomains_count++; - } - $domain_array[$row['parentdomainname']][] = $row; - } - - foreach ($domain_array as $parentdomain => $sdomains) { - // PARENTDOMAIN - if (Settings::Get('system.awstats_enabled') == '1') { - $statsapp = 'awstats'; - } else { - $statsapp = 'webalizer'; - } - $row = [ - 'domain' => $idna_convert->decode($parentdomain) - ]; - eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_delimiter") . "\";"); - - foreach ($sdomains as $domain) { - $row = \Froxlor\PhpHelper::htmlentitiesArray($domain); - - // show docroot nicely - if (strpos($row['documentroot'], $userinfo['documentroot']) === 0) { - $row['documentroot'] = \Froxlor\FileDir::makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['documentroot'])); - } - // get ssl-ips if activated - $show_ssledit = false; - if (Settings::Get('system.use_ssl') == '1' && \Froxlor\Domain\Domain::domainHasSslIpPort($row['id']) && $row['caneditdomain'] == '1' && $row['letsencrypt'] == 0) { - $show_ssledit = true; - } - eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_domain") . "\";"); - } - } - - eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domainlist") . "\";"); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $domain_list_data['domain_list']), + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { $json_result = SubDomains::getLocal($userinfo, array( diff --git a/lib/Froxlor/UI/Callbacks/Domain.php b/lib/Froxlor/UI/Callbacks/Domain.php new file mode 100644 index 00000000..7ba4ad8e --- /dev/null +++ b/lib/Froxlor/UI/Callbacks/Domain.php @@ -0,0 +1,47 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Listing + * + */ + +class Domain +{ + public static function domainTarget(string $data, array $attributes): mixed + { + if (empty($attributes['aliasdomain'])) { + // path or redirect + if (preg_match('/^https?\:\/\//', $attributes['documentroot'])) { + return [ + 'type' => 'link', + 'data' => [ + 'text' => $attributes['documentroot'], + 'href' => $attributes['documentroot'], + 'target' => '_blank' + ] + ]; + } else { + // show docroot nicely + if (strpos($attributes['documentroot'], UI::getCurrentUser()['documentroot']) === 0) { + $attributes['documentroot'] = \Froxlor\FileDir::makeCorrectDir(str_replace(UI::getCurrentUser()['documentroot'], "/", $attributes['documentroot'])); + } + return $attributes['documentroot']; + } + } + return UI::getLng('domains.aliasdomain') . ' ' . $attributes['aliasdomain']; + } +} diff --git a/lib/Froxlor/UI/Callbacks/Text.php b/lib/Froxlor/UI/Callbacks/Text.php index 04d9b4e0..cdf3e301 100644 --- a/lib/Froxlor/UI/Callbacks/Text.php +++ b/lib/Froxlor/UI/Callbacks/Text.php @@ -1,4 +1,5 @@ 'boolean', - 'data' => (bool) $data - ]; - } + public static function boolean(?string $data): array + { + return [ + 'type' => 'boolean', + 'data' => (bool) $data + ]; + } - public static function domainWithSan(string $data, array $attributes): array - { - return [ - 'type' => 'domainWithSan', - 'data' => [ - 'domain' => $data, - 'san' => implode(', ', $attributes['san'] ?? []), - ] - ]; - } + public static function domainWithSan(string $data, array $attributes): array + { + return [ + 'type' => 'domainWithSan', + 'data' => [ + 'domain' => $data, + 'san' => implode(', ', $attributes['san'] ?? []), + ] + ]; + } + + public static function customerfullname(string $data, array $attributes): string + { + return \Froxlor\User::getCorrectFullUserDetails($attributes); + } } diff --git a/lib/Froxlor/UI/Collection.php b/lib/Froxlor/UI/Collection.php index 82f216c8..bdc67e7f 100644 --- a/lib/Froxlor/UI/Collection.php +++ b/lib/Froxlor/UI/Collection.php @@ -81,16 +81,23 @@ class Collection public function has(string $column, string $class, string $parentKey = 'id', string $childKey = 'id', array $params = []): Collection { $this->has[] = [ - 'column' => $column, - 'class' => $class, - 'parentKey' => $parentKey, - 'childKey' => $childKey, - 'params' => $params + 'column' => $column, + 'class' => $class, + 'parentKey' => $parentKey, + 'childKey' => $childKey, + 'params' => $params ]; return $this; } + public function addParam(array $keyval): Collection + { + $this->params = array_merge($this->params, $keyval); + + return $this; + } + public function withPagination(array $columns): Collection { // TODO: handle 'sortable' => true in $columns diff --git a/lib/Froxlor/UI/Panel/UI.php b/lib/Froxlor/UI/Panel/UI.php index 9025b610..696ca466 100644 --- a/lib/Froxlor/UI/Panel/UI.php +++ b/lib/Froxlor/UI/Panel/UI.php @@ -35,6 +35,13 @@ class UI */ private static $linker = null; + /** + * current logged in user + * + * @var array + */ + private static $userinfo = []; + /** * default fallback theme * @@ -224,6 +231,16 @@ class UI return self::$linker; } + public static function setCurrentUser($userinfo = null) + { + self::$userinfo = $userinfo; + } + + public static function getCurrentUser(): array + { + return self::$userinfo; + } + public static function setLng($lng = array()) { self::$lng = $lng; diff --git a/lib/Froxlor/User.php b/lib/Froxlor/User.php index 717579e9..0600683d 100644 --- a/lib/Froxlor/User.php +++ b/lib/Froxlor/User.php @@ -24,7 +24,7 @@ class User $returnval = $userinfo['name'] . ', ' . $userinfo['firstname']; } else { if ($userinfo['name'] != '' && $userinfo['firstname'] != '') { - $returnval = $userinfo['name'] . ', ' . $userinfo['firstname'] . ' | ' . $userinfo['company']; + $returnval = $userinfo['name'] . ', ' . $userinfo['firstname'] . '
' . $userinfo['company'] . ''; } else { $returnval = $userinfo['company']; } diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index 937975e6..914848f0 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -14,6 +14,9 @@ * @package Formfields * */ + +use Froxlor\Settings; + return array( 'domain_add' => array( 'title' => $lng['domains']['subdomain_add'], @@ -41,19 +44,19 @@ return array( ), 'path' => array( 'label' => $lng['panel']['path'], - 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null), + 'desc' => (Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['select_var'] ?? '', 'value' => $pathSelect['value'], 'note' => $pathSelect['note'] ?? '', ), 'url' => array( - 'visible' => (\Froxlor\Settings::Get('panel.pathedit') == 'Dropdown' ? true : false), + 'visible' => (Settings::Get('panel.pathedit') == 'Dropdown' ? true : false), 'label' => $lng['panel']['urloverridespath'], 'type' => 'text' ), 'redirectcode' => array( - 'visible' => (\Froxlor\Settings::Get('customredirect.enabled') == '1' ? true : false), + 'visible' => (Settings::Get('customredirect.enabled') == '1' ? true : false), 'label' => $lng['domains']['redirectifpathisurl'], 'desc' => $lng['domains']['redirectifpathisurlinfo'], 'type' => 'select', @@ -71,18 +74,18 @@ return array( 'select_var' => $openbasedir ), 'phpsettingid' => array( - 'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) && count($phpconfigs) > 0 ? true : false), + 'visible' => (((int) Settings::Get('system.mod_fcgid') == 1 || (int) Settings::Get('phpfpm.enabled') == 1) && count($phpconfigs) > 0 ? true : false), 'label' => $lng['admin']['phpsettings']['title'], 'type' => 'select', 'select_var' => $phpconfigs, - 'selected' => (int) Settings::Get('phpfpm.enabled') == 1) ? Settings::Get('phpfpm.defaultini') : Settings::Get('system.mod_fcgid_defaultini') + 'selected' => (int) Settings::Get('phpfpm.enabled') == 1 ? Settings::Get('phpfpm.defaultini') : Settings::Get('system.mod_fcgid_defaultini') ) ) ), 'section_bssl' => array( 'title' => $lng['admin']['webserversettings_ssl'], 'image' => 'icons/domain_add.png', - 'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports ? true : false) : false, + 'visible' => Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports ? true : false) : false, 'fields' => array( 'sslenabled' => array( 'label' => $lng['admin']['domain_sslenabled'], @@ -98,7 +101,7 @@ return array( 'checked' => false ), 'letsencrypt' => array( - 'visible' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? true : false), + 'visible' => (Settings::Get('system.leenabled') == '1' ? true : false), 'label' => $lng['customer']['letsencrypt']['title'], 'desc' => $lng['customer']['letsencrypt']['description'], 'type' => 'checkbox', @@ -106,7 +109,7 @@ return array( 'checked' => false ), 'http2' => array( - 'visible' => ($ssl_ipsandports ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1', + 'visible' => ($ssl_ipsandports ? true : false) && Settings::Get('system.webserver') != 'lighttpd' && Settings::Get('system.http2_support') == '1', 'label' => $lng['admin']['domain_http2']['title'], 'desc' => $lng['admin']['domain_http2']['description'], 'type' => 'checkbox', diff --git a/lib/init.php b/lib/init.php index 5c64f2c6..c82a8320 100644 --- a/lib/init.php +++ b/lib/init.php @@ -362,6 +362,7 @@ if ($nosession == 1 && AREA != 'login') { } UI::twig()->addGlobal('userinfo', ($userinfo ?? [])); +UI::setCurrentUser($userinfo); /** * Logic moved out of lng-file diff --git a/lib/tablelisting/admin/tablelisting.customers.php b/lib/tablelisting/admin/tablelisting.customers.php index 629bf7a4..b431c698 100644 --- a/lib/tablelisting/admin/tablelisting.customers.php +++ b/lib/tablelisting/admin/tablelisting.customers.php @@ -16,81 +16,74 @@ * */ +use Froxlor\UI\Callbacks\Text; use Froxlor\UI\Callbacks\Impersonate; use Froxlor\UI\Callbacks\ProgressBar; use Froxlor\UI\Listing; return [ - 'customer_list' => [ - 'title' => $lng['admin']['customers'], - 'icon' => 'fa-solid fa-user', - 'columns' => [ - 'c.loginname' => [ - 'label' => $lng['login']['username'], - 'column' => 'loginname', - 'format_callback' => [Impersonate::class, 'customer'], - ], - 'a.loginname' => [ - 'label' => $lng['admin']['admin'], - 'column' => 'admin.loginname', - 'format_callback' => [Impersonate::class, 'admin'], - ], - 'c.name' => [ - 'label' => $lng['customer']['name'], - 'column' => 'name', - ], - 'c.email' => [ - 'label' => $lng['customer']['email'], - 'column' => 'email', - ], - 'c.firstname' => [ - 'label' => $lng['customer']['firstname'], - 'column' => 'firstname', - ], - 'c.company' => [ - 'label' => $lng['customer']['company'], - 'column' => 'company', - ], - 'c.diskspace' => [ - 'label' => $lng['customer']['diskspace'], - 'column' => 'diskspace', - 'format_callback' => [ProgressBar::class, 'diskspace'], - ], - 'c.traffic' => [ - 'label' => $lng['customer']['traffic'], - 'column' => 'traffic', - 'format_callback' => [ProgressBar::class, 'traffic'], - ], - ], - 'visible_columns' => Listing::getVisibleColumnsForListing('customer_list', [ - 'c.loginname', - 'a.loginname', - 'c.email', - 'c.firstname', - 'c.company', - 'c.diskspace', - 'c.traffic', - ]), - 'actions' => [ - 'edit' => [ - 'icon' => 'fa fa-edit', - 'href' => [ - 'section' => 'customers', - 'page' => 'customers', - 'action' => 'edit', - 'id' => ':customerid' - ], - ], - 'delete' => [ - 'icon' => 'fa fa-trash', - 'class' => 'text-danger', - 'href' => [ - 'section' => 'customers', - 'page' => 'customers', - 'action' => 'delete', - 'id' => ':customerid' - ], - ], - ], - ] + 'customer_list' => [ + 'title' => $lng['admin']['customers'], + 'icon' => 'fa-solid fa-user', + 'columns' => [ + 'c.name' => [ + 'label' => $lng['customer']['name'], + 'column' => 'name', + 'format_callback' => [Text::class, 'customerfullname'], + ], + 'c.loginname' => [ + 'label' => $lng['login']['username'], + 'column' => 'loginname', + 'format_callback' => [Impersonate::class, 'customer'], + ], + 'a.loginname' => [ + 'label' => $lng['admin']['admin'], + 'column' => 'admin.loginname', + 'format_callback' => [Impersonate::class, 'admin'], + ], + 'c.email' => [ + 'label' => $lng['customer']['email'], + 'column' => 'email', + ], + 'c.diskspace' => [ + 'label' => $lng['customer']['diskspace'], + 'column' => 'diskspace', + 'format_callback' => [ProgressBar::class, 'diskspace'], + ], + 'c.traffic' => [ + 'label' => $lng['customer']['traffic'], + 'column' => 'traffic', + 'format_callback' => [ProgressBar::class, 'traffic'], + ], + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('customer_list', [ + 'c.name', + 'c.loginname', + 'a.loginname', + 'c.email', + 'c.diskspace', + 'c.traffic', + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'customers', + 'page' => 'customers', + 'action' => 'edit', + 'id' => ':customerid' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'customers', + 'page' => 'customers', + 'action' => 'delete', + 'id' => ':customerid' + ], + ], + ], + ] ]; diff --git a/lib/tablelisting/admin/tablelisting.domains.php b/lib/tablelisting/admin/tablelisting.domains.php index fb54fdcc..42001055 100644 --- a/lib/tablelisting/admin/tablelisting.domains.php +++ b/lib/tablelisting/admin/tablelisting.domains.php @@ -16,84 +16,76 @@ * */ +use Froxlor\UI\Callbacks\Text; use Froxlor\UI\Callbacks\Impersonate; use Froxlor\UI\Listing; return [ - 'domain_list' => [ - 'title' => $lng['admin']['domains'], - 'icon' => 'fa-solid fa-user', - 'columns' => [ - 'd.domain_ace' => [ - 'label' => $lng['domains']['domainname'], - 'column' => 'domain_ace', - ], - 'c.name' => [ - 'label' => $lng['customer']['name'], - 'column' => 'customer.name', - ], - 'c.firstname' => [ - 'label' => $lng['customer']['firstname'], - 'column' => 'customer.firstname', - ], - 'c.company' => [ - 'label' => $lng['customer']['company'], - 'column' => 'customer.company', - ], - 'c.loginname' => [ - 'label' => $lng['login']['username'], - 'column' => 'customer.loginname', - 'format_callback' => [Impersonate::class, 'customer'], - ], - 'd.aliasdomain' => [ - 'label' => $lng['domains']['aliasdomain'], - 'column' => 'aliasdomain', - ], - ], - 'visible_columns' => Listing::getVisibleColumnsForListing('domain_list', [ - 'd.domain_ace', - 'c.name', - 'c.firstname', - 'c.company', - 'c.loginname', - 'd.aliasdomain', - ]), - 'actions' => [ - 'edit' => [ - 'icon' => 'fa fa-edit', - 'href' => [ - 'section' => 'domains', - 'page' => 'domains', - 'action' => 'edit', - 'id' => ':id' - ], - ], - 'logfiles' => [ - 'icon' => 'fa fa-file', - 'href' => [ - 'section' => 'domains', - 'page' => 'logfiles', - 'domain_id' => ':id' - ], - ], - 'domaindnseditor' => [ - 'icon' => 'fa fa-globe', - 'href' => [ - 'section' => 'domains', - 'page' => 'domaindnseditor', - 'domain_id' => ':id' - ], - ], - 'delete' => [ - 'icon' => 'fa fa-trash', - 'class' => 'text-danger', - 'href' => [ - 'section' => 'domains', - 'page' => 'domains', - 'action' => 'delete', - 'id' => ':id' - ], - ], - ] - ] + 'domain_list' => [ + 'title' => $lng['admin']['domains'], + 'icon' => 'fa-solid fa-user', + 'columns' => [ + 'd.domain_ace' => [ + 'label' => $lng['domains']['domainname'], + 'column' => 'domain_ace', + ], + 'c.name' => [ + 'label' => $lng['customer']['name'], + 'column' => 'customer.name', + 'format_callback' => [Text::class, 'customerfullname'], + ], + 'c.loginname' => [ + 'label' => $lng['login']['username'], + 'column' => 'customer.loginname', + 'format_callback' => [Impersonate::class, 'customer'], + ], + 'd.aliasdomain' => [ + 'label' => $lng['domains']['aliasdomain'], + 'column' => 'aliasdomain', + ], + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('domain_list', [ + 'd.domain_ace', + 'c.name', + 'c.loginname', + 'd.aliasdomain', + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'domains', + 'page' => 'domains', + 'action' => 'edit', + 'id' => ':id' + ], + ], + 'logfiles' => [ + 'icon' => 'fa fa-file', + 'href' => [ + 'section' => 'domains', + 'page' => 'logfiles', + 'domain_id' => ':id' + ], + ], + 'domaindnseditor' => [ + 'icon' => 'fa fa-globe', + 'href' => [ + 'section' => 'domains', + 'page' => 'domaindnseditor', + 'domain_id' => ':id' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'domains', + 'page' => 'domains', + 'action' => 'delete', + 'id' => ':id' + ], + ] + ] + ] ]; diff --git a/lib/tablelisting/customer/tablelisting.domains.php b/lib/tablelisting/customer/tablelisting.domains.php new file mode 100644 index 00000000..84ba85f5 --- /dev/null +++ b/lib/tablelisting/customer/tablelisting.domains.php @@ -0,0 +1,79 @@ + (2010-) + * @author Maurice Preuß + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Tabellisting + * + */ + +use Froxlor\UI\Callbacks\Domain; +use Froxlor\UI\Listing; + +return [ + 'domain_list' => [ + 'title' => $lng['admin']['domains'], + 'icon' => 'fa-solid fa-user', + 'columns' => [ + 'd.domain_ace' => [ + 'label' => $lng['domains']['domainname'], + 'column' => 'domain_ace', + ], + 'd.documentroot' => [ + 'label' => $lng['panel']['path'], + 'column' => 'documentroot', + 'format_callback' => [Domain::class, 'domainTarget'], + ] + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('domain_list', [ + 'd.domain_ace', + 'd.documentroot' + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'domains', + 'page' => 'domains', + 'action' => 'edit', + 'id' => ':id' + ], + ], + 'logfiles' => [ + 'icon' => 'fa fa-file', + 'href' => [ + 'section' => 'domains', + 'page' => 'logfiles', + 'domain_id' => ':id' + ], + ], + 'domaindnseditor' => [ + 'icon' => 'fa fa-globe', + 'href' => [ + 'section' => 'domains', + 'page' => 'domaindnseditor', + 'domain_id' => ':id' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'domains', + 'page' => 'domains', + 'action' => 'delete', + 'id' => ':id' + ], + ] + ] + ] +]; From 5b675c25a329fed528e4c1b44e4e02448fa6e377 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 10:10:47 +0100 Subject: [PATCH 02/13] don't show SU link for yourself Signed-off-by: Michael Kaufmann --- lib/Froxlor/UI/Callbacks/Impersonate.php | 70 +++++++++++++----------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/lib/Froxlor/UI/Callbacks/Impersonate.php b/lib/Froxlor/UI/Callbacks/Impersonate.php index c9b508f1..3d3bea32 100644 --- a/lib/Froxlor/UI/Callbacks/Impersonate.php +++ b/lib/Froxlor/UI/Callbacks/Impersonate.php @@ -1,4 +1,5 @@ 'link', - 'data' => [ - 'text' => $data, - 'href' => $linker->getLink([ - 'section' => 'admins', - 'page' => 'admins', - 'action' => 'su', - 'id' => $attributes['adminid'], - ]), - ] - ]; - } + public static function admin(string $data, array $attributes): mixed + { + if (UI::getCurrentUser()['adminid'] != $attributes['adminid']) { + $linker = UI::getLinker(); + return [ + 'type' => 'link', + 'data' => [ + 'text' => $data, + 'href' => $linker->getLink([ + 'section' => 'admins', + 'page' => 'admins', + 'action' => 'su', + 'id' => $attributes['adminid'], + ]), + ] + ]; + } + return $data; + } - public static function customer(string $data, array $attributes): array - { - $linker = UI::getLinker(); - return [ - 'type' => 'link', - 'data' => [ - 'text' => $data, - 'href' => $linker->getLink([ - 'section' => 'customers', - 'page' => 'customers', - 'action' => 'su', - 'sort' => $attributes['loginname'], - 'id' => $attributes['customerid'], - ]), - ] - ]; - } + public static function customer(string $data, array $attributes): array + { + $linker = UI::getLinker(); + return [ + 'type' => 'link', + 'data' => [ + 'text' => $data, + 'href' => $linker->getLink([ + 'section' => 'customers', + 'page' => 'customers', + 'action' => 'su', + 'sort' => $attributes['loginname'], + 'id' => $attributes['customerid'], + ]), + ] + ]; + } } From c7cc2d435746248108047da55841ca30b8325e6d Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 11:22:00 +0100 Subject: [PATCH 03/13] email listing Signed-off-by: Michael Kaufmann --- customer_email.php | 91 ++----------------- lib/Froxlor/UI/Callbacks/Email.php | 35 +++++++ .../email/formfield.emails_addaccount.php | 2 +- .../email/formfield.emails_addforwarder.php | 2 +- .../customer/tablelisting.emails.php | 83 +++++++++++++++++ templates/Froxlor/form/formfields.html.twig | 2 +- templates/Froxlor/table/callbacks.html.twig | 11 +++ templates/Froxlor/table/table.html.twig | 2 + 8 files changed, 143 insertions(+), 85 deletions(-) create mode 100644 lib/Froxlor/UI/Callbacks/Email.php create mode 100644 lib/tablelisting/customer/tablelisting.emails.php diff --git a/customer_email.php b/customer_email.php index 93f9da5c..9cd97b8c 100644 --- a/customer_email.php +++ b/customer_email.php @@ -40,91 +40,15 @@ if ($page == 'overview') { } elseif ($page == 'emails') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_email::emails"); - $fields = array( - 'd.domain_ace' => $lng['domains']['domainname'], - 'm.email_full' => $lng['emails']['emailaddress'], - 'm.destination' => $lng['emails']['forwarders'] - ); + try { - // get total count - $json_result = Emails::getLocal($userinfo)->listingCount(); - $result = json_decode($json_result, true)['data']; - // initialize pagination and filtering - $paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result); - // get list - $json_result = Emails::getLocal($userinfo, $paging->getApiCommandParams())->listing(); + $email_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.emails.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Emails::class, $userinfo)) + ->withPagination($email_list_data['email_list']['columns']) + ->getList(); } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - $result = json_decode($json_result, true)['data']; - - $sortcode = $paging->getHtmlSortCode($lng); - $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); - $searchcode = $paging->getHtmlSearchCode($lng); - $pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s); - $emails = array(); - $emailscount = $paging->getEntries(); - - foreach ($result['list'] as $row) { - if (! isset($emails[$row['domain']]) || ! is_array($emails[$row['domain']])) { - $emails[$row['domain']] = array(); - } - - $emails[$row['domain']][$row['email_full']] = $row; - } - - if ($paging->sortfield == 'd.domain_ace' && $paging->sortorder == 'desc') { - krsort($emails); - } else { - ksort($emails); - } - - $count = 0; - $accounts = ''; - $emails_count = 0; - $domainname = ''; - foreach ($emails as $domainid => $emailaddresses) { - if ($paging->sortfield == 'm.email_full' && $paging->sortorder == 'desc') { - krsort($emailaddresses); - } else { - ksort($emailaddresses); - } - - foreach ($emailaddresses as $row) { - if ($domainname != $idna_convert->decode($row['domain'])) { - $domainname = $idna_convert->decode($row['domain']); - eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate("email/emails_domain") . "\";"); - } - - $emails_count ++; - $row['email'] = $idna_convert->decode($row['email']); - $row['email_full'] = $idna_convert->decode($row['email_full']); - $row['destination'] = explode(' ', $row['destination']); - uasort($row['destination'], 'strcasecmp'); - - $dest_list = $row['destination']; - foreach ($dest_list as $dest_id => $destination) { - $row['destination'][$dest_id] = $idna_convert->decode($row['destination'][$dest_id]); - - if ($row['destination'][$dest_id] == $row['email_full']) { - unset($row['destination'][$dest_id]); - } - } - - $destinations_count = count($row['destination']); - $row['destination'] = implode(', ', $row['destination']); - - if (strlen($row['destination']) > 35) { - $row['destination'] = substr($row['destination'], 0, 32) . '... (' . $destinations_count . ')'; - } - - $row['mboxsize'] = \Froxlor\PhpHelper::sizeReadable($row['mboxsize'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s'); - - $row = \Froxlor\PhpHelper::htmlentitiesArray($row); - eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate("email/emails_email") . "\";"); - $count ++; - } - } $result_stmt = Database::prepare(" SELECT COUNT(`id`) as emaildomains @@ -136,7 +60,10 @@ if ($page == 'overview') { )); $emaildomains_count = $result2['emaildomains']; - eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/emails") . "\";"); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $email_list_data['email_list']), + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { $json_result = Emails::getLocal($userinfo, array( diff --git a/lib/Froxlor/UI/Callbacks/Email.php b/lib/Froxlor/UI/Callbacks/Email.php new file mode 100644 index 00000000..03e1a164 --- /dev/null +++ b/lib/Froxlor/UI/Callbacks/Email.php @@ -0,0 +1,35 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Listing + * + */ + +class Email +{ + public static function account(string $data, array $attributes): mixed + { + return [ + 'type' => 'booleanWithInfo', + 'data' => [ + 'checked' => $data != 0, + 'info' => $data != 0 ? PhpHelper::sizeReadable($attributes['mboxsize'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s') : '' + ] + ]; + } +} diff --git a/lib/formfields/customer/email/formfield.emails_addaccount.php b/lib/formfields/customer/email/formfield.emails_addaccount.php index e57db43d..08e3827c 100644 --- a/lib/formfields/customer/email/formfield.emails_addaccount.php +++ b/lib/formfields/customer/email/formfield.emails_addaccount.php @@ -23,7 +23,7 @@ return array( 'title' => $lng['emails']['account_add'], 'image' => 'icons/email_add.png', 'fields' => array( - 'email_full' => array( + 'emailaddr' => array( 'label' => $lng['emails']['emailaddress'], 'type' => 'label', 'value' => $result['email_full'] diff --git a/lib/formfields/customer/email/formfield.emails_addforwarder.php b/lib/formfields/customer/email/formfield.emails_addforwarder.php index 2b3fee44..5900f55f 100644 --- a/lib/formfields/customer/email/formfield.emails_addforwarder.php +++ b/lib/formfields/customer/email/formfield.emails_addforwarder.php @@ -23,7 +23,7 @@ return array( 'title' => $lng['emails']['forwarder_add'], 'image' => 'icons/autoresponder_add.png', 'fields' => array( - 'email_full' => array( + 'emailaddr' => array( 'label' => $lng['emails']['from'], 'type' => 'label', 'value' => $result['email_full'] diff --git a/lib/tablelisting/customer/tablelisting.emails.php b/lib/tablelisting/customer/tablelisting.emails.php new file mode 100644 index 00000000..b4f79cae --- /dev/null +++ b/lib/tablelisting/customer/tablelisting.emails.php @@ -0,0 +1,83 @@ + (2010-) + * @author Maurice Preuß + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Tabellisting + * + */ + +use Froxlor\UI\Callbacks\Email; +use Froxlor\UI\Callbacks\Text; +use Froxlor\UI\Listing; + +return [ + 'email_list' => [ + 'title' => $lng['menue']['email']['emails'], + 'icon' => 'fa-solid fa-envelope', + 'columns' => [ + 'm.email_full' => [ + 'label' => $lng['emails']['emailaddress'], + 'column' => 'email_full', + ], + 'm.destination' => [ + 'label' => $lng['emails']['forwarders'], + 'column' => 'destination', + // @todo formatting + ], + 'm.popaccountid' => [ + 'label' => $lng['emails']['account'], + 'column' => 'popaccountid', + 'format_callback' => [Email::class, 'account'], + ], + 'm.iscatchall' => [ + 'label' => $lng['emails']['catchall'], + 'column' => 'iscatchall', + 'format_callback' => [Text::class, 'boolean'], + 'visible' => \Froxlor\Settings::Get('catchall.catchall_enabled') == '1' + ], + 'm.quota' => [ + 'label' => $lng['emails']['quota'], + 'column' => 'quota', + 'visible' => \Froxlor\Settings::Get('system.mail_quota_enabled') == '1' + ] + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('email_list', [ + 'm.email_full', + 'm.destination', + 'm.popaccountid', + 'm.iscatchall', + 'm.quota' + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'email', + 'page' => 'emails', + 'action' => 'edit', + 'id' => ':id' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'email', + 'page' => 'emails', + 'action' => 'delete', + 'id' => ':id' + ], + ] + ] + ] +]; diff --git a/templates/Froxlor/form/formfields.html.twig b/templates/Froxlor/form/formfields.html.twig index 1304ef99..08920022 100644 --- a/templates/Froxlor/form/formfields.html.twig +++ b/templates/Froxlor/form/formfields.html.twig @@ -53,7 +53,7 @@ {% if field.next_to is defined %}
{% endif %} - + {% if field.next_to is defined %} {% for nid, nfield in field.next_to %} {% if nfield.next_to_prefix is defined %} diff --git a/templates/Froxlor/table/callbacks.html.twig b/templates/Froxlor/table/callbacks.html.twig index 0258ad1d..421bba1e 100644 --- a/templates/Froxlor/table/callbacks.html.twig +++ b/templates/Froxlor/table/callbacks.html.twig @@ -18,6 +18,17 @@ {% endif %} {% endmacro %} +{% macro booleanWithInfo(data) %} + {% if (data.checked) %} + + {% else %} + + {% endif %} + {% if data.info is not empty %} + {{ data.info }} + {% endif %} +{% endmacro %} + {% macro link(data) %} {% apply spaceless %} diff --git a/templates/Froxlor/table/table.html.twig b/templates/Froxlor/table/table.html.twig index 157ee887..cbd7ab65 100644 --- a/templates/Froxlor/table/table.html.twig +++ b/templates/Froxlor/table/table.html.twig @@ -31,6 +31,8 @@ {{ callbacks.progressbar(td.data.data) }} {% elseif td.data.type == 'boolean' %} {{ callbacks.boolean(td.data.data) }} + {% elseif td.data.type == 'booleanWithInfo' %} + {{ callbacks.booleanWithInfo(td.data.data) }} {% elseif td.data.type == 'link' %} {{ callbacks.link(td.data.data) }} {% elseif td.data.type == 'domainWithSan' %} From 038b6f9510dbad12697db4b2e7d3988be3915b75 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 14:25:58 +0100 Subject: [PATCH 04/13] customer ftp/mysql listing Signed-off-by: Michael Kaufmann --- customer_ftp.php | 41 ++-------- customer_mysql.php | 54 +++---------- lib/Froxlor/UI/Callbacks/Ftp.php | 33 ++++++++ lib/Froxlor/UI/Callbacks/Mysql.php | 34 +++++++++ .../customer/tablelisting.ftps.php | 74 ++++++++++++++++++ .../customer/tablelisting.mysqls.php | 76 +++++++++++++++++++ 6 files changed, 236 insertions(+), 76 deletions(-) create mode 100644 lib/Froxlor/UI/Callbacks/Ftp.php create mode 100644 lib/Froxlor/UI/Callbacks/Mysql.php create mode 100644 lib/tablelisting/customer/tablelisting.ftps.php create mode 100644 lib/tablelisting/customer/tablelisting.mysqls.php diff --git a/customer_ftp.php b/customer_ftp.php index 99743677..cd9b40bc 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -38,44 +38,19 @@ if ($page == 'overview') { } elseif ($page == 'accounts') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts"); - $fields = array( - 'username' => $lng['login']['username'], - 'homedir' => $lng['panel']['path'], - 'description' => $lng['panel']['ftpdesc'] - ); try { - // get total count - $json_result = Ftps::getLocal($userinfo)->listingCount(); - $result = json_decode($json_result, true)['data']; - // initialize pagination and filtering - $paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result); - // get list - $json_result = Ftps::getLocal($userinfo, $paging->getApiCommandParams())->listing(); + $ftp_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.ftps.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Ftps::class, $userinfo)) + ->withPagination($ftp_list_data['ftp_list']['columns']) + ->getList(); } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - $result = json_decode($json_result, true)['data']; - $ftps_count = $paging->getEntries(); - $sortcode = $paging->getHtmlSortCode($lng); - $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); - $searchcode = $paging->getHtmlSearchCode($lng); - $pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s); - $count = 0; - $accounts = ''; - foreach ($result['list'] as $row) { - if (strpos($row['homedir'], $userinfo['documentroot']) === 0) { - $row['documentroot'] = str_replace($userinfo['documentroot'], "/", $row['homedir']); - } else { - $row['documentroot'] = $row['homedir']; - } - $row['documentroot'] = \Froxlor\FileDir::makeCorrectDir($row['documentroot']); - $row = \Froxlor\PhpHelper::htmlentitiesArray($row); - eval("\$accounts.=\"" . \Froxlor\UI\Template::getTemplate('ftp/accounts_account') . "\";"); - $count++; - } - - eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/accounts') . "\";"); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $ftp_list_data['ftp_list']), + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { $json_result = Ftps::getLocal($userinfo, array( diff --git a/customer_mysql.php b/customer_mysql.php index 895841e0..4db4fda9 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -47,56 +47,24 @@ if ($page == 'overview') { } elseif ($page == 'mysqls') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls"); - $fields = array( - 'databasename' => $lng['mysql']['databasename'], - 'description' => $lng['mysql']['databasedescription'] - ); - try { - // get total count - $json_result = Mysqls::getLocal($userinfo)->listingCount(); - $result = json_decode($json_result, true)['data']; - // initialize pagination and filtering - $paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result); - // get list - $json_result = Mysqls::getLocal($userinfo, $paging->getApiCommandParams())->listing(); - } catch (Exception $e) { - \Froxlor\UI\Response::dynamic_error($e->getMessage()); - } - $result = json_decode($json_result, true)['data']; - - $mysqls_count = $paging->getEntries(); - $sortcode = $paging->getHtmlSortCode($lng); - $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); - $searchcode = $paging->getHtmlSearchCode($lng); - $pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s); - $count = 0; - $mysqls = ''; $dbservers_stmt = Database::query("SELECT COUNT(DISTINCT `dbserver`) as numservers FROM `" . TABLE_PANEL_DATABASES . "`"); $dbserver = $dbservers_stmt->fetch(PDO::FETCH_ASSOC); $count_mysqlservers = $dbserver['numservers']; - // Begin root-session - Database::needRoot(true); - foreach ($result['list'] as $row) { - $row = \Froxlor\PhpHelper::htmlentitiesArray($row); - $mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) as MB FROM information_schema.TABLES - WHERE table_schema = :table_schema - GROUP BY table_schema"); - $mbdata = Database::pexecute_first($mbdata_stmt, array( - "table_schema" => $row['databasename'] - )); - if (!$mbdata) { - $mbdata = array('MB' => 0); - } - $row['size'] = \Froxlor\PhpHelper::sizeReadable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s'); - eval("\$mysqls.=\"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_database') . "\";"); - $count++; + try { + $mysql_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.mysqls.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Mysqls::class, $userinfo)) + ->withPagination($mysql_list_data['mysql_list']['columns']) + ->getList(); + } catch (Exception $e) { + \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - Database::needRoot(false); - // End root-session - eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls') . "\";"); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $mysql_list_data['mysql_list']), + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { diff --git a/lib/Froxlor/UI/Callbacks/Ftp.php b/lib/Froxlor/UI/Callbacks/Ftp.php new file mode 100644 index 00000000..31f575ab --- /dev/null +++ b/lib/Froxlor/UI/Callbacks/Ftp.php @@ -0,0 +1,33 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Listing + * + */ + +class Ftp +{ + public static function pathRelative(string $data, array $attributes): string + { + if (strpos($data, UI::getCurrentUser()['documentroot']) === 0) { + $data = str_replace(UI::getCurrentUser()['documentroot'], "/", $data); + } + $data = \Froxlor\FileDir::makeCorrectDir($data); + + return $data; + } +} diff --git a/lib/Froxlor/UI/Callbacks/Mysql.php b/lib/Froxlor/UI/Callbacks/Mysql.php new file mode 100644 index 00000000..f3e83411 --- /dev/null +++ b/lib/Froxlor/UI/Callbacks/Mysql.php @@ -0,0 +1,34 @@ + (2010-) + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Listing + * + */ + +class Mysql +{ + public static function dbserver(string $data, array $attributes): string + { + // get sql-root access data + Database::needRoot(true, (int) $data); + Database::needSqlData(); + $sql_root = Database::getSqlData(); + Database::needRoot(false); + + return $sql_root['caption'] . '
' . $sql_root['host'] . ''; + } +} diff --git a/lib/tablelisting/customer/tablelisting.ftps.php b/lib/tablelisting/customer/tablelisting.ftps.php new file mode 100644 index 00000000..ce338c49 --- /dev/null +++ b/lib/tablelisting/customer/tablelisting.ftps.php @@ -0,0 +1,74 @@ + (2010-) + * @author Maurice Preuß + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Tabellisting + * + */ + +use Froxlor\UI\Callbacks\Ftp; +use Froxlor\UI\Listing; + +return [ + 'ftp_list' => [ + 'title' => $lng['menue']['ftp']['accounts'], + 'icon' => 'fa-solid fa-users', + 'columns' => [ + 'username' => [ + 'label' => $lng['login']['username'], + 'column' => 'username', + ], + 'description' => [ + 'label' => $lng['panel']['ftpdesc'], + 'column' => 'description' + ], + 'homedir' => [ + 'label' => $lng['panel']['path'], + 'column' => 'homedir', + 'format_callback' => [Ftp::class, 'pathRelative'] + ], + 'shell' => [ + 'label' => $lng['panel']['shell'], + 'column' => 'shell', + 'visible' => \Froxlor\Settings::Get('system.allow_customer_shell') == '1' + ] + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('ftp_list', [ + 'username', + 'description', + 'homedir', + 'shell' + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'ftp', + 'page' => 'ftps', + 'action' => 'edit', + 'id' => ':id' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'ftp', + 'page' => 'ftps', + 'action' => 'delete', + 'id' => ':id' + ], + ] + ] + ] +]; diff --git a/lib/tablelisting/customer/tablelisting.mysqls.php b/lib/tablelisting/customer/tablelisting.mysqls.php new file mode 100644 index 00000000..488037e5 --- /dev/null +++ b/lib/tablelisting/customer/tablelisting.mysqls.php @@ -0,0 +1,76 @@ + (2010-) + * @author Maurice Preuß + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Tabellisting + * + */ + +use Froxlor\UI\Callbacks\Mysql; +use Froxlor\UI\Callbacks\Text; +use Froxlor\UI\Listing; + +return [ + 'mysql_list' => [ + 'title' => $lng['menue']['mysql']['databases'], + 'icon' => 'fa-solid fa-database', + 'columns' => [ + 'databasename' => [ + 'label' => $lng['mysql']['databasename'], + 'column' => 'databasename', + ], + 'description' => [ + 'label' => $lng['mysql']['databasedescription'], + 'column' => 'description' + ], + 'size' => [ + 'label' => $lng['mysql']['size'], + 'column' => 'size', + 'format_callback' => [Text::class, 'size'] + ], + 'dbserver' => [ + 'label' => $lng['mysql']['mysql_server'], + 'column' => 'dbserver', + 'format_callback' => [Mysql::class, 'dbserver'], + 'visible' => $count_mysqlservers > 1 + ] + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('mysql_list', [ + 'databasename', + 'description', + 'size', + 'dbserver' + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'mysql', + 'page' => 'mysqls', + 'action' => 'edit', + 'id' => ':id' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'mysql', + 'page' => 'mysqls', + 'action' => 'delete', + 'id' => ':id' + ], + ] + ] + ] +]; From 1faa9f17ab83999d224f35bd095ceee08cbbf563 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 14:30:38 +0100 Subject: [PATCH 05/13] minor icon tweaks Signed-off-by: Michael Kaufmann --- lib/navigation/00.froxlor.main.php | 2 +- templates/Froxlor/userarea.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/navigation/00.froxlor.main.php b/lib/navigation/00.froxlor.main.php index 6e9ea20e..755d7286 100644 --- a/lib/navigation/00.froxlor.main.php +++ b/lib/navigation/00.froxlor.main.php @@ -83,7 +83,7 @@ return array( 'url' => 'customer_ftp.php', 'label' => $lng['menue']['ftp']['ftp'], 'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'ftp')), - 'icon' => 'fa fa-transfer', + 'icon' => 'fa fa-users', 'elements' => array( array( 'url' => 'customer_ftp.php?page=accounts', diff --git a/templates/Froxlor/userarea.html.twig b/templates/Froxlor/userarea.html.twig index 9f77c761..617d9945 100644 --- a/templates/Froxlor/userarea.html.twig +++ b/templates/Froxlor/userarea.html.twig @@ -43,7 +43,7 @@
    • From d93354964690646d4d0a6c8996ff1dd169014bd5 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 15:16:59 +0100 Subject: [PATCH 06/13] don't send header() on CLI environment Signed-off-by: Michael Kaufmann --- dns_editor.php | 4 +- lib/Froxlor/Api/FroxlorRPC.php | 186 ++++++++++++++++----------------- logfiles_viewer.php | 4 +- 3 files changed, 96 insertions(+), 98 deletions(-) diff --git a/dns_editor.php b/dns_editor.php index 6bac1ac0..4a466c90 100644 --- a/dns_editor.php +++ b/dns_editor.php @@ -19,13 +19,13 @@ if (! defined('AREA')) { * */ -use Froxlor\Api\Commands\DomainZones as DomainZones; +use Froxlor\Api\Commands\DomainZones; use Froxlor\UI\Request; // This file is being included in admin_domains and customer_domains // and therefore does not need to require lib/init.php -$domain_id = (int) Request::get(['domain_id']); +$domain_id = (int) Request::get('domain_id'); $record = isset($_POST['record']['record']) ? trim($_POST['record']['record']) : null; $type = isset($_POST['record']['type']) ? $_POST['record']['type'] : 'A'; diff --git a/lib/Froxlor/Api/FroxlorRPC.php b/lib/Froxlor/Api/FroxlorRPC.php index 56dfe43c..6bbdfdaf 100644 --- a/lib/Froxlor/Api/FroxlorRPC.php +++ b/lib/Froxlor/Api/FroxlorRPC.php @@ -3,7 +3,6 @@ namespace Froxlor\Api; use Exception; -use voku\helper\AntiXSS; /** * This file is part of the Froxlor project. @@ -23,110 +22,111 @@ use voku\helper\AntiXSS; */ class FroxlorRPC { - /** - * validate a given request - * - * @param $request - * @return array - * @throws Exception - */ - public static function validateRequest($request): array - { - // make basic authentication - if (!isset($_SERVER['PHP_AUTH_USER']) || !self::validateAuth($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) { - header('WWW-Authenticate: Basic realm="API"'); - throw new Exception('Unauthenticated. Please provide api user credentials.', 401); - } + /** + * validate a given request + * + * @param $request + * @return array + * @throws Exception + */ + public static function validateRequest($request): array + { + // make basic authentication + if (!isset($_SERVER['PHP_AUTH_USER']) || !self::validateAuth($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) { + if (@php_sapi_name() !== 'cli') { + header('WWW-Authenticate: Basic realm="API"'); + } + throw new Exception('Unauthenticated. Please provide api user credentials.', 401); + } - // check if present - if (empty($request)) { - throw new Exception('Empty request body.', 400); - } + // check if present + if (empty($request)) { + throw new Exception('Empty request body.', 400); + } - // decode json request - $decoded_request = json_decode($request, true); + // decode json request + $decoded_request = json_decode($request, true); - // is it valid? - if (is_null($decoded_request)) { - throw new Exception('Invalid JSON Format.', 400); - } + // is it valid? + if (is_null($decoded_request)) { + throw new Exception('Invalid JSON Format.', 400); + } - return self::validateBody($decoded_request); - } + return self::validateBody($decoded_request); + } - /** - * validates the given api credentials - * - * @param string $key - * @param string $secret - * @return boolean - */ - private static function validateAuth(string $key, string $secret): bool - { - $sel_stmt = \Froxlor\Database\Database::prepare( - " + /** + * validates the given api credentials + * + * @param string $key + * @param string $secret + * @return boolean + */ + private static function validateAuth(string $key, string $secret): bool + { + $sel_stmt = \Froxlor\Database\Database::prepare( + " SELECT ak.*, a.api_allowed as admin_api_allowed, c.api_allowed as cust_api_allowed, c.deactivated FROM `api_keys` ak LEFT JOIN `panel_admins` a ON a.adminid = ak.adminid LEFT JOIN `panel_customers` c ON c.customerid = ak.customerid WHERE `apikey` = :ak AND `secret` = :as " - ); - $result = \Froxlor\Database\Database::pexecute_first($sel_stmt, array( - 'ak' => $key, - 'as' => $secret - ), true, true); - if ($result) { - if ($result['apikey'] == $key && $result['secret'] == $secret && ($result['valid_until'] == -1 || $result['valid_until'] >= time( - )) && (($result['customerid'] == 0 && $result['admin_api_allowed'] == 1) || ($result['customerid'] > 0 && $result['cust_api_allowed'] == 1 && $result['deactivated'] == 0))) { - // get user to check whether api call is allowed - if (!empty($result['allowed_from'])) { - // @todo allow specification and validating of whole subnets later - $ip_list = explode(",", $result['allowed_from']); - $access_ip = inet_ntop(inet_pton($_SERVER['REMOTE_ADDR'])); - if (in_array($access_ip, $ip_list)) { - return true; - } - } else { - return true; - } - } - } - return false; - } + ); + $result = \Froxlor\Database\Database::pexecute_first($sel_stmt, array( + 'ak' => $key, + 'as' => $secret + ), true, true); + if ($result) { + if ($result['apikey'] == $key && $result['secret'] == $secret && ($result['valid_until'] == -1 || $result['valid_until'] >= time()) && (($result['customerid'] == 0 && $result['admin_api_allowed'] == 1) || ($result['customerid'] > 0 && $result['cust_api_allowed'] == 1 && $result['deactivated'] == 0))) { + // get user to check whether api call is allowed + if (!empty($result['allowed_from'])) { + // @todo allow specification and validating of whole subnets later + $ip_list = explode(",", $result['allowed_from']); + $access_ip = inet_ntop(inet_pton($_SERVER['REMOTE_ADDR'])); + if (in_array($access_ip, $ip_list)) { + return true; + } + } else { + return true; + } + } + } + return false; + } - /** - * validates the given command - * - * @param array $request - * - * @return array - * @throws Exception - */ - private static function validateBody($request) - { - // check command exists - if (empty($request['command'])) { - throw new Exception("Please provide a command.", 400); - } + /** + * validates the given command + * + * @param array $request + * + * @return array + * @throws Exception + */ + private static function validateBody($request) + { + // check command exists + if (empty($request['command'])) { + throw new Exception("Please provide a command.", 400); + } - $command = explode(".", $request['command']); + $command = explode(".", $request['command']); - if (count($command) != 2) { - throw new Exception("The given command is invalid.", 400); - } - // simply check for file-existance, as we do not want to use our autoloader because this way - // it will recognize non-api classes+methods as valid commands - $apiclass = '\\Froxlor\\Api\\Commands\\' . $command[0]; - if (!class_exists($apiclass) || !@method_exists($apiclass, $command[1])) { - throw new Exception("Unknown command", 400); - } - return array( - 'command' => array( - 'class' => $command[0], - 'method' => $command[1] - ), - 'params' => $request['params'] ?? null - ); - } + if (count($command) != 2) { + throw new Exception("The given command is invalid.", 400); + } + // simply check for file-existance, as we do not want to use our autoloader because this way + // it will recognize non-api classes+methods as valid commands + $apiclass = '\\Froxlor\\Api\\Commands\\' . $command[0]; + if (!class_exists($apiclass) || !@method_exists($apiclass, $command[1])) { + throw new Exception("Unknown command", 400); + } + return array( + 'command' => array( + 'class' => $command[0], + 'method' => $command[1] + ), + 'params' => $request['params'] ?? null + ); + } } diff --git a/logfiles_viewer.php b/logfiles_viewer.php index f943b9e1..63207132 100644 --- a/logfiles_viewer.php +++ b/logfiles_viewer.php @@ -19,15 +19,13 @@ if (! defined('AREA')) { * */ -use Froxlor\Api\Commands\SubDomains as SubDomains; +use Froxlor\Api\Commands\SubDomains; use Froxlor\Settings; use Froxlor\UI\Request; // This file is being included in admin_domains and customer_domains // and therefore does not need to require lib/init.php -// TODO get domain related settings for logfile (speciallogfile) - $domain_id = (int) Request::get('domain_id'); $last_n = (int) Request::get('number_of_lines', 100); From bbc3644e236131a61f2cd12c1f98ce9074c5ff54 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 15:32:05 +0100 Subject: [PATCH 07/13] fix unittests for FroxlorRPC-class (maybe) Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/FroxlorRPC.php | 2 +- tests/Global/FroxlorRpcTest.php | 88 +++++++++------------------------ 2 files changed, 25 insertions(+), 65 deletions(-) diff --git a/lib/Froxlor/Api/FroxlorRPC.php b/lib/Froxlor/Api/FroxlorRPC.php index 6bbdfdaf..9e89150c 100644 --- a/lib/Froxlor/Api/FroxlorRPC.php +++ b/lib/Froxlor/Api/FroxlorRPC.php @@ -92,7 +92,7 @@ class FroxlorRPC } } } - return false; + throw new Exception('Invalid authorization credentials', 403); } /** diff --git a/tests/Global/FroxlorRpcTest.php b/tests/Global/FroxlorRpcTest.php index 0bb05256..67961901 100644 --- a/tests/Global/FroxlorRpcTest.php +++ b/tests/Global/FroxlorRpcTest.php @@ -11,32 +11,20 @@ use Froxlor\Api\FroxlorRPC; class FroxlorRpcTest extends TestCase { - public function testInvalidRequestHeader() - { - $this->expectExceptionCode(400); - $this->expectExceptionMessage("Invalid request header"); - FroxlorRPC::validateRequest(array()); - } - public function testNoCredentialsGiven() { - $this->expectExceptionCode(400); - $this->expectExceptionMessage("No authorization credentials given"); - FroxlorRPC::validateRequest(array( - 'header' => 'asd' - )); + $this->expectExceptionCode(401); + $this->expectExceptionMessage("Unauthenticated. Please provide api user credentials."); + FroxlorRPC::validateRequest([]); } public function testValidateAuthInvalid() { $this->expectExceptionCode(403); $this->expectExceptionMessage("Invalid authorization credentials"); - FroxlorRPC::validateRequest(array( - 'header' => [ - 'apikey' => 'asd', - 'secret' => 'asd' - ] - )); + $_SERVER['PHP_AUTH_USER'] = 'asd'; + $_SERVER['PHP_AUTH_PW'] = 'asd'; + FroxlorRPC::validateRequest([]); } public function testValidateAuthAllowFromInvalid() @@ -45,12 +33,9 @@ class FroxlorRpcTest extends TestCase Database::query("UPDATE `api_keys` SET `allowed_from` = '123.123.123.123';"); $this->expectExceptionCode(403); $this->expectExceptionMessage("Invalid authorization credentials"); - FroxlorRPC::validateRequest(array( - 'header' => [ - 'apikey' => 'test', - 'secret' => 'test' - ] - )); + $_SERVER['PHP_AUTH_USER'] = 'test'; + $_SERVER['PHP_AUTH_PW'] = 'test'; + FroxlorRPC::validateRequest([]); } public function testInvalidRequestBody() @@ -58,68 +43,43 @@ class FroxlorRpcTest extends TestCase Database::query("UPDATE `api_keys` SET `allowed_from` = '';"); $this->expectExceptionCode(400); $this->expectExceptionMessage("Invalid request body"); - FroxlorRPC::validateRequest(array( - 'header' => [ - 'apikey' => 'test', - 'secret' => 'test' - ] - )); + $_SERVER['PHP_AUTH_USER'] = 'test'; + $_SERVER['PHP_AUTH_PW'] = 'test'; + FroxlorRPC::validateRequest([]); } public function testNoCommandGiven() { $this->expectExceptionCode(400); $this->expectExceptionMessage("No command given"); - FroxlorRPC::validateRequest(array( - 'header' => [ - 'apikey' => 'test', - 'secret' => 'test' - ], - 'body' => 'asd' - )); + $_SERVER['PHP_AUTH_USER'] = 'test'; + $_SERVER['PHP_AUTH_PW'] = 'test'; + FroxlorRPC::validateRequest(['cmd' => 'test']); } public function testInvalidCommandGiven() { $this->expectExceptionCode(400); $this->expectExceptionMessage("Invalid command"); - FroxlorRPC::validateRequest(array( - 'header' => [ - 'apikey' => 'test', - 'secret' => 'test' - ], - 'body' => [ - 'command' => 'Froxlor' - ] - )); + $_SERVER['PHP_AUTH_USER'] = 'test'; + $_SERVER['PHP_AUTH_PW'] = 'test'; + FroxlorRPC::validateRequest(['command' => 'Froxlor']); } public function testUnknownCommandGiven() { $this->expectExceptionCode(400); $this->expectExceptionMessage("Unknown command"); - FroxlorRPC::validateRequest(array( - 'header' => [ - 'apikey' => 'test', - 'secret' => 'test' - ], - 'body' => [ - 'command' => 'SomeModule.cmd' - ] - )); + $_SERVER['PHP_AUTH_USER'] = 'test'; + $_SERVER['PHP_AUTH_PW'] = 'test'; + FroxlorRPC::validateRequest(['command' => 'SomeModule.cmd']); } public function testCommandOk() { - $result = FroxlorRPC::validateRequest(array( - 'header' => [ - 'apikey' => 'test', - 'secret' => 'test' - ], - 'body' => [ - 'command' => 'Froxlor.listFunctions' - ] - )); + $_SERVER['PHP_AUTH_USER'] = 'test'; + $_SERVER['PHP_AUTH_PW'] = 'test'; + $result = FroxlorRPC::validateRequest(['command' => 'Froxlor.listFunctions']); $this->assertEquals('Froxlor', $result['command']['class']); $this->assertEquals('listFunctions', $result['command']['method']); $this->assertNull($result['params']); From 5d7649a27412a724d858af3b2022548cac212d16 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 15:42:25 +0100 Subject: [PATCH 08/13] fix unittests for FroxlorRPC-class again (maybe) Signed-off-by: Michael Kaufmann --- tests/Global/FroxlorRpcTest.php | 39 +++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/tests/Global/FroxlorRpcTest.php b/tests/Global/FroxlorRpcTest.php index 67961901..866f8a36 100644 --- a/tests/Global/FroxlorRpcTest.php +++ b/tests/Global/FroxlorRpcTest.php @@ -15,7 +15,7 @@ class FroxlorRpcTest extends TestCase { $this->expectExceptionCode(401); $this->expectExceptionMessage("Unauthenticated. Please provide api user credentials."); - FroxlorRPC::validateRequest([]); + FroxlorRPC::validateRequest(""); } public function testValidateAuthInvalid() @@ -24,7 +24,7 @@ class FroxlorRpcTest extends TestCase $this->expectExceptionMessage("Invalid authorization credentials"); $_SERVER['PHP_AUTH_USER'] = 'asd'; $_SERVER['PHP_AUTH_PW'] = 'asd'; - FroxlorRPC::validateRequest([]); + FroxlorRPC::validateRequest(""); } public function testValidateAuthAllowFromInvalid() @@ -35,17 +35,26 @@ class FroxlorRpcTest extends TestCase $this->expectExceptionMessage("Invalid authorization credentials"); $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; - FroxlorRPC::validateRequest([]); + FroxlorRPC::validateRequest(""); } - public function testInvalidRequestBody() + public function testEmptyRequestBody() { Database::query("UPDATE `api_keys` SET `allowed_from` = '';"); $this->expectExceptionCode(400); - $this->expectExceptionMessage("Invalid request body"); + $this->expectExceptionMessage("Empty request body."); $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; - FroxlorRPC::validateRequest([]); + FroxlorRPC::validateRequest(""); + } + + public function testInvalidJSON() + { + $this->expectExceptionCode(400); + $this->expectExceptionMessage("Invalid JSON Format."); + $_SERVER['PHP_AUTH_USER'] = 'test'; + $_SERVER['PHP_AUTH_PW'] = 'test'; + FroxlorRPC::validateRequest('asd'); } public function testNoCommandGiven() @@ -54,7 +63,7 @@ class FroxlorRpcTest extends TestCase $this->expectExceptionMessage("No command given"); $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; - FroxlorRPC::validateRequest(['cmd' => 'test']); + FroxlorRPC::validateRequest(json_encode(['cmd' => 'test'])); } public function testInvalidCommandGiven() @@ -63,7 +72,7 @@ class FroxlorRpcTest extends TestCase $this->expectExceptionMessage("Invalid command"); $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; - FroxlorRPC::validateRequest(['command' => 'Froxlor']); + FroxlorRPC::validateRequest(json_encode(['command' => 'Froxlor'])); } public function testUnknownCommandGiven() @@ -72,14 +81,14 @@ class FroxlorRpcTest extends TestCase $this->expectExceptionMessage("Unknown command"); $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; - FroxlorRPC::validateRequest(['command' => 'SomeModule.cmd']); + FroxlorRPC::validateRequest(json_encode(['command' => 'SomeModule.cmd'])); } public function testCommandOk() { $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; - $result = FroxlorRPC::validateRequest(['command' => 'Froxlor.listFunctions']); + $result = FroxlorRPC::validateRequest(json_encode(['command' => 'Froxlor.listFunctions'])); $this->assertEquals('Froxlor', $result['command']['class']); $this->assertEquals('listFunctions', $result['command']['method']); $this->assertNull($result['params']); @@ -89,16 +98,14 @@ class FroxlorRpcTest extends TestCase { $key = $this->generateKey(); $request = array( - 'body' => [ - 'command' => 'Froxlor.listFunctions', - 'params' => $key - ] + 'command' => 'Froxlor.listFunctions', + 'params' => $key ); $json_request = json_encode($request); $decoded_request = json_decode($json_request, true); $decoded_request = $this->stripcslashes_deep($decoded_request); - $this->assertEquals($key['key'], $decoded_request['body']['params']['key']); - $this->assertEquals($key['cert'], $decoded_request['body']['params']['cert']); + $this->assertEquals($key['key'], $decoded_request['params']['key']); + $this->assertEquals($key['cert'], $decoded_request['params']['cert']); } private function stripcslashes_deep($value) From 01798650fe892050d3272dfa673ee7d62c25db6c Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 15:51:26 +0100 Subject: [PATCH 09/13] fix unittests for FroxlorRPC-class round #3 (maybe) Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/DomainZones.php | 2 +- tests/DomainZones/DomainZonesTest.php | 4 ++-- tests/Global/FroxlorRpcTest.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Froxlor/Api/Commands/DomainZones.php b/lib/Froxlor/Api/Commands/DomainZones.php index c5b29296..32748c20 100644 --- a/lib/Froxlor/Api/Commands/DomainZones.php +++ b/lib/Froxlor/Api/Commands/DomainZones.php @@ -545,6 +545,6 @@ class DomainZones extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour \Froxlor\System\Cronjob::inserttask(\Froxlor\Cron\TaskId::REBUILD_DNS); return $this->response(true); } - return $this->response(null, 204); + return $this->response(true, 304); } } diff --git a/tests/DomainZones/DomainZonesTest.php b/tests/DomainZones/DomainZonesTest.php index 47f1d806..b4abc13b 100644 --- a/tests/DomainZones/DomainZonesTest.php +++ b/tests/DomainZones/DomainZonesTest.php @@ -929,7 +929,7 @@ class DomainZonesTest extends TestCase $json_result = DomainZones::getLocal($customer_userdata, $data)->delete(); $result = json_decode($json_result, true); $this->assertTrue($result['data']); - $this->assertEquals(200, $result['status']); + $this->assertEquals(200, http_response_code()); } public function testCustomerDomainZonesDeleteUnmodified() @@ -949,6 +949,6 @@ class DomainZonesTest extends TestCase $json_result = DomainZones::getLocal($customer_userdata, $data)->delete(); $result = json_decode($json_result, true); $this->assertTrue($result['data']); - $this->assertEquals(304, $result['status']); + $this->assertEquals(304, http_response_code()); } } diff --git a/tests/Global/FroxlorRpcTest.php b/tests/Global/FroxlorRpcTest.php index 866f8a36..84c3bb00 100644 --- a/tests/Global/FroxlorRpcTest.php +++ b/tests/Global/FroxlorRpcTest.php @@ -60,7 +60,7 @@ class FroxlorRpcTest extends TestCase public function testNoCommandGiven() { $this->expectExceptionCode(400); - $this->expectExceptionMessage("No command given"); + $this->expectExceptionMessage("Please provide a command."); $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; FroxlorRPC::validateRequest(json_encode(['cmd' => 'test'])); @@ -69,7 +69,7 @@ class FroxlorRpcTest extends TestCase public function testInvalidCommandGiven() { $this->expectExceptionCode(400); - $this->expectExceptionMessage("Invalid command"); + $this->expectExceptionMessage("The given command is invalid."); $_SERVER['PHP_AUTH_USER'] = 'test'; $_SERVER['PHP_AUTH_PW'] = 'test'; FroxlorRPC::validateRequest(json_encode(['command' => 'Froxlor'])); From 8c6452bb05a8fd0e5bab0e88785bcd1893054079 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 17:17:29 +0100 Subject: [PATCH 10/13] customer-extras overviews Signed-off-by: Michael Kaufmann --- customer_extras.php | 104 +++++------------- .../customer/extras/formfield.backup.php | 7 +- .../extras/formfield.htaccess_add.php | 2 +- .../extras/formfield.htaccess_edit.php | 2 +- .../extras/formfield.htpasswd_add.php | 2 +- .../extras/formfield.htpasswd_edit.php | 2 +- .../customer/tablelisting.htaccess.php | 87 +++++++++++++++ .../customer/tablelisting.htpasswd.php | 63 +++++++++++ lng/english.lng.php | 4 +- lng/german.lng.php | 4 +- templates/Froxlor/form/formfields.html.twig | 22 +++- 11 files changed, 211 insertions(+), 88 deletions(-) create mode 100644 lib/tablelisting/customer/tablelisting.htaccess.php create mode 100644 lib/tablelisting/customer/tablelisting.htpasswd.php diff --git a/customer_extras.php b/customer_extras.php index 59427300..2fed7fd6 100644 --- a/customer_extras.php +++ b/customer_extras.php @@ -50,36 +50,18 @@ if ($page == 'overview') { 'path' => $lng['panel']['path'] ); try { - // get total count - $json_result = DirProtections::getLocal($userinfo)->listingCount(); - $result = json_decode($json_result, true)['data']; - // initialize pagination and filtering - $paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result); - // get list - $json_result = DirProtections::getLocal($userinfo, $paging->getApiCommandParams())->listing(); + $htpasswd_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.htpasswd.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\DirProtections::class, $userinfo)) + ->withPagination($htpasswd_list_data['htpasswd_list']['columns']) + ->getList(); } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - $result = json_decode($json_result, true)['data']; - $sortcode = $paging->getHtmlSortCode($lng); - $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); - $searchcode = $paging->getHtmlSearchCode($lng); - $pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s); - $count = 0; - $htpasswds = ''; - - foreach ($result['list'] as $row) { - if (strpos($row['path'], $userinfo['documentroot']) === 0) { - $row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']); - } - $row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']); - $row = \Froxlor\PhpHelper::htmlentitiesArray($row); - eval("\$htpasswds.=\"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds_htpasswd") . "\";"); - $count ++; - } - - eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htpasswds") . "\";"); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $htpasswd_list_data['htpasswd_list']), + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { $json_result = DirProtections::getLocal($userinfo, array( @@ -181,51 +163,22 @@ if ($page == 'overview') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess"); - $fields = array( - 'path' => $lng['panel']['path'], - 'options_indexes' => $lng['extras']['view_directory'], - 'error404path' => $lng['extras']['error404path'], - 'error403path' => $lng['extras']['error403path'], - 'error500path' => $lng['extras']['error500path'], - 'options_cgi' => $lng['extras']['execute_perl'] - ); - try { - // get total count - $json_result = DirOptions::getLocal($userinfo)->listingCount(); - $result = json_decode($json_result, true)['data']; - // initialize pagination and filtering - $paging = new \Froxlor\UI\Pagination($userinfo, $fields, $result); - // get list - $json_result = DirOptions::getLocal($userinfo, $paging->getApiCommandParams())->listing(); - } catch (Exception $e) { - \Froxlor\UI\Response::dynamic_error($e->getMessage()); - } - $result = json_decode($json_result, true)['data']; - - $sortcode = $paging->getHtmlSortCode($lng); - $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); - $searchcode = $paging->getHtmlSearchCode($lng); - $pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s); - $count = 0; - $htaccess = ''; $cperlenabled = \Froxlor\Customer\Customer::customerHasPerlEnabled($userinfo['customerid']); - foreach ($result['list'] as $row) { - if (strpos($row['path'], $userinfo['documentroot']) === 0) { - $row['path'] = str_replace($userinfo['documentroot'], "/", $row['path']); - } - $row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']); - $row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']); - $row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']); - $row['options_cgi'] = str_replace('1', $lng['panel']['yes'], $row['options_cgi']); - $row['options_cgi'] = str_replace('0', $lng['panel']['no'], $row['options_cgi']); - $row = \Froxlor\PhpHelper::htmlentitiesArray($row); - eval("\$htaccess.=\"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_htaccess") . "\";"); - $count ++; + try { + $htaccess_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.htaccess.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\DirOptions::class, $userinfo)) + ->withPagination($htaccess_list_data['htaccess_list']['columns']) + ->getList(); + } catch (Exception $e) { + \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/htaccess") . "\";"); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $htaccess_list_data['htaccess_list']), + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { $json_result = DirOptions::getLocal($userinfo, array( @@ -363,7 +316,7 @@ if ($page == 'overview') { \Froxlor\UI\Response::standard_success('backupscheduled'); } else { - if (! empty($existing_backupJob)) { + if (!empty($existing_backupJob)) { $action = "abort"; $row = $existing_backupJob['data']; @@ -371,18 +324,19 @@ if ($page == 'overview') { $row['backup_web'] = ($row['backup_web'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no']; $row['backup_mail'] = ($row['backup_mail'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no']; $row['backup_dbs'] = ($row['backup_dbs'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no']; - } - $pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']); - $backup_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.backup.php'; - $backup_form = \Froxlor\UI\HtmlForm::genHTMLForm($backup_data); - $title = $backup_data['backup']['title']; - $image = $backup_data['backup']['image']; - if (! empty($existing_backupJob)) { // overwrite backup_form after we took everything from it we needed eval("\$backup_form = \"" . \Froxlor\UI\Template::getTemplate("extras/backup_listexisting") . "\";"); } - eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/backup") . "\";"); + + $pathSelect = \Froxlor\FileDir::makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid']); + $backup_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.backup.php'; + + UI::twigBuffer('user/form.html.twig', [ + 'formaction' => $linker->getLink(array('section' => 'extras')), + 'formdata' => $backup_data['backup'] + ]); + UI::twigOutputBuffer(); } } } else { diff --git a/lib/formfields/customer/extras/formfield.backup.php b/lib/formfields/customer/extras/formfield.backup.php index 13de0341..354202ae 100644 --- a/lib/formfields/customer/extras/formfield.backup.php +++ b/lib/formfields/customer/extras/formfield.backup.php @@ -17,7 +17,7 @@ return array( 'backup' => array( 'title' => $lng['extras']['backup'], - 'image' => 'icons/backup_big.png', + 'image' => 'fa-solid fa-server', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['backup'], @@ -33,8 +33,9 @@ return array( ), 'path_protection_info' => array( 'label' => $lng['extras']['path_protection_label'], - 'type' => 'label', - 'value' => $lng['extras']['path_protection_info'] + 'type' => 'infotext', + 'value' => $lng['extras']['path_protection_info'], + 'classes' => 'fw-bold text-danger' ), 'backup_web' => array( 'label' => $lng['extras']['backup_web'], diff --git a/lib/formfields/customer/extras/formfield.htaccess_add.php b/lib/formfields/customer/extras/formfield.htaccess_add.php index 7d44f488..0c17f77d 100644 --- a/lib/formfields/customer/extras/formfield.htaccess_add.php +++ b/lib/formfields/customer/extras/formfield.htaccess_add.php @@ -17,7 +17,7 @@ return array( 'htaccess_add' => array( 'title' => $lng['extras']['pathoptions_add'], - 'image' => 'icons/htpasswd_add.png', + 'image' => 'fa-solid fa-folder', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['pathoptions_add'], diff --git a/lib/formfields/customer/extras/formfield.htaccess_edit.php b/lib/formfields/customer/extras/formfield.htaccess_edit.php index bcf0879e..3f6788cc 100644 --- a/lib/formfields/customer/extras/formfield.htaccess_edit.php +++ b/lib/formfields/customer/extras/formfield.htaccess_edit.php @@ -17,7 +17,7 @@ return array( 'htaccess_edit' => array( 'title' => $lng['extras']['pathoptions_edit'], - 'image' => 'icons/htpasswd_edit.png', + 'image' => 'fa-solid fa-folder', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['pathoptions_edit'], diff --git a/lib/formfields/customer/extras/formfield.htpasswd_add.php b/lib/formfields/customer/extras/formfield.htpasswd_add.php index 6b4bce20..ab2d674c 100644 --- a/lib/formfields/customer/extras/formfield.htpasswd_add.php +++ b/lib/formfields/customer/extras/formfield.htpasswd_add.php @@ -17,7 +17,7 @@ return array( 'htpasswd_add' => array( 'title' => $lng['extras']['directoryprotection_add'], - 'image' => 'icons/htpasswd_add.png', + 'image' => 'fa-solid fa-lock', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['directoryprotection_add'], diff --git a/lib/formfields/customer/extras/formfield.htpasswd_edit.php b/lib/formfields/customer/extras/formfield.htpasswd_edit.php index 607ef682..2fe44227 100644 --- a/lib/formfields/customer/extras/formfield.htpasswd_edit.php +++ b/lib/formfields/customer/extras/formfield.htpasswd_edit.php @@ -17,7 +17,7 @@ return array( 'htpasswd_edit' => array( 'title' => $lng['extras']['directoryprotection_edit'], - 'image' => 'icons/htpasswd_edit.png', + 'image' => 'fa-solid fa-lock', 'sections' => array( 'section_a' => array( 'title' => $lng['extras']['directoryprotection_edit'], diff --git a/lib/tablelisting/customer/tablelisting.htaccess.php b/lib/tablelisting/customer/tablelisting.htaccess.php new file mode 100644 index 00000000..eab4b7ab --- /dev/null +++ b/lib/tablelisting/customer/tablelisting.htaccess.php @@ -0,0 +1,87 @@ + (2010-) + * @author Maurice Preuß + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Tabellisting + * + */ + +use Froxlor\UI\Callbacks\Ftp; +use Froxlor\UI\Callbacks\Text; +use Froxlor\UI\Listing; + +return [ + 'htaccess_list' => [ + 'title' => $lng['menue']['extras']['pathoptions'], + 'icon' => 'fa-solid fa-folder', + 'columns' => [ + 'path' => [ + 'label' => $lng['panel']['path'], + 'column' => 'path', + 'format_callback' => [Ftp::class, 'pathRelative'] + ], + 'option_indexes' => [ + 'label' => $lng['extras']['view_directory'], + 'column' => 'option_indexes', + 'format_callback' => [Text::class, 'boolean'] + ], + 'error404path' => [ + 'label' => $lng['extras']['error404path'], + 'column' => 'error404path' + ], + 'error403path' => [ + 'label' => $lng['extras']['error403path'], + 'column' => 'error403path' + ], + 'error500path' => [ + 'label' => $lng['extras']['error500path'], + 'column' => 'error500path' + ], + 'options_cgi' => [ + 'label' => $lng['extras']['execute_perl'], + 'column' => 'options_cgi', + 'format_callback' => [Text::class, 'boolean'], + 'visible' => $cperlenabled + ] + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('htaccess_list', [ + 'path', + 'option_indexes', + 'error404path', + 'error403path', + 'error500path', + 'options_cgi' + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'extras', + 'page' => 'htaccess', + 'action' => 'edit', + 'id' => ':id' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'extras', + 'page' => 'htaccess', + 'action' => 'delete', + 'id' => ':id' + ], + ] + ] + ] +]; diff --git a/lib/tablelisting/customer/tablelisting.htpasswd.php b/lib/tablelisting/customer/tablelisting.htpasswd.php new file mode 100644 index 00000000..7d2f1c66 --- /dev/null +++ b/lib/tablelisting/customer/tablelisting.htpasswd.php @@ -0,0 +1,63 @@ + (2010-) + * @author Maurice Preuß + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Tabellisting + * + */ + +use Froxlor\UI\Callbacks\Ftp; +use Froxlor\UI\Listing; + +return [ + 'htpasswd_list' => [ + 'title' => $lng['menue']['extras']['directoryprotection'], + 'icon' => 'fa-solid fa-lock', + 'columns' => [ + 'username' => [ + 'label' => $lng['login']['username'], + 'column' => 'username' + ], + 'path' => [ + 'label' => $lng['panel']['path'], + 'column' => 'path', + 'format_callback' => [Ftp::class, 'pathRelative'] + ] + ], + 'visible_columns' => Listing::getVisibleColumnsForListing('htpasswd_list', [ + 'username', + 'path' + ]), + 'actions' => [ + 'edit' => [ + 'icon' => 'fa fa-edit', + 'href' => [ + 'section' => 'extras', + 'page' => 'htpasswds', + 'action' => 'edit', + 'id' => ':id' + ], + ], + 'delete' => [ + 'icon' => 'fa fa-trash', + 'class' => 'text-danger', + 'href' => [ + 'section' => 'extras', + 'page' => 'htpasswds', + 'action' => 'delete', + 'id' => ':id' + ], + ] + ] + ] +]; diff --git a/lng/english.lng.php b/lng/english.lng.php index 71eed37c..ecec69dc 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1893,8 +1893,8 @@ $lng['crondesc']['cron_backup'] = 'Process backup jobs'; $lng['error']['backupfunctionnotenabled'] = 'The backup function is not enabled'; $lng['serversettings']['backupenabled']['title'] = "Enable backup for customers"; $lng['serversettings']['backupenabled']['description'] = "If activated, the customer will be able to schedule backup jobs (cron-backup) which generates an archive within his docroot (subdirectory chosable by customer)"; -$lng['extras']['path_protection_label'] = 'Important'; -$lng['extras']['path_protection_info'] = 'We strongly recommend protecting the given path, see "Extras" -> "Directory protection"'; +$lng['extras']['path_protection_label'] = 'Important'; +$lng['extras']['path_protection_info'] = 'We strongly recommend protecting the given path, see "Extras" -> "Directory protection"'; $lng['tasks']['CREATE_CUSTOMER_BACKUP'] = 'Backup job for customer %loginname%'; $lng['error']['dns_domain_nodns'] = 'DNS is not enabled for this domain'; diff --git a/lng/german.lng.php b/lng/german.lng.php index badb40e6..286585d0 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1543,8 +1543,8 @@ $lng['crondesc']['cron_backup'] = 'Ausstehende Sicherungen erstellen'; $lng['error']['backupfunctionnotenabled'] = 'Die Sicherungs-Funktion is nicht aktiviert'; $lng['serversettings']['backupenabled']['title'] = "Backup für Kunden aktivieren"; $lng['serversettings']['backupenabled']['description'] = "Wenn dies aktiviert ist, kann der Kunde Sicherungen planen (cron-backup) welche ein Archiv in sein Heimatverzeichnis ablegt (Unterordner vom Kunden wählbar)"; -$lng['extras']['path_protection_label'] = 'Wichtig'; -$lng['extras']['path_protection_info'] = 'Wir raten dringend dazu den angegebenen Pfad zu schützen, siehe "Extras" -> "Verzeichnisschutz"'; +$lng['extras']['path_protection_label'] = 'Wichtig'; +$lng['extras']['path_protection_info'] = 'Wir raten dringend dazu den angegebenen Pfad zu schützen, siehe "Extras" -> "Verzeichnisschutz"'; $lng['tasks']['CREATE_CUSTOMER_BACKUP'] = 'Datensicherung für Kunde %loginname%'; $lng['error']['dns_domain_nodns'] = 'DNS ist für diese Domain nicht aktiviert'; diff --git a/templates/Froxlor/form/formfields.html.twig b/templates/Froxlor/form/formfields.html.twig index 08920022..2d6d341e 100644 --- a/templates/Froxlor/form/formfields.html.twig +++ b/templates/Froxlor/form/formfields.html.twig @@ -6,7 +6,7 @@ {% if field.desc is defined and field.desc is not empty %}
      {{ field.desc|raw }} {% endif %} -
      +
      {% endif %} {% if field.type == 'text' or field.type == 'password' or field.type == 'number' or field.type == 'file' or field.type == 'email' or field.type == 'hidden' %} {{ _self.input(id, field) }} @@ -24,6 +24,8 @@ {{ _self.link(id, field) }} {% elseif field.type == 'itemlist' %} {{ _self.itemlist(id, field) }} + {% elseif field.type == 'infotext' %} + {{ _self.infotext(id, field) }} {% endif %} {% if norow == false and field.type != 'hidden' %}
      @@ -49,6 +51,22 @@ {% endif %} {% endmacro %} +{% macro infotext(id, field) %} + {% if field.next_to is defined %} +
      + {% endif %} + {{ field.value }} + {% if field.next_to is defined %} + {% for nid, nfield in field.next_to %} + {% if nfield.next_to_prefix is defined %} + {{ nfield.next_to_prefix }} + {% endif %} + {{ _self.fieldrow(nid, nfield, true) }} + {% endfor %} +
      + {% endif %} +{% endmacro %} + {% macro plain(id, field) %} {% if field.next_to is defined %}
      @@ -74,7 +92,7 @@ {% endif %} {% if field.note is defined and field.note is not empty %} -
      {{ field.note|raw }}
      +
      {{ field.note|raw }}
      {% endif %} {% if field.next_to is defined %} {% for nid, nfield in field.next_to %} From cdc4eccdd923a80861bb28b046d3b657d4256f4c Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 19:36:22 +0100 Subject: [PATCH 11/13] action-menu and info-box testing for overviews Signed-off-by: Michael Kaufmann --- customer_domains.php | 16 +++++++++++++++- templates/Froxlor/user/table.html.twig | 25 ++++++++++++++++++++----- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/customer_domains.php b/customer_domains.php index 8d250987..b9c9deca 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -45,15 +45,29 @@ if ($page == 'overview') { try { $domain_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/customer/tablelisting.domains.php'; $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\SubDomains::class, $userinfo)) -// ->addParam(['sql_search' => ['d.parentdomainid' => $parentdomain_id]]) + //->addParam(['sql_search' => ['d.parentdomainid' => $parentdomain_id]]) ->withPagination($domain_list_data['domain_list']['columns']) ->getList(); } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } + $add_link = false; + $json_result = SubDomains::getLocal($userinfo, ['sql_search' => ['d.parentdomainid' => 0]])->listing(); + $result = json_decode($json_result, true)['data']; + $parentdomains_count = $result['count']; + + if (($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0) { + $add_link = [ + 'href' => $linker->getLink(['section' => 'domains', 'page' => 'domains', 'action' => 'add']), + 'label' => $lng['domains']['subdomain_add'] + ]; + } + UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $domain_list_data['domain_list']), + 'add_link' => $add_link, + 'entity_info' => $lng['domains']['description'] ]); UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { diff --git a/templates/Froxlor/user/table.html.twig b/templates/Froxlor/user/table.html.twig index 334b786f..452b4fb2 100644 --- a/templates/Froxlor/user/table.html.twig +++ b/templates/Froxlor/user/table.html.twig @@ -1,9 +1,24 @@ {% extends "Froxlor/userarea.html.twig" %} {% block content %} - - {% import "Froxlor/table/table.html.twig" as table %} - - {{ table.table(listing) }} - +
      +
      + {% import "Froxlor/table/table.html.twig" as table %} + {{ table.table(listing) }} +
      + {% if add_link is iterable or (entity_info is defined and entity_info is not empty) %} +
      + {% if add_link is iterable %} + + + {{ add_link.label }} + {% endif %} + {% if entity_info is defined and entity_info is not empty %} + + {% endif %} +
      + {% endif %} +
      {% endblock %} From fc4725cd61ff16a369931cf455d90cd3cc24b681 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 20:13:13 +0100 Subject: [PATCH 12/13] more action-menu and info-box testing for overviews Signed-off-by: Michael Kaufmann --- customer_domains.php | 7 ++----- customer_email.php | 15 +++++++++++---- customer_extras.php | 15 +++++++++++---- customer_ftp.php | 15 +++++++++++---- customer_mysql.php | 22 +++++++++++++++------- lib/Froxlor/UI/Callbacks/Text.php | 7 +++++++ templates/Froxlor/user/table.html.twig | 2 +- 7 files changed, 58 insertions(+), 25 deletions(-) diff --git a/customer_domains.php b/customer_domains.php index b9c9deca..14e19b7b 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -33,10 +33,7 @@ if (Settings::IsInList('panel.customer_hide_options', 'domains')) { $id = (int) Request::get('id'); -if ($page == 'overview') { - $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_domains"); - eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domains") . "\";"); -} elseif ($page == 'domains') { +if ($page == 'overview' || $page == 'domains') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains"); @@ -52,11 +49,11 @@ if ($page == 'overview') { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - $add_link = false; $json_result = SubDomains::getLocal($userinfo, ['sql_search' => ['d.parentdomainid' => 0]])->listing(); $result = json_decode($json_result, true)['data']; $parentdomains_count = $result['count']; + $add_link = false; if (($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0) { $add_link = [ 'href' => $linker->getLink(['section' => 'domains', 'page' => 'domains', 'action' => 'add']), diff --git a/customer_email.php b/customer_email.php index 9cd97b8c..81f2b621 100644 --- a/customer_email.php +++ b/customer_email.php @@ -34,10 +34,7 @@ if (Settings::IsInList('panel.customer_hide_options', 'email')) { $id = (int) Request::get('id'); -if ($page == 'overview') { - $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_email"); - eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/email") . "\";"); -} elseif ($page == 'emails') { +if ($page == 'overview' || $page == 'emails') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_email::emails"); @@ -60,8 +57,18 @@ if ($page == 'overview') { )); $emaildomains_count = $result2['emaildomains']; + $add_link = false; + if (($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && $emaildomains_count !=0) { + $add_link = [ + 'href' => $linker->getLink(['section' => 'email', 'page' => $page, 'action' => 'add']), + 'label' => $lng['emails']['emails_add'] + ]; + } + UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $email_list_data['email_list']), + 'add_link' => $add_link, + 'entity_info' => $lng['emails']['description'] ]); UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { diff --git a/customer_extras.php b/customer_extras.php index 2fed7fd6..c55daa2a 100644 --- a/customer_extras.php +++ b/customer_extras.php @@ -33,10 +33,7 @@ if (Settings::IsInList('panel.customer_hide_options', 'extras')) { $id = (int) Request::get('id'); -if ($page == 'overview') { - $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_extras"); - eval("echo \"" . \Froxlor\UI\Template::getTemplate("extras/extras") . "\";"); -} elseif ($page == 'htpasswds') { +if ($page == 'overview' || $page == 'htpasswds') { // redirect if this customer sub-page is hidden via settings if (Settings::IsInList('panel.customer_hide_options', 'extras.directoryprotection')) { @@ -60,6 +57,11 @@ if ($page == 'overview') { UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $htpasswd_list_data['htpasswd_list']), + 'add_link' => [ + 'href' => $linker->getLink(['section' => 'extras', 'page' => 'htpasswds', 'action' => 'add']), + 'label' => $lng['extras']['directoryprotection_add'] + ], + 'entity_info' => $lng['extras']['description'] ]); UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { @@ -177,6 +179,11 @@ if ($page == 'overview') { UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $htaccess_list_data['htaccess_list']), + 'add_link' => [ + 'href' => $linker->getLink(['section' => 'extras', 'page' => 'htaccess', 'action' => 'add']), + 'label' => $lng['extras']['pathoptions_add'] + ], + 'entity_info' => $lng['extras']['description'] ]); UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { diff --git a/customer_ftp.php b/customer_ftp.php index cd9b40bc..ebf982f3 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -32,10 +32,7 @@ if (Settings::IsInList('panel.customer_hide_options', 'ftp')) { $id = (int) Request::get('id', 0); -if ($page == 'overview') { - $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp"); - eval("echo \"" . \Froxlor\UI\Template::getTemplate('ftp/ftp') . "\";"); -} elseif ($page == 'accounts') { +if ($page == 'overview' || $page == 'accounts') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts"); try { @@ -47,8 +44,18 @@ if ($page == 'overview') { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } + $add_link = false; + if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') { + $add_link = [ + 'href' => $linker->getLink(['section' => 'ftp', 'page' => 'accounts', 'action' => 'add']), + 'label' => $lng['ftp']['account_add'] + ]; + } + UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $ftp_list_data['ftp_list']), + 'add_link' => $add_link, + 'entity_info' => $lng['ftp']['description'] ]); UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { diff --git a/customer_mysql.php b/customer_mysql.php index 4db4fda9..6e126c46 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -38,13 +38,7 @@ Database::needRoot(false); $id = (int) Request::get('id'); -if ($page == 'overview') { - $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql"); - Database::needSqlData(); - $sql = Database::getSqlData(); - $lng['mysql']['description'] = str_replace('', $sql['host'], $lng['mysql']['description']); - eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysql') . "\";"); -} elseif ($page == 'mysqls') { +if ($page == 'overview' || $page == 'mysqls') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls"); @@ -61,8 +55,22 @@ if ($page == 'overview') { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } + Database::needSqlData(); + $sql = Database::getSqlData(); + $lng['mysql']['description'] = str_replace('', $sql['host'], $lng['mysql']['description']); + + $add_link = false; + if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') { + $add_link = [ + 'href' => $linker->getLink(['section' => 'mysql', 'page' => 'mysqls', 'action' => 'add']), + 'label' => $lng['mysql']['database_create'] + ]; + } + UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $mysql_list_data['mysql_list']), + 'add_link' => $add_link, + 'entity_info' => $lng['mysql']['description'] ]); UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { diff --git a/lib/Froxlor/UI/Callbacks/Text.php b/lib/Froxlor/UI/Callbacks/Text.php index cdf3e301..e26c7f62 100644 --- a/lib/Froxlor/UI/Callbacks/Text.php +++ b/lib/Froxlor/UI/Callbacks/Text.php @@ -2,6 +2,8 @@ namespace Froxlor\UI\Callbacks; +use Froxlor\PhpHelper; + /** * This file is part of the Froxlor project. * Copyright (c) 2010 the Froxlor Team (see authors). @@ -42,4 +44,9 @@ class Text { return \Froxlor\User::getCorrectFullUserDetails($attributes); } + + public static function size(string $data, array $attributes): string + { + return PhpHelper::sizeReadable($data, null, 'bi'); + } } diff --git a/templates/Froxlor/user/table.html.twig b/templates/Froxlor/user/table.html.twig index 452b4fb2..9f3dcb65 100644 --- a/templates/Froxlor/user/table.html.twig +++ b/templates/Froxlor/user/table.html.twig @@ -2,7 +2,7 @@ {% block content %}
      -
      +
      {% import "Froxlor/table/table.html.twig" as table %} {{ table.table(listing) }}
      From 6b5cabb1253649ac76cabe282ddd8606455e672a Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 25 Feb 2022 20:41:06 +0100 Subject: [PATCH 13/13] more overview/actions-links Signed-off-by: Michael Kaufmann --- admin_admins.php | 24 ++++--- admin_customers.php | 33 ++++++---- admin_domains.php | 65 ++++++++++++------- admin_ipsandports.php | 20 +++--- admin_plans.php | 20 +++--- customer_domains.php | 8 +-- customer_email.php | 8 +-- customer_extras.php | 4 +- customer_ftp.php | 8 +-- customer_mysql.php | 8 +-- lib/tablelisting/admin/tablelisting.plans.php | 2 +- templates/Froxlor/user/table.html.twig | 16 +++-- 12 files changed, 130 insertions(+), 86 deletions(-) diff --git a/admin_admins.php b/admin_admins.php index b22b7c21..657469fc 100644 --- a/admin_admins.php +++ b/admin_admins.php @@ -32,22 +32,26 @@ if ($page == 'admins' && $userinfo['change_serversettings'] == '1') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_admins"); - $admin_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.admins.php'; + $admin_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.admins.php'; - try { + try { // get filtered collection - $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Admins::class, $userinfo)) - ->withPagination($admin_list_data['admin_list']['columns']) - ->getList(); + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Admins::class, $userinfo)) + ->withPagination($admin_list_data['admin_list']['columns']) + ->getList(); } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - UI::twigBuffer('user/table.html.twig', [ - 'listing' => \Froxlor\UI\Listing::format($list, $admin_list_data['admin_list']), - ]); - UI::twigOutputBuffer(); - } elseif ($action == 'su') { + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $admin_list_data['admin_list']), + 'actions_links' => [[ + 'href' => $linker->getLink(['section' => 'admins', 'page' => $page, 'action' => 'add']), + 'label' => $lng['admin']['admin_add'] + ]] + ]); + UI::twigOutputBuffer(); + } elseif ($action == 'su') { try { $json_result = Admins::getLocal($userinfo, array( diff --git a/admin_customers.php b/admin_customers.php index a7b43f19..35208d2a 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -33,19 +33,28 @@ if ($page == 'customers' && $userinfo['customers'] != '0') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_customers"); try { - $customer_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.customers.php'; - $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Customers::class, $userinfo)) - ->has('admin', \Froxlor\Api\Commands\Admins::class, 'adminid', 'adminid') - ->withPagination($customer_list_data['customer_list']['columns']) - ->getList(); - } catch (Exception $e) { - \Froxlor\UI\Response::dynamic_error($e->getMessage()); - } + $customer_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.customers.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Customers::class, $userinfo)) + ->has('admin', \Froxlor\Api\Commands\Admins::class, 'adminid', 'adminid') + ->withPagination($customer_list_data['customer_list']['columns']) + ->getList(); + } catch (Exception $e) { + \Froxlor\UI\Response::dynamic_error($e->getMessage()); + } - UI::twigBuffer('user/table.html.twig', [ - 'listing' => \Froxlor\UI\Listing::format($list, $customer_list_data['customer_list']), - ]); - UI::twigOutputBuffer(); + $actions_links = false; + if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') { + $actions_links = [[ + 'href' => $linker->getLink(['section' => 'customers', 'page' => $page, 'action' => 'add']), + 'label' => $lng['admin']['customer_add'] + ]]; + } + + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $customer_list_data['customer_list']), + 'actions_links' => $actions_links + ]); + UI::twigOutputBuffer(); } elseif ($action == 'su' && $id != 0) { try { $json_result = Customers::getLocal($userinfo, array( diff --git a/admin_domains.php b/admin_domains.php index e8d32190..ceb30463 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -33,20 +33,39 @@ if ($page == 'domains' || $page == 'overview') { if ($action == '') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_domains"); - try { - $domain_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.domains.php'; - $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Domains::class, $userinfo)) - ->has('customer', \Froxlor\Api\Commands\Customers::class, 'customerid', 'customerid') - ->withPagination($domain_list_data['domain_list']['columns']) - ->getList(); - } catch (Exception $e) { - \Froxlor\UI\Response::dynamic_error($e->getMessage()); - } + try { + $domain_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.domains.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\Domains::class, $userinfo)) + ->has('customer', \Froxlor\Api\Commands\Customers::class, 'customerid', 'customerid') + ->withPagination($domain_list_data['domain_list']['columns']) + ->getList(); + } catch (Exception $e) { + \Froxlor\UI\Response::dynamic_error($e->getMessage()); + } - UI::twigBuffer('user/table.html.twig', [ - 'listing' => \Froxlor\UI\Listing::format($list, $domain_list_data['domain_list']), - ]); - UI::twigOutputBuffer(); + $json_result = Customers::getLocal($userinfo)->listingCount(); + $countcustomers = json_decode($json_result, true)['data']; + + $actions_links = false; + if (($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && $countcustomers != 0) { + $actions_links = []; + $actions_links[] = [ + 'href' => $linker->getLink(['section' => 'domains', 'page' => $page, 'action' => 'add']), + 'label' => $lng['admin']['domain_add'] + ]; + $actions_links[] = [ + 'href' => $linker->getLink(['section' => 'domains', 'page' => $page, 'action' => 'import']), + 'label' => $lng['domains']['domain_import'], + 'icon' => 'fa-solid fa-file-import', + 'class' => 'btn-secondary' + ]; + } + + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $domain_list_data['domain_list']), + 'actions_links' => $actions_links + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { @@ -325,7 +344,7 @@ if ($page == 'domains' || $page == 'overview') { if (in_array($domain_emails_row['email_full'], $domain_emails_row['destination'])) { $email_forwarders -= 1; - $email_accounts ++; + $email_accounts++; } } } @@ -541,14 +560,14 @@ if ($page == 'domains' || $page == 'overview') { LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid "); $c_allowed_configs = \Froxlor\Customer\Customer::getCustomerDetail($result['customerid'], 'allowed_phpconfigs'); - if (! empty($c_allowed_configs)) { + if (!empty($c_allowed_configs)) { $c_allowed_configs = json_decode($c_allowed_configs, true); } else { $c_allowed_configs = array(); } while ($phpconfigs_row = $phpconfigs_result_stmt->fetch(PDO::FETCH_ASSOC)) { - $disabled = ! empty($c_allowed_configs) && ! in_array($phpconfigs_row['id'], $c_allowed_configs); + $disabled = !empty($c_allowed_configs) && !in_array($phpconfigs_row['id'], $c_allowed_configs); if ((int) Settings::Get('phpfpm.enabled') == 1) { $phpconfigs .= \Froxlor\UI\HTML::makeoption($phpconfigs_row['description'] . " [" . $phpconfigs_row['interpreter'] . "]", $phpconfigs_row['id'], $result['phpsettingid'], true, true, null, $disabled); } else { @@ -558,8 +577,10 @@ if ($page == 'domains' || $page == 'overview') { $result = \Froxlor\PhpHelper::htmlentitiesArray($result); if (Settings::Get('panel.allow_domain_change_customer') != '1') { - $result['customername'] .= ' (' . $customer['loginname'] . ')'; + $result['customername'] .= ' (' . $customer['loginname'] . ')'; } $domain_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/domains/formfield.domains_edit.php'; @@ -577,7 +598,7 @@ if ($page == 'domains' || $page == 'overview') { $customerid = intval($_POST['customerid']); $allowed_phpconfigs = \Froxlor\Customer\Customer::getCustomerDetail($customerid, 'allowed_phpconfigs'); - echo ! empty($allowed_phpconfigs) ? $allowed_phpconfigs : json_encode(array()); + echo !empty($allowed_phpconfigs) ? $allowed_phpconfigs : json_encode(array()); exit(); } elseif ($action == 'import') { @@ -597,7 +618,7 @@ if ($page == 'domains' || $page == 'overview') { \Froxlor\UI\Response::standard_error('domain_import_error', $e->getMessage()); } - if (! empty($bulk->getErrors())) { + if (!empty($bulk->getErrors())) { \Froxlor\UI\Response::dynamic_error(implode("
      ", $bulk->getErrors())); } @@ -606,7 +627,7 @@ if ($page == 'domains' || $page == 'overview') { \Froxlor\System\Cronjob::inserttask(\Froxlor\Cron\TaskId::REBUILD_VHOST); \Froxlor\System\Cronjob::inserttask(\Froxlor\Cron\TaskId::REBUILD_DNS); - $result_str = $result['imported'] . ' / ' . $result['all'] . (! empty($result['note']) ? ' (' . $result['note'] . ')' : ''); + $result_str = $result['imported'] . ' / ' . $result['all'] . (!empty($result['note']) ? ' (' . $result['note'] . ')' : ''); \Froxlor\UI\Response::standard_success('domain_import_successfully', $result_str, array( 'filename' => $filename, 'action' => '', @@ -647,7 +668,7 @@ function formatDomainEntry(&$row, &$idna_convert) $row['ipandport'] .= $rowip['ip'] . ':' . $rowip['port'] . "\n"; } } - $row['ipandport'] = substr($row['ipandport'], 0, - 1); + $row['ipandport'] = substr($row['ipandport'], 0, -1); $row['termination_date'] = str_replace("0000-00-00", "", $row['termination_date']); $row['termination_css'] = ""; diff --git a/admin_ipsandports.php b/admin_ipsandports.php index 172806c6..9c258609 100644 --- a/admin_ipsandports.php +++ b/admin_ipsandports.php @@ -32,18 +32,22 @@ if ($page == 'ipsandports' || $page == 'overview') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports"); try { - $ipsandports_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.ipsandports.php'; + $ipsandports_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.ipsandports.php'; $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\IpsAndPorts::class, $userinfo)) - ->withPagination($ipsandports_list_data['ipsandports_list']['columns']) - ->getList(); - } catch (Exception $e) { + ->withPagination($ipsandports_list_data['ipsandports_list']['columns']) + ->getList(); + } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - UI::twigBuffer('user/table.html.twig', [ - 'listing' => \Froxlor\UI\Listing::format($list, $ipsandports_list_data['ipsandports_list']), - ]); - UI::twigOutputBuffer(); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $ipsandports_list_data['ipsandports_list']), + 'actions_links' => [[ + 'href' => $linker->getLink(['section' => 'ipsandports', 'page' => $page, 'action' => 'add']), + 'label' => $lng['admin']['ipsandports']['add'] + ]] + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { $json_result = IpsAndPorts::getLocal($userinfo, array( diff --git a/admin_plans.php b/admin_plans.php index c856766e..ac035a21 100644 --- a/admin_plans.php +++ b/admin_plans.php @@ -33,18 +33,22 @@ if ($page == '' || $page == 'overview') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_plans"); try { - $plan_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.plans.php'; - $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\HostingPlans::class, $userinfo)) - ->withPagination($plan_list_data['plan_list']['columns']) - ->getList(); + $plan_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.plans.php'; + $list = (new \Froxlor\UI\Collection(\Froxlor\Api\Commands\HostingPlans::class, $userinfo)) + ->withPagination($plan_list_data['plan_list']['columns']) + ->getList(); } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - UI::twigBuffer('user/table.html.twig', [ - 'listing' => \Froxlor\UI\Listing::format($list, $plan_list_data['plan_list']), - ]); - UI::twigOutputBuffer(); + UI::twigBuffer('user/table.html.twig', [ + 'listing' => \Froxlor\UI\Listing::format($list, $plan_list_data['plan_list']), + 'actions_links' => [[ + 'href' => $linker->getLink(['section' => 'plans', 'page' => $page, 'action' => 'add']), + 'label' => $lng['admin']['plans']['add'] + ]] + ]); + UI::twigOutputBuffer(); } elseif ($action == 'delete' && $id != 0) { try { diff --git a/customer_domains.php b/customer_domains.php index 14e19b7b..2091f961 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -53,17 +53,17 @@ if ($page == 'overview' || $page == 'domains') { $result = json_decode($json_result, true)['data']; $parentdomains_count = $result['count']; - $add_link = false; + $actions_links = false; if (($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0) { - $add_link = [ + $actions_links = [[ 'href' => $linker->getLink(['section' => 'domains', 'page' => 'domains', 'action' => 'add']), 'label' => $lng['domains']['subdomain_add'] - ]; + ]]; } UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $domain_list_data['domain_list']), - 'add_link' => $add_link, + 'actions_links' => $actions_links, 'entity_info' => $lng['domains']['description'] ]); UI::twigOutputBuffer(); diff --git a/customer_email.php b/customer_email.php index 81f2b621..2f1d590d 100644 --- a/customer_email.php +++ b/customer_email.php @@ -57,17 +57,17 @@ if ($page == 'overview' || $page == 'emails') { )); $emaildomains_count = $result2['emaildomains']; - $add_link = false; + $actions_links = false; if (($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && $emaildomains_count !=0) { - $add_link = [ + $actions_links = [[ 'href' => $linker->getLink(['section' => 'email', 'page' => $page, 'action' => 'add']), 'label' => $lng['emails']['emails_add'] - ]; + ]]; } UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $email_list_data['email_list']), - 'add_link' => $add_link, + 'actions_links' => $actions_links, 'entity_info' => $lng['emails']['description'] ]); UI::twigOutputBuffer(); diff --git a/customer_extras.php b/customer_extras.php index c55daa2a..5ea69bd5 100644 --- a/customer_extras.php +++ b/customer_extras.php @@ -57,10 +57,10 @@ if ($page == 'overview' || $page == 'htpasswds') { UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $htpasswd_list_data['htpasswd_list']), - 'add_link' => [ + 'actions_links' => [[ 'href' => $linker->getLink(['section' => 'extras', 'page' => 'htpasswds', 'action' => 'add']), 'label' => $lng['extras']['directoryprotection_add'] - ], + ]], 'entity_info' => $lng['extras']['description'] ]); UI::twigOutputBuffer(); diff --git a/customer_ftp.php b/customer_ftp.php index ebf982f3..ce3bde10 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -44,17 +44,17 @@ if ($page == 'overview' || $page == 'accounts') { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } - $add_link = false; + $actions_links = false; if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') { - $add_link = [ + $actions_links = [[ 'href' => $linker->getLink(['section' => 'ftp', 'page' => 'accounts', 'action' => 'add']), 'label' => $lng['ftp']['account_add'] - ]; + ]]; } UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $ftp_list_data['ftp_list']), - 'add_link' => $add_link, + 'actions_links' => $actions_links, 'entity_info' => $lng['ftp']['description'] ]); UI::twigOutputBuffer(); diff --git a/customer_mysql.php b/customer_mysql.php index 6e126c46..4985e0f3 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -59,17 +59,17 @@ if ($page == 'overview' || $page == 'mysqls') { $sql = Database::getSqlData(); $lng['mysql']['description'] = str_replace('', $sql['host'], $lng['mysql']['description']); - $add_link = false; + $actions_links = false; if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') { - $add_link = [ + $actions_links = [[ 'href' => $linker->getLink(['section' => 'mysql', 'page' => 'mysqls', 'action' => 'add']), 'label' => $lng['mysql']['database_create'] - ]; + ]]; } UI::twigBuffer('user/table.html.twig', [ 'listing' => \Froxlor\UI\Listing::format($list, $mysql_list_data['mysql_list']), - 'add_link' => $add_link, + 'actions_links' => $actions_links, 'entity_info' => $lng['mysql']['description'] ]); UI::twigOutputBuffer(); diff --git a/lib/tablelisting/admin/tablelisting.plans.php b/lib/tablelisting/admin/tablelisting.plans.php index 88d5a7c4..d365bd67 100644 --- a/lib/tablelisting/admin/tablelisting.plans.php +++ b/lib/tablelisting/admin/tablelisting.plans.php @@ -21,7 +21,7 @@ use Froxlor\UI\Listing; return [ 'plan_list' => [ - 'title' => $lng['domains']['ssl_certificates'], + 'title' => $lng['admin']['plans']['plans'], 'icon' => 'fa-solid fa-user', 'columns' => [ 'p.name' => [ diff --git a/templates/Froxlor/user/table.html.twig b/templates/Froxlor/user/table.html.twig index 9f3dcb65..40abea6e 100644 --- a/templates/Froxlor/user/table.html.twig +++ b/templates/Froxlor/user/table.html.twig @@ -2,19 +2,21 @@ {% block content %}
      -
      +
      {% import "Froxlor/table/table.html.twig" as table %} {{ table.table(listing) }}
      - {% if add_link is iterable or (entity_info is defined and entity_info is not empty) %} + {% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}
      - {% if add_link is iterable %} - - - {{ add_link.label }} + {% if actions_links is iterable %} + {% for link in actions_links %} + + + {{ link.label }} + {% endfor %} {% endif %} {% if entity_info is defined and entity_info is not empty %} -