Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	22 Mar 2008 18:16:10 -0000	1.10
+++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl	7 Jun 2008 20:28:57 -0000	1.11
@@ -62,6 +62,7 @@
         # We use the privacy level that the user select
         set priv_level $user_level
     }
+    set send_email_url [ad_quotehtml "/shared/send-email?sendto=$user_id&return_url=$return_url"]
     switch $priv_level {
         "4" {
             return "<a href=\"mailto:$email\" title=\"#acs-subsite.Send_email_to_this_user#\">$email</a>"
@@ -71,22 +72,23 @@
             if { $email_image_id != "-1" } {
                 # The user has an email image stored in the content repository
                 set revision_id [content::item::get_latest_revision -item_id $email_image_id]
-                set export_vars "user_id=$user_id&revision_id=$revision_id"
-                set email_image "<a href=\"/shared/send-email?sendto=$user_id&return_url=$return_url\"><img border=0 align=middle src=/shared/email-image-bits.tcl?$export_vars></a>"
+                set img_src [ad_quotehtml "/shared/email-image-bits.tcl?user_id=$user_id&revision_id=$revision_id"]
+                set email_image "<a href=\"$send_email_url\"><img style=\"border:0\" src=\"$img_src\" alt=\"#acs-subsite.Email#\"></a>"
             } else {
                 # Create a new email_image
-                if { [catch { set email_image [email_image::new_item -user_id $user_id -bgcolor $bgcolor -transparent $transparent] } errmsg ] } {
+                if { [catch { set email_image [email_image::new_item -user_id $user_id -return_url $return_url -bgcolor $bgcolor -transparent $transparent] } errmsg ] } {
+                    ns_log Error "email_image::get_user_email failed \n $errmsg"
                     # ImageMagick not present, we protect the email by adding
                     # an image replacing the "@" symbol
                     set email_user [lindex [split $email '@'] 0]
                     set email_domain [lindex [split $email '@'] 1]
-                    set email_image "<a href=\"/shared/send-email?sendto=$user_id&return_url=$return_url\">${email_user}<img border=0 align=middle src=/shared/images/at.gif>${email_domain}</a>"
+                    set email_image "<a href=\"$send_email_url\">${email_user}<img style=\"border:0\" src=\"/shared/images/at.gif\" alt=\"@\">${email_domain}</a>"
                 }
             }
             return $email_image
         }
         "2" {
-            return "<a href=\"/shared/send-email?sendto=$user_id&return_url=$return_url\">\#acs-subsite.Send_email_to_this_user\#</a>"
+            return "<a href=\"$send_email_url\">\#acs-subsite.Send_email_to_this_user\#</a>"
         }
         "1" { 
             #Do not show e-mail
@@ -110,6 +112,7 @@
 
 ad_proc -public email_image::new_item {
     -user_id:required
+    {-return_url ""}
     {-bgcolor ""}
     {-transparent ""}
 } {
@@ -182,9 +185,9 @@
     # Delete the temporary file created by ImageMagick
     catch { file delete  $dest_path } errMsg
     
-    set export_vars "user_id=$user_id&revision_id=$revision_id"
-    set email_image "<a href=\"/shared/send-email?sendto=$user_id\"><img align=middle border=0 \
-                     src=/shared/email-image-bits.tcl?$export_vars></a>"
+    set img_src [ad_quotehtml "/shared/email-image-bits.tcl?user_id=$user_id&revision_id=$revision_id"]
+    set send_email_url [ad_quotehtml "/shared/send-email?sendto=$user_id&return_url=$return_url"]
+    set email_image "<a href=\"$send_email_url\"><img style=\"border:0\" src=\"$img_src\" alt=\"#acs-subsite.Email#\"></a>"
 
     return "$email_image"
 }