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.12 -r1.13
--- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 27 Oct 2014 16:39:45 -0000 1.12
+++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 22 Jun 2015 21:03:12 -0000 1.13
@@ -60,18 +60,18 @@
# 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"]
+ set send_email_url [ns_quotehtml "/shared/send-email?sendto=$user_id&return_url=$return_url"]
switch $priv_level {
"4" {
- return "$email"
+ return [subsr {$email}]
}
"3" {
set email_image_id [email_image::get_related_item_id -user_id $user_id]
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 img_src [ad_quotehtml "/shared/email-image-bits.tcl?user_id=$user_id&revision_id=$revision_id"]
- set email_image ""
+ set img_src [ns_quotehtml "/shared/email-image-bits.tcl?user_id=$user_id&revision_id=$revision_id"]
+ return [subst {}]
} else {
# Create a new email_image
if { [catch { set email_image [email_image::new_item -user_id $user_id -return_url $return_url -bgcolor $bgcolor -transparent $transparent] } errmsg ] } {
@@ -80,13 +80,13 @@
# an image replacing the "@" symbol
set email_user [lindex [split $email '@'] 0]
set email_domain [lindex [split $email '@'] 1]
- set email_image "${email_user}${email_domain}"
+ set email_image [subst {$email_user$email_domain}]
}
}
return $email_image
}
"2" {
- return "\#acs-subsite.Send_email_to_this_user\#"
+ return [subst {#acs-subsite.Send_email_to_this_user#}]
}
"1" {
#Do not show e-mail
@@ -183,7 +183,7 @@
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 ""
+ set email_image [subst {}
return "$email_image"
}