projects
/
e-DoKo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix error when language is not set
[e-DoKo.git]
/
digest.php
diff --git
a/digest.php
b/digest.php
index cb3409f5b13adf6dae4512e62696d9da5d16aa08..9bb33d20f0e65da25c19b5dde6929dfd6056c679 100644
(file)
--- a/
digest.php
+++ b/
digest.php
@@
-1,5
+1,5
@@
<?php
<?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.
*
*
* This file is part of e-DoKo.
*
@@
-39,17
+39,23
@@
if(isset($_SERVER['REMOTE_ADDR']))
/* get userid for users that have digest set != digest-off */
$users = DB_get_digest_users();
/* get userid for users that have digest set != digest-off */
$users = DB_get_digest_users();
+global $WIKI;
+
global $defaulttimezone;
foreach($users as $uid)
{
// get local time
global $defaulttimezone;
foreach($users as $uid)
{
// get local time
-
$zone = DB_get_user_timezone($uid);
date_default_timezone_set($zone);
$time = (int)(date("H"));
$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);
$PREF = DB_get_PREF($uid);
+
+ // set users language preference
+ set_language($PREF['language']);
+
+ // calculate mod by digest-time
switch($PREF['digest'])
{
case 'digest-off':
switch($PREF['digest'])
{
case 'digest-off':
@@
-85,6
+91,16
@@
foreach($users as $uid)
// get messages
$messages = DB_get_digest_message_by_email($email);
// 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))
{
// add them together
if(sizeof($messages))
{
@@
-100,15
+116,14
@@
foreach($users as $uid)
// add header, footer, sent out
$name = DB_get_name('userid',$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 = "\n
Have a nice day
\n".
- "
your E-Doko digester
\n\n".
+ $footer = "\n
"._('Have a nice day')."
\n".
+ "
".('your E-Doko digester')."
\n\n".
"-- \n".
"-- \n".
- "You can change your mail delivery mode in the preference menu.\n".
- 'web: http://doko.nubati.net '.
- 'help: http://wiki.nubati.net/EmailDoko '.
- 'bugs: http://wiki.nubati.net/EmailDokoIssues';
+ _('You can change your mail delivery mode in the preference menu.')."\n".
+ _('web').': http://doko.nubati.net '.
+ _('help, bugs, etc.').": $WIKI";
$subject = "$EmailName Digest";
$subject = "$EmailName Digest";