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

FIX avoid Passing null to parameter #1 of type string is deprecated

Browse Source
This commit is contained in:
Regis Houssin 2022-07-16 15:20:45 +02:00
parent 2c707f0258
commit 0c7a868306
4 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/db/mysqli.class.php
View File

@ -471,7 +471,7 @@ class DoliDBMysqli extends DoliDB
*/
public function escape($stringtoencode)
{
return $this->db->real_escape_string($stringtoencode);
return $this->db->real_escape_string((string) $stringtoencode);
}
/**
@ -482,7 +482,7 @@ class DoliDBMysqli extends DoliDB
*/
public function escapeunderscore($stringtoencode)
{
return str_replace('_', '\_', $stringtoencode);
return str_replace('_', '\_', (string) $stringtoencode);
}
/**

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

@ -6569,10 +6569,10 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
*
* @param string $dir Directory to create (Separator must be '/'. Example: '/mydir/mysubdir')
* @param string $dataroot Data root directory (To avoid having the data root in the loop. Using this will also lost the warning on first dir PHP has no permission when open_basedir is used)
* @param string|null $newmask Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'
* @param string $newmask Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'
* @return int < 0 if KO, 0 = already exists, > 0 if OK
*/
function dol_mkdir($dir, $dataroot = '', $newmask = null)
function dol_mkdir($dir, $dataroot = '', $newmask = '')
{
global $conf;
@ -6613,7 +6613,7 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);
umask(0);
$dirmaskdec = octdec($newmask);
$dirmaskdec = octdec((string) $newmask);
if (empty($newmask)) {
$dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);
}

2
htdocs/user/card.php
View File

@ -476,7 +476,7 @@ if (empty($reshook)) {
$object->lang = GETPOST('default_lang', 'aZ09');
// Do we update also ->entity ?
if (!empty($conf->multicompany->enabled && $user->entity == 0 && !empty($user->admin))) { // If multicompany is not enabled, we never update the entity of a user.
if (!empty($conf->multicompany->enabled) && empty($user->entity) && !empty($user->admin)) { // If multicompany is not enabled, we never update the entity of a user.
if (GETPOST('superadmin', 'int')) {
$object->entity = 0;
} else {

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

@ -1485,8 +1485,8 @@ class User extends CommonObject
// Clean parameters
$this->setUpperOrLowerCase();
$this->civility_code = trim($this->civility_code);
$this->login = trim($this->login);
$this->civility_code = trim((string) $this->civility_code);
$this->login = trim((string) $this->login);
if (!isset($this->entity)) {
$this->entity = $conf->entity; // If not defined, we use default value
}
@ -1848,47 +1848,45 @@ class User extends CommonObject
dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
// Clean parameters
$this->civility_code = trim($this->civility_code);
$this->lastname = trim($this->lastname);
$this->firstname = trim($this->firstname);
$this->ref_employee = trim($this->ref_employee);
$this->national_registration_number = trim($this->national_registration_number);
$this->employee = $this->employee ? $this->employee : 0;
$this->login = trim($this->login);
$this->gender = trim($this->gender);
$this->pass = trim($this->pass);
$this->api_key = trim($this->api_key);
$this->address = $this->address ? trim($this->address) : trim($this->address);
$this->zip = $this->zip ? trim($this->zip) : trim($this->zip);
$this->town = $this->town ? trim($this->town) : trim($this->town);
$this->civility_code = trim((string) $this->civility_code);
$this->lastname = trim((string) $this->lastname);
$this->firstname = trim((string) $this->firstname);
$this->ref_employee = trim((string) $this->ref_employee);
$this->national_registration_number = trim((string) $this->national_registration_number);
$this->employee = ($this->employee > 0 ? $this->employee : 0);
$this->login = trim((string) $this->login);
$this->gender = trim((string) $this->gender);
$this->pass = trim((string) $this->pass);
$this->api_key = trim((string) $this->api_key);
$this->address = trim((string) $this->address);
$this->zip = trim((string) $this->zip);
$this->town = trim((string) $this->town);
$this->setUpperOrLowerCase();
$this->state_id = trim($this->state_id);
$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
$this->office_phone = trim($this->office_phone);
$this->office_fax = trim($this->office_fax);
$this->user_mobile = trim($this->user_mobile);
$this->personal_mobile = trim($this->personal_mobile);
$this->email = trim($this->email);
$this->personal_email = trim($this->personal_email);
$this->job = trim($this->job);
$this->signature = trim($this->signature);
$this->note_public = trim($this->note_public);
$this->note_private = trim($this->note_private);
$this->openid = trim(empty($this->openid) ? '' : $this->openid); // Avoid warning
$this->admin = $this->admin ? $this->admin : 0;
$this->address = empty($this->address) ? '' : $this->address;
$this->zip = empty($this->zip) ? '' : $this->zip;
$this->town = empty($this->town) ? '' : $this->town;
$this->setUpperOrLowerCase();
$this->accountancy_code = trim($this->accountancy_code);
$this->color = empty($this->color) ? '' : $this->color;
$this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
$this->dateemploymentend = empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
$this->birth = trim($this->birth);
$this->fk_warehouse = (int) $this->fk_warehouse;
$this->state_id = ($this->state_id > 0 ? $this->state_id : 0);
$this->country_id = ($this->country_id > 0 ? $this->country_id : 0);
$this->office_phone = trim((string) $this->office_phone);
$this->office_fax = trim((string) $this->office_fax);
$this->user_mobile = trim((string) $this->user_mobile);
$this->personal_mobile = trim((string) $this->personal_mobile);
$this->email = trim((string) $this->email);
$this->personal_email = trim((string) $this->personal_email);
$this->job = trim((string) $this->job);
$this->signature = trim((string) $this->signature);
$this->note_public = trim((string) $this->note_public);
$this->note_private = trim((string) $this->note_private);
$this->openid = trim((string) $this->openid);
$this->admin = ($this->admin > 0 ? $this->admin : 0);
$this->accountancy_code = trim((string) $this->accountancy_code);
$this->color = trim((string) $this->color);
$this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
$this->dateemploymentend = empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
$this->birth = empty($this->birth) ? '' : $this->birth;
$this->fk_warehouse = (int) $this->fk_warehouse;
// Check parameters
$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');