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

Remove need for session_ids for "allowed" bots, dump user_founder/user_active in favour of user_type, new user_type, USER_IGNORE

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@4603 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-10-15 17:43:07 +00:00
parent 8661a45de5
commit a47fa4d6ca
21 changed files with 425 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
phpBB/language/en/lang_admin.php
View File

@@ -47,10 +47,6 @@ $lang += array(
'PHP_INFO' => 'PHP Information',
'IM' => 'Jabber Settings',
'GROUP_CAT' => 'Usergroups',
'CREATE' => 'Create',
'GROUP_PREFS' => 'Preferences',
'LOG_CAT' => 'Logging',
'ADMIN_LOGS' => 'Admin Log',
'MOD_LOGS' => 'Moderator Log',
@@ -67,13 +63,18 @@ $lang += array(
'MANAGE_THEME' => 'Themes',
'MANAGE_IMAGESET' => 'Imagesets',
'USER_CAT' => 'Users',
'USER_CAT' => 'Users / Groups',
'BAN_EMAILS' => 'Ban Emails',
'BAN_IPS' => 'Ban IPs',
'BAN_USERS' => 'Ban Usernames',
'DISALLOW' => 'Disallow names',
'RANKS' => 'Ranks',
'PRUNE_USERS' => 'Prune users',
'BOTS' => 'Bots',
'GROUP_MANAGE' => 'Manage groups',
'GROUP_PREFS' => 'Group prefs',
'USER_PERMS' => 'User permissions',
'GROUP_PERMS' => 'Group permissions',
'ADMINISTRATORS' => 'Administrators',
'USERNAMES_EXPLAIN' => 'Place each username on a seperate line',
@@ -221,6 +222,10 @@ $lang += array(
'LOG_EMAIL_ERROR' => '%s',
'LOG_JABBER_ERROR' => '%s',
'LOG_BOT_ADDED' => '<b>New bot added</b><br />&#187; %s',
'LOG_BOT_UPDATED' => '<b>Existing bot updated</b><br />&#187; %s',
'LOG_BOT_DELETE' => '<b>Deleted bot</b><br />&#187; %s',
);
// Index page
@@ -1779,4 +1784,38 @@ $lang += array(
'INST_ERR_FTP_LOGIN' => 'Could not login to ftp server, check your username and password',
);
// Bots
$lang += array(
'BOTS_EXPLAIN' => 'Bots or crawlers are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
'BOT_NAME' => 'Bot name',
'BOT_LAST_VISIT' => 'Last visit',
'BOT_NEVER' => 'Never',
'BOT_ACTIVATE' => 'Activate',
'BOT_DEACTIVATE' => 'Deactivate',
'BOT_ADD' => 'Add bot',
'BOT_EDIT' => 'Edit bots',
'BOT_EDIT_EXPLAIN' => 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.',
'BOT_NAME' => 'Bot name',
'BOT_NAME_EXPLAIN' => 'Used only for your own information.',
'BOT_LANG' => 'Bot language',
'BOT_LANG_EXPLAIN' => 'The language presented to the bot as it browses',
'BOT_STYLE' => 'Bot style',
'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot',
'BOT_ACTIVE' => 'Bot active',
'BOT_AGENT' => 'Agent match',
'BOT_AGENT_EXPLAIN' => 'A string matching the bots browser agent.',
'BOT_IP' => 'Bot IP address',
'BOT_IP_EXPLAIN' => 'Partial matches are allowed, seperate addresses with an apostrophe. A single hostname may be entered instead of an IP.',
'BOT_ADDED' => 'New bot successfully added',
'BOT_UPDATED' => 'Existing bot updated successfully',
'BOT_DELETED' => 'Bot deleted successfully',
'NO_BOT' => 'Found no bot with the specified ID',
'ERR_BOT_NO_MATCHES' => 'You must supply at least one of an agent or IP for this bot match.',
'ERR_BOT_NO_IP' => 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
);
?>

69
phpBB/language/en/lang_main.php
View File

@@ -245,7 +245,7 @@ $lang = array(
'G_INACTIVE' => 'Unapproved Users',
'G_INACTIVE_COPPA' => 'Unapproved COPPA Users',
'G_GUESTS' => 'Guests',
'G_BANNED' => 'Banned Users',
'G_BOTS' => 'Bots',
'NO_NEW_POSTS' => 'No new posts',
'NEW_POSTS' => 'New posts',
@@ -684,7 +684,7 @@ $lang += array(
'DOWNLOAD_COUNTS' => '%d Times', // replace %d with count
);
// ucp
// ucp_main
$lang += array(
'UCP' => 'User Control Panel',
'UCP_OPTIONS' => 'Options',
@@ -733,8 +733,10 @@ $lang += array(
'EMPTY_DRAFT_TITLE' => 'You must enter a draft title',
'EMPTY_DRAFT' => 'You must enter a message to submit your changes',
'BACK_TO_DRAFTS' => 'Back to saved drafts',
);
// ucp_profile
$lang += array(
'UCP_PROFILE' => 'Profile',
'UCP_REG_DETAILS' => 'Registration details',
@@ -763,6 +765,9 @@ $lang += array(
'UCP_JABBER' => 'Jabber Address',
'BIRTHDAY' => 'Birthday',
'BIRTHDAY_EXPLAIN' => 'Setting a year will list your age when it is your birthday.',
'DAY' => 'Day',
'MONTH' => 'Month',
'YEAR' => 'Year',
'UCP_SIGNATURE' => 'Your signature',
'SIGNATURE_NOTICE' => 'Please note that some forums limit the size and content of your signature. Be sure to read any forum or board rules to ensure you comply with them.',
@@ -784,7 +789,8 @@ $lang += array(
'LINK_REMOTE_SIZE' => 'Avatar dimensions',
'LINK_REMOTE_SIZE_EXPLAIN' => 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
'BY' => 'by', // Width by Height
'AVATAR_GALLERY' => 'Select from gallery',
'AVATAR_GALLERY' => 'Local gallery',
'DISPLAY_GALLERY' => 'Display gallery',
'AVATAR_CATEGORY' => 'Category',
'AVATAR_PAGE' => 'Page',
@@ -795,8 +801,10 @@ $lang += array(
'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.',
'PROFILE_UPDATED' => 'Your profile has been updated.',
);
// ucp_register
$lang += array(
'REGISTRATION' => 'Registration',
'COPPA_BIRTHDAY' => 'To continue with the registration procedure please tell us when you were born.',
'UCP_COPPA_BEFORE' => 'Before %s',
@@ -821,61 +829,24 @@ $lang += array(
'COPPA_COMPLIANCE' => 'COPPA Compliance',
'COPPA_EXPLAIN' => 'Please note that clicking submit will create your account. However it cannot be activated until a parent or guardian approves your registration. You will be emailed a copy of the necessary form with details of where to send it.',
'No_user_id_specified' => 'Sorry but that user does not exist',
'Wrong_Profile' => 'You cannot modify a profile that is not your own.',
'Only_one_avatar' => 'Only one type of avatar can be specified',
'File_no_data' => 'The file at the URL you gave contains no data',
'No_connection_URL' => 'A connection could not be made to the URL you gave',
'Incomplete_URL' => 'The URL you entered is incomplete',
'Wrong_remote_avatar_format' => 'The URL of the remote avatar is not valid',
'No_send_account_inactive' => 'Sorry, but your password cannot be retrieved because your account is currently inactive. Please contact the forum administrator for more information',
'Profile_updated' => 'Your profile has been updated',
'Profile_updated_inactive' => 'Your profile has been updated, however you have changed vital details thus your account is now inactive. Check your email to find out how to reactivate your account, or if admin activation is require wait for the administrator to reactivate your account',
'Fields_empty' => 'You must fill in the required fields',
'Avatar_filetype' => 'The avatar filetype must be .jpg, .gif or .png',
'Avatar_filesize' => 'The avatar image file size must be less than %d kB',
'Welcome_subject' => 'Welcome to %s Forums',
'New_account_subject' => 'New user account',
'Account_activated_subject' => 'Account Activated',
'PASSWORD_MISMATCH' => 'The passwords you entered did not match',
'PASSWORD_MISMATCH' => 'The passwords you entered did not match',
'CONFIRM_CODE_WRONG' => 'The confirmation code you entered was incorrect.',
'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password',
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information',
'ACCOUNT_INACTIVE_ADMIN'=> 'Your account has been created. However, this forum requires account activation by the administrator. An email has been sent to them and you will be informed when your account has been activated',
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
'Send_password' => 'Send me a new password',
'Password_updated' => 'A new password has been created, please check your email for details on how to activate it',
'No_email_match' => 'The email address you supplied does not match the one listed for that username',
'New_password_activation' => 'New password activation',
'Password_activated' => 'Your account has been re-activated. To logon please use the password supplied in the email you received',
'COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
);
// ucp_activate
$lang += array(
'Account_active' => 'Your account has now been activated. Thank you for registering',
'Account_active_admin' => 'The account has now been activated',
'Reactivate' => 'Reactivate your account!',
'Already_activated' => 'You have already activated your account',
'Wrong_activation' => 'The activation key you supplied does not match any in the database',
'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering',
'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated',
'PASSWORD_ACTIVATED' => 'Your new password has been activated',
'ALREADY_ACTIVATED' => 'You have already activated your account',
'WRONG_ACTIVATION' => 'The activation key you supplied does not match any in the database',
);
// ucp_remind