diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 11:26:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 11:26:14 +0000 |
| commit | daa3288a368ddac0335dde7ee2a718883bfb2fdc (patch) | |
| tree | ddca8411bb3c8fc81050ea1e654a8ea726d9c5a0 /phpBB/memberlist.php | |
| parent | a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5 (diff) | |
| download | forums-daa3288a368ddac0335dde7ee2a718883bfb2fdc.tar forums-daa3288a368ddac0335dde7ee2a718883bfb2fdc.tar.gz forums-daa3288a368ddac0335dde7ee2a718883bfb2fdc.tar.bz2 forums-daa3288a368ddac0335dde7ee2a718883bfb2fdc.tar.xz forums-daa3288a368ddac0335dde7ee2a718883bfb2fdc.zip | |
- implemented the suggested html_entity_decode function made by david
- fixed string length checking by also decoding entities for the sake of checking
- used the new html_entity_decode function
git-svn-id: file:///svn/phpbb/trunk@6545 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index fa297d5b89..e635487ff1 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -298,17 +298,17 @@ switch ($mode) $messenger = new messenger(false); $messenger->template('profile_send_im', $row['user_lang']); - $messenger->subject(html_entity_decode($subject)); + $messenger->subject(utf8_html_entity_decode($subject)); $messenger->replyto($user->data['user_email']); $messenger->im($row['user_jabber'], $row['username']); $messenger->assign_vars(array( - 'SITENAME' => $config['sitename'], + 'SITENAME' => utf8_html_entity_decode($config['sitename']), 'BOARD_EMAIL' => $config['board_contact'], - 'FROM_USERNAME' => html_entity_decode($user->data['username']), - 'TO_USERNAME' => html_entity_decode($row['username']), - 'MESSAGE' => html_entity_decode($message)) + 'FROM_USERNAME' => utf8_html_entity_decode($user->data['username']), + 'TO_USERNAME' => utf8_html_entity_decode($row['username']), + 'MESSAGE' => utf8_html_entity_decode($message)) ); $messenger->send(NOTIFY_IM); @@ -728,7 +728,7 @@ switch ($mode) if ($user_id) { - $messenger->subject(html_entity_decode($subject)); + $messenger->subject(utf8_html_entity_decode($subject)); $messenger->im($row['user_jabber'], $row['username']); $notify_type = $row['user_notify_type']; } @@ -743,17 +743,17 @@ switch ($mode) $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); $messenger->assign_vars(array( - 'SITENAME' => $config['sitename'], + 'SITENAME' => utf8_html_entity_decode($config['sitename']), 'BOARD_EMAIL' => $config['board_contact'], - 'TO_USERNAME' => html_entity_decode($row['to_name']), - 'FROM_USERNAME' => html_entity_decode($user->data['username']), - 'MESSAGE' => html_entity_decode($message)) + 'TO_USERNAME' => utf8_html_entity_decode($row['to_name']), + 'FROM_USERNAME' => utf8_html_entity_decode($user->data['username']), + 'MESSAGE' => utf8_html_entity_decode($message)) ); if ($topic_id) { $messenger->assign_vars(array( - 'TOPIC_NAME' => html_entity_decode($row['topic_title']), + 'TOPIC_NAME' => utf8_html_entity_decode($row['topic_title']), 'U_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=" . $row['forum_id'] . "&t=$topic_id") ); } @@ -1111,7 +1111,7 @@ switch ($mode) continue; } - $params[] = $key . '=' . urlencode(htmlspecialchars($var)); + $params[] = urlencode($key) . '=' . urlencode(htmlspecialchars($var)); } } |