Changeset 4879 for extensions/Mail_supervisor/include/fonctions.php

Timestamp:

Feb 12, 2010, 2:37:08 PM (15 years ago)

Author:

cljosse

Message:

[Mail_supervisor] Fix Bug in 'submit', customization of the file 'lang'

File:

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

extensions/Mail_supervisor/include/fonctions.php

@@ -130 +130 @@
                   $erreur_message = $ip . " "  . $action_spam  ;
                   pwg_set_session_var('action_spam', "true"); 
-                  $erreur_message .= "<BR />".l10n('is_a_spam') ;
+                  $erreur_message .= "<BR />".l10n('Sv_is_a_spam') ;
                  if ($mails_options[no_connect] == 'on' ){
                         //[status] => guest
@@ -262 +262 @@
     $data = mysql_fetch_array($result,MYSQL_ASSOC);
         //====================================================================================
+        
         $next_day = Str_To_Time( $data['nb_mails_periode'], $data['date_mail'] );;
         $data['rest_mail']=    $next_day - time() ;
 
-        $next_day =  + Str_To_Time( $data['nb_spams_periode'],$data['date_spam']);
+        $next_day = Str_To_Time( $data['nb_spams_periode'],$data['date_spam']);
         $data['rest_spam']=  $next_day - time() ;
 
@@ -334 +335 @@
 if ($week > 0 )
 {
-        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";
+        return $week. " " .l10n('Sv_Week'). " " .  $day . " " .l10n('Sv_Day'). "s ". $heures . " ". l10n('Sv_Hour'). "s " .    $minutes. " " .l10n('Sv_minute'). "s ".  $secondes." " .l10n('Sv_seconde')."s";
+}
+return $day . " " .l10n('Sv_Day'). "s ". $heures . " ". l10n('Sv_Hour'). "s " . $minutes. " " .l10n('Sv_Minute'). "s ".  $secondes." " .l10n('Sv_Seconde')."s";
 
 }       
@@ -371 +372 @@
                            time(),
                          2000,
-         '"1 '.l10n('Week').'"' ,
+         '"1 '.l10n('Sv_Week').'"' ,
                             0,
                   time(),
                            10,
-          '"2 '.l10n('Day').'"',
+          '"2 '.l10n('Sv_Day').'"',
                        '"false"',
                 time(),
-          '"2 '.l10n('Day').'"',
+          '"2 '.l10n('Sv_Day').'"',
         
                       '"Init"',
-   '"'.l10n('supervisor').'"',
-        '"'.l10n('hello').'"',
+   '"'.l10n('Sv_supervisor').'"',
+        '"'.l10n('Sv_hello').'"',
          )
         ;
@@ -531 +532 @@
 {
 //========================================================
-  global $erreur_message;
-$a_ajouter=$ajout ;
-
-        $period_search=array("W","D","H","M","S");
-                       array_push($period_search,l10n('Week').'s',l10n('Day').'s',l10n('Hour').'s',l10n('Minute').'s',l10n('Seconde').'s');
-                               array_push($period_search,l10n('Week'),l10n('Day'),l10n('Hour'),l10n('Minute'),l10n('Seconde'));
-
-
-        
-        $period_match = array(' week ',' day ',' hour ',' minute ',' seconde ');        
-                        array_push($period_match,' week ',' day ',' hour ',' minute ',' seconde ');
-                        array_push($period_match,' week ',' day ',' hour ',' minute ',' seconde ');
+  global $erreur_message,$infos_message;
+
+   
+$a_ajouter = strtolower($ajout) ;
+if (strlen($a_ajouter) <4) $a_ajouter=$a_ajouter." " ;
+ $period_search=array("s ","j ","h ","m ","s ");
+ array_push($period_search,"w ","d ","h ","m ","s ");
+array_push($period_search,l10n('Sv_Week').'s',l10n('Sv_Day').'s',l10n('Sv_Hour').'s',l10n('Sv_Minute').'s',l10n('Sv_Seconde').'s');
+array_push($period_search,l10n('Sv_Week'),l10n('Sv_Day'),l10n('Sv_Hour'),l10n('Sv_Minute'),l10n('Sv_Seconde'));
+        
+$period_match = array(' week ',' day ',' hour ',' minute ',' seconde ');
+                array_push($period_match,' week ',' day ',' hour ',' minute ',' seconde ');     
+                    array_push($period_match,' week ',' day ',' hour ',' minute ',' seconde ');
+                    array_push($period_match,' week ',' day ',' hour ',' minute ',' seconde ');
         
 
@@ -551 +554 @@
 $v1 = array('- ','+ ','week','day','hour','minute','seconde',' -',' +',' ');
 $v2 = array('-','+', (7*24*60*60) ,  (24*60*60),  (60*60),  60,1,'|-','|+',"*" );
+
+
 $new_valeur =  str_replace($v1,$v2,$a_ajouter) ;
 $new_valeur =  str_replace('++','+',$new_valeur ) ;
@@ -556 +561 @@
 $new_valeur = explode( "|",$new_valeur );
 $p = $init_date ;
-
+$n0=0;
         //$new_valeur = $a_ajouter + $init_date ;
         foreach($new_valeur as $nv)
@@ -564 +569 @@
                     $p += $return ;
                  }else {
-                 $erreur_message .= $return . " nv : " .  $nv ;
+                    $erreur_message .=   "[" . $ajout . "] --> " . l10n('Sv_syntax_error') . " : " .  $nv ."<br />";
                  }
                         
          
         }
+        
 return  $p ;
  
@@ -686 +692 @@
                                 pwg_query($query );     
         }
-          $erreur_message .=  $mails_options[ip] ." ".$user['username']." ".$user['email'] . ' -----> ' . l10n('black_list') ;
+          $erreur_message .=  $mails_options[ip] ." ".$user['username']." ".$user['email'] . ' -----> ' . l10n('Sv_black_list') ;
         // die($nb." ".$ip." ".$user['username']." ".$user['email']);  
         return true ;   
@@ -787 +793 @@
 
 $user_name=str_replace(" ","%20",trim($user_name));
-if ($user_name==l10n('guest')) $user_name="";
+if ($user_name==l10n('Sv_guest')) $user_name="";
 $user_name="";  // ne plus tester sur le login.
 $mail_adresse =str_replace(" ","%20",trim($mail_adresse));