/[smecontribs]/rpms/smeserver-sme7admin/contribs7/smeserver-sme7admin-1.1.1-fixe_mail_status.patch
ViewVC logotype

Annotation of /rpms/smeserver-sme7admin/contribs7/smeserver-sme7admin-1.1.1-fixe_mail_status.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue May 26 08:20:25 2009 UTC (14 years, 11 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-sme7admin-1_1_1-23_el4_sme, smeserver-sme7admin-1_1_1-22_el4_sme, smeserver-sme7admin-1_1_1-21_el4_sme, smeserver-sme7admin-1_1_1-16_el4_sme, smeserver-sme7admin-1_1_1-13_el4_sme, smeserver-sme7admin-1_1_1-10_el4_sme, smeserver-sme7admin-1_1_1-11_el4_sme, smeserver-sme7admin-1_1_1-9_el4_sme, smeserver-sme7admin-1_1_1-18_el4_sme, smeserver-sme7admin-1_1_1-15_el4_sme, smeserver-sme7admin-1_1_1-19_el4_sme, HEAD
Fixe Status Emails DB parameters

1 vip-ire 1.1 --- smeserver-sme7admin-1.1.1/root/etc/e-smith/web/functions/sme7admin.fixe_mail_status 2009-05-26 18:29:56.000000000 +0200
2     +++ smeserver-sme7admin-1.1.1/root/etc/e-smith/web/functions/sme7admin 2009-05-26 18:34:07.000000000 +0200
3     @@ -158,8 +158,8 @@
4     'LimitVpnDuration'=>"2",
5    
6     'AlertMailRecipient'=>'admin',
7     - 'StateMailRecipient'=>'admin',
8     - 'StateInterval'=>"3",
9     + 'StatusMailRecipient'=>'admin',
10     + 'StatusInterval'=>"3",
11    
12     'MaxMailIn'=>"1",
13     'MaxMailOut'=>"1",
14     @@ -454,8 +454,8 @@
15     $q->i($q->p(gettext("Configuration of status e-mails.\n"))),
16     $q->p(gettext("If you set the frequency to 0, status e-mails are disabled. You can put only the username if the recipient is a local user.\n")),
17     $q->start_table,
18     - esmith::cgi::genNameValueRow($q,gettext("Status e-mails recipient"),"StateMailRecipient",$params{"StatusMailRecipient"}),
19     - esmith::cgi::genNameValueRow($q,gettext("Frequency of status e-mails (* 5min)"),"StateInterval",$params{"StatusInterval"}),
20     + esmith::cgi::genNameValueRow($q,gettext("Status e-mails recipient"),"StatusMailRecipient",$params{"StatusMailRecipient"}),
21     + esmith::cgi::genNameValueRow($q,gettext("Frequency of status e-mails (* 5min)"),"StatusInterval",$params{"StatusInterval"}),
22     $q->end_table,
23     $q->hr({width=>'50%'});
24    
25     @@ -576,16 +576,16 @@
26     }
27    
28     #verification validite e-mail status
29     - if (! ($q->param('StateMailRecipient') =~ /^[\w.-]+(@[\dA-Za-z-.]+)?$/) )
30     + if (! ($q->param('StatusMailRecipient') =~ /^[\w.-]+(@[\dA-Za-z-.]+)?$/) )
31     {
32     $verifok=0;
33     - $str=sprintf(gettext("\"%s\" is not a valid e-mail address.\n"),$q->param("StateMailRecipient"));
34     + $str=sprintf(gettext("\"%s\" is not a valid e-mail address.\n"),$q->param("StatusMailRecipient"));
35     print esmith::cgi::genTextRow($q,$q->p($str));
36     }
37    
38     #verification valeurs numeriques
39     foreach my $key ( 'ImgWidth', 'ImgHeight', 'LimitPppoeDisconnect', 'LimitPppoeDuration', 'LimitVpnDuration',
40     - 'StateInterval', 'MaxMailIn', 'MaxMailOut', 'MaxDiskSpace', 'MaxCpu', 'MaxHdTemp',
41     + 'StatusInterval', 'MaxMailIn', 'MaxMailOut', 'MaxDiskSpace', 'MaxCpu', 'MaxHdTemp',
42     'MaxHwTemp', 'MaxSamba', 'MaxSsh', 'MaxFtp', 'MaxVpn')
43     {
44     if (!($q->param("$key")=~/\d+/))
45     @@ -597,7 +597,7 @@
46     }
47    
48     # si on vient de desactiver les mails de status, on affiche un message
49     - if ($params{'StateInterval'} != 0 && $q->param('StatusInterval') == 0)
50     + if ($params{'StatusInterval'} != 0 && $q->param('StatusInterval') == 0)
51     {
52     print esmith::cgi::genTextRow($q,$q->p(gettext("Status e-mails have been disabled.\n")));
53     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed