More updates ... added Date and Content-type/encoding output for the emails, updated all email templates

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2587 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/emailer.php

@@ -38,8 +38,8 @@ class emailer
 		$this->use_smtp = $use_smtp;
 		$this->tpl_file = NULL;
 		$this->address = NULL;
- 		$this->msg = "";
+ 		$this->msg = '';
-	   $this->mimeOut = "";
+		$this->mimeOut = '';
 	}
 
 	//
@@ -47,11 +47,11 @@ class emailer
 	//
 	function reset()
 	{
-		$this->tpl_file = "";
+		$this->tpl_file = '';
-		$this->address = "";
+		$this->address = '';
-		$this->msg = "";
+		$this->msg = '';
-		$this->memOut = "";
+		$this->memOut = '';
-		$this->vars = "";
+		$this->vars = '';
 	}
 
 	//
@@ -59,13 +59,8 @@ class emailer
 	//
 	function email_address($address)
 	{
-
-		$success = true;
-
 		$this->address = '';
 		$this->address .= $address;
-
-		return $success;
 	}
 
 	//
@@ -84,30 +79,27 @@ class emailer
 		$this->extra_headers = $headers;
 	}
 
-	function use_template($template_file, $template_lang = "")
+	function use_template($template_file, $template_lang = '')
 	{
 		global $board_config, $phpbb_root_path;
 
-		if( $template_lang == "" )
+		if ( $template_lang == '' )
 		{
 			$template_lang = $board_config['default_lang'];
 		}
 
-		$template_file = $phpbb_root_path . "language/lang_" . $template_lang . "/email/" . $template_file . ".tpl";
+		$this->tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl';
-		if( !file_exists($template_file) )
+		if ( !file_exists($this->tpl_file) )
 		{
-			message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__);
+			message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__);
-		}
-		else
-		{
-			$this->tpl_file = $template_file;
-			if( !$this->load_msg() )
-			{
-				message_die(GENERAL_ERROR, "Couldn't load template file: $template_file", "", __LINE__, __FILE__);
-			}
 		}
 
-		return TRUE;
+		if ( !$this->load_msg() )
+		{
+			message_die(GENERAL_ERROR, 'Could not load email template file ' . $template_file, '', __LINE__, __FILE__);
+		}
+
+		return true;
 	}
 
 	//
@@ -115,35 +107,25 @@ class emailer
 	//
 	function load_msg()
 	{
-		if ($this->tpl_file == NULL)
+		if ( $this->tpl_file == NULL )
 		{
-			message_die(GENERAL_ERROR, "No template file set", "", __LINE__, __FILE__);
+			message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__);
 		}
-		else
+
+		if ( !($fd = fopen($this->tpl_file, 'r')) )
 		{
-			if(!($fd = fopen($this->tpl_file, 'r')))
+			message_die(GENERAL_ERROR, 'Failed opening template file', '', __LINE__, __FILE__);
-			{
-				message_die(GENERAL_ERROR, "fopen failed opening template file", "", __LINE__, __FILE__);
 		}
-			else
+
-			{
 		$this->msg .= fread($fd, filesize($this->tpl_file));
 		fclose($fd);
-			}
+
-		}
+		return true;
-		return TRUE;
 	}
 
 	function assign_vars($vars)
 	{
-		if(empty($this->vars))
+		$this->vars = ( empty($this->vars) ) ? $vars : $this->vars . $vars;
-		{
-			$this->vars = $vars;
-		}
-		else
-		{
-			$this->vars .= $vars;
-		}
 	}
 
 	function parse_email()
@@ -165,12 +147,13 @@ class emailer
 		// do this here because the subject may contain a variable
 		//
 		$match = array();
-		preg_match("/^(Subject:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
+		preg_match("/^(Subject:(.*?)[\r\n]+?)?(Charset:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match);
 
-		$this->msg = ( isset($match[3]) ) ? trim($match[3]) : '';
+		$this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
 		$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
+		$this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : 'iso-8859-1';
 
-		return TRUE;
+		return true;
 	}
 
 	//
@@ -180,45 +163,53 @@ class emailer
 	{
 		global $phpEx, $phpbb_root_path;
 
-		if ($this->address == NULL)
+		if ( $this->address == NULL )
 		{
-			message_die(GENERAL_ERROR, "No email address set", "", __LINE__, __FILE__);
+			message_die(GENERAL_ERROR, 'No email address set', '', __LINE__, __FILE__);
-		}
-		else
-		{
-			if(!$this->parse_email())
-			{
-				return FALSE;
-			}
-			if($this->use_smtp)
-			{
-				if(!defined('SMTP_INCLUDED')) 
-				{
-					include($phpbb_root_path . "includes/smtp.".$phpEx);
-				}
-				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
-				{
-					message_die(GENERAL_ERROR, "Sending via SMTP failed", "", __LINE__, __FILE__);
-				}
-			}
-			else
-			{
-				@mail($this->address, $this->subject, $this->msg, $this->extra_headers);
-			}
 		}
 
-		return TRUE;
+		if ( !$this->parse_email() )
+		{
+			return false;
+		}
+
+		//
+		// Add date and encoding type
+		//
+		$universal_extra = "MIME-Version: 1.0\r\nContent-type: text/plain; charset=" . $this->encoding . "\r\nContent-transfer-encoding: 8bit\r\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\r\n";
+		$this->extra_headers = $universal_extra . $this->extra_headers; 
+
+		if ( $this->use_smtp )
+		{
+			if ( !defined('SMTP_INCLUDED') ) 
+			{
+				include($phpbb_root_path . 'includes/smtp.' . $phpEx);
+			}
+
+			$result = smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers);
+		}
+		else
+		{
+			$result = @mail($this->address, $this->subject, $this->msg, $this->extra_headers);
+		}
+
+		if ( !$result )
+		{
+			message_die(GENERAL_ERROR, 'Failed sending email', '', __LINE__, __FILE__);
+		}
+
+		return true;
 	}
 
 
 	//
 	// Attach files via MIME.
 	//
-	function attachFile($filename, $mimetype="application/octet-stream", $szFromAddress, $szFilenameToDisplay)
+	function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay)
 	{
 		$mime_boundary = "--==================_846811060==_";
 
-		$this->mailMsg = "--".$mime_boundary."\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n".$this->mailMsg;
+		$this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n" . $this->mailMsg;
 
 		if ($mime_filename)
 		{
@@ -234,11 +225,11 @@ class emailer
 		$this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n";
 		$this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n";
 
-		if ($mimetype == "message/rfc822")
+		if ( $mimetype == "message/rfc822" )
 		{
 			$this->mimeOut .= "From: ".$szFromAddress."\n";
 			$this->mimeOut .= "To: ".$this->emailAddress."\n";
-			$this->mimeOut .= "Date: ".date("D, d M Y G:i:s ").$this->getTimeZoneInEmailFormat()."\n";
+			$this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n";
 			$this->mimeOut .= "Reply-To:".$szFromAddress."\n";
 			$this->mimeOut .= "Subject: ".$this->mailSubject."\n";
 			$this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n";

phpBB/includes/functions_admin.php

@@ -55,7 +55,7 @@ function make_forum_select($box_name, $ignore_forum = false)
 //
 // Synchronise functions for forums/topics
 //
-function sync($type, $id)
+function sync($type, $id = false)
 {
 	global $db;
 

phpBB/includes/functions_post.php

@@ -267,7 +267,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	{
 		$topic_vote = ( !empty($poll_title) && count($poll_options) >= 2 ) ? 1 : 0;
 		$sql  = ( $mode != "editpost" ) ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id";
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -280,7 +280,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 
 	$edited_sql = ( $mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post'] ) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : "";
 	$sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id";
-	if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
+	if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
@@ -291,7 +291,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	}
 
 	$sql = ( $mode != 'editpost' ) ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message',  bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id";
-	if ( !($result = $db->sql_query($sql)) )
+	if ( !$db->sql_query($sql) )
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
@@ -304,7 +304,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	if ( ( $mode == 'newtopic' || $mode == 'editpost' ) && !empty($poll_title) && count($poll_options) >= 2 )
 	{
 		$sql = ( !$post_data['has_poll'] ) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " WHERE topic_id = $topic_id";
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -348,7 +348,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 				$poll_result = ( $mode == "editpost" && isset($old_poll_result[$option_id]) ) ? $old_poll_result[$option_id] : 0;
 
 				$sql = ( $mode != "editpost" || !isset($old_poll_result[$option_id]) ) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id";
-				if ( !($result = $db->sql_query($sql)) )
+				if ( !$db->sql_query($sql) )
 				{
 					message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 				}
@@ -359,8 +359,9 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 		if ( $delete_option_sql != '' )
 		{
 			$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " 
-				WHERE vote_option_id IN ($delete_option_sql)";
+				WHERE vote_option_id IN ($delete_option_sql) 
-			if ( !($result = $db->sql_query($sql)) )
+					AND vote_id = $poll_id";
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Error deleting pruned poll options', '', __LINE__, __FILE__, $sql);
 			}
@@ -395,12 +396,12 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 			else
 			{
 
-				$topic_update_sql .= "topic_replies = topic_replies - 1";
+				$topic_update_sql .= 'topic_replies = topic_replies - 1';
 
 				$sql = "SELECT MAX(post_id) AS last_post_id
 					FROM " . POSTS_TABLE . " 
 					WHERE topic_id = $topic_id";
-				if ( !($db->sql_query($sql)) )
+				if ( !($result = $db->sql_query($sql)) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
@@ -416,7 +417,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 				$sql = "SELECT MAX(post_id) AS last_post_id
 					FROM " . POSTS_TABLE . " 
 					WHERE forum_id = $forum_id"; 
-				if ( !($db->sql_query($sql)) )
+				if ( !($result = $db->sql_query($sql)) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
@@ -432,7 +433,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 			$sql = "SELECT MIN(post_id) AS first_post_id
 				FROM " . POSTS_TABLE . " 
 				WHERE topic_id = $topic_id";
-			if ( !($db->sql_query($sql)) )
+			if ( !($result = $db->sql_query($sql)) )
 			{
 				message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 			}
@@ -460,7 +461,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 	$sql = "UPDATE " . FORUMS_TABLE . " SET 
 		$forum_update_sql 
 		WHERE forum_id = $forum_id";
-	if ( !($result = $db->sql_query($sql)) )
+	if ( !$db->sql_query($sql) )
 	{
 		message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 	}
@@ -471,7 +472,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 			$topic_update_sql 
 			WHERE topic_id = $topic_id 
 				OR topic_moved_id = $topic_id";
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -482,7 +483,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
 		$sql = "UPDATE " . USERS_TABLE . "
 			SET user_posts = user_posts $sign 
 			WHERE user_id = $user_id";
-		if ( !($result = $db->sql_query($sql, END_TRANSACTION)) )
+		if ( !$db->sql_query($sql, END_TRANSACTION) )
 		{
 			message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql);
 		}
@@ -505,14 +506,14 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	{
 		$sql = "DELETE FROM " . POSTS_TABLE . " 
 			WHERE post_id = $post_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . POSTS_TEXT_TABLE . " 
 			WHERE post_id = $post_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 		}
@@ -525,14 +526,14 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 				$sql = "DELETE FROM " . TOPICS_TABLE . " 
 					WHERE topic_id = $topic_id 
 						OR topic_moved_id = $topic_id";
-				if ( !($db->sql_query($sql)) )
+				if ( !$db->sql_query($sql) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
 
 				$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
 					WHERE topic_id = $topic_id";
-				if ( !($db->sql_query($sql)) )
+				if ( !$db->sql_query($sql) )
 				{
 					message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql);
 				}
@@ -546,21 +547,21 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 	{
 		$sql = "DELETE FROM " . VOTE_DESC_TABLE . " 
 			WHERE topic_id = $topic_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " 
 			WHERE vote_id = $poll_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
 
 		$sql = "DELETE FROM " . VOTE_USERS_TABLE . " 
 			WHERE vote_id = $poll_id";
-		if ( !($db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql);
 		}
@@ -596,7 +597,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 	{
 		$delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : '';
 		$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
-		if ( !($result = $db->sql_query($sql)) )
+		if ( !$db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql);
 		}
@@ -646,7 +647,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 			$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
 			$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
 
-			$email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+			$email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n";
 
 			$update_watched_sql = '';
 			if ( $row = $db->sql_fetchrow($result) )
@@ -659,7 +660,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 					{
 						$emailer->use_template('topic_notify', $row['user_lang']);
 						$emailer->email_address($row['user_email']);
-						$emailer->set_subject();//$lang['Topic_reply_notification']
+						$emailer->set_subject();
 						$emailer->extra_headers($email_headers);
 
 						$emailer->assign_vars(array(
@@ -707,7 +708,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 			$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
 				WHERE topic_id = $topic_id
 					AND user_id = " . $userdata['user_id'];
-			if ( !$result = $db->sql_query($sql) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Could not delete topic watch information', '', __LINE__, __FILE__, $sql);
 			}
@@ -716,7 +717,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id
 		{
 			$sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status)
 				VALUES (" . $userdata['user_id'] . ", $topic_id, 0)";
-			if ( !($result = $db->sql_query($sql)) )
+			if ( !$db->sql_query($sql) )
 			{
 				message_die(GENERAL_ERROR, 'Could not insert topic watch information', '', __LINE__, __FILE__, $sql);
 			}

phpBB/includes/usercp_email.php

@@ -94,15 +94,10 @@ if ( $result = $db->sql_query($sql) )
 					include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 					$emailer = new emailer($board_config['smtp_delivery']);
 
-					$email_headers = 'From: ' . $userdata['user_email'] . "\n";
+					$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
-					if ( !empty($HTTP_POST_VARS['cc_email']) )
+					$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n";
-					{
+					$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n";
-						$email_headers .= "Cc: " . $userdata['user_email'] . "\n";
+					$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n";
-					}
-					$email_headers .= 'Return-Path: ' . $userdata['user_email'] . "\n";
-					$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
-					$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
-					$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
 					$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
 
 					$emailer->use_template('profile_send_email', $user_lang);
@@ -120,6 +115,25 @@ if ( $result = $db->sql_query($sql) )
 					$emailer->send();
 					$emailer->reset();
 
+					if ( !empty($HTTP_POST_VARS['cc_email']) )
+					{
+						$email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n";
+						$emailer->use_template('profile_send_email');
+						$emailer->email_address($userdata['user_email']);
+						$emailer->set_subject($subject);
+						$emailer->extra_headers($email_headers);
+
+						$emailer->assign_vars(array(
+							'SITENAME' => $board_config['sitename'], 
+							'BOARD_EMAIL' => $board_config['board_email'], 
+							'FROM_USERNAME' => $userdata['username'], 
+							'TO_USERNAME' => $username, 
+							'MESSAGE' => $message)
+						);
+						$emailer->send();
+						$emailer->reset();
+					}
+
 					$template->assign_vars(array(
 						'META' => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">')
 					);

phpBB/language/lang_albanian/email/admin_activate.tpl

@@ -1,4 +1,5 @@
 Subject: Llogari e re
+Charset: iso-8859-1
 
 Përshëndetje,
 

phpBB/language/lang_albanian/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: iso-8859-1
+
 Mesazhi i mëposhtëm është dërguar nga një administrator i "{SITENAME}". Nqs ky mesazh është i padëshirueshëm, abuzues apo përmban material të pahijshëm ju lutem kontaktoni webmasterin tek adresa:
 
 {BOARD_EMAIL}

phpBB/language/lang_albanian/email/admin_welcome_activated.tpl

@@ -1,4 +1,5 @@
 Subject: Llogaria u aktivizia
+Charset: iso-8859-1
 
 Përshëndetje {USERNAME},
 

phpBB/language/lang_albanian/email/admin_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_albanian/email/coppa_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_albanian/email/group_added.tpl

@@ -1,4 +1,5 @@
 Subject: Jeni anëtar i këtij grupi tashmë
+Charset: iso-8859-1
 
 Urime,
 

phpBB/language/lang_albanian/email/group_approved.tpl

@@ -1,4 +1,5 @@
 Subject: Kërkesa juaj u aprovua
+Charset: iso-8859-1
 
 Urime,
 

phpBB/language/lang_albanian/email/group_request.tpl

@@ -1,4 +1,5 @@
 Subject: Dikush ka bërë kërkesë për anëtarësim tek grupi juaj
+Charset: iso-8859-1
 
 I nderuar {GROUP_MODERATOR},
 

phpBB/language/lang_albanian/email/privmsg_notify.tpl

@@ -1,4 +1,5 @@
 Subject: Sapo keni marrë mesazh privat të ri
+Charset: iso-8859-1
 
 Përshëndetje {USERNAME},
 

phpBB/language/lang_albanian/email/profile_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: iso-8859-1
+
 Përshëndetje {TO_USERNAME},
 
 Mesazhi i mëposhtëm u dërgua për ju nga {FROM_USERNAME} nëpërmjet llogarisë tuaj tek {SITENAME}. Nqs ky mesazh është i padëshirueshëm, abuzues apo përmban material të pahijshëm ju lutem kontaktoni webmasterin tek adresa:

phpBB/language/lang_albanian/email/topic_notify.tpl

@@ -1,4 +1,5 @@
 Subject: Përgjigje tek tema - {TOPIC_TITLE}
+Charset: iso-8859-1
 
 Përshëndetje {USERNAME},
 

phpBB/language/lang_albanian/email/user_activate.tpl

@@ -1,4 +1,5 @@
 Subject: Riaktivizoni llogarinë tuaj
+Charset: iso-8859-1
 
 Përshëndetje {USERNAME},
 

phpBB/language/lang_albanian/email/user_activate_passwd.tpl

@@ -1,4 +1,5 @@
 Subject: Aktivizoni fjalëkalimin e ri
+Charset: iso-8859-1
 
 Përshëndetje {USERNAME}
 

phpBB/language/lang_albanian/email/user_welcome.tpl

@@ -1,4 +1,5 @@
 Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_albanian/email/user_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Mirsevini tek forumi i {SITENAME}
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_arabic/email/admin_activate.tpl

@@ -1,4 +1,5 @@
 Subject: гФКСЯ МПнП
+Charset: windows-1256
 
 гСНИЗ,
 

phpBB/language/lang_arabic/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: windows-1256
+
 هذه رسالة من مدير  "{SITENAME}". اذا كانت هذه الرسالة اعلانات, تحتوي على لغة بذيئة أو اي كلام غير ملائم الرجاء مراسلة مسؤول الموقع على العنوان التالي:
 
 {BOARD_EMAIL}

phpBB/language/lang_arabic/email/admin_welcome_activated.tpl

@@ -1,4 +1,5 @@
 Subject: تم تشغيل الاشتراك
+Charset: windows-1256
 
 مرحبا {USERNAME},
 

phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: أهلا وسهلا بكم في منتدى {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: أهلا وسهلا بكم في منتدى {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_arabic/email/group_added.tpl

@@ -1,4 +1,5 @@
 Subject: تم اضافتك للمجموعة
+Charset: windows-1256
 
 مبروك,
 

phpBB/language/lang_arabic/email/group_approved.tpl

@@ -1,4 +1,5 @@
 Subject: تمت الموافقة على طلبك
+Charset: windows-1256
 
 مبروك,
 

phpBB/language/lang_arabic/email/group_request.tpl

@@ -1,4 +1,5 @@
 Subject: تم تقديم طلبك للاشتراك في المجموعة
+Charset: windows-1256
 
 السيد/ة {GROUP_MODERATOR},
 

phpBB/language/lang_arabic/email/privmsg_notify.tpl

@@ -1,4 +1,5 @@
 Subject: لقد وصلت رسالة خاصة
+Charset: windows-1256
 
 مرحبا {USERNAME},
 

phpBB/language/lang_arabic/email/profile_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: windows-1256
+
 مرحبا {TO_USERNAME},
 
 هذه الرسالة قد ارسلها {FROM_USERNAME} لحسابك في الموقع {SITENAME}. اذا كانت هذه الرسالة اعلانات, تحتوي على لغة بذيئة أو اي كلام غير ملائم الرجاء مراسلة مسؤول الموقع على العنوان التالي:

phpBB/language/lang_arabic/email/topic_notify.tpl

@@ -1,4 +1,5 @@
 Subject: التذكير بالردود على المواضيع - {TOPIC_TITLE}
+Charset: windows-1256
 
 مرحبا {USERNAME},
 

phpBB/language/lang_arabic/email/user_activate.tpl

@@ -1,4 +1,5 @@
 Subject: v
+Charset: windows-1256
 
 ăŃÍČÇ {USERNAME},
 

phpBB/language/lang_arabic/email/user_activate_passwd.tpl

@@ -1,4 +1,5 @@
 Subject: New password activation
+Charset: windows-1256
 
 ãÑÍÈÇ {USERNAME}
 

phpBB/language/lang_arabic/email/user_welcome.tpl

@@ -1,4 +1,5 @@
 Subject: أهلا وسهلا بكم في منتدى {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_arabic/email/user_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: أهلا وسهلا بكم في منتدى {SITENAME}
+Charset: windows-1256
 
 {WELCOME_MSG}
 

phpBB/language/lang_bulgarian/email/admin_activate.tpl

@@ -1,4 +1,5 @@
 Subject: Нов потребител
+Charset: windows-1251
 
 Здравейте!
 

phpBB/language/lang_bulgarian/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: windows-1251
+
 Това е мейл, пратен от администратора на "{SITENAME}". Ако това съобщение е спам, съдържа неприлични или други коментари които вие намирате за обидни, моля свържете се с webmaster-а на следния е-мейл адрес:
 
 {BOARD_EMAIL}

phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl

@@ -1,4 +1,5 @@
 Subject: دَِْمفوْمً<D985> م ـيْوقوِـٍ
+Charset: windows-1251
 
 الِـقمىْم {USERNAME}!
 

phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Добре дошли на {SITENAME} Форумите
+Charset: windows-1251
 
 {WELCOME_MSG}
 

phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Добре дошли на {SITENAME} Форумите
+Charset: windows-1251
 
 {WELCOME_MSG}
 

phpBB/language/lang_bulgarian/email/group_added.tpl

@@ -1,4 +1,5 @@
 Subject: Приет сте за член на тази група
+Charset: windows-1251
 
 Поздравления,
 

phpBB/language/lang_bulgarian/email/group_approved.tpl

@@ -1,4 +1,5 @@
 Subject: Вашата кандидатура е одобрена
+Charset: windows-1251
 
 Поздравления,
 

phpBB/language/lang_bulgarian/email/group_request.tpl

@@ -1,4 +1,5 @@
 Subject: Получена е заявка за приемане в групата ви
+Charset: windows-1251
 
 {GROUP_MODERATOR},
 

phpBB/language/lang_bulgarian/email/privmsg_notify.tpl

@@ -1,4 +1,5 @@
 Subject: Получихте ново лично съобщения
+Charset: windows-1251
 
 Здравейте {USERNAME}!
 

phpBB/language/lang_bulgarian/email/profile_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: windows-1251
+
 Здравейте {TO_USERNAME}!
 
 Съобщението по-долу ви е пратено от {FROM_USERNAME} чрез вашия профил на {SITENAME}. Ако това съобщение е спам, съдържа неприлични или други коментари които вие намирате за обидни, моля свържете се с webmaster-а на следния е-мейл адрес:

phpBB/language/lang_bulgarian/email/topic_notify.tpl

@@ -1,4 +1,5 @@
 Subject: Уведемояване за отговори по темата - {TOPIC_TITLE}
+Charset: windows-1251
 
 Здравейте {USERNAME}!
 

phpBB/language/lang_bulgarian/email/user_activate.tpl

@@ -1,4 +1,5 @@
 Subject: ذم-ـيْوقوِـىْم َُِْمفوْمً<D985> ّو!
+Charset: windows-1251
 
 الِـقمىْم {USERNAME}!
 

phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl

@@ -1,4 +1,5 @@
 Subject: Активиране на нова парола
+Charset: windows-1251
 
 Здравейте {USERNAME}!
 

phpBB/language/lang_bulgarian/email/user_welcome.tpl

@@ -1,4 +1,5 @@
 Subject: Добре дошли на {SITENAME} Форумите
+Charset: windows-1251
 
 {WELCOME_MSG}
 

phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Добре дошли на {SITENAME} Форумите
+Charset: windows-1251
 
 {WELCOME_MSG}
 

phpBB/language/lang_chinese_simplified/email/admin_activate.tpl

@@ -1,4 +1,5 @@
 Subject: 新用户帐户
+Charset: gb2312
 
 您好,
 

phpBB/language/lang_chinese_simplified/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: gb2312
+
 这封电子邮件是由"{SITENAME}"管理员寄出的. 假如这封电子邮件的内容令你感到不愉快, 甚至是恶意的攻击, 请使用以下链接提出申诉:
 
 {BOARD_EMAIL}

phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl

@@ -1,4 +1,5 @@
 Subject: 账户激活
+Charset: gb2312
 
 {USERNAME} 您好,
 

phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: 欢迎您访问 {SITENAME} 论坛
+Charset: gb2312
 
 {WELCOME_MSG}
 

phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: 欢迎您访问 {SITENAME} 论坛
+Charset: gb2312
 
 {WELCOME_MSG}
 

phpBB/language/lang_chinese_simplified/email/group_added.tpl

@@ -1,4 +1,5 @@
 Subject: 您已经被加入这个团队
+Charset: gb2312
 
 恭喜,
 

phpBB/language/lang_chinese_simplified/email/group_approved.tpl

@@ -1,4 +1,5 @@
 Subject: 您的申请已经被批准了
+Charset: gb2312
 
 恭喜您,
 

phpBB/language/lang_chinese_simplified/email/group_request.tpl

@@ -1,4 +1,5 @@
 Subject: 加入这个团队的申请已经提交
+Charset: gb2312
 
 亲爱的 {GROUP_MODERATOR},
 

phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl

@@ -1,4 +1,5 @@
 Subject: 新的站内信件
+Charset: gb2312
 
 {USERNAME} 您好,
 

phpBB/language/lang_chinese_simplified/email/profile_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: gb2312
+
 {TO_USERNAME} 您好,
 
 这封电子邮件是"{FROM_USERNAME}"利用您在"{SITENAME}"的会员资料所发送的. 如果这封电子邮件的内容是恶意的攻击或是垃圾邮件, 请使用以下的链接提出申诉:

phpBB/language/lang_chinese_simplified/email/topic_notify.tpl

@@ -1,4 +1,5 @@
 Subject: »ØÌû֪ͨ - {TOPIC_TITLE}
+Charset: gb2312
 
 {USERNAME} ÄúºÃ,
 

phpBB/language/lang_chinese_simplified/email/user_activate.tpl

@@ -1,4 +1,5 @@
 Subject: 重新激活您的账户!
+Charset: gb2312
 
 {USERNAME} 您好,
 

phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl

@@ -1,4 +1,5 @@
 Subject: 新密码激活
+Charset: gb2312
 
 {USERNAME} 您好,
 

phpBB/language/lang_chinese_simplified/email/user_welcome.tpl

@@ -1,4 +1,5 @@
 Subject: 欢迎您访问 {SITENAME} 论坛
+Charset: gb2312
 
 {WELCOME_MSG}
 

phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: 欢迎您访问 {SITENAME} 论坛
+Charset: gb2312
 
 {WELCOME_MSG}
 

phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 您好,
 
 這個 "{USERNAME}" 的帳號正在等待開通 (可能暫時被凍結了或是才剛完成註冊程序). 如果有必要的話, 請先查明這個使用者的資料, 然後利用以下連結啟用這個會員帳號:

phpBB/language/lang_chinese_traditional_taiwan/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 這封電子郵件是由"{SITENAME}"管理團隊所寄出. 假如這封電子郵件的內容令你感到不愉快, 甚至是惡意的攻擊批評, 請利用以下的連結提出申訴:
 
 {BOARD_EMAIL}

phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 親愛的 {USERNAME} 您好,
 
 您在"{SITENAME}"的帳號已經啟用, 您可以使用所收到的會員帳號及密碼登入"{SITENAME}".

phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 {WELCOME_MSG}
 
 請妥善保留這封電子郵件. 您的帳號資料如下:

phpBB/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 {WELCOME_MSG}
 
 依照"美國兒童網路隱私保護法"規定, 您的帳號尚未能啟用.

phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 恭喜您,
 
 您已經正式加入"{SITENAME}"的"{GROUP_NAME}"這個群組.

phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 恭喜您,
 
 你在"{SITENAME}"所申請加入的群組"{GROUP_NAME}", 已經獲得批准.

phpBB/language/lang_chinese_traditional_taiwan/email/group_denied.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 您好, 
 
 很抱歉, 你在"{SITENAME}"所申請加入的群組"{GROUP_NAME}", 並未獲得批准. 

phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 親愛的 {GROUP_MODERATOR} 您好,
 
 有一個會員提出申請加入你在"{SITENAME}"所管理的會員群組.

phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 親愛的 {USERNAME} 您好,
 
 您在"{SITENAME}"有新的私人訊息, 而且您要求系統以電子郵件通知. 您可以利用以下的連結檢視您剛收到的私人訊息:

phpBB/language/lang_chinese_traditional_taiwan/email/profile_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 親愛的 {TO_USERNAME} 您好,
 
 這封電子郵件是由"{FROM_USERNAME}"透過您在"{SITENAME}"的會員資料所傳送. 假如這封電子郵件的內容令你感到不愉快, 甚至是惡意的攻擊批評, 請利用以下的連結提出申訴:

phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 親愛的 {USERNAME} 您好,
 
 您收到這封這封電子郵件是因為您在"{SITENAME}"訂閱了主題"{TOPIC_TITLE}", 這個主題在您上次來訪後有新的回覆訊息. 您可以使用以下連結來觀看回覆的訊息, 在您觀看原主題之前, 不會有更新的訊息通知您.

phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 親愛的 {USERNAME} 您好,
 
 您在"{SITENAME}"的帳號暫時被凍結, 最有可能的原因是因為您更改過您的個人資料. 請使用以下連結重新啟用您的帳號:

phpBB/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 親愛的 {USERNAME} 您好,
 
 您收到這封這封電子郵件是因為您 (或者是某人冒充您的名義) 申請了一組新的密碼. 假如這不是您本人所申請, 請不用理會這封電子郵件, 但是如果您持續收到這類的信件騷擾, 請您儘快向管理人員連繫.

phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 {WELCOME_MSG}
 
 請妥善保留這封電子郵件. 您的帳號資料如下:

phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl

@@ -1,3 +1,5 @@
+Charset: big5
+
 {WELCOME_MSG}
 
 請妥善保留這封電子郵件. 您的帳號資料如下:

phpBB/language/lang_danish/email/admin_activate.tpl

@@ -1,4 +1,5 @@
 Subject: Genaktiver venligst din konto!
+Charset: iso-8859-1
 
 Hej,
 

phpBB/language/lang_danish/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: iso-8859-1
+
 Følgende email er afsendt fra administratoren af "{SITENAME}". Hvis denne email er uønsket, indeholder bandeord, eller andre kommentarer du finder anstødende, så kontakt venligst webmasteren af forumet på følgende adresse:
 
 {BOARD_EMAIL}

phpBB/language/lang_danish/email/admin_welcome_activated.tpl

@@ -1,4 +1,5 @@
 Subject: Konto aktiveret
+Charset: iso-8859-1
 
 Hej {USERNAME},
 

phpBB/language/lang_danish/email/admin_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Velkommen til {SITENAME} Forum
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Velkommen til {SITENAME} Forum
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_danish/email/group_added.tpl

@@ -1,4 +1,5 @@
 Subject: Du er nu tilføjet til denne bruger gruppe
+Charset: iso-8859-1
 
 Tillykke,
 

phpBB/language/lang_danish/email/group_approved.tpl

@@ -1,4 +1,5 @@
 Subject: Din tilmelding er blevet godkendt
+Charset: iso-8859-1
 
 Tillykke,
 

phpBB/language/lang_danish/email/group_request.tpl

@@ -1,4 +1,5 @@
 Subject: En bruger ønsker at tilmelde sig til din gruppe
+Charset: iso-8859-1
 
 Kære {GROUP_MODERATOR},
 

phpBB/language/lang_danish/email/privmsg_notify.tpl

@@ -1,4 +1,5 @@
 Subject: Ny Privat besked er ankommet
+Charset: iso-8859-1
 
 Hej {USERNAME},
 

phpBB/language/lang_danish/email/profile_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: iso-8859-1
+
 Hej {TO_USERNAME},
 
 Denne email er sendt til dig fra {FROM_USERNAME} via din konto på {SITENAME}. Hvis denne besked er uønsket, indeholder bandeord eller andre kommentarer, som du finder anstødende, så kontakt venligst webmasteren af forumet på den følgende adresse:

phpBB/language/lang_danish/email/topic_notify.tpl

@@ -1,4 +1,5 @@
 Subject: Emnet er besvaret - {TOPIC_TITLE}
+Charset: iso-8859-1
 
 Hej {USERNAME},
 

phpBB/language/lang_danish/email/user_activate.tpl

@@ -1,4 +1,5 @@
 Subject: Genaktiver venligst din konto!
+Charset: iso-8859-1
 
 Hej {USERNAME},
 

phpBB/language/lang_danish/email/user_activate_passwd.tpl

@@ -1,4 +1,5 @@
 Subject: Aktivering af nyt kodeord
+Charset: iso-8859-1
 
 Hej {USERNAME}
 

phpBB/language/lang_danish/email/user_welcome.tpl

@@ -1,4 +1,5 @@
 Subject: Velkommen til {SITENAME} Forum
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_danish/email/user_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Velkommen til {SITENAME} Forum
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_dutch/email/admin_activate.tpl

@@ -1,4 +1,5 @@
 Subject: Nieuw gebruikers account
+Charset: iso-8859-1
 
 Hallo,
 

phpBB/language/lang_dutch/email/admin_send_email.tpl

@@ -1,3 +1,5 @@
+Charset: iso-8859-1
+
 De volgende email is verstuurd door een beheerder van "{SITENAME}". Als dit
 bericht ongewenste gegevens bevat neem dat contact op het de webmaster van de
 site op het volgende adres:

phpBB/language/lang_dutch/email/admin_welcome_activated.tpl

@@ -1,4 +1,5 @@
 Subject: Account Geactiveerd
+Charset: iso-8859-1
 
 Hallo {USERNAME},
 

phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Welkom op {SITENAME}
+Charset: iso-8859-1
 
 {WELCOME_MSG}
 

phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl

@@ -1,4 +1,5 @@
 Subject: Welkom op {SITENAME}
+Charset: iso-8859-1
 
 {WELCOME_MSG}