- fixing some bugs

- removing utf8 characters from email files (has been discussed internally, you guys know why)
- making sure some opendir calls are checked before calling readdir.


git-svn-id: file:///svn/phpbb/trunk@6912 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/acm/acm_file.php

@@ -100,7 +100,13 @@ class acm
 	{
 		global $phpEx;
 
-		$dir = opendir($this->cache_dir);
+		$dir = @opendir($this->cache_dir);
+
+		if (!$dir)
+		{
+			return;
+		}
+
 		while (($entry = readdir($dir)) !== false)
 		{
 			if (!preg_match('/^(sql_|data_(?!global))/', $entry))
@@ -115,7 +121,7 @@ class acm
 				@unlink($this->cache_dir . $entry);
 			}
 		}
-		@closedir($dir);
+		closedir($dir);
 
 		if (file_exists($this->cache_dir . 'data_global.' . $phpEx))
 		{
@@ -190,7 +196,13 @@ class acm
 	function purge()
 	{
 		// Purge all phpbb cache files
-		$dir = opendir($this->cache_dir);
+		$dir = @opendir($this->cache_dir);
+
+		if (!$dir)
+		{
+			return;
+		}
+
 		while (($entry = readdir($dir)) !== false)
 		{
 			if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0)
@@ -200,7 +212,7 @@ class acm
 
 			@unlink($this->cache_dir . $entry);
 		}
-		@closedir($dir);
+		closedir($dir);
 
 		unset($this->vars);
 		unset($this->var_expires);
@@ -221,7 +233,13 @@ class acm
 		{
 			$regex = '(' . ((is_array($table)) ? implode('|', $table) : $table) . ')';
 
-			$dir = opendir($this->cache_dir);
+			$dir = @opendir($this->cache_dir);
+
+			if (!$dir)
+			{
+				return;
+			}
+
 			while (($entry = readdir($dir)) !== false)
 			{
 				if (strpos($entry, 'sql_') !== 0)
@@ -238,7 +256,7 @@ class acm
 					@unlink($this->cache_dir . $entry);
 				}
 			}
-			@closedir($dir);
+			closedir($dir);
 
 			return;
 		}

phpBB/includes/acp/acp_board.php

@@ -397,7 +397,10 @@ class acp_board
 			// Retrieve a list of auth plugins and check their config values
 			$auth_plugins = array();
 
-			$dp = opendir($phpbb_root_path . 'includes/auth');
+			$dp = @opendir($phpbb_root_path . 'includes/auth');
+
+			if ($dp)
+			{
 				while (($file = readdir($dp)) !== false)
 				{
 					if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
@@ -405,8 +408,10 @@ class acp_board
 						$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
 					}
 				}
+				closedir($dp);
 
 				sort($auth_plugins);
+			}
 
 			$updated_auth_settings = false;
 			$old_auth_config = array();
@@ -575,7 +580,13 @@ class acp_board
 
 		$auth_plugins = array();
 
-		$dp = opendir($phpbb_root_path . 'includes/auth');
+		$dp = @opendir($phpbb_root_path . 'includes/auth');
+
+		if (!$dp)
+		{
+			return '';
+		}
+
 		while (($file = readdir($dp)) !== false)
 		{
 			if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
@@ -583,6 +594,7 @@ class acp_board
 				$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
 			}
 		}
+		closedir($dp);
 
 		sort($auth_plugins);
 

phpBB/includes/acp/acp_database.php

@@ -1212,7 +1212,10 @@ class acp_database
 						}
 
 						$dir = $phpbb_root_path . 'store/';
-						$dh = opendir($dir);
+						$dh = @opendir($dir);
+
+						if ($dh)
+						{
 							while (($file = readdir($dh)) !== false)
 							{
 								if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches))
@@ -1230,6 +1233,7 @@ class acp_database
 								}
 							}
 							closedir($dh);
+						}
 
 						$template->assign_vars(array(
 							'U_ACTION'	=> $this->u_action . '&action=submit'

phpBB/includes/acp/acp_language.php

@@ -940,8 +940,10 @@ class acp_language
 		$db->sql_freeresult($result);
 
 		$new_ary = $iso = array();
-		$dp = opendir("{$phpbb_root_path}language");
+		$dp = @opendir("{$phpbb_root_path}language");
 
+		if ($dp)
+		{
 			while (($file = readdir($dp)) !== false)
 			{
 				if ($file[0] != '.' && file_exists("{$phpbb_root_path}language/$file/iso.txt"))
@@ -963,8 +965,10 @@ class acp_language
 					}
 				}
 			}
+			closedir($dp);
+		}
+
 		unset($installed);
-		@closedir($dp);
 
 		if (sizeof($new_ary))
 		{

phpBB/includes/acp/acp_modules.php

@@ -512,7 +512,13 @@ class acp_modules
 
 		if (!$module)
 		{
-			$dh = opendir($directory);
+			$dh = @opendir($directory);
+
+			if (!$dh)
+			{
+				return $fileinfo;
+			}
+
 			while (($file = readdir($dh)) !== false)
 			{
 				// Is module?

phpBB/includes/acp/acp_permission_roles.php

@@ -394,8 +394,10 @@ class acp_permission_roles
 		$s_role_options = '';
 		while ($row = $db->sql_fetchrow($result))
 		{
+			$role_name = (!empty($user->lang[$row['role_name']])) ? $user->lang[$row['role_name']] : $row['role_name'];
+
 			$template->assign_block_vars('roles', array(
-				'ROLE_NAME'				=> (!empty($user->lang[$row['role_name']])) ? $user->lang[$row['role_name']] : $row['role_name'],
+				'ROLE_NAME'				=> $role_name,
 				'ROLE_DESCRIPTION'		=> (!empty($user->lang[$row['role_description']])) ? $user->lang[$row['role_description']] : nl2br($row['role_description']),
 
 				'U_EDIT'			=> $this->u_action . '&action=edit&role_id=' . $row['role_id'],
@@ -405,12 +407,12 @@ class acp_permission_roles
 				'U_DISPLAY_ITEMS'	=> ($row['role_id'] == $display_item) ? '' : $this->u_action . '&display_item=' . $row['role_id'] . '#assigned_to')
 			);
 
-			$s_role_options .= '<option value="' . $row['role_id'] . '">' . $row['role_name'] . '</option>';
+			$s_role_options .= '<option value="' . $row['role_id'] . '">' . $role_name . '</option>';
 
 			if ($display_item == $row['role_id'])
 			{
 				$template->assign_vars(array(
-					'L_ROLE_ASSIGNED_TO'	=> sprintf($user->lang['ROLE_ASSIGNED_TO'], $row['role_name']))
+					'L_ROLE_ASSIGNED_TO'	=> sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name))
 				);
 			}
 		}

phpBB/includes/acp/acp_search.php

@@ -485,7 +485,10 @@ class acp_search
 
 		$search_types = array();
 
-		$dp = opendir($phpbb_root_path . 'includes/search');
+		$dp = @opendir($phpbb_root_path . 'includes/search');
+
+		if ($dp)
+		{
 			while (($file = readdir($dp)) !== false)
 			{
 				if ((preg_match('#\.' . $phpEx . '$#', $file)) && ($file != "search.$phpEx"))
@@ -493,7 +496,10 @@ class acp_search
 					$search_types[] = preg_replace('#^(.*?)\.' . $phpEx . '$#', '\1', $file);
 				}
 			}
+			closedir($dp);
+
 			sort($search_types);
+		}
 
 		return $search_types;
 	}

phpBB/includes/acp/acp_styles.php

@@ -527,7 +527,10 @@ parse_css_file = {PARSE_CSS_FILE}
 		// Grab uninstalled items
 		$new_ary = $cfg = array();
 
-		$dp = opendir("{$phpbb_root_path}styles");
+		$dp = @opendir("{$phpbb_root_path}styles");
+
+		if ($dp)
+		{
 			while (($file = readdir($dp)) !== false)
 			{
 				$subpath = ($mode != 'style') ? "$mode/" : '';
@@ -549,8 +552,10 @@ parse_css_file = {PARSE_CSS_FILE}
 					}
 				}
 			}
-		unset($installed);
 			@closedir($dp);
+		}
+
+		unset($installed);
 
 		if (sizeof($new_ary))
 		{
@@ -1431,12 +1436,21 @@ parse_css_file = {PARSE_CSS_FILE}
 		$imagesetlist = array('nolang' => array(), 'lang' => array());
 
 		$dir = "{$phpbb_root_path}styles/$imageset_path/imageset";
-		$dp = opendir($dir);
+		$dp = @opendir($dir);
+
+		if ($dp)
+		{
 			while (($file = readdir($dp)) !== false)
 			{
 				if (!is_file($dir . '/' . $file) && !is_link($dir . '/' . $file) && $file[0] != '.' && strtoupper($file) != 'CVS' && !sizeof($imagesetlist['lang']))
 				{
-				$dp2 = opendir("$dir/$file");
+					$dp2 = @opendir("$dir/$file");
+
+					if (!$dp2)
+					{
+						continue;
+					}
+
 					while (($file2 = readdir($dp2)) !== false)
 					{
 						$imglang = $file;
@@ -1453,6 +1467,7 @@ parse_css_file = {PARSE_CSS_FILE}
 				}
 			}
 			closedir($dp);
+		}
 
 		// Make sure the list of possible images is sorted alphabetically
 		sort($imagesetlist['nolang']);

phpBB/includes/captcha/captcha_gd.php

@@ -137,7 +137,13 @@ class captcha
 		{
 			global $phpbb_root_path;
 	
-			$dr = opendir($phpbb_root_path . 'includes/captcha/fonts');
+			$dr = @opendir($phpbb_root_path . 'includes/captcha/fonts');
+
+			if (!$dr)
+			{
+				trigger_error('Unable to open includes/captcha/fonts directory.', E_USER_ERROR);
+			}
+
 			while (false !== ($entry = readdir($dr)))
 			{
 				if (strtolower(pathinfo($entry, PATHINFO_EXTENSION)) == 'ttf')

phpBB/includes/functions_admin.php

@@ -345,7 +345,13 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
 		return false;
 	}
 
-	$dh = opendir($rootdir . $dir);
+	$dh = @opendir($rootdir . $dir);
+
+	if (!$dh)
+	{
+		return false;
+	}
+
 	while (($fname = readdir($dh)) !== false)
 	{
 		if (is_file("$rootdir$dir$fname"))
@@ -2677,9 +2683,9 @@ function add_permission_language()
 	// Now search in acp and mods folder for permissions_ files.
 	foreach (array('acp/', 'mods/') as $path)
 	{
-		$dh = opendir($user->lang_path . $path);
+		$dh = @opendir($user->lang_path . $path);
 
-		if ($dh !== false)
+		if ($dh)
 		{
 			while (($file = readdir($dh)) !== false)
 			{

phpBB/includes/functions_template.php

@@ -483,6 +483,7 @@ class template_compile
 						// Allow checking if loops are set with .loopname
 						// It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
 						$blocks = explode('.', $varrefs[1]);
+
 						// If the block is nested, we have a reference that we can grab.
 						// If the block is not nested, we just go and grab the block from _tpldata
 						if (sizeof($blocks) > 1)
@@ -490,12 +491,14 @@ class template_compile
 							$block = array_pop($blocks);
 							$namespace = implode('.', $blocks);
 							$varref = $this->generate_block_data_ref($namespace, true);
+
 							// Add the block reference for the last child.
 							$varref .= "['" . $block . "']";
 						}
 						else
 						{
 							$varref = '$this->_tpldata';
+
 							// Add the block reference for the last child.
 							$varref .= "['" . $blocks[0] . "']";
 						}

phpBB/includes/session.php

@@ -1306,7 +1306,7 @@ class user extends session
 					}
 					$stylesheet = str_replace($match, $content, $stylesheet);
 				}
-				unset ($content);
+				unset($content);
 			}
 
 			$stylesheet = str_replace('./', 'styles/' . $this->theme['theme_path'] . '/theme/', $stylesheet);

phpBB/install/convertors/functions_phpbb20.php

@@ -1282,7 +1282,7 @@ function phpbb_import_avatar($user_avatar)
 	else if ($convert_row['user_avatar_type'] == 1)
 	{
 		// Uploaded avatar
-		return import_avatar($user_avatar, '');
+		return import_avatar($user_avatar);
 	}
 	else if ($convert_row['user_avatar_type'] == 2)
 	{

phpBB/install/index.php

@@ -147,7 +147,14 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$language)
 // dir, this may or may not be English
 if (!$language)
 {
-	$dir = opendir($phpbb_root_path . 'language');
+	$dir = @opendir($phpbb_root_path . 'language');
+
+	if (!$dir)
+	{
+		die('Unable to access the language directory');
+		exit;
+	}
+
 	while (($file = readdir($dir)) !== false)
 	{
 		$path = $phpbb_root_path . 'language/' . $file;
@@ -221,7 +228,7 @@ class module
 		$module = array();
 
 		// Grab module information using Bart's "neat-o-module" system (tm)
-		$dir = opendir('.');
+		$dir = @opendir('.');
 
 		if (!$dir)
 		{
@@ -654,7 +661,12 @@ class module
 	{
 		global $phpbb_root_path, $phpEx;
 
-		$dir = opendir($phpbb_root_path . 'language');
+		$dir = @opendir($phpbb_root_path . 'language');
+
+		if (!$dir)
+		{
+			$this->error('Unable to access the language directory', __LINE__, __FILE__);
+		}
 
 		while ($file = readdir($dir))
 		{

phpBB/install/install_convert.php

@@ -215,7 +215,13 @@ class install_convert extends module
 		$convertors = $sort = array();
 		$get_info = true;
 
-		$handle = opendir('./convertors/');
+		$handle = @opendir('./convertors/');
+
+		if (!$handle)
+		{
+			$this->error('Unable to access the convertors directory', __LINE__, __FILE__);
+		}
+
 		while ($entry = readdir($handle))
 		{
 			if (preg_match('/^convert_([a-z0-9_]+).' . $phpEx . '/i', $entry, $m))

phpBB/install/install_install.php

@@ -1603,7 +1603,13 @@ class install_install extends module
 	{
 		global $db, $lang, $phpbb_root_path, $phpEx;
 
-		$dir = opendir($phpbb_root_path . 'language');
+		$dir = @opendir($phpbb_root_path . 'language');
+
+		if (!$dir)
+		{
+			$this->error('Unable to access the language directory', __LINE__, __FILE__);
+		}
+
 		while (($file = readdir($dir)) !== false)
 		{
 			$path = $phpbb_root_path . 'language/' . $file;

phpBB/language/en/acp/permissions_phpbb.php

@@ -157,7 +157,7 @@ $lang = array_merge($lang, array(
 
 	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'misc'),
 	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_f_postcount'	=> array('lang' => 'Increment post counter', 'cat' => 'misc'),
+	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'misc'),
 	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'misc'),
 ));
 

phpBB/language/en/email/admin_activate.txt

@@ -2,9 +2,9 @@ Subject: Activate user account
 
 Hello,
 
-The account owned by “{USERNAME}” has been deactivated or newly created, you should check the details of this user (if required) and handle it appropriately.
+The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and handle it appropriately.
 
-Use this link to view the user’s profile:
+Use this link to view the user's profile:
 {U_USER_DETAILS}
 
 Use this link to activate the account:

phpBB/language/en/email/admin_send_email.txt

@@ -1,5 +1,5 @@
 
-The following is an email sent to you by an administrator of “{SITENAME}”. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
 
 {CONTACT_EMAIL}
 

phpBB/language/en/email/admin_welcome_activated.txt

@@ -2,6 +2,6 @@ Subject: Account activated
 
 Hello {USERNAME},
 
-Your account on “{SITENAME}” has now been activated, you may login using the username and password you received in a previous email.
+Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous email.
 
 {EMAIL_SIG}

phpBB/language/en/email/admin_welcome_inactive.txt

@@ -1,4 +1,4 @@
-Subject: Welcome to “{SITENAME}” — {U_BOARD}
+Subject: Welcome to "{SITENAME}" - {U_BOARD}
 
 {WELCOME_MSG}
 

phpBB/language/en/email/coppa_resend_inactive.txt

@@ -1,4 +1,4 @@
-Subject: Welcome to “{SITENAME}” — {U_BOARD}
+Subject: Welcome to "{SITENAME}" - {U_BOARD}
 
 {WELCOME_MSG}
 
@@ -13,14 +13,14 @@ OR mail it to:
 {MAIL_INFO}
 
 ------------------------------ CUT HERE ------------------------------
-Permission to participate at “{SITENAME}”
+Permission to participate at "{SITENAME}"
 
 Username: {USERNAME}
 Email: {EMAIL_ADDRESS}
 
-I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO “{SITENAME}” TO STORE THIS INFORMATION. 
+I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
 I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
-I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM “{SITENAME}” AT ANY TIME.
+I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
 
 
 Parent or guardian 

phpBB/language/en/email/coppa_welcome_inactive.txt

@@ -1,4 +1,4 @@
-Subject: Welcome to “{SITENAME}” — {U_BOARD}
+Subject: Welcome to "{SITENAME}" - {U_BOARD}
 
 {WELCOME_MSG}
 
@@ -13,15 +13,15 @@ OR mail it to:
 {MAIL_INFO}
 
 ------------------------------ CUT HERE ------------------------------
-Permission to participate at “{SITENAME}”
+Permission to participate at "{SITENAME}"
 
 Username: {USERNAME}
 Password: {PASSWORD}
 Email: {EMAIL_ADDRESS}
 
-I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO “{SITENAME}” TO STORE THIS INFORMATION. 
+I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
 I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
-I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM “{SITENAME}” AT ANY TIME.
+I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
 
 
 Parent or guardian 

phpBB/language/en/email/email_notify.txt

@@ -1,8 +1,8 @@
-Subject: “{SITENAME}” — Email a friend
+Subject: "{SITENAME}" - Email a friend
 
 Hello {TO_USERNAME},
 
-This email was sent from “{SITENAME}” by {FROM_USERNAME} who thought you may be interested in the following topic:
+This email was sent from "{SITENAME}" by {FROM_USERNAME} who thought you may be interested in the following topic:
 
 {TOPIC_NAME}
 

phpBB/language/en/email/forum_notify.txt

@@ -1,12 +1,12 @@
-Subject: Forum post notification — “{FORUM_NAME}”
+Subject: Forum post notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, “{FORUM_NAME}” at “{SITENAME}”. This forum has received a new reply to the topic “{TOPIC_TITLE}” since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic.
 
 {U_NEWEST_POST}
 
-If you no longer wish to watch this forum you can either click the “Unsubscribe forum” link found in the forum above, or by clicking the following link:
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
 
 {U_STOP_WATCHING_FORUM}
 

phpBB/language/en/email/group_added.txt

@@ -2,7 +2,7 @@ Subject: You have been added to this usergroup
 
 Congratulations,
 
-You have been added to the “{GROUP_NAME}” group on “{SITENAME}”.
+You have been added to the "{GROUP_NAME}" group on "{SITENAME}".
 This action was done by a group leader or the site administrator, contact them for more information.
 
 You can view your groups information here:

phpBB/language/en/email/group_approved.txt

@@ -2,7 +2,7 @@ Subject: Your request has been approved
 
 Congratulations,
 
-Your request to join the “{GROUP_NAME}” group on “{SITENAME}” has been approved.
+Your request to join the "{GROUP_NAME}" group on "{SITENAME}" has been approved.
 Click on the following link to see your group membership.
 
 {U_GROUP}

phpBB/language/en/email/group_request.txt

@@ -2,7 +2,7 @@ Subject: A request to join your group has been made
 
 Dear {USERNAME},
 
-A user has requested to join the group “{GROUP_NAME}” you moderate on “{SITENAME}”.
+A user has requested to join the group "{GROUP_NAME}" you moderate on "{SITENAME}".
 To approve or deny this request for group membership please visit the following link:
 
 {U_PENDING}

phpBB/language/en/email/installed.txt

@@ -13,8 +13,8 @@ Password: {PASSWORD}
 Board URL: {U_BOARD}
 ----------------------------
 
-Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com’s support page — http://www.phpbb.com/support/
+Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
 
-In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com’s mailing list, located at the above URL.
+In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL.
 
 {EMAIL_SIG}

phpBB/language/en/email/newtopic_notify.txt

@@ -1,12 +1,12 @@
-Subject: New topic notification — “{FORUM_NAME}”
+Subject: New topic notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, “{FORUM_NAME}” at “{SITENAME}”. This forum has received a new topic since your last visit, “{TOPIC_TITLE}”. You can use the following link to view forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view forum, no more notifications will be sent until you visit the forum.
 
 {U_FORUM}
 
-If you no longer wish to watch this forum you can either click the “Unsubscribe forum” link found in the forum above, or by clicking the following link:
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
 
 {U_STOP_WATCHING_FORUM}
 

phpBB/language/en/email/post_approved.txt

@@ -1,8 +1,8 @@
-Subject: Post approved — “{POST_SUBJECT}”
+Subject: Post approved - "{POST_SUBJECT}"
 
 Hello {USERNAME},
 
-You are receiving this notification because your post “{POST_SUBJECT}” at “{SITENAME}” was approved by a moderator or administrator.
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator.
 
 If you want to view the post, click the following link:
 {U_VIEW_POST}

phpBB/language/en/email/post_disapproved.txt

@@ -1,8 +1,8 @@
-Subject: Post disapproved — “{POST_SUBJECT}”
+Subject: Post disapproved - "{POST_SUBJECT}"
 
 Hello {USERNAME},
 
-You are receiving this notification because your post “{POST_SUBJECT}” at “{SITENAME}” was disapproved by a moderator or administrator.
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator.
 
 The following reason was given for the disapproval:
 

phpBB/language/en/email/privmsg_notify.txt

@@ -2,7 +2,7 @@ Subject: New private message has arrived
 
 Hello {USERNAME},
 
-You have received a new private message from “{AUTHOR_NAME}” to your account on “{SITENAME}” with the following subject:
+You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject:
 
 {SUBJECT}
 

phpBB/language/en/email/profile_send_email.txt

@@ -1,7 +1,7 @@
 
 Hello {TO_USERNAME},
 
-The following is an email sent to you by {FROM_USERNAME} via your account on “{SITENAME}”. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+The following is an email sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
 
 {BOARD_CONTACT}
 

phpBB/language/en/email/profile_send_im.txt

@@ -1,7 +1,7 @@
 
 Hello {TO_USERNAME},
 
-The following is a message sent to you by {FROM_USERNAME} via your account on “{SITENAME}”. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+The following is a message sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
 
 {BOARD_CONTACT}
 

phpBB/language/en/email/report_closed.txt

@@ -1,8 +1,8 @@
-Subject: Report closed — “{POST_SUBJECT}”
+Subject: Report closed - "{POST_SUBJECT}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the report you filed on the post “{POST_SUBJECT}” in “{TOPIC_TITLE}” at “{SITENAME}” was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
+You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
 
 
 {EMAIL_SIG}

phpBB/language/en/email/report_deleted.txt

@@ -1,8 +1,8 @@
-Subject: Report deleted — “{POST_SUBJECT}”
+Subject: Report deleted - "{POST_SUBJECT}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the report you filed on the post “{POST_SUBJECT}” in “{TOPIC_TITLE}” at “{SITENAME}” was deleted by a moderator or by an administrator.
+You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator.
 
 
 {EMAIL_SIG}

phpBB/language/en/email/topic_approved.txt

@@ -1,8 +1,8 @@
-Subject: Topic approved — “{TOPIC_TITLE}”
+Subject: Topic approved - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because your topic “{TOPIC_TITLE}” at “{SITENAME}” was approved by a moderator or administrator.
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator.
 
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}

phpBB/language/en/email/topic_disapproved.txt

@@ -1,8 +1,8 @@
-Subject: Topic disapproved — “{TOPIC_TITLE}”
+Subject: Topic disapproved - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because your topic “{TOPIC_TITLE}” at “{SITENAME}” was disapproved by a moderator or administrator.
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator.
 
 The following reason was given for the disapproval:
 

phpBB/language/en/email/topic_notify.txt

@@ -1,8 +1,8 @@
-Subject: Topic reply notification — “{TOPIC_TITLE}”
+Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the topic, “{TOPIC_TITLE}” at “{SITENAME}”. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
@@ -10,7 +10,7 @@ If you want to view the newest post made since your last visit, click the follow
 If you want to view the topic, click the following link:
 {U_TOPIC}
 
-If you no longer wish to watch this topic you can either click the “Stop watching this topic” link found at the bottom of the topic above, or by clicking the following link:
+If you no longer wish to watch this topic you can either click the "Stop watching this topic" link found at the bottom of the topic above, or by clicking the following link:
 
 {U_STOP_WATCHING_TOPIC}
 

phpBB/language/en/email/user_activate.txt

@@ -2,7 +2,7 @@ Subject: Reactivate your account
 
 Hello {USERNAME},
 
-Your account on “{SITENAME}” has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
+Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
 
 {U_ACTIVATE}
 

phpBB/language/en/email/user_activate_inactive.txt

@@ -2,6 +2,6 @@ Subject: Your account has been deactivated
 
 Hello {USERNAME},
 
-Your account on “{SITENAME}” has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occured.
+Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occured.
 
 {EMAIL_SIG}

phpBB/language/en/email/user_activate_passwd.txt

@@ -2,7 +2,7 @@ Subject: New password activation
 
 Hello {USERNAME}
 
-You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on “{SITENAME}”. If you did not request this notification then please ignore it, if you keep receiving it please contact the board administrator.
+You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on "{SITENAME}". If you did not request this notification then please ignore it, if you keep receiving it please contact the board administrator.
 
 To use the new password you need to activate it. To do this click the link provided below.
 

phpBB/language/en/email/user_remind_inactive.txt

@@ -2,10 +2,10 @@ Subject: Inactive account reminder
 
 Hello {USERNAME},
 
-On {REGISTER_DATE} you registered a new account at “{SITENAME}”. To date you have not activated this account which is a prerequisite for forum login. For your convenience the activation link is repeated below.
+On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for forum login. For your convenience the activation link is repeated below.
 
 {U_ACTIVATE}
 
-Thank you for registering at “{SITENAME}”, we look forward to your participation.
+Thank you for registering at "{SITENAME}", we look forward to your participation.
 
 {EMAIL_SIG}

phpBB/language/en/email/user_resend_inactive.txt

@@ -1,4 +1,4 @@
-Subject: Welcome to “{SITENAME}” — {U_BOARD}
+Subject: Welcome to "{SITENAME}" - {U_BOARD}
 
 {WELCOME_MSG}
 

phpBB/language/en/email/user_welcome.txt

@@ -1,4 +1,4 @@
-Subject: Welcome to “{SITENAME}” — {U_BOARD}
+Subject: Welcome to "{SITENAME}" - {U_BOARD}
 
 {WELCOME_MSG}
 

phpBB/language/en/email/user_welcome_inactive.txt

@@ -1,4 +1,4 @@
-Subject: Welcome to “{SITENAME}” — {U_BOARD}
+Subject: Welcome to "{SITENAME}" - {U_BOARD}
 
 {WELCOME_MSG}