Don't use HTTP_HOST to get the hostname. We force that to

"example.com" when we are using the CLI so we'll get inconsistent
behavior between CLI and the web interface.

For now hardcode it to be example.com so that it's clear.  But to do
it right we need an after_install step which actually fixes it up.
And probably an after_upgrade step as well.

1 files changed, 4 insertions, 6 deletions

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 664fe127..d5264fcc 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -304,9 +304,8 @@ class gallery_installer {
     module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
 
     // Sendmail configuration
-    $domain = Input::instance()->server("HTTP_HOST");
-    module::set_var("gallery", "email_from", "admin@$domain");
-    module::set_var("gallery", "email_reply_to", "public@$domain");
+    module::set_var("gallery", "email_from", "admin@example.com");
+    module::set_var("gallery", "email_reply_to", "public@example.com");
     module::set_var("gallery", "email_line_length", 70);
     module::set_var("gallery", "email_header_separator", serialize("\n"));
 
@@ -606,9 +605,8 @@ class gallery_installer {
     }
 
     if ($version == 36) {
-      $domain = Input::instance()->server("HTTP_HOST");
-      module::set_var("gallery", "email_from", "admin@$domain");
-      module::set_var("gallery", "email_reply_to", "public@$domain");
+      module::set_var("gallery", "email_from", "admin@example.com");
+      module::set_var("gallery", "email_reply_to", "public@example.com");
       module::set_var("gallery", "email_line_length", 70);
       module::set_var("gallery", "email_header_separator", serialize("\n"));
       module::set_version("gallery", $version = 37);