mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 07:07:51 +02:00
Code Issues Releases Wiki Activity

hmm... This commit does not increase the number of BBCodes. However, this does other things that we need to do first. This splits the usage of allow_* from the BBCode bitfield in forum descriptions, forum rules and group descriptions. This also fixes a tiny, tiny severe issue that nobody found :D I hope it works :P

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6188 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-07-17 03:23:31 +00:00
parent 29d92430c5
commit fa205b922d
16 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/acp/acp_forums.php
View File

@ -99,9 +99,11 @@ class acp_forums
'forum_link_track' => request_var('forum_link_track', false), 'forum_link_track' => request_var('forum_link_track', false),
'forum_desc' => request_var('forum_desc', '', true), 'forum_desc' => request_var('forum_desc', '', true),
'forum_desc_uid' => '', 'forum_desc_uid' => '',
'forum_desc_options' => 0,
'forum_desc_bitfield' => 0, 'forum_desc_bitfield' => 0,
'forum_rules' => request_var('forum_rules', '', true), 'forum_rules' => request_var('forum_rules', '', true),
'forum_rules_uid' => '', 'forum_rules_uid' => '',
'forum_rules_options' => 0,
'forum_rules_bitfield' => 0, 'forum_rules_bitfield' => 0,
'forum_rules_link' => request_var('forum_rules_link', ''), 'forum_rules_link' => request_var('forum_rules_link', ''),
'forum_image' => request_var('forum_image', ''), 'forum_image' => request_var('forum_image', ''),
@ -127,13 +129,13 @@ class acp_forums
// Get data for forum rules if specified... // Get data for forum rules if specified...
if ($forum_data['forum_rules']) if ($forum_data['forum_rules'])
{ {
generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], request_var('rules_parse_bbcode', false), request_var('rules_parse_urls', false), request_var('rules_parse_smilies', false)); generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options'], request_var('rules_parse_bbcode', false), request_var('rules_parse_urls', false), request_var('rules_parse_smilies', false));
} }
// Get data for forum description if specified // Get data for forum description if specified
if ($forum_data['forum_desc']) if ($forum_data['forum_desc'])
{ {
generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], request_var('desc_parse_bbcode', false), request_var('desc_parse_urls', false), request_var('desc_parse_smilies', false)); generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'], request_var('desc_parse_bbcode', false), request_var('desc_parse_urls', false), request_var('desc_parse_smilies', false));
} }
$errors = $this->update_forum_data($forum_data); $errors = $this->update_forum_data($forum_data);
@ -405,15 +407,16 @@ class acp_forums
// Before we are able to display the preview and plane text, we need to parse our request_var()'d value... // Before we are able to display the preview and plane text, we need to parse our request_var()'d value...
$forum_data['forum_rules_uid'] = ''; $forum_data['forum_rules_uid'] = '';
$forum_data['forum_rules_bitfield'] = 0; $forum_data['forum_rules_bitfield'] = 0;
$forum_data['forum_rules_options'] = 0;
generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], request_var('rules_allow_bbcode', false), request_var('rules_allow_urls', false), request_var('rules_allow_smiliess', false)); generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options'], request_var('rules_allow_bbcode', false), request_var('rules_allow_urls', false), request_var('rules_allow_smiliess', false));
} }
// Generate preview content // Generate preview content
$forum_rules_preview = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield']); $forum_rules_preview = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']);
// decode... // decode...
$forum_rules_data = generate_text_for_edit($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield']); $forum_rules_data = generate_text_for_edit($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_options']);
} }
// Parse desciption if specified // Parse desciption if specified
@ -424,12 +427,13 @@ class acp_forums
// Before we are able to display the preview and plane text, we need to parse our request_var()'d value... // Before we are able to display the preview and plane text, we need to parse our request_var()'d value...
$forum_data['forum_desc_uid'] = ''; $forum_data['forum_desc_uid'] = '';
$forum_data['forum_desc_bitfield'] = 0; $forum_data['forum_desc_bitfield'] = 0;
$forum_data['forum_desc_options'] = 0;
generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], request_var('desc_allow_bbcode', false), request_var('desc_allow_urls', false), request_var('desc_allow_smiliess', false)); generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'], request_var('desc_allow_bbcode', false), request_var('desc_allow_urls', false), request_var('desc_allow_smiliess', false));
} }
// decode... // decode...
$forum_desc_data = generate_text_for_edit($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield']); $forum_desc_data = generate_text_for_edit($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_options']);
} }
$forum_type_options = ''; $forum_type_options = '';
@ -661,7 +665,7 @@ class acp_forums
$template->assign_block_vars('forums', array( $template->assign_block_vars('forums', array(
'FOLDER_IMAGE' => $folder_image, 'FOLDER_IMAGE' => $folder_image,
'FORUM_NAME' => $row['forum_name'], 'FORUM_NAME' => $row['forum_name'],
'FORUM_DESCRIPTION' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield']), 'FORUM_DESCRIPTION' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
'FORUM_TOPICS' => $row['forum_topics'], 'FORUM_TOPICS' => $row['forum_topics'],
'FORUM_POSTS' => $row['forum_posts'], 'FORUM_POSTS' => $row['forum_posts'],

2
phpBB/includes/acp/acp_groups.php
View File

@ -418,7 +418,7 @@ class acp_groups
else else
{ {
$group_name = $group_row['group_name']; $group_name = $group_row['group_name'];
$group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield']); $group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_options']);
$group_type = $group_row['group_type']; $group_type = $group_row['group_type'];
$group_rank = $group_row['group_rank']; $group_rank = $group_row['group_rank'];
} }

2
phpBB/includes/acp/acp_profile.php
View File

@ -1408,7 +1408,7 @@ class acp_profile
} }
else else
{ {
add_log('admin', 'LOG_PROFILE_FIELD_CREATE', $field_ident . ':' . $cp->vars['lang_name']); add_log('admin', 'LOG_PROFILE_FIELD_CREATE', substr($field_ident, 1) . ':' . $cp->vars['lang_name']);
trigger_error($user->lang['ADDED_PROFILE_FIELD'] . adm_back_link($this->u_action)); trigger_error($user->lang['ADDED_PROFILE_FIELD'] . adm_back_link($this->u_action));
} }
} }

26
phpBB/includes/functions.php
View File

@ -1811,7 +1811,7 @@ function decode_message(&$message, $bbcode_uid = '')
* For display of custom parsed text on user-facing pages * For display of custom parsed text on user-facing pages
* Expects $text to be the value directly from the database (stored value) * Expects $text to be the value directly from the database (stored value)
*/ */
function generate_text_for_display($text, $uid, $bitfield) function generate_text_for_display($text, $uid, $bitfield, $flags)
{ {
global $__bbcode; global $__bbcode;
@ -1820,13 +1820,6 @@ function generate_text_for_display($text, $uid, $bitfield)
return ''; return '';
} }
// Get flags... they are always allow_bbcode, allow_smilies and allow_urls
$flags = $bitfield;
if ($flags >> 3)
{
$flags = bindec(substr(decbin($flags), strlen(decbin($flags >> 3))));
}
// Parse bbcode if bbcode uid stored and bbcode enabled // Parse bbcode if bbcode uid stored and bbcode enabled
if ($uid && ($flags & 1)) if ($uid && ($flags & 1))
{ {
@ -1838,11 +1831,11 @@ function generate_text_for_display($text, $uid, $bitfield)
if (empty($__bbcode)) if (empty($__bbcode))
{ {
$__bbcode = new bbcode($bitfield >> 3); $__bbcode = new bbcode($bitfield);
} }
else else
{ {
$__bbcode->bbcode($bitfield >> 3); $__bbcode->bbcode($bitfield);
} }
$__bbcode->bbcode_second_pass($text, $uid); $__bbcode->bbcode_second_pass($text, $uid);
@ -1859,7 +1852,7 @@ function generate_text_for_display($text, $uid, $bitfield)
* This function additionally returns the uid and bitfield that needs to be stored. * This function additionally returns the uid and bitfield that needs to be stored.
* Expects $text to be the value directly from request_var() and in it's non-parsed form * Expects $text to be the value directly from request_var() and in it's non-parsed form
*/ */
function generate_text_for_storage(&$text, &$uid, &$bitfield, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false) function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false)
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
@ -1889,7 +1882,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, $allow_bbcode = fa
} }
$flags = (($allow_bbcode) ? 1 : 0) + (($allow_smilies) ? 2 : 0) + (($allow_urls) ? 4 : 0); $flags = (($allow_bbcode) ? 1 : 0) + (($allow_smilies) ? 2 : 0) + (($allow_urls) ? 4 : 0);
$bitfield = $flags + ($message_parser->bbcode_bitfield << 3); $bitfield = $message_parser->bbcode_bitfield;
return; return;
} }
@ -1898,17 +1891,10 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, $allow_bbcode = fa
* For decoding custom parsed text for edits as well as extracting the flags * For decoding custom parsed text for edits as well as extracting the flags
* Expects $text to be the value directly from the database (pre-parsed content) * Expects $text to be the value directly from the database (pre-parsed content)
*/ */
function generate_text_for_edit($text, $uid, $bitfield) function generate_text_for_edit($text, $uid, $flags)
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
// Get forum flags...
$flags = $bitfield;
if ($flags >> 3)
{
$flags = bindec(substr(decbin($flags), strlen(decbin($flags >> 3))));
}
decode_message($text, $uid); decode_message($text, $uid);
return array( return array(

8
phpBB/includes/functions_display.php
View File

@ -234,7 +234,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'S_IS_CAT' => true, 'S_IS_CAT' => true,
'FORUM_ID' => $row['forum_id'], 'FORUM_ID' => $row['forum_id'],
'FORUM_NAME' => $row['forum_name'], 'FORUM_NAME' => $row['forum_name'],
'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield']), 'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang['FORUM_CAT'] . '" />' : '', 'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang['FORUM_CAT'] . '" />' : '',
'FORUM_FOLDER_IMG_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', 'FORUM_FOLDER_IMG_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
'U_VIEWFORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id'])) 'U_VIEWFORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']))
@ -334,7 +334,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'FORUM_ID' => $row['forum_id'], 'FORUM_ID' => $row['forum_id'],
'FORUM_NAME' => $row['forum_name'], 'FORUM_NAME' => $row['forum_name'],
'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield']), 'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
'TOPICS' => $row['forum_topics'], 'TOPICS' => $row['forum_topics'],
$l_post_click_count => $post_click_count, $l_post_click_count => $post_click_count,
'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : $user->img($folder_image, $folder_alt), 'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : $user->img($folder_image, $folder_alt),
@ -383,7 +383,7 @@ function generate_forum_rules(&$forum_data)
if ($forum_data['forum_rules']) if ($forum_data['forum_rules'])
{ {
$forum_data['forum_rules'] = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield']); $forum_data['forum_rules'] = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']);
} }
$template->assign_vars(array( $template->assign_vars(array(
@ -443,7 +443,7 @@ function generate_forum_nav(&$forum_data)
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_ID' => $forum_data['forum_id'], 'FORUM_ID' => $forum_data['forum_id'],
'FORUM_NAME' => $forum_data['forum_name'], 'FORUM_NAME' => $forum_data['forum_name'],
'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'])) 'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']))
); );
return; return;

2
phpBB/includes/functions_user.php
View File

@ -1389,7 +1389,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
// Parse description // Parse description
if ($desc) if ($desc)
{ {
generate_text_for_storage($sql_ary['group_desc'], $sql_ary['group_desc_uid'], $sql_ary['group_desc_bitfield'], $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies); generate_text_for_storage($sql_ary['group_desc'], $sql_ary['group_desc_uid'], $sql_ary['group_desc_bitfield'], $sql_ary['group_desc_options'], $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies);
} }
if (sizeof($group_attributes)) if (sizeof($group_attributes))

2
phpBB/includes/mcp/mcp_forum.php
View File

@ -63,7 +63,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_NAME' => $forum_info['forum_name'], 'FORUM_NAME' => $forum_info['forum_name'],
'FORUM_DESCRIPTION' => generate_text_for_display($forum_info['forum_desc'], $forum_info['forum_desc_uid'], $forum_info['forum_desc_bitfield']), 'FORUM_DESCRIPTION' => generate_text_for_display($forum_info['forum_desc'], $forum_info['forum_desc_uid'], $forum_info['forum_desc_bitfield'], $forum_info['forum_desc_options']),
'REPORTED_IMG' => $user->img('icon_reported', 'TOPIC_REPORTED'), 'REPORTED_IMG' => $user->img('icon_reported', 'TOPIC_REPORTED'),
'UNAPPROVED_IMG' => $user->img('icon_unapproved', 'TOPIC_UNAPPROVED'), 'UNAPPROVED_IMG' => $user->img('icon_unapproved', 'TOPIC_UNAPPROVED'),

10
phpBB/includes/ucp/ucp_groups.php
View File

@ -300,7 +300,7 @@ class ucp_groups
$template->assign_block_vars($block, array( $template->assign_block_vars($block, array(
'GROUP_ID' => $row['group_id'], 'GROUP_ID' => $row['group_id'],
'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'],
'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield']) : $user->lang['GROUP_IS_SPECIAL'], 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : $user->lang['GROUP_IS_SPECIAL'],
'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true,
'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status], 'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status],
@ -352,7 +352,7 @@ class ucp_groups
$template->assign_block_vars('nonmember', array( $template->assign_block_vars('nonmember', array(
'GROUP_ID' => $row['group_id'], 'GROUP_ID' => $row['group_id'],
'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'],
'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield']) : $user->lang['GROUP_IS_SPECIAL'], 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : $user->lang['GROUP_IS_SPECIAL'],
'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true,
'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true, 'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true,
'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status], 'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status],
@ -552,7 +552,7 @@ class ucp_groups
else else
{ {
$group_name = $group_row['group_name']; $group_name = $group_row['group_name'];
$group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield']); $group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_options']);
$group_type = $group_row['group_type']; $group_type = $group_row['group_type'];
$group_rank = $group_row['group_rank']; $group_rank = $group_row['group_rank'];
} }
@ -896,7 +896,7 @@ class ucp_groups
default: default:
$user->add_lang('acp/common'); $user->add_lang('acp/common');
$sql = 'SELECT g.group_id, g.group_name, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_type, ug.group_leader $sql = 'SELECT g.group_id, g.group_name, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_desc_options, g.group_type, ug.group_leader
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
WHERE ug.user_id = ' . $user->data['user_id'] . ' WHERE ug.user_id = ' . $user->data['user_id'] . '
AND g.group_id = ug.group_id AND g.group_id = ug.group_id
@ -908,7 +908,7 @@ class ucp_groups
{ {
$template->assign_block_vars('leader', array( $template->assign_block_vars('leader', array(
'GROUP_NAME' => ($value['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $value['group_name']] : $value['group_name'], 'GROUP_NAME' => ($value['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $value['group_name']] : $value['group_name'],
'GROUP_DESC' => generate_text_for_display($value['group_desc'], $value['group_desc_uid'], $value['group_desc_bitfield']), 'GROUP_DESC' => generate_text_for_display($value['group_desc'], $value['group_desc_uid'], $value['group_desc_bitfield'], $value['group_desc_options']),
'GROUP_TYPE' => $value['group_type'], 'GROUP_TYPE' => $value['group_type'],
'GROUP_ID' => $value['group_id'], 'GROUP_ID' => $value['group_id'],

3
phpBB/install/schemas/firebird_schema.sql
View File

@ -329,6 +329,7 @@ CREATE TABLE phpbb_forums (
forum_name BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, forum_name BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
forum_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, forum_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
forum_desc_bitfield INTEGER DEFAULT 0 NOT NULL, forum_desc_bitfield INTEGER DEFAULT 0 NOT NULL,
forum_desc_options INTEGER DEFAULT 0 NOT NULL,
forum_desc_uid VARCHAR(5) DEFAULT '' NOT NULL, forum_desc_uid VARCHAR(5) DEFAULT '' NOT NULL,
forum_link VARCHAR(255) DEFAULT '' NOT NULL, forum_link VARCHAR(255) DEFAULT '' NOT NULL,
forum_password VARCHAR(40) DEFAULT '' NOT NULL, forum_password VARCHAR(40) DEFAULT '' NOT NULL,
@ -337,6 +338,7 @@ CREATE TABLE phpbb_forums (
forum_rules BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, forum_rules BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
forum_rules_link VARCHAR(255) DEFAULT '' NOT NULL, forum_rules_link VARCHAR(255) DEFAULT '' NOT NULL,
forum_rules_bitfield INTEGER DEFAULT 0 NOT NULL, forum_rules_bitfield INTEGER DEFAULT 0 NOT NULL,
forum_rules_options INTEGER DEFAULT 0 NOT NULL,
forum_rules_uid VARCHAR(5) DEFAULT '' NOT NULL, forum_rules_uid VARCHAR(5) DEFAULT '' NOT NULL,
forum_topics_per_page INTEGER DEFAULT 0 NOT NULL, forum_topics_per_page INTEGER DEFAULT 0 NOT NULL,
forum_type INTEGER DEFAULT 0 NOT NULL, forum_type INTEGER DEFAULT 0 NOT NULL,
@ -413,6 +415,7 @@ CREATE TABLE phpbb_groups (
group_name VARCHAR(255) DEFAULT '' NOT NULL, group_name VARCHAR(255) DEFAULT '' NOT NULL,
group_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL, group_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
group_desc_bitfield INTEGER DEFAULT 0 NOT NULL, group_desc_bitfield INTEGER DEFAULT 0 NOT NULL,
group_desc_options INTEGER DEFAULT 0 NOT NULL,
group_desc_uid VARCHAR(5) DEFAULT '' NOT NULL, group_desc_uid VARCHAR(5) DEFAULT '' NOT NULL,
group_display INTEGER DEFAULT 0 NOT NULL, group_display INTEGER DEFAULT 0 NOT NULL,
group_avatar VARCHAR(255) DEFAULT '' NOT NULL, group_avatar VARCHAR(255) DEFAULT '' NOT NULL,

3
phpBB/install/schemas/mssql_schema.sql
View File

@ -353,6 +353,7 @@ CREATE TABLE [phpbb_forums] (
[forum_name] [varchar] (3000) DEFAULT ('') NOT NULL , [forum_name] [varchar] (3000) DEFAULT ('') NOT NULL ,
[forum_desc] [varchar] (8000) DEFAULT ('') NOT NULL , [forum_desc] [varchar] (8000) DEFAULT ('') NOT NULL ,
[forum_desc_bitfield] [int] DEFAULT (0) NOT NULL , [forum_desc_bitfield] [int] DEFAULT (0) NOT NULL ,
[forum_desc_options] [int] DEFAULT (0) NOT NULL ,
[forum_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL , [forum_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
[forum_link] [varchar] (255) DEFAULT ('') NOT NULL , [forum_link] [varchar] (255) DEFAULT ('') NOT NULL ,
[forum_password] [varchar] (40) DEFAULT ('') NOT NULL , [forum_password] [varchar] (40) DEFAULT ('') NOT NULL ,
@ -361,6 +362,7 @@ CREATE TABLE [phpbb_forums] (
[forum_rules] [varchar] (8000) DEFAULT ('') NOT NULL , [forum_rules] [varchar] (8000) DEFAULT ('') NOT NULL ,
[forum_rules_link] [varchar] (255) DEFAULT ('') NOT NULL , [forum_rules_link] [varchar] (255) DEFAULT ('') NOT NULL ,
[forum_rules_bitfield] [int] DEFAULT (0) NOT NULL , [forum_rules_bitfield] [int] DEFAULT (0) NOT NULL ,
[forum_rules_options] [int] DEFAULT (0) NOT NULL ,
[forum_rules_uid] [varchar] (5) DEFAULT ('') NOT NULL , [forum_rules_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
[forum_topics_per_page] [int] DEFAULT (0) NOT NULL , [forum_topics_per_page] [int] DEFAULT (0) NOT NULL ,
[forum_type] [int] DEFAULT (0) NOT NULL , [forum_type] [int] DEFAULT (0) NOT NULL ,
@ -458,6 +460,7 @@ CREATE TABLE [phpbb_groups] (
[group_name] [varchar] (255) DEFAULT ('') NOT NULL , [group_name] [varchar] (255) DEFAULT ('') NOT NULL ,
[group_desc] [varchar] (8000) DEFAULT ('') NOT NULL , [group_desc] [varchar] (8000) DEFAULT ('') NOT NULL ,
[group_desc_bitfield] [int] DEFAULT (0) NOT NULL , [group_desc_bitfield] [int] DEFAULT (0) NOT NULL ,
[group_desc_options] [int] DEFAULT (0) NOT NULL ,
[group_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL , [group_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
[group_display] [int] DEFAULT (0) NOT NULL , [group_display] [int] DEFAULT (0) NOT NULL ,
[group_avatar] [varchar] (255) DEFAULT ('') NOT NULL , [group_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,

3
phpBB/install/schemas/mysql_schema.sql
View File

@ -217,6 +217,7 @@ CREATE TABLE phpbb_forums (
forum_name text DEFAULT '' NOT NULL, forum_name text DEFAULT '' NOT NULL,
forum_desc text DEFAULT '' NOT NULL, forum_desc text DEFAULT '' NOT NULL,
forum_desc_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL, forum_desc_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
forum_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
forum_desc_uid varchar(5) DEFAULT '' NOT NULL, forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
forum_link varchar(255) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL,
forum_password varchar(40) DEFAULT '' NOT NULL, forum_password varchar(40) DEFAULT '' NOT NULL,
@ -225,6 +226,7 @@ CREATE TABLE phpbb_forums (
forum_rules text DEFAULT '' NOT NULL, forum_rules text DEFAULT '' NOT NULL,
forum_rules_link varchar(255) DEFAULT '' NOT NULL, forum_rules_link varchar(255) DEFAULT '' NOT NULL,
forum_rules_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL, forum_rules_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
forum_rules_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
forum_rules_uid varchar(5) DEFAULT '' NOT NULL, forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL, forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL,
forum_type tinyint(4) DEFAULT '0' NOT NULL, forum_type tinyint(4) DEFAULT '0' NOT NULL,
@ -287,6 +289,7 @@ CREATE TABLE phpbb_groups (
group_name varchar(255) DEFAULT '' NOT NULL, group_name varchar(255) DEFAULT '' NOT NULL,
group_desc text DEFAULT '' NOT NULL, group_desc text DEFAULT '' NOT NULL,
group_desc_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL, group_desc_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
group_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
group_desc_uid varchar(5) DEFAULT '' NOT NULL, group_desc_uid varchar(5) DEFAULT '' NOT NULL,
group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
group_avatar varchar(255) DEFAULT '' NOT NULL, group_avatar varchar(255) DEFAULT '' NOT NULL,

3
phpBB/install/schemas/oracle_schema.sql
View File

@ -433,6 +433,7 @@ CREATE TABLE phpbb_forums (
forum_name varchar2(3000) DEFAULT '' NOT NULL, forum_name varchar2(3000) DEFAULT '' NOT NULL,
forum_desc clob DEFAULT '' NOT NULL, forum_desc clob DEFAULT '' NOT NULL,
forum_desc_bitfield number(11) DEFAULT '0' NOT NULL, forum_desc_bitfield number(11) DEFAULT '0' NOT NULL,
forum_desc_options number(1) DEFAULT '0' NOT NULL,
forum_desc_uid varchar2(5) DEFAULT '' NOT NULL, forum_desc_uid varchar2(5) DEFAULT '' NOT NULL,
forum_link varchar2(255) DEFAULT '' NOT NULL, forum_link varchar2(255) DEFAULT '' NOT NULL,
forum_password varchar2(40) DEFAULT '' NOT NULL, forum_password varchar2(40) DEFAULT '' NOT NULL,
@ -441,6 +442,7 @@ CREATE TABLE phpbb_forums (
forum_rules clob DEFAULT '' NOT NULL, forum_rules clob DEFAULT '' NOT NULL,
forum_rules_link varchar2(255) DEFAULT '' NOT NULL, forum_rules_link varchar2(255) DEFAULT '' NOT NULL,
forum_rules_bitfield number(11) DEFAULT '0' NOT NULL, forum_rules_bitfield number(11) DEFAULT '0' NOT NULL,
forum_rules_options number(1) DEFAULT '0' NOT NULL,
forum_rules_uid varchar2(5) DEFAULT '' NOT NULL, forum_rules_uid varchar2(5) DEFAULT '' NOT NULL,
forum_topics_per_page number(4) DEFAULT '0' NOT NULL, forum_topics_per_page number(4) DEFAULT '0' NOT NULL,
forum_type number(4) DEFAULT '0' NOT NULL, forum_type number(4) DEFAULT '0' NOT NULL,
@ -528,6 +530,7 @@ CREATE TABLE phpbb_groups (
group_name varchar2(255) DEFAULT '' NOT NULL, group_name varchar2(255) DEFAULT '' NOT NULL,
group_desc clob DEFAULT '' NOT NULL, group_desc clob DEFAULT '' NOT NULL,
group_desc_bitfield number(11) DEFAULT '0' NOT NULL, group_desc_bitfield number(11) DEFAULT '0' NOT NULL,
group_desc_options number(1) DEFAULT '0' NOT NULL,
group_desc_uid varchar2(5) DEFAULT '' NOT NULL, group_desc_uid varchar2(5) DEFAULT '' NOT NULL,
group_display number(1) DEFAULT '0' NOT NULL, group_display number(1) DEFAULT '0' NOT NULL,
group_avatar varchar2(255) DEFAULT '' NOT NULL, group_avatar varchar2(255) DEFAULT '' NOT NULL,

3
phpBB/install/schemas/sqlite_schema.sql
View File

@ -206,6 +206,7 @@ CREATE TABLE phpbb_forums (
forum_name text(65535) NOT NULL DEFAULT '', forum_name text(65535) NOT NULL DEFAULT '',
forum_desc text(65535) NOT NULL DEFAULT '', forum_desc text(65535) NOT NULL DEFAULT '',
forum_desc_bitfield int(11) UNSIGNED NOT NULL DEFAULT '0', forum_desc_bitfield int(11) UNSIGNED NOT NULL DEFAULT '0',
forum_desc_options tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
forum_desc_uid varchar(5) NOT NULL DEFAULT '', forum_desc_uid varchar(5) NOT NULL DEFAULT '',
forum_link varchar(255) NOT NULL DEFAULT '', forum_link varchar(255) NOT NULL DEFAULT '',
forum_password varchar(40) NOT NULL DEFAULT '', forum_password varchar(40) NOT NULL DEFAULT '',
@ -214,6 +215,7 @@ CREATE TABLE phpbb_forums (
forum_rules text(65535) NOT NULL DEFAULT '', forum_rules text(65535) NOT NULL DEFAULT '',
forum_rules_link varchar(255) NOT NULL DEFAULT '', forum_rules_link varchar(255) NOT NULL DEFAULT '',
forum_rules_bitfield int(11) UNSIGNED NOT NULL DEFAULT '0', forum_rules_bitfield int(11) UNSIGNED NOT NULL DEFAULT '0',
forum_rules_options tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
forum_rules_uid varchar(5) NOT NULL DEFAULT '', forum_rules_uid varchar(5) NOT NULL DEFAULT '',
forum_topics_per_page tinyint(4) NOT NULL DEFAULT '0', forum_topics_per_page tinyint(4) NOT NULL DEFAULT '0',
forum_type tinyint(4) NOT NULL DEFAULT '0', forum_type tinyint(4) NOT NULL DEFAULT '0',
@ -273,6 +275,7 @@ CREATE TABLE phpbb_groups (
group_name varchar(255) NOT NULL DEFAULT '', group_name varchar(255) NOT NULL DEFAULT '',
group_desc text(65535) NOT NULL DEFAULT '', group_desc text(65535) NOT NULL DEFAULT '',
group_desc_bitfield int(11) UNSIGNED NOT NULL DEFAULT '0', group_desc_bitfield int(11) UNSIGNED NOT NULL DEFAULT '0',
group_desc_options tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
group_desc_uid varchar(5) NOT NULL DEFAULT '', group_desc_uid varchar(5) NOT NULL DEFAULT '',
group_display tinyint(1) UNSIGNED NOT NULL DEFAULT '0', group_display tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
group_avatar varchar(255) NOT NULL DEFAULT '', group_avatar varchar(255) NOT NULL DEFAULT '',

2
phpBB/memberlist.php
View File

@ -992,7 +992,7 @@ switch ($mode)
} }
$template->assign_vars(array( $template->assign_vars(array(
'GROUP_DESC' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield']), 'GROUP_DESC' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
'GROUP_NAME' => ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'], 'GROUP_NAME' => ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
'GROUP_COLOR' => $group_row['group_colour'], 'GROUP_COLOR' => $group_row['group_colour'],
'GROUP_TYPE' => $user->lang['GROUP_IS_' . $group_row['l_group_type']], 'GROUP_TYPE' => $user->lang['GROUP_IS_' . $group_row['l_group_type']],

2
phpBB/posting.php
View File

@ -1125,7 +1125,7 @@ $template->assign_vars(array(
'L_MESSAGE_BODY_EXPLAIN' => (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '', 'L_MESSAGE_BODY_EXPLAIN' => (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '',
'FORUM_NAME' => $post_data['forum_name'], 'FORUM_NAME' => $post_data['forum_name'],
'FORUM_DESC' => ($post_data['forum_desc']) ? generate_text_for_display($post_data['forum_desc'], $post_data['forum_desc_uid'], $post_data['forum_desc_bitfield']) : '', 'FORUM_DESC' => ($post_data['forum_desc']) ? generate_text_for_display($post_data['forum_desc'], $post_data['forum_desc_uid'], $post_data['forum_desc_bitfield'], $post_data['forum_desc_options']) : '',
'TOPIC_TITLE' => censor_text($post_data['topic_title']), 'TOPIC_TITLE' => censor_text($post_data['topic_title']),
'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : '', 'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : '',
'USERNAME' => ((!$preview && $mode != 'quote') || $preview) ? $post_data['username'] : '', 'USERNAME' => ((!$preview && $mode != 'quote') || $preview) ? $post_data['username'] : '',

2
phpBB/viewtopic.php
View File

@ -505,7 +505,7 @@ $topic_data['topic_title'] = censor_text($topic_data['topic_title']);
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_ID' => $forum_id, 'FORUM_ID' => $forum_id,
'FORUM_NAME' => $topic_data['forum_name'], 'FORUM_NAME' => $topic_data['forum_name'],
'FORUM_DESC' => generate_text_for_display($topic_data['forum_desc'], $topic_data['forum_desc_uid'], $topic_data['forum_desc_bitfield']), 'FORUM_DESC' => generate_text_for_display($topic_data['forum_desc'], $topic_data['forum_desc_uid'], $topic_data['forum_desc_bitfield'], $topic_data['forum_desc_options']),
'TOPIC_ID' => $topic_id, 'TOPIC_ID' => $topic_id,
'TOPIC_TITLE' => $topic_data['topic_title'], 'TOPIC_TITLE' => $topic_data['topic_title'],
'PAGINATION' => $pagination, 'PAGINATION' => $pagination,