X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=digest.php;h=9bb33d20f0e65da25c19b5dde6929dfd6056c679;hp=533526230c1b6d1d1c73445b00a513c2b1852ebb;hb=e2db7fab7569c20afa4f7915edb70842ae1aed8e;hpb=761622f46541afbaf2303a791595f6595f3208eb

diff --git a/digest.php b/digest.php
index 5335262..9bb33d2 100644
--- a/digest.php
+++ b/digest.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -45,13 +45,17 @@ global $defaulttimezone;
 foreach($users as $uid)
   {
     // get local time
-
     $zone  = DB_get_user_timezone($uid);
     date_default_timezone_set($zone);
     $time = (int)(date("H"));
 
-    // calculate mod by digest-time
+    // load users preferences
     $PREF = DB_get_PREF($uid);
+
+    // set users language preference
+    set_language($PREF['language']);
+
+    // calculate mod by digest-time
     switch($PREF['digest'])
       {
       case 'digest-off':
@@ -87,6 +91,16 @@ foreach($users as $uid)
 	// get messages
 	$messages = DB_get_digest_message_by_email($email);
 
+	// check messages for outdated ones and delete those
+	foreach ($messages as $key=>$mess)
+	  {
+	    if($mess[2] == 'your_turn' && $uid != DB_get_player_by_gameid($mess[3]) )
+	      {
+		DB_digest_delete_message($mess[0]);
+		unset($messages[$key]);
+	      }
+	  }
+
 	// add them together
 	if(sizeof($messages))
 	  {
@@ -102,14 +116,14 @@ foreach($users as $uid)
 
 	    // add header, footer, sent out
 	    $name    = DB_get_name('userid',$uid);
-	    $header  = "Hello $name\n\nHere is a digest of the latest emails:\n\n";
+	    $header  = _("Hello")." $name\n\n"._("Here is a digest of the latest emails:")."\n\n";
 
-	    $footer  = "\nHave a nice day\n".
-	      "   your E-Doko digester\n\n".
+	    $footer  = "\n"._('Have a nice day')."\n".
+	      "   ".('your E-Doko digester')."\n\n".
 	      "-- \n".
-	      "You can change your mail delivery mode in the preference menu.\n".
-	      'web: http://doko.nubati.net   '.
-	      "help, bugs, etc.: $WIKI";
+	      _('You can change your mail delivery mode in the preference menu.')."\n".
+	      _('web').': http://doko.nubati.net   '.
+	      _('help, bugs, etc.').": $WIKI";
 
 	    $subject = "$EmailName Digest";