diff options
Diffstat (limited to 'httemplate/edit')
| -rwxr-xr-x | httemplate/edit/svc_acct.cgi | 123 | ||||
| -rwxr-xr-x | httemplate/edit/svc_domain.cgi | 118 | 
2 files changed, 229 insertions, 12 deletions
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 35c9006f6..bed0aaac1 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -333,8 +333,6 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>  % if ( $communigate ) { -%  #preferences -    <% include('/elements/tr-checkbox.html',                 'label'      => 'Password recovery',                 'field'      => 'password_recover', @@ -378,6 +376,8 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>              )    %> +%  #preferences +  %# false laziness w/svc_domain acct_def    <TR>      <TD ALIGN="right">Message delete method</TD> @@ -397,13 +397,126 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>      <TD><INPUT TYPE="text" NAME="cgp_emptytrash" VALUE="<% $svc_acct->cgp_emptytrash %>"></TD>    </TR> -%#XXX language, time zone, layout, printo style, send read receipts +  <% include('/elements/tr-select.html', +               'label'      => 'Language', +               'field'      => 'cgp_language', +               'options'    => [ '', qw( English Arabic Chinese Dutch French German Hebrew Italian Japanese Portuguese Russian Slovak Spanish Thai ) ], +               'labels'     => { +                                 '' => 'default (English)', +                               }, +               'curr_value' => $svc_acct->cgp_language, +            ) +  %> + +  <% include('/elements/tr-select.html', +               'label'      => 'Time zone', +               'field'      => 'cgp_timezone', +               'options'    => [ +                                 'HostOS', +                                 '(+0100) Algeria/Congo', +                                 '(+0200) Egypt/South Africa', +                                 '(+0300) Saudi Arabia', +                                 '(+0400) Oman', +                                 '(+0500) Pakistan', +                                 '(+0600) Bangladesh', +                                 '(+0700) Thailand/Vietnam', +                                 '(+0800) China/Malaysia', +                                 '(+0900) Japan/Korea', +                                 '(+1000) Queensland', +                                 '(+1100) Micronesia', +                                 '(+1200) Fiji', +                                 '(+1300) Tonga/Kiribati', +                                 '(+1400) Christmas Islands', +                                 '(-0100) Azores/Cape Verde', +                                 '(-0200) Fernando de Noronha', +                                 '(-0300) Argentina/Uruguay', +                                 '(-0400) Venezuela/Guyana', +                                 '(-0500) Haiti/Peru', +                                 '(-0600) Central America', +                                 '(-0700) Arisona', +                                 '(-0800) Adamstown', +                                 '(-0900) Marquesas Islands', +                                 '(-1000) Hawaii/Tahiti', +                                 '(-1100) Samoa', +                                 'Asia/Afghanistan', +                                 'Asia/India', +                                 'Asia/Iran', +                                 'Asia/Iraq', +                                 'Asia/Israel', +                                 'Asia/Jordan', +                                 'Asia/Lebanon', +                                 'Asia/Syria', +                                 'Australia/Adelaide', +                                 'Australia/East', +                                 'Australia/NorthernTerritory', +                                 'Europe/Central', +                                 'Europe/Eastern', +                                 'Europe/Moscow', +                                 'Europe/Western', +                                 'GMT (+0000)', +                                 'Newfoundland', +                                 'NewZealand/Auckland', +                                 'NorthAmerica/Alaska', +                                 'NorthAmerica/Atlantic', +                                 'NorthAmerica/Central', +                                 'NorthAmerica/Eastern', +                                 'NorthAmerica/Mountain', +                                 'NorthAmerica/Pacific', +                                 'Russia/Ekaterinburg', +                                 'Russia/Irkutsk', +                                 'Russia/Kamchatka', +                                 'Russia/Krasnoyarsk', +                                 'Russia/Magadan', +                                 'Russia/Novosibirsk', +                                 'Russia/Vladivostok', +                                 'Russia/Yakutsk', +                                 'SouthAmerica/Brasil', +                                 'SouthAmerica/Chile', +                                 'SouthAmerica/Paraguay', +                               ], +               'labels'     => { +                                 '' => 'default (HostOS)', +                               }, +               'curr_value' => $svc_acct->cgp_timezone, +            ) +  %> + +  <% include('/elements/tr-select.html', +               'label'      => 'Layout', +               'field'      => 'cgp_skinname', +               'options'    => [ '', '***', 'GoldFleece', 'Skin2' ], +               'labels'     => { +                                 '' => 'default (***)', +                               }, +               'curr_value' => $svc_acct->cgp_skinname, +            ) +  %> + +%#XXX pronto style + +  <% include('/elements/tr-select.html', +               'label'      => 'Send read receipts', +               'field'      => 'cgp_sendmdnmode', +               'options'    => [ '', 'Never', 'Manually', 'Automatically' ], +               'labels'     => { +                                 '' => 'default (Automatically)', +                               }, +               'curr_value' => $svc_acct->cgp_language, +            ) +  %> +  %#XXX vacation message, redirect all mail, mail rules  % } else { -  <INPUT TYPE="hidden" NAME="cgp_deletemode" VALUE="<% $svc_acct->cgp_deletemode %>"> -  <INPUT TYPE="hidden" NAME="cgp_emptytrash" VALUE="<% $svc_acct->cgp_emptytrash %>"> +%   for (qw( password_recover cgp_rulesallowed cgp_rpopallowed cgp_mailtoall +%            cgp_addmailtrailer +%            cgp_deletemode cgp_emptytrash cgp_language cgp_timezone +%            cgp_skinname cgp_sendmdnmode +%          ) ) { + +      <INPUT TYPE="hidden" NAME="<% $_ %>" VALUE="<% $svc_acct->$_() %>"> +%   }  % } diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi index 0ec91bc84..4f780d68b 100755 --- a/httemplate/edit/svc_domain.cgi +++ b/httemplate/edit/svc_domain.cgi @@ -178,7 +178,7 @@ Account defaults                 'labels'     => {                                   '' => 'default (No)', #No always the default?                                 }, -              'curr_value'  => $svc_domain->acct_def_cgp_rulesallowed, +               'curr_value' => $svc_domain->acct_def_cgp_rulesallowed,              )    %> @@ -225,15 +225,116 @@ Account defaults                 'curr_value' => $svc_domain->acct_def_cgp_emptytrash,              )    %> +  <% include('/elements/tr-select.html', +               'label'      => 'Language', +               'field'      => 'acct_def_cgp_language', +               'options'    => [ '', qw( English Arabic Chinese Dutch French German Hebrew Italian Japanese Portuguese Russian Slovak Spanish Thai ) ], +               'labels'     => { +                                 '' => 'default (English)', +                               }, +               'curr_value' => $svc_domain->acct_def_cgp_language, +            ) +  %> -  <% include('/elements/tr-checkbox.html', -               'label'      =>'Password recovery', -               'field'      => 'acct_def_password_recover', -               'curr_value' => $svc_domain->acct_def_password_recover, -               'value'      => 'Y', +  <% include('/elements/tr-select.html', +               'label'      => 'Time zone', +               'field'      => 'acct_def_cgp_timezone', +               'options'    => [ +                                 'HostOS', +                                 '(+0100) Algeria/Congo', +                                 '(+0200) Egypt/South Africa', +                                 '(+0300) Saudi Arabia', +                                 '(+0400) Oman', +                                 '(+0500) Pakistan', +                                 '(+0600) Bangladesh', +                                 '(+0700) Thailand/Vietnam', +                                 '(+0800) China/Malaysia', +                                 '(+0900) Japan/Korea', +                                 '(+1000) Queensland', +                                 '(+1100) Micronesia', +                                 '(+1200) Fiji', +                                 '(+1300) Tonga/Kiribati', +                                 '(+1400) Christmas Islands', +                                 '(-0100) Azores/Cape Verde', +                                 '(-0200) Fernando de Noronha', +                                 '(-0300) Argentina/Uruguay', +                                 '(-0400) Venezuela/Guyana', +                                 '(-0500) Haiti/Peru', +                                 '(-0600) Central America', +                                 '(-0700) Arisona', +                                 '(-0800) Adamstown', +                                 '(-0900) Marquesas Islands', +                                 '(-1000) Hawaii/Tahiti', +                                 '(-1100) Samoa', +                                 'Asia/Afghanistan', +                                 'Asia/India', +                                 'Asia/Iran', +                                 'Asia/Iraq', +                                 'Asia/Israel', +                                 'Asia/Jordan', +                                 'Asia/Lebanon', +                                 'Asia/Syria', +                                 'Australia/Adelaide', +                                 'Australia/East', +                                 'Australia/NorthernTerritory', +                                 'Europe/Central', +                                 'Europe/Eastern', +                                 'Europe/Moscow', +                                 'Europe/Western', +                                 'GMT (+0000)', +                                 'Newfoundland', +                                 'NewZealand/Auckland', +                                 'NorthAmerica/Alaska', +                                 'NorthAmerica/Atlantic', +                                 'NorthAmerica/Central', +                                 'NorthAmerica/Eastern', +                                 'NorthAmerica/Mountain', +                                 'NorthAmerica/Pacific', +                                 'Russia/Ekaterinburg', +                                 'Russia/Irkutsk', +                                 'Russia/Kamchatka', +                                 'Russia/Krasnoyarsk', +                                 'Russia/Magadan', +                                 'Russia/Novosibirsk', +                                 'Russia/Vladivostok', +                                 'Russia/Yakutsk', +                                 'SouthAmerica/Brasil', +                                 'SouthAmerica/Chile', +                                 'SouthAmerica/Paraguay', +                               ], +               'labels'     => { +                                 '' => 'default (HostOS)', +                               }, +               'curr_value' => $svc_domain->acct_def_cgp_timezone, +            ) +  %> + +  <% include('/elements/tr-select.html', +               'label'      => 'Layout', +               'field'      => 'acct_def_cgp_skinname', +               'options'    => [ '', '***', 'GoldFleece', 'Skin2' ], +               'labels'     => { +                                 '' => 'default (***)', +                               }, +               'curr_value' => $svc_domain->acct_def_cgp_skinname,              )    %> +%#XXX pronto style + +  <% include('/elements/tr-select.html', +               'label'      => 'Send read receipts', +               'field'      => 'acct_def_cgp_sendmdnmode', +               'options'    => [ '', 'Never', 'Manually', 'Automatically' ], +               'labels'     => { +                                 '' => 'default (Automatically)', +                               }, +               'curr_value' => $svc_domain->acct_def_cgp_language, +            ) +  %> + +%              #XXX rules, archive rule, spam foldering rule(s) +  </TABLE>  <BR> @@ -241,7 +342,10 @@ Account defaults  %   foreach my $f (qw( password_selfchange password_recover cgp_accessmodes  %                      quota file_quota file_maxnum file_maxsize -%                      cgp_deletemode cgp_emptytrash +%                      cgp_rulesallowed cgp_rpopallowed cgp_mailtoall +%                      cgp_addmailtrailer +%                      cgp_deletemode cgp_emptytrash cgp_language +%                      cgp_timezone cgp_skinname cgp_sendmdnmode  %                 )) {        <INPUT TYPE="hidden" NAME="acct_def_<%$f%>" VALUE="<% $svc_domain->get("acct_def_$f") %>">  %   }  | 
