Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
dc12e93f6e
14 changed files with 1511 additions and 1653 deletions
|
|
@ -714,12 +714,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/admin/system/database.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$row might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 1
|
||||
path: ../../../htdocs/admin/system/dbtable.php
|
||||
|
||||
-
|
||||
message: '#^Loose comparison using \!\= between '',''\|''\.'' and '' '' will always evaluate to true\.$#'
|
||||
identifier: notEqual.alwaysTrue
|
||||
|
|
@ -750,12 +744,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/admin/system/phpinfo.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$title in isset\(\) always exists and is not nullable\.$#'
|
||||
identifier: isset.variable
|
||||
count: 1
|
||||
path: ../../../htdocs/admin/system/phpinfo.php
|
||||
|
||||
-
|
||||
message: '#^Call to function function_exists\(\) with ''exec''\|''popen'' will always evaluate to true\.$#'
|
||||
identifier: function.alreadyNarrowedType
|
||||
|
|
@ -780,12 +768,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/admin/tools/dolibarr_export.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$massaction might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 1
|
||||
path: ../../../htdocs/admin/tools/export.php
|
||||
|
||||
-
|
||||
message: '#^Right side of && is always true\.$#'
|
||||
identifier: booleanAnd.rightAlwaysTrue
|
||||
|
|
@ -822,24 +804,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/admin/tools/ui/class/documentation.class.php
|
||||
|
||||
-
|
||||
message: '#^Method Documentation\:\:showCode\(\) has parameter \$lines with no value type specified in iterable type array\.$#'
|
||||
identifier: missingType.iterableValue
|
||||
count: 1
|
||||
path: ../../../htdocs/admin/tools/ui/class/documentation.class.php
|
||||
|
||||
-
|
||||
message: '#^Property Documentation\:\:\$menu type has no value type specified in iterable type array\.$#'
|
||||
identifier: missingType.iterableValue
|
||||
count: 1
|
||||
path: ../../../htdocs/admin/tools/ui/class/documentation.class.php
|
||||
|
||||
-
|
||||
message: '#^Property Documentation\:\:\$summary type has no value type specified in iterable type array\.$#'
|
||||
identifier: missingType.iterableValue
|
||||
count: 1
|
||||
path: ../../../htdocs/admin/tools/ui/class/documentation.class.php
|
||||
|
||||
-
|
||||
message: '#^Property Documentation\:\:\$view type has no value type specified in iterable type array\.$#'
|
||||
identifier: missingType.iterableValue
|
||||
|
|
@ -1092,12 +1056,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/barcode/printsheet.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$code might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 1
|
||||
path: ../../../htdocs/barcode/printsheet.php
|
||||
|
||||
-
|
||||
message: '#^Strict comparison using \=\=\= between ''facture'' and ''facture'' will always evaluate to true\.$#'
|
||||
identifier: identical.alwaysTrue
|
||||
|
|
@ -6762,12 +6720,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/core/tpl/filemanager.tpl.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$num might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 2
|
||||
path: ../../../htdocs/core/tpl/list_print_total.tpl.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$sql might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
|
|
@ -8442,12 +8394,6 @@ parameters:
|
|||
count: 4
|
||||
path: ../../../htdocs/intracommreport/lib/intracommreport.lib.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$groupby might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 1
|
||||
path: ../../../htdocs/intracommreport/list.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$type might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
|
|
@ -11970,12 +11916,6 @@ parameters:
|
|||
count: 2
|
||||
path: ../../../htdocs/takepos/invoice.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$batch might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 1
|
||||
path: ../../../htdocs/takepos/invoice.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$body_ticket might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
|
|
@ -12330,12 +12270,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/user/notify/card.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$num might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 5
|
||||
path: ../../../htdocs/user/notify/card.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$dolibarr_main_authentication might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
|
|
@ -12756,18 +12690,6 @@ parameters:
|
|||
count: 1
|
||||
path: ../../../htdocs/website/samples/wrapper.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$val might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 1
|
||||
path: ../../../htdocs/workstation/workstation_list.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$visible might not be defined\.$#'
|
||||
identifier: variable.undefined
|
||||
count: 1
|
||||
path: ../../../htdocs/workstation/workstation_list.php
|
||||
|
||||
-
|
||||
message: '#^Variable \$num in isset\(\) always exists and is not nullable\.$#'
|
||||
identifier: isset.variable
|
||||
|
|
|
|||
|
|
@ -116,6 +116,9 @@ if (GETPOSTISSET("limityear") && GETPOSTINT("limityear") < 2100) {
|
|||
|
||||
// Security check
|
||||
$socid = GETPOSTINT('socid');
|
||||
if (empty($socid)) {
|
||||
$socid = $user->socid; // External users: fall back to their own company (consistent with other card pages)
|
||||
}
|
||||
$id = GETPOSTINT('id');
|
||||
if ($user->socid && ($socid != $user->socid)) {
|
||||
accessforbidden();
|
||||
|
|
|
|||
|
|
@ -1279,6 +1279,22 @@ abstract class CommonObject
|
|||
dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Check that the contact actually exists in database
|
||||
$sql_check = "SELECT rowid FROM ".$this->db->prefix().($source == 'internal' ? "user" : "socpeople")." WHERE rowid = ".((int) $fk_socpeople);
|
||||
$resql_check = $this->db->query($sql_check);
|
||||
if ($resql_check) {
|
||||
if (!$this->db->num_rows($resql_check)) {
|
||||
$langs->load("errors");
|
||||
$this->error = $langs->trans("ErrorRecordNotFound");
|
||||
dol_syslog(get_class($this)."::add_contact Contact/user id ".$fk_socpeople." does not exist", LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
$this->error = $this->db->lasterror();
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!$type_contact) {
|
||||
$langs->load("errors");
|
||||
$this->error = $langs->trans("ErrorWrongValueForParameterX", "2");
|
||||
|
|
|
|||
|
|
@ -113,10 +113,25 @@ function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
|
|||
if ($tens < 20) {
|
||||
$tens = ($tens ? ' '.$list1[$tens].' ' : '');
|
||||
} else {
|
||||
$tens = (int) ($tens / 10);
|
||||
$tens = ' '.$list2[$tens].' ';
|
||||
$singles = (int) ((int) $num_levels[$i] % 10);
|
||||
$singles = ' '.$list1[$singles].' ';
|
||||
$tsd = (int) ($tens / 10); // tens digit (2-9)
|
||||
$usd = (int) ($tens % 10); // units digit (0-9)
|
||||
|
||||
// French-style systems: 70-79 = sixty + (10-19), 90-99 = eighty + (10-19)
|
||||
// Detection: if the translation of "seventy"/"ninety" contains the word for "ten"
|
||||
$tenWord = trim($list1[10]); // e.g. "dix"
|
||||
if ($usd > 0 && ($tsd == 7 || $tsd == 9) && $tenWord !== '' && strpos(trim($list2[$tsd]), $tenWord) !== false) {
|
||||
// Use the base ten word (60 for 70s, 80 for 90s) + teen word (11-19)
|
||||
$baseWord = trim($list2[$tsd - 1]);
|
||||
// Remove trailing 's' (e.g. quatre-vingts → quatre-vingt when used in composition)
|
||||
if (substr($baseWord, -1) === 's') {
|
||||
$baseWord = substr($baseWord, 0, -1);
|
||||
}
|
||||
$tens = ' '.$baseWord.' ';
|
||||
$singles = ' '.$list1[10 + $usd].' ';
|
||||
} else {
|
||||
$tens = ' '.$list2[$tsd].' ';
|
||||
$singles = ' '.$list1[$usd].' ';
|
||||
}
|
||||
}
|
||||
$words[] = $hundreds.$tens.$singles.(($levels && (int) ($num_levels[$i])) ? ' '.$list3[$levels].' ' : '');
|
||||
} //end for loop
|
||||
|
|
|
|||
|
|
@ -329,774 +329,7 @@ class ImportCsv extends ModeleImports
|
|||
public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
|
||||
{
|
||||
// phpcs:enable
|
||||
global $langs, $conf, $user;
|
||||
global $thirdparty_static; // Specific to thirdparty import
|
||||
global $tablewithentity_cache; // Cache to avoid to call desc at each rows on tables
|
||||
|
||||
$error = 0;
|
||||
$warning = 0;
|
||||
$this->errors = array();
|
||||
$this->warnings = array();
|
||||
|
||||
//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
|
||||
|
||||
//var_dump($array_match_file_to_database);
|
||||
//var_dump($arrayrecord); exit;
|
||||
|
||||
$array_match_database_to_file = array_flip($array_match_file_to_database);
|
||||
$sort_array_match_file_to_database = $array_match_file_to_database;
|
||||
ksort($sort_array_match_file_to_database);
|
||||
|
||||
//var_dump($sort_array_match_file_to_database);
|
||||
|
||||
if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val']))) {
|
||||
//print 'W';
|
||||
$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
|
||||
$this->warnings[$warning]['type'] = 'EMPTY';
|
||||
$warning++;
|
||||
} else {
|
||||
$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
|
||||
$updatedone = false;
|
||||
$insertdone = false;
|
||||
// For each table to insert, me make a separate insert
|
||||
foreach ($objimport->array_import_tables[0] as $alias => $tablename) {
|
||||
// Build sql request
|
||||
$sql = '';
|
||||
$listfields = array();
|
||||
$listvalues = array();
|
||||
$i = 0;
|
||||
$errorforthistable = 0;
|
||||
|
||||
// Define $tablewithentity_cache[$tablename] if not already defined
|
||||
if (!isset($tablewithentity_cache[$tablename])) { // keep this test with "isset"
|
||||
dol_syslog("Check if table ".$tablename." has an entity field");
|
||||
$resql = $this->db->DDLDescTable($tablename, 'entity');
|
||||
if ($resql) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
if ($obj) {
|
||||
$tablewithentity_cache[$tablename] = 1; // table contains entity field
|
||||
} else {
|
||||
$tablewithentity_cache[$tablename] = 0; // table does not contain entity field
|
||||
}
|
||||
} else {
|
||||
dol_print_error($this->db);
|
||||
}
|
||||
} else {
|
||||
//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
|
||||
}
|
||||
|
||||
// Define an array to convert fields ('c.ref', ...) into column index (1, ...)
|
||||
$arrayfield = array();
|
||||
foreach ($sort_array_match_file_to_database as $key => $val) {
|
||||
$arrayfield[$val] = ($key - 1);
|
||||
}
|
||||
|
||||
// $arrayrecord start at key 0
|
||||
// $sort_array_match_file_to_database start at key 1
|
||||
|
||||
// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
|
||||
foreach ($sort_array_match_file_to_database as $key => $val) {
|
||||
$fieldalias = preg_replace('/\..*$/i', '', $val);
|
||||
$fieldname = preg_replace('/^.*\./i', '', $val);
|
||||
|
||||
if ($alias != $fieldalias) {
|
||||
continue; // Not a field of current table
|
||||
}
|
||||
|
||||
if ($key <= $maxfields) {
|
||||
// Set $newval with value to insert and set $listvalues with sql request part for insert
|
||||
$newval = '';
|
||||
if ($arrayrecord[($key - 1)]['type'] > 0) {
|
||||
$newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
|
||||
}
|
||||
|
||||
//var_dump($newval);var_dump($val);
|
||||
//var_dump($objimport->array_import_convertvalue[0][$val]);
|
||||
|
||||
// Make some tests on $newval
|
||||
|
||||
// Is it a required field ?
|
||||
if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) {
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
|
||||
$this->errors[$error]['type'] = 'NOTNULL';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
} else {
|
||||
// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
|
||||
// We convert field if required
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val])) {
|
||||
//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
|
||||
if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
|
||||
|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
|
||||
|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
|
||||
) {
|
||||
// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
|
||||
$isidorref = 'id';
|
||||
if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
|
||||
$isidorref = 'ref';
|
||||
}
|
||||
|
||||
$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
|
||||
//print 'Newval is now "'.$newval.'" and is type '.$isidorref."<br>\n";
|
||||
|
||||
if ($isidorref == 'ref') { // If value into input import file is a ref, we apply the function defined into descriptor
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '') {
|
||||
$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
|
||||
} else {
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
if ($class == 'CGenericDic') {
|
||||
$classinstance->element = $objimport->array_import_convertvalue[0][$val]['element'];
|
||||
$classinstance->table_element = $objimport->array_import_convertvalue[0][$val]['table_element'];
|
||||
}
|
||||
|
||||
// Try the fetch from code or ref
|
||||
$param_array = array('', $newval);
|
||||
if ($class == 'AccountingAccount') {
|
||||
//var_dump($arrayrecord[0]['val']);
|
||||
/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
|
||||
$tmpchartofaccount = new AccountancySystem($this->db);
|
||||
$tmpchartofaccount->fetch(getDolGlobalInt('CHARTOFACCOUNTS'));
|
||||
//var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
|
||||
if ((! (getDolGlobalInt('CHARTOFACCOUNTS') > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
|
||||
{
|
||||
$this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
|
||||
$this->errors[$error]['type']='RESTRICTONCURRENCTCHART';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}*/
|
||||
$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
|
||||
}
|
||||
if ($class == 'CActionComm') {
|
||||
$param_array = array($newval); // CActionComm fetch method have same parameter for id and code
|
||||
}
|
||||
$result = call_user_func_array(array($classinstance, $method), $param_array);
|
||||
|
||||
// If duplicate record found
|
||||
if (!($classinstance->id != '') && $result == -2) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorMultipleRecordFoundFromRef', $newval);
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
|
||||
// If not found, try the fetch from label
|
||||
if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel') {
|
||||
$param_array = array('', '', $newval);
|
||||
call_user_func_array(array($classinstance, $method), $param_array);
|
||||
}
|
||||
$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
|
||||
|
||||
//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
|
||||
if ($classinstance->id != '') { // id may be 0, it is a found value
|
||||
$newval = $classinstance->id;
|
||||
} elseif (! $error) {
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
|
||||
} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', num2Alpha($key - 1), $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
|
||||
}
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
|
||||
$isidorref = 'id';
|
||||
if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
|
||||
$isidorref = 'ref';
|
||||
}
|
||||
$newval = preg_replace('/^(id|ref):/i', '', $newval);
|
||||
|
||||
if ($isidorref == 'ref') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
|
||||
$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
|
||||
if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
|
||||
$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
|
||||
} else {
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
// Try the fetch from code and ref
|
||||
$param_array = array('', $newval, $code);
|
||||
call_user_func_array(array($classinstance, $method), $param_array);
|
||||
$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
|
||||
if ($classinstance->id > 0) { // we found record
|
||||
$newval = $classinstance->id;
|
||||
} else {
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
|
||||
}
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
|
||||
if (empty($newval)) {
|
||||
$newval = '0';
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
$units = $objimport->array_import_convertvalue[0][$val]['units'];
|
||||
if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '') {
|
||||
$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
|
||||
} else {
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
// Try the fetch from code or ref
|
||||
call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
|
||||
$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
|
||||
$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
|
||||
//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
|
||||
if ($classinstance->id > 0) { // we found record
|
||||
$newval = $scaleorid ? $scaleorid : 0;
|
||||
} else {
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
|
||||
}
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codeclient(null, 0);
|
||||
$newval = $this->thirdpartyobject->code_client;
|
||||
//print 'code_client='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codefournisseur(null, 1);
|
||||
$newval = $this->thirdpartyobject->code_fournisseur;
|
||||
//print 'code_fournisseur='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codecompta('customer');
|
||||
$newval = $this->thirdpartyobject->code_compta_client;
|
||||
//print 'code_compta='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codecompta('supplier');
|
||||
$newval = $this->thirdpartyobject->code_compta_fournisseur;
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
//print 'code_compta_fournisseur='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$defaultref = '';
|
||||
|
||||
$classModForNumber = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$pathModForNumber = $objimport->array_import_convertvalue[0][$val]['path'];
|
||||
|
||||
if (!empty($classModForNumber) && !empty($pathModForNumber) && is_readable(DOL_DOCUMENT_ROOT.$pathModForNumber)) {
|
||||
require_once DOL_DOCUMENT_ROOT.$pathModForNumber;
|
||||
$modForNumber = new $classModForNumber();
|
||||
'@phan-var-force ModeleNumRefMembers|ModeleNumRefCommandes|ModeleNumRefSuppliersInvoices|ModeleNumRefSuppliersOrders|ModeleNumRefProjects|ModeleNumRefTask|ModeleNumRefPropales $modForNumber';
|
||||
|
||||
$tmpobject = null;
|
||||
// Set the object with the date property when we can
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['classobject'])) {
|
||||
$pathForObject = $objimport->array_import_convertvalue[0][$val]['pathobject'];
|
||||
require_once DOL_DOCUMENT_ROOT.$pathForObject;
|
||||
$tmpclassobject = $objimport->array_import_convertvalue[0][$val]['classobject'];
|
||||
$tmpobject = new $tmpclassobject($this->db);
|
||||
foreach ($arrayfield as $tmpkey => $tmpval) { // $arrayfield is array('c.ref'=>0, ...)
|
||||
if (in_array($tmpkey, array('t.date', 'c.date_commande'))) {
|
||||
$tmpobject->date = dol_stringtotime($arrayrecord[$arrayfield[$tmpkey]]['val'], 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$defaultref = $modForNumber->getNextValue(null, $tmpobject);
|
||||
}
|
||||
if (is_numeric($defaultref) && $defaultref <= 0) { // If error
|
||||
$defaultref = '';
|
||||
}
|
||||
$newval = $defaultref;
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file='.$file.', class='.$class.', method='.$method);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, ($key - 1)));
|
||||
if (empty($classinstance->error) && empty($classinstance->errors)) {
|
||||
$newval = $res; // We get new value computed.
|
||||
} else {
|
||||
$this->errors[$error]['type'] = 'CLASSERROR';
|
||||
$this->errors[$error]['lib'] = implode(
|
||||
"\n",
|
||||
array_merge([$classinstance->error], $classinstance->errors)
|
||||
);
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
|
||||
$newval = price2num($newval);
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
|
||||
if (!getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
|
||||
$newval = rtrim(trim($newval), "0");
|
||||
} else {
|
||||
$newval = trim($newval);
|
||||
}
|
||||
}
|
||||
|
||||
//print 'Val to use as insert is '.$newval.'<br>';
|
||||
}
|
||||
|
||||
// Test regexp
|
||||
if (!empty($objimport->array_import_regex[0][$val]) && ($newval != '')) {
|
||||
// If test regex string is "field@table" or "field@table:..." (means must exists into table ...)
|
||||
$reg = array();
|
||||
if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg)) {
|
||||
$field = $reg[1];
|
||||
$table = $reg[2];
|
||||
$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
|
||||
|
||||
$cachekey = $field.'@'.$table;
|
||||
if (!empty($filter)) {
|
||||
$cachekey .= ':'.$filter;
|
||||
}
|
||||
|
||||
// Load content of field@table into cache array
|
||||
if (!is_array($this->cachefieldtable[$cachekey])) { // If content of field@table not already loaded into cache
|
||||
$sql = "SELECT ".$field." as aliasfield FROM ".$table;
|
||||
if (!empty($filter)) {
|
||||
$sql .= ' WHERE '.$filter;
|
||||
}
|
||||
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
$num = $this->db->num_rows($resql);
|
||||
$i = 0;
|
||||
while ($i < $num) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
if ($obj) {
|
||||
$this->cachefieldtable[$cachekey][] = $obj->aliasfield;
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
} else {
|
||||
dol_print_error($this->db);
|
||||
}
|
||||
}
|
||||
|
||||
// Now we check cache is not empty (should not) and key is in cache
|
||||
if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
|
||||
$tableforerror = $table;
|
||||
if (!empty($filter)) {
|
||||
$tableforerror .= ':'.$filter;
|
||||
}
|
||||
$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, $field, $tableforerror);
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
} elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
|
||||
// If test is just a static regex
|
||||
//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
|
||||
$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', num2Alpha($key - 1), $newval, $objimport->array_import_regex[0][$val]);
|
||||
$this->errors[$error]['type'] = 'REGEX';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
|
||||
// Check HTML injection
|
||||
$inj = testSqlAndScriptInject($newval, 0);
|
||||
if ($inj) {
|
||||
$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorHtmlInjectionForField', num2Alpha($key - 1), dol_trunc($newval, 100));
|
||||
$this->errors[$error]['type'] = 'HTMLINJECTION';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
|
||||
// Other tests
|
||||
// ...
|
||||
}
|
||||
|
||||
// Define $listfields and $listvalues to build the SQL request
|
||||
if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
|
||||
if (!in_array("socialnetworks", $listfields)) {
|
||||
$listfields[] = "socialnetworks";
|
||||
$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
|
||||
$listvalues[$socialkey] = '';
|
||||
}
|
||||
//var_dump($newval); var_dump($arrayrecord[($key - 1)]['type']);
|
||||
if (!empty($newval) && $arrayrecord[($key - 1)]['type'] > 0) {
|
||||
$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
|
||||
//var_dump('sk='.$socialkey); // socialkey=19
|
||||
$socialnetwork = explode("_", $fieldname)[1];
|
||||
if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
|
||||
$json = new stdClass();
|
||||
$json->$socialnetwork = $newval;
|
||||
$listvalues[$socialkey] = json_encode($json);
|
||||
} else {
|
||||
$jsondata = $listvalues[$socialkey];
|
||||
$json = json_decode($jsondata);
|
||||
$json->$socialnetwork = $newval;
|
||||
$listvalues[$socialkey] = json_encode($json);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$listfields[] = $fieldname;
|
||||
// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
|
||||
if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
|
||||
$listvalues[] = ($newval == '0' ? (int) $newval : "null");
|
||||
} elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
|
||||
$listvalues[] = "''";
|
||||
} else {
|
||||
$listvalues[] = "'".$this->db->escape($newval)."'";
|
||||
}
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
|
||||
// We add hidden fields (but only if there is at least one field to add into table)
|
||||
// We process here all the fields that were declared into the array $this->import_fieldshidden_array of the descriptor file.
|
||||
// Previously we processed the ->import_fields_array.
|
||||
if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
|
||||
// Loop on each hidden fields to add them into listfields/listvalues
|
||||
foreach ($objimport->array_import_fieldshidden[0] as $tmpkey => $tmpval) {
|
||||
if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $tmpkey)) {
|
||||
continue; // Not a field of current table
|
||||
}
|
||||
$keyfieldcache = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $tmpkey);
|
||||
|
||||
if (in_array($keyfieldcache, $listfields)) { // avoid duplicates in insert
|
||||
continue;
|
||||
} elseif ($tmpval == 'user->id') {
|
||||
$listfields[] = $keyfieldcache;
|
||||
$listvalues[] = ((int) $user->id);
|
||||
} elseif (preg_match('/^lastrowid-/', $tmpval)) {
|
||||
$tmp = explode('-', $tmpval);
|
||||
$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
|
||||
$listfields[] = $keyfieldcache;
|
||||
$listvalues[] = (int) $lastinsertid;
|
||||
$keyfield = $keyfieldcache;
|
||||
//print $tmpkey."-".$tmpval."-".$listfields."-".$listvalues."<br>";exit;
|
||||
} elseif (preg_match('/^const-/', $tmpval)) {
|
||||
$tmp = explode('-', $tmpval, 2);
|
||||
$listfields[] = $keyfieldcache;
|
||||
$listvalues[] = "'".$this->db->escape($tmp[1])."'";
|
||||
} elseif (preg_match('/^rule-/', $tmpval)) { // Example: rule-computeAmount, rule-computeDirection, ...
|
||||
$fieldname = $tmpkey;
|
||||
if (!empty($objimport->array_import_convertvalue[0][$fieldname])) {
|
||||
if ($objimport->array_import_convertvalue[0][$fieldname]['rule'] == 'compute') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$fieldname]['classfile']) ? $objimport->array_import_convertvalue[0][$fieldname]['file'] : $objimport->array_import_convertvalue[0][$fieldname]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$fieldname]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
|
||||
$type = $objimport->array_import_convertvalue[0][$fieldname]['type'];
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, ($key - 1)));
|
||||
if (empty($classinstance->error) && empty($classinstance->errors)) {
|
||||
$fieldArr = explode('.', $fieldname);
|
||||
if (count($fieldArr) > 0) {
|
||||
$fieldname = $fieldArr[1];
|
||||
}
|
||||
|
||||
// Set $listfields and $listvalues
|
||||
$listfields[] = $fieldname;
|
||||
if ($type == 'int') {
|
||||
$listvalues[] = (int) $res;
|
||||
} elseif ($type == 'double') {
|
||||
$listvalues[] = (float) $res;
|
||||
} else {
|
||||
$listvalues[] = "'".$this->db->escape($res)."'";
|
||||
}
|
||||
} else {
|
||||
$this->errors[$error]['type'] = 'CLASSERROR';
|
||||
$this->errors[$error]['lib'] = implode(
|
||||
"\n",
|
||||
array_merge([$classinstance->error], $classinstance->errors)
|
||||
);
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'Bad value of profile setup '.$tmpval.' for array_import_fieldshidden';
|
||||
$this->errors[$error]['type'] = 'Import profile setup';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
|
||||
|
||||
// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
|
||||
// so we can try to make the insert or update now.
|
||||
if (!$errorforthistable) {
|
||||
//print "$alias/$tablename/$listfields/$listvalues<br>";
|
||||
if (!empty($listfields)) {
|
||||
$updatedone = false;
|
||||
$insertdone = false;
|
||||
|
||||
$is_table_category_link = false;
|
||||
$fname = 'rowid';
|
||||
if (strpos($tablename, '_categorie_') !== false) {
|
||||
$is_table_category_link = true;
|
||||
$fname = '*';
|
||||
}
|
||||
|
||||
if (!empty($updatekeys)) {
|
||||
// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
|
||||
|
||||
if (empty($lastinsertid)) { // No insert done yet for a parent table
|
||||
$sqlSelect = "SELECT ".$fname." FROM ".$tablename;
|
||||
$data = array_combine($listfields, $listvalues);
|
||||
$where = array(); // filters to forge SQL request
|
||||
$filters = array(); // filters to forge output error message
|
||||
foreach ($updatekeys as $key) {
|
||||
$col = $objimport->array_import_updatekeys[0][$key];
|
||||
$key = preg_replace('/^.*\./i', '', $key);
|
||||
if (isModEnabled("socialnetworks") && strpos($key, "socialnetworks") !== false) {
|
||||
$tmp = explode("_", $key);
|
||||
$key = $tmp[0];
|
||||
$socialnetwork = $tmp[1];
|
||||
$jsondata = $data[$key];
|
||||
$json = json_decode($jsondata);
|
||||
$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
|
||||
//var_dump($stringtosearch);
|
||||
//var_dump($this->db->escape($stringtosearch)); // This provide a value for sql string (but not for a like)
|
||||
$where[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
|
||||
$filters[] = $col." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
|
||||
//var_dump($where[1]); // This provide a value for sql string inside a like
|
||||
} else {
|
||||
$where[] = $key.' = '.$data[$key];
|
||||
$filters[] = $col.' = '.$data[$key];
|
||||
}
|
||||
}
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$where[] = "entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
$filters[] = "entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
}
|
||||
$sqlSelect .= " WHERE ".implode(' AND ', $where);
|
||||
|
||||
$resql = $this->db->query($sqlSelect);
|
||||
if ($resql) {
|
||||
$num_rows = $this->db->num_rows($resql);
|
||||
if ($num_rows == 1) {
|
||||
$res = $this->db->fetch_object($resql);
|
||||
$lastinsertid = $res->rowid;
|
||||
$keyfield = 'rowid';
|
||||
if ($is_table_category_link) {
|
||||
$lastinsertid = 'linktable';
|
||||
} // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
|
||||
$last_insert_id_array[$tablename] = $lastinsertid;
|
||||
} elseif ($num_rows > 1) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
} else {
|
||||
// No record found with filters, insert will be tried below
|
||||
}
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
} else {
|
||||
// We have a last INSERT ID (got by previous pass), so we check if we have a row referencing this foreign key.
|
||||
// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
|
||||
// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
|
||||
// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
|
||||
// Note: For extrafield tablename, we have in importfieldshidden_array an entry 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
|
||||
$sqlSelect = "SELECT rowid FROM ".$tablename;
|
||||
if (empty($keyfield)) {
|
||||
$keyfield = 'rowid';
|
||||
}
|
||||
|
||||
$sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
|
||||
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$sqlSelect .= " AND entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
}
|
||||
|
||||
$resql = $this->db->query($sqlSelect);
|
||||
if ($resql) {
|
||||
$res = $this->db->fetch_object($resql);
|
||||
if ($this->db->num_rows($resql) == 1) {
|
||||
// We have a row referencing this last foreign key, continue with UPDATE.
|
||||
} else {
|
||||
// No record found referencing this last foreign key,
|
||||
// force $lastinsertid to 0 so we INSERT below.
|
||||
$lastinsertid = 0;
|
||||
}
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($lastinsertid)) {
|
||||
// We db escape social network field because he isn't in field creation
|
||||
if (in_array("socialnetworks", $listfields)) {
|
||||
$socialkey = array_search("socialnetworks", $listfields);
|
||||
$tmpsql = $listvalues[$socialkey];
|
||||
$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
|
||||
}
|
||||
|
||||
// Build SQL UPDATE request
|
||||
$sqlstart = "UPDATE ".$tablename;
|
||||
|
||||
$data = array_combine($listfields, $listvalues);
|
||||
$set = array();
|
||||
foreach ($data as $key => $val) {
|
||||
$set[] = $key." = ".$val; // $val was escaped/sanitized previously
|
||||
}
|
||||
$sqlstart .= " SET ".implode(', ', $set).", import_key = '".$this->db->escape($importid)."'";
|
||||
if (empty($keyfield)) {
|
||||
$keyfield = 'rowid';
|
||||
}
|
||||
|
||||
$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
|
||||
|
||||
if ($is_table_category_link) {
|
||||
'@phan-var-force string[] $where';
|
||||
$sqlend = " WHERE " . implode(' AND ', $where);
|
||||
}
|
||||
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$sqlend .= " AND entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
}
|
||||
|
||||
$sql = $sqlstart.$sqlend;
|
||||
|
||||
// Run update request
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
|
||||
$updatedone = true;
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update not done, we do insert
|
||||
if (!$error && !$updatedone) {
|
||||
// We db escape social network field because he isn't in field creation
|
||||
if (in_array("socialnetworks", $listfields)) {
|
||||
$socialkey = array_search("socialnetworks", $listfields);
|
||||
$tmpsql = $listvalues[$socialkey];
|
||||
$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
|
||||
}
|
||||
|
||||
// Build SQL INSERT request
|
||||
$sqlstart = "INSERT INTO ".$tablename."(".implode(", ", $listfields).", import_key";
|
||||
$sqlend = ") VALUES(".implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$sqlstart .= ", entity";
|
||||
$sqlend .= ", ".$conf->entity;
|
||||
}
|
||||
if (!empty($objimport->array_import_tables_creator[0][$alias])) {
|
||||
$sqlstart .= ", ".$objimport->array_import_tables_creator[0][$alias];
|
||||
$sqlend .= ", ".$user->id;
|
||||
}
|
||||
$sql = $sqlstart.$sqlend.")";
|
||||
//dol_syslog("import_csv.modules", LOG_DEBUG);
|
||||
|
||||
// Run insert request
|
||||
if ($sql) {
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if (!$is_table_category_link) {
|
||||
$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
|
||||
}
|
||||
$insertdone = true;
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/*else
|
||||
{
|
||||
dol_print_error(null,'ErrorFieldListEmptyFor '.$alias."/".$tablename);
|
||||
}*/
|
||||
}
|
||||
|
||||
if ($error) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ($updatedone) {
|
||||
$this->nbupdate++;
|
||||
}
|
||||
if ($insertdone) {
|
||||
$this->nbinsert++;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
return $this->commonImportInsert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -378,8 +378,6 @@ class ImportXlsx extends ModeleImports
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
// What is this doing here ? it is common to all imports, is should be in the parent class
|
||||
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
|
||||
/**
|
||||
* Insert a record into database
|
||||
|
|
@ -395,784 +393,6 @@ class ImportXlsx extends ModeleImports
|
|||
public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
|
||||
{
|
||||
// phpcs:enable
|
||||
global $langs, $conf, $user;
|
||||
global $thirdparty_static; // Specific to thirdparty import
|
||||
global $tablewithentity_cache; // Cache to avoid to call desc at each rows on tables
|
||||
|
||||
$error = 0;
|
||||
$warning = 0;
|
||||
$this->errors = array();
|
||||
$this->warnings = array();
|
||||
|
||||
//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
|
||||
|
||||
//var_dump($array_match_file_to_database);
|
||||
//var_dump($arrayrecord); exit;
|
||||
|
||||
$array_match_database_to_file = array_flip($array_match_file_to_database);
|
||||
$sort_array_match_file_to_database = $array_match_file_to_database;
|
||||
ksort($sort_array_match_file_to_database);
|
||||
|
||||
//var_dump($sort_array_match_file_to_database);
|
||||
|
||||
if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[1]['val']))) {
|
||||
//print 'W';
|
||||
$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
|
||||
$this->warnings[$warning]['type'] = 'EMPTY';
|
||||
$warning++;
|
||||
} else {
|
||||
$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
|
||||
$updatedone = false;
|
||||
$insertdone = false;
|
||||
// For each table to insert, me make a separate insert
|
||||
foreach ($objimport->array_import_tables[0] as $alias => $tablename) {
|
||||
// Build sql request
|
||||
$sql = '';
|
||||
$listfields = array();
|
||||
$listvalues = array();
|
||||
$i = 0;
|
||||
$errorforthistable = 0;
|
||||
|
||||
// Define $tablewithentity_cache[$tablename] if not already defined
|
||||
if (!isset($tablewithentity_cache[$tablename])) { // keep this test with "isset"
|
||||
dol_syslog("Check if table " . $tablename . " has an entity field");
|
||||
$resql = $this->db->DDLDescTable($tablename, 'entity');
|
||||
if ($resql) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
if ($obj) {
|
||||
$tablewithentity_cache[$tablename] = 1; // table contains entity field
|
||||
} else {
|
||||
$tablewithentity_cache[$tablename] = 0; // table does not contain entity field
|
||||
}
|
||||
} else {
|
||||
dol_print_error($this->db);
|
||||
}
|
||||
} else {
|
||||
//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
|
||||
}
|
||||
|
||||
// Define an array to convert fields ('c.ref', ...) into column index (1, ...)
|
||||
$arrayfield = array();
|
||||
foreach ($sort_array_match_file_to_database as $key => $val) {
|
||||
$arrayfield[$val] = ($key);
|
||||
}
|
||||
|
||||
// $arrayrecord start at key 1
|
||||
// $sort_array_match_file_to_database start at key 1
|
||||
|
||||
// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
|
||||
foreach ($sort_array_match_file_to_database as $key => $val) {
|
||||
$fieldalias = preg_replace('/\..*$/i', '', $val);
|
||||
$fieldname = preg_replace('/^.*\./i', '', $val);
|
||||
|
||||
if ($alias != $fieldalias) {
|
||||
continue; // Not a field of current table
|
||||
}
|
||||
|
||||
if ($key <= $maxfields) {
|
||||
// Set $newval with value to insert and set $listvalues with sql request part for insert
|
||||
$newval = '';
|
||||
if ($arrayrecord[($key)]['type'] > 0) {
|
||||
$newval = $arrayrecord[($key)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
|
||||
}
|
||||
|
||||
//var_dump($newval);var_dump($val);
|
||||
//var_dump($objimport->array_import_convertvalue[0][$val]);
|
||||
|
||||
// Make some tests on $newval
|
||||
|
||||
// Is it a required field ?
|
||||
if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', num2Alpha($key - 1));
|
||||
$this->errors[$error]['type'] = 'NOTNULL';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
} else {
|
||||
// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
|
||||
// We convert field if required
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val])) {
|
||||
//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
|
||||
if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
|
||||
|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
|
||||
|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
|
||||
) {
|
||||
// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
|
||||
$isidorref = 'id';
|
||||
if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
|
||||
$isidorref = 'ref';
|
||||
}
|
||||
$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
|
||||
//print 'Newval is now "'.$newval.'" and is type '.$isidorref."<br>\n";
|
||||
|
||||
if ($isidorref == 'ref') { // If value into input import file is a ref, we apply the function defined into descriptor
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] != '') {
|
||||
$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval];
|
||||
} else {
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
if ($class == 'CGenericDic') {
|
||||
$classinstance->element = $objimport->array_import_convertvalue[0][$val]['element'];
|
||||
$classinstance->table_element = $objimport->array_import_convertvalue[0][$val]['table_element'];
|
||||
}
|
||||
|
||||
// Try the fetch from code or ref
|
||||
$param_array = array('', $newval);
|
||||
if ($class == 'AccountingAccount') {
|
||||
//var_dump($arrayrecord[0]['val']);
|
||||
/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
|
||||
$tmpchartofaccount = new AccountancySystem($this->db);
|
||||
$tmpchartofaccount->fetch(getDolGlobalInt('CHARTOFACCOUNTS'));
|
||||
//var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
|
||||
if ((! (getDolGlobalInt('CHARTOFACCOUNTS') > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
|
||||
{
|
||||
$this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
|
||||
$this->errors[$error]['type']='RESTRICTONCURRENCTCHART';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}*/
|
||||
$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
|
||||
}
|
||||
|
||||
$result = call_user_func_array(array($classinstance, $method), $param_array);
|
||||
|
||||
// If duplicate record found
|
||||
if (!($classinstance->id != '') && $result == -2) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorMultipleRecordFoundFromRef', $newval);
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
|
||||
// If not found, try the fetch from label
|
||||
if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel') {
|
||||
$param_array = array('', '', $newval);
|
||||
call_user_func_array(array($classinstance, $method), $param_array);
|
||||
}
|
||||
$this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] = $classinstance->id;
|
||||
|
||||
//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
|
||||
if ($classinstance->id != '') { // id may be 0, it is a found value
|
||||
$newval = $classinstance->id;
|
||||
} elseif (! $error) {
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
|
||||
} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
|
||||
}
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
|
||||
$isidorref = 'id';
|
||||
if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
|
||||
$isidorref = 'ref';
|
||||
}
|
||||
$newval = preg_replace('/^(id|ref):/i', '', $newval);
|
||||
|
||||
if ($isidorref == 'ref') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
|
||||
$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
|
||||
if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] != '') {
|
||||
$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval];
|
||||
} else {
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', code=' . $code);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
// Try the fetch from code and ref
|
||||
$param_array = array('', $newval, $code);
|
||||
call_user_func_array(array($classinstance, $method), $param_array);
|
||||
$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] = $classinstance->id;
|
||||
if ($classinstance->id > 0) { // we found record
|
||||
$newval = $classinstance->id;
|
||||
} else {
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
|
||||
}
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
|
||||
if (empty($newval)) {
|
||||
$newval = '0';
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
$units = $objimport->array_import_convertvalue[0][$val]['units'];
|
||||
if ($this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] != '') {
|
||||
$newval = $this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval];
|
||||
} else {
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method . ', units=' . $units);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
// Try the fetch from code or ref
|
||||
call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
|
||||
$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
|
||||
$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] = $scaleorid;
|
||||
//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
|
||||
if ($classinstance->id > 0) { // we found record
|
||||
$newval = $scaleorid ? $scaleorid : 0;
|
||||
} else {
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
|
||||
}
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codeclient(null, 0);
|
||||
$newval = $this->thirdpartyobject->code_client;
|
||||
//print 'code_client='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codefournisseur(null, 1);
|
||||
$newval = $this->thirdpartyobject->code_fournisseur;
|
||||
//print 'code_fournisseur='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codecompta('customer');
|
||||
$newval = $this->thirdpartyobject->code_compta_client;
|
||||
//print 'code_compta='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirdpartyobject->get_codecompta('supplier');
|
||||
$newval = $this->thirdpartyobject->code_compta_fournisseur;
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
//print 'code_compta_fournisseur='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$defaultref = '';
|
||||
|
||||
$classModForNumber = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$pathModForNumber = $objimport->array_import_convertvalue[0][$val]['path'];
|
||||
|
||||
if (!empty($classModForNumber) && !empty($pathModForNumber) && is_readable(DOL_DOCUMENT_ROOT.$pathModForNumber)) {
|
||||
require_once DOL_DOCUMENT_ROOT.$pathModForNumber;
|
||||
$modForNumber = new $classModForNumber();
|
||||
'@phan-var-force ModeleNumRefMembers|ModeleNumRefCommandes|ModeleNumRefSuppliersInvoices|ModeleNumRefSuppliersOrders|ModeleNumRefProjects|ModeleNumRefTask|ModeleNumRefPropales $modForNumber';
|
||||
|
||||
$tmpobject = null;
|
||||
// Set the object with the date property when we can
|
||||
if (!empty($objimport->array_import_convertvalue[0][$val]['classobject'])) {
|
||||
$pathForObject = $objimport->array_import_convertvalue[0][$val]['pathobject'];
|
||||
require_once DOL_DOCUMENT_ROOT.$pathForObject;
|
||||
$tmpclassobject = $objimport->array_import_convertvalue[0][$val]['classobject'];
|
||||
$tmpobject = new $tmpclassobject($this->db);
|
||||
foreach ($arrayfield as $tmpkey => $tmpval) { // $arrayfield is array('c.ref'=>1, ...)
|
||||
if (in_array($tmpkey, array('t.date', 'c.date_commande'))) {
|
||||
$tmpobject->date = dol_stringtotime($arrayrecord[$arrayfield[$tmpkey]]['val'], 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$defaultref = $modForNumber->getNextValue(null, $tmpobject);
|
||||
}
|
||||
if (is_numeric($defaultref) && $defaultref <= 0) { // If error
|
||||
$defaultref = '';
|
||||
}
|
||||
$newval = $defaultref;
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$val]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$val]['method'];
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, $key));
|
||||
if (empty($classinstance->error) && empty($classinstance->errors)) {
|
||||
$newval = $res; // We get new value computed.
|
||||
} else {
|
||||
$this->errors[$error]['type'] = 'CLASSERROR';
|
||||
$this->errors[$error]['lib'] = implode(
|
||||
"\n",
|
||||
array_merge([$classinstance->error], $classinstance->errors)
|
||||
);
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
|
||||
$newval = price2num($newval);
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
|
||||
if (!getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
|
||||
$newval = rtrim(trim($newval), "0");
|
||||
} else {
|
||||
$newval = trim($newval);
|
||||
}
|
||||
}
|
||||
|
||||
//print 'Val to use as insert is '.$newval.'<br>';
|
||||
}
|
||||
|
||||
// Test regexp
|
||||
if (!empty($objimport->array_import_regex[0][$val]) && ($newval != '')) {
|
||||
// If test is "Must exist in a field@table or field@table:..."
|
||||
$reg = array();
|
||||
if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg)) {
|
||||
$field = $reg[1];
|
||||
$table = $reg[2];
|
||||
$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
|
||||
|
||||
$cachekey = $field . '@' . $table;
|
||||
if (!empty($filter)) {
|
||||
$cachekey .= ':' . $filter;
|
||||
}
|
||||
|
||||
// Load content of field@table into cache array
|
||||
if (!is_array($this->cachefieldtable[$cachekey])) { // If content of field@table not already loaded into cache
|
||||
$sql = "SELECT " . $field . " as aliasfield FROM " . $table;
|
||||
if (!empty($filter)) {
|
||||
$sql .= ' WHERE ' . $filter;
|
||||
}
|
||||
|
||||
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
$num = $this->db->num_rows($resql);
|
||||
$i = 0;
|
||||
while ($i < $num) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
if ($obj) {
|
||||
$this->cachefieldtable[$cachekey][] = $obj->aliasfield;
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
} else {
|
||||
dol_print_error($this->db);
|
||||
}
|
||||
}
|
||||
|
||||
// Now we check cache is not empty (should not) and key is into cache
|
||||
if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
|
||||
$tableforerror = $table;
|
||||
if (!empty($filter)) {
|
||||
$tableforerror .= ':' . $filter;
|
||||
}
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
|
||||
$this->errors[$error]['type'] = 'FOREIGNKEY';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
} elseif (!preg_match('/' . $objimport->array_import_regex[0][$val] . '/i', $newval)) {
|
||||
// If test is just a static regex
|
||||
//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
|
||||
$this->errors[$error]['type'] = 'REGEX';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
|
||||
// Check HTML injection
|
||||
$inj = testSqlAndScriptInject($newval, 0);
|
||||
if ($inj) {
|
||||
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
|
||||
$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorHtmlInjectionForField', $key, dol_trunc($newval, 100));
|
||||
$this->errors[$error]['type'] = 'HTMLINJECTION';
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
|
||||
// Other tests
|
||||
// ...
|
||||
}
|
||||
|
||||
// Define $listfields and $listvalues to build the SQL request
|
||||
if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
|
||||
if (!in_array("socialnetworks", $listfields)) {
|
||||
$listfields[] = "socialnetworks";
|
||||
$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
|
||||
$listvalues[$socialkey] = '';
|
||||
}
|
||||
if (!empty($newval) && $arrayrecord[($key)]['type'] > 0) {
|
||||
$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
|
||||
$socialnetwork = explode("_", $fieldname)[1];
|
||||
if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
|
||||
$json = new stdClass();
|
||||
$json->$socialnetwork = $newval;
|
||||
$listvalues[$socialkey] = json_encode($json);
|
||||
} else {
|
||||
$jsondata = $listvalues[$socialkey];
|
||||
$json = json_decode($jsondata);
|
||||
$json->$socialnetwork = $newval;
|
||||
$listvalues[$socialkey] = json_encode($json);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$listfields[] = $fieldname;
|
||||
|
||||
// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
|
||||
if (empty($newval) && $arrayrecord[($key)]['type'] < 0) {
|
||||
$listvalues[] = ($newval == '0' ? (int) $newval : "null");
|
||||
} elseif (empty($newval) && $arrayrecord[($key)]['type'] == 0) {
|
||||
$listvalues[] = "''";
|
||||
} else {
|
||||
$listvalues[] = "'".$this->db->escape($newval)."'";
|
||||
}
|
||||
}
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
|
||||
// We add hidden fields (but only if there is at least one field to add into table)
|
||||
// We process here all the fields that were declared into the array $this->import_fieldshidden_array of the descriptor file.
|
||||
// Previously we processed the ->import_fields_array.
|
||||
if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
|
||||
// Loop on each hidden fields to add them into listfields/listvalues
|
||||
foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
|
||||
if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $key)) {
|
||||
continue; // Not a field of current table
|
||||
}
|
||||
$keyfieldcache = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
|
||||
if (in_array($keyfieldcache, $listfields)) { // avoid duplicates in insert
|
||||
continue;
|
||||
} elseif ($val == 'user->id') {
|
||||
$listfields[] = $keyfieldcache;
|
||||
$listvalues[] = ((int) $user->id);
|
||||
} elseif (preg_match('/^lastrowid-/', $val)) {
|
||||
$tmp = explode('-', $val);
|
||||
$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
|
||||
$listfields[] = $keyfieldcache;
|
||||
$keyfield = $keyfieldcache;
|
||||
$listvalues[] = (int) $lastinsertid;
|
||||
//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
|
||||
} elseif (preg_match('/^const-/', $val)) {
|
||||
$tmp = explode('-', $val, 2);
|
||||
$listfields[] = $keyfieldcache;
|
||||
$listvalues[] = "'".$this->db->escape($tmp[1])."'";
|
||||
} elseif (preg_match('/^rule-/', $val)) {
|
||||
$fieldname = $key;
|
||||
$classinstance = null;
|
||||
if (!empty($objimport->array_import_convertvalue[0][$fieldname])) {
|
||||
if ($objimport->array_import_convertvalue[0][$fieldname]['rule'] == 'compute') {
|
||||
$file = (empty($objimport->array_import_convertvalue[0][$fieldname]['classfile']) ? $objimport->array_import_convertvalue[0][$fieldname]['file'] : $objimport->array_import_convertvalue[0][$fieldname]['classfile']);
|
||||
$class = $objimport->array_import_convertvalue[0][$fieldname]['class'];
|
||||
$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
|
||||
$type = $objimport->array_import_convertvalue[0][$fieldname]['type'];
|
||||
$resultload = dol_include_once($file);
|
||||
if (empty($resultload)) {
|
||||
dol_print_error(null, 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
|
||||
break;
|
||||
}
|
||||
$classinstance = new $class($this->db);
|
||||
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, $key));
|
||||
$fieldArr = explode('.', $fieldname);
|
||||
if (count($fieldArr) > 0) {
|
||||
$fieldname = $fieldArr[1];
|
||||
}
|
||||
|
||||
// Set $listfields and $listvalues
|
||||
$listfields[] = $fieldname;
|
||||
if ($type == 'int') {
|
||||
$listvalues[] = (int) $res;
|
||||
} elseif ($type == 'double') {
|
||||
$listvalues[] = (float) $res;
|
||||
} else {
|
||||
$listvalues[] = "'".$this->db->escape($res)."'";
|
||||
}
|
||||
} else {
|
||||
$this->errors[$error]['type'] = 'CLASSERROR';
|
||||
if (is_object($classinstance)) { // @phpstan-ignore-line
|
||||
$this->errors[$error]['lib'] = implode(
|
||||
"\n",
|
||||
array_merge([$classinstance->error], $classinstance->errors)
|
||||
);
|
||||
} else {
|
||||
$this->errors[$error]['lib']
|
||||
= "Unexpected rule ".$objimport->array_import_convertvalue[0][$fieldname]['rule'];
|
||||
}
|
||||
|
||||
$errorforthistable++;
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$this->errors[$error]['lib'] = 'Bad value of profile setup ' . $val . ' for array_import_fieldshidden';
|
||||
$this->errors[$error]['type'] = 'Import profile setup';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
|
||||
|
||||
// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
|
||||
// so we can try to make the insert or update now.
|
||||
if (!$errorforthistable) {
|
||||
//print "$alias/$tablename/$listfields/$listvalues<br>";
|
||||
if (!empty($listfields)) {
|
||||
$updatedone = false;
|
||||
$insertdone = false;
|
||||
|
||||
$is_table_category_link = false;
|
||||
$fname = 'rowid';
|
||||
if (strpos($tablename, '_categorie_') !== false) {
|
||||
$is_table_category_link = true;
|
||||
$fname = '*';
|
||||
}
|
||||
|
||||
if (!empty($updatekeys)) {
|
||||
// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
|
||||
|
||||
if (empty($lastinsertid)) { // No insert done yet for a parent table
|
||||
$sqlSelect = "SELECT ".$fname." FROM " . $tablename;
|
||||
|
||||
$data = array_combine($listfields, $listvalues);
|
||||
|
||||
$where = array(); // filters to forge SQL request
|
||||
// @phpstan-ignore-next-line
|
||||
'@phan-var string[] $where';
|
||||
$filters = array(); // filters to forge output error message
|
||||
foreach ($updatekeys as $key) {
|
||||
$col = $objimport->array_import_updatekeys[0][$key];
|
||||
$key = preg_replace('/^.*\./i', '', $key);
|
||||
if (isModEnabled("socialnetworks") && strpos($key, "socialnetworks") !== false) {
|
||||
$tmp = explode("_", $key);
|
||||
$key = $tmp[0];
|
||||
$socialnetwork = $tmp[1];
|
||||
$jsondata = $data[$key];
|
||||
$json = json_decode($jsondata);
|
||||
$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
|
||||
//var_dump($stringtosearch);
|
||||
//var_dump($this->db->escape($stringtosearch)); // This provide a value for sql string (but not for a like)
|
||||
$where[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
|
||||
$filters[] = $col." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
|
||||
//var_dump($where[1]); // This provide a value for sql string inside a like
|
||||
} else {
|
||||
$where[] = $key.' = '.$data[$key];
|
||||
$filters[] = $col.' = '.$data[$key];
|
||||
}
|
||||
}
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$where[] = "entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
$filters[] = "entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
}
|
||||
$sqlSelect .= " WHERE " . implode(' AND ', $where);
|
||||
|
||||
$resql = $this->db->query($sqlSelect);
|
||||
if ($resql) {
|
||||
$num_rows = $this->db->num_rows($resql);
|
||||
if ($num_rows == 1) {
|
||||
$res = $this->db->fetch_object($resql);
|
||||
$lastinsertid = $res->rowid;
|
||||
$keyfield = 'rowid';
|
||||
if ($is_table_category_link) {
|
||||
$lastinsertid = 'linktable';
|
||||
} // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
|
||||
$last_insert_id_array[$tablename] = $lastinsertid;
|
||||
} elseif ($num_rows > 1) {
|
||||
$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
} else {
|
||||
// No record found with filters, insert will be tried below
|
||||
}
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
} else {
|
||||
// We have a last INSERT ID (got by previous pass), so we check if we have a row referencing this foreign key.
|
||||
// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
|
||||
// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
|
||||
// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
|
||||
// Note: For extrafield tablename, we have in importfieldshidden_array an entry 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
|
||||
$sqlSelect = "SELECT rowid FROM " . $tablename;
|
||||
if (empty($keyfield)) {
|
||||
$keyfield = 'rowid';
|
||||
}
|
||||
|
||||
$sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
|
||||
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$sqlSelect .= " AND entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
}
|
||||
|
||||
$resql = $this->db->query($sqlSelect);
|
||||
if ($resql) {
|
||||
$res = $this->db->fetch_object($resql);
|
||||
if ($this->db->num_rows($resql) == 1) {
|
||||
// We have a row referencing this last foreign key, continue with UPDATE.
|
||||
} else {
|
||||
// No record found referencing this last foreign key,
|
||||
// force $lastinsertid to 0 so we INSERT below.
|
||||
$lastinsertid = 0;
|
||||
}
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($lastinsertid)) {
|
||||
// We db escape social network field because he isn't in field creation
|
||||
if (in_array("socialnetworks", $listfields)) {
|
||||
$socialkey = array_search("socialnetworks", $listfields);
|
||||
$tmpsql = $listvalues[$socialkey];
|
||||
$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
|
||||
}
|
||||
|
||||
// Build SQL UPDATE request
|
||||
$sqlstart = "UPDATE " . $tablename;
|
||||
|
||||
$data = array_combine($listfields, $listvalues);
|
||||
$set = array();
|
||||
foreach ($data as $key => $val) {
|
||||
$set[] = $key." = ".$val; // $val was escaped/sanitized previously
|
||||
}
|
||||
$sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
|
||||
if (empty($keyfield)) {
|
||||
$keyfield = 'rowid';
|
||||
}
|
||||
|
||||
$sqlend = " WHERE " . $keyfield . " = ".((int) $lastinsertid);
|
||||
|
||||
if ($is_table_category_link) {
|
||||
'@phan-var-force string[] $where';
|
||||
$sqlend = " WHERE " . implode(' AND ', $where);
|
||||
}
|
||||
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$sqlend .= " AND entity IN (".getEntity($this->getElementFromTableWithPrefix($tablename)).")";
|
||||
}
|
||||
|
||||
$sql = $sqlstart . $sqlend;
|
||||
|
||||
// Run update request
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
|
||||
$updatedone = true;
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Update not done, we do insert
|
||||
if (!$error && !$updatedone) {
|
||||
// We db escape social network field because he isn't in field creation
|
||||
if (in_array("socialnetworks", $listfields)) {
|
||||
$socialkey = array_search("socialnetworks", $listfields);
|
||||
$tmpsql = $listvalues[$socialkey];
|
||||
$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
|
||||
}
|
||||
|
||||
// Build SQL INSERT request
|
||||
$sqlstart = "INSERT INTO " . $tablename . "(" . implode(", ", $listfields) . ", import_key";
|
||||
$sqlend = ") VALUES(" . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
|
||||
if (!empty($tablewithentity_cache[$tablename])) {
|
||||
$sqlstart .= ", entity";
|
||||
$sqlend .= ", " . $conf->entity;
|
||||
}
|
||||
if (!empty($objimport->array_import_tables_creator[0][$alias])) {
|
||||
$sqlstart .= ", " . $objimport->array_import_tables_creator[0][$alias];
|
||||
$sqlend .= ", " . $user->id;
|
||||
}
|
||||
$sql = $sqlstart . $sqlend . ")";
|
||||
//dol_syslog("import_xlsx.modules", LOG_DEBUG);
|
||||
|
||||
// Run insert request
|
||||
if ($sql) {
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
if (!$is_table_category_link) {
|
||||
$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
|
||||
}
|
||||
$insertdone = true;
|
||||
} else {
|
||||
//print 'E';
|
||||
$this->errors[$error]['lib'] = $this->db->lasterror();
|
||||
$this->errors[$error]['type'] = 'SQL';
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/*else
|
||||
{
|
||||
dol_print_error(null,'ErrorFieldListEmptyFor '.$alias."/".$tablename);
|
||||
}*/
|
||||
}
|
||||
|
||||
if ($error) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ($updatedone) {
|
||||
$this->nbupdate++;
|
||||
}
|
||||
if ($insertdone) {
|
||||
$this->nbinsert++;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
return $this->commonImportInsert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys, 1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1190,6 +1190,23 @@ class EmailCollector extends CommonObject
|
|||
$sourcedir = $this->source_directory;
|
||||
$targetdir = ($this->target_directory ? $this->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
|
||||
|
||||
// Avoid long blocks on IMAP operations (applies to native IMAP and Webklex/php-imap).
|
||||
$timeoutconnect = (int) getDolGlobalInt('MAIN_USE_CONNECT_TIMEOUT', 5);
|
||||
if ($timeoutconnect <= 0) {
|
||||
$timeoutconnect = 5;
|
||||
}
|
||||
$timeoutread = (int) getDolGlobalInt('MAIN_USE_RESPONSE_TIMEOUT', 20);
|
||||
if ($timeoutread <= 0) {
|
||||
$timeoutread = 20;
|
||||
}
|
||||
if (function_exists('imap_timeout')) {
|
||||
imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect); // timeout seems ignored with ssl connect
|
||||
imap_timeout(IMAP_READTIMEOUT, $timeoutread);
|
||||
imap_timeout(IMAP_WRITETIMEOUT, 5);
|
||||
imap_timeout(IMAP_CLOSETIMEOUT, 5);
|
||||
$this->debuginfo .= 'IMAP timeouts: connect='.$timeoutconnect.'s, read='.$timeoutread.'s<br>';
|
||||
}
|
||||
|
||||
if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
|
||||
if ($this->acces_type == 1) {
|
||||
// Mode OAUth2 (access_type == 1) with PHP-IMAP
|
||||
|
|
|
|||
|
|
@ -151,15 +151,23 @@ $step = (GETPOST('step') ? GETPOST('step') : 1);
|
|||
$import_name = GETPOST('import_name');
|
||||
$hexa = GETPOST('hexa');
|
||||
$importmodelid = GETPOSTINT('importmodelid');
|
||||
$excludefirstline = (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 2);
|
||||
$endatlinenb = (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
|
||||
$updatekeys = (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array());
|
||||
$excludefirstline = (GETPOST('excludefirstline', 'alphanohtml', 3) ? GETPOST('excludefirstline', 'alphanohtml', 3) : 2);
|
||||
$endatlinenb = (GETPOST('endatlinenb', 'alphanohtml', 3) ? GETPOST('endatlinenb', 'alphanohtml', 3) : '');
|
||||
$updatekeys = (GETPOST('updatekeys', 'array', 3) ? GETPOST('updatekeys', 'array', 3) : array());
|
||||
$importtriggermode = GETPOST('importtriggermode', 'alpha', 3);
|
||||
$separator = (GETPOST('separator', 'nohtml') ? GETPOST('separator', 'nohtml', 3) : '');
|
||||
$enclosure = (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"'); // We must use 'nohtml' and not 'alphanohtml' because we must accept "
|
||||
$charset = GETPOST('charset', 'aZ09');
|
||||
$separator_used = str_replace('\t', "\t", $separator);
|
||||
$relativepath = '';
|
||||
|
||||
if (empty($importtriggermode)) {
|
||||
$importtriggermode = getDolGlobalString('IMPORT_TRIGGER_MODE_DEFAULT', 'strict_line');
|
||||
}
|
||||
if (!in_array($importtriggermode, array('strict_line', 'fast_bulk'), true)) {
|
||||
$importtriggermode = 'strict_line';
|
||||
}
|
||||
|
||||
$objimport = new Import($db);
|
||||
$objimport->load_arrays($user, ($step == 1 ? '' : $datatoimport));
|
||||
|
||||
|
|
@ -1130,7 +1138,8 @@ if ($step == 3 && $datatoimport) {
|
|||
$htmltext .= $langs->trans("DataComeFromIdFoundFromRef", $langs->transnoentitiesnoconv($entitylang)).'<br>';
|
||||
}
|
||||
if ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromcodeid') {
|
||||
$htmltext .= $langs->trans("DataComeFromIdFoundFromCodeId", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$tmpcode]['dict'])).'<br>';
|
||||
$dictlabel = $objimport->array_import_convertvalue[0][$tmpcode]['dict'] ?? '';
|
||||
$htmltext .= $langs->trans("DataComeFromIdFoundFromCodeId", $langs->transnoentitiesnoconv($dictlabel)).'<br>';
|
||||
}
|
||||
}
|
||||
// Source required
|
||||
|
|
@ -1144,7 +1153,8 @@ if ($step == 3 && $datatoimport) {
|
|||
if ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromref') {
|
||||
$htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.str_replace('"', '', $example).')' : '').'</b><br>';
|
||||
} elseif ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromcodeid') {
|
||||
$htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$tmpcode]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.str_replace('"', '', $example).')' : '').'</b><br>';
|
||||
$dictlabel = $objimport->array_import_convertvalue[0][$tmpcode]['dict'] ?? '';
|
||||
$htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($dictlabel)).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.str_replace('"', '', $example).')' : '').'</b><br>';
|
||||
} elseif ($example) {
|
||||
$htmltext .= $langs->trans("SourceExample").': <b>'.str_replace('"', '', $example).'</b><br>';
|
||||
}
|
||||
|
|
@ -1505,6 +1515,8 @@ if ($step == 4 && $datatoimport) {
|
|||
require_once $dir.$file;
|
||||
$obj = new $classname($db, $datatoimport);
|
||||
'@phan-var-force ModeleImports $obj';
|
||||
$obj->importtriggermode = $importtriggermode;
|
||||
$obj->importissimulation = 1;
|
||||
if ($model == 'csv') {
|
||||
'@phan-var-force ImportCsv $obj';
|
||||
$obj->separator = $separator_used;
|
||||
|
|
@ -1529,7 +1541,7 @@ if ($step == 4 && $datatoimport) {
|
|||
|
||||
$nboflines = $obj->import_get_nb_of_lines($conf->import->dir_temp.'/'.$filetoimport);
|
||||
|
||||
$param = '&leftmenu=import&format='.urlencode($format).'&datatoimport='.urlencode($datatoimport).'&filetoimport='.urlencode($filetoimport).'&nboflines='.((int) $nboflines).'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure);
|
||||
$param = '&leftmenu=import&format='.urlencode($format).'&datatoimport='.urlencode($datatoimport).'&filetoimport='.urlencode($filetoimport).'&nboflines='.((int) $nboflines).'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure).'&importtriggermode='.urlencode($importtriggermode);
|
||||
$param2 = $param; // $param2 = $param without excludefirstline and endatlinenb
|
||||
if ($excludefirstline) {
|
||||
$param .= '&excludefirstline='.urlencode($excludefirstline);
|
||||
|
|
@ -1550,6 +1562,7 @@ if ($step == 4 && $datatoimport) {
|
|||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="step" value="4">'; // step 4
|
||||
print '<input type="hidden" name="action" value="launchsimu">'; // step 4
|
||||
print '<input type="hidden" name="importtriggermode" value="'.dol_escape_htmltag($importtriggermode).'">';
|
||||
|
||||
print dol_get_fiche_head($head, 'step4', 'Import', -2, 'upload');
|
||||
|
||||
|
|
@ -1691,6 +1704,31 @@ if ($step == 4 && $datatoimport) {
|
|||
echo '</pre>';*/
|
||||
print '</td></tr>';
|
||||
|
||||
// Trigger mode
|
||||
print '<tr><td>';
|
||||
print $langs->trans("ImportTriggerModeLabel");
|
||||
print '</td><td>';
|
||||
$triggerModeChoices = array(
|
||||
'strict_line' => $langs->trans("ImportTriggerModeStrictLine"),
|
||||
'fast_bulk' => $langs->trans("ImportTriggerModeFastBulk"),
|
||||
);
|
||||
if ($action == 'launchsimu') {
|
||||
print dol_escape_htmltag($triggerModeChoices[$importtriggermode] ?? $importtriggermode);
|
||||
print '<input type="hidden" name="importtriggermode" value="'.dol_escape_htmltag($importtriggermode).'">';
|
||||
print ' <a href="'.$_SERVER["PHP_SELF"].'?step=4'.$param.'">'.$langs->trans("Modify").'</a>';
|
||||
} else {
|
||||
print $form->selectarray('importtriggermode', $triggerModeChoices, $importtriggermode, 0);
|
||||
}
|
||||
print '<br><span class="opacitymedium">';
|
||||
print $langs->trans("ImportTriggerModeHint");
|
||||
print '</span>';
|
||||
if ($importtriggermode === 'fast_bulk') {
|
||||
print '<br><span class="warning">';
|
||||
print $langs->trans("ImportTriggerModeFastBulkWarning");
|
||||
print '</span>';
|
||||
}
|
||||
print '</td></tr>';
|
||||
|
||||
print '</table>';
|
||||
print '</div>';
|
||||
|
||||
|
|
@ -1787,6 +1825,10 @@ if ($step == 4 && $datatoimport) {
|
|||
}
|
||||
print '</div>';
|
||||
} else {
|
||||
print '<div class="warning">';
|
||||
print '<b>'.$langs->trans("ImportTriggerModeSimulationWarningTitle").'</b><br>';
|
||||
print $langs->trans("ImportTriggerModeSimulationWarning");
|
||||
print '</div><br>';
|
||||
// Launch import
|
||||
$arrayoferrors = array();
|
||||
$arrayofwarnings = array();
|
||||
|
|
@ -1839,6 +1881,7 @@ if ($step == 4 && $datatoimport) {
|
|||
'fieldssource' => $fieldssource,
|
||||
'importid' => $importid,
|
||||
'updatekeys' => $updatekeys,
|
||||
'importtriggermode' => $importtriggermode,
|
||||
'arrayoferrors' => &$arrayoferrors,
|
||||
'arrayofwarnings' => &$arrayofwarnings,
|
||||
'nbok' => &$nbok,
|
||||
|
|
@ -2009,6 +2052,8 @@ if ($step == 5 && $datatoimport) {
|
|||
require_once $dir.$file;
|
||||
$obj = new $classname($db, $datatoimport);
|
||||
'@phan-var-force ModeleImports $obj';
|
||||
$obj->importtriggermode = $importtriggermode;
|
||||
$obj->importissimulation = 0;
|
||||
if ($model == 'csv') {
|
||||
'@phan-var-force ImportCsv $obj';
|
||||
$obj->separator = $separator_used;
|
||||
|
|
@ -2032,7 +2077,7 @@ if ($step == 5 && $datatoimport) {
|
|||
|
||||
$nboflines = (GETPOSTISSET("nboflines") ? GETPOSTINT("nboflines") : dol_count_nb_of_line($conf->import->dir_temp.'/'.$filetoimport));
|
||||
|
||||
$param = '&format='.$format.'&datatoimport='.urlencode($datatoimport).'&filetoimport='.urlencode($filetoimport).'&nboflines='.((int) $nboflines);
|
||||
$param = '&format='.$format.'&datatoimport='.urlencode($datatoimport).'&filetoimport='.urlencode($filetoimport).'&nboflines='.((int) $nboflines).'&importtriggermode='.urlencode($importtriggermode);
|
||||
if ($excludefirstline) {
|
||||
$param .= '&excludefirstline='.urlencode($excludefirstline);
|
||||
}
|
||||
|
|
@ -2140,6 +2185,20 @@ if ($step == 5 && $datatoimport) {
|
|||
print '<input type="text" size="4" name="endatlinenb" disabled="disabled" value="'.$endatlinenb.'">';
|
||||
print '</td></tr>';
|
||||
|
||||
// Trigger mode
|
||||
print '<tr><td>';
|
||||
print $langs->trans("ImportTriggerModeLabel");
|
||||
print '</td><td>';
|
||||
if ($importtriggermode === 'fast_bulk') {
|
||||
print $langs->trans("ImportTriggerModeSummaryFast");
|
||||
} else {
|
||||
print $langs->trans("ImportTriggerModeSummaryStrict");
|
||||
}
|
||||
print '<br><span class="opacitymedium">';
|
||||
print $langs->trans("ImportTriggerModeSummaryHint");
|
||||
print '</span>';
|
||||
print '</td></tr>';
|
||||
|
||||
print '</table>';
|
||||
print '</div>';
|
||||
|
||||
|
|
@ -2262,6 +2321,7 @@ if ($step == 5 && $datatoimport) {
|
|||
'fieldssource' => $fieldssource,
|
||||
'importid' => $importid,
|
||||
'updatekeys' => $updatekeys,
|
||||
'importtriggermode' => $importtriggermode,
|
||||
'arrayoferrors' => &$arrayoferrors,
|
||||
'arrayofwarnings' => &$arrayofwarnings,
|
||||
'nbok' => &$nbok,
|
||||
|
|
@ -2322,6 +2382,22 @@ if ($step == 5 && $datatoimport) {
|
|||
}
|
||||
}
|
||||
|
||||
if (!$error && $importtriggermode === 'fast_bulk') {
|
||||
$resbulktrigger = $obj->runImportBulkTrigger($importid, $user, $langs, $conf);
|
||||
if ($resbulktrigger < 0) {
|
||||
$arrayoferrors['none'][] = array('lib' => $langs->trans("ErrorFailedTriggerCall"), 'type' => 'TRIGGER');
|
||||
if (!empty($obj->errors) && is_array($obj->errors)) {
|
||||
foreach ($obj->errors as $tmperror) {
|
||||
$lib = (is_array($tmperror) ? ($tmperror['lib'] ?? '') : $tmperror);
|
||||
if ($lib !== '') {
|
||||
$arrayoferrors['none'][] = array('lib' => $lib, 'type' => 'TRIGGER');
|
||||
}
|
||||
}
|
||||
}
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$error) {
|
||||
$db->commit(); // We can commit if no errors.
|
||||
} else {
|
||||
|
|
@ -2331,6 +2407,13 @@ if ($step == 5 && $datatoimport) {
|
|||
|
||||
print dol_get_fiche_end();
|
||||
|
||||
if ($importtriggermode === 'fast_bulk') {
|
||||
print '<div class="warning">';
|
||||
print '<b>'.$langs->trans("ImportTriggerModeFastBulkFinalWarningTitle").'</b><br>';
|
||||
print $langs->trans("ImportTriggerModeFastBulkFinalWarning");
|
||||
print '</div><br>';
|
||||
}
|
||||
|
||||
|
||||
// Show result
|
||||
print '<br>';
|
||||
|
|
|
|||
|
|
@ -154,3 +154,16 @@ ResultOfSimulationNoError=Result of simulation: No error
|
|||
NumberOfLinesLimited=Number of lines limited
|
||||
ErrorFileLinesReachEOF=File has %s lines. However we reach the end of file or an empty line at record %s. This may occurs when some records are split onto several lines and not correctly delimited by the "Char delimiter", or if there is line with no data on all fields.
|
||||
ImportInProcess=Import of file %s is in process
|
||||
ImportTriggerModeLabel=Import mode
|
||||
ImportTriggerModeStrictLine=Secure mode (slower) - applies all automatic actions on each imported line
|
||||
ImportTriggerModeFastBulk=Fast mode (faster) - does not apply automatic actions line by line
|
||||
ImportTriggerModeHint=Choose Secure mode if you use modules or automatic business actions (notifications, synchronizations, linked updates, etc.).
|
||||
ImportTriggerModeFastBulkWarning=Warning: in Fast mode, automatic actions are not executed for each line.
|
||||
ImportTriggerModeSimulationWarningTitle=Simulation mode
|
||||
ImportTriggerModeSimulationWarning=Simulation never executes automatic import actions.
|
||||
ImportTriggerModeSimulationInfo=Simulation: no automatic action is executed (this is expected).
|
||||
ImportTriggerModeSummaryFast=Fast mode (faster)
|
||||
ImportTriggerModeSummaryStrict=Secure mode (automatic actions on each line)
|
||||
ImportTriggerModeSummaryHint=Fast mode is recommended for high volumes. Secure mode is recommended when automatic business rules are required.
|
||||
ImportTriggerModeFastBulkFinalWarningTitle=Fast mode
|
||||
ImportTriggerModeFastBulkFinalWarning=During this import, automatic actions will not be executed line by line.
|
||||
|
|
|
|||
|
|
@ -1424,3 +1424,4 @@ since=since
|
|||
SignatureID=Signature
|
||||
except=except
|
||||
DUPLICATA=DUPLICATA
|
||||
ErrorFailedTriggerCall=Failed to call trigger
|
||||
|
|
|
|||
|
|
@ -154,3 +154,16 @@ ResultOfSimulationNoError=Résultat de la simulation : Aucune erreur
|
|||
NumberOfLinesLimited=Nombre de lignes limité
|
||||
ErrorFileLinesReachEOF=L'enregistrement fichier contient %s lignes. Cependant, nous atteignons la fin de fichier ou une ligne vide à l'enregistrement %s. Cela peut se produire lorsque certains enregistrements sont répartis sur plusieurs lignes et non correctement délimitées par le délimiteur de caractères, ou s'il existe une ligne sans données dans tous les champs.
|
||||
ImportInProcess=L'importation de fichier %s est en cours.
|
||||
ImportTriggerModeLabel=Mode d'import
|
||||
ImportTriggerModeStrictLine=Mode sécurisé (plus lent) - applique toutes les actions automatiques sur chaque ligne importée
|
||||
ImportTriggerModeFastBulk=Mode rapide (plus rapide) - n'applique pas les actions automatiques ligne par ligne
|
||||
ImportTriggerModeHint=Choisissez le mode sécurisé si vous utilisez des modules ou des actions automatiques (notifications, synchronisations, mises à jour liées, etc.).
|
||||
ImportTriggerModeFastBulkWarning=Attention : en mode rapide, les actions automatiques ne sont pas exécutées pour chaque ligne.
|
||||
ImportTriggerModeSimulationWarningTitle=Mode simulation
|
||||
ImportTriggerModeSimulationWarning=La simulation n'exécute jamais les actions automatiques de l'import.
|
||||
ImportTriggerModeSimulationInfo=Simulation : aucune action automatique n'est exécutée (c'est normal).
|
||||
ImportTriggerModeSummaryFast=Mode rapide (plus rapide)
|
||||
ImportTriggerModeSummaryStrict=Mode sécurisé (actions automatiques sur chaque ligne)
|
||||
ImportTriggerModeSummaryHint=Le mode rapide est conseillé pour les gros volumes. Le mode sécurisé est conseillé si vous avez des règles métier automatiques.
|
||||
ImportTriggerModeFastBulkFinalWarningTitle=Mode rapide
|
||||
ImportTriggerModeFastBulkFinalWarning=Pendant cet import, les actions automatiques ne seront pas exécutées ligne par ligne.
|
||||
|
|
|
|||
|
|
@ -1067,7 +1067,7 @@ twelve=douze
|
|||
thirteen=treize
|
||||
fourteen=quatorze
|
||||
fifteen=quinze
|
||||
sixteen=soixante
|
||||
sixteen=seize
|
||||
seventeen=dix-sept
|
||||
eighteen=dix-huit
|
||||
nineteen=dix-neuf
|
||||
|
|
@ -1422,3 +1422,4 @@ since=depuis
|
|||
SignatureID=Signature
|
||||
except=sauf
|
||||
DUPLICATA=DUPLICATA
|
||||
ErrorFailedTriggerCall=Echec de l'appel du trigger
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* Copyright (C) 2013-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
|
||||
* Copyright (C) 2015-2017 Jean-François Ferry <jfefe@aternatik.fr>
|
||||
* Copyright (C) 2015 Ari Elbaz (elarifr) <github@accedinfo.com>
|
||||
* Copyright (C) 2015-2018 Charlene Benke <charlie@patas-monkey.com>
|
||||
* Copyright (C) 2015-2026 Charlene Benke <charlene@patas-monkey.com>
|
||||
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||
* Copyright (C) 2018-2026 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2018 David Beniamine <David.Beniamine@Tetras-Libre.fr>
|
||||
|
|
@ -3224,14 +3224,6 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', '', '', !is_object($societe) || empty($societe->default_lang) ? '' : $societe->default_lang);
|
||||
$somethingshown = $formfile->numoffiles;
|
||||
|
||||
// Show links to link elements
|
||||
$tmparray = $form->showLinkToObjectBlock($object, array(), array(), 1);
|
||||
$linktoelem = $tmparray['linktoelem'];
|
||||
$htmltoenteralink = $tmparray['htmltoenteralink'];
|
||||
print $htmltoenteralink;
|
||||
|
||||
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
|
||||
|
||||
$MAXEVENT = 10;
|
||||
|
||||
$morehtmlcenter = '<div class="nowraponall">';
|
||||
|
|
|
|||
Loading…
Reference in a new issue