mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-26 01:43:45 +02:00
Code Issues Releases Wiki Activity

- fixed a few smaller things

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5952 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-05-20 18:39:35 +00:00
parent 037f0bf4da
commit 5029170afb
28 changed files with 118 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/memberlist.php
View File

@@ -260,12 +260,12 @@ switch ($mode)
include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
$subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']);
$message = $_POST['message'];
$message = request_var('message', '', true);
$messenger = new messenger();
$messenger->template('profile_send_email', $row['user_lang']);
$messenger->subject($subject);
$messenger->subject(html_entity_decode($subject));
$messenger->replyto($user->data['user_email']);
$messenger->im($row['user_jabber'], $row['username']);
@@ -273,9 +273,9 @@ switch ($mode)
$messenger->assign_vars(array(
'SITENAME' => $config['sitename'],
'BOARD_EMAIL' => $config['board_contact'],
'FROM_USERNAME' => $user->data['username'],
'TO_USERNAME' => $row['username'],
'MESSAGE' => $message)
'FROM_USERNAME' => html_entity_decode($user->data['username']),
'TO_USERNAME' => html_entity_decode($row['username']),
'MESSAGE' => html_entity_decode($message))
);
$messenger->send(NOTIFY_IM);
@@ -289,10 +289,10 @@ switch ($mode)
// Send vars to the template
$template->assign_vars(array(
'IM_CONTACT' => $row[$sql_field],
'USERNAME' => addslashes($row['username']),
'USERNAME' => $row['username'],
'EMAIL' => $row['user_email'],
'CONTACT_NAME' => $row[$sql_field],
'SITENAME' => addslashes($config['sitename']),
'SITENAME' => $config['sitename'],
'PRESENCE_IMG' => $presence_img,
@@ -616,7 +616,7 @@ switch ($mode)
if ($user_id)
{
$messenger->subject($subject);
$messenger->subject(html_entity_decode($subject));
$messenger->im($row['user_jabber'], $row['username']);
$notify_type = $row['user_notify_type'];
}