use PEAR_PATH instead of DOL_DOCUMENT_ROOT."/includes/pear/"

This commit is contained in:
liedekef 2007-01-17 14:44:13 +00:00
parent af7c4fb997
commit 49d14462b9
32 changed files with 43 additions and 43 deletions

View File

@ -20,7 +20,7 @@
//
//require_once "PEAR.php";
require_once DOL_DOCUMENT_ROOT."/includes/pear/PEAR.php";
require_once PEAR_PATH."/PEAR.php";
define("AUTH_IDLED", -1);
@ -188,7 +188,7 @@ class DOLIAuth {
$storage_path = "Auth/Container/" . $driver . ".php";
$storage_class = "Auth_Container_" . $driver;
require_once DOL_DOCUMENT_ROOT."/includes/pear/".$storage_path;
require_once PEAR_PATH."/".$storage_path;
return new $storage_class($options);
}

View File

@ -20,9 +20,9 @@
//
//require_once 'Auth/Container.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/Auth/Container.php";
require_once PEAR_PATH."/Auth/Container.php";
//require_once 'DB.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/DB.php";
require_once PEAR_PATH."/DB.php";
/**
* Storage driver for fetching login data from a database

View File

@ -21,8 +21,8 @@
// require_once 'PEAR.php';
// require_once 'Auth/Container.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/PEAR.php";
require_once DOL_DOCUMENT_ROOT."/includes/pear/Auth/Container.php";
require_once PEAR_PATH."/PEAR.php";
require_once PEAR_PATH."/Auth/Container.php";
/**
* Storage driver for fetching login data from LDAP

View File

@ -26,13 +26,13 @@
* Include Auth_Container base class
*/
//require_once 'Auth/Container.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/Auth/Container.php";
require_once PEAR_PATH."/Auth/Container.php";
/**
* Include PEAR MDB2 package
*/
//require_once 'MDB2.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2.php";
require_once PEAR_PATH."/MDB2.php";
/**
* Storage driver for fetching login data from a database

View File

@ -23,7 +23,7 @@
//
//require_once "PEAR.php";
require_once DOL_DOCUMENT_ROOT."/includes/pear/PEAR.php";
require_once PEAR_PATH."/PEAR.php";
// {{{ constants
// {{{ error codes
@ -225,7 +225,7 @@ class DB
function &factory($type)
{
include_once(DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php");
include_once(PEAR_PATH."/DB/${type}.php");
$classname = "DB_${type}";
@ -274,9 +274,9 @@ class DB
if (is_array($options) && isset($options["debug"]) &&
$options["debug"] >= 2) {
// expose php errors with sufficient debug level
include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php";
include_once PEAR_PATH."/DB/${type}.php";
} else {
include_once DOL_DOCUMENT_ROOT."/includes/pear/DB/${type}.php";
include_once PEAR_PATH."/DB/${type}.php";
}
$classname = "DB_${type}";

View File

@ -27,7 +27,7 @@
*/
//require_once "PEAR.php";
require_once DOL_DOCUMENT_ROOT."/includes/pear/PEAR.php";
require_once PEAR_PATH."/PEAR.php";
class DB_common extends DOLIPEAR
{

View File

@ -21,8 +21,8 @@
// require_once 'PEAR.php';
// require_once 'Auth/Container.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/PEAR.php";
require_once DOL_DOCUMENT_ROOT."/includes/pear/Auth/Container.php";
require_once PEAR_PATH."/PEAR.php";
require_once PEAR_PATH."/Auth/Container.php";
/**
* Storage driver for fetching login data from LDAP

View File

@ -26,7 +26,7 @@
//
// require_once 'DB/common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/DB/common.php";
require_once PEAR_PATH."/DB/common.php";
/**
* LDAP2 DB interface class

View File

@ -24,8 +24,8 @@
// require_once 'DB/common.php';
// require_once 'DB/ldap2.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/DB/common.php";
require_once DOL_DOCUMENT_ROOT."/includes/pear/DB/ldap2.php";
require_once PEAR_PATH."/DB/common.php";
require_once PEAR_PATH."/DB/ldap2.php";
/**
* LDAP3 DB interface class

View File

@ -30,7 +30,7 @@
//
//require_once 'DB/common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/DB/common.php";
require_once PEAR_PATH."/DB/common.php";
class DB_mysql extends DB_common
{

View File

@ -24,7 +24,7 @@
//
//require_once 'DB/common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/DB/common.php";
require_once PEAR_PATH."/DB/common.php";
class DB_pgsql extends DB_common

View File

@ -53,7 +53,7 @@
*/
//require_once 'PEAR.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/PEAR.php";
require_once PEAR_PATH."/PEAR.php";
// {{{ Error constants

View File

@ -45,7 +45,7 @@
// $Id$
//require_once 'MDB2/LOB.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/LOB.php";
require_once PEAR_PATH."/MDB2/LOB.php";
/**
* @package MDB2

View File

@ -48,7 +48,7 @@
//
//require_once 'MDB2/Driver/Datatype/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Datatype/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Datatype/Common.php";
/**
* MDB2 MS SQL driver

View File

@ -47,7 +47,7 @@
//
//require_once 'MDB2/Driver/Datatype/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Datatype/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Datatype/Common.php";
/**
* MDB2 MySQL driver

View File

@ -47,7 +47,7 @@
//
//require_once 'MDB2/Driver/Datatype/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Datatype/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Datatype/Common.php";
/**
* MDB2 MySQLi driver

View File

@ -45,7 +45,7 @@
// $Id$
//require_once 'MDB2/Driver/Datatype/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Datatype/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Datatype/Common.php";
/**
* MDB2 PostGreSQL driver

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Function/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Function/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Function/Common.php";
// {{{ class MDB2_Driver_Function_mssql
/**

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Function/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Function/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Function/Common.php";
/**
* MDB2 MySQL driver for the function modules

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Function/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Function/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Function/Common.php";
/**
* MDB2 MySQLi driver for the function modules

View File

@ -45,7 +45,7 @@
// $Id$
//require_once 'MDB2/Driver/Function/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Function/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Function/Common.php";
/**
* MDB2 MySQL driver for the function modules

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Native/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Native/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Native/Common.php";
/**
* MDB2 MSSQL driver for the native module

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Native/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Native/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Native/Common.php";
/**
* MDB2 MySQL driver for the native module

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Native/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Native/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Native/Common.php";
/**
* MDB2 MySQLi driver for the native module

View File

@ -45,7 +45,7 @@
// $Id$
//require_once 'MDB2/Driver/Native/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Native/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Native/Common.php";
/**
* MDB2 PostGreSQL driver for the native module

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Reverse/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Reverse/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Reverse/Common.php";
/**
* MDB2 MSSQL driver for the schema reverse engineering module

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Reverse/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Reverse/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Reverse/Common.php";
/**
* MDB2 MySQL driver for the schema reverse engineering module

View File

@ -46,7 +46,7 @@
//
//require_once 'MDB2/Driver/Reverse/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Reverse/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Reverse/Common.php";
/**
* MDB2 MySQLi driver for the schema reverse engineering module

View File

@ -45,7 +45,7 @@
// $Id$
//require_once 'MDB2/Driver/Reverse/Common.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2/Driver/Reverse/Common.php";
require_once PEAR_PATH."/MDB2/Driver/Reverse/Common.php";
/**
* MDB2 PostGreSQL driver for the schema reverse engineering module

View File

@ -51,7 +51,7 @@
*/
//require_once 'MDB2.php';
require_once DOL_DOCUMENT_ROOT."/includes/pear/MDB2.php";
require_once PEAR_PATH."/MDB2.php";
/**
* MDB2_LOB: user land stream wrapper implementation for LOB support

View File

@ -104,7 +104,7 @@ if (! session_id() || ! isset($_SESSION["dol_login"]))
// MODE DOLIBARR
if (in_array('dolibarr',$authmode) && ! $login)
{
require_once(DOL_DOCUMENT_ROOT."/includes/pear/Auth/Auth.php");
require_once(PEAR_PATH."/Auth/Auth.php");
$pear = $dolibarr_main_db_type.'://'.$dolibarr_main_db_user.':'.$dolibarr_main_db_pass.'@'.$dolibarr_main_db_host.'/'.$dolibarr_main_db_name;
@ -155,7 +155,7 @@ if (! session_id() || ! isset($_SESSION["dol_login"]))
// Ajout du mode MDB2 pour test uniquement
if (in_array('dolibarr_mdb2',$authmode) && ! $login)
{
require_once(DOL_DOCUMENT_ROOT."/includes/pear/Auth/Auth.php");
require_once(PEAR_PATH."/Auth/Auth.php");
$pear = $dolibarr_main_db_type.'://'.$dolibarr_main_db_user.':'.$dolibarr_main_db_pass.'@'.$dolibarr_main_db_host.'/'.$dolibarr_main_db_name;
@ -206,7 +206,7 @@ if (! session_id() || ! isset($_SESSION["dol_login"]))
if ($conf->ldap->enabled && in_array('ldap',$authmode) && ! $login)
{
// Authentification Apache KO ou non active, pas de mode force on demande le login
require_once(DOL_DOCUMENT_ROOT."/includes/pear/Auth/Auth.php");
require_once(PEAR_PATH."/Auth/Auth.php");
#$ldapdebug=true;
if ($ldapdebug) print "DEBUG: Traces connexions LDAP<br>\n";

View File

@ -32,7 +32,7 @@ if (!empty ($_SERVER["REMOTE_USER"]))
include_once("../conf/conf.php");
require_once("../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/includes/pear/Auth/Auth.php");
require_once(PEAR_PATH."/Auth/Auth.php");
dolibarr_syslog("End session in DOLSESSID_".$dolibarr_main_db_name);