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

- Customer can now select http-redirect-code for domains (if path is an URL), only works for apache as lighttpd does not support this until version 1.5.0, fixes #184

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-05-11 08:50:35 +00:00
parent 88b0c70d0c
commit 465f29531e
14 changed files with 447 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
templates/customer/domains/domains_add.tpl
View File

@@ -13,24 +13,31 @@ $header
</tr>
<tr>
<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$aliasdomains</select></td>
<td class="main_field_display" nowrap="nowrap"><select name="alias">$aliasdomains</select></td>
</tr>
<if $settings['panel']['pathedit'] != 'Dropdown'><tr>
<td class="main_field_name">
{$lng['panel']['pathorurl']}:<br />
<font size="1">{$lng['panel']['pathDescription']}</font>
</td>
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
</tr></if>
<if $settings['panel']['pathedit'] == 'Dropdown'><tr>
<td class="main_field_name">{$lng['panel']['path']}:</td>
<td class="main_field_display">{$pathSelect}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
</tr></if>
<if $settings['system']['use_ssl'] == '1'>
<if $settings['panel']['pathedit'] != 'Dropdown'>
<tr>
<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}</font></td>
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
</tr>
</if>
<if $settings['panel']['pathedit'] == 'Dropdown'>
<tr>
<td class="main_field_name">{$lng['panel']['path']}:</td>
<td class="main_field_display">{$pathSelect}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
</tr>
</if>
<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
<tr>
<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
</tr>
</if>
<if $settings['system']['use_ssl'] == '1'>
<tr>
<td class="main_field_name">SSL Redirect:</td>
<td class="main_field_display" nowrap="nowrap">$ssl_redirect</td>

67
templates/customer/domains/domains_edit.tpl
View File

@@ -16,33 +16,46 @@ $header
<td class="main_field_name">{$lng['dns']['destinationip']}:</td>
<td class="main_field_display" nowrap="nowrap">{$domainip}</td>
</tr>
<if $alias_check == '0'><tr>
<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td>
</tr></if>
<if $settings['panel']['pathedit'] != 'Dropdown'><tr>
<td class="main_field_name">
{$lng['panel']['pathorurl']}:<br />
<font size="1">{$lng['panel']['pathDescription']}</font>
</td>
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
</tr></if>
<if $settings['panel']['pathedit'] == 'Dropdown'><tr>
<td class="main_field_name">{$lng['panel']['path']}:</td>
<td class="main_field_display">{$pathSelect}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
</tr></if>
<if $result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0' ><tr>
<td class="main_field_name">{$lng['domains']['wildcarddomain']}</td>
<td class="main_field_display" nowrap="nowrap">$iswildcarddomain</td>
</tr></if>
<if ( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0' ><tr>
<td class="main_field_name">Emaildomain:</td>
<td class="main_field_display" nowrap="nowrap">$isemaildomain</td>
</tr></if>
<if $alias_check == '0'>
<tr>
<td class="main_field_name">{$lng['domains']['aliasdomain']}:</td>
<td class="main_field_display" nowrap="nowrap"><select class="tendina_nobordo" name="alias">$domains</select></td>
</tr>
</if>
<if $settings['panel']['pathedit'] != 'Dropdown'>
<tr>
<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}</font></td>
<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
</tr>
</if>
<if $settings['panel']['pathedit'] == 'Dropdown'>
<tr>
<td class="main_field_name">{$lng['panel']['path']}:</td>
<td class="main_field_display">{$pathSelect}</td>
</tr>
<tr>
<td class="main_field_name">{$lng['panel']['urloverridespath']}:</td>
<td class="main_field_display"><input type="text" class="text" name="url" value="{$urlvalue}" size="30" /></td>
</tr>
</if>
<if $settings['system']['webserver'] == 'apache2' && $settings['customredirect']['enabled'] == '1'>
<tr>
<td class="main_field_name">{$lng['domains']['redirectifpathisurl']}:<br /><font size="1">{$lng['domains']['redirectifpathisurlinfo']}</font></td>
<td class="main_field_display" nowrap="nowrap"><select name="redirectcode">$redirectcode</select></td>
</tr>
</if>
<if $result['parentdomainid'] == '0' && $userinfo['subdomains'] != '0' >
<tr>
<td class="main_field_name">{$lng['domains']['wildcarddomain']}</td>
<td class="main_field_display" nowrap="nowrap">$iswildcarddomain</td>
</tr>
</if>
<if ( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0' >
<tr>
<td class="main_field_name">Emaildomain:</td>
<td class="main_field_display" nowrap="nowrap">$isemaildomain</td>
</tr>
</if>
<if $settings['system']['use_ssl'] == '1'>
<tr>
<td class="main_field_name">SSL Redirect:</td>