To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.

- fix a bunch of bugs
- <!-- $Id$ --> is no longer allowed in template (.html) files
- changed layout of private message screens (folders are menu items)
- removed unread mode for private messages
- added new feature to template engine - "jump out of loop" or "loop another loop within my loop" :D (will be documented within the coding guidelines)
- added autologin field to sessions
- check session length checks
- added add_log statement to sessions to track session valid to invalid changes if ip/browser change depending on config settings (only debug)
- added multibyte support for various variables (exception at the moment is usernames which needs some discussion)
- hopefully not broke something. :/


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

phpBB/includes/acp/acp_email.php

@@ -125,6 +125,7 @@ class acp_email
 
 				// Send the messages
 				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+				include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 				$messenger = new messenger($use_queue);
 
 				$errored = false;
@@ -170,12 +171,7 @@ class acp_email
 
 				if ($group_id)
 				{
-					$sql = 'SELECT group_name 
-						FROM ' . GROUPS_TABLE . " 
-						WHERE group_id = $group_id";
-					$result = $db->sql_query($sql);
-					$group_name = (string) $db->sql_fetchfield('group_name');
-					$db->sql_freeresult($result);
+					$group_name = get_group_name($group_id);
 				}
 				else
 				{
@@ -218,8 +214,8 @@ class acp_email
 			'S_GROUP_OPTIONS'		=> $select_list,
 			'USERNAMES'				=> $usernames,
 			'U_FIND_USERNAME'		=> $phpbb_root_path . "memberlist.$phpEx$SID&mode=searchuser&form=acp_email&field=usernames",
-			'SUBJECT'				=> request_var('subject', ''),
-			'MESSAGE'				=> request_var('message', ''),
+			'SUBJECT'				=> request_var('subject', '', true),
+			'MESSAGE'				=> request_var('message', '', true),
 			'S_PRIORITY_OPTIONS'	=> $s_priority_options)
 		);