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

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

Browse Source 
Conflicts:
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur 2021-07-21 00:41:40 +02:00
commit e02fbadcd7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/fileconf.php
View File

@ -559,7 +559,7 @@ if (!empty($force_install_noedit)) {
class="needroot text-security" class="needroot text-security"
value="<?php value="<?php
// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1. // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
$autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : '')); $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
if (!empty($dolibarr_main_prod)) { if (!empty($dolibarr_main_prod)) {
$autofill = ''; $autofill = '';
} }

2
htdocs/main.inc.php
View File

@ -461,7 +461,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request) // Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
$arrayofactiontoforcetokencheck = array( $arrayofactiontoforcetokencheck = array(
'activate', 'add', 'addrights', 'addtimespent', 'activate', 'add', 'addrights', 'addtimespent',
'confirm_create_user', 'confirm_create_thirdparty', 'confirm_delete', 'confirm_deletedir', 'confirm_purge', 'confirm_reject_check', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_delete', 'confirm_deletedir', 'confirm_deletefile', 'confirm_purge', 'confirm_reject_check',
'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights', 'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
'disable', 'disable',
'doprev', 'donext', 'dvprev', 'dvnext', 'doprev', 'donext', 'dvprev', 'dvnext',

12
htdocs/user/class/user.class.php
View File

@ -1281,9 +1281,9 @@ class User extends CommonObject
$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")); $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
return -1; return -1;
} elseif (preg_match('/[,@<>"\']/', $this->login)) { } elseif (preg_match('/[,@<>"\']/', $this->login)) {
$langs->load("errors"); $langs->load("errors");
$this->error = $langs->trans("ErrorBadCharIntoLoginName"); $this->error = $langs->trans("ErrorBadCharIntoLoginName");
return -1; return -1;
} }
$this->datec = dol_now(); $this->datec = dol_now();
@ -1674,9 +1674,9 @@ class User extends CommonObject
$this->error = $langs->trans("ErrorFieldRequired", 'Login'); $this->error = $langs->trans("ErrorFieldRequired", 'Login');
return -1; return -1;
} elseif (preg_match('/[,@<>"\']/', $this->login)) { } elseif (preg_match('/[,@<>"\']/', $this->login)) {
$langs->load("errors"); $langs->load("errors");
$this->error = $langs->trans("ErrorBadCharIntoLoginName"); $this->error = $langs->trans("ErrorBadCharIntoLoginName");
return -1; return -1;
} }
$this->db->begin(); $this->db->begin();