Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

fix in social import

Browse Source
This commit is contained in:
Lucas Marcouiller
2022-05-20 21:12:55 +02:00
parent 7e4070faa5
commit c887f48dee
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2951,7 +2951,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
} else {
if (!empty($dictsocialnetworks[$type]['url'])) {
$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);
$htmllink .= '&nbsp;<a href="'.$link.'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
$htmllink .= '&nbsp;<a href="'.dol_sanitizeUrl($link).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
} else {
$htmllink .= dol_escape_htmltag($value);
}

8
htdocs/core/modules/import/import_csv.modules.php
View File

@@ -717,14 +717,16 @@ class ImportCsv extends ModeleImports
$socialkey = array_search("socialnetworks", $listfields);
if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
$socialnetwork = explode("_", $fieldname)[1];
$newvalue = '\'{ "'.$socialnetwork.'" : "'.$this->db->escape($newval).'" }\'';
$listvalues[$socialkey] = $newvalue;
$json = new stdClass();
$json->$socialnetwork = $newval;
$newvalue = json_encode($json);
$listvalues[$socialkey] = "'".$this->db->escape($newvalue)."'";
} else {
$socialnetwork = explode("_", $fieldname)[1];
$jsondata = $listvalues[$socialkey];
$jsondata = str_replace("'", "", $jsondata);
$json = json_decode($jsondata);
$json->$socialnetwork = $this->db->escape($newval);
$json->$socialnetwork = $newval;
$listvalues[$socialkey] = "'".$this->db->escape(json_encode($json))."'";
}
}

4
htdocs/core/modules/import/import_xlsx.modules.php
View File

@@ -760,7 +760,9 @@ class ImportXlsx extends ModeleImports
$socialkey = array_search("socialnetworks", $listfields);
if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
$socialnetwork = explode("_", $fieldname)[1];
$newvalue = '\'{ "'.$socialnetwork.'" : "'.$this->db->escape($newval).'" }\'';
$json = new stdClass();
$json->$socialnetwork = $newval;
$newvalue = json_encode($json);
$listvalues[$socialkey] = $newvalue;
} else {
$socialnetwork = explode("_", $fieldname)[1];