Index: openacs.org-dev/packages/cms/www/modules/users/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/cms/www/modules/users/index.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/cms/www/modules/users/index.tcl	9 Jul 2002 17:35:04 -0000	1.1.1.1
+++ openacs.org-dev/packages/cms/www/modules/users/index.tcl	8 Oct 2002 15:47:03 -0000	1.1.1.2
@@ -12,23 +12,14 @@
 # Determine if the user has admin privileges on the user module
 set user_id [User::getID]
 set module_id [cm::modules::get_module_id $mount_point]
-template::query check_admin admin_p onevalue "
-  select 
-    cms_permission.permission_p (:module_id, :user_id, 'cm_admin')
-  from
-    dual" -cache "module_permission $module_id $user_id"
+set admin_p [db_string check_admin ""]
 
 if { [string equal $admin_p t] } {
   set admin_url "make-admin?mount_point=$mount_point&parent_id=$parent_id&target_user_id="
 }
 
-template::query check_perm perm_p onevalue "
-  select 
-    cms_permission.permission_p (:module_id, :user_id, 'cm_perm')
-  from
-    dual" -cache "module_permission $module_id $user_id"
+set perm_p [db_string check_perm ""]
 
-
 # Create all the neccessary URL params for passthrough
 set passthrough "mount_point=$mount_point&parent_id=$parent_id"
 set root_id [cm::modules::${mount_point}::getRootFolderID]
@@ -39,20 +30,8 @@
   set current_id $id
 
   # Get info about the current group
-  template::query get_info1 info onerow "
-    select 
-      g.group_id, g.group_name, p.email, p.url,
-      NVL((select 'f' from dual where exists (
-            select 1 from acs_rels 
-              where object_id_one = :id 
-              and rel_type in ('composition_rel', 'membership_rel'))),
-          't') as is_empty 
-    from 
-      groups g, parties p
-    where
-      g.group_id = :id
-    and
-      p.party_id = :id"
+  
+  db_1row get_info1 "" -column_array info
 
   set groups_query [db_map get_groups_1] 
   set users_query [db_map get_users_1] 
@@ -67,34 +46,25 @@
 
 	append state_html $the_pipe
 
-	if { [string equal $row(member_state) $value] } {
+	if { [string equal $member_state $value] } {
 	  append state_html "<b>$value</b>"
 	} else {
-	  append state_html "<a href=\"change-user-state?rel_id=$row(rel_id)&group_id=$id"
+            append state_html "<a href=\"change-user-state?rel_id=${rel_id}&group_id=$id"
 	  append state_html "&new_state=$value&mount_point=$mount_point&parent_id=$id\">"
 	  append state_html "$value</a>"
 	}
 
 	set the_pipe "&nbsp;|&nbsp;"
       }
 
-      set row(state_html) $state_html
     }
 
 } else {
 
   set current_id $module_id
 
   # the everyone party
-  template::query get_info2 info onerow "
-    select
-      party_id group_id, 'All Users' as group_name, 
-      email, url, 'f' as is_empty
-    from
-      parties
-    where
-      party_id = -1
-  "
+  db_1row get_info2 "" -column_array info
 
   #clipboard::get_bookmark_icon $clip $mount_point $info(group_id) info
 
@@ -105,7 +75,8 @@
 }
 
 # Select subgroups, users
-template::query get_subgroups subgroups multirow $groups_query
-template::query get_users users multirow $users_query -eval $users_eval
+db_multirow subgroups get_subgroups $groups_query
+ns_log Notice "users_eval = $users_eval"
+db_multirow -extend state_html users get_users $users_query $users_eval
 
 set return_url [ns_conn url]