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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/core/lib/security2.lib.php
This commit is contained in:
Laurent Destailleur 2020-10-30 05:59:45 +01:00
commit d4daf8b9ce
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,13 +501,10 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
{ {
$numbers = "ABCDEF"; $numbers = "ABCDEF";
$max = strlen($numbers) - 1; $max = strlen($numbers) - 1;
if (function_exists('random_int')) // Cryptographic random if (function_exists('random_int')) { // Cryptographic random
{
$tmp = random_int(0, $max); $tmp = random_int(0, $max);
$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password); $generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
} } else {
else
{
$tmp = mt_rand(0, $max); $tmp = mt_rand(0, $max);
$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password); $generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
} }

1
htdocs/core/tpl/advtarget.tpl.php
View File

@ -482,7 +482,6 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
print '<tr><td>' . $extrafields->attributes[$elementtype]['label'][$key]; print '<tr><td>' . $extrafields->attributes[$elementtype]['label'][$key];
if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) { if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
} }
print '</td><td>'; print '</td><td>';
if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') || ($extrafields->attributes[$elementtype]['type'][$key] == 'text')) { if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') || ($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {