Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.52 -r1.53
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	3 Apr 2009 12:13:49 -0000	1.52
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	3 Apr 2009 12:25:08 -0000	1.53
@@ -706,6 +706,7 @@
             Password: %user_password%</msg>
   <msg key="user_add_confirm_email_subject">You have been added as a user to %system_name% at %system_url%</msg>
   <msg key="User_Admin_Page">User Admin Page</msg>
+  <msg key="user_already_member">%users.first_names% %users.last_name% is already a member</msg>
   <msg key="user_email_already_exists">User %user_email% already exists... storing user_id</msg>
   <msg key="user_email_created">User %user_email% created....</msg>
   <msg key="user_has_been_a_member_since">%first_names% %last_name% has been a member of %system_name% since %pretty_creation_date%</msg>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	3 Apr 2009 12:13:49 -0000	1.22
+++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	3 Apr 2009 12:25:08 -0000	1.23
@@ -641,6 +641,7 @@
   <msg key="user_add_confirm_email_body">Ha sido registrado como usuario de %system_name% en %system_url%. Direcci�n de correo: %user_email% Contrase�a: %user_password%</msg>
   <msg key="user_add_confirm_email_subject">Ha sido registrado como usuario de %system_name% en %system_url%</msg>
   <msg key="User_Admin_Page">P�gina de administraci�n de usuarios</msg>
+  <msg key="user_already_member">%users.first_names% %users.last_name% ya es miembro</msg>
   <msg key="user_email_already_exists">El usuario %user_email% ya existe... guardando user_id</msg>
   <msg key="user_email_created">Usuario %user_email% creado...</msg>
   <msg key="user_has_been_a_member_since"> %first_names% %last_name% es miembro de %system_name% desde el d�a %pretty_creation_date%</msg>
Index: openacs-4/packages/dotlrn/www/member-add-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-oracle.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/member-add-oracle.xql	9 Nov 2008 23:29:23 -0000	1.8
+++ openacs-4/packages/dotlrn/www/member-add-oracle.xql	3 Apr 2009 12:25:08 -0000	1.9
@@ -6,17 +6,14 @@
 
     <fullquery name="select_users">
         <querytext>
-            select user_id,
-                   first_names,
-                   last_name,
-                   email
-            from dotlrn_users
-            where lower(last_name) like lower('%' || :search_text || '%')
-            or lower(first_names) like lower('%' || :search_text || '%')
-            or lower(email) like lower('%' || :search_text || '%')
-            and user_id not in (select user_id
-                                from dotlrn_member_rels_full
-                                where community_id = :community_id)
+            select a.user_id, a.first_names, a.last_name, a.email,
+                   case when b.user_id is not null then 1 else 0 end as member_p 
+            from dotlrn_users a 
+            left outer join (select user_id from dotlrn_member_rels_full where community_id = :community_id) b 
+                         on (a.user_id = b.user_id)
+            where lower(a.last_name) like lower('%' || :search_text || '%')
+               or lower(a.first_names) like lower('%' || :search_text || '%')
+               or lower(a.email) like lower('%' || :search_text || '%')
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/member-add-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/member-add-postgresql.xql	8 Aug 2006 21:26:24 -0000	1.4
+++ openacs-4/packages/dotlrn/www/member-add-postgresql.xql	3 Apr 2009 12:25:08 -0000	1.5
@@ -6,17 +6,14 @@
 
     <fullquery name="select_users">
         <querytext>
-            select user_id,
-                   first_names,
-                   last_name,
-                   email
-            from dotlrn_users
-            where lower(last_name) like lower('%' || :search_text || '%')
-            or lower(first_names) like lower('%' || :search_text || '%')
-            or lower(email) like lower('%' || :search_text || '%')
-            and user_id not in (select user_id
-                                from dotlrn_member_rels_full
-                                where community_id = :community_id)
+            select a.user_id, a.first_names, a.last_name, a.email,
+                   case when b.user_id is not null then 1 else 0 end as member_p 
+            from dotlrn_users a 
+            left outer join (select user_id from dotlrn_member_rels_full where community_id = :community_id) b 
+                         on (a.user_id = b.user_id)
+            where lower(a.last_name) like lower('%' || :search_text || '%')
+               or lower(a.first_names) like lower('%' || :search_text || '%')
+               or lower(a.email) like lower('%' || :search_text || '%')
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/member-add.adp	15 May 2007 20:14:25 -0000	1.16
+++ openacs-4/packages/dotlrn/www/member-add.adp	3 Apr 2009 12:25:09 -0000	1.17
@@ -20,21 +20,27 @@
 
 <master>
 <property name="title">#dotlrn.Add_A_Member#</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context;noquote@</property>
 
 <h1>#dotlrn.Add_A_Member#</h1>
 
 <if @users:rowcount@ eq 0>
-     #dotlrn.there_are_no_users_matching#
+  <p>#dotlrn.there_are_no_users_matching#</p>
 </if>
 <else>
-	#dotlrn.lt_The_results_of_your_s#
-</else>
 
-<ul>
-<multiple name="users">
-  <li>
-	<a href="member-add-2?user_id=@users.user_id@&referer=@referer@" title="#dotlrn.add# @users.last_name@, @users.first_names@">@users.last_name@, @users.first_names@ (@users.email@)</a>  
-  </li>
-</multiple>
-</ul>
+    #dotlrn.lt_The_results_of_your_s#
+
+    <ul>
+      <multiple name="users">
+        <li>
+        <if @users.member_p@ true>
+          #dotlrn.user_already_member#
+        </if>
+        <else>
+          <a href="@users.member_add_url@" title="#dotlrn.add# @users.last_name@, @users.first_names@">@users.last_name@, @users.first_names@</a>
+        </else>
+        </li>
+      </multiple>
+    </ul>
+</else>
Index: openacs-4/packages/dotlrn/www/member-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/member-add.tcl	8 Aug 2006 21:26:24 -0000	1.12
+++ openacs-4/packages/dotlrn/www/member-add.tcl	3 Apr 2009 12:25:09 -0000	1.13
@@ -30,10 +30,10 @@
 set community_id [dotlrn_community::get_community_id]
 
 # Just search
-db_multirow users select_users {}
+db_multirow -extend {member_add_url} users select_users {} {
+    set member_add_url [export_vars -base "member-add-2" { user_id referer }]
+}
 
-set context_bar [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.New_User]]
+set context [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.New_User]]
 
-
 ad_return_template
-