Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	30 Mar 2013 19:07:24 -0000	1.37
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	27 Oct 2014 16:41:50 -0000	1.38
@@ -31,7 +31,7 @@
         preferred, but if it doesn't exist, we build one using the system URL.
     } {
         set domain [get_parameter -name "EmailDomain"]
-        if { [empty_string_p $domain] } {
+        if { $domain eq "" } {
             # No domain set up, let's use the default from the system info
             # This may not find anything, but at least it's worth a try
             if { ![regexp {^(https?://)?(www\.)?([^/]*)} [ad_url] match ignore ignore domain] } {
@@ -77,7 +77,7 @@
     } {
         Build an object/type-specific e-mail address that the user can reply to.
     } {
-        if {[empty_string_p $object_id] || [empty_string_p $type_id]} {
+        if {$object_id eq "" || $type_id eq ""} {
             return "\"[address_domain] mailer\" <[reply_address_prefix]@[address_domain]>"
         } else {
             return "\"[address_domain] mailer\" <[reply_address_prefix]-$object_id-$type_id@[address_domain]>"
@@ -125,13 +125,13 @@
        # Variable used in the content
        set manage_notifications_url [manage_notifications_url]
 
-       if { [string length $content_html] == 0 } {
+       if { $content_html eq "" } {
            set mime_type "text/plain"
-           append content_text "\n#notifications.lt_Getting_too_much_emai#"
+           append content_text "\n#" "notifications.lt_Getting_too_much_emai#"
            set content $content_text
        } else {
            set mime_type "text/html"
-           append content_html "<p>#notifications.lt_Getting_too_much_emai#</p>"
+           append content_html "<p>#" "notifications.lt_Getting_too_much_emai#</p>"
            set content $content_html
        }
 
@@ -149,7 +149,7 @@
         
        set reply_to [reply_address -object_id $reply_object_id -type_id $notification_type_id]
 
-       if { ![empty_string_p $from_user_id] && $from_user_id != 0 && [db_0or1row get_person {}]} {
+       if { $from_user_id ne "" && $from_user_id != 0 && [db_0or1row get_person {}]} {
            set from_email [cc_email_from_party $from_user_id]
 	   
            # Set the Mail-Followup-To address to the
@@ -261,8 +261,8 @@
 
             # walk through the headers and extract each one
             set is_auto_reply_p 0
-            while {![empty_string_p $line]} {
-                set next_line [lindex $file [expr $i + 1]]
+            while {$line ne ""} {
+                set next_line [lindex $file $i+1]
                 if {[regexp {^[ ]*$} $next_line match] && $i > 0} {
                     set end_of_headers_p 1
                 }
@@ -340,7 +340,7 @@
             set from_user [cc_lookup_email_user $from]
 
             # We don't accept empty users for now
-            if {[empty_string_p $from_user]} {
+            if {$from_user eq ""} {
                 ns_log debug "load_qmail_mail_queue: no user for from address: $from, to: $to. bouncing message."
 		# bounce message with an informative error.
 		bounce_mail_message  -to_addr $email_headers(from) \
@@ -357,7 +357,7 @@
 
             set to_stuff [parse_reply_address -reply_address $to]
             # We don't accept a bad incoming email address
-            if {[empty_string_p $to_stuff]} {
+            if {$to_stuff eq ""} {
                 ns_log debug "load_qmail_mail_queue: bad to address $to from $from. bouncing message."
 
 		# bounce message here