LAYOUT: fix footer

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

diff --git a/include/functions.php b/include/functions.php
index d7ff0658bc042e6fb27448956cc5092db016d615..d9421f12a82ef5f99585f00f4ab905ff84a6d419 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";
 
   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,
   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 />";
                              "<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;
 }
 


@@ -1726,16 +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");
-       bind_textdomain_codeset("edoko", 'UTF-8');
-       // 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;
 }