[geeklog-cvs] geeklog: Re-introduced the path hints in the install script when...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8d94805f4047
changeset: 6477:8d94805f4047
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Nov 22 22:08:19 2008 +0100
description:
Re-introduced the path hints in the install script when it can't find db-config.php

diffstat:

4 files changed, 19 insertions(+), 3 deletions(-)
public_html/admin/install/index.php            |    7 +++++++
public_html/admin/install/language/english.php |    5 ++++-
public_html/admin/install/language/german.php  |    8 ++++++--
public_html/docs/history                       |    2 ++

diffs (69 lines):

diff -r 0aebc29b9f54 -r 8d94805f4047 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Nov 22 19:51:40 2008 +0100
+++ b/public_html/admin/install/index.php	Sat Nov 22 22:08:19 2008 +0100
@@ -1613,6 +1613,13 @@
                 ' . $form_fields . '
                 <input type="submit" name="submit" class="submit" value="Next >>"' . XHTML . '>
                 </form>' . LB;
+            $display .= '<p>' . $LANG_INSTALL[94] . '<p>' . LB
+                     . '<ul><li>' . $LANG_INSTALL[95] . '<br' . XHTML . '>' . LB
+                     . '<code>' . strtr(__FILE__, '\\', '/') . '</code></li>'
+                     . '<li>' . sprintf($LANG_INSTALL[96],
+                                        '<code>db-config.php</code>')
+                     . '<br' . XHTML . '>' . LB . '<code>' . $gl_path
+                     . '</code></li></ul>' . LB;
         }
         break;
 
diff -r 0aebc29b9f54 -r 8d94805f4047 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sat Nov 22 19:51:40 2008 +0100
+++ b/public_html/admin/install/language/english.php	Sat Nov 22 22:08:19 2008 +0100
@@ -143,7 +143,10 @@
     90 => 'Empty database?',
     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
     92 => 'Use UTF-8',
-    93 => 'Success'
+    93 => 'Success',
+    94 => 'Here are some hints to find the correct path:',
+    95 => 'The complete path to this file (the install script) is:',
+    96 => 'The installer was looking for %s in:'
 );
 
 // +---------------------------------------------------------------------------+
diff -r 0aebc29b9f54 -r 8d94805f4047 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sat Nov 22 19:51:40 2008 +0100
+++ b/public_html/admin/install/language/german.php	Sat Nov 22 22:08:19 2008 +0100
@@ -133,7 +133,7 @@
     80 => 'Ändern',
     81 => 'Stop!',
     82 => 'Es ist unbedingt nötig, die Zugriffsrechte der unten aufgeführten Dateien zu ändern. Andernfalls wirst Du Geeklog nicht installieren können.',
-    83 => 'Installation Error',
+    83 => 'Fehler bei der Installation',
     84 => 'The path "',
     85 => '" does not appear to be correct. Please go back and try again.',
     86 => 'Sprache',
@@ -142,7 +142,11 @@
     89 => 'Aktuelle Version:',
     90 => 'Leere Datenbank?',
     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
-    92 => 'Benutze UTF-8'
+    92 => 'Benutze UTF-8',
+    93 => 'Success',
+    94 => 'Hier sind einige Hinweise, um den richtigen Pfad zu ermitteln:',
+    95 => 'Der komplette Pfad zu dieser Datei (dem Installations-Skript) ist:',
+    96 => 'Das Installations-Skript hat nach %s in diesem Verzeichnis gesucht:'
 );
 
 // +---------------------------------------------------------------------------+
diff -r 0aebc29b9f54 -r 8d94805f4047 public_html/docs/history
--- a/public_html/docs/history	Sat Nov 22 19:51:40 2008 +0100
+++ b/public_html/docs/history	Sat Nov 22 22:08:19 2008 +0100
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Re-introduced the path hints in the install script when it can't find
+  db-config.php [Dirk]
 - Added a note about the max. dimensions of a userphoto in the About You pane
   of a user's My Account page (feature request #0000629) [Dirk]
 - Don't include X-Originating-IP header in emails sent from the site's admin