diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 18:39:35 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 18:39:35 +0000 |
commit | 5029170afbe7e74a0c46b3b3f1ecca83697ced42 (patch) | |
tree | 4762e7d8d4d3b723d681f0bf5a88f65b266978b2 /phpBB/memberlist.php | |
parent | 037f0bf4da281981dd5bc0e217325d2c49531409 (diff) | |
download | forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.gz forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.bz2 forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.xz forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.zip |
- fixed a few smaller things
git-svn-id: file:///svn/phpbb/trunk@5952 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
-rw-r--r-- | phpBB/memberlist.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index a4975f8d6e..3feb7daaa0 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -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']; } |