Index: advuser.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advuser/advuser.module,v
retrieving revision 1.13.2.8
diff -u -p -r1.13.2.8 advuser.module
--- advuser.module	2 May 2008 19:32:59 -0000	1.13.2.8
+++ advuser.module	15 May 2008 17:21:14 -0000
@@ -150,8 +150,9 @@ function advuser_admin_account() {
     $form['roles'][$account->uid][0] = array('#value' => theme('item_list', $users_roles));
     $form['member_for'][$account->uid] = array('#value' => format_interval(time() - $account->created));
     $form['last_access'][$account->uid] =  array('#value' => $account->access ? t('@time ago', array('@time' => format_interval(time() - $account->access))) : t('never'));
+    profile_load_profile($account);
     foreach(advuser_profile_fields() as $field) {
-      $form[$field->name][$account->uid] = array('#value' => advuser_profile_value($field->fid, $account->uid));
+      $form[$field->name][$account->uid] = array('#value' => profile_view_field($account, $field));
     }
     $fv = l(t('edit'), "user/$account->uid/edit", array(), $destination);
     if ($account->uid != 1) {
Index: advuser_filters.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advuser/Attic/advuser_filters.inc,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 advuser_filters.inc
--- advuser_filters.inc	15 May 2008 17:16:18 -0000	1.1.2.8
+++ advuser_filters.inc	15 May 2008 17:21:14 -0000
@@ -321,8 +321,6 @@ function advuser_filters() {
   );
 
   $roles = advuser_user_roles();
-  //TODO: Add logic to handle the ADVUSER_ADMINISTRATOR_RID being selected.
-  unset ($roles[ADVUSER_ADMINISTRATOR_RID]);
   if (count($roles)) {
     $filters['user_roles'] = array(
       'title' => t('Role'),
@@ -346,6 +344,7 @@ function advuser_filters() {
     $filters[$field->name] = array(
       'title' => check_plain($field->title),
       'type' => $field->type,
+      'class' => $field->name,
       'join' => "LEFT JOIN {profile_fields} pf ON pf.fid = ".$field->fid." LEFT JOIN {profile_values} pv ON pv.fid = pf.fid",
       'where' => "pv.value %op '%s' AND pv.uid = u.uid",
       'options' => $opts,
@@ -492,29 +491,32 @@ function advuser_filter_form_submit($for
  */
 function theme_advuser_filters($form) {
 
-  $output = '<ul class="clear-block">';
+  $output = '<ul>';
   if (sizeof($form['current'])) {
     foreach (element_children($form['current']) as $key) {
-      $output .= '<li>'. drupal_render($form['current'][$key]) .'</li>';
+      $output .= '<li>' . drupal_render($form['current'][$key]) . '</li>';
     }
   }
+  $output .= '</ul>';
 
-  $output .= '<li><dl class="multiselect">'. (sizeof($form['current']) ? '<dt><em>'. drupal_render($form['filters_ops']) .'</em> '. t('where') .'</dt>' : '') .'<dd class="a">';
+  $output .= '<div class="container-inline" id="user-admin-buttons">'. drupal_render($form['buttons']) .'</div>';
+  $output .= '<br/><br/>';
+  $output .= '<table class="multiselect container-inline">';
   foreach (element_children($form['filter']) as $key) {
-    $output .= drupal_render($form['filter'][$key]);
+    $output .= '<tr>';
+    $output .= '<td>' . (sizeof($form['current']) ? drupal_render($form['filters_ops']) : '') . '</td>';
+    $output .= '<td class="a">' . drupal_render($form['filter'][$key]) . '</td>';
+    $output .= '<td>' . $f . drupal_render($form['filters_qops']) . '</td>';
+    $output .= '<td class="b">' . drupal_render($form['status'][$key]) . '</td>';
+    $output .= '</tr>';
   }
-  $output .= '</dd>';
-
-  $output .= '<dt>'. drupal_render($form['filters_qops']) .'</dt><dd class="b">';
 
   foreach (element_children($form['status']) as $key) {
     $output .= drupal_render($form['status'][$key]);
   }
-  $output .= '</dd>';
+  $output .= '</td></tr>';
 
-  $output .= '</dl>';
-  $output .= '<div class="container-inline" id="user-admin-buttons">'. drupal_render($form['buttons']) .'</div>';
-  $output .= '</li></ul>';
+  $output .= '</table>';
 
   return $output;
 }