fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

Browse Source
This commit is contained in:
Dante
2016-02-29 17:17:28 -04:00
parent 6e56feb708 3368a0d225
commit b66ae36c0f
17 changed files with 1651 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -692,7 +692,7 @@ class pmTablesProxy extends HttpProxyController
$sErrorMessages = '';
$i = 1;
$conData = 0;
$insert = 'INSERT INTO ' . $aAdditionalTables['ADD_TAB_NAME'] . ' (';
$insert = 'REPLACE INTO ' . $aAdditionalTables['ADD_TAB_NAME'] . ' (';
$query = '';
$swHead = false;
while (($aAux = fgetcsv( $oFile, 4096, $_POST['form']['CSV_DELIMITER'] )) !== false) {
@@ -720,7 +720,7 @@ class pmTablesProxy extends HttpProxyController
$j = 0;
foreach ($aAdditionalTables['FIELDS'] as $aField) {
$conData++;
$temp = isset($aAux[$j]) ? '"'.addslashes($aAux[$j]).'"' : '""';
$temp = isset($aAux[$j]) ? '"'.addslashes(stripslashes($aAux[$j])).'"' : '""';
if ($temp == '') {
switch ($aField['FLD_TYPE']) {
case 'DATE':
@@ -889,7 +889,7 @@ class pmTablesProxy extends HttpProxyController
$SDATA = "";
$cnt = count( $cols );
foreach ($cols as $key => $val) {
$SDATA .= $val;
$SDATA .= addslashes($val);
if (-- $cnt > 0) {
$SDATA .= $sDelimiter;
}