Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v18

Browse Source
This commit is contained in:
Laurent Destailleur 2023-06-23 01:20:46 +02:00
parent 597328e3ab
commit 8be328cc16
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/conf/conf.php.example
View File

@ -128,6 +128,8 @@ $dolibarr_main_db_user='';
// dolibarr_main_db_pass
// =====================
// This parameter contains password used to read and write into Dolibarr database.
// If content is 'crypted:...', the password is encrypted/decrypted with dol_encode/dol_decode.
// If content is 'dolcrypt:...', the password is encrypted/decrypted with dolEncrypt/dolDecrypt.
//
// Examples:
// $dolibarr_main_db_pass='myadminpass';

7
htdocs/core/lib/security2.lib.php
View File

@ -411,20 +411,25 @@ function encodedecode_dbpassconf($level = 0)
$val = preg_replace('/["\'][\s;]*$/', '', $val);
if (preg_match('/crypted:/i', $buffer)) {
// method dol_encode/dol_decode
$mode = 'crypted:';
$val = preg_replace('/crypted:/i', '', $val);
$passwd_crypted = $val;
$val = dol_decode($val);
$passwd = $val;
} elseif (preg_match('/^dolcrypt:([^:]+):(.*)$/i', $buffer, $reg)) {
// method dolEncrypt/dolDecrypt
$mode = 'dolcrypt:';
$val = preg_replace('/crypted:([^:]+):/i', '', $val);
$passwd_crypted = $val;
$val = dolDecrypt($buffer);
$passwd = $val;
} else {
$passwd = $val;
$mode = 'crypted:';
$val = dol_encode($val);
$passwd_crypted = $val;
// TODO replace with dolEncrypt()
// ...
}
$lineofpass = 1;
}
@ -436,7 +441,7 @@ function encodedecode_dbpassconf($level = 0)
$config .= '$dolibarr_main_db_pass=\''.$passwd.'\';'."\n";
}
if ($level == 1) {
$config .= '$dolibarr_main_db_pass=\'crypted:'.$passwd_crypted.'\';'."\n";
$config .= '$dolibarr_main_db_pass=\''.$mode.$passwd_crypted.'\';'."\n";
}
//print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;