diff --git a/lib/Froxlor/UI/Callbacks/Domain.php b/lib/Froxlor/UI/Callbacks/Domain.php index ae556c3a..713b255b 100644 --- a/lib/Froxlor/UI/Callbacks/Domain.php +++ b/lib/Froxlor/UI/Callbacks/Domain.php @@ -61,7 +61,7 @@ class Domain return UI::getLng('domains.aliasdomain') . ' ' . $attributes['fields']['aliasdomain']; } - public static function domainExternalLink(array $attributes) + public static function domainExternalLinkInfo(array $attributes) { $result = '' . $attributes['data'] . ''; // check for statistics if parentdomainid==0 to show stats-link for customers @@ -72,6 +72,12 @@ class Domain } $result .= ' '; } + if ($attributes['fields']['registration_date'] != '') { + $result .= '
' . UI::getLng('domains.registration_date') . ': ' . $attributes['fields']['registration_date'] . ''; + } + if ($attributes['fields']['termination_date'] != '') { + $result .= '
' . UI::getLng('domains.termination_date_overview') . ': ' . $attributes['fields']['termination_date'] . ''; + } return $result; } diff --git a/lib/Froxlor/UI/Callbacks/Style.php b/lib/Froxlor/UI/Callbacks/Style.php index d34b521e..6ff1ea9a 100644 --- a/lib/Froxlor/UI/Callbacks/Style.php +++ b/lib/Froxlor/UI/Callbacks/Style.php @@ -46,6 +46,21 @@ class Style return $isValid ? '' : 'bg-danger'; } + public static function resultDomainTerminatedOrDeactivated(array $attributes): string + { + $termination_date = str_replace("0000-00-00", "", $attributes['fields']['termination_date'] ?? ''); + $termination_css = ''; + if (!empty($termination_date)) { + $cdate = strtotime($termination_date . " 23:59:59"); + $today = time(); + $termination_css = 'bg-warning'; + if ($cdate < $today) { + $termination_css = 'bg-danger'; + } + } + return $attributes['fields']['deactivated'] ? 'bg-info' : $termination_css; + } + public static function diskspaceWarning(array $attributes): string { return self::getWarningStyle('diskspace', $attributes['fields'], (int)Settings::Get('system.report_webmax')); diff --git a/lib/tablelisting/admin/tablelisting.domains.php b/lib/tablelisting/admin/tablelisting.domains.php index 2590d6c0..2ca442aa 100644 --- a/lib/tablelisting/admin/tablelisting.domains.php +++ b/lib/tablelisting/admin/tablelisting.domains.php @@ -16,6 +16,7 @@ * */ +use Froxlor\UI\Callbacks\Style; use Froxlor\UI\Callbacks\Domain; use Froxlor\UI\Callbacks\Impersonate; use Froxlor\UI\Callbacks\Text; @@ -117,6 +118,9 @@ return [ ], 'visible' => [Domain::class, 'adminCanDelete'] ] + ], + 'format_callback' => [ + [Style::class, 'resultDomainTerminatedOrDeactivated'] ] ] ]; diff --git a/lib/tablelisting/customer/tablelisting.domains.php b/lib/tablelisting/customer/tablelisting.domains.php index 8088058a..bc7a163a 100644 --- a/lib/tablelisting/customer/tablelisting.domains.php +++ b/lib/tablelisting/customer/tablelisting.domains.php @@ -16,6 +16,8 @@ * */ + +use Froxlor\UI\Callbacks\Style; use Froxlor\UI\Callbacks\Domain; use Froxlor\UI\Listing; @@ -119,6 +121,9 @@ return [ ], 'visible' => [Domain::class, 'canDelete'] ] + ], + 'format_callback' => [ + [Style::class, 'resultDomainTerminatedOrDeactivated'] ] ] ];