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

- fixed typo in field-name (just beautification, no functions affected)

Browse Source 
- don't show delete-link for std-subdomains (they can be deactivated individually for each user when editing a user), fixes #101
This commit is contained in:
Michael Kaufmann (d00p)
2010-04-06 05:58:03 +00:00
parent 43595df977
commit 941b887b75
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actions/admin/settings/150.mail.php
View File

@@ -75,7 +75,7 @@ return array(
'default' => 100,
'save_method' => 'storeSettingField',
),
'systen_autoresponder_enabled' => array(
'system_autoresponder_enabled' => array(
'label' => $lng['serversettings']['autoresponder_active'],
'settinggroup' => 'autoresponder',
'varname' => 'autoresponder_active',
@@ -84,7 +84,7 @@ return array(
'cronmodule' => 'froxlor/autoresponder',
'save_method' => 'storeSettingField',
),
'systen_last_autoresponder_run' => array(
'system_last_autoresponder_run' => array(
'settinggroup' => 'autoresponder',
'varname' => 'last_autoresponder_run',
'type' => 'hidden',

11
templates/admin/domains/domains_domain.tpl
View File

@@ -3,5 +3,14 @@
<td class="field_name"><font size="-1">{$row['ipandport']}</font></td>
<td class="field_name"><font size="-1">{$row['customername']} (<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=su&amp;id={$row['customerid']}" target="_blank">{$row['loginname']}</a>)</font></td>
<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a></td>
<td class="field_name"><if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}">{$lng['panel']['delete']}</a></if><if isset($row['domainaliasid']) && $row['domainaliasid'] != 0><a href="$filename?s=$s&amp;page=$page&amp;searchfield=d.aliasdomain&amp;searchtext={$row['id']}">{$lng['domains']['hasaliasdomains']}</a></if></td>
<td class="field_name">
<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}">{$lng['panel']['delete']}</a>
</if>
</if>
<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
<a href="$filename?s=$s&amp;page=$page&amp;searchfield=d.aliasdomain&amp;searchtext={$row['id']}">{$lng['domains']['hasaliasdomains']}</a>
</if>
</td>
</tr>