set languages can also be used by UID now; make mymail langauge sensitive

mymail used to use the language of the person triggering the email.

diff --git a/include/functions.php b/include/functions.php
index 1f8f2ccf1d0c7c4c5c54b41e675a29088596ae08..366b613a73f191d363d156fb8374abf03df96fef 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -106,82 +106,25 @@ define("CARDS_GAMEOVER",    5); /* show all cards from everyone (looking at some
 
 function mymail($uid,$gameid=0,$type,$message)
 {
-  global $EmailName,$WIKI;
+  global $EmailName,$WIKI,$PREF;
 
-  /* do we send the email right away or save it in the database? */
-  $send_now = 1;
-
-  /* add standard header and footer */
-  $subject = "$EmailName ";
-  if($gameid)
-    $game = DB_format_gameid($gameid);
-  else
-    $game = '';
-
-  switch($type)
+  /* uid can be either a single uid or an array, convert everything to
+   *  an array, so that we can loop over it */
+  if(!is_array($uid))
     {
-    case GAME_CANCELED:
-      $subject.=sprintf(_("Game %s canceled"),$game);
-      break;
-    case GAME_CANCELED_POVERTY:
-      $subject.=sprintf(_("Game %s canceled (poverty not resolved)"),$game);
-      break;
-    case GAME_CANCELED_TIMEOUT:
-      $subject.=sprintf(_("Game %s canceled (timed out)"),$game);
-      break;
-    case GAME_YOUR_TURN:
-      $subject.=sprintf(_("A card has been played in game %s"),$game);
-      break;
-    case GAME_READY:
-      $subject.=sprintf(_("Ready, set, go... (game %s)"),$game);
-      break;
-    case GAME_POVERTY:
-      $subject.=sprintf(_("Poverty (game %s)"),$game);
-      break;
-    case GAME_DPOVERTY:
-      $subject.=sprintf(_("Double poverty (game %s)"),$game);
-      break;
-    case GAME_OVER:
-      $subject.=sprintf(_("Game over (game %s)"),$game);
-      break;
-    case GAME_RECOVERY:
-      $subject.=_("Recovery");
-      break;
-    case GAME_REMINDER:
-      $subject.=sprintf(_("Reminder: game %s it's your turn"),$game);
-      break;
-    case GAME_NEW:
-      $subject.=sprintf(_("You are invited to a game of DoKo (game %s)"),$game);
-      break;
-    default:
-      $subject.=sprintf(_("Problem with email, contact admin (errorcode %d)"),$gameid);
+      $to_uid=$uid;
+      $uid = array();
+      $uid[]=$to_uid;
     }
 
-  /* standard goodbye */
-  $footer  = "\nHave a nice day\n".
-    "   your E-Doko service department\n\n".
-    "-- \n".
-    "You can change your mail delivery mode in the preference menu.\n".
-    'web: http://doko.nubati.net   '.
-    "help, bugs, etc.: $WIKI";
-
-  if(is_array($uid))
+  foreach($uid as $user)
     {
-      /* send email to more than one person */
+      /* do we send the email right away or save it in the database? */
+      $send_now = 1;
 
-      $header  = "Hello all\n\n";
-
-      foreach($uid as $user)
-       {
-         $all[] = DB_get_email('userid',$user);
-       }
-      $To = implode(",",$all);
-    }
-  else
-    {
-      /* standard greeting */
       $name    = DB_get_name('userid',$uid);
-      $header  = "Hello $name\n\n";
+      $header  = sprintf(_('Hello %s'),$name);
+      $header .= "\n\n";
 
       $To = DB_get_email('userid',$uid);
 
@@ -189,18 +132,79 @@ function mymail($uid,$gameid=0,$type,$message)
        * the database for later delivery
        */
 
-      $PREF = DB_get_PREF($uid);
-      if( $PREF['digest'] != 'digest-off' )
-       $send_now = 0;
-    }
+      $uidPREF = DB_get_PREF($uid);
+      if( $uidPREF['digest'] != 'digest-off' )
+        $send_now = 0;
+      /* use local language */
+      set_language($uidPREF['language']);
 
-  if($send_now)
-    sendmail($To,$subject,$header.$message.$footer);
-  else
-    {
-      /* store email in database */
-      DB_digest_insert_email($To,$message,$type,$gameid);
+      /* add standard header and footer */
+      $subject = "$EmailName ";
+      if($gameid)
+        $game = DB_format_gameid($gameid);
+      else
+        $game = '';
+
+      switch($type)
+        {
+        case GAME_CANCELED:
+          $subject.=sprintf(_('Game %s canceled'),$game);
+          break;
+        case GAME_CANCELED_POVERTY:
+          $subject.=sprintf(_('Game %s canceled (poverty not resolved)'),$game);
+          break;
+        case GAME_CANCELED_TIMEOUT:
+          $subject.=sprintf(_('Game %s canceled (timed out)'),$game);
+          break;
+        case GAME_YOUR_TURN:
+          $subject.=sprintf(_('A card has been played in game %s'),$game);
+          break;
+        case GAME_READY:
+          $subject.=sprintf(_('Ready, set, go... (game %s)'),$game);
+          break;
+        case GAME_POVERTY:
+          $subject.=sprintf(_('Poverty (game %s)'),$game);
+          break;
+        case GAME_DPOVERTY:
+          $subject.=sprintf(_('Double poverty (game %s)'),$game);
+          break;
+        case GAME_OVER:
+          $subject.=sprintf(_('Game over (game %s)'),$game);
+          break;
+        case GAME_RECOVERY:
+          $subject.=_('Recovery');
+          break;
+        case GAME_REMINDER:
+          $subject.=sprintf(_("Reminder: game %s it's your turn"),$game);
+          break;
+        case GAME_NEW:
+          $subject.=sprintf(_('You are invited to a game of DoKo (game %s)'),$game);
+          break;
+        default:
+          $subject.=sprintf(_('Problem with email, contact admin (errorcode %d)'),$gameid);
+        }
+
+      /* standard goodbye */
+      $footer  = "\n"._("Have a nice day\n   your E-Doko service department").
+        "\n\n".
+        "-- \n".
+        _('You can change your mail delivery mode in the preference menu.').
+       "\n".
+        _('web').': http://doko.nubati.net   '.
+        _('help, bugs, etc.').": $WIKI";
+
+      if($send_now)
+        sendmail($To,$subject,$header.$message.$footer);
+      else
+        {
+          /* store email in database */
+          DB_digest_insert_email($To,$message,$type,$gameid);
+        }
     }
+  /* reset language to original user*/
+  set_language($PREF['language']);
+
+  return;
 }
 
 function sendmail($To,$Subject,$message)
@@ -1708,9 +1712,15 @@ function detectlanguage()
        return $langcode['0'];
 }
 
-function set_language($language)
+function set_language($l,$type='lang')
 {
-    switch($language)
+   if($type=='uid')
+     {
+       $userPREF = DB_get_PREF($l);
+       $l = $userPREF['language'];
+     };
+
+    switch($l)
       {
       case 'de':
        putenv("LC_ALL=de_DE");

diff --git a/include/game.php b/include/game.php
index d1160493ef7f2f14523e27d08bb1489fcfcb832f..177b7f33b9c1c4ff04d5e34e3fe9fc6dfa71a8fe 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -57,11 +57,10 @@ $playid   = DB_get_current_playid($gameid); /* might be -1 at beginning of the g
 
 /* get prefs and save them in a variable*/
 $PREF = DB_get_PREF(isset($_SESSION['id'])?$_SESSION['id']:$myid);
-/* set language chosen in preferences, will become active on the next reload (see index.php)*/
+/* set language chosen in preferences */
 $_SESSION['language'] = $PREF['language'];
 set_language($PREF['language']);
 
-
 /* get rule set for this game */
 $RULES = DB_get_RULES($gameid);
 
@@ -1911,7 +1910,7 @@ switch($mystatus)
                      $link = "$name: ".$HOST.$INDEX."?action=game&me=".$hash."\n" ;
                      $email_message .= $link;
                    }
-                 $email_message .= "\n\n (you can use reply all on this email to reach all the players.)\n\n";
+                 $email_message .= "\n\n (use in-game comments to reach all players)\n\n";
                  mymail($userids,$gameid, GAME_OVER, $email_message);
              }
          }

diff --git a/include/stats.php b/include/stats.php
index bb6d69319960caad2e601c1b5bb83f990c496d41..a643047c0fe1cc545256d33a423e916beacbd2d5 100644 (file)
--- a/include/stats.php
+++ b/include/stats.php
@@ -35,7 +35,7 @@ if(!$myid)
   return;
 
 $PREF = DB_get_PREF($myid);
-/* set language chosen in preferences, will become active on the next reload (see index.php)*/
+/* set language chosen in preferences*/
 $_SESSION['language'] = $PREF['language'];
 set_language($PREF['language']);
 

diff --git a/rss.php b/rss.php
index c089fb5ebe0423de14888cf49d8570097e93e535..25695b810d9969c385bd05c24acaa7fafc9726be 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -75,8 +75,7 @@ header("Content-Type: text/xml");
 <?php
 
 /* set language */
-$PREF = DB_get_PREF($id);
-set_language($PREF['language']);
+set_language($id,'uid');
 
 echo '<subtitle>'._('Know when it is your turn')."</subtitle>\n";