LAYOUT: fix footer

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

diff --git a/include/functions.php b/include/functions.php
index 366b613a73f191d363d156fb8374abf03df96fef..d9421f12a82ef5f99585f00f4ab905ff84a6d419 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,5 +1,5 @@
 <?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.
  *
@@ -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;
 
-      $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
        */
 
-      $uidPREF = DB_get_PREF($uid);
+      $uidPREF = DB_get_PREF($user);
       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)
@@ -185,7 +185,7 @@ function mymail($uid,$gameid=0,$type,$message)
         }
 
       /* 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.').
@@ -201,6 +201,7 @@ function mymail($uid,$gameid=0,$type,$message)
           DB_digest_insert_email($To,$message,$type,$gameid);
         }
     }
+
   /* 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";
 
+  $headers .= "Content-Type: text/plain; charset = \"UTF-8\";\r\n";
+  $headers .= "Content-Transfer-Encoding: 8bit\r\n";
+  $headers .= "\r\n";
+
   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 />";
-      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;
 }
 
@@ -1207,15 +1209,15 @@ function display_single_user($r,$start=0)
       switch($wins)
        {
        case 0:
-         echo "#tricks 0"; break;
+         echo _('#tricks 0'); break;
        case 1:
-         echo "#tricks 1"; break;
+         echo _('#tricks 1'); break;
        case 2:
        case 3:
        case 4:
-         echo "#tricks few"; break;
+         echo _('#tricks few'); break;
        default:
-         echo "#tricks many"; break;
+         echo _('#tricks many'); break;
        }
       echo "</span>\n";
       echo "  </div>\n";
@@ -1725,15 +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");
-       // 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;
 }