Index: user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user.module,v retrieving revision 1.498 diff -u -r1.498 user.module --- user.module 5 Aug 2005 01:18:39 -0000 1.498 +++ user.module 5 Aug 2005 15:21:33 -0000 @@ -1437,7 +1437,7 @@ $form = form_textfield('', 'test', '', 30, 64, t('Enter a host to check if it will be denied or allowed.')); $form .= form_hidden('type', 'host'); $form .= form_submit(t('Check host')); - $output .= form_group(t('Host'), form($form)); + $output .= form_group(t('Host (IP address)'), form($form)); return $output; } @@ -1516,7 +1516,7 @@ function _user_admin_access_form($edit) { $output = '
'. form_radios(t('Access type'), 'status', $edit['status'], array('1' => t('Allow'), '0' => t('Deny'))) .'
'; - $output .= '
'. form_radios(t('Rule type'), 'type', $edit['type'] ? $edit['type'] : 'user', array('user' => t('Username'), 'mail' => t('E-mail'), 'host' => t('Host'))) .'
'; + $output .= '
'. form_radios(t('Rule type'), 'type', $edit['type'] ? $edit['type'] : 'user', array('user' => t('Username'), 'mail' => t('E-mail'), 'host' => t('Host (IP address)'))) .'
'; $output .= '
'. form_textfield(t('Mask'), 'mask', $edit['mask'], 30, 64, '%: '. t('Matches any number of characters, even zero characters') .'.
_: '. t('Matches exactly one character.'), NULL, TRUE) .'
'; return $output; @@ -1787,16 +1787,29 @@ case 'admin/user/create': case 'admin/user/account/create': return t('

This web page allows the administrators to register a new users by hand. Note that you cannot have a user where either the e-mail address or the username match another user in the system.

'); + case strstr($section, 'admin/access/rules/check'): + return t('

Use the forms below to determine if your access rules are working properly.

'); + case strstr($section, 'admin/access/rules/add'): + return t('You may add access rules here. You should note that although access rules can often help get rid of unwanted users, determined individuals can circumvent them.

+

To add a rule, first select the rule and access type. User name and email address bans prevent certain individuals from registering or logging in. Host rules ban access to the entire site from a specific computer on the Internet. Access is denied to any user/computer matching a deny type of rule. An allow rule can be used to override an overly restrictive deny rule. Enter who the rule should apply to in the "Mask" box. +

Example:
To ban the computer located at IP address 123.123.123.123, set the access type to \'Deny\', the rule type to \'Host\' and enter \'123.123.123.123\' into the mask.'); case strstr($section, 'admin/access/rules'): - return t('

Set up username and e-mail address access rules for new accounts. If a username or email address for a new account matches any deny rule, but not an allow rule, then the new account will not be allowed to be created. A host rule is effective for every page view, not just registrations.

'); + return t('

Access rules let you ban selected users and computers. There are three ways of resticting access: +

+ Each of the three kinds of access rules has two types: "Allow" and "Deny." Your site\'s access rules and types are listed here:'); case 'admin/access': - return t('

Permissions let you control what users can do on your site. Each user role (defined on the user roles page) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.

', array('%role' => url('admin/access/roles'))); + return t('

Permissions work together with user roles to let you control what users can do on your site. Each user role has its own set of permissions. For example, you can give users classified as "administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. This allows trusted users to share the administrative burden of running your site. You can also use permissions to let privileged users access special features and content.

', array('%role' => url('admin/access/roles'))); case 'admin/access/roles': - return t('

Roles allow you to fine tune the security and administration of drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".

By default, Drupal comes with two user roles:

+ return t('

Roles work together with user permissions to let you control what users can do on your site. For example, you might give users assigned to the "administrators" role the ability to delete content or let "subscribers" access restricted content. Once a role is created, you assign users to them by editing the user\'s profile. Users given more than one role and will enjoy the combined permissions of each assigned role.

By default, Drupal comes with two user roles:

', array('%permissions' => url('admin/access/permissions'))); +
  • Anonymous user: for users that don\'t have a user account or that are not authenticated.
  • +
  • Authenticated user: automatically assigned to users once they are registered with the site.
  • + + To add a role, enter its name in the text box and click "Add role." To delete or change the name of a role, click "edit."

    ', array('%permissions' => url('admin/access/permissions'))); case 'admin/user/search': return t('

    Enter a simple pattern ("*" may be user as a wildcard match) to search for a username. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda".

    '); case 'admin/modules#description':