projects
/
e-DoKo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved php from old mysql to myslqi to make things more future proof
[e-DoKo.git]
/
include
/
functions.php
diff --git
a/include/functions.php
b/include/functions.php
index 366b613a73f191d363d156fb8374abf03df96fef..191823d6de6f45db89e3c144ea307c8522dcbdac 100644
(file)
--- a/
include/functions.php
+++ b/
include/functions.php
@@
-1,5
+1,5
@@
<?php
<?php
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012
, 2013
Arun Persaud <arun@nubati.net>
*
* This file is part of e-DoKo.
*
*
* This file is part of e-DoKo.
*
@@
-122,22
+122,22
@@
function mymail($uid,$gameid=0,$type,$message)
/* do we send the email right away or save it in the database? */
$send_now = 1;
/* do we send the email right away or save it in the database? */
$send_now = 1;
- $name = DB_get_name('userid',$uid);
- $header = sprintf(_('Hello %s'),$name);
- $header .= "\n\n";
-
- $To = DB_get_email('userid',$uid);
+ $name = DB_get_name('userid',$user);
+ $To = DB_get_email('userid',$user);
/* check if user wants email right away or if we should save it in
* the database for later delivery
*/
/* check if user wants email right away or if we should save it in
* the database for later delivery
*/
- $uidPREF = DB_get_PREF($u
id
);
+ $uidPREF = DB_get_PREF($u
ser
);
if( $uidPREF['digest'] != 'digest-off' )
$send_now = 0;
/* use local language */
set_language($uidPREF['language']);
if( $uidPREF['digest'] != 'digest-off' )
$send_now = 0;
/* use local language */
set_language($uidPREF['language']);
+ $header = sprintf(_('Hello %s'),$name);
+ $header .= "\n\n";
+
/* add standard header and footer */
$subject = "$EmailName ";
if($gameid)
/* add standard header and footer */
$subject = "$EmailName ";
if($gameid)
@@
-185,7
+185,7
@@
function mymail($uid,$gameid=0,$type,$message)
}
/* standard goodbye */
}
/* standard goodbye */
- $footer = "\n"._(
"Have a nice day\n your E-Doko service department"
).
+ $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\n".
"-- \n".
_('You can change your mail delivery mode in the preference menu.').
@@
-201,6
+201,7
@@
function mymail($uid,$gameid=0,$type,$message)
DB_digest_insert_email($To,$message,$type,$gameid);
}
}
DB_digest_insert_email($To,$message,$type,$gameid);
}
}
+
/* reset language to original user*/
set_language($PREF['language']);
/* reset language to original user*/
set_language($PREF['language']);
@@
-217,6
+218,10
@@
function sendmail($To,$Subject,$message)
if(isset($EMAIL_REPLY))
$header .= "From: e-DoKo daemon <$EMAIL_REPLY>\r\n";
if(isset($EMAIL_REPLY))
$header .= "From: e-DoKo daemon <$EMAIL_REPLY>\r\n";
+ $header .= "Content-Type: text/plain; charset = \"UTF-8\";\r\n";
+ $header .= "Content-Transfer-Encoding: 8bit\r\n";
+ $header .= "\r\n";
+
if($debug)
{
/* display email on screen,
if($debug)
{
/* display email on screen,
@@
-227,15
+232,12
@@
function sendmail($To,$Subject,$message)
"<a href=\"$1\">$1</a>", $message);
echo "<br />To: $To<br />";
"<a href=\"$1\">$1</a>", $message);
echo "<br />To: $To<br />";
- if($header != "")
- echo $header."<br />";
+ echo $header."<br />";
echo "Subject: $Subject <br />$message<br />\n";
}
else
echo "Subject: $Subject <br />$message<br />\n";
}
else
- if($header != "")
- mail($To,$Subject,$message,$header);
- else
- mail($To,$Subject,$message);
+ mail($To,$Subject,$message,$header);
+
return;
}
return;
}
@@
-1085,8
+1087,8
@@
function display_single_user($r,$start=0)
$stop = substr($vacation[1],0,10);
$comment = $vacation[2];
$stop = substr($vacation[1],0,10);
$comment = $vacation[2];
-
$title = "begin: $start end:
$stop $comment";
- echo " <span class=\"vacation\" title=\"$title\">$gravatar
(on vacation until $stop)
</span> \n";
+
$title = _("begin:")." $start "._("end:")."
$stop $comment";
+ echo " <span class=\"vacation\" title=\"$title\">$gravatar
"._("(on vacation until $stop)")."
</span> \n";
}
else
echo " $gravatar \n";
}
else
echo " $gravatar \n";
@@
-1207,15
+1209,15
@@
function display_single_user($r,$start=0)
switch($wins)
{
case 0:
switch($wins)
{
case 0:
- echo
"#tricks 0"
; break;
+ echo
_('#tricks 0')
; break;
case 1:
case 1:
- echo
"#tricks 1"
; break;
+ echo
_('#tricks 1')
; break;
case 2:
case 3:
case 4:
case 2:
case 3:
case 4:
- echo
"#tricks few"
; break;
+ echo
_('#tricks few')
; break;
default:
default:
- echo
"#tricks many"
; break;
+ echo
_('#tricks many')
; break;
}
echo "</span>\n";
echo " </div>\n";
}
echo "</span>\n";
echo " </div>\n";
@@
-1448,7
+1450,7
@@
function format_score_table_ascii($score)
/* truncate table if we have too many games */
$max = sizeof($score);
/* truncate table if we have too many games */
$max = sizeof($score);
- if($max>6) $output.="
(table truncated to last 6 games)
\n";
+ if($max>6) $output.="
"._("(table truncated to last 6 games)")."
\n";
/* output header */
foreach($score[0]['players'] as $id=>$points)
/* output header */
foreach($score[0]['players'] as $id=>$points)
@@
-1725,15
+1727,19
@@
function set_language($l,$type='lang')
case 'de':
putenv("LC_ALL=de_DE");
setlocale(LC_ALL, "de_DE");
case 'de':
putenv("LC_ALL=de_DE");
setlocale(LC_ALL, "de_DE");
- // Specify location of translation tables
- bindtextdomain("edoko", "./locale");
- // Choose domain
- textdomain("edoko");
break;
default:
break;
default:
- /* do nothing */
+ putenv("LC_ALL=en_US");
+ setlocale(LC_ALL, "en_US");
+ break;
}
}
+ // Specify location of translation tables
+ bindtextdomain("edoko", "./locale");
+ bind_textdomain_codeset("edoko", 'UTF-8');
+ // Choose domain
+ textdomain("edoko");
+
return;
}
return;
}