lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW Finish removal of code using adodbtime

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-22 01:54:50 +02:00
parent 8486919e3d
commit ce494354e2
6 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/system/constall.php
View File

@ -73,7 +73,6 @@ $configfileparameters = array(
'?dolibarr_main_auth_ldap_admin_pass', '?dolibarr_main_auth_ldap_admin_pass',
'?dolibarr_main_auth_ldap_debug', '?dolibarr_main_auth_ldap_debug',
'separator', 'separator',
'?dolibarr_lib_ADODB_PATH',
'?dolibarr_lib_FPDF_PATH', '?dolibarr_lib_FPDF_PATH',
'?dolibarr_lib_TCPDF_PATH', '?dolibarr_lib_TCPDF_PATH',
'?dolibarr_lib_FPDI_PATH', '?dolibarr_lib_FPDI_PATH',
@ -122,7 +121,6 @@ $configfilelib = array(
'dolibarr_main_auth_ldap_admin_pass', 'dolibarr_main_auth_ldap_admin_pass',
'dolibarr_main_auth_ldap_debug', 'dolibarr_main_auth_ldap_debug',
'separator', 'separator',
'dolibarr_lib_ADODB_PATH',
'dolibarr_lib_TCPDF_PATH', 'dolibarr_lib_TCPDF_PATH',
'dolibarr_lib_FPDI_PATH', 'dolibarr_lib_FPDI_PATH',
'dolibarr_lib_NUSOAP_PATH', 'dolibarr_lib_NUSOAP_PATH',

1
htdocs/admin/system/dolibarr.php
View File

@ -342,7 +342,6 @@ $configfileparameters = array(
'?dolibarr_main_auth_ldap_admin_pass' => 'dolibarr_main_auth_ldap_admin_pass', '?dolibarr_main_auth_ldap_admin_pass' => 'dolibarr_main_auth_ldap_admin_pass',
'?dolibarr_main_auth_ldap_debug' => 'dolibarr_main_auth_ldap_debug', '?dolibarr_main_auth_ldap_debug' => 'dolibarr_main_auth_ldap_debug',
'separator3' => '', 'separator3' => '',
'?dolibarr_lib_ADODB_PATH' => 'dolibarr_lib_ADODB_PATH',
'?dolibarr_lib_FPDF_PATH' => 'dolibarr_lib_FPDF_PATH', '?dolibarr_lib_FPDF_PATH' => 'dolibarr_lib_FPDF_PATH',
'?dolibarr_lib_TCPDF_PATH' => 'dolibarr_lib_TCPDF_PATH', '?dolibarr_lib_TCPDF_PATH' => 'dolibarr_lib_TCPDF_PATH',
'?dolibarr_lib_FPDI_PATH' => 'dolibarr_lib_FPDI_PATH', '?dolibarr_lib_FPDI_PATH' => 'dolibarr_lib_FPDI_PATH',

3
htdocs/core/lib/functions.lib.php
View File

@ -2638,6 +2638,9 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
$useadodb = getDolGlobalInt('MAIN_USE_LEGACY_ADODB_FOR_DATE', 0); $useadodb = getDolGlobalInt('MAIN_USE_LEGACY_ADODB_FOR_DATE', 0);
//$useadodb = 1; // To switch to adodb //$useadodb = 1; // To switch to adodb
if (!empty($useadodb)) {
include_once DOL_DOCUMENT_ROOT.'/includes/adodbtime/adodb-time.inc.php';
}
// Analyze date // Analyze date
$reg = array(); $reg = array();

7
htdocs/filefunc.inc.php
View File

@ -311,9 +311,6 @@ define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
* To use other version than embeded libraries, define here constant to path. Use '' to use include class path autodetect. * To use other version than embeded libraries, define here constant to path. Use '' to use include class path autodetect.
*/ */
// Path to root libraries // Path to root libraries
if (!defined('ADODB_PATH')) {
define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/adodbtime/' : (empty($dolibarr_lib_ADODB_PATH) ? '' : $dolibarr_lib_ADODB_PATH.'/'));
}
if (!defined('TCPDF_PATH')) { if (!defined('TCPDF_PATH')) {
define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/'); define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/');
} }
@ -354,10 +351,6 @@ if (!defined('DOL_DEFAULT_TTF_BOLD')) {
* Include functions * Include functions
*/ */
if (!defined('ADODB_DATE_VERSION')) {
include_once ADODB_PATH.'adodb-time.inc.php';
}
// If password is encoded, we decode it. Note: When page is called for install, $dolibarr_main_db_pass may not be defined yet. // If password is encoded, we decode it. Note: When page is called for install, $dolibarr_main_db_pass may not be defined yet.
if ((!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) || !empty($dolibarr_main_db_encrypted_pass)) { if ((!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) || !empty($dolibarr_main_db_encrypted_pass)) {
if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) { if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) {

10
htdocs/install/inc.php
View File

@ -35,24 +35,16 @@ require_once '../filefunc.inc.php';
// Define DOL_DOCUMENT_ROOT and ADODB_PATH used for install/upgrade process // Define DOL_DOCUMENT_ROOT used for install/upgrade process
if (!defined('DOL_DOCUMENT_ROOT')) { if (!defined('DOL_DOCUMENT_ROOT')) {
define('DOL_DOCUMENT_ROOT', '..'); define('DOL_DOCUMENT_ROOT', '..');
} }
if (!defined('ADODB_PATH')) {
$foundpath = DOL_DOCUMENT_ROOT.'/includes/adodbtime/';
if (!is_dir($foundpath)) {
$foundpath = '/usr/share/php/adodb/';
}
define('ADODB_PATH', $foundpath);
}
require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/conf.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/conf.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once ADODB_PATH.'adodb-time.inc.php';
$conf = new Conf(); $conf = new Conf();

7
htdocs/install/step1.php
View File

@ -825,7 +825,7 @@ function write_conf_file($conffile)
global $dolibarr_main_distrib; global $dolibarr_main_distrib;
global $db_host, $db_port, $db_name, $db_user, $db_pass, $db_type, $db_character_set, $db_collation; global $db_host, $db_port, $db_name, $db_user, $db_pass, $db_type, $db_character_set, $db_collation;
global $conffile, $conffiletoshow, $conffiletoshowshort; global $conffile, $conffiletoshow, $conffiletoshowshort;
global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH; global $force_dolibarr_lib_NUSOAP_PATH;
global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH; global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH;
global $force_dolibarr_lib_GEOIP_PATH; global $force_dolibarr_lib_GEOIP_PATH;
global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP; global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
@ -944,11 +944,6 @@ function write_conf_file($conffile)
} }
fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';'); fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
fputs($fp, "\n"); fputs($fp, "\n");
if (empty($force_dolibarr_lib_ADODB_PATH)) {
fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH = '';
}
fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
fputs($fp, "\n");
if (empty($force_dolibarr_lib_GEOIP_PATH)) { if (empty($force_dolibarr_lib_GEOIP_PATH)) {
fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH = ''; fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH = '';
} }