From fb9dccc94ac1ad06b41678cf7ad233061fb41b75 Mon Sep 17 00:00:00 2001 From: envoyr Date: Sun, 27 Feb 2022 21:10:23 +0100 Subject: [PATCH] update naming --- lib/Froxlor/UI/Callbacks/Domain.php | 12 ++++++------ .../{SSLCertificates.php => SSLCertificate.php} | 7 ++++++- lib/tablelisting/customer/tablelisting.domains.php | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) rename lib/Froxlor/UI/Callbacks/{SSLCertificates.php => SSLCertificate.php} (89%) diff --git a/lib/Froxlor/UI/Callbacks/Domain.php b/lib/Froxlor/UI/Callbacks/Domain.php index 2ca9cfe3..36164094 100644 --- a/lib/Froxlor/UI/Callbacks/Domain.php +++ b/lib/Froxlor/UI/Callbacks/Domain.php @@ -46,23 +46,23 @@ class Domain return UI::getLng('domains.aliasdomain') . ' ' . $attributes['fields']['aliasdomain']; } - public static function canEditDomain(array $attributes): bool + public static function canEdit(array $attributes): bool { return (bool)$attributes['fields']['caneditdomain']; } - public static function canViewDomainLogs(array $attributes): bool + public static function canViewLogs(array $attributes): bool { return (bool)UI::getCurrentUser()['logviewenabled']; } - public static function canDeleteDomain(array $attributes): bool + public static function canDelete(array $attributes): bool { return $attributes['fields']['parentdomainid'] != '0' && empty($attributes['fields']['domainaliasid']); } - public static function canEditDomainDNS(array $attributes): bool + public static function canEditDNS(array $attributes): bool { return $attributes['fields']['isbinddomain'] == '1' && UI::getCurrentUser()['dnsenabled'] == '1' @@ -71,13 +71,13 @@ class Domain && Settings::Get('system.dnsenabled') == '1'; } - public function canEditDomainSSL(array $attributes): bool + public function canEditSSL(array $attributes): bool { // FIXME: https://github.com/Froxlor/Froxlor/blob/master/templates/Sparkle/customer/domains/domains_domain.tpl#L41 return false; } - public function canEditDomainAlias(array $attributes): bool + public function canEditAlias(array $attributes): bool { return !empty($attributes['fields']['domainaliasid']); } diff --git a/lib/Froxlor/UI/Callbacks/SSLCertificates.php b/lib/Froxlor/UI/Callbacks/SSLCertificate.php similarity index 89% rename from lib/Froxlor/UI/Callbacks/SSLCertificates.php rename to lib/Froxlor/UI/Callbacks/SSLCertificate.php index 5f529283..9abcbaf2 100644 --- a/lib/Froxlor/UI/Callbacks/SSLCertificates.php +++ b/lib/Froxlor/UI/Callbacks/SSLCertificate.php @@ -17,7 +17,7 @@ namespace Froxlor\UI\Callbacks; * @package Froxlor\UI\Callbacks * */ -class SSLCertificates +class SSLCertificate { public static function domainWithSan(array $attributes): array { @@ -29,4 +29,9 @@ class SSLCertificates ] ]; } + + public function canDelete(array $attributes): bool + { + return false; + } } diff --git a/lib/tablelisting/customer/tablelisting.domains.php b/lib/tablelisting/customer/tablelisting.domains.php index a341ce21..80a345d5 100644 --- a/lib/tablelisting/customer/tablelisting.domains.php +++ b/lib/tablelisting/customer/tablelisting.domains.php @@ -47,7 +47,7 @@ return [ 'action' => 'edit', 'id' => ':id' ], - 'visible' => [Domain::class, 'canEditDomain'] + 'visible' => [Domain::class, 'canEdit'] ], 'logfiles' => [ 'icon' => 'fa fa-file', @@ -56,7 +56,7 @@ return [ 'page' => 'logfiles', 'domain_id' => ':id' ], - 'visible' => [Domain::class, 'canViewDomainLogs'] + 'visible' => [Domain::class, 'canViewLogs'] ], 'domaindnseditor' => [ 'icon' => 'fa fa-globe', @@ -65,7 +65,7 @@ return [ 'page' => 'domaindnseditor', 'domain_id' => ':id' ], - 'visible' => [Domain::class, 'canEditDomainDNS'] + 'visible' => [Domain::class, 'canEditDNS'] ], 'delete' => [ 'icon' => 'fa fa-trash', @@ -76,7 +76,7 @@ return [ 'action' => 'delete', 'id' => ':id' ], - 'visible' => [Domain::class, 'canDeleteDomain'] + 'visible' => [Domain::class, 'canDelete'] ] ] ]