summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate/view')
-rw-r--r--httemplate/view/svc_acct/basics.html57
-rw-r--r--httemplate/view/svc_acct/communigate.html77
-rw-r--r--httemplate/view/svc_domain/basics.html18
3 files changed, 92 insertions, 60 deletions
diff --git a/httemplate/view/svc_acct/basics.html b/httemplate/view/svc_acct/basics.html
index 7beb88a81..f4c83888d 100644
--- a/httemplate/view/svc_acct/basics.html
+++ b/httemplate/view/svc_acct/basics.html
@@ -68,62 +68,7 @@
% } elsif ( $opt{'communigate'} ) {
-%# settings
-
- <% include('/view/elements/tr.html', label=>'Mailbox type', value=>$svc_acct->cgp_type) %>
-
- <% include('/view/elements/tr.html', label=>'Enabled services',
- value=>$svc_acct->cgp_accessmodes ) %>
-
- <% include('/view/elements/tr.html', label=>'Mail storage limit',
- value=>$svc_acct->quota ) %>
-
- <% include('/view/elements/tr.html', label=>'File storage limit',
- value=>$svc_acct->file_quota ) %>
-
- <% include('/view/elements/tr.html', label=>'Number of files limit',
- value=>$svc_acct->file_maxnum ) %>
-
- <% include('/view/elements/tr.html', label=>'File size limit',
- value=>$svc_acct->file_maxsize ) %>
-
- <% include('/view/elements/tr.html', label=>'Password recovery',
- value=>$svc_acct->password_recover ? 'YES' : 'NO' ) %>
-
- <% include('/view/elements/tr.html', label=>'Allowed mail rules',
- value=>$svc_acct->cgp_rulesallowed || 'default (No)') %>
-
- <% include('/view/elements/tr.html', label=>'RPOP modifications',
- value=>$svc_acct->cgp_rpopallowed ? 'YES' : 'NO' ) %>
-
- <% include('/view/elements/tr.html', label=>'Accepts mail to "all"',
- value=>$svc_acct->cgp_mailtoall ? 'YES' : 'NO' ) %>
-
- <% include('/view/elements/tr.html', label=>'Add trailer to sent mail',
- value=>$svc_acct->cgp_addmailtrailer ? 'YES' : 'NO' ) %>
-
-%# preferences
-
- <% include('/view/elements/tr.html', label=>'Message delete method',
- value=>$svc_acct->cgp_deletemode ) %>
-
- <% include('/view/elements/tr.html', label=>'On logout remove trash',
- value=>$svc_acct->cgp_emptytrash ) %>
-
- <% include('/view/elements/tr.html', label=>'Language',
- value=>$svc_acct->cgp_language || 'default (English)' ) %>
- <% include('/view/elements/tr.html', label=>'Time zone',
- value=>$svc_acct->cgp_timezone || 'default (HostOS)' ) %>
- <% include('/view/elements/tr.html', label=>'Layout',
- value=>$svc_acct->cgp_skinname || 'default (***)' ) %>
-
- <% include('/view/elements/tr.html', label=>'Pronto style',
- value=>$svc_acct->cgp_prontoskinname ) %>
-
- <% include('/view/elements/tr.html', label=>'Send read receipts',
- value=>$svc_acct->cgp_sendmdnmode ) %>
-
-%#XXX vacation message, redirect all mail, mail rules
+ <% include( 'communigate.html', %opt ) %>
% }
diff --git a/httemplate/view/svc_acct/communigate.html b/httemplate/view/svc_acct/communigate.html
new file mode 100644
index 000000000..9d6680750
--- /dev/null
+++ b/httemplate/view/svc_acct/communigate.html
@@ -0,0 +1,77 @@
+%# settings
+
+ <% include('/view/elements/tr.html', label=>'Mailbox type', value=>$svc_acct->cgp_type) %>
+
+ <% include('/view/elements/tr.html', label=>'Enabled services',
+ value=>$svc_acct->cgp_accessmodes ) %>
+
+ <% include('/view/elements/tr.html', label=>'Mail storage limit',
+ value=>$svc_acct->quota ) %>
+
+ <% include('/view/elements/tr.html', label=>'File storage limit',
+ value=>$svc_acct->file_quota ) %>
+
+ <% include('/view/elements/tr.html', label=>'Number of files limit',
+ value=>$svc_acct->file_maxnum ) %>
+
+ <% include('/view/elements/tr.html', label=>'File size limit',
+ value=>$svc_acct->file_maxsize ) %>
+
+ <% include('/view/elements/tr.html', label=>'Password recovery',
+ value=>$svc_acct->password_recover ? 'YES' : 'NO' ) %>
+
+ <% include('/view/elements/tr.html', label=>'Allowed mail rules',
+ value=>$svc_acct->cgp_rulesallowed || 'default (No)') %>
+
+ <% include('/view/elements/tr.html', label=>'RPOP modifications',
+ value=>$svc_acct->cgp_rpopallowed ? 'YES' : 'NO' ) %>
+
+ <% include('/view/elements/tr.html', label=>'Accepts mail to "all"',
+ value=>$svc_acct->cgp_mailtoall ? 'YES' : 'NO' ) %>
+
+ <% include('/view/elements/tr.html', label=>'Add trailer to sent mail',
+ value=>$svc_acct->cgp_addmailtrailer ? 'YES' : 'NO' ) %>
+
+%# preferences
+
+ <% include('/view/elements/tr.html', label=>'Message delete method',
+ value=>$svc_acct->cgp_deletemode ) %>
+
+ <% include('/view/elements/tr.html', label=>'On logout remove trash',
+ value=>$svc_acct->cgp_emptytrash ) %>
+
+ <% include('/view/elements/tr.html', label=>'Language',
+ value=>$svc_acct->cgp_language || 'default (English)' ) %>
+ <% include('/view/elements/tr.html', label=>'Time zone',
+ value=>$svc_acct->cgp_timezone || 'default (HostOS)' ) %>
+ <% include('/view/elements/tr.html', label=>'Layout',
+ value=>$svc_acct->cgp_skinname || 'default (***)' ) %>
+
+ <% include('/view/elements/tr.html', label=>'Pronto style',
+ value=>$svc_acct->cgp_prontoskinname ) %>
+
+ <% include('/view/elements/tr.html', label=>'Send read receipts',
+ value=>$svc_acct->cgp_sendmdnmode ) %>
+
+%#XXX vacation message, redirect all mail
+
+%# mail rules
+
+ <% include('/view/elements/tr.html', label=>'Mail rules',
+ value=>$rule_link,
+ )
+ %>
+
+<%init>
+
+my %opt = @_;
+
+#my $conf = new FS::Conf;
+
+my $svc_acct = $opt{'svc_acct'};
+#my $part_svc = $opt{'part_svc'};
+
+my $rule_link = qq(<A HREF="${p}browse/cgp_rule.html?svcnum=).
+ $svc_acct->svcnum. '">View/edit mail rules</A>';
+
+</%init>
diff --git a/httemplate/view/svc_domain/basics.html b/httemplate/view/svc_domain/basics.html
index c9841f49c..1915719a0 100644
--- a/httemplate/view/svc_domain/basics.html
+++ b/httemplate/view/svc_domain/basics.html
@@ -79,10 +79,12 @@ Service #<B><% $svcnum %></B>
</TD>
</TR>
-<TR>
- <TD ALIGN="right">Enabled services</TD>
- <TD BGCOLOR="#ffffff"><% $svc_domain->cgp_accessmodes %></TD>
-</TR>
+% if ( $svc_domain->cgp_accessmodes ) {
+ <TR>
+ <TD ALIGN="right">Enabled services</TD>
+ <TD BGCOLOR="#ffffff"><% $svc_domain->cgp_accessmodes %></TD>
+ </TR>
+% }
% if ( $svc_domain->trailer ) {
<TR>
@@ -91,6 +93,14 @@ Service #<B><% $svcnum %></B>
</TR>
% }
+% if ( $communigate ) {
+% my $rule_url = $p. 'browse/cgp_rule.html?svcnum='. $svc_domain->svcnum;
+ <TR>
+ <TD ALIGN="right">Doimain mail rules</TD>
+ <TD BGCOLOR="#ffffff"><A HREF="<% $rule_url %>">View/Edit domain mail rules</A></TD>
+ </TR>
+% }
+
</TABLE></TD></TR></TABLE>
<%init>
generated by cgit v1.2.1 (git 2.18.0) at 2025-10-31 05:29:02 +0000