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

- 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

phpBB/language/en/acp/board.php

@@ -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',

phpBB/language/en/acp/common.php

@@ -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>',

phpBB/language/en/acp/permissions_phpbb.php

@@ -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'),

phpBB/language/en/acp/posting.php

@@ -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',
+));
+
 ?>

phpBB/language/en/common.php

@@ -91,6 +91,9 @@ $lang = array_merge($lang, array(
 	'CHANGE'				=> 'Change',
 	'CLICK_VIEW_PRIVMSG'	=> 'Click %sHere%s to visit your Inbox',
 	'CONFIRM'				=> 'Confirm',
+	'CONFIRM_CODE'			=> 'Confirmation code',
+	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as you see it in the image, it is case sensitive, zero has a diagonal line through it.',
+	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
@@ -226,7 +229,11 @@ $lang = array_merge($lang, array(
 	'LOCK_TOPIC'			=> 'Lock Topic',
 	'LOGIN'					=> 'Login',
 	'LOGIN_CHECK_PM'		=> 'Log in to check your private messages',
-	'LOGIN_ERROR'			=> 'You have specified an incorrect username or password. Please check them both and try again. If you continue to have problems please contact a board administrator.',
+	'LOGIN_CONFIRMATION'	=> 'Confirmation of login',
+	'LOGIN_CONFIRM_EXPLAIN'	=> 'To prevent brute forcing accounts the board administrator requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
+	'LOGIN_ERROR_ATTEMPTS'	=> 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now have to additionally confirm the image you see below.',
+	'LOGIN_ERROR_PASSWORD'	=> 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact a board administrator.',
+	'LOGIN_ERROR_USERNAME'	=> 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact a board administrator.',
 	'LOGIN_FORUM'			=> 'To view or post in this forum you must enter a password.',
 	'LOGIN_INFO'			=> 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilies. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
 	'LOGIN_VIEWFORUM'		=> 'The board administrator requires you to be registered and logged in to view this forum.',

phpBB/language/en/email/new_report_pm.txt

@@ -1,17 +0,0 @@
-Subject: PM Report submitted - {SUBJECT}
-Charset: iso-8859-1
-
-Hello {USERNAME},
-
-You are receiving this email because the private message "{SUBJECT}" at {SITENAME} was reported by "{REPORTER}".
-The private message has been put into your inbox for further handling.
-
-Report Reason: {REPORT_REASON}
-
-{REPORT_TEXT}
-
-If you want to view the message and the report, click the following link:
-{U_VIEW_REPORT}
-
-
-{EMAIL_SIG}

phpBB/language/en/email/new_report_post.txt

@@ -1,19 +0,0 @@
-Subject: Report submitted - {SUBJECT}
-Charset: iso-8859-1
-
-Hello {USERNAME},
-
-You are receiving this email because the post "{SUBJECT}" at {SITENAME} was reported by "{REPORTER}".
-
-Report Reason: {REPORT_REASON}
-
-{REPORT_TEXT}
-
-If you want to view the report, click the following link:
-{U_VIEW_REPORT}
-
-If you want to view the reported post click the following link:
-{U_VIEW_POST}
-
-
-{EMAIL_SIG}

phpBB/language/en/mcp.php

@@ -83,6 +83,8 @@ $lang = array_merge($lang, array(
 
 	'IP_INFO'				=> 'IP Information',
 
+	'JUMP_TO'					=> 'Moderate Forum',		// Overwriting the jump to language variable for the mcp jumpbox
+	
 	'LATEST_LOGS'				=> 'Latest 5 logged actions',
 	'LATEST_REPORTED'			=> 'Latest 5 reports',
 	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting for approval',
@@ -175,7 +177,6 @@ $lang = array_merge($lang, array(
 	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to merge the selected posts?',
 	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one',
 	'MERGE_TOPIC_ID'		=> 'Destination topic id',
-	'MESSAGE_REPORTED_SUCCESS'	=> 'This message has been successfully reported',
 	'MOD_OPTIONS'			=> 'Moderator Options',
 	'MORE_INFO'				=> 'Further information',
 	'MOVE_TOPIC_CONFIRM'	=> 'Are you sure you want to move the topic into a new forum?',
@@ -219,6 +220,7 @@ $lang = array_merge($lang, array(
 	'READ_USERNOTES'		=> 'User notes',
 	'READ_WARNINGS'			=> 'User warnings',
 	'REPORTER'				=> 'Reporter',
+	'REPORT_ALREADY_DEALT_WITH'		=> 'This post has already been reported previously and successfully dealt with',
 	'REPORT_TIME'			=> 'Report time',
 	'REPORTS_TOTAL'			=> 'In total there are <b>%d</b> reports to review',
 	'REPORTS_ZERO_TOTAL'	=> 'There are no reports to review',

phpBB/language/en/ucp.php

@@ -80,9 +80,6 @@ $lang = array_merge($lang, array(
 	'CHANGE_PASSWORD_EXPLAIN'	=> 'Must be between %1$d and %2$d characters.',
 	'CLICK_RETURN_FOLDER'		=> 'Click %1$sHere%2$s to return to your "%3$s" Folder',
 	'CONFIRMATION'				=> 'Confirmation of registration',
-	'CONFIRM_CODE'				=> 'Confirmation code',
-	'CONFIRM_CODE_EXPLAIN'		=> 'Enter the code exactly as you see it in the image, it is case sensitive, zero has a diagonal line through it.',
-	'CONFIRM_CODE_WRONG'		=> 'The confirmation code you entered was incorrect.',
 	'CONFIRM_EMAIL'				=> 'Confirm email address',
 	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your email address.',
 	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board administrator requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
@@ -198,8 +195,6 @@ $lang = array_merge($lang, array(
 	'MESSAGE_DELETED'			=> 'Message successfully deleted',
 	'MESSAGE_HISTORY'			=> 'Message History',
 	'MESSAGE_REMOVED_FROM_OUTBOX'	=> 'This message has been removed by it\'s author before it was delivered',
-	'MESSAGE_REPORTED'			=> 'Click to view reports',
-	'MESSAGE_REPORTED_MESSAGE'	=> 'Reported Message',
 	'MESSAGE_STORED'			=> 'The message has been send successfully',
 	'MESSAGES_DELETED'			=> 'Messages successfully deleted',
 	'MOVE_DELETED_MESSAGES_TO'	=> 'Move messages from removed folder to',
@@ -291,9 +286,6 @@ $lang = array_merge($lang, array(
 	'RENAME'					=> 'Rename',
 	'RENAME_FOLDER'				=> 'Rename folder',
 	'REPLIED_MESSAGE'			=> 'Replied to Message',
-	'REPORT_PM'					=> 'Report PM',
-	'REPORT_PM_NOTIFY'			=> 'Send report notifications as PM',
-	'REPORT_PM_NOTIFY_EXPLAIN'	=> 'If enabled, notifications and status updates to new reports get send as PM instead of emailing them.',
 	'RETURN_FOLDER'				=> 'Click %1$sHere%2$s to return to folder',
 	'RETURN_UCP'				=> 'Click %sHere%s to return to the User Control Panel',
 	'RULE_ADDED'				=> 'Rule successfully added',