Index: forms/advuser_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advuser/forms/Attic/advuser_admin.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 advuser_admin.inc --- forms/advuser_admin.inc 8 Apr 2010 16:37:50 -0000 1.1.2.1 +++ forms/advuser_admin.inc 10 Apr 2010 17:46:00 -0000 @@ -53,6 +53,7 @@ function theme_advuser_admin(&$form) { $header = array( theme('table_select_header_cell'), array('data' => t('Username'), 'field' => 'u.name'), + array('data' => t('Mail'), 'field' => 'u.mail'), array('data' => t('Status'), 'field' => 'u.status'), ); $roles = advuser_user_roles(); @@ -78,6 +79,7 @@ function theme_advuser_admin(&$form) { $row = array( drupal_render($form['accounts'][$key]), drupal_render($form['name'][$key]), + drupal_render($form['mail'][$key]), drupal_render($form['status'][$key]), ); $roles = advuser_user_roles(); Index: forms/advuser_admin_account.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advuser/forms/Attic/advuser_admin_account.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 advuser_admin_account.inc --- forms/advuser_admin_account.inc 8 Apr 2010 16:37:50 -0000 1.1.2.1 +++ forms/advuser_admin_account.inc 10 Apr 2010 17:46:00 -0000 @@ -5,6 +5,7 @@ function advuser_admin_account(&$form_st $header = array( array(), array('data' => t('Username'), 'field' => 'u.name'), + array('data' => t('Mail'), 'field' => 'u.mail'), array('data' => t('Status'), 'field' => 'u.status'), ); $roles = advuser_user_roles(); @@ -20,15 +21,17 @@ function advuser_admin_account(&$form_st $ff = array(); $pf = array(); foreach (advuser_profile_fields() as $field) { - $ff[] = array('data'=>t($field->title), 'field'=>"$field->name.value"); - $pf[] = "LEFT JOIN {profile_values} $field->name ON $field->name.fid = $field->fid AND $field->name.uid = u.uid"; + if (isset($field->name)) { + $ff[] = array('data'=>t($field->title), 'field'=>"$field->name.value"); + $pf[] = "LEFT JOIN {profile_values} $field->name ON $field->name.fid = $field->fid AND $field->name.uid = u.uid"; + } } $header = array_merge($header, $ff); $header[] = t('Operations'); $filter['join'] .= count($pf) ? ' ' . implode(' ', array_unique($pf)) : NULL; - $sql = 'SELECT DISTINCT u.uid, u.name, u.status, u.created, u.access '.$pquery.' 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.mail, u.status, u.created, u.access '.$pquery.' 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); $query_count = 'SELECT COUNT(DISTINCT u.uid) FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid '. $filter['join'] .' WHERE u.uid != 0 '. $filter['where']; @@ -69,6 +72,7 @@ function advuser_admin_account(&$form_st while ($account = db_fetch_object($result)) { $accounts[$account->uid] = ''; $form['name'][$account->uid] = array('#value' => theme('username', $account)); + $form['mail'][$account->uid] = array('#value' => $account->mail); $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);