[geeklog-cvs] geeklog: Added missing half of the fix for filling out the email...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/34a340e909f3
changeset: 6568:34a340e909f3
user:      Dirk Haun <dirk at haun-online.de>
date:      Mon Dec 15 10:09:27 2008 +0100
description:
Added missing half of the fix for filling out the email addresses in the install script (cf. bug #0000759)

diffstat:

1 file changed, 6 insertions(+)
public_html/admin/install/index.php |    6 ++++++

diffs (17 lines):

diff -r 8ef676172fdb -r 34a340e909f3 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Dec 14 21:49:32 2008 +0100
+++ b/public_html/admin/install/index.php	Mon Dec 15 10:09:27 2008 +0100
@@ -332,7 +332,13 @@
             $site_admin_url = isset($_POST['site_admin_url']) ? $_POST['site_admin_url'] : 'http://' . $_SERVER['HTTP_HOST'] . preg_replace('/\/install.*/', '', $_SERVER['PHP_SELF']) ; 
             $host_name = explode(':', $_SERVER['HTTP_HOST']);
             $host_name = $host_name[0];
+            if (empty($_CONF['site_mail'])) {
+                $_CONF['site_mail'] = 'admin at example.com';
+            }
             $site_mail = isset($_POST['site_mail']) ? $_POST['site_mail'] : ($_CONF['site_mail'] != 'admin at example.com' ? $_CONF['site_mail'] : 'admin@' . $host_name);
+            if (empty($_CONF['noreply_mail'])) {
+                $_CONF['noreply_mail'] = 'noreply at example.com';
+            }
             $noreply_mail = isset($_POST['noreply_mail']) ? $_POST['noreply_mail'] : ($_CONF['noreply_mail'] != 'noreply at example.com' ? $_CONF['noreply_mail'] : 'noreply@' . $host_name);
             if (isset($_POST['utf8']) && ($_POST['utf8'] == 'on')) {
                 $utf8 = true;