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/includes/acp | |
| 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/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_ban.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 8 | ||||
| -rwxr-xr-x | phpBB/includes/acp/acp_inactive.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_language.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php index 420deb975f..868421e988 100644 --- a/phpBB/includes/acp/acp_ban.php +++ b/phpBB/includes/acp/acp_ban.php @@ -189,7 +189,7 @@ class acp_ban $template->assign_block_vars('ban_reason', array( 'BAN_ID' => $ban_id, 'REASON' => $reason, - 'A_REASON' => addslashes(html_entity_decode($reason))) + 'A_REASON' => addslashes(utf8_html_entity_decode($reason))) ); } } @@ -201,7 +201,7 @@ class acp_ban $template->assign_block_vars('ban_give_reason', array( 'BAN_ID' => $ban_id, 'REASON' => $reason, - 'A_REASON' => addslashes(html_entity_decode($reason))) + 'A_REASON' => addslashes(utf8_html_entity_decode($reason))) ); } } diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 48ad8546d1..81e1e52ea4 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -150,15 +150,15 @@ class acp_email $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - $messenger->subject(html_entity_decode($subject)); + $messenger->subject(utf8_html_entity_decode($subject)); $messenger->replyto($config['board_email']); $messenger->set_mail_priority($priority); $messenger->assign_vars(array( - 'SITENAME' => $config['sitename'], + 'SITENAME' => utf8_html_entity_decode($config['sitename']), 'CONTACT_EMAIL' => $config['board_contact'], - 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), - 'MESSAGE' => html_entity_decode($message)) + 'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])), + 'MESSAGE' => utf8_html_entity_decode($message)) ); if (!($messenger->send($used_method))) diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 9a26a3595d..616360f422 100755 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -108,9 +108,9 @@ class acp_inactive $messenger->im($row['user_jabber'], $row['username']); $messenger->assign_vars(array( - 'EMAIL_SIG' => $sig, - 'USERNAME' => html_entity_decode($row['username']), - 'SITENAME' => $config['sitename'], + 'EMAIL_SIG' => utf8_html_entity_decode($sig), + 'USERNAME' => utf8_html_entity_decode($row['username']), + 'SITENAME' => utf8_html_entity_decode($config['sitename']), 'REGISTER_DATE' => $user->format_date($row['user_regdate']), 'U_ACTIVATE' => "$board_url&mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey']) diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index c901c73ddc..39fbc057bc 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -827,7 +827,7 @@ class acp_language // Write ISO File $iso_src = html_entity_decode($row['lang_english_name']) . "\n"; - $iso_src .= html_entity_decode($row['lang_local_name']) . "\n"; + $iso_src .= utf8_html_entity_decode($row['lang_local_name']) . "\n"; $iso_src .= html_entity_decode($row['lang_author']); $compress->add_data($iso_src, 'language/' . $row['lang_iso'] . '/iso.txt'); diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 6b817235b2..ac832d14e3 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -305,10 +305,10 @@ class acp_users $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); $messenger->assign_vars(array( - 'SITENAME' => $config['sitename'], - 'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), - 'USERNAME' => html_entity_decode($user_row['username']), - 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), + 'SITENAME' => utf8_html_entity_decode($config['sitename']), + 'WELCOME_MSG' => utf8_html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), + 'USERNAME' => utf8_html_entity_decode($user_row['username']), + 'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])), 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey") ); |