From 7279554681da728deb74a87230de3a1021182f71 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Wed, 4 Mar 2009 00:23:34 +0000
Subject: Additional (optional, defaults to off) logging of PEAR error details,
 which allows database issues to be more easily diagnosed.

---
 index.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 914ba5bde..03c044415 100644
--- a/index.php
+++ b/index.php
@@ -43,7 +43,11 @@ function handleError($error)
         return;
     }
 
-    common_log(LOG_ERR, "PEAR error: " . $error->getMessage());
+    $logmsg = "PEAR error: " . $error->getMessage();
+    if(common_config('site', 'logdebug')) {
+        $logmsg .= " : ". $error->getDebugInfo();
+    }
+    common_log(LOG_ERR, $logmsg);
     $msg = sprintf(_('The database for %s isn\'t responding correctly, '.
                      'so the site won\'t work properly. '.
                      'The site admins probably know about the problem, '.
-- 
cgit v1.2.3-54-g00ecf


From f9babf6a7d4215e763a8c1766a2e6592fe274953 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 4 Mar 2009 06:24:33 -0800
Subject: Check for config file when running

When running the full system, check for a config file, and throw an
error if none is found.
---
 index.php      | 8 ++++++++
 lib/common.php | 6 ++++++
 lib/util.php   | 6 +++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 914ba5bde..7f580b836 100644
--- a/index.php
+++ b/index.php
@@ -61,6 +61,14 @@ function main()
 {
     global $user, $action;
 
+    if (!_have_config()) {
+        $msg = sprintf(_("No configuration file found. Try running ".
+                         "the installation program first."));
+        $sac = new ServerErrorAction($msg);
+        $sac->showPage();
+        return;
+    }
+
     // For database errors
 
     PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
diff --git a/lib/common.php b/lib/common.php
index 0fff3af2e..ca8dedeef 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -187,6 +187,12 @@ foreach ($_config_files as $_config_file) {
     }
 }
 
+function _have_config()
+{
+    global $_have_a_config;
+    return $_have_a_config;
+}
+
 // XXX: Throw a conniption if database not installed
 
 // Fixup for laconica.ini
diff --git a/lib/util.php b/lib/util.php
index 18e4f310c..f9a787d47 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ function common_language()
 
     // If there is a user logged in and they've set a language preference
     // then return that one...
-    if (common_logged_in()) {
+    if (_have_config() && common_logged_in()) {
         $user = common_current_user();
         $user_language = $user->language;
         if ($user_language)
@@ -315,6 +315,10 @@ function common_current_user()
 {
     global $_cur;
 
+    if (!_have_config()) {
+        return null;
+    }
+
     if ($_cur === false) {
 
         if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
-- 
cgit v1.2.3-54-g00ecf