-
-
+
-
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 35ceefe171..6b3a5b25c9 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -362,10 +362,6 @@
- id="bbcode" checked="checked" /> {L_YES} id="bbcode" checked="checked" /> {L_NO}
-
-
-
- id="html" checked="checked" /> {L_YES} id="html" checked="checked" /> {L_NO} -
- id="smilies" checked="checked" /> {L_YES} id="smilies" checked="checked" /> {L_NO} @@ -603,11 +599,10 @@
-
- {L_DISABLE_HTML}
{L_DISABLE_BBCODE}
{L_DISABLE_SMILIES}
{L_DISABLE_MAGIC_URL}
-
{L_OPTIONS}: {HTML_STATUS} :: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS} +
{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS}
', $value); - break; + break; + case 'date': - break; + break; + case 'dropdown': $field_id = $ident_ary['data']['field_id']; $lang_id = $ident_ary['data']['lang_id']; @@ -416,12 +420,14 @@ class custom_profile } return $this->options_lang[$field_id][$lang_id][(int) $value]; - break; + break; + case 'bool': - break; + break; + default: trigger_error('Unknown profile type'); - break; + break; } } @@ -665,6 +671,7 @@ class custom_profile switch ($profile_row['field_type']) { case FIELD_DATE: + if (!isset($_REQUEST[$var_name . '_day'])) { if ($profile_row['field_default_value'] == 'now') @@ -682,25 +689,30 @@ class custom_profile } $var = sprintf('%2d-%2d-%4d', $day, $month, $year); - break; - case FIELD_TEXT: - include_once($phpbb_root_path . 'includes/message_parser.' . $phpEx); + break; - $message_parser = new parse_message(request_var($var_name, '')); + case FIELD_TEXT: + include_once($phpbb_root_path . 'includes/message_parser.' . $phpEx); + + $message_parser = new parse_message(request_var($var_name, '')); - // Get the allowed settings from the global settings. Magic URLs are always set to true. - // TODO: It might be nice to make this a per field setting. - $message_parser->parse($config['allow_html'], $config['allow_bbcode'], true, $config['allow_smilies']); - $var = array( - $profile_row['field_ident'] => $message_parser->message, - $profile_row['field_ident'] . '_bbcode_uid' => $message_parser->bbcode_uid, - $profile_row['field_ident'] . '_bbcode_bitfield' => $message_parser->bbcode_bitfield, - 'submitted' => request_var($var_name, '') - ); - break; + /** + * Get the allowed settings from the global settings. Magic URLs are always set to true. + * @todo It might be nice to make this a per field setting. + */ + $message_parser->parse($config['allow_bbcode'], true, $config['allow_smilies']); + + $var = array( + $profile_row['field_ident'] => $message_parser->message, + $profile_row['field_ident'] . '_bbcode_uid' => $message_parser->bbcode_uid, + $profile_row['field_ident'] . '_bbcode_bitfield' => $message_parser->bbcode_bitfield, + 'submitted' => request_var($var_name, '') + ); + break; + default: $var = request_var($var_name, $profile_row['field_default_value']); - break; + break; } return $var; diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 28f8acd57c..269fee2c26 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1321,6 +1321,11 @@ function group_delete($group_id, $group_name = false) WHERE group_id = $group_id"; $db->sql_query($sql); + // Delete auth entries from the groups table + $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . " + WHERE group_id = $group_id"; + $db->sql_query($sql); + add_log('admin', 'LOG_GROUP_DELETE', $group_name); return false; diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 06c06cd98a..0143957223 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -847,7 +847,6 @@ function mcp_fork_topic($topic_ids) 'post_approved' => 1, 'post_reported' => 0, 'enable_bbcode' => (int) $row['enable_bbcode'], - 'enable_html' => (int) $row['enable_html'], 'enable_smilies' => (int) $row['enable_smilies'], 'enable_magic_url' => (int) $row['enable_magic_url'], 'enable_sig' => (int) $row['enable_sig'], diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 317713625f..044c261873 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -105,13 +105,6 @@ function mcp_topic_view($id, $mode, $action) $message = $row['post_text']; $post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title']; - // If the board has HTML off but the post has HTML - // on then we process it, else leave it alone - if (!$config['allow_html'] && $row['enable_html']) - { - $message = preg_replace('#(<)([\/]?.*?)(>)#is', '<\\2>', $message); - } - if ($row['bbcode_bitfield']) { $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 9872387b78..d0ffb37874 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -262,12 +262,6 @@ function mcp_warn_post_view($id, $mode, $action) // Parse the message and subject $message = $userrow['post_text']; - // If the board has HTML off but the post has HTML on then we process it, else leave it alone - if (!$auth->acl_get('f_html', $userrow['forum_id']) && $row['enable_html']) - { - $message = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $message); - } - // Second parse bbcode here if ($userrow['bbcode_bitfield']) { @@ -277,12 +271,6 @@ function mcp_warn_post_view($id, $mode, $action) // Always process smilies after parsing bbcodes $message = smiley_text($message); - if ($userrow['enable_html'] && $auth->acl_get('f_html', $userrow['forum_id'])) - { - // Remove Comments from post content - $message = preg_replace('##is', '', $message); - } - // Replace naughty words such as farty pants $message = str_replace("\n", '
', censor_text($message)); @@ -391,7 +379,7 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0) $message_parser = new parse_message(); $message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning); $message_md5 = md5($message_parser->message); - $message_parser->parse(false, true, true, true, false, false, true); + $message_parser->parse(true, true, true, false, false, true); $pm_data = array( 'from_user_id' => $user->data['user_id'], @@ -399,7 +387,6 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0) 'from_username' => $user->data['username'], 'enable_sig' => false, 'enable_bbcode' => true, - 'enable_html' => false, 'enable_smilies' => true, 'enable_urls' => false, 'icon_id' => 0, diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index dc206d1ba1..f5386f1fd7 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -113,7 +113,13 @@ class bbcode_firstpass extends bbcode 'flash' => array('bbcode_id' => 11, 'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ie' => "\$this->bbcode_flash('\$1', '\$2', '\$3')")) ); - $this->parsed_items = array('code' => 0, 'quote' => 0, 'attachment' => 0, 'b' => 0, 'i' => 0, 'url' => 0, 'img' => 0, 'size' => 0, 'color' => 0, 'u' => 0, 'list' => 0, 'email' => 0, 'flash' => 0); + // Zero the parsed items array + $this->parsed_items = array(); + + foreach ($this->bbcodes as $tag => $bbcode_data) + { + $this->parsed_items[$tag] = 0; + } if (!is_array($rowset)) { @@ -128,8 +134,9 @@ class bbcode_firstpass extends bbcode { $rowset[] = $row; } + $db->sql_freeresult($result); } - + foreach ($rowset as $row) { $this->bbcodes[$row['bbcode_tag']] = array( @@ -279,7 +286,6 @@ class bbcode_firstpass extends bbcode '#.*?#', '#.*?#', '#
» %s', 'LOG_FORUM_ADD' => 'Created new forum
» %s', + 'LOG_FORUM_DEL_FORUM' => 'Deleted forum
» %s', + 'LOG_FORUM_DEL_FORUMS' => 'Deleted forum and its subforums
» %s', + 'LOG_FORUM_DEL_MOVE_FORUMS' => 'Deleted forum and moved subforums to %s
» %s', + 'LOG_FORUM_DEL_MOVE_POSTS' => 'Deleted forum and moved posts to %s
» %s', + 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => 'Deleted forum and its subforums, moved messages to %s
» %s', + 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => 'Deleted forum, moved posts to %s and subforums to %s
» %s', + 'LOG_FORUM_DEL_POSTS' => 'Deleted forum and its messages
» %s', + 'LOG_FORUM_DEL_POSTS_FORUMS' => 'Deleted forum, its messages and subforums
» %s', + 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => 'Deleted forum and its messages, moved subforums to %s
» %s', 'LOG_FORUM_EDIT' => 'Edited forum details
» %s', 'LOG_FORUM_MOVE_DOWN' => 'Moved forum %s below %s', 'LOG_FORUM_MOVE_UP' => 'Moved forum %s above %s', 'LOG_FORUM_SYNC' => 'Re-synchronised forum
» %s', - 'LOG_FORUM_DEL_POSTS' => 'Deleted forum and its messages
» %s', - 'LOG_FORUM_DEL_FORUMS' => 'Deleted forum and its subforums
» %s', - 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => 'Deleted forum and its messages, moved subforums to %s
» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => 'Deleted forum and its subforums, moved messages to %s
» %s', - 'LOG_FORUM_DEL_MOVE_POSTS' => 'Deleted forum and moved posts to %s
» %s', - 'LOG_FORUM_DEL_MOVE_FORUMS' => 'Deleted forum and moved subforums to %s
» %s', - 'LOG_FORUM_DEL_POSTS_FORUMS' => 'Deleted forum, its messages and subforums
» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => 'Deleted forum, moved posts to %s and subforums to %s
» %s', 'LOG_GROUP_CREATED' => 'New usergroup created
» %s', 'LOG_GROUP_DEFAULTS' => 'Group made default for members
» %s', @@ -438,9 +439,9 @@ $lang = array_merge($lang, array( 'LOG_F_ROLE_ADD' => 'Forum Role added
» %s', 'LOG_F_ROLE_EDIT' => 'Forum Role edited
» %s', 'LOG_F_ROLE_REMOVED' => 'Forum Role removed
» %s', - 'LOG_M_ROLE_ADD' => 'Mod Role added
» %s', - 'LOG_M_ROLE_EDIT' => 'Mod Role edited
» %s', - 'LOG_M_ROLE_REMOVED' => 'Mod Role removed
» %s', + 'LOG_M_ROLE_ADD' => 'Moderator Role added
» %s', + 'LOG_M_ROLE_EDIT' => 'Moderator Role edited
» %s', + 'LOG_M_ROLE_REMOVED' => 'Moderator Role removed
» %s', 'LOG_U_ROLE_ADD' => 'User Role added
» %s', 'LOG_U_ROLE_EDIT' => 'User Role edited
» %s', 'LOG_U_ROLE_REMOVED' => 'User Role removed
» %s', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 20f1cebe84..bbbb52d390 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -103,7 +103,6 @@ $lang = array_merge($lang, array( 'acl_u_pm_attach' => array('lang' => 'Can attach files in private messages', 'cat' => 'pm'), 'acl_u_pm_download' => array('lang' => 'Can download files in private messages', 'cat' => 'pm'), 'acl_u_pm_bbcode' => array('lang' => 'Can post BBCode in private messages', 'cat' => 'pm'), - 'acl_u_pm_html' => array('lang' => 'Can post HTML in private messages', 'cat' => 'pm'), 'acl_u_pm_smilies' => array('lang' => 'Can post smilies in private messages', 'cat' => 'pm'), 'acl_u_pm_img' => array('lang' => 'Can post images in private messages', 'cat' => 'pm'), 'acl_u_pm_flash' => array('lang' => 'Can post Flash in private messages', 'cat' => 'pm'), @@ -134,7 +133,6 @@ $lang = array_merge($lang, array( 'acl_f_attach' => array('lang' => 'Can attach files', 'cat' => 'content'), 'acl_f_download' => array('lang' => 'Can download files', 'cat' => 'content'), 'acl_f_sigs' => array('lang' => 'Can use signatures', 'cat' => 'content'), - 'acl_f_html' => array('lang' => 'Can post HTML', 'cat' => 'content'), 'acl_f_bbcode' => array('lang' => 'Can post BBCode', 'cat' => 'content'), 'acl_f_smilies' => array('lang' => 'Can post smilies', 'cat' => 'content'), 'acl_f_img' => array('lang' => 'Can post images', 'cat' => 'content'), diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 5ac25650d2..3a25caeb3b 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -130,7 +130,7 @@ $help = array( ), array( 0 => 'Can I use HTML?', - 1 => 'That depends on whether the administrator allows you too, they have complete control over it. If you are allowed to use it you will probably find only certain tags work. This is a safety feature to prevent people abusing the board by using tags which may destroy the layout or cause other problems. If HTML is enabled you can disable it on a per post basis from the posting form.' + 1 => '...' ), array( 0 => 'What are Smileys?', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index e76831cef1..d1d507a94b 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -74,7 +74,6 @@ $lang = array_merge($lang, array( 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this message?', 'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered', 'DISABLE_BBCODE' => 'Disable BBCode', - 'DISABLE_HTML' => 'Disable HTML', 'DISABLE_MAGIC_URL' => 'Do not automatically parse URLs', 'DISABLE_SMILIES' => 'Disable Smilies', 'DISALLOWED_EXTENSION' => 'The Extension %s is not allowed', @@ -100,9 +99,6 @@ $lang = array_merge($lang, array( 'GENERAL_UPLOAD_ERROR' => 'Could not upload Attachment to %s', - 'HTML_IS_OFF' => 'HTML is OFF', - 'HTML_IS_ON' => 'HTML is ON', - 'IMAGES_ARE_OFF' => '[img] is OFF', 'IMAGES_ARE_ON' => '[img] is ON', 'INVALID_FILENAME' => '%s is an invalid filename', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 235ade1d58..bab24a78a6 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -102,7 +102,6 @@ $lang = array_merge($lang, array( 'DEFAULT_ACTION_EXPLAIN' => 'This Action will be triggered if none of the above is applicable', 'DEFAULT_ADD_SIG' => 'Attach my signature by default', 'DEFAULT_BBCODE' => 'Enable BBCode by default', - 'DEFAULT_HTML' => 'Enable HTML by default', 'DEFAULT_NOTIFY' => 'Notify me upon replies by default', 'DEFAULT_SMILIES' => 'Enable smilies by default', 'DEFINED_RULES' => 'Defined Rules', diff --git a/phpBB/posting.php b/phpBB/posting.php index 4aa20b2d64..5f3b062d1c 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -232,8 +232,6 @@ if ($sql) $enable_urls = $enable_magic_url; - $enable_html = (isset($enable_html)) ? $enable_html : $config['allow_html']; - if (!in_array($mode, array('quote', 'edit', 'delete'))) { $enable_sig = ($config['allow_sig'] && $user->optionget('attachsig')); @@ -261,7 +259,7 @@ if ($sql) $db->sql_freeresult($result); } - $check_value = (($enable_html+1) << 16) + (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1); + $check_value = (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1); } // Notify user checkbox @@ -393,7 +391,6 @@ if ($mode == 'delete') // HTML, BBCode, Smilies, Images and Flash status -$html_status = ($config['allow_html'] && $auth->acl_get('f_html', $forum_id)); $bbcode_status = ($config['allow_bbcode'] && $auth->acl_get('f_bbcode', $forum_id)); $smilies_status = ($config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)); $img_status = ($auth->acl_get('f_img', $forum_id)); @@ -519,7 +516,6 @@ if ($submit || $preview || $refresh) $topic_time_limit = (isset($_POST['topic_time_limit'])) ? (int) $_POST['topic_time_limit'] : (($mode != 'post') ? $topic_time_limit : 0); $icon_id = request_var('icon', 0); - $enable_html = (!$html_status || isset($_POST['disable_html'])) ? false : true; $enable_bbcode = (!$bbcode_status || isset($_POST['disable_bbcode'])) ? false : true; $enable_smilies = (!$smilies_status || isset($_POST['disable_smilies'])) ? false : true; $enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1; @@ -533,7 +529,7 @@ if ($submit || $preview || $refresh) if ($submit) { - $status_switch = (($enable_html+1) << 16) + (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1); + $status_switch = (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1); $status_switch = ($status_switch != $check_value); } else @@ -615,7 +611,7 @@ if ($submit || $preview || $refresh) // Parse message if ($update_message) { - $message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies, $img_status, $flash_status, $quote_status); + $message_parser->parse($enable_bbcode, $enable_urls, $enable_smilies, $img_status, $flash_status, $quote_status); } else { @@ -685,7 +681,6 @@ if ($submit || $preview || $refresh) 'poll_start' => $poll_start, 'poll_last_vote' => $poll_last_vote, 'poll_vote_change' => $poll_vote_change, - 'enable_html' => $enable_html, 'enable_bbcode' => $enable_bbcode, 'enable_urls' => $enable_urls, 'enable_smilies' => $enable_smilies, @@ -820,7 +815,6 @@ if ($submit || $preview || $refresh) 'poster_id' => (int) $poster_id, 'enable_sig' => (bool) $enable_sig, 'enable_bbcode' => (bool) $enable_bbcode, - 'enable_html' => (bool) $enable_html, 'enable_smilies' => (bool) $enable_smilies, 'enable_urls' => (bool) $enable_urls, 'enable_indexing' => (bool) $enable_indexing, @@ -855,7 +849,7 @@ if (!sizeof($error) && $preview) { $post_time = ($mode == 'edit') ? $post_time : $current_time; - $preview_message = $message_parser->format_display($enable_html, $enable_bbcode, $enable_urls, $enable_smilies, false); + $preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); $preview_signature = ($mode == 'edit') ? $user_sig : $user->data['user_sig']; $preview_signature_uid = ($mode == 'edit') ? $user_sig_bbcode_uid : $user->data['user_sig_bbcode_uid']; @@ -869,7 +863,7 @@ if (!sizeof($error) && $preview) $parse_sig->bbcode_bitfield = $preview_signature_bitfield; // Not sure about parameters for bbcode/smilies/urls... in signatures - $parse_sig->format_display($config['allow_html'], $config['allow_bbcode'], true, $config['allow_smilies']); + $parse_sig->format_display($config['allow_bbcode'], true, $config['allow_smilies']); $preview_signature = $parse_sig->message; unset($parse_sig); } @@ -888,7 +882,7 @@ if (!sizeof($error) && $preview) $parse_poll->bbcode_uid = $message_parser->bbcode_uid; $parse_poll->bbcode_bitfield = $message_parser->bbcode_bitfield; - $parse_poll->format_display($enable_html, $enable_bbcode, $enable_urls, $enable_smilies); + $parse_poll->format_display($enable_bbcode, $enable_urls, $enable_smilies); $template->assign_vars(array( 'S_HAS_POLL_OPTIONS'=> (sizeof($poll_options)), @@ -901,7 +895,7 @@ if (!sizeof($error) && $preview) ); $parse_poll->message = implode("\n", $poll_options); - $parse_poll->format_display($enable_html, $enable_bbcode, $enable_urls, $enable_smilies); + $parse_poll->format_display($enable_bbcode, $enable_urls, $enable_smilies); $preview_poll_options = explode('
', $parse_poll->message); unset($parse_poll); @@ -1008,7 +1002,6 @@ if ($enable_icons) $s_topic_icons = posting_gen_topic_icons($mode, $icon_id); } -$html_checked = (isset($enable_html)) ? !$enable_html : (($config['allow_html']) ? !$user->optionget('html') : 1); $bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode']) ? !$user->optionget('bbcode') : 1); $smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies']) ? !$user->optionget('smilies') : 1); $urls_checked = (isset($enable_urls)) ? !$enable_urls : 0; @@ -1079,7 +1072,6 @@ $template->assign_vars(array( 'USERNAME' => ((!$preview && $mode != 'quote') || $preview) ? stripslashes($username) : '', 'SUBJECT' => $post_subject, 'MESSAGE' => $post_text, - 'HTML_STATUS' => ($html_status) ? $user->lang['HTML_IS_ON'] : $user->lang['HTML_IS_OFF'], 'BBCODE_STATUS' => ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '', '') : sprintf($user->lang['BBCODE_IS_OFF'], '', ''), 'IMG_STATUS' => ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], 'FLASH_STATUS' => ($flash_status) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'], @@ -1101,8 +1093,6 @@ $template->assign_vars(array( 'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_username)), 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $topic_last_post_id && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) || $auth->acl_get('m_delete', $forum_id))), - 'S_HTML_ALLOWED' => $html_status, - 'S_HTML_CHECKED' => ($html_checked) ? ' checked="checked"' : '', 'S_BBCODE_ALLOWED' => $bbcode_status, 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, @@ -1121,10 +1111,33 @@ $template->assign_vars(array( 'S_HAS_DRAFTS' => ($auth->acl_get('u_savedrafts') && $user->data['is_registered'] && $drafts), 'S_FORM_ENCTYPE' => $form_enctype, + 'S_BBCODE_IMG' => $img_status, + 'S_BBCODE_FLASH' => $flash_status, + 'S_BBCODE_QUOTE' => $quote_status, + 'S_POST_ACTION' => $s_action, 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); +// Build custom bbcodes array +$sql = 'SELECT bbcode_id, bbcode_tag + FROM ' . BBCODES_TABLE . ' + WHERE display_on_posting = 1'; +$result = $db->sql_query($sql); + +$i = 0; +while ($row = $db->sql_fetchrow($result)) +{ + $template->assign_block_vars('custom_tags', array( + 'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'", + 'BBCODE_ID' => 22 + ($i * 2), + 'BBCODE_TAG' => $row['bbcode_tag']) + ); + + $i++; +} +$db->sql_freeresult($result); + // Poll entry if (($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id && (!$poll_last_vote || $auth->acl_get('m_edit', $forum_id)))) && $auth->acl_get('f_poll', $forum_id)) @@ -1371,7 +1384,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u 'post_time' => $current_time, 'post_approved' => ($auth->acl_get('f_moderate', $data['forum_id']) && !$auth->acl_get('m_approve')) ? 0 : 1, 'enable_bbcode' => $data['enable_bbcode'], - 'enable_html' => $data['enable_html'], 'enable_smilies' => $data['enable_smilies'], 'enable_magic_url' => $data['enable_urls'], 'enable_sig' => $data['enable_sig'], @@ -1422,7 +1434,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u 'icon_id' => $data['icon_id'], 'post_approved' => ($auth->acl_get('f_moderate', $data['forum_id']) && !$auth->acl_get('m_approve')) ? 0 : 1, 'enable_bbcode' => $data['enable_bbcode'], - 'enable_html' => $data['enable_html'], 'enable_smilies' => $data['enable_smilies'], 'enable_magic_url' => $data['enable_urls'], 'enable_sig' => $data['enable_sig'], diff --git a/phpBB/report.php b/phpBB/report.php index ddc7cfc5e5..850c6158e1 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -33,7 +33,7 @@ if (!$id) trigger_error('INVALID_MODE'); } -$redirect_url = ($report_post) ? "{$phpbb_root_path}viewtopic.$phpEx$SID&p=$id#$id" : "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&p=$id"; +$redirect_url = ($report_post) ? "{$phpbb_root_path}viewtopic.$phpEx$SID&p=$id#p$id" : "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&p=$id"; // Has the report been cancelled? if (isset($_POST['cancel'])) @@ -387,7 +387,6 @@ function report_notification($notify_user, $report_post, $report_data) 'from_username' => $user->data['username'], 'icon_id' => 0, 'enable_bbcode' => 0, - 'enable_html' => 0, 'enable_smilies' => 0, 'enable_magic_url' => 1, 'enable_sig' => 0, diff --git a/phpBB/search.php b/phpBB/search.php index e6ff66ff7e..a27c479eae 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -471,6 +471,7 @@ if ($keywords || $author || $search_id) AND t.topic_id = tp.topic_id)'; $sql_select .= ', tp.topic_posted'; } + if ($config['load_db_lastread']) { $sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . ' @@ -611,11 +612,6 @@ if ($keywords || $author || $search_id) continue; } - if ($row['enable_html']) - { - $row['post_text'] = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $row['post_text']); - } - decode_message($row['post_text'], $row['bbcode_uid']); if ($return_chars != -1) diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index 389763231d..83162921b6 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -14,7 +14,7 @@ var text_name = 'message'; // Define the bbCode tags bbcode = new Array(); -bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]'); +bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]', {custom_tags.BBCODE_NAME}); imageTag = false; // Helpline messages @@ -234,21 +234,30 @@ function checkForm()
| {HTML_STATUS} | -
| {BBCODE_STATUS} |
| - | {L_DISABLE_HTML} | -|||||
| diff --git a/phpBB/styles/subSilver/template/ucp_prefs_post.html b/phpBB/styles/subSilver/template/ucp_prefs_post.html index 4b3bb1537e..8dc01174eb 100644 --- a/phpBB/styles/subSilver/template/ucp_prefs_post.html +++ b/phpBB/styles/subSilver/template/ucp_prefs_post.html @@ -15,10 +15,6 @@ | {L_DEFAULT_BBCODE}: | {L_YES} {L_NO} | ||||
| {L_DEFAULT_HTML}: | -{L_YES} {L_NO} | -|||||
| {L_DEFAULT_SMILIES}: | {L_YES} {L_NO} | diff --git a/phpBB/styles/subSilver/template/ucp_profile_signature.html b/phpBB/styles/subSilver/template/ucp_profile_signature.html index 05fc81526b..e121b86395 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_signature.html +++ b/phpBB/styles/subSilver/template/ucp_profile_signature.html @@ -100,9 +100,6 @@ function marklist(form_name, status)|||||
{L_OPTIONS}
|
|