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

- added limitation for autoresponder, fixes #377

Browse Source 
refs #377
This commit is contained in:
Michael Kaufmann (d00p)
2010-09-20 07:56:32 +00:00
parent 7676acf1f2
commit 29d54671d3
26 changed files with 324 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/admin/admins/admins.tpl
View File

@@ -5,7 +5,7 @@ $header
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="3"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['admins']}</b>&nbsp;({$admincount})</td>
<td class="maintitle_search_right" colspan="<if $settings['ticket']['enabled'] == 1 >7<else>6</if>">{$searchcode}</td>
<td class="maintitle_search_right" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >7<else>6</if>">{$searchcode}</td>
</tr>
<tr>
<td class="field_display_border_left">{$lng['login']['username']}<br />{$arrowcode['loginname']}</td>
@@ -13,7 +13,17 @@ $header
<td class="field_display">{$lng['admin']['customers']}<br />{$lng['admin']['domains']}</td>
<td class="field_display">{$lng['customer']['diskspace']}<br />{$lng['customer']['traffic']}</td>
<td class="field_display">{$lng['customer']['mysqls']}<br />{$lng['customer']['ftps']}</td>
<if $settings['ticket']['enabled'] == 1 ><td class="field_display">{$lng['customer']['tickets']}</td></if>
<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
<td class="field_display">{$lng['customer']['tickets']}</td>
</if>
<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_display">{$lng['customer']['autoresponder']}</td>
</if>
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_display">{$lng['customer']['tickets']}<br />{$lng['customer']['autoresponder']}</td>
</if>
</if>
<td class="field_display">{$lng['customer']['emails']}<br />{$lng['customer']['subdomains']}</td>
<td class="field_display">{$lng['customer']['accounts']}<br />{$lng['customer']['forwarders']}</td>
<td class="field_display">{$lng['admin']['deactivated']}<br />{$arrowcode['deactivated']}</td>
@@ -26,7 +36,7 @@ $header
</tr>
</if>
<tr>
<td class="field_display_border_left" colspan="<if $settings['ticket']['enabled'] == 1 >10<else>9</if>"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['admin_add']}</a></td>
<td class="field_display_border_left" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >10<else>9</if>"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['admin_add']}</a></td>
</tr>
</table>
</form>

6
templates/admin/admins/admins_add.tpl
View File

@@ -110,6 +110,12 @@ $header
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_quota" value="0" maxlength="9" />&nbsp;{$email_quota_ul}</td>
</tr>
</if>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td class="main_field_name">{$lng['customer']['autoresponder']}:</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_autoresponder" value="0" maxlength="9" />&nbsp;{$email_autoresponder_ul}</td>
</tr>
</if>
<tr>
<td class="main_field_name">{$lng['customer']['ftps']}: *</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="ftps" value="0" maxlength="9" />&nbsp;{$ftps_ul}</td>

16
templates/admin/admins/admins_admin.tpl
View File

@@ -4,7 +4,21 @@
<td class="field_name"><b><font color="green">{$row['customers_used']}</font></b>/<b><font color="#FD6204">{$row['customers']}</font></b><br /><b><font color="green">{$row['domains_used']}</font></b>/<b><font color="#FD6204">{$row['domains']}</font></b></td>
<td class="field_name"><b><font color="green">{$row['diskspace_used']}</font></b>/<b><font color="#FD6204">{$row['diskspace']}</font></b> (MB)<br /><b><font color="green">{$row['traffic_used']}</font></b>/<b><font color="#FD6204">{$row['traffic']}</font></b> (GB)</td>
<td class="field_name"><b><font color="green">{$row['mysqls_used']}</font></b>/<b><font color="#FD6204">{$row['mysqls']}</font></b><br /><b><font color="green">{$row['ftps_used']}</font></b>/<b><font color="#FD6204">{$row['ftps']}</font></b></td>
<if $settings['ticket']['enabled'] == 1 ><td class="field_name"><b><font color="green">{$row['tickets_used']}</font></b>/<b><font color="#FD6204">{$row['tickets']}</font></b></td></if>
<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
<td class="field_name"><b><font color="green">{$row['tickets_used']}</font></b>/<b><font color="#FD6204">{$row['tickets']}</font></b></td>
</if>
<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_name"><b><font color="green">{$row['email_autoresponder_used']}</font></b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b></td>
</if>
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_name">
<b><font color="green">{$row['tickets_used']}</font></b>/<b><font color="#FD6204">{$row['tickets']}</font></b>
<br />
<b><font color="green">{$row['email_autoresponder_used']}</font></b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b>
</td>
</if>
</if>
<td class="field_name"><b><font color="green">{$row['emails_used']}</font></b>/<b><font color="#FD6204">{$row['emails']}</font></b><br /><b><font color="green">{$row['subdomains_used']}</font></b>/<b><font color="#FD6204">{$row['subdomains']}</font></b></td>
<td class="field_name"><b><font color="green">{$row['email_accounts_used']}</font></b>/<b><font color="#FD6204">{$row['email_accounts']}</font></b><br /><b><font color="green">{$row['email_forwarders_used']}</font></b>/<b><font color="#FD6204">{$row['email_forwarders']}</font></b></td>
<td class="field_name" style=" text-align: center; "><if $row['deactivated'] == '1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>

6
templates/admin/admins/admins_edit.tpl
View File

@@ -127,6 +127,12 @@ $header
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_quota" value="{$result['email_quota']}" maxlength="3" />&nbsp;{$email_quota_ul}</td>
</tr>
</if>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td class="main_field_name">{$lng['customer']['autoresponder']}:</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_autoresponder" value="{$result['email_autoresponder']}" maxlength="9" />&nbsp;{$email_autoresponder_ul}</td>
</tr>
</if>
<tr>
<td class="main_field_name">{$lng['customer']['ftps']}: *</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="ftps" value="{$result['ftps']}" maxlength="9" />&nbsp;{$ftps_ul}</td>

16
templates/admin/customers/customers.tpl
View File

@@ -5,7 +5,7 @@ $header
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="3" ><b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['customers']}</b>&nbsp;({$customercount})</td>
<td class="maintitle_search_right" colspan="<if $settings['ticket']['enabled'] == 1 >8<else>7</if>">{$searchcode}</td>
<td class="maintitle_search_right" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >8<else>7</if>">{$searchcode}</td>
</tr>
<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used']>
<tr>
@@ -17,7 +17,17 @@ $header
<td class="field_display">{$lng['admin']['admin']}<br />{$arrowcode['a.loginname']}</td>
<td class="field_display">{$lng['customer']['name']}&nbsp;&nbsp;{$arrowcode['c.name']}<br />{$lng['customer']['firstname']}&nbsp;&nbsp;{$arrowcode['c.firstname']}</td>
<td class="field_display">{$lng['customer']['domains']}</td>
<if $settings['ticket']['enabled'] == 1 ><td class="field_display">{$lng['customer']['tickets']}</td></if>
<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
<td class="field_display">{$lng['customer']['tickets']}</td>
</if>
<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_display">{$lng['customer']['autoresponder']}</td>
</if>
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_display">{$lng['customer']['tickets']}<br />{$lng['customer']['autoresponder']}</td>
</if>
</if>
<td class="field_display">{$lng['customer']['diskspace']}<br />{$lng['customer']['traffic']}</td>
<td class="field_display">{$lng['customer']['mysqls']}<br />{$lng['customer']['ftps']}</td>
<td class="field_display">{$lng['customer']['emails']}<br />{$lng['customer']['subdomains']}</td>
@@ -33,7 +43,7 @@ $header
</if>
<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
<tr>
<td colspan="<if $settings['ticket']['enabled'] == 1 >11<else>10</if>" class="field_display_border_left"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a></td>
<td colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >11<else>10</if>" class="field_display_border_left"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a></td>
</tr>
</if>
</table>

6
templates/admin/customers/customers_add.tpl
View File

@@ -126,6 +126,12 @@ $header
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_quota" value="0" maxlength="9" />&nbsp;{$email_quota_ul}</td>
</tr>
</if>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td class="main_field_name">{$lng['customer']['autoresponder']}:</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_autoresponder" value="0" maxlength="9" />&nbsp;{$email_autoresponder_ul}</td>
</tr>
</if>
<tr>
<td class="main_field_name">{$lng['customer']['email_imap']}: *</td>
<td class="main_field_display" nowrap="nowrap">$email_imap</td>

16
templates/admin/customers/customers_customer.tpl
View File

@@ -3,7 +3,21 @@
<td class="field_name">{$row['adminname']}</td>
<td class="field_name"><if $row['name'] != '' && $row['firstname'] != ''>{$row['name']}<br />{$row['firstname']}</if><if ($row['name'] == '' || $row['firstname'] == '') && $row['company'] != ''>{$row['company']}</if></td>
<td class="field_name"><if $row['domains'] != 0><a href="admin_domains.php?s=$s&amp;page=domains&amp;searchfield=c.loginname&amp;searchtext={$row['loginname']}">{$row['domains']}</a><else>{$row['domains']}</if></td>
<if $settings['ticket']['enabled'] == 1 ><td class="field_name"><span<if $row['tickets'] < $row['tickets_used'] && $row['tickets'] != 'UL'> style="color:red"</if><if $row['tickets_used'] < $row['tickets'] || $row['tickets'] == 'UL'> style="color:green"</if>><b>{$row['tickets_used']}</b>/<b><font color="#FD6204">{$row['tickets']}</font></b></span></td></if>
<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 0) >
<td class="field_name"><span<if $row['tickets'] < $row['tickets_used'] && $row['tickets'] != 'UL'> style="color:red"</if><if $row['tickets_used'] < $row['tickets'] || $row['tickets'] == 'UL'> style="color:green"</if>><b>{$row['tickets_used']}</b>/<b><font color="#FD6204">{$row['tickets']}</font></b></span></td>
</if>
<if ($settings['ticket']['enabled'] == 0 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_name"><span<if $row['email_autoresponder'] < $row['email_autoresponder_used'] && $row['email_autoresponder'] != 'UL'> style="color:red"</if><if $row['email_autoresponder_used'] < $row['email_autoresponder'] || $row['email_autoresponder'] == 'UL'> style="color:green"</if>><b>{$row['email_autoresponder_used']}</b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b></span></td>
</if>
<if ($settings['ticket']['enabled'] == 1 && $settings['autoresponder']['autoresponder_active'] == 1) >
<td class="field_name">
<span<if $row['tickets'] < $row['tickets_used'] && $row['tickets'] != 'UL'> style="color:red"</if><if $row['tickets_used'] < $row['tickets'] || $row['tickets'] == 'UL'> style="color:green"</if>><b>{$row['tickets_used']}</b>/<b><font color="#FD6204">{$row['tickets']}</font></b></span>
<br />
<span<if $row['email_autoresponder'] < $row['email_autoresponder_used'] && $row['email_autoresponder'] != 'UL'> style="color:red"</if><if $row['email_autoresponder_used'] < $row['email_autoresponder'] || $row['email_autoresponder'] == 'UL'> style="color:green"</if>><b>{$row['email_autoresponder_used']}</b>/<b><font color="#FD6204">{$row['email_autoresponder']}</font></b></span>
</td>
</if>
</if>
<td class="field_name">
<span<if $row['diskspace'] < $row['diskspace_used'] && $row['diskspace'] != 'UL'> style="color:red"</if><if $row['diskspace_used'] < $row['diskspace'] || $row['diskspace'] == 'UL'> style="color:green"</if>><b>{$row['diskspace_used']}</b>/<b><font color="#FD6204">{$row['diskspace']}</font></b></span> (MB)
<br />

6
templates/admin/customers/customers_edit.tpl
View File

@@ -127,6 +127,12 @@ $header
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_quota" value="{$result['email_quota']}" maxlength="9" />&nbsp;{$email_quota_ul}</td>
</tr>
</if>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td class="main_field_name">{$lng['customer']['autoresponder']}:</td>
<td class="main_field_display" nowrap="nowrap"><input type="text" class="textul" name="email_autoresponder" value="{$result['email_autoresponder']}" maxlength="9" />&nbsp;{$email_autoresponder_ul}</td>
</tr>
</if>
<tr>
<td class="main_field_name">{$lng['customer']['email_imap']}: *</td>
<td class="main_field_display" nowrap="nowrap">$email_imap</td>

8
templates/admin/index/index.tpl
View File

@@ -39,10 +39,18 @@ $header
<td class="field_name_border_left">{$lng['customer']['forwarders']}:</td>
<td class="field_display">{$overview['email_forwarders_used']} ({$userinfo['email_forwarders_used']}/{$userinfo['email_forwarders']})</td>
</tr>
<if $settings['system']['mail_quota_enabled'] == 1>
<tr>
<td class="field_name_border_left">{$lng['customer']['email_quota']}:</td>
<td class="field_display">{$overview['email_quota_used']} ({$userinfo['email_quota_used']}/{$userinfo['email_quota']})</td>
</tr>
</if>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td class="field_name_border_left">{$lng['customer']['autoresponder']}:</td>
<td class="field_display">{$userinfo['email_autoresponder_used']} ({$userinfo['email_autoresponder']})</td>
</tr>
</if>
<if (int)$settings['aps']['aps_active'] == 1>
<tr>
<td class="field_name_border_left">{$lng['aps']['numberofapspackages']}:</td>

6
templates/admin/settings/updatecounters_row_admin.tpl
View File

@@ -46,6 +46,12 @@
<td><span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span></td>
</tr>
</if>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td>{$lng['customer']['autoresponder']}:</td>
<td><span <if $admin['email_autoresponder_used'] == $admin['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_autoresponder_used']} -&gt; {$admin['email_autoresponder_used_new']}</b></span></td>
</tr>
</if>
<tr>
<td>{$lng['customer']['ftps']}:</td>
<td><span <if $admin['ftps_used'] == $admin['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span></td>

6
templates/admin/settings/updatecounters_row_customer.tpl
View File

@@ -30,6 +30,12 @@
<td><span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span></td>
</tr>
</if>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td>{$lng['customer']['autoresponder']}:</td>
<td><span <if $customer['email_autoresponder_used'] == $customer['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_autoresponder_used']} -&gt; {$customer['email_autoresponder_used_new']}</b></span></td>
</tr>
</if>
<tr>
<td>{$lng['customer']['ftps']}:</td>
<td><span <if $customer['ftps_used'] == $customer['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span></td>

2
templates/customer/email/autoresponder.tpl
View File

@@ -11,9 +11,11 @@ $header
<td class="field_display">&nbsp;</td>
</tr>
$autoresponder
<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') >
<tr>
<td class="field_display_border_left" colspan="5"><a href="$filename?&amp;action=add&amp;s=$s">{$lng['autoresponder']['autoresponder_add']}</a></td>
</tr>
</if>
</table>
<br />
<br />

7
templates/customer/index/index.tpl
View File

@@ -68,6 +68,13 @@ $header
<td class="field_display">{$userinfo['email_quota_used']} ({$userinfo['email_quota']})</td>
</tr>
</if>
</tr>
<if $settings['autoresponder']['autoresponder_active'] == 1>
<tr>
<td class="field_name_border_left">{$lng['customer']['autoresponder']}:</td>
<td class="field_display">{$userinfo['email_autoresponder_used']} ({$userinfo['email_autoresponder']})</td>
</tr>
</if>
<tr>
<td class="field_name_border_left">{$lng['customer']['mysqls']}:</td>
<td class="field_display">{$userinfo['mysqls_used']} ({$userinfo['mysqls']})</td>