diff --git a/customer_domains.php b/customer_domains.php index ad6420f3..45b02893 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -41,7 +41,7 @@ if ($page == 'overview') { 'd.domain' => $lng['domains']['domainname'] ); $paging = new paging($userinfo, TABLE_PANEL_DOMAINS, $fields); - $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`letsencrypt`, `d`.`termination_date`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` + $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`letsencrypt`, `d`.`registration_date`, `d`.`termination_date`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id` WHERE `d`.`customerid`= :customerid diff --git a/lng/english.lng.php b/lng/english.lng.php index 0565eeaa..eb9d15fb 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -892,7 +892,7 @@ $lng['panel']['active'] = 'Active'; $lng['panel']['please_choose'] = 'Please choose'; $lng['panel']['allow_modifications'] = 'Allow modifications'; $lng['domains']['add_date'] = 'Added to Froxlor'; -$lng['domains']['registration_date'] = 'Added at registry'; +$lng['domains']['registration_date'] = 'Added to registry'; $lng['domains']['topleveldomain'] = 'Top-Level-Domain'; // ADDED IN 1.2.19-svn22 diff --git a/lng/german.lng.php b/lng/german.lng.php index 3036fd22..6a5d957d 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -887,7 +887,7 @@ $lng['panel']['active'] = 'Aktiv'; $lng['panel']['please_choose'] = 'Bitte auswählen'; $lng['panel']['allow_modifications'] = 'Änderungen zulassen'; $lng['domains']['add_date'] = 'Zu Froxlor hinzugefügt'; -$lng['domains']['registration_date'] = 'Bei Registry hinzugefügt'; +$lng['domains']['registration_date'] = 'Registriert am'; $lng['domains']['topleveldomain'] = 'Top-Level-Domain'; // ADDED IN 1.2.19-svn22 diff --git a/templates/Sparkle/admin/domains/domains_domain.tpl b/templates/Sparkle/admin/domains/domains_domain.tpl index a00ecab6..62adfef0 100644 --- a/templates/Sparkle/admin/domains/domains_domain.tpl +++ b/templates/Sparkle/admin/domains/domains_domain.tpl @@ -4,10 +4,13 @@ class="disabled"> - {$row['domain']} + {$row['domain']}  ({$lng['admin']['stdsubdomain']}) + +
{$lng['domains']['registration_date']}: {$row['registration_date']} +

({$lng['domains']['termination_date_overview']} {$row['termination_date']})
diff --git a/templates/Sparkle/customer/domains/domains_domain.tpl b/templates/Sparkle/customer/domains/domains_domain.tpl index e4e10181..7f43c220 100644 --- a/templates/Sparkle/customer/domains/domains_domain.tpl +++ b/templates/Sparkle/customer/domains/domains_domain.tpl @@ -5,7 +5,10 @@ - {$row['domain']} + {$row['domain']} + +
{$lng['domains']['registration_date']}: {$row['registration_date']} +

({$lng['domains']['termination_date_overview']} {$row['termination_date']})