From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Tue, 8 Feb 2011 21:43:24 +0000 (+0000)
Subject: fix mail encoding problem (crude but effective)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=01e0675ad053b08fa42a6729534acd0473c91162;p=web%2Fkonrad%2Fsmoke.git

fix mail encoding problem (crude but effective)


git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@725 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---

diff --git a/www/config.php.template b/www/config.php.template
index 854b646..862514d 100644
--- a/www/config.php.template
+++ b/www/config.php.template
@@ -85,7 +85,7 @@ $twigoptions = array(
   'cache' => false,
 
   //character set, default is utf-8
-  //'charset' => 'utf-8',
+  'charset' => 'utf-8',
 
   //enable this while you are actively changing code/templates and use a cache:
   //'auto_reload' => true,
diff --git a/www/inc/wext/customer.php b/www/inc/wext/customer.php
index 4dba57a..a311e09 100644
--- a/www/inc/wext/customer.php
+++ b/www/inc/wext/customer.php
@@ -310,7 +310,7 @@ class WOCustomer extends WOCustomerAbstract
 			}
 		}
 		//send mail
-		mb_send_mail($ct->email,$subject,$mailtext,$mailheader);
+		mail($ct->email,$subject,$mailtext,$mailheader);
 	}
 	
 	/**page shown to the customer after clicking the password reset link above*/
diff --git a/www/inc/wext/order.php b/www/inc/wext/order.php
index 22d7ff0..b4af70a 100644
--- a/www/inc/wext/order.php
+++ b/www/inc/wext/order.php
@@ -739,7 +739,7 @@ class WOOrder extends WOOrderAbstract
 			}
 		}
 		//send mail
-		mb_send_mail($ct->email,$subject,$mailtext,$mailheader);
+		mail($ct->email,$subject,$mailtext,$mailheader);
 	}
 };
 
diff --git a/www/template/en/resetlogin.txt b/www/template/en/resetlogin.txt
index 14eecaa..eff80b1 100644
--- a/www/template/en/resetlogin.txt
+++ b/www/template/en/resetlogin.txt
@@ -8,6 +8,8 @@ and after that the body of the mail.
 #}
 Password Reset at MagicSmoke.silmor.de
 From: no-reply@localdomain.com
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 
 Hello {{customer.title}} {{customer.name}}!