Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-admin/www/users/merge.tcl	24 May 2005 02:54:59 -0000	1.1.2.1
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	8 Jun 2005 11:11:49 -0000	1.1.2.2
@@ -11,81 +11,67 @@
     context:onevalue
     first_names:onevalue
     last_name:onevalue
+} -validate {
+    if_the_logged_in_user_is_crazy {
+	# Just for security reasons...
+	set current_user_id [ad_conn user_id]
+	if { [string equal $current_user_id $user_id] || [string equal $current_user_id $user_id_from_search] } {
+	    ad_complain "You can't merge yourself"
+	}
+    }
 }
 
-set current_user_id [ad_conn user_id]
-set return_url [ad_conn url]
 set context [list [list "./" "Merge"] "Merge"]
 
-# information of user_id one
+#
+# Information of user_id_one
+#
 if { [db_0or1row one_user_portrait { *SQL* }] } {
     set one_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$user_id"
 } else {
     set one_img_src "/resources/acs-admin/not_available.gif"
 }
 
-
 db_1row one_get_info { *SQL* }
 
 db_multirow -extend {one_item_object_url} one_user_contributions one_user_contributions { *SQL* } {
-    set one_item_object_url "/"
+    set one_item_object_url  "[site_node::get_url_from_object_id $object_id]"
 }
 
-
-if {[db_0or1row one_select_dotlrn_user_info { *SQL* }]} {
-    set one_dotlrn_user_p 1
+set user_id_one_items [callback MergeShowUserInfo -user_id $user_id ]
+if { ![empty_string_p $user_id_one_items] } {
+    set user_id_one_items_html "<ul><li>User Items<ul>"
+    foreach item $user_id_one_items {
+	append user_one_items_html "<li>$item</li>"
+    }
+    append user_id_one_items_html "</ul></li></ul>"
 } else {
-    set one_dotlrn_user_p 0
+    set user_id_one_items_html ""
 }
 
-set one_can_browse_p [dotlrn::user_can_browse_p -user_id $user_id]
-db_multirow one_member_classes one_select_member_classes { *SQL* } {
-    set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $class_instance_id -rel_type $rel_type]
-}    
-db_multirow one_member_clubs one_select_member_clubs { *SQL* } {
-    set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $club_id -rel_type $rel_type]
+#
+# Information of user_id_two
+#
+if { [db_0or1row two_user_portrait { *SQL* }] } {
+    set two_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$user_id_from_search"
+} else {
+    set two_img_src "/resources/acs-admin/not_available.gif"
 }
-db_multirow one_member_subgroups one_select_member_subgroups { *SQL* } {
-    set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
-}
 
-
-# information of user_id two
 db_1row two_get_info { *SQL* }
 
 db_multirow -extend {two_item_object_url} two_user_contributions two_user_contributions { *SQL* } {
-    set two_item_object_url "/"
+    set two_item_object_url "[site_node::get_url_from_object_id $object_id]"
 }
 
-
-
-if { [db_0or1row two_user_portrait { *SQL* }] } {
-    set two_img_src "[subsite::get_element -element url]shared/portrait-bits.tcl?user_id=$user_id_from_search"
+set user_id_two_items [callback MergeShowUserInfo -user_id $user_id_from_search ]
+if { ![empty_string_p $user_id_two_items] } {
+    set user_id_two_items_html "<ul><li>User Items<ul>"
+    foreach item $user_id_two_items {
+	append user_two_items_html "<li>$item</li>"
+    }
+    append user_id_two_items_html "</ul></li></ul>"
 } else {
-    set two_img_src "/resources/acs-admin/not_available.gif"
+    set user_id_two_items_html ""
 }
 
-if {[db_0or1row two_select_dotlrn_user_info { *SQL* }]} {
-    set two_dotlrn_user_p 1
-} else {
-   set two_dotlrn_user_p 0
-}
-
-set two_can_browse_p [dotlrn::user_can_browse_p -user_id $user_id]
-
-
-db_multirow two_member_classes two_select_member_classes { *SQL* } {
-    set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $class_instance_id -rel_type $rel_type]
-}    
-
-db_multirow two_member_clubs two_select_member_clubs { *SQL* } {
-    set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $club_id -rel_type $rel_type]
-}
-db_multirow two_member_subgroups two_select_member_subgroups { *SQL* } {
-    set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
-}
-
-
-
-
-