mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Changing the stance we take towards flash. (DelvarWorld, NeoThermic)
fixing a few smaller bugs. #12007 #12003 git-svn-id: file:///svn/phpbb/trunk@7715 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
parent
d268559876
commit
ed17471e0c
10 changed files with 18 additions and 10 deletions
|
|
@ -237,6 +237,8 @@ p a {
|
|||
<li>[Fix] Check if there are active styles left before deleting a style</li>
|
||||
<li>[Fix] Correctly update styles after the deletion of an imageset.</li>
|
||||
<li>[Sec] Adding confirm boxes to UCP group actions (ToonArmy)</li>
|
||||
<li>[Feature] Added the option to disable the flash bbcode globally (DelvarWorld).</li>
|
||||
<li>[Sec] Changed the embedding of Flash (NeoThermic, DelvarWorld).</li>
|
||||
|
||||
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@ class acp_board
|
|||
'allow_topic_notify' => array('lang' => 'ALLOW_TOPIC_NOTIFY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
|
||||
'allow_forum_notify' => array('lang' => 'ALLOW_FORUM_NOTIFY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
|
||||
'allow_bbcode' => array('lang' => 'ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
|
||||
'allow_post_flash' => array('lang' => 'ALLOW_POST_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
|
||||
'allow_smilies' => array('lang' => 'ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
|
||||
'allow_post_links' => array('lang' => 'ALLOW_POST_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
|
||||
'allow_nocensors' => array('lang' => 'ALLOW_NO_CENSORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
|
||||
|
|
|
|||
|
|
@ -615,7 +615,8 @@ if (version_compare($current_version, '3.0.RC1', '<='))
|
|||
_sql($sql, $errored, $error_ary);
|
||||
|
||||
set_config('jab_use_ssl', '0');
|
||||
|
||||
set_config('allow_post_flash', '0');
|
||||
|
||||
$no_updates = false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars',
|
|||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_nocensors', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_flash', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_links', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1');
|
||||
|
|
@ -537,7 +538,7 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
|
|||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 14, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%';
|
||||
|
||||
# Standard Access (f_)
|
||||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 15, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock');
|
||||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 15, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_flash', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock');
|
||||
|
||||
# No Access (f_)
|
||||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 16, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option = 'f_';
|
||||
|
|
@ -556,7 +557,7 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
|
|||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove');
|
||||
|
||||
# Standard Access + Polls (f_)
|
||||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 21, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_ignoreflood', 'f_sticky', 'f_user_lock');
|
||||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 21, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_flash', 'f_ignoreflood', 'f_sticky', 'f_user_lock');
|
||||
|
||||
# Limited Access + Polls (f_)
|
||||
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 22, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_sticky', 'f_user_lock', 'f_votechg');
|
||||
|
|
|
|||
|
|
@ -126,6 +126,8 @@ $lang = array_merge($lang, array(
|
|||
'ACP_POST_SETTINGS_EXPLAIN' => 'Here you can set all default settings for posting.',
|
||||
'ALLOW_POST_LINKS' => 'Allow links in posts/private messages',
|
||||
'ALLOW_POST_LINKS_EXPLAIN' => 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
|
||||
'ALLOW_POST_FLASH' => 'Allow use of <code>[FLASH]</code> BBCode tag',
|
||||
'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts.',
|
||||
|
||||
'BUMP_INTERVAL' => 'Bump interval',
|
||||
'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
|
||||
|
|
|
|||
|
|
@ -647,7 +647,7 @@ $lang = array_merge($lang, array(
|
|||
'LOG_USER_DEL_AVATAR_USER' => '<strong>User avatar removed</strong>',
|
||||
'LOG_USER_DEL_SIG_USER' => '<strong>User signature removed</strong>',
|
||||
'LOG_USER_FEEDBACK' => '<strong>Added user feedback</strong><br />» %s',
|
||||
'LOG_USER_GENERAL' => '%s',
|
||||
'LOG_USER_GENERAL' => '<strong>Entry added:</strong><br />%s',
|
||||
'LOG_USER_INACTIVE_USER' => '<strong>User account de-activated</strong>',
|
||||
'LOG_USER_LOCK' => '<strong>User locked own topic</strong><br />» %s',
|
||||
'LOG_USER_MOVE_POSTS_USER' => '<strong>Moved all posts to forum</strong>» %s',
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ $lang = array_merge($lang, array(
|
|||
'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them.',
|
||||
'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
|
||||
'WARNING_PM_SUBJECT' => 'Board warning issued',
|
||||
'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s.',
|
||||
'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s .',
|
||||
'WARNINGS_ZERO_TOTAL' => 'No warnings exist.',
|
||||
|
||||
'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s.',
|
||||
|
|
|
|||
|
|
@ -450,7 +450,7 @@ $bbcode_status = ($config['allow_bbcode'] && $auth->acl_get('f_bbcode', $forum_i
|
|||
$smilies_status = ($bbcode_status && $config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? true : false;
|
||||
$img_status = ($bbcode_status && $auth->acl_get('f_img', $forum_id)) ? true : false;
|
||||
$url_status = ($config['allow_post_links']) ? true : false;
|
||||
$flash_status = ($bbcode_status && $auth->acl_get('f_flash', $forum_id)) ? true : false;
|
||||
$flash_status = ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $config['allow_post_flash']) ? true : false;
|
||||
$quote_status = ($auth->acl_get('f_reply', $forum_id)) ? true : false;
|
||||
|
||||
// Save Draft
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@
|
|||
|
||||
<!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email -->
|
||||
|
||||
<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="1" /><param name="loop" value="1" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="1" loop="1" quality="high" allowscriptaccess="never"></embed></object><!-- END flash -->
|
||||
<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="none" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allowNetworking="none"></embed></object><!-- END flash -->
|
||||
|
|
@ -59,10 +59,11 @@
|
|||
<!-- BEGIN flash -->
|
||||
<object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}">
|
||||
<param name="movie" value="{URL}" />
|
||||
<param name="play" value="true" />
|
||||
<param name="loop" value="true" />
|
||||
<param name="play" value="false" />
|
||||
<param name="loop" value="false" />
|
||||
<param name="quality" value="high" />
|
||||
<param name="allowScriptAccess" value="never" />
|
||||
<embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never"></embed>
|
||||
<param name="allowNetworking" value="none" />
|
||||
<embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allowNetworking="none" ></embed>
|
||||
</object>
|
||||
<!-- END flash -->
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue