Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/notifications/notifications.info	23 Sep 2002 23:32:23 -0000	1.11
+++ openacs-4/packages/notifications/notifications.info	14 Oct 2002 10:31:12 -0000	1.11.2.1
@@ -87,7 +87,7 @@
             <file type="content_page" path="www/object-goto.tcl"/>
         </files>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailDomain"  default="openacs.org" description="The domain for the notification email address" section_name="email"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailDomain"  default="" description="The domain for the notification email address" section_name="email"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailReplyAddressPrefix"  default="notification" description="The prefix for email replies" section_name="email"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailQmailQueue"  description="The location of the qmail queue for incoming email" section_name="email"/>
         </parameters>
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 -r1.9 -r1.9.2.1
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	22 Sep 2002 15:49:29 -0000	1.9
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	14 Oct 2002 10:31:13 -0000	1.9.2.1
@@ -22,7 +22,15 @@
     }
 
     ad_proc -public address_domain {} {
-        return [get_parameter -name "EmailDomain"]
+        set domain [get_parameter -name "EmailDomain"]
+        if { [empty_string_p $domain] } {
+            # 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] } {
+                ns_log Warning "notification::email::address_domain: Couldn't find an email domain for notifications."
+            }
+        }
+        return $domain
     }
 
     ad_proc -public manage_notifications_url {} {