From 13c4d42352c14d41759c14863a03f4fd84430d87 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 25 Mar 2004 22:33:38 +0000
Subject: [PATCH] fixed problem with two different dsn and auth_dsn database
 backends   (e.g. mysql + pgsql)

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3212 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/WikiUserNew.php  | 11 +++++++++--
 lib/XmlRpcServer.php |  3 ++-
 lib/config.php       |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php
index fadca32a9..bc2ba5e46 100644
--- a/lib/WikiUserNew.php
+++ b/lib/WikiUserNew.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiUserNew.php,v 1.38 2004-03-25 17:37:36 rurban Exp $');
+rcs_id('$Id: WikiUserNew.php,v 1.39 2004-03-25 22:33:38 rurban Exp $');
 /* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  */
 /**
@@ -883,12 +883,16 @@ extends _AnonUser
         if (empty($this->_auth_dbi)) {
             if ($DBParams['dbtype'] != 'SQL' and $DBParams['dbtype'] != 'ADODB')
                 return false;
+            if (empty($DBAuthParams))
+                return false;
             if (empty($DBAuthParams['auth_dsn'])) {
                 $dbh = $request->getDbh(); // use phpwiki database 
             } elseif ($DBAuthParams['auth_dsn'] == $DBParams['dsn']) {
                 $dbh = $request->getDbh(); // same phpwiki database 
             } else { // use another external database handle. needs PHP >= 4.1
-                $dbh = WikiDB::open($DBAuthParams);
+                $local_params = array_merge($DBParams,$DBAuthParams);
+                $local_params['dsn'] = $local_params['auth_dsn'];
+                $dbh = WikiDB::open($local_params);
             }       
             $this->_auth_dbi =& $dbh->_backend->_dbh;    
         }
@@ -2589,6 +2593,9 @@ extends UserPreferences
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.38  2004/03/25 17:37:36  rurban
+// helper to patch to and from php5 (workaround for stricter parser, no macros in php)
+//
 // Revision 1.37  2004/03/25 17:00:31  rurban
 // more code to convert old-style pref array to new hash
 //
diff --git a/lib/XmlRpcServer.php b/lib/XmlRpcServer.php
index 86df446cb..dc91e1083 100644
--- a/lib/XmlRpcServer.php
+++ b/lib/XmlRpcServer.php
@@ -1,5 +1,5 @@
 <?php 
-// $Id: XmlRpcServer.php,v 1.5 2003-02-21 04:12:05 dairiki Exp $
+// $Id: XmlRpcServer.php,v 1.6 2004-03-25 22:33:38 rurban Exp $
 /* Copyright (C) 2002, Lawrence Akka <lakka@users.sourceforge.net>
  *
  * LICENCE
@@ -47,6 +47,7 @@
 */
 
 // ToDo:  
+//        Make use of the xmlrpc extension if found. Resolve namespace conflicts
 //        Remove all warnings from xmlrpc.inc 
 //        Return list of external links in listLinks
  
diff --git a/lib/config.php b/lib/config.php
index b90d7421e..eb69cc9a7 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.90 2004-03-17 19:36:31 rurban Exp $');
+rcs_id('$Id: config.php,v 1.91 2004-03-25 22:33:38 rurban Exp $');
 /*
  * NOTE: the settings here should probably not need to be changed.
 *
@@ -435,7 +435,7 @@ if (!defined('ALLOW_ANON_EDIT')) define('ALLOW_ANON_EDIT', false);
 if (!defined('REQUIRE_SIGNIN_BEFORE_EDIT')) define('REQUIRE_SIGNIN_BEFORE_EDIT', ! ALLOW_ANON_EDIT);
 if (!defined('ALLOW_BOGO_LOGIN')) define('ALLOW_BOGO_LOGIN', true);
 
-if (ALLOW_USER_LOGIN and empty($DBAuthParams['auth_dsn'])) {
+if (ALLOW_USER_LOGIN and !empty($DBAuthParams) and empty($DBAuthParams['auth_dsn'])) {
     if (isset($DBParams['dsn']))
         $DBAuthParams['auth_dsn'] = $DBParams['dsn'];
 }
-- 
2.45.0