defr/drupal/core: modules/user/user.module comparison

comparison modules/user/user.module @ 5:2427550111ae 6.2

Drupal 6.2

author	Franck Deroche <webmaster@defr.org>
date	Tue, 23 Dec 2008 14:30:08 +0100
parents	c1f4ac30525a
children	fff6d4c8c043

comparison

equal deleted inserted replaced

-:d94886ac61a0
+:2427550111ae
 <?php
-// $Id: user.module,v 1.892 2008/02/03 19:23:01 goba Exp $
+// $Id: user.module,v 1.892.2.2 2008/04/09 21:11:51 goba Exp $
 /**
 * @file
 * Enables the user registration and login system.
 */
 // The user is not blocked and logged in at least once.
 ($account->access && $account->status && user_access('access user profiles'))
 );
 }
+/**
+* Access callback for user account editing.
+*/
 function user_edit_access($account) {
 return (($GLOBALS['user']->uid == $account->uid) || user_access('administer users')) && $account->uid > 0;
 }
 function user_load_self($arg) {
 'weight' => -10,
 );
 $items['admin/user/user/create'] = array(
 'title' => 'Add user',
 'page arguments' => array('create'),
+'access arguments' => array('administer users'),
 'type' => MENU_LOCAL_TASK,
 'file' => 'user.admin.inc',
 );
 $items['admin/user/settings'] = array(
 'title' => 'User settings',
 'file' => 'user.admin.inc',
 );
 $items['admin/user/roles/edit'] = array(
 'title' => 'Edit role',
 'page arguments' => array('user_admin_role'),
+'access arguments' => array('administer permissions'),
 'type' => MENU_CALLBACK,
 'file' => 'user.admin.inc',
 );
 $items['admin/user/rules'] = array(
 'title' => 'Access rules',
 'weight' => -10,
 );
 $items['admin/user/rules/add'] = array(
 'title' => 'Add rule',
 'page callback' => 'user_admin_access_add',
+'access arguments' => array('administer permissions'),
 'type' => MENU_LOCAL_TASK,
 'file' => 'user.admin.inc',
 );
 $items['admin/user/rules/check'] = array(
 'title' => 'Check rules',
 'page callback' => 'user_admin_access_check',
+'access arguments' => array('administer permissions'),
 'type' => MENU_LOCAL_TASK,
 'file' => 'user.admin.inc',
 );
 $items['admin/user/rules/edit'] = array(
 'title' => 'Edit rule',
 'page callback' => 'user_admin_access_edit',
+'access arguments' => array('administer permissions'),
 'type' => MENU_CALLBACK,
 'file' => 'user.admin.inc',
 );
 $items['admin/user/rules/delete'] = array(
 'title' => 'Delete rule',
 'page callback' => 'drupal_get_form',
 'page arguments' => array('user_admin_access_delete_confirm'),
+'access arguments' => array('administer permissions'),
 'type' => MENU_CALLBACK,
 'file' => 'user.admin.inc',
 );
 $items['logout'] = array(
 'page callback' => 'user_logout',
 'weight' => 10,
 'file' => 'user.pages.inc',
 );
-$items['user/%user_current'] = array(
+$items['user/%user_uid_optional'] = array(
 'title' => 'My account',
 'title callback' => 'user_page_title',
 'title arguments' => array(1),
 'page callback' => 'user_view',
 'page arguments' => array(1),
 $items['user/%user_category/edit/'. $category['name']] = array(
 'title callback' => 'check_plain',
 'title arguments' => array($category['title']),
 'page callback' => 'user_edit',
 'page arguments' => array(1, 3),
-'access callback' => isset($category['access callback']) ? $category['access callback'] : TRUE,
+'access callback' => isset($category['access callback']) ? $category['access callback'] : 'user_edit_access',
-'access arguments' => isset($category['access arguments']) ? $category['access arguments'] : array(),
+'access arguments' => isset($category['access arguments']) ? $category['access arguments'] : array(1),
 'type' => MENU_LOCAL_TASK,
 'weight' => $category['weight'],
 'load arguments' => array('%map', '%index'),
 'tab_parent' => 'user/%/edit',
 'file' => 'user.pages.inc',
 function user_init() {
 drupal_add_css(drupal_get_path('module', 'user') .'/user.css', 'module');
 }
-function user_current_load($arg) {
+function user_uid_optional_load($arg) {
-return user_load($arg ? $arg : $GLOBALS['user']->uid);
+return user_load(isset($arg) ? $arg : $GLOBALS['user']->uid);
 }
 /**
 * Return a user object after checking if any profile category in the path exists.
 */
 }
 /**
 * Returns the user id of the currently logged in user.
 */
-function user_current_to_arg($arg) {
+function user_uid_optional_to_arg($arg) {
 // Give back the current user uid when called from eg. tracker, aka.
 // with an empty arg. Also use the current user uid when called from
 // the menu with a % for the current account link.
 return empty($arg) || $arg == '%' ? $GLOBALS['user']->uid : $arg;
 }
 /**
 * Form builder; the main user login form.
 *
 * @ingroup forms
 */
-function user_login(&$form_state, $msg = '') {
+function user_login(&$form_state) {
 global $user;
 // If we are already logged on, go to the user page instead.
 if ($user->uid) {
 drupal_goto('user/'. $user->uid);
 }
 // Display login form:
-if ($msg) {
-$form['message'] = array('#value' => '<p>'. check_plain($msg) .'</p>');
-}
 $form['name'] = array('#type' => 'textfield',
 '#title' => t('Username'),
 '#size' => 60,
 '#maxlength' => USERNAME_MAX_LENGTH,
 '#required' => TRUE,

Mercurial > defr > drupal > core

comparison modules/user/user.module @ 5:2427550111ae 6.2