From: garvinhicking <garvinhicking>
Date: Mon, 23 Jan 2006 09:46:13 +0000 (+0000)
Subject: shared install changes for mod_userdir, beta prepare
X-Git-Tag: 1.0~158
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b741672077388e38781075c9705075023fd55cfd;p=s9y.git

shared install changes for mod_userdir, beta prepare
---

diff --git a/deployment/serendipity_config.inc.php b/deployment/serendipity_config.inc.php
index 6cb468f..506f4cf 100644
--- a/deployment/serendipity_config.inc.php
+++ b/deployment/serendipity_config.inc.php
@@ -4,6 +4,7 @@
 # Serendipity is provided in managed mode here
 
 #@define('S9Y_INCLUDE_PATH', 's9y/');
+@define('S9Y_DATA_PATH', dirname( __FILE__)."/");
 require_once 's9y/serendipity_config.inc.php';
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
diff --git a/docs/NEWS b/docs/NEWS
index 60679b8..15d69f6 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,8 +1,11 @@
 # $Id$
 
-Version 1.0 ()
+Version 1.0-beta1 (January 23rd, 2006)
 ------------------------------------------------------------------------
 
+   * Apply changes to shared installation directory detection so that
+     it also works with Apache's mod_userdir (elf2000)
+
    * Fix some problems with sending UTF-8 emails on some systems. Allow
      Plugin API to handle the whole mailflow optionally.
      (garvinhicking)
diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index 84763dd..2a90311 100644
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -9,7 +9,15 @@ $umask = 0775;
 define('S9Y_I_ERROR', -1);
 define('S9Y_I_WARNING', 0);
 define('S9Y_I_SUCCESS', 1);
-$basedir = serendipity_query_default('serendipityPath', false);
+
+if (defined('S9Y_DATA_PATH')) {
+    // Shared installation. S9Y_INCLUDE_PATH points to repository,
+    // S9Y_DATA_PATH points to the local directory.
+    $basedir = S9Y_DATA_PATH;
+} else {
+    // Usual installation within DOCUMENT_ROOT.
+    $basedir = serendipity_query_default('serendipityPath', false);
+}
 
 /**
  * Checks a return code constant if it's successfull or an error and return HTML code
diff --git a/include/db/mysql.inc.php b/include/db/mysql.inc.php
index ea7dadc..f65658d 100644
--- a/include/db/mysql.inc.php
+++ b/include/db/mysql.inc.php
@@ -70,6 +70,10 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
 
     // highlight_string(var_export($sql, 1));
 
+    if (!is_resource($serendipity['dbConn'])) {
+        return false;
+    }
+
     if ($expectError) {
         $c = @mysql_query($sql, $serendipity['dbConn']);
     } else {
diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 057fa35..2cf87e9 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -179,6 +179,9 @@ function serendipity_query_default($optname, $default, $usertemplate = false, $t
             $test_path2 = serendipity_getRealDir(__FILE__);
             if (file_exists($test_path1 . 'serendipity_admin.php')) {
                 return $test_path1;
+            } elseif (defined('S9Y_DATA_PATH')) {
+                // Shared installation!
+                return S9Y_DATA_PATH;
             } else {
                 return $test_path2;
             }
diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php
index 6e25d0b..b1c5d65 100644
--- a/lang/serendipity_lang_ru.inc.php
+++ b/lang/serendipity_lang_ru.inc.php
@@ -1,6 +1,7 @@
 <?php # $Id$
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
+# Translation by Nightly <nightly@reys.net>
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'utf-8');
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 73b3873..a25ce96 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -21,7 +21,7 @@ if (IS_installed === true && !defined('IN_serendipity')) {
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '1.0-alpha2';
+$serendipity['version']         = '1.0-beta1';
 
 // Name of folder for the default theme
 $serendipity['defaultTemplate'] = 'default';
@@ -162,7 +162,11 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/se
     $local_config = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php';
 } elseif (file_exists($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php')) {
     $local_config = $serendipity['serendipityPath'] . '/serendipity_config_local.inc.php';
+} elseif (is_defined('S9Y_DATA_PATH')) {
+    // Shared installation!
+    $local_config = S9Y_DATA_PATH . '/serendipity_config_local.inc.php';
 } else {
+    // Installation fallback
     $local_config = S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php';
 }