? drupal-6.x-dev/sites/default/settings.php Index: drupal-6.x-dev/install.php =================================================================== RCS file: /cvs/drupal/drupal/install.php,v retrieving revision 1.85 diff -u -p -r1.85 install.php --- drupal-6.x-dev/install.php 31 Oct 2007 16:14:15 -0000 1.85 +++ drupal-6.x-dev/install.php 5 Nov 2007 18:03:39 -0000 @@ -887,7 +887,14 @@ function install_configure_form() { $form['admin_account']['account']['name'] = array('#type' => 'textfield', '#title' => st('Username'), '#maxlength' => USERNAME_MAX_LENGTH, - '#description' => st('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.'), + '#description' => st('Only lower cases are allowed; spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.'), + '#required' => TRUE, + '#weight' => -15, + ); + $form['admin_account']['account']['fullname'] = array('#type' => 'textfield', + '#title' => st('Full name'), + '#maxlength' => FULLNAME_MAX_LENGTH, + '#description' => st('Specify your first and last name.'), '#required' => TRUE, '#weight' => -10, ); @@ -961,6 +968,9 @@ function install_configure_form_validate if ($error = user_validate_name($form_state['values']['account']['name'])) { form_error($form['admin_account']['account']['name'], $error); } + if ($error = user_validate_fullname($form_state['values']['account']['fullname'])) { + form_error($form['admin_account']['account']['fullname'], $error); + } if ($error = user_validate_mail($form_state['values']['account']['mail'])) { form_error($form['admin_account']['account']['mail'], $error); } Index: drupal-6.x-dev/includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.710 diff -u -p -r1.710 common.inc --- drupal-6.x-dev/includes/common.inc 4 Nov 2007 21:24:09 -0000 1.710 +++ drupal-6.x-dev/includes/common.inc 5 Nov 2007 18:03:40 -0000 @@ -2810,6 +2810,9 @@ function drupal_common_themes() { 'username' => array( 'arguments' => array('object' => NULL), ), + 'fullname' => array( + 'arguments' => array('object' => NULL), + ), 'progress_bar' => array( 'arguments' => array('percent' => NULL, 'message' => NULL), ), Index: drupal-6.x-dev/includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.393 diff -u -p -r1.393 theme.inc --- drupal-6.x-dev/includes/theme.inc 4 Nov 2007 20:32:34 -0000 1.393 +++ drupal-6.x-dev/includes/theme.inc 5 Nov 2007 18:03:40 -0000 @@ -1660,6 +1660,54 @@ function theme_username($object) { return $output; } +/** + * Format a user full name. + * + * @param $object + * The user object to format, usually returned from user_load(). + * @return + * A string containing an HTML link to the user's page if the passed object + * suggests that this is a site user. Otherwise, only the user full name is returned. + */ +function theme_fullname($object) { + + if ($object->uid && $object->fullname) { + // Shorten the name when it is too long or it will break many tables. + if (drupal_strlen($object->fullname) > 20) { + $fullname = drupal_substr($object->fullname, 0, 15) .'...'; + } + else { + $fullname = $object->fullname; + } + + if (user_access('access user profiles')) { + $output = l($fullname, 'user/'. $object->uid, array('title' => t('View user profile.'))); + } + else { + $output = check_plain($fullname); + } + } + else if ($object->fullname) { + // Sometimes modules display content composed by people who are + // not registered members of the site (e.g. mailing list or news + // aggregator modules). This clause enables modules to display + // the true author of the content. + if (!empty($object->homepage)) { + $output = l($object->fullname, $object->homepage, array('rel' => 'nofollow')); + } + else { + $output = check_plain($object->fullname); + } + + $output .= ' ('. t('not verified') .')'; + } + else { + $output = variable_get('anonymous', t('Anonymous')); + } + + return $output; +} + function theme_progress_bar($percent, $message) { $output = '
'; $output .= '
'; Index: drupal-6.x-dev/modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.291 diff -u -p -r1.291 blog.module --- drupal-6.x-dev/modules/blog/blog.module 4 Nov 2007 15:45:15 -0000 1.291 +++ drupal-6.x-dev/modules/blog/blog.module 5 Nov 2007 18:03:40 -0000 @@ -107,7 +107,7 @@ function blog_form(&$node) { function blog_view($node, $teaser = FALSE, $page = FALSE) { if ($page) { // Breadcrumb navigation - drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("@name's blog", array('@name' => $node->name)), 'blog/'. $node->uid))); + drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("@fullname's blog", array('@fullname' => $node->fullname)), 'blog/'. $node->uid))); } return node_prepare($node, $teaser); } @@ -121,9 +121,9 @@ function blog_link($type, $node = NULL, if ($type == 'node' && $node->type == 'blog') { if (arg(0) != 'blog' || arg(1) != $node->uid) { $links['blog_usernames_blog'] = array( - 'title' => t("@username's blog", array('@username' => $node->name)), + 'title' => t("@fullname's blog", array('@fullname' => $node->fullname)), 'href' => "blog/$node->uid", - 'attributes' => array('title' => t("Read @username's latest blog entries.", array('@username' => $node->name))) + 'attributes' => array('title' => t("Read @fullname's latest blog entries.", array('@fullname' => $node->fullname))) ); } } Index: drupal-6.x-dev/modules/blog/blog.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v retrieving revision 1.3 diff -u -p -r1.3 blog.pages.inc --- drupal-6.x-dev/modules/blog/blog.pages.inc 25 Oct 2007 17:44:38 -0000 1.3 +++ drupal-6.x-dev/modules/blog/blog.pages.inc 5 Nov 2007 18:03:40 -0000 @@ -12,7 +12,7 @@ function blog_page_user($account) { global $user; - drupal_set_title($title = t("@name's blog", array('@name' => $account->name))); + drupal_set_title($title = t("@fullname's blog", array('@fullname' => $account->fullname))); $items = array(); @@ -59,7 +59,7 @@ function blog_page_last() { */ function blog_feed_user($account) { $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.created DESC"), $account->uid, 0, variable_get('feed_default_items', 10)); - $channel['title'] = $account->name ."'s blog"; + $channel['title'] = $account->fullname ."'s blog"; $channel['link'] = url('blog/'. $account->uid, array('absolute' => TRUE)); $items = array(); Index: drupal-6.x-dev/modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.600 diff -u -p -r1.600 comment.module --- drupal-6.x-dev/modules/comment/comment.module 5 Nov 2007 14:25:58 -0000 1.600 +++ drupal-6.x-dev/modules/comment/comment.module 5 Nov 2007 18:03:40 -0000 @@ -1132,7 +1132,7 @@ function comment_validate($edit) { $node = node_load($edit['nid']); if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) > COMMENT_ANONYMOUS_MAYNOT_CONTACT) { if ($edit['name']) { - $taken = db_result(db_query("SELECT COUNT(uid) FROM {users} WHERE LOWER(name) = '%s'", $edit['name'])); + $taken = db_result(db_query("SELECT COUNT(uid) FROM {users} WHERE name = '%s'", strtolower($edit['name']))); if ($taken != 0) { form_set_error('name', t('The name you used belongs to a registered user.')); Index: drupal-6.x-dev/modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.898 diff -u -p -r1.898 node.module --- drupal-6.x-dev/modules/node/node.module 5 Nov 2007 15:14:54 -0000 1.898 +++ drupal-6.x-dev/modules/node/node.module 5 Nov 2007 18:03:41 -0000 @@ -652,7 +652,7 @@ function node_load($param = array(), $re // Retrieve a field list based on the site's schema. $fields = drupal_schema_fields_sql('node', 'n'); $fields = array_merge($fields, drupal_schema_fields_sql('node_revisions', 'r')); - $fields = array_merge($fields, array('u.name', 'u.data')); + $fields = array_merge($fields, array('u.name', 'u.fullname', 'u.data')); $fields = implode(', ', $fields); // rename timestamp field for clarity. $fields = str_replace('r.timestamp', 'r.timestamp AS revision_timestamp', $fields); @@ -2244,7 +2244,7 @@ function node_forms() { function theme_node_submitted($node) { return t('Submitted by !username on @datetime', array( - '!username' => theme('username', $node), + '!username' => theme('fullname', $node), '@datetime' => format_date($node->created), )); } Index: drupal-6.x-dev/modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.169 diff -u -p -r1.169 system.install --- drupal-6.x-dev/modules/system/system.install 4 Nov 2007 16:39:59 -0000 1.169 +++ drupal-6.x-dev/modules/system/system.install 5 Nov 2007 18:03:42 -0000 @@ -251,7 +251,7 @@ function system_install() { // presumed to be a serialized array. Install will change uid 1 immediately // anyways. So we insert the superuser here, the uid is 2 here for now, but // very soon it will be changed to 1. - db_query("INSERT INTO {users} (name, mail, created, data) VALUES('%s', '%s', %d, '%s')", 'placeholder-for-uid-1', 'placeholder-for-uid-1', time(), serialize(array())); + db_query("INSERT INTO {users} (name, fullname, mail, created, data) VALUES('%s', '%s', '%s', %d, '%s')", 'placeholder-for-uid-1', 'placeholder-for-uid-1', 'placeholder-for-uid-1', time(), serialize(array())); // This sets the above two users to 1 -1 = 0 (anonymous) and // 2- 1 = 1 (superuser). We skip uid 2 but that's not a big problem. db_query('UPDATE {users} SET uid = uid - 1'); Index: drupal-6.x-dev/modules/tracker/tracker.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v retrieving revision 1.3 diff -u -p -r1.3 tracker.pages.inc --- drupal-6.x-dev/modules/tracker/tracker.pages.inc 7 Oct 2007 19:25:57 -0000 1.3 +++ drupal-6.x-dev/modules/tracker/tracker.pages.inc 5 Nov 2007 18:03:42 -0000 @@ -34,14 +34,14 @@ function tracker_page($uid = 0) { // TODO: These queries are very expensive, see http://drupal.org/node/105639 if ($uid) { - $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_updated DESC'; + $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, u.fullname, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_updated DESC'; $sql = db_rewrite_sql($sql); $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)'; $sql_count = db_rewrite_sql($sql_count); $result = pager_query($sql, 25, 0, $sql_count, COMMENT_PUBLISHED, $uid, $uid); } else { - $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_updated DESC'; + $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, u.fullname, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_updated DESC'; $sql = db_rewrite_sql($sql); $sql_count = 'SELECT COUNT(n.nid) FROM {node} n WHERE n.status = 1'; $sql_count = db_rewrite_sql($sql_count); @@ -64,7 +64,7 @@ function tracker_page($uid = 0) { $rows[] = array( node_get_types('name', $node->type), l($node->title, "node/$node->nid") .' '. theme('mark', node_mark($node->nid, $node->changed)), - theme('username', $node), + theme('fullname', $node), array('class' => 'replies', 'data' => $comments), t('!time ago', array('!time' => format_interval(time() - $node->last_updated))) ); Index: drupal-6.x-dev/modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.8 diff -u -p -r1.8 user.admin.inc --- drupal-6.x-dev/modules/user/user.admin.inc 27 Oct 2007 15:28:43 -0000 1.8 +++ drupal-6.x-dev/modules/user/user.admin.inc 5 Nov 2007 18:03:42 -0000 @@ -132,6 +132,7 @@ function user_admin_account() { $header = array( array(), array('data' => t('Username'), 'field' => 'u.name'), + array('data' => t('Full name'), 'field' => 'u.fullname'), array('data' => t('Status'), 'field' => 'u.status'), t('Roles'), array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'), @@ -139,7 +140,7 @@ function user_admin_account() { t('Operations') ); - $sql = 'SELECT DISTINCT u.uid, u.name, u.status, u.created, u.access FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid '. $filter['join'] .' WHERE u.uid != 0 '. $filter['where']; + $sql = 'SELECT DISTINCT u.uid, u.name, u.fullname, u.status, u.created, u.access FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid '. $filter['join'] .' WHERE u.uid != 0 '. $filter['where']; $sql .= tablesort_sql($header); $result = pager_query($sql, 50, 0, NULL, $filter['args']); @@ -171,6 +172,7 @@ function user_admin_account() { while ($account = db_fetch_object($result)) { $accounts[$account->uid] = ''; $form['name'][$account->uid] = array('#value' => theme('username', $account)); + $form['fullname'][$account->uid] = array('#value' => theme('fullname', $account)); $form['status'][$account->uid] = array('#value' => $status[$account->status]); $users_roles = array(); $roles_result = db_query('SELECT rid FROM {users_roles} WHERE uid = %d', $account->uid); @@ -912,6 +914,7 @@ function theme_user_admin_account($form) $header = array( theme('table_select_header_cell'), array('data' => t('Username'), 'field' => 'u.name'), + array('data' => t('Full name'), 'field' => 'u.fullname'), array('data' => t('Status'), 'field' => 'u.status'), t('Roles'), array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'), @@ -925,6 +928,7 @@ function theme_user_admin_account($form) $rows[] = array( drupal_render($form['accounts'][$key]), drupal_render($form['name'][$key]), + drupal_render($form['fullname'][$key]), drupal_render($form['status'][$key]), drupal_render($form['roles'][$key]), drupal_render($form['member_for'][$key]), Index: drupal-6.x-dev/modules/user/user.install =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.install,v retrieving revision 1.3 diff -u -p -r1.3 user.install --- drupal-6.x-dev/modules/user/user.install 4 Nov 2007 14:33:07 -0000 1.3 +++ drupal-6.x-dev/modules/user/user.install 5 Nov 2007 18:03:42 -0000 @@ -142,6 +142,13 @@ function user_schema() { 'default' => '', 'description' => t('Unique user name.'), ), + 'fullname' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + 'description' => t('User full name.'), + ), 'pass' => array( 'type' => 'varchar', 'length' => 32, @@ -282,3 +289,14 @@ function user_schema() { return $schema; } +/** + * Add a fullname field to users table, folk from name, and convert all stored + * name to lower case. + */ +function user_update_6000() { + $ret = array(); + db_add_field($ret, 'users', 'fullname', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => t('User full name.'))); + $ret[] = update_sql('UPDATE {users} SET fullname = name'); + $ret[] = update_sql('UPDATE {users} SET name = LOWER(name)'); + return $ret; +} Index: drupal-6.x-dev/modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.859 diff -u -p -r1.859 user.module --- drupal-6.x-dev/modules/user/user.module 4 Nov 2007 16:02:32 -0000 1.859 +++ drupal-6.x-dev/modules/user/user.module 5 Nov 2007 18:03:43 -0000 @@ -7,6 +7,7 @@ */ define('USERNAME_MAX_LENGTH', 60); +define('FULLNAME_MAX_LENGTH', 255); define('EMAIL_MAX_LENGTH', 64); /** @@ -144,17 +145,23 @@ function user_load($array = array()) { } foreach ($array as $key => $value) { - if ($key == 'uid' || $key == 'status') { - $query[] = "$key = %d"; - $params[] = $value; - } - else if ($key == 'pass') { - $query[] = "pass = '%s'"; - $params[] = md5($value); - } - else { - $query[]= "LOWER($key) = LOWER('%s')"; - $params[] = $value; + switch ($key) { + case 'uid': + case 'status': + $query[] = "$key = %d"; + $params[] = $value; + break; + case 'pass': + $query[] = "pass = '%s'"; + $params[] = md5($value); + break; + case 'name': + $query[]= "$key = '%s'"; + $params[] = strtolower($value); + break; + default: + $query[]= "LOWER($key) = LOWER('%s')"; + $params[] = $value; } } $result = db_query('SELECT * FROM {users} u WHERE '. implode(' AND ', $query), $params); @@ -212,7 +219,12 @@ function user_save($account, $array = ar if (in_array($key, $user_fields)) { // Save standard fields $query .= "$key = '%s', "; - $v[] = $value; + if ($key == 'name') { + $v[] = strtolower($value); + } + else { + $v[] = $value; + } } else if ($key != 'roles') { // Roles is a special case: it used below. @@ -287,6 +299,11 @@ function user_save($account, $array = ar $values[] = $value; $s[] = "%d"; break; + case 'name': + $fields[] = $key; + $values[] = strtolower($value); + $s[] = "'%s'"; + break; default: if (substr($key, 0, 4) !== 'auth' && in_array($key, $user_fields)) { $fields[] = $key; @@ -361,11 +378,20 @@ function user_validate_name($name) { '\x{0}]/u', // NULL byte $name)) { return t('The username contains an illegal character.'); - } + } + if ($name != strtolower($name)) return t('The username contains an illegal character.'); if (strpos($name, '@') !== FALSE && !eregi('@([0-9a-z](-?[0-9a-z])*.)+[a-z]{2}([zmuvtg]|fo|me)?$', $name)) return t('The username is not a valid authentication ID.'); if (strlen($name) > USERNAME_MAX_LENGTH) return t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => USERNAME_MAX_LENGTH)); } +/** + * Verify the syntax of the given full name. + */ +function user_validate_fullname($fullname) { + if (!strlen($fullname)) return t('You must enter a full name.'); + if (strlen($fullname) > FULLNAME_MAX_LENGTH) return t('The full name %fullname is too long: it must be %max characters or less.', array('%fullname' => $name, '%max' => FULLNAME_MAX_LENGTH)); +} + function user_validate_mail($mail) { if (!$mail) return t('You must enter an e-mail address.'); if (!valid_email_address($mail)) { @@ -479,7 +505,7 @@ function user_access($string, $account = * @return boolean TRUE for blocked users, FALSE for active */ function user_is_blocked($name) { - $deny = db_fetch_object(db_query("SELECT name FROM {users} WHERE status = 0 AND name = LOWER('%s')", $name)); + $deny = db_fetch_object(db_query("SELECT name FROM {users} WHERE status = 0 AND name = '%s'", $name)); return $deny; } @@ -536,13 +562,13 @@ function user_search($op = 'search', $ke $keys = preg_replace('!\*+!', '%', $keys); if (user_access('administer users')) { // Administrators can also search in the otherwise private email field. - $result = pager_query("SELECT name, uid, mail FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%') OR LOWER(mail) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys, $keys); + $result = pager_query("SELECT name, uid, mail FROM {users} WHERE name LIKE '%%%s%%' OR mail LIKE '%%%s%%'", 15, 0, NULL, strtolower($keys), strtolower($keys)); while ($account = db_fetch_object($result)) { $find[] = array('title' => $account->name .' ('. $account->mail .')', 'link' => url('user/'. $account->uid, array('absolute' => TRUE))); } } else { - $result = pager_query("SELECT name, uid FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys); + $result = pager_query("SELECT name, uid FROM {users} WHERE name LIKE '%%%s%%'", 15, 0, NULL, strtolower($keys)); while ($account = db_fetch_object($result)) { $find[] = array('title' => $account->name, 'link' => url('user/'. $account->uid, array('absolute' => TRUE))); } @@ -696,7 +722,7 @@ function user_block($op = 'list', $delta case 1: if ($menu = menu_tree()) { - $block['subject'] = $user->uid ? check_plain($user->name) : t('Navigation'); + $block['subject'] = $user->uid ? check_plain($user->fullname) : t('Navigation'); $block['content'] = $menu; } return $block; @@ -704,7 +730,7 @@ function user_block($op = 'list', $delta case 2: if (user_access('access content')) { // Retrieve a list of new users who have subsequently accessed the site successfully. - $result = db_query_range('SELECT uid, name FROM {users} WHERE status != 0 AND access != 0 ORDER BY created DESC', 0, variable_get('user_block_whois_new_count', 5)); + $result = db_query_range('SELECT uid, name, fullname FROM {users} WHERE status != 0 AND access != 0 ORDER BY created DESC', 0, variable_get('user_block_whois_new_count', 5)); while ($account = db_fetch_object($result)) { $items[] = $account; } @@ -723,7 +749,7 @@ function user_block($op = 'list', $delta // Perform database queries to gather online user lists. We use s.timestamp // rather than u.access because it is much faster. $anonymous_count = sess_count($interval); - $authenticated_users = db_query('SELECT DISTINCT u.uid, u.name, s.timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= %d AND s.uid > 0 ORDER BY s.timestamp DESC', $interval); + $authenticated_users = db_query('SELECT DISTINCT u.uid, u.name, u.fullname, s.timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= %d AND s.uid > 0 ORDER BY s.timestamp DESC', $interval); $authenticated_count = 0; $max_users = variable_get('user_block_max_list_count', 10); $items = array(); @@ -800,7 +826,7 @@ function template_preprocess_user_pictur function theme_user_list($users, $title = NULL) { if (!empty($users)) { foreach ($users as $user) { - $items[] = theme('username', $user); + $items[] = theme('fullname', $user); } } return theme('item_list', $items, $title); @@ -1291,10 +1317,17 @@ function user_edit_form(&$form_state, $u '#title' => t('Username'), '#default_value' => $edit['name'], '#maxlength' => USERNAME_MAX_LENGTH, - '#description' => t('Your preferred username; punctuation is not allowed except for periods, hyphens, and underscores.'), + '#description' => t('Your preferred username; only lower cases are allowed; spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.'), '#required' => TRUE, ); } + $form['account']['fullname'] = array('#type' => 'textfield', + '#title' => t('Full name'), + '#default_value' => $edit['fullname'], + '#maxlength' => USERNAME_MAX_LENGTH, + '#description' => t('Specify your first and last name.'), + '#required' => TRUE, + ); $form['account']['mail'] = array('#type' => 'textfield', '#title' => t('E-mail address'), '#default_value' => $edit['mail'], @@ -1369,7 +1402,7 @@ function _user_edit_validate($uid, &$edi if ($error = user_validate_name($edit['name'])) { form_set_error('name', $error); } - else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(name) = LOWER('%s')", $uid, $edit['name'])) > 0) { + else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND name = '%s'", $uid, strtolower($edit['name']))) > 0) { form_set_error('name', t('The name %name is already taken.', array('%name' => $edit['name']))); } else if (drupal_is_denied('user', $edit['name'])) { @@ -1377,11 +1410,16 @@ function _user_edit_validate($uid, &$edi } } + // Validate the full name: + if ($error = user_validate_fullname($edit['fullname'])) { + form_set_error('fullname', $error); + } + // Validate the e-mail address: if ($error = user_validate_mail($edit['mail'])) { form_set_error('mail', $error); } - else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) { + else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND mail = '%s'", $uid, strtolower($edit['mail']))) > 0) { form_set_error('mail', t('The e-mail address %email is already registered. Have you forgotten your password?', array('%email' => $edit['mail'], '@password' => url('user/password')))); } else if (drupal_is_denied('mail', $edit['mail'])) { @@ -2204,7 +2242,7 @@ function user_register() { // Remove form_group around default fields if there are no other groups. if (!$extra) { - foreach (array('name', 'mail', 'pass', 'status', 'roles', 'notify') as $key) { + foreach (array('name', 'fullname', 'mail', 'pass', 'status', 'roles', 'notify') as $key) { if (isset($form['account'][$key])) { $form[$key] = $form['account'][$key]; } Index: drupal-6.x-dev/modules/user/user.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v retrieving revision 1.3 diff -u -p -r1.3 user.pages.inc --- drupal-6.x-dev/modules/user/user.pages.inc 27 Oct 2007 14:01:12 -0000 1.3 +++ drupal-6.x-dev/modules/user/user.pages.inc 5 Nov 2007 18:03:43 -0000 @@ -12,7 +12,7 @@ function user_autocomplete($string = '') { $matches = array(); if ($string) { - $result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string, 0, 10); + $result = db_query_range("SELECT name FROM {users} WHERE name LIKE '%s%%'", strtolower($string), 0, 10); while ($user = db_fetch_object($result)) { $matches[$user->name] = check_plain($user->name); } @@ -150,7 +150,7 @@ function user_logout() { * Menu callback; Displays a user or user profile page. */ function user_view($account) { - drupal_set_title(check_plain($account->name)); + drupal_set_title(check_plain($account->fullname)); // Retrieve all profile fields and attach to $account->content. user_build_content($account); /** @@ -222,7 +222,7 @@ function template_preprocess_user_profil * @see user_edit_submit(). */ function user_edit($account, $category = 'account') { - drupal_set_title(check_plain($account->name)); + drupal_set_title(check_plain($account->fullname)); return drupal_get_form('user_profile_form', $account, $category); } Index: drupal-6.x-dev/themes/garland/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/template.php,v retrieving revision 1.16 diff -u -p -r1.16 template.php --- drupal-6.x-dev/themes/garland/template.php 11 Oct 2007 09:51:29 -0000 1.16 +++ drupal-6.x-dev/themes/garland/template.php 5 Nov 2007 18:03:43 -0000 @@ -82,7 +82,7 @@ function phptemplate_comment_submitted($ function phptemplate_node_submitted($node) { return t('!datetime — !username', array( - '!username' => theme('username', $node), + '!username' => theme('fullname', $node), '!datetime' => format_date($node->created), )); }