Changeset 4065 for extensions/Mail_supervisor/include

Timestamp:

Oct 20, 2009, 12:57:43 PM (15 years ago)

Author:

cljosse

Message:

[mail_supervisor] update help.

File:

• extensions/Mail_supervisor/include/fonctions.php (modified) (2 diffs)

extensions/Mail_supervisor/include/fonctions.php

@@ -173 +173 @@
     $data = mysql_fetch_array(pwg_query($query));
         //====================================================================================
-        
-
-    $mails_periode="+".str_replace($period_search, $period_match, $data['nb_mails_periode']);
-        $next_day =  strtotime(  $mails_periode,$data['date_mail']);
-        $data['rest_mail']=  ( $next_day )-time() ;
-        
+    $mails_periode = "+" . trim( str_replace($period_search, $period_match, $data['nb_mails_periode']));
+ 
+        $next_day = $data['date_mail'] + strtotime(  $mails_periode,0);;
+        $data['rest_mail']=    $next_day - time() ;
+ 
                                 
         $spams_periode="+".str_replace($period_search, $period_match, $data['nb_spams_periode']);
-        $next_day =  strtotime(  $spams_periode,$data['date_spam']);
-        $data['rest_spam']=  ( $next_day )-time() ;
+        $next_day = $data['date_spam'] + strtotime(  $spams_periode,0);
+        $data['rest_spam']=  $next_day -time() ;
 
   
         $quarantaine_periode="+".str_replace($period_search, $period_match, $data['quarantaine_periode']);
-        $next_day =  strtotime( $quarantaine_periode,$data['date_quarantaine']);        
+        $next_day = $data['date_quarantaine'] + strtotime( $quarantaine_periode,0);     
+        
         if ($data['quarantaine']) {
         $data['reste'] =   ( $next_day )-time() ;
@@ -224 +224 @@
 function int_to_heure($int)
 {
-$week= (int) ($int/(3600*24*7)); 
-$int=$int-($week*(3600*24*7));  
-
-$day= (int) ($int/(3600*24));   
-$int=$int-($day*(3600*24));
-
-$heures=(int) ($int/3600);
-
-$int=$int-($heures*(3600));
-
-$minutes=(int) ($int/60);
-$int= $int - ($minutes*(60));
+
+
+
+$delta=(7*24*60*60) ;
+$week = (int) ($int/$delta); 
+
+$int= $int-($week*$delta) ;  
+
+
+$delta=(24*60*60) ;
+$day= (int) ($int/$delta); 
+$int=$int-($day*$delta);
+
+$delta=(60*60) ;
+$heures=(int) ($int/$delta);
+$int=$int-($heures*$delta);
+
+$delta=(60) ;
+$minutes=(int) ($int/$delta);
+$int= $int - ($minutes*$delta);
+
 
 $secondes=(int) ($int);
 
-$heures= substr ('00'. $heures,-2,2);   
-$day= substr ('00'.  $day,-2,2);   
-$minutes=substr ('00'.$minutes,-2,2);
-$secondes=substr ('00'.$secondes,-2,2);
-
+$day      = substr ('00'.    $day,-2,2);   
+$heures   = substr ('00'. $heures,-2,2);   
+$minutes  = substr ('00'.$minutes,-2,2);
+$secondes = substr ('00'.$secondes,-2,2);
+
+   
 if ($week > 0 )
 {
-
-return $week. " " .l10n('Week'). " " .  $day . " " .l10n('Day'). "s ". $heures . " ". l10n('Hour'). "s " . $minutes. " " .l10n('minute'). "s ".  $secondes." " .l10n('seconde')."s";
+        return $week. " " .l10n('Week'). " " .  $day . " " .l10n('Day'). "s ". $heures . " ". l10n('Hour'). "s " .    $minutes. " " .l10n('minute'). "s ".  $secondes." " .l10n('seconde')."s";
 }
 return $day . " " .l10n('Day'). "s ". $heures . " ". l10n('Hour'). "s " . $minutes. " " .l10n('Minute'). "s ".  $secondes." " .l10n('Seconde')."s";