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

- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)

Browse Source 
- use getenv instead of $_ENV (with $_ENV the case could be wrong)
- permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently)
- implemented max login attempts
- changed the expected return parameters for logins/sessions
- added acp page for editing report/denial reasons
- other fixes here and there


git-svn-id: file:///svn/phpbb/trunk@5622 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-03-12 23:19:55 +00:00
parent f4cfd3665f
commit 9988679d56
58 changed files with 1117 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/acp/board.php
View File

@@ -74,7 +74,6 @@ $lang = array_merge($lang, array(
'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',
'ALLOW_REPORT_PM' => 'Allow reporting of private messages',
'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages',
'ALLOW_PRINT_PM' => 'Allow print view in private messaging',
'ALLOW_EMAIL_PM' => 'Allow emailing private messages',

6
phpBB/language/en/acp/common.php
View File

@@ -104,6 +104,7 @@ $lang = array_merge($lang, array(
'ACP_MANAGE_EXTENSIONS' => 'Manage Extensions',
'ACP_MANAGE_FORUMS' => 'Manage Forums',
'ACP_MANAGE_RANKS' => 'Manage Ranks',
'ACP_MANAGE_REASONS' => 'Manage Report/Denial Reasons',
'ACP_MANAGE_USERS' => 'Manage Users',
'ACP_MASS_EMAIL' => 'Mass Email',
'ACP_MESSAGES' => 'Messages',
@@ -124,6 +125,7 @@ $lang = array_merge($lang, array(
'ACP_PRUNING' => 'Pruning',
'ACP_RANKS' => 'Ranks',
'ACP_REASONS' => 'Report/Denial Reasons',
'ACP_SERVER_CONFIGURATION' => 'Server Configuration',
'ACP_SERVER_SETTINGS' => 'Server Settings',
@@ -458,6 +460,10 @@ $lang = array_merge($lang, array(
'LOG_PRUNE_USER_DEL_DEL' => '<b>Users pruned and posts deleted</b><br />&#187; %s',
'LOG_PRUNE_USER_DEL_ANON' => '<b>Users pruned and posts retained</b><br />&#187; %s',
'LOG_REASON_ADDED' => '<b>Added report/denial reason</b><br />&#187; %s',
'LOG_REASON_REMOVED' => '<b>Removed report/denial reason</b><br />&#187; %s',
'LOG_REASON_UPDATED' => '<b>Updated report/denial reason</b><br />&#187; %s',
'LOG_RESET_DATE' => '<b>Board start date reset</b>',
'LOG_RESET_ONLINE' => '<b>Most users online reset</b>',
'LOG_RESYNC_POSTCOUNTS' => '<b>User postcounts synced</b>',

2
phpBB/language/en/acp/permissions_phpbb.php
View File

@@ -96,7 +96,6 @@ $lang = array_merge($lang, array(
'acl_u_readpm' => array('lang' => 'Can read private messages', 'cat' => 'pm'),
'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
'acl_u_pm_delete' => array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
'acl_u_pm_report' => array('lang' => 'Can report private messages', 'cat' => 'pm'),
'acl_u_pm_forward' => array('lang' => 'Can forward private messages', 'cat' => 'pm'),
'acl_u_pm_emailpm' => array('lang' => 'Can email private messages', 'cat' => 'pm'),
'acl_u_pm_printpm' => array('lang' => 'Can print private messages', 'cat' => 'pm'),
@@ -215,6 +214,7 @@ $lang = array_merge($lang, array(
'acl_a_language' => array('lang' => 'Can manage language packs', 'cat' => 'misc'),
'acl_a_email' => array('lang' => 'Can send mass email', 'cat' => 'misc'),
'acl_a_bots' => array('lang' => 'Can manage bots', 'cat' => 'misc'),
'acl_a_reasons' => array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
# 'acl_a_backup' => array('lang' => 'Can backup database', 'cat' => 'misc'),
# 'acl_a_restore' => array('lang' => 'Can restore database', 'cat' => 'misc'),
# 'acl_a_search' => array('lang' => 'Can re-index search tables', 'cat' => 'misc'),

25
phpBB/language/en/acp/posting.php
View File

@@ -200,4 +200,29 @@ $lang = array_merge($lang, array(
'NO_DISALLOWED' => 'No Disallowed Usernames',
));
// Reasons
$lang = array_merge($lang, array(
'ACP_REASONS_EXPLAIN' => 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
'ADD_NEW_REASON' => 'Add new reason',
'IS_NOT_TRANSLATED' => 'Reason has not been localized',
'IS_TRANSLATED' => 'Reason has been localized',
'NO_REASON' => 'Reason could not be found',
'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.',
'REASON_ADD' => 'Add report/denial reason',
'REASON_ADDED' => 'Report/denial reason successfully added',
'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.',
'REASON_DESCRIPTION' => 'Reason Description',
'REASON_EDIT' => 'Edit report/denial reason',
'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.',
'REASON_REMOVED' => 'Report/denial reason successfully removed',
'REASON_TITLE' => 'Reason Title',
'REASON_UPDATED' => 'Report/denial reason successfully updated',
'USED_IN_REPORTS' => 'Used in reports',
));
?>