[geeklog-cvs] geeklog: Fixed warnings, typos, and oddities

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e592515b56a0
changeset: 6452:e592515b56a0
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Oct 12 20:13:29 2008 +0200
description:
Fixed warnings, typos, and oddities

diffstat:

2 files changed, 8 insertions(+), 2 deletions(-)
public_html/admin/install/index.php           |    8 +++++++-
public_html/admin/install/install-plugins.php |    2 +-

diffs (38 lines):

diff -r fa12aa529516 -r e592515b56a0 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sun Oct 12 19:14:39 2008 +0200
+++ b/public_html/admin/install/index.php	Sun Oct 12 20:13:29 2008 +0200
@@ -129,7 +129,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;
@@ -1303,7 +1309,7 @@
             }
 
             // Update the GL configuration with the correct paths.
-            $config->set('path_html', 0);
+            $config->set('path_html', $html_path);
             $config->set('path_log', $_CONF['path'] . 'logs/');
             $config->set('path_language', $_CONF['path'] . 'language/');
             $config->set('backup_path', $_CONF['path'] . 'backups/');
diff -r fa12aa529516 -r e592515b56a0 public_html/admin/install/install-plugins.php
--- a/public_html/admin/install/install-plugins.php	Sun Oct 12 19:14:39 2008 +0200
+++ b/public_html/admin/install/install-plugins.php	Sun Oct 12 20:13:29 2008 +0200
@@ -413,7 +413,7 @@
                                 . ($missing_public_html || $missing_admin 
                                     ? '<br' . XHTML . '><br' . XHTML . '><p><small><span class="error">Warning:</span> This plugin is not fully installed. Check that the plugin has been correctly installed to:<br' . XHTML . '><br' . XHTML . '>' 
                                         . ($missing_public_html ? '<code>' . $_CONF['path_html'] . '</code><br' . XHTML . '>' : '') 
-                                        . ($missing_admin ? '<code>' . $admindir . '</code><br' . XHTML . '>' : '') . '</small></p>'
+                                        . ($missing_admin ? '<code>' . $admin_dir . '</code><br' . XHTML . '>' : '') . '</small></p>'
                                     : '')
                             . '</td>' . LB
                             . '<td align="center"><input type="hidden" name="plugins[' . $plugin . '][version]" value="' . $pi_version . '"' . XHTML . '>'