mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)
- fixed forum editing and parent id selection - completely removed HTML support (it only creates security problems) - changed cache_moderators() to reflect permission changes git-svn-id: file:///svn/phpbb/trunk@5603 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
@@ -71,7 +71,6 @@ $lang = array_merge($lang, array(
|
||||
'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity',
|
||||
|
||||
'ALLOW_MASS_PM' => 'Allow Mass PM\'s',
|
||||
'ALLOW_HTML_PM' => 'Allow HTML in private messages',
|
||||
'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages',
|
||||
'ALLOW_SMILIES_PM' => 'Allow smilies in private messages',
|
||||
'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages',
|
||||
@@ -330,7 +329,7 @@ $lang = array_merge($lang, array(
|
||||
|
||||
// Board defaults
|
||||
$lang = array_merge($lang, array(
|
||||
'ACP_BOARD_DEFAULTS_EXPLAIN' => 'These settings allow you to define a number of default or global settings used by the board. For example, to disable the use of HTML across the entire board alter the relevant setting below. This data is also used for new user registrations and (where relevant) guest users. Please note that registered users can override some of these options with their own settings.',
|
||||
'ACP_BOARD_DEFAULTS_EXPLAIN' => 'These settings allow you to define a number of default or global settings used by the board. This data is also used for new user registrations and (where relevant) guest users. Please note that registered users can override some of these options with their own settings.',
|
||||
'DEFAULT_STYLE' => 'Default Style',
|
||||
'OVERRIDE_STYLE' => 'Override user style',
|
||||
'OVERRIDE_STYLE_EXPLAIN' => 'Replaces users style with the default.',
|
||||
@@ -359,16 +358,12 @@ $lang = array_merge($lang, array(
|
||||
'MIN_RATINGS_EXPLAIN' => 'Number of distinct ratings before users karma is calculated.',
|
||||
'ALLOW_ATTACHMENTS' => 'Allow Attachments',
|
||||
'ALLOW_PM_ATTACHMENTS' => 'Allow Attachments in Private Messages',
|
||||
'ALLOW_HTML' => 'Allow HTML',
|
||||
'ALLOWED_TAGS' => 'Allowed HTML tags',
|
||||
'ALLOWED_TAGS_EXPLAIN' => 'Separate tags with commas.',
|
||||
'ALLOW_BBCODE' => 'Allow BBCode',
|
||||
'ALLOW_SMILIES' => 'Allow Smilies',
|
||||
'ALLOW_SIG' => 'Allow Signatures',
|
||||
'ALLOW_SIG_IMG' => 'Allow use of IMG BBCode Tag in user signatures',
|
||||
'ALLOW_SIG_BBCODE' => 'Allow BBCode in user signatures',
|
||||
'ALLOW_SIG_SMILIES' => 'Allow use of smilies in user signatures',
|
||||
'ALLOW_SIG_HTML' => 'Allow use of HTML in user signatures',
|
||||
'ALLOW_SIG_FLASH' => 'Allow use of FLASH BBCode Tag in user signatures',
|
||||
'ALLOW_NO_CENSORS' => 'Allow Disable of Censors',
|
||||
'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.',
|
||||
|
||||
@@ -110,7 +110,7 @@ $lang = array_merge($lang, array(
|
||||
'ACP_MESSAGE_SETTINGS' => 'Message Settings',
|
||||
'ACP_MODULE_MANAGEMENT' => 'Module Management',
|
||||
'ACP_MOD_LOGS' => 'Moderator Log',
|
||||
'ACP_MOD_ROLES' => 'Mod Roles',
|
||||
'ACP_MOD_ROLES' => 'Moderator Roles',
|
||||
|
||||
'ACP_ORPHAN_ATTACHMENTS' => 'Orphan Attachments',
|
||||
|
||||
@@ -377,18 +377,19 @@ $lang = array_merge($lang, array(
|
||||
'LOG_ERROR_EMAIL' => '<b>Email Error</b><br />» %s',
|
||||
|
||||
'LOG_FORUM_ADD' => '<b>Created new forum</b><br />» %s',
|
||||
'LOG_FORUM_DEL_FORUM' => '<b>Deleted forum</b><br />» %s',
|
||||
'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />» %s',
|
||||
'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />» %s',
|
||||
'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />» %s',
|
||||
'LOG_FORUM_EDIT' => '<b>Edited forum details</b><br />» %s',
|
||||
'LOG_FORUM_MOVE_DOWN' => '<b>Moved forum</b> %s <b>below</b> %s',
|
||||
'LOG_FORUM_MOVE_UP' => '<b>Moved forum</b> %s <b>above</b> %s',
|
||||
'LOG_FORUM_SYNC' => '<b>Re-synchronised forum</b><br />» %s',
|
||||
'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />» %s',
|
||||
'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />» %s',
|
||||
'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />» %s',
|
||||
'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />» %s',
|
||||
'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />» %s',
|
||||
|
||||
'LOG_GROUP_CREATED' => '<b>New usergroup created</b><br />» %s',
|
||||
'LOG_GROUP_DEFAULTS' => '<b>Group made default for members</b><br />» %s',
|
||||
@@ -438,9 +439,9 @@ $lang = array_merge($lang, array(
|
||||
'LOG_F_ROLE_ADD' => '<b>Forum Role added</b><br />» %s',
|
||||
'LOG_F_ROLE_EDIT' => '<b>Forum Role edited</b><br />» %s',
|
||||
'LOG_F_ROLE_REMOVED' => '<b>Forum Role removed</b><br />» %s',
|
||||
'LOG_M_ROLE_ADD' => '<b>Mod Role added</b><br />» %s',
|
||||
'LOG_M_ROLE_EDIT' => '<b>Mod Role edited</b><br />» %s',
|
||||
'LOG_M_ROLE_REMOVED' => '<b>Mod Role removed</b><br />» %s',
|
||||
'LOG_M_ROLE_ADD' => '<b>Moderator Role added</b><br />» %s',
|
||||
'LOG_M_ROLE_EDIT' => '<b>Moderator Role edited</b><br />» %s',
|
||||
'LOG_M_ROLE_REMOVED' => '<b>Moderator Role removed</b><br />» %s',
|
||||
'LOG_U_ROLE_ADD' => '<b>User Role added</b><br />» %s',
|
||||
'LOG_U_ROLE_EDIT' => '<b>User Role edited</b><br />» %s',
|
||||
'LOG_U_ROLE_REMOVED' => '<b>User Role removed</b><br />» %s',
|
||||
|
||||
@@ -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'),
|
||||
|
||||
Reference in New Issue
Block a user