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

Merge pull request #6056 from senky/ticket/16574

Browse Source 
[ticket/16574] Remove flash BBcode
This commit is contained in:
Máté Bartus
2021-08-23 21:34:28 +02:00
committed by GitHub
parent 3d5d16ee4f 419d627683
commit 553a20ddf7
56 changed files with 117 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/ucp/ucp_main.php
View File

@@ -587,10 +587,9 @@ class ucp_main
$bbcode_status = $auth->acl_get('u_pm_bbcode') || $auth->acl_getf_global('f_bbcode');
$smilies_status = $auth->acl_get('u_pm_smilies') || $auth->acl_getf_global('f_smilies');
$img_status = $auth->acl_get('u_pm_img') || $auth->acl_getf_global('f_img');
$flash_status = $auth->acl_get('u_pm_flash') || $auth->acl_getf_global('f_flash');
$message_parser->message = $draft_message;
$message_parser->parse($bbcode_status, $config['allow_post_links'], $smilies_status, $img_status, $flash_status, true, $config['allow_post_links']);
$message_parser->parse($bbcode_status, $config['allow_post_links'], $smilies_status, $img_status, true, $config['allow_post_links']);
$draft_row = array(
'draft_subject' => $draft_subject,

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

@@ -684,7 +684,6 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$bbcode_status = ($config['allow_bbcode'] && $config['auth_bbcode_pm'] && $auth->acl_get('u_pm_bbcode')) ? true : false;
$smilies_status = ($config['allow_smilies'] && $config['auth_smilies_pm'] && $auth->acl_get('u_pm_smilies')) ? true : false;
$img_status = ($config['auth_img_pm'] && $auth->acl_get('u_pm_img')) ? true : false;
$flash_status = ($config['auth_flash_pm'] && $auth->acl_get('u_pm_flash')) ? true : false;
$url_status = ($config['allow_post_links']) ? true : false;
/**
@@ -695,15 +694,14 @@ function compose_pm($id, $mode, $action, $user_folders = array())
* @var bool bbcode_status BBCode status
* @var bool smilies_status Smilies status
* @var bool img_status Image BBCode status
* @var bool flash_status Flash BBCode status
* @var bool url_status URL BBCode status
* @since 3.3.3-RC1
* @changed 4.0.0-a1 Removed flash_status
*/
$vars = [
'bbcode_status',
'smilies_status',
'img_status',
'flash_status',
'url_status',
];
extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_bbcode_status', compact($vars)));
@@ -726,7 +724,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
if (confirm_box(true))
{
$message_parser->message = $message;
$message_parser->parse($bbcode_status, $url_status, $smilies_status, $img_status, $flash_status, true, $url_status);
$message_parser->parse($bbcode_status, $url_status, $smilies_status, $img_status, true, $url_status);
$sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
'user_id' => $user->data['user_id'],
@@ -872,7 +870,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
}
// Parse message
$message_parser->parse($enable_bbcode, ($config['allow_post_links']) ? $enable_urls : false, $enable_smilies, $img_status, $flash_status, true, $config['allow_post_links']);
$message_parser->parse($enable_bbcode, ($config['allow_post_links']) ? $enable_urls : false, $enable_smilies, $img_status, true, $config['allow_post_links']);
// On a refresh we do not care about message parsing errors
if (count($message_parser->warn_msg) && !$refresh)
@@ -1327,7 +1325,6 @@ function compose_pm($id, $mode, $action, $user_folders = array())
'MESSAGE' => $message_text,
'BBCODE_STATUS' => $user->lang(($bbcode_status ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF'), '<a href="' . $controller_helper->route('phpbb_help_bbcode_controller') . '">', '</a>'),
'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'],
'SMILIES_STATUS' => ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
'URL_STATUS' => ($url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
'MAX_FONT_SIZE' => (int) $config['max_post_font_size'],
@@ -1352,7 +1349,6 @@ function compose_pm($id, $mode, $action, $user_folders = array())
'S_ATTACH_DATA' => json_encode($message_parser->attachment_data),
'S_BBCODE_IMG' => $img_status,
'S_BBCODE_FLASH' => $flash_status,
'S_BBCODE_QUOTE' => true,
'S_BBCODE_URL' => $url_status,

3
phpBB/includes/ucp/ucp_prefs.php
View File

@@ -230,7 +230,6 @@ class ucp_prefs
'post_st' => $request->variable('post_st', (!empty($user->data['user_post_show_days'])) ? (int) $user->data['user_post_show_days'] : 0),
'images' => $request->variable('images', (bool) $user->optionget('viewimg')),
'flash' => $request->variable('flash', (bool) $user->optionget('viewflash')),
'smilies' => $request->variable('smilies', (bool) $user->optionget('viewsmilies')),
'sigs' => $request->variable('sigs', (bool) $user->optionget('viewsigs')),
'avatars' => $request->variable('avatars', (bool) $user->optionget('viewavatars')),
@@ -280,7 +279,6 @@ class ucp_prefs
if (!count($error))
{
$user->optionset('viewimg', $data['images']);
$user->optionset('viewflash', $data['flash']);
$user->optionset('viewsmilies', $data['smilies']);
$user->optionset('viewsigs', $data['sigs']);
$user->optionset('viewavatars', $data['avatars']);
@@ -415,7 +413,6 @@ class ucp_prefs
'ERROR' => (count($error)) ? implode('<br />', $error) : '',
'S_IMAGES' => $data['images'],
'S_FLASH' => $data['flash'],
'S_SMILIES' => $data['smilies'],
'S_SIGS' => $data['sigs'],
'S_AVATARS' => $data['avatars'],

3
phpBB/includes/ucp/ucp_profile.php
View File

@@ -538,7 +538,6 @@ class ucp_profile
$enable_urls,
$enable_smilies,
$config['allow_sig_img'],
$config['allow_sig_flash'],
true,
$config['allow_sig_links'],
'sig'
@@ -612,7 +611,6 @@ class ucp_profile
'BBCODE_STATUS' => $user->lang(($config['allow_sig_bbcode'] ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF'), '<a href="' . $controller_helper->route('phpbb_help_bbcode_controller') . '">', '</a>'),
'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
'FLASH_STATUS' => ($config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],
'URL_STATUS' => ($config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
'MAX_FONT_SIZE' => (int) $config['max_sig_font_size'],
@@ -621,7 +619,6 @@ class ucp_profile
'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'],
'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'],
'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false,
'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false,
'S_LINKS_ALLOWED' => ($config['allow_sig_links']) ? true : false)
);