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

show registration date of domain (if given) in admin and customer domain-list, fixes #553

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-02 11:50:45 +01:00
parent 212cb0140d
commit 426e46a2df
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customer_domains.php
View File

@@ -41,7 +41,7 @@ if ($page == 'overview') {
'd.domain' => $lng['domains']['domainname'] 'd.domain' => $lng['domains']['domainname']
); );
$paging = new paging($userinfo, TABLE_PANEL_DOMAINS, $fields); $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 . "` `ad` ON `d`.`aliasdomain`=`ad`.`id`
LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id`
WHERE `d`.`customerid`= :customerid WHERE `d`.`customerid`= :customerid

2
lng/english.lng.php
View File

@@ -892,7 +892,7 @@ $lng['panel']['active'] = 'Active';
$lng['panel']['please_choose'] = 'Please choose'; $lng['panel']['please_choose'] = 'Please choose';
$lng['panel']['allow_modifications'] = 'Allow modifications'; $lng['panel']['allow_modifications'] = 'Allow modifications';
$lng['domains']['add_date'] = 'Added to Froxlor'; $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'; $lng['domains']['topleveldomain'] = 'Top-Level-Domain';
// ADDED IN 1.2.19-svn22 // ADDED IN 1.2.19-svn22

2
lng/german.lng.php
View File

@@ -887,7 +887,7 @@ $lng['panel']['active'] = 'Aktiv';
$lng['panel']['please_choose'] = 'Bitte auswählen'; $lng['panel']['please_choose'] = 'Bitte auswählen';
$lng['panel']['allow_modifications'] = 'Änderungen zulassen'; $lng['panel']['allow_modifications'] = 'Änderungen zulassen';
$lng['domains']['add_date'] = 'Zu Froxlor hinzugefügt'; $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'; $lng['domains']['topleveldomain'] = 'Top-Level-Domain';
// ADDED IN 1.2.19-svn22 // ADDED IN 1.2.19-svn22

5
templates/Sparkle/admin/domains/domains_domain.tpl vendored
View File

@@ -4,10 +4,13 @@
<if $row['termination_css'] == ''> <if $row['termination_css'] == ''>
<tr <if $row['deactivated'] == 1>class="disabled"</if>> <tr <if $row['deactivated'] == 1>class="disabled"</if>>
</if> </if>
<td>{$row['domain']} <td><b>{$row['domain']}</b>
<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> <if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
&nbsp;({$lng['admin']['stdsubdomain']}) &nbsp;({$lng['admin']['stdsubdomain']})
</if> </if>
<if $row['registration_date'] != ''>
<br><small>{$lng['domains']['registration_date']}: {$row['registration_date']}</small>
</if>
<if $row['termination_date'] != ''> <if $row['termination_date'] != ''>
<br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small> <br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small>
</if> </if>

5
templates/Sparkle/customer/domains/domains_domain.tpl vendored
View File

@@ -5,7 +5,10 @@
<tr> <tr>
</if> </if>
<td> <td>
<a href="http://{$row['domain']}" target="_blank">{$row['domain']}</a> <a href="http://{$row['domain']}" target="_blank"><b>{$row['domain']}</b></a>
<if $row['registration_date'] != ''>
<br><small>{$lng['domains']['registration_date']}: {$row['registration_date']}</small>
</if>
<if $row['termination_date'] != ''> <if $row['termination_date'] != ''>
<br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small> <br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small>
</if> </if>