--- smeserver-sme7admin-1.1.1/root/etc/e-smith/web/functions/sme7admin.fixe_mail_status	2009-05-26 18:29:56.000000000 +0200
+++ smeserver-sme7admin-1.1.1/root/etc/e-smith/web/functions/sme7admin	2009-05-26 18:34:07.000000000 +0200
@@ -158,8 +158,8 @@
 	'LimitVpnDuration'=>"2",
 	
    	'AlertMailRecipient'=>'admin',
-	'StateMailRecipient'=>'admin',
-	'StateInterval'=>"3",
+	'StatusMailRecipient'=>'admin',
+	'StatusInterval'=>"3",
                                         
    	'MaxMailIn'=>"1",
 	'MaxMailOut'=>"1",
@@ -454,8 +454,8 @@
 		$q->i($q->p(gettext("Configuration of status e-mails.\n"))),
 		$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")),
 		$q->start_table,
-		esmith::cgi::genNameValueRow($q,gettext("Status e-mails recipient"),"StateMailRecipient",$params{"StatusMailRecipient"}),
-		esmith::cgi::genNameValueRow($q,gettext("Frequency of status e-mails (* 5min)"),"StateInterval",$params{"StatusInterval"}),
+		esmith::cgi::genNameValueRow($q,gettext("Status e-mails recipient"),"StatusMailRecipient",$params{"StatusMailRecipient"}),
+		esmith::cgi::genNameValueRow($q,gettext("Frequency of status e-mails (* 5min)"),"StatusInterval",$params{"StatusInterval"}),
 	    	$q->end_table,
 		$q->hr({width=>'50%'});
     
@@ -576,16 +576,16 @@
 	    }
 	
     	#verification validite e-mail status
-	    if (! ($q->param('StateMailRecipient') =~ /^[\w.-]+(@[\dA-Za-z-.]+)?$/) )
+	    if (! ($q->param('StatusMailRecipient') =~ /^[\w.-]+(@[\dA-Za-z-.]+)?$/) )
     	{
 	    	$verifok=0;
-    	    $str=sprintf(gettext("\"%s\" is not a valid e-mail address.\n"),$q->param("StateMailRecipient"));  
+    	    $str=sprintf(gettext("\"%s\" is not a valid e-mail address.\n"),$q->param("StatusMailRecipient"));  
         	print esmith::cgi::genTextRow($q,$q->p($str));
 	    }
 
        	#verification valeurs numeriques
 	    foreach my $key ( 'ImgWidth', 'ImgHeight', 'LimitPppoeDisconnect', 'LimitPppoeDuration', 'LimitVpnDuration',
-		    'StateInterval', 'MaxMailIn', 'MaxMailOut', 'MaxDiskSpace', 'MaxCpu', 'MaxHdTemp', 
+		    'StatusInterval', 'MaxMailIn', 'MaxMailOut', 'MaxDiskSpace', 'MaxCpu', 'MaxHdTemp', 
     		'MaxHwTemp', 'MaxSamba', 'MaxSsh', 'MaxFtp', 'MaxVpn')
 	    {
 		    if (!($q->param("$key")=~/\d+/))
@@ -597,7 +597,7 @@
 	    }
 	
     	# si on vient de desactiver les mails de status, on affiche un message
-	    if ($params{'StateInterval'} != 0 && $q->param('StatusInterval') == 0)
+	    if ($params{'StatusInterval'} != 0 && $q->param('StatusInterval') == 0)
     	{
 	    	print esmith::cgi::genTextRow($q,$q->p(gettext("Status e-mails have been disabled.\n")));
        	}