user.module 83.7 KB
Newer Older
Dries's avatar
 
Dries committed
1 2 3 4 5
<?php
// $Id$

/*** Common functions ******************************************************/

Dries's avatar
 
Dries committed
6 7 8 9 10 11 12 13
// we cannot use module_invoke because we need passing by reference
function user_module_invoke($type, &$array, &$user) {
  foreach (module_list() as $module) {
    $function = $module .'_user';
    if(function_exists($function)) $function($type, $array, $user);
  }
}

Dries's avatar
 
Dries committed
14
function user_external_load($authname) {
Dries's avatar
 
Dries committed
15
  $result = db_query("SELECT uid FROM {authmap} WHERE authname = '%s'", $authname);
Dries's avatar
 
Dries committed
16

Dries's avatar
 
Dries committed
17 18
  if ($user = db_fetch_object($result)) {
    return user_load($user);
Dries's avatar
 
Dries committed
19 20 21 22 23 24 25 26 27 28 29
  }
  else {
    return 0;
  }
}

function user_load($array = array()) {
  /*
  ** Dynamically compose a SQL query:
  */

Dries's avatar
 
Dries committed
30 31
  $query = "";

Dries's avatar
 
Dries committed
32 33
  foreach ($array as $key => $value) {
    if ($key == "pass") {
Kjartan's avatar
Kjartan committed
34
      $query .= "u.$key = '". md5($value) ."' AND ";
35
    }
Dries's avatar
 
Dries committed
36
    else {
Dries's avatar
 
Dries committed
37
      $query .= "u.$key = '". check_query($value) ."' AND ";
Dries's avatar
 
Dries committed
38 39
    }
  }
Dries's avatar
 
Dries committed
40
  $result = db_query_range("SELECT u.*, r.name AS role FROM {role} r INNER JOIN {users} u ON r.rid = u.rid WHERE $query u.status < 3", 0, 1);
Dries's avatar
 
Dries committed
41 42

  $user = db_fetch_object($result);
Dries's avatar
 
Dries committed
43
  if ($user->data && $data = unserialize($user->data)) {
Dries's avatar
 
Dries committed
44 45 46 47 48 49
    foreach ($data as $key => $value) {
      if (!isset($user->$key)) {
        $user->$key = $value;
      }
    }
  }
Dries's avatar
 
Dries committed
50

Dries's avatar
 
Dries committed
51 52
  user_module_invoke("load", $array, $user);

Dries's avatar
 
Dries committed
53 54 55 56 57 58 59 60
  return $user;
}

function user_save($account, $array = array()) {
  /*
  ** Dynamically compose a SQL query:
  */

Kjartan's avatar
Kjartan committed
61
  $user_fields = user_fields();
Dries's avatar
 
Dries committed
62
  if ($account->uid) {
Dries's avatar
 
Dries committed
63 64
    user_module_invoke("update", $array, $account);

Dries's avatar
 
Dries committed
65
    $data = unserialize(db_result(db_query("SELECT data FROM {users} WHERE uid = %d", $account->uid)));
Dries's avatar
 
Dries committed
66 67
    foreach ($array as $key => $value) {
      if ($key == "pass") {
Dries's avatar
 
Dries committed
68 69
        $query .= "$key = '%s', ";
        $v[] = md5($value);
Dries's avatar
 
Dries committed
70 71
      }
      else if (substr($key, 0, 4) !== "auth") {
Kjartan's avatar
Kjartan committed
72
        if (in_array($key, $user_fields)) {
Dries's avatar
 
Dries committed
73 74
          // escape '%'s:
          $value = str_replace("%", "%%", $value);
Dries's avatar
 
Dries committed
75 76
          $query .= "$key = '%s', ";
          $v[] = $value;
Dries's avatar
 
Dries committed
77 78 79 80
        }
        else {
          $data[$key] = $value;
        }
Dries's avatar
 
Dries committed
81 82
      }
    }
Dries's avatar
 
Dries committed
83 84
    $query .= "data = '%s', ";
    $v[] = serialize($data);
Dries's avatar
 
Dries committed
85

Dries's avatar
 
Dries committed
86
    db_query("UPDATE {users} SET $query timestamp = %d WHERE uid = %d", array_merge($v, array(time(), $account->uid)));
Dries's avatar
 
Dries committed
87 88 89 90 91

    $user = user_load(array("uid" => $account->uid));
  }
  else {
    $array["timestamp"] = time();
Dries's avatar
 
Dries committed
92
    $array["uid"] = db_next_id("{users}_uid");
Dries's avatar
 
Dries committed
93 94 95 96

    foreach ($array as $key => $value) {
      if ($key == "pass") {
        $fields[] = check_query($key);
Dries's avatar
 
Dries committed
97 98
        $values[] = md5($value);
        $s[] = "'%s'";
Dries's avatar
 
Dries committed
99 100
      }
      else if (substr($key, 0, 4) !== "auth") {
Kjartan's avatar
Kjartan committed
101
        if (in_array($key, $user_fields)) {
Dries's avatar
 
Dries committed
102
          $fields[] = check_query($key);
Dries's avatar
 
Dries committed
103 104
          $values[] = $value;
          $s[] = "'%s'";
Dries's avatar
 
Dries committed
105 106 107 108
        }
        else {
          $data[$key] = $value;
        }
Dries's avatar
 
Dries committed
109 110 111
      }
    }

Dries's avatar
 
Dries committed
112
    $fields[] = "data";
Dries's avatar
 
Dries committed
113 114
    $values[] = serialize($data);
    $s[] = "'%s'";
Dries's avatar
 
Dries committed
115

Dries's avatar
 
Dries committed
116
    db_query("INSERT INTO {users} (". implode(", ", $fields) .") VALUES (". implode(", ", $s) .")", $values);
Dries's avatar
 
Dries committed
117 118

    $user = user_load(array("name" => $array["name"]));
Dries's avatar
 
Dries committed
119 120

    module_invoke_all("user", "insert", $array, $user);
Dries's avatar
 
Dries committed
121 122 123 124 125 126 127 128 129
  }

  foreach ($array as $key => $value) {
    if (substr($key, 0, 4) == "auth") {
      $authmaps[$key] = $value;
    }
  }

  if ($authmaps) {
Dries's avatar
 
Dries committed
130
    user_set_authmaps($user, $authmaps);
Dries's avatar
 
Dries committed
131 132 133 134 135 136 137 138 139 140
  }

  return $user;
}

function user_validate_name($name) {
  /*
  ** Verify the syntax of the given name:
  */

Dries's avatar
 
Dries committed
141
  if (!$name) return t("You must enter a username.");
Dries's avatar
 
Dries committed
142 143
  if (substr($name, 0, 1) == ' ') return t("The username cannot begin with a space.");
  if (substr($name, -1) == ' ') return t("The username cannot end with a space.");
Dries's avatar
 
Dries committed
144
  if (ereg("  ", $name)) return t("The username cannot contain multiple spaces in a row.");
Dries's avatar
 
Dries committed
145 146
  if (ereg('[^ [:alnum:]@_.-]', $name)) return t("The username contains an illegal character.");
  if (ereg('@', $name) && !eregi('@([0-9a-z](-?[0-9a-z])*.)+[a-z]{2}([zmuvtg]|fo|me)?$', $name)) return t("The username is not a valid authentication ID.");
Dries's avatar
 
Dries committed
147
  if (strlen($name) > 56) return t("The username '%name' is too long: it must be less than 56 characters.", array("%name" => $name));
Dries's avatar
 
Dries committed
148 149 150
}

function user_validate_mail($mail) {
Dries's avatar
 
Dries committed
151
  if (!$mail) return t("You must enter an e-mail address.");
Dries's avatar
 
Dries committed
152
  if ($mail && !valid_email_address($mail)) {
Dries's avatar
 
Dries committed
153
    return t("The e-mail address '%mail' is not valid.", array("%mail" => $mail));
Dries's avatar
 
Dries committed
154 155 156
  }
}

157
function user_validate_authmap($account, $authname, $module) {
Dries's avatar
 
Dries committed
158
  $result = db_query("SELECT COUNT(*) from {authmap} WHERE uid != %d AND authname = '%s'", $account->uid, $authname);
Dries's avatar
 
Dries committed
159 160 161 162
  if (db_result($result) > 0) {
    $name = module_invoke($module, "info", "name");
    return t("The %u ID %s is already taken.", array("%u" => ucfirst($name), "%s" => "<i>$authname</i>"));
  }
Dries's avatar
 
Dries committed
163 164
}

Dries's avatar
 
Dries committed
165
function user_password($length = 10) {
Dries's avatar
 
Dries committed
166
  /*
Dries's avatar
 
Dries committed
167
  ** Generate a random alphanumeric password.
Dries's avatar
 
Dries committed
168 169
  */

Dries's avatar
 
Dries committed
170 171 172 173 174 175 176 177 178
  // This variable contains the list of allowable characters for the
  // password.  Note that the number 0 and the letter 'O' have been
  // removed to avoid confusion between the two.  The same is true
  // of 'I' and 1.
  $allowable_characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
  // We see how many characters are in the allowable list:
  $len = strlen($allowable_characters);

  // Seed the random number generator with the microtime stamp:
Dries's avatar
 
Dries committed
179
  mt_srand((double)microtime() * 1000000);
Dries's avatar
 
Dries committed
180 181 182 183 184 185 186 187 188 189 190 191 192

  // Declare the password as a blank string:
  $pass = "";

  // Loop the number of times specified by $length:
  for ($i = 0; $i < $length; $i++) {

    // Each iteration, pick a random character from the
    // allowable string and append it to the password:
    $pass .= $allowable_characters[mt_rand(0, $len - 1)];
  }

  return $pass;
Dries's avatar
 
Dries committed
193 194 195 196
}

function user_access($string) {
  global $user;
Dries's avatar
 
Dries committed
197
  static $perm = 0;
Dries's avatar
 
Dries committed
198

Dries's avatar
 
Dries committed
199
  // User #1 has all priveleges:
Dries's avatar
 
Dries committed
200 201 202 203
  if ($user->uid == 1) {
    return 1;
  }

Dries's avatar
 
Dries committed
204 205 206 207
  /*
  ** To reduce the number of SQL queries, we cache the user's permissions
  ** in a static variable.
  */
Dries's avatar
 
Dries committed
208

Dries's avatar
 
Dries committed
209 210
  if ($perm === 0) {
    $perm = db_result(db_query("SELECT p.perm FROM {role} r, {permission} p WHERE r.rid = p.rid AND r.rid = %d", $user->rid), 0);
Dries's avatar
 
Dries committed
211 212
  }

Dries's avatar
 
Dries committed
213
  return strstr($perm, $string);
Dries's avatar
 
Dries committed
214 215 216 217 218
}

function user_mail($mail, $subject, $message, $header) {
  if (variable_get("smtp_library", "") && file_exists(variable_get("smtp_library", ""))) {
    include_once variable_get("smtp_library", "");
219
    return user_mail_wrapper($mail, $subject, $message, $header);
Dries's avatar
 
Dries committed
220 221
  }
  else {
222 223 224 225 226 227 228
    /*
    ** Note: if you are having problems with sending mail, or mails look wrong
    ** when they are recieved you may have to modify the str_replace to suit
    ** your systems.
    **  - \r\n will work under dos and windows.
    **  - \n will work for linux, unix and BSDs.
    **  - \r will work for macs.
Dries's avatar
 
Dries committed
229 230 231 232 233 234 235 236 237 238 239 240
    **
    ** According to RFC 2646, it's quite rude to not wrap your e-mails:
    **
    ** "The Text/Plain media type is the lowest common denominator of
    ** Internet email, with lines of no more than 997 characters (by
    ** convention usually no more than 80), and where the CRLF sequence
    ** represents a line break [MIME-IMT]."
    **
    ** CRLF === \r\n
    **
    ** http://www.rfc-editor.org/rfc/rfc2646.txt
    **
241
    */
Dries's avatar
 
Dries committed
242 243 244 245
    return mail(
      $mail,
      user_mail_encode($subject),
      str_replace("\r", "", $message),
Dries's avatar
 
Dries committed
246
      "MIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8; format=flowed\nContent-transfer-encoding: 8Bit\n" . $header
Dries's avatar
 
Dries committed
247
    );
Dries's avatar
 
Dries committed
248 249 250
  }
}

Kjartan's avatar
Kjartan committed
251 252 253 254 255
function user_mail_encode($string, $charset = "UTF-8") {
  /*
  ** Used to encodes mail headers that contain non US- ASCII
  ** characters.
  ** http://www.rfc-editor.org/rfc/rfc2047.txt
Kjartan's avatar
Kjartan committed
256 257 258 259 260 261 262 263
  **
  ** Notes:
  **   - The chunks come in groupings of 4 bytes when using base64
  **     encoded.
  **   - trim() is used to ensure that no extra spacing is added by
  **     chunk_split() or preg_replace().
  **   - Using \n as the chunk separator may cause problems on some
  **     systems and may have to be changed to \r\n or \r.
Kjartan's avatar
Kjartan committed
264
  */
Kjartan's avatar
Kjartan committed
265 266 267
  $chunk_size = 75 - 7 - strlen($charset);
  $chunk_size -= $chunk_size % 4;
  $string = trim(chunk_split(base64_encode($string), $chunk_size, "\n"));
Kjartan's avatar
Kjartan committed
268 269
  $string = trim(preg_replace('/^(.*)$/m', " =?$charset?B?\\1?=", $string));
  return $string;
Dries's avatar
 
Dries committed
270 271
}

Dries's avatar
 
Dries committed
272
function user_deny($type, $mask) {
Dries's avatar
 
Dries committed
273 274
  $allow = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = '1' AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask));
  $deny = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = '0' AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask));
Dries's avatar
 
Dries committed
275

Dries's avatar
 
Dries committed
276
  return $deny && !$allow;
Dries's avatar
 
Dries committed
277 278
}

Dries's avatar
 
Dries committed
279 280
function user_fields() {
  static $fields;
Dries's avatar
 
Dries committed
281

Dries's avatar
 
Dries committed
282
  if (!$fields) {
Dries's avatar
 
Dries committed
283
    $result = db_query("SELECT * FROM {users} WHERE uid = 1");
Kjartan's avatar
Kjartan committed
284 285 286
    if (db_num_rows($result)) {
      $fields = array_keys(db_fetch_array($result));
    }
Dries's avatar
 
Dries committed
287 288 289 290
    else {
      // Make sure we return the default fields at least
      $fields = array("uid", "name", "pass", "mail", "mode", "sort", "threshold", "theme", "signature", "timestamp", "status", "timezone", "language", "init", "data", "rid");
    }
Dries's avatar
 
Dries committed
291
  }
Dries's avatar
 
Dries committed
292

Dries's avatar
 
Dries committed
293
  return $fields;
Dries's avatar
 
Dries committed
294 295
}

Dries's avatar
 
Dries committed
296 297 298
/*** Module hooks **********************************************************/

function user_perm() {
Dries's avatar
 
Dries committed
299
  return array("administer users", "access user list");
Dries's avatar
 
Dries committed
300 301 302
}

function user_search($keys) {
Dries's avatar
 
Dries committed
303 304
  $find = array();
  $result = db_query_range("SELECT * FROM {users} WHERE name LIKE '%%%s%%'", $keys, 0, 20);
Dries's avatar
 
Dries committed
305
  while ($account = db_fetch_object($result)) {
Dries's avatar
 
Dries committed
306
    $find[] = array("title" => $account->name, "link" => (strstr(request_uri(), "admin") ? url("admin/user/edit/$account->uid") : url("user/view/$account->uid")), "user" => $account->name);
Dries's avatar
 
Dries committed
307 308 309 310
  }
  return $find;
}

Dries's avatar
 
Dries committed
311
function user_block($op = "list", $delta = 0) {
Dries's avatar
 
Dries committed
312 313
  global $user;

Dries's avatar
 
Dries committed
314
  if ($op == "list") {
Dries's avatar
 
Dries committed
315
     $blocks[0]["info"] = t("User login");
316
     $blocks[1]["info"] = t("Navigation");
317
     $blocks[2]["info"] = t("Who's new");
Dries's avatar
 
Dries committed
318
     $blocks[3]["info"] = t("Who's online");
319

320
     return $blocks;
321 322
  }
  else {
Dries's avatar
 
Dries committed
323 324
    $block = array();

Dries's avatar
 
Dries committed
325 326
    switch ($delta) {
      case 0:
Dries's avatar
 
Dries committed
327

328
        if (!$user->uid) {
Dries's avatar
 
Dries committed
329 330 331 332 333 334 335 336 337
          /*
          ** For usability's sake, avoid showing two login forms on one
          ** page.
          */

          if (arg(0) == "user" && arg(1) != "view") {
            return;
          }

Dries's avatar
 
Dries committed
338 339
          $edit = $_POST["edit"];

Dries's avatar
 
Dries committed
340 341
          $output = "<div class=\"user-login-block\">\n";

342
          /*
Dries's avatar
Dries committed
343 344
          ** Save the referer.  We record where the user came from such
          ** that we/ can redirect him after having completed the login
345 346
          ** form.
          */
Dries's avatar
Dries committed
347

348
          if (empty($edit)) {
Dries's avatar
 
Dries committed
349
            $edit["destination"] = url($_GET["q"]);
350 351
          }
          // NOTE: special care needs to be taken because on pages with forms, such as node and comment submission pages, the $edit variable might already be set.
Dries's avatar
Dries committed
352

Dries's avatar
 
Dries committed
353 354 355
          $form = form_hidden("destination", $edit["destination"]);
          $form .= form_textfield(t("Username"), "name", $edit["name"], 15, 64);
          $form .= form_password(t("Password"), "pass", $pass, 15, 64);
Dries's avatar
 
Dries committed
356 357

          if (variable_get("user_remember", 0) == 0) {
Dries's avatar
 
Dries committed
358
            $form .= form_checkbox(t("Remember me"), "remember_me", 1, 0, 0);
Dries's avatar
 
Dries committed
359 360
          }
          elseif (variable_get("user_remember", 1) == 1) {
Dries's avatar
 
Dries committed
361
            $form .= form_hidden("remember_me", 1);
Dries's avatar
 
Dries committed
362
          }
363

Dries's avatar
 
Dries committed
364 365 366 367 368
          $form .= form_submit(t("Log in"));

          $output .= form($form, "post", url("user/login"));

          $output .= "</div>\n";
Dries's avatar
 
Dries committed
369

Dries's avatar
 
Dries committed
370
          if (variable_get("user_register", 1)) {
Dries's avatar
 
Dries committed
371
            $items[] = l(t("Create new account"), "user/register", array("title" => t("Create a new user account.")));
Dries's avatar
 
Dries committed
372
          }
Dries's avatar
 
Dries committed
373
          $items[] = l(t("Request new password"), "user/password", array("title" => t("Request new password via e-mail.")));
Dries's avatar
 
Dries committed
374

Dries's avatar
 
Dries committed
375
          $output .= theme("item_list", $items);
376

Dries's avatar
 
Dries committed
377
          $block["subject"] = t("User login");
Dries's avatar
 
Dries committed
378
          $block["content"] = "<div class=\"user-login-link\">$output</div>";
Dries's avatar
 
Dries committed
379
        }
Dries's avatar
Dries committed
380
        return $block;
381
      case 1:
Dries's avatar
 
Dries committed
382 383
        if ($menu = menu_tree()) {
           $block["subject"] = $user->uid ? $user->name : t("Navigation");
Dries's avatar
 
Dries committed
384
           $block["content"] = "<div class=\"menu\">". $menu ."</div>";
Dries's avatar
 
Dries committed
385
        }
386
        return $block;
Dries's avatar
 
Dries committed
387
      case 2:
388 389 390
        if (user_access("access content")) {
          $result = db_query_range("SELECT uid, name FROM {users} WHERE status != '0' ORDER BY uid DESC", 0, 5);
          while ($account = db_fetch_object($result)) {
391
            $items[] = format_name($account);
392
          }
Dries's avatar
 
Dries committed
393

Dries's avatar
 
Dries committed
394
          $output = theme("user_list", $items);
Dries's avatar
 
Dries committed
395

396 397 398 399
          $block["subject"] = t("Who's new");
          $block["content"] = $output;
          return $block;
        }
Dries's avatar
 
Dries committed
400 401
      case 3:
        if (user_access("access content")) {
Dries's avatar
 
Dries committed
402 403
          /* count users with activity in the past defined period */
          $time_period = variable_get("user_block_seconds_online", 2700);
Dries's avatar
 
Dries committed
404

Dries's avatar
 
Dries committed
405 406 407 408 409 410 411 412
          /* perform database queries to gather online user lists */
          $guests = db_fetch_object(db_query("SELECT COUNT(DISTINCT sid) AS count FROM {sessions} WHERE timestamp >= %d AND uid = 0", time() - $time_period));
          $users = db_query("SELECT DISTINCT uid, MAX(timestamp) AS max_timestamp FROM {sessions} WHERE timestamp >= %d AND uid != 0 GROUP BY uid ORDER BY max_timestamp DESC", time() - $time_period );
          $total_users = db_affected_rows();

          /* format the output with proper grammar */
          if ($total_users == 1 && $guests->count == 1) {
            $output = t("There is currently %members and %visitors online.", array("%members" => format_plural($total_users, "1 user", "%count users"), "%visitors" => format_plural($guests->count, "1 guest", "%count guests")));
Dries's avatar
 
Dries committed
413 414
          }
          else {
Dries's avatar
 
Dries committed
415 416 417 418
            $output = t("There are currently %members and %visitors online.", array("%members" => format_plural($total_users, "1 user", "%count users"), "%visitors" => format_plural($guests->count, "1 guest", "%count guests")));
          }

          if (user_access("access user list") && $total_users) {
Dries's avatar
 
Dries committed
419

Dries's avatar
 
Dries committed
420
            // Display a list of currently online users
Dries's avatar
 
Dries committed
421
            $max_users = variable_get("user_block_max_list_count", 10);
Dries's avatar
 
Dries committed
422 423
            if ($max_users) {
              $items = array();
Dries's avatar
 
Dries committed
424

Dries's avatar
 
Dries committed
425 426 427 428 429
              while ($max_users-- && $uid = db_fetch_object($users)) {
                $items[] = format_name(user_load(array("uid" => $uid->uid)));
              }

              if ($items) {
Dries's avatar
 
Dries committed
430 431 432
                if (db_fetch_object($users)) {
                  $items[] = "...";
                }
Dries's avatar
 
Dries committed
433 434
                $output .= theme("item_list", $items, t("Online users:"));
              }
Dries's avatar
 
Dries committed
435
            }
Dries's avatar
 
Dries committed
436
          }
Dries's avatar
 
Dries committed
437 438
          $block["subject"] = t("Who's online");
          $block["content"] = $output;
Dries's avatar
 
Dries committed
439
        }
Dries's avatar
 
Dries committed
440
        return $block;
Dries's avatar
 
Dries committed
441 442
    }
  }
443 444
}

Dries's avatar
 
Dries committed
445
function theme_user_list($items, $title = NULL) {
Dries's avatar
 
Dries committed
446
  return theme("item_list", $items, $title);
Dries's avatar
 
Dries committed
447 448
}

Dries's avatar
 
Dries committed
449
function user_link($type) {
Dries's avatar
 
Dries committed
450
  global $user;
Dries's avatar
 
Dries committed
451

Dries's avatar
 
Dries committed
452
  if ($type == "system") {
Dries's avatar
Dries committed
453
    if ($user->uid) {
Dries's avatar
 
Dries committed
454 455 456
      menu("user", t("my account"), "user_page", 8);
      menu("user/edit", t("edit account"), "user_page", 0);
      menu("user/logout", t("log out"), "user_page", 10);
Dries's avatar
Dries committed
457
    }
Dries's avatar
 
Dries committed
458
    else {
Dries's avatar
 
Dries committed
459
      menu("user", t("my account"), "user_page", 8, MENU_HIDE);
Dries's avatar
 
Dries committed
460
    }
Dries's avatar
 
Dries committed
461

Dries's avatar
 
Dries committed
462
    if (user_access("administer users")) {
Dries's avatar
 
Dries committed
463 464 465
      menu("admin/user", t("accounts"), "user_admin", 2);
      menu("admin/user/create", t("new user"), "user_admin", 1);
      menu("admin/user/access", t("access rules"), NULL, 3);
466 467
      menu("admin/user/access/mail", t("e-mail rules"), "user_admin");
      menu("admin/user/access/user", t("name rules"), "user_admin");
Dries's avatar
 
Dries committed
468 469 470
      menu("admin/user/role", t("roles"), "user_admin", 4);
      menu("admin/user/permission", t("permissions"), "user_admin", 5);
      menu("admin/user/search", t("search"), "user_admin", 8);
Dries's avatar
 
Dries committed
471
      menu("admin/user/help", t("help"), "user_help_page", 9);
Dries's avatar
 
Dries committed
472
      menu("admin/user/edit", t("edit user account"), "user_admin", 0, MENU_HIDE);
Dries's avatar
 
Dries committed
473
    }
Dries's avatar
 
Dries committed
474 475 476 477 478
  }
}

/*** Authentication methods ************************************************/

479
function user_get_authname($account, $module) {
Dries's avatar
 
Dries committed
480 481

  /*
482
  **  Called by authentication modules in order to edit/view their authmap information.
Dries's avatar
 
Dries committed
483 484
  */

Dries's avatar
 
Dries committed
485
  $result = db_query("SELECT authname FROM {authmap} WHERE uid = %d AND module = '%s'", $account->uid, $module);
486 487 488
  return db_result($result);
}

Dries's avatar
 
Dries committed
489

490 491 492 493 494 495 496
function user_get_authmaps($authname = NULL) {

  /*
  ** Accepts an user object, $account, or an DA name and returns an
  ** associtive array of modules and DA names. Called at external login.
  */

Dries's avatar
 
Dries committed
497
  $result = db_query("SELECT authname, module FROM {authmap} WHERE authname = '%s'", $authname);
Dries's avatar
 
Dries committed
498 499 500 501 502 503 504 505 506 507 508 509 510 511 512
  if (db_num_rows($result) > 0) {
    while ($authmap = db_fetch_object($result)) {
      $authmaps[$authmap->module] = $authmap->authname;
    }
    return $authmaps;
  }
  else {
    return 0;
  }
}

function user_set_authmaps($account, $authmaps) {
  foreach ($authmaps as $key => $value) {
    $module = explode("_", $key, 2);
    if ($value) {
Dries's avatar
 
Dries committed
513 514 515
      db_query("UPDATE {authmap} SET authname = '%s' WHERE uid = %d AND module = '%s'", $value, $account->uid, $module["1"]);
      if (!db_affected_rows()) {
        db_query("INSERT INTO {authmap} (authname, uid, module) VALUES ('%s', %d, '%s')", $value, $account->uid, $module[1]);
Dries's avatar
 
Dries committed
516 517 518
      }
    }
    else {
Dries's avatar
 
Dries committed
519
      db_query("DELETE FROM {authmap} WHERE uid = %d AND module = '%s'", $account->uid, $module["1"]);
Dries's avatar
 
Dries committed
520 521 522 523 524
    }
  }
}

function user_auth_help_links() {
525
  $links = array();
Dries's avatar
 
Dries committed
526
  foreach (module_list() as $module) {
Dries's avatar
 
Dries committed
527
    if (module_hook($module, "auth")) {
Dries's avatar
 
Dries committed
528
      $links[] = l(module_invoke($module, "info", "name"), "user/help#$module");
Dries's avatar
 
Dries committed
529 530 531 532 533 534 535
    }
  }
  return $links;
}

/*** User features *********************************************************/

Dries's avatar
 
Dries committed
536
function user_login($edit = array(), $msg = "") {
Dries's avatar
 
Dries committed
537
  global $user, $base_url;
Dries's avatar
 
Dries committed
538 539 540 541 542 543

  /*
  ** If we are already logged on, go to the user page instead.
  */

  if ($user->uid) {
Dries's avatar
 
Dries committed
544
    drupal_goto(url("user"));
Dries's avatar
 
Dries committed
545 546 547
  }

  if (user_deny("user", $edit["name"])) {
Dries's avatar
 
Dries committed
548
    $error = t("The name '%s' has been denied access.", array("%s" => $edit["name"]));
Dries's avatar
 
Dries committed
549 550 551 552
  }
  else if ($edit["name"] && $edit["pass"]) {

    /*
Dries's avatar
 
Dries committed
553
    ** Try to log in the user locally:
Dries's avatar
 
Dries committed
554 555
    */

Dries's avatar
 
Dries committed
556
    if (!$user->uid) {
557 558
      $name = $edit["name"];
      $pass = $edit["pass"];
Dries's avatar
 
Dries committed
559 560 561 562 563 564 565 566
      $user = user_load(array("name" => $name, "pass" => $pass, "status" => 1));
    }

    /*
    ** Strip name and server from ID:
    */

    if ($server = strrchr($edit["name"], "@")) {
567 568 569
      $name = substr($edit["name"], 0, strlen($edit["name"]) - strlen($server));
      $server = substr($server, 1);
      $pass = $edit["pass"];
Dries's avatar
 
Dries committed
570
    }
Dries's avatar
 
Dries committed
571

Dries's avatar
 
Dries committed
572
    /*
Dries's avatar
 
Dries committed
573
    ** When possible, determine corresponding external auth source. Invoke
Dries's avatar
 
Dries committed
574
    ** source, and login user if successful:
Dries's avatar
 
Dries committed
575 576
    */

Dries's avatar
 
Dries committed
577
    if (!$user->uid && $server && $result = user_get_authmaps("$name@$server")) {
Dries's avatar
 
Dries committed
578 579
      if (module_invoke(key($result), "auth", $name, $pass, $server)) {
        $user = user_external_load("$name@$server");
Dries's avatar
 
Dries committed
580
        watchdog("user", "external load: $name@$server, module: ". key($result));
Dries's avatar
 
Dries committed
581 582
      }
      else {
Dries's avatar
 
Dries committed
583
        $error = t("Invalid password for %s.", array("%s" => "<i>$name@$server</i>"));
Dries's avatar
 
Dries committed
584 585 586
      }
    }

Dries's avatar
 
Dries committed
587
    /*
Dries's avatar
 
Dries committed
588
    ** Try each external authentication source in series. Register user if
Dries's avatar
 
Dries committed
589
    ** successful.
Dries's avatar
 
Dries committed
590 591
    */

Dries's avatar
 
Dries committed
592
    else if (!$user->uid && $server) {
Dries's avatar
 
Dries committed
593 594 595 596
      foreach (module_list() as $module) {
        if (module_hook($module, "auth")) {
          if (module_invoke($module, "auth", $name, $pass, $server)) {
            if (variable_get("user_register", 1) == 1 && !user_load(array("name" => "$name@$server"))) { //register this new user
Dries's avatar
Dries committed
597
              $user = user_save("", array("name" => "$name@$server", "pass" => user_password(), "init" => "$name@$server", "status" => 1, "authname_$module" => "$name@$server", "rid" => _user_authenticated_id()));
Dries's avatar
 
Dries committed
598
              watchdog("user", "new user: $name@$server ($module ID)", l(t("edit user"), "admin/user/edit/$user->uid"));
Dries's avatar
 
Dries committed
599 600 601 602 603 604 605 606 607 608
              break;
            }
          }
        }
      }
    }

    if ($user->uid) {
      watchdog("user", "session opened for '$user->name'");

Dries's avatar
 
Dries committed
609 610
      // update the user table timestamp noting user has logged in
      db_query("UPDATE {users} SET timestamp = '%d' WHERE uid = '%s'", time(), $user->uid);
Dries's avatar
 
Dries committed
611

Dries's avatar
 
Dries committed
612 613
      user_module_invoke("login", $edit, $user);

Dries's avatar
 
Dries committed
614 615 616 617 618
      /*
      ** If the user wants to be remembered, set the proper cookie such
      ** that the session won't expire.
      */

Dries's avatar
 
Dries committed
619
      $path = preg_replace("/.+\/\/[^\/]+(.*)/", "\$1/", $base_url);
Dries's avatar
 
Dries committed
620
      if ($edit["remember_me"]) {
Dries's avatar
 
Dries committed
621
        setcookie(session_name(), session_id(), time() + 3600 * 24 * 365, $path);
Dries's avatar
 
Dries committed
622
      }
Dries's avatar
 
Dries committed
623
      else {
Dries's avatar
 
Dries committed
624
        setcookie(session_name(), session_id(), FALSE, $path);
Dries's avatar
 
Dries committed
625 626 627
      }

      /*
Dries's avatar
 
Dries committed
628
      ** Redirect the user to the page he logged on from.
Dries's avatar
 
Dries committed
629 630
      */

Dries's avatar
 
Dries committed
631
      drupal_goto($edit["destination"]);
Dries's avatar
 
Dries committed
632 633 634
    }
    else {
      if (!$error) {
Dries's avatar
 
Dries committed
635
        $error = t("Sorry.  Unrecognized username or password.") ." ". l(t("Have you forgotten your password?"), "user/password");
Dries's avatar
 
Dries committed
636 637 638 639 640 641 642 643 644 645 646 647 648 649 650
      }
      if ($server) {
        watchdog("user", "failed login for '$name@$server': $error");
      }
      else {
        watchdog("user", "failed login for '$name': $error");
      }
    }
  }

  /*
  ** Display error message (if any):
  */

  if ($error) {
Dries's avatar
 
Dries committed
651
    $output .= theme("error", $error);
Dries's avatar
 
Dries committed
652 653
  }

Dries's avatar
 
Dries committed
654
  /*
Dries's avatar
 
Dries committed
655
  ** Save the referrer.  We record where the user came from such that we
Dries's avatar
 
Dries committed
656 657 658
  ** can redirect him after having completed the login form.
  */

659
  if (empty($edit)) {
Dries's avatar
 
Dries committed
660
    $edit["destination"] = url($_GET["q"]);
Dries's avatar
 
Dries committed
661 662 663
  }
  $output .= form_hidden("destination", $edit["destination"]);

Dries's avatar
 
Dries committed
664 665 666 667
  /*
  ** Display login form:
  */

Dries's avatar
 
Dries committed
668 669 670
  if ($msg) {
    $output .= "<p>$msg</p>";
  }
Dries's avatar
 
Dries committed
671
  if (count(user_auth_help_links()) > 0) {
Dries's avatar
 
Dries committed
672
    $output .= form_textfield(t("Username"), "name", $edit["name"], 30, 64, t("Enter your %s username, or an ID from one of our affiliates: %a.", array("%s" => variable_get("site_name", "local"), "%a" => implode(", ", user_auth_help_links()))));
Dries's avatar
 
Dries committed
673 674
  }
  else {
Dries's avatar
 
Dries committed
675
    $output .= form_textfield(t("Username"), "name", $edit["name"], 30, 64, t("Enter your %s username.", array("%s" => variable_get("site_name", "local"))));
Dries's avatar
 
Dries committed
676
  }
Dries's avatar
 
Dries committed
677
  $output .= form_password(t("Password"), "pass", $pass, 30, 64, t("Enter the password that accompanies your username."));
678
  $output .= form_checkbox(t("Remember me"), "remember_me", 1, 0, 0);
Dries's avatar
 
Dries committed
679
  $output .= form_submit(t("Log in"));
Dries's avatar
 
Dries committed
680
  $items[] = l(t("Request new password"), "user/password");
681
  if (variable_get("user_register", 1)) {
Dries's avatar
 
Dries committed
682
    $items[] = l(t("Create new account"), "user/register");
683
  }
Dries's avatar
 
Dries committed
684
  $output .= theme("item_list", $items);
Dries's avatar
 
Dries committed
685

Dries's avatar
 
Dries committed
686
  return form($output, "post", url("user"));
Dries's avatar
 
Dries committed
687 688
}

689
function _user_authenticated_id() {
Dries's avatar
 
Dries committed
690
  return db_result(db_query("SELECT rid FROM {role} WHERE name = 'authenticated user'"));
691 692
}

Dries's avatar
 
Dries committed
693 694 695 696 697 698 699 700 701 702 703
function user_logout() {
  global $user;

  if ($user->uid) {
    watchdog("user", "session closed for user '$user->name'");

    /*
    ** Destroy the current session:
    */

    session_destroy();
Dries's avatar
 
Dries committed
704
    module_invoke_all("user", "logout", NULL, $user);
Dries's avatar
 
Dries committed
705 706 707
    unset($user);
  }

Dries's avatar
 
Dries committed
708
  drupal_goto(url());
Dries's avatar
 
Dries committed
709 710 711
}

function user_pass($edit = array()) {
Dries's avatar
 
Dries committed
712 713
  global $base_url;

Kjartan's avatar
Kjartan committed
714
  if ($edit["name"]) {
Dries's avatar
 
Dries committed
715
    $account = db_fetch_object(db_query("SELECT uid, name, mail FROM {users} WHERE status = 1 AND name = '%s'", $edit["name"]));
Dries's avatar
 
Dries committed
716
    if (!$account) $error = t("Sorry. The username <i>%s</i> is not recognized.", array("%s" => $edit["name"]));
717
  }
Kjartan's avatar
Kjartan committed
718
  else if ($edit["mail"]) {
Dries's avatar
 
Dries committed
719
    $account = db_fetch_object(db_query("SELECT uid, name, mail FROM {users} WHERE status = 1 AND mail = '%s'", $edit["mail"]));
Dries's avatar
 
Dries committed
720
    if (!$account) $error = t("Sorry. The e-mail address <i>%s</i> is not recognized.", array("%s" => $edit["mail"]));
Kjartan's avatar
Kjartan committed
721 722
  }
  if ($account) {
Dries's avatar
 
Dries committed
723

724
      $from = variable_get("site_mail", ini_get("sendmail_from"));
Dries's avatar
 
Dries committed
725 726 727 728 729 730 731 732 733 734 735 736
      $pass = user_password();

      /*
      ** Save new password:
      */

      user_save($account, array("pass" => $pass));

      /*
      ** Mail new password:
      */

Dries's avatar
 
Dries committed
737
      $variables = array("%username" => $account->name, "%site" => variable_get("site_name", "drupal"), "%password" => $pass, "%uri" => $base_url, "%uri_brief" => substr($base_url, strlen("http://")), "%mailto" => $account->mail, "%date" => format_date(time()));
Dries's avatar
 
Dries committed
738 739
      $subject = strtr(variable_get("user_mail_pass_subject", _user_mail_text("pass_subject")), $variables);
      $body = strtr(variable_get("user_mail_pass_body", _user_mail_text("pass_body")), $variables);
740
      $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
Dries's avatar
 
Dries committed
741
      $mail_success = user_mail($account->mail, $subject, $body, $headers);
Dries's avatar
 
Dries committed
742

Dries's avatar
 
Dries committed
743 744 745 746 747 748 749 750
      if ($mail_success) {
        watchdog("user", "mail password: '". $account->name ."' &lt;". $account->mail ."&gt;");
        return t("Your password and further instructions have been sent to your e-mail address.");
      }
      else {
        watchdog("error", "error mailing new password: '". $account->name ."' &lt;". $account->mail ."&gt;");
        return t("Unable to send mail. Please contact the site admin.");
      }
Dries's avatar
 
Dries committed
751 752
    }
    else {
753

Kjartan's avatar
Kjartan committed
754 755
    // Display error message if necessary.
    if ($error) {
Dries's avatar
 
Dries committed
756
      $output .= theme("error", $error);
Dries's avatar
 
Dries committed
757 758 759 760 761 762
    }

    /*
    ** Display form:
    */

Dries's avatar
 
Dries committed
763
    $output .= "<p>". sprintf(t("Enter your username %sor%s your e-mail address."), "<b><i>", "</i></b>") ."</p>";
Dries's avatar
 
Dries committed
764 765 766
    $output .= form_textfield(t("Username"), "name", $edit["name"], 30, 64);
    $output .= form_textfield(t("E-mail address"), "mail", $edit["mail"], 30, 64);
    $output .= form_submit(t("E-mail new password"));
Dries's avatar
 
Dries committed
767
    $items[] = l(t("Log in"), "user/login");
768
    if (variable_get("user_register", 1)) {
Dries's avatar
 
Dries committed
769
      $items[] = l(t("Create new account"), "user/register");
770
    }
Dries's avatar
 
Dries committed
771
    $output .= theme("item_list", $items);
Dries's avatar
 
Dries committed
772

Dries's avatar
 
Dries committed
773
    return form($output, "post", url("user"));
Dries's avatar
 
Dries committed
774 775 776 777
  }
}

function user_register($edit = array()) {
Dries's avatar
 
Dries committed
778
  global $user, $base_url;
779 780 781 782 783 784

  /*
  ** If we are already logged on, go to the user page instead.
  */

  if ($user->uid) {
Dries's avatar
 
Dries committed
785
    drupal_goto(url("user/edit"));
786
  }
Dries's avatar
 
Dries committed
787

Dries's avatar
 
Dries committed
788
  if (!(is_null($edit["name"]) && is_null($edit["mail"]))) {
Dries's avatar
 
Dries committed
789 790 791 792 793 794 795
    if ($error = user_validate_name($edit["name"])) {
      // do nothing
    }
    else if ($error = user_validate_mail($edit["mail"])) {
      // do nothing
    }
    else if (user_deny("user", $edit["name"])) {
Dries's avatar
 
Dries committed
796
      $error = t("The name '%s' has been denied access.", array("%s" => $edit["name"]));
Dries's avatar
 
Dries committed
797 798
    }
    else if (user_deny("mail", $edit["mail"])) {
Dries's avatar
 
Dries committed
799
      $error = t("The e-mail address '%s' has been denied access.", array("%s" => $edit["mail"]));
Dries's avatar
 
Dries committed
800
    }
Dries's avatar
 
Dries committed
801
    else if (db_num_rows(db_query("SELECT name FROM {users} WHERE LOWER(name) = LOWER('%s')", $edit["name"])) > 0) {
Dries's avatar
 
Dries committed
802
      $error = t("The name '%s' is already taken.", array("%s" => $edit["name"]));
Dries's avatar
 
Dries committed
803
    }
Dries's avatar
 
Dries committed
804
    else if (db_num_rows(db_query("SELECT mail FROM {users} WHERE LOWER(mail) = LOWER('%s') OR LOWER(init) = LOWER('%s')", $edit["mail"], $edit["mail"])) > 0) {
Dries's avatar
 
Dries committed
805
      $error = t("The e-mail address '%s' is already taken.", array("%s" => $edit["mail"]));
Dries's avatar
 
Dries committed
806
    }
Dries's avatar
 
Dries committed
807
    else if (variable_get("user_register", 1) == 0) {
Dries's avatar
 
Dries committed
808 809 810
      $error = t("Public registrations have been disabled by the site administrator.");
    }
    else {
Dries's avatar
 
Dries committed
811 812 813 814 815 816 817 818 819 820 821 822 823 824 825
      foreach (module_list() as $module) {
        if (module_hook($module, "user")) {
          $result = module_invoke($module, "user", "register_validate", $edit, $user);
          if (is_array($result)) {
            $data = array_merge($data, $result);
          }
          elseif (is_string($result)) {
            $error = $result;
            break;
          }
        }
      }
      if (!$error) {
        $success = 1;
      }
Dries's avatar
 
Dries committed
826 827 828 829 830
    }
  }

  if ($success) {

831
    $from = variable_get("site_mail", ini_get("sendmail_from"));
Dries's avatar
 
Dries committed
832 833
    $pass = user_password();

834
    // create new user account, noting whether administrator approval is required
835 836 837
    user_role_init();
    // TODO: is this necessary? Won't session_write replicate this?
    unset($edit["session"]);
838
    $account = user_save("", array_merge(array("name" => $edit["name"], "pass" => $pass, "init" => $edit["mail"], "mail" => $edit["mail"], "rid" => _user_authenticated_id(), "status" => (variable_get("user_register", 1) == 1 ? 1 : 0)), $data));
Dries's avatar
 
Dries committed
839
    watchdog("user", "new user: '". $edit["name"] ."' &lt;". $edit["mail"] ."&gt;", l(t("edit user"), "admin/user/edit/$account->uid"));
Dries's avatar
 
Dries committed
840

Dries's avatar
 
Dries committed
841
    $variables = array("%username" => $edit["name"], "%site" => variable_get("site_name", "drupal"), "%password" => $pass, "%uri" => $base_url, "%uri_brief" => substr($base_url, strlen("http://")), "%mailto" => $edit["mail"], "%date" => format_date(time()));
842

Dries's avatar
 
Dries committed
843
    //the first user may login immediately, and receives a customized welcome e-mail.
844
    if ($account->uid == 1) {
Dries's avatar
 
Dries committed
845
      user_mail($edit["mail"], t("drupal user account details for %s", array("%s" => $edit["name"])), strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n  username: %username\n  password: %password\n\n". url("user/edit") ."\n\n--drupal"), $variables), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
846
      // This should not be t()'ed. No point as its only shown once in the sites lifetime, and it would be bad to store the password
Dries's avatar
 
Dries committed
847
      $output .= "<p>Welcome to Drupal. You are user #1, which gives you full and immediate access.  All future registrants will receive their passwords via e-mail, so please configure your e-mail settings using the Administration pages.</p><p> Your password is <b>$pass</b>. You may change your password on the next page.</p><p>Please login below.</p>";
Dries's avatar
 
Dries committed
848
      $output .= form_hidden("destination", url("user/edit"));
849
      $output .= form_hidden("name", $account->name);
850 851 852 853 854
      $output .= form_hidden("pass", $pass);
      $output .= form_submit(t("Log in"));
      return form($output);
    }
    else {
855 856 857 858 859
      if ($account->status) {
        /*
        ** Create new user account, no administrator approval required:
        */

Dries's avatar
 
Dries committed
860 861
        $subject = strtr(variable_get("user_mail_welcome_subject", _user_mail_text("welcome_subject")), $variables);
        $body = strtr(variable_get("user_mail_welcome_body", _user_mail_text("welcome_body")), $variables);
862 863 864 865 866 867 868
        user_mail($edit["mail"], $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
        return t("Your password and further instructions have been sent to your e-mail address.");
      }
      else {
        /*
        ** Create new user account, administrator approval required:
        */
Dries's avatar
 
Dries committed
869 870
        $subject = strtr(variable_get("user_mail_approval_subject", _user_mail_text("welcome_approval_subject")), $variables);
        $body = strtr(variable_get("user_mail_approval_body", _user_mail_text("welcome_approval_body")), $variables);
871
        user_mail($edit["mail"], $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
Dries's avatar
 
Dries committed
872
        user_mail(variable_get("site_mail", ini_get("sendmail_from")), $subject, t("%u has applied for an account.\n\n%uri", array("%u" => $account->name, "%uri" => url("admin/user/edit/$account->uid"))), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
Dries's avatar
 
Dries committed
873
        return t("Thank you for applying for an account. Your account is currently pending approval by the site administrator.<br />In the meantime, your password and further instructions have been sent to your e-mail address.");
874
      }
875
    }
Dries's avatar
 
Dries committed
876 877 878
  }
  else {
    if ($error) {
Dries's avatar
 
Dries committed
879
      $output .= theme("error", $error);
Dries's avatar
 
Dries committed
880
    }
881
  }
Dries's avatar
 
Dries committed
882

883
  // display the registration form
884
  $output .= variable_get("user_registration_help", "");
885
  $affiliates = user_auth_help_links();
Dries's avatar
 
Dries committed
886
  if (count($affiliates) > 0) {
887
    $affiliates = implode(", ", $affiliates);
Dries's avatar
 
Dries committed
888
    $output .= "<p>". t("Note: If you have an account with one of our affiliates (%s), you may ". l("login now", "user/login") ." instead of registering.", array("%s" => $affiliates)) ."</p>";
889
  }
Dries's avatar
 
Dries committed
890
  $output .= form_textfield(t("Username"), "name", $edit["name"], 30, 64, t("Your full name or your preferred username: only letters, numbers and spaces are allowed."));
891 892 893 894
  $output .= form_textfield(t("E-mail address"), "mail", $edit["mail"], 30, 64, t("A password and instructions will be sent to this e-mail address, so make sure it is accurate."));
  foreach (module_list() as $module) {
    if (module_hook($module, "user")) {
      $output .= module_invoke($module, "user", "register_form", $edit, $user);
Dries's avatar
 
Dries committed
895
    }
Dries's avatar
 
Dries committed
896
  }
897
  $output .= form_submit(t("Create new account"));
898
  $items[] = l(t("Request new password"), "user/password");
Dries's avatar
 
Dries committed
899
  $items[] = l(t("Log in"), "user/login");
Dries's avatar
 
Dries committed
900
  $output .= theme("item_list", $items);
Kjartan's avatar
Kjartan committed
901

902
  return form($output);
Dries's avatar
 
Dries committed
903 904 905
}

function user_edit($edit = array()) {
Dries's avatar
 
Dries committed
906
  global $user;
Dries's avatar
 
Dries committed
907 908

  if ($user->uid) {
Dries's avatar
 
Dries committed
909
    if (!(is_null($edit["name"]) && is_null($edit["mail"]))) {
Dries's avatar
 
Dries committed
910 911 912 913