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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-03 14:09:00 +02:00
commit 4215237f64
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -1905,7 +1905,7 @@ class EmailCollector extends CommonObject
$sql = "SELECT rowid as id FROM " . MAIN_DB_PREFIX . "user WHERE email LIKE '%" . $from . "%'"; $sql = "SELECT rowid as id FROM " . MAIN_DB_PREFIX . "user WHERE email LIKE '%" . $from . "%'";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql->num_rows == 0) { if ($resql->num_rows == 0) {
$this->errors = 'User Not allowed to add documents'; $this->errors[] = 'User Not allowed to add documents';
} }
$arrayobject = array( $arrayobject = array(
'propale' => array('table' => 'propal', 'propale' => array('table' => 'propal',
@ -2043,7 +2043,7 @@ class EmailCollector extends CommonObject
$path = ($objectmanaged->entity > 1 ? "/" . $objectmanaged->entity : ''); $path = ($objectmanaged->entity > 1 ? "/" . $objectmanaged->entity : '');
$dirs[] = DOL_DATA_ROOT . $path . "/" . $elementpath . '/' . dol_sanitizeFileName($objectmanaged->ref) . '/'; $dirs[] = DOL_DATA_ROOT . $path . "/" . $elementpath . '/' . dol_sanitizeFileName($objectmanaged->ref) . '/';
} else { } else {
$this->errors = 'object not found'; $this->errors[] = 'object not found';
} }
} }
} }
@ -2053,12 +2053,12 @@ class EmailCollector extends CommonObject
$resr = saveAttachment($target, $prefix . '_' . $filename, $content); $resr = saveAttachment($target, $prefix . '_' . $filename, $content);
if ($resr == -1) { if ($resr == -1) {
$this->errors = 'Doc not saved'; $this->errors[] = 'Doc not saved';
} }
} }
} }
} else { } else {
$this->errors = 'no joined piece'; $this->errors[] = 'no joined piece';
} }
} elseif ($operation['type'] == 'project') { } elseif ($operation['type'] == 'project') {
// Create project / lead // Create project / lead