diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index ce9e661146..79edfe240f 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -38,6 +38,9 @@ require($phpbb_root_path . 'includes/functions_post.'.$phpEx); require($phpbb_root_path . 'includes/functions_selects.'.$phpEx); require($phpbb_root_path . 'includes/functions_validate.'.$phpEx); +$html_entities_match = array('#<#', '#>#'); +$html_entities_replace = array('<', '>'); + // // Set mode // @@ -753,7 +756,7 @@ if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) | } else { - $this_userdata = get_userdata( $HTTP_POST_VARS['username'] ); + $this_userdata = get_userdata(htmlspecialchars($HTTP_POST_VARS['username'])); if( !$this_userdata ) { message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] ); @@ -778,7 +781,9 @@ if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) | $location = htmlspecialchars($this_userdata['user_from']); $occupation = htmlspecialchars($this_userdata['user_occ']); $interests = htmlspecialchars($this_userdata['user_interests']); - $signature = ( $this_userdata['user_sig_bbcode_uid'] != '' ) ? htmlspecialchars(preg_replace("/:(([a-z0-9]+:)?)" . $this_userdata['user_sig_bbcode_uid'] . "\]/si", ']', $userdata['user_sig'])) : htmlspecialchars($userdata['user_sig']); + + $signature = ($this_userdata['user_sig_bbcode_uid'] != '') ? preg_replace('#:' . $this_userdata['user_sig_bbcode_uid'] . '#si', '', $this_userdata['user_sig']) : $this_userdata['user_sig']; + $signature = preg_replace($html_entities_match, $html_entities_replace, $signature); $viewemail = $this_userdata['user_viewemail']; $notifypm = $this_userdata['user_notify_pm']; diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a136669c2b..d4a1841f7c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -125,6 +125,8 @@ h3 {font-size:12pt;color:blue}
  • Back ported HTML handler from 2.2, this may impact some boards which allow complex HTML - existing parser remains but commented out
  • Fixed parsing of word censors to not censor words within < and > tag delimiters
  • Fixed database utilities failing to backup data with MySQL
    • +
  • Fixed signature parsing in User Admin
    • +
  • Fixed missing class="post" tags in subSilver Admin templates
  • diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl index a7e253e108..5f9219453c 100644 --- a/phpBB/templates/subSilver/admin/board_config_body.tpl +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -9,23 +9,23 @@ {L_SERVER_NAME} - + {L_SERVER_PORT}
    {L_SERVER_PORT_EXPLAIN} - + {L_SCRIPT_PATH}
    {L_SCRIPT_PATH_EXPLAIN} - + {L_SITE_NAME}
    {L_SITE_NAME_EXPLAIN} - + {L_SITE_DESCRIPTION} - + {L_DISABLE_BOARD}
    {L_DISABLE_BOARD_EXPLAIN} @@ -41,19 +41,19 @@ {L_FLOOD_INTERVAL}
    {L_FLOOD_INTERVAL_EXPLAIN} - + {L_TOPICS_PER_PAGE} - + {L_POSTS_PER_PAGE} - + {L_HOT_THRESHOLD} - + {L_DEFAULT_STYLE} @@ -69,7 +69,7 @@ {L_DATE_FORMAT}
    {L_DATE_FORMAT_EXPLAIN} - + {L_SYSTEM_TIMEZONE} @@ -91,15 +91,15 @@ {L_COOKIE_DOMAIN} - + {L_COOKIE_NAME} - + {L_COOKIE_PATH} - + {L_COOKIE_SECURE}
    {L_COOKIE_SECURE_EXPLAIN} @@ -107,7 +107,7 @@ {L_SESSION_LENGTH} - + {L_PRIVATE_MESSAGING} @@ -118,22 +118,22 @@ {L_INBOX_LIMIT} - + {L_SENTBOX_LIMIT} - + {L_SAVEBOX_LIMIT} - + {L_ABILITIES_SETTINGS} {L_MAX_POLL_OPTIONS} - + {L_ALLOW_HTML} @@ -141,7 +141,7 @@ {L_ALLOWED_TAGS}
    {L_ALLOWED_TAGS_EXPLAIN} - + {L_ALLOW_BBCODE} @@ -153,7 +153,7 @@ {L_SMILIES_PATH}
    {L_SMILIES_PATH_EXPLAIN} - + {L_ALLOW_SIG} @@ -161,7 +161,7 @@ {L_MAX_SIG_LENGTH}
    {L_MAX_SIG_LENGTH_EXPLAIN} - + {L_ALLOW_NAME_CHANGE} @@ -184,28 +184,28 @@ {L_MAX_FILESIZE}
    {L_MAX_FILESIZE_EXPLAIN} - Bytes + Bytes {L_MAX_AVATAR_SIZE}
    {L_MAX_AVATAR_SIZE_EXPLAIN} - x + x {L_AVATAR_STORAGE_PATH}
    {L_AVATAR_STORAGE_PATH_EXPLAIN} - + {L_AVATAR_GALLERY_PATH}
    {L_AVATAR_GALLERY_PATH_EXPLAIN} - + {L_COPPA_SETTINGS} {L_COPPA_FAX} - + {L_COPPA_MAIL}
    {L_COPPA_MAIL_EXPLAIN} @@ -217,7 +217,7 @@ {L_ADMIN_EMAIL} - + {L_EMAIL_SIG}
    {L_EMAIL_SIG_EXPLAIN} @@ -229,15 +229,15 @@ {L_SMTP_SERVER} - + {L_SMTP_USERNAME}
    {L_SMTP_USERNAME_EXPLAIN} - + {L_SMTP_PASSWORD}
    {L_SMTP_PASSWORD_EXPLAIN} - + {S_HIDDEN_FIELDS}   diff --git a/phpBB/templates/subSilver/admin/category_edit_body.tpl b/phpBB/templates/subSilver/admin/category_edit_body.tpl index eb99540e01..4af80e0779 100644 --- a/phpBB/templates/subSilver/admin/category_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/category_edit_body.tpl @@ -10,7 +10,7 @@ {L_CATEGORY} - + {S_HIDDEN_FIELDS} diff --git a/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl b/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl index 37c9c809dd..2dd029149e 100644 --- a/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl +++ b/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl @@ -21,7 +21,7 @@ {L_ADDITIONAL_TABLES} - + {L_GZIP_COMPRESS} diff --git a/phpBB/templates/subSilver/admin/disallow_body.tpl b/phpBB/templates/subSilver/admin/disallow_body.tpl index df3b5bec7d..debed8beef 100644 --- a/phpBB/templates/subSilver/admin/disallow_body.tpl +++ b/phpBB/templates/subSilver/admin/disallow_body.tpl @@ -9,7 +9,7 @@ {L_USERNAME}
    {L_ADD_EXPLAIN} -   +   {L_DELETE_DISALLOW} diff --git a/phpBB/templates/subSilver/admin/forum_admin_body.tpl b/phpBB/templates/subSilver/admin/forum_admin_body.tpl index d863b03f43..3105a49a99 100644 --- a/phpBB/templates/subSilver/admin/forum_admin_body.tpl +++ b/phpBB/templates/subSilver/admin/forum_admin_body.tpl @@ -27,13 +27,13 @@ - + - + diff --git a/phpBB/templates/subSilver/admin/forum_edit_body.tpl b/phpBB/templates/subSilver/admin/forum_edit_body.tpl index 7f56bbe9d8..11706e49c4 100644 --- a/phpBB/templates/subSilver/admin/forum_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/forum_edit_body.tpl @@ -10,7 +10,7 @@ {L_FORUM_NAME} - + {L_FORUM_DESCRIPTION} @@ -33,11 +33,11 @@ {L_PRUNE_DAYS} -   {L_DAYS} +   {L_DAYS} {L_PRUNE_FREQ} -   {L_DAYS} +   {L_DAYS} diff --git a/phpBB/templates/subSilver/admin/group_edit_body.tpl b/phpBB/templates/subSilver/admin/group_edit_body.tpl index cc7ca5c795..79571f5f22 100644 --- a/phpBB/templates/subSilver/admin/group_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/group_edit_body.tpl @@ -11,7 +11,7 @@ {L_GROUP_NAME}: - + @@ -22,7 +22,7 @@ {L_GROUP_MODERATOR}: -   +   diff --git a/phpBB/templates/subSilver/admin/ranks_edit_body.tpl b/phpBB/templates/subSilver/admin/ranks_edit_body.tpl index cb0a528608..fd35b74a5e 100644 --- a/phpBB/templates/subSilver/admin/ranks_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/ranks_edit_body.tpl @@ -9,7 +9,7 @@ {L_RANK_TITLE}: - + {L_RANK_SPECIAL} @@ -17,12 +17,12 @@ {L_RANK_MINIMUM}: - + {L_RANK_IMAGE}:
    {L_RANK_IMAGE_EXPLAIN} -
    {IMAGE_DISPLAY} +
    {IMAGE_DISPLAY}    diff --git a/phpBB/templates/subSilver/admin/smile_edit_body.tpl b/phpBB/templates/subSilver/admin/smile_edit_body.tpl index 087f623862..c5d6dd1e5b 100644 --- a/phpBB/templates/subSilver/admin/smile_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/smile_edit_body.tpl @@ -18,7 +18,7 @@ function update_smiley(newimage) {L_SMILEY_CODE} - + {L_SMILEY_URL} @@ -26,7 +26,7 @@ function update_smiley(newimage) {L_SMILEY_EMOTION} - + {S_HIDDEN_FIELDS} diff --git a/phpBB/templates/subSilver/admin/styles_edit_body.tpl b/phpBB/templates/subSilver/admin/styles_edit_body.tpl index 170543216c..c53ad57a74 100755 --- a/phpBB/templates/subSilver/admin/styles_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/styles_edit_body.tpl @@ -9,7 +9,7 @@ {L_THEME_NAME}: - + {L_TEMPLATE}: @@ -22,218 +22,218 @@ {L_STYLESHEET}:
    Filename for CSS stylesheet to use for this theme. - +   {L_BACKGROUND_IMAGE}: - +   {L_BACKGROUND_COLOR}: - +   {L_BODY_TEXT_COLOR}: - +   {L_BODY_LINK_COLOR}: - +   {L_BODY_VLINK_COLOR}: - +   {L_BODY_ALINK_COLOR}: - +   {L_BODY_HLINK_COLOR}: - +   {L_TR_COLOR1}: - - + + {L_TR_COLOR2}: - - + + {L_TR_COLOR3}: - - + + {L_TR_CLASS1}: - - + + {L_TR_CLASS2}: - - + + {L_TR_CLASS3}: - - + + {L_TH_COLOR1}: - - + + {L_TH_COLOR2}: - - + + {L_TH_COLOR3}: - - + + {L_TH_CLASS1}: - - + + {L_TH_CLASS2}: - - + + {L_TH_CLASS3}: - - + + {L_TD_COLOR1}: - - + + {L_TD_COLOR2}: - - + + {L_TD_COLOR3}: - - + + {L_TD_CLASS1}: - - + + {L_TD_CLASS2}: - - + + {L_TD_CLASS3}: - - + + {L_FONTFACE_1}: - - + + {L_FONTFACE_2}: - - + + {L_FONTFACE_3}: - - + + {L_FONTSIZE_1}: - - + + {L_FONTSIZE_2}: - - + + {L_FONTSIZE_3}: - - + + {L_FONTCOLOR_1}: - - + + {L_FONTCOLOR_2}: - - + + {L_FONTCOLOR_3}: - - + + {L_SPAN_CLASS_1}: - - + + {L_SPAN_CLASS_2}: - - + + {L_SPAN_CLASS_3}: - - + + diff --git a/phpBB/templates/subSilver/admin/user_ban_body.tpl b/phpBB/templates/subSilver/admin/user_ban_body.tpl index c3fdb4070d..65bb65a6d9 100644 --- a/phpBB/templates/subSilver/admin/user_ban_body.tpl +++ b/phpBB/templates/subSilver/admin/user_ban_body.tpl @@ -9,7 +9,7 @@ {L_USERNAME}: - {S_HIDDEN_FIELDS} + {S_HIDDEN_FIELDS} {L_UNBAN_USER} @@ -23,7 +23,7 @@ {L_IP_OR_HOSTNAME}:
    {L_BAN_IP_EXPLAIN} - + {L_UNBAN_IP} @@ -37,7 +37,7 @@ {L_EMAIL_ADDRESS}:
    {L_BAN_EMAIL_EXPLAIN} - + {L_UNBAN_EMAIL} diff --git a/phpBB/templates/subSilver/admin/user_edit_body.tpl b/phpBB/templates/subSilver/admin/user_edit_body.tpl index 97e27450e4..a1def7af47 100644 --- a/phpBB/templates/subSilver/admin/user_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/user_edit_body.tpl @@ -15,27 +15,27 @@ {L_USERNAME}: * - + {L_EMAIL_ADDRESS}: * - + {L_NEW_PASSWORD}: *
    {L_PASSWORD_IF_CHANGED} - + {L_CONFIRM_PASSWORD}: *
    {L_PASSWORD_CONFIRM_IF_CHANGED} - + @@ -50,49 +50,49 @@ {L_ICQ_NUMBER} - + {L_AIM} - + {L_MESSENGER} - + {L_YAHOO} - + {L_WEBSITE} - + {L_LOCATION} - + {L_OCCUPATION} - + {L_INTERESTS} - + @@ -200,7 +200,7 @@ {L_DATE_FORMAT}
    {L_DATE_FORMAT_EXPLAIN} - + @@ -236,7 +236,7 @@ {L_UPLOAD_AVATAR_URL} - + @@ -244,7 +244,7 @@ {L_LINK_REMOTE_AVATAR} - + diff --git a/phpBB/templates/subSilver/admin/user_email_body.tpl b/phpBB/templates/subSilver/admin/user_email_body.tpl index f13436b759..77c8090532 100644 --- a/phpBB/templates/subSilver/admin/user_email_body.tpl +++ b/phpBB/templates/subSilver/admin/user_email_body.tpl @@ -17,7 +17,7 @@ {L_EMAIL_SUBJECT} - + {L_EMAIL_MSG} diff --git a/phpBB/templates/subSilver/admin/user_select_body.tpl b/phpBB/templates/subSilver/admin/user_select_body.tpl index 5d7a31b83c..4717944556 100644 --- a/phpBB/templates/subSilver/admin/user_select_body.tpl +++ b/phpBB/templates/subSilver/admin/user_select_body.tpl @@ -8,6 +8,6 @@ {L_USER_SELECT} - {S_HIDDEN_FIELDS} + {S_HIDDEN_FIELDS} diff --git a/phpBB/templates/subSilver/admin/words_edit_body.tpl b/phpBB/templates/subSilver/admin/words_edit_body.tpl index a930d519f9..e48241ecec 100644 --- a/phpBB/templates/subSilver/admin/words_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/words_edit_body.tpl @@ -9,11 +9,11 @@ {L_WORD} - + {L_REPLACEMENT} - + {S_HIDDEN_FIELDS}