BUGFIX: fixed previous commit about sending mail in utf-8

[e-DoKo.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index d7ff0658bc042e6fb27448956cc5092db016d615..191823d6de6f45db89e3c144ea307c8522dcbdac 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -218,6 +218,10 @@ function sendmail($To,$Subject,$message)
   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,
@@ -228,15 +232,12 @@ function sendmail($To,$Subject,$message)
                              "<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
-    if($header != "")
-      mail($To,$Subject,$message,$header);
-    else
-      mail($To,$Subject,$message);
+    mail($To,$Subject,$message,$header);
+
   return;
 }
 
@@ -1086,8 +1087,8 @@ function display_single_user($r,$start=0)
          $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";
@@ -1449,7 +1450,7 @@ function format_score_table_ascii($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)
@@ -1726,16 +1727,19 @@ function set_language($l,$type='lang')
       case 'de':
        putenv("LC_ALL=de_DE");
        setlocale(LC_ALL, "de_DE");
-       // Specify location of translation tables
-       bindtextdomain("edoko", "./locale");
-       bind_textdomain_codeset("edoko", 'UTF-8');
-       // Choose domain
-       textdomain("edoko");
        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;
 }