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

HOR-3485

Browse Source 
update

update

update

update

coding style

Remove LoadClass & LoadSystem
This commit is contained in:
hjonathan
2017-08-07 13:11:09 -04:00
parent 74889e7a2a
commit 4bdad263cd
2 changed files with 37 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -76,7 +76,8 @@
"gulliver/includes/smarty_plugins/function.pmos.php", "gulliver/includes/smarty_plugins/function.pmos.php",
"thirdparty/pear/PEAR.php", "thirdparty/pear/PEAR.php",
"thirdparty/HTMLPurifier/HTMLPurifier.auto.php", "thirdparty/HTMLPurifier/HTMLPurifier.auto.php",
"workflow/engine/classes/class.pmFunctions.php" "workflow/engine/classes/class.pmFunctions.php",
"workflow/engine/classes/class.pmScript.php"
] ]
} }
} }

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

@@ -451,30 +451,32 @@ class pmTablesProxy extends HttpProxyController
$this->message = $this->success ? G::loadTranslation( 'ID_DELETED_SUCCESSFULLY' ) : G::loadTranslation( 'ID_DELETE_FAILED' ); $this->message = $this->success ? G::loadTranslation( 'ID_DELETED_SUCCESSFULLY' ) : G::loadTranslation( 'ID_DELETE_FAILED' );
} }
public function importCSV ($httpData) /**
* Import pmTable from CSV file
* @param $httpData
*/
public function importCSV($httpData)
{ {
$filter = new InputFilter(); $filter = new InputFilter();
$countRow = 250; $countRow = 250;
$tmpfilename = $_FILES['form']['tmp_name']['CSV_FILE']; $tmpfilename = $_FILES['form']['tmp_name']['CSV_FILE'];
//$tmpfilename = $filter->xssFilterHard($tmpfilename, 'path'); if (preg_match('/[\x00-\x08\x0b-\x0c\x0e\x1f]/', file_get_contents($tmpfilename)) === 0) {
if (preg_match( '/[\x00-\x08\x0b-\x0c\x0e\x1f]/', file_get_contents( $tmpfilename ) ) === 0) {
$filename = $_FILES['form']['name']['CSV_FILE']; $filename = $_FILES['form']['name']['CSV_FILE'];
//$filename = $filter->xssFilterHard($filename, 'path'); if ($oFile = fopen($filter->xssFilterHard($tmpfilename, 'path'), 'r')) {
if ($oFile = fopen( $filter->xssFilterHard($tmpfilename, 'path'), 'r' )) {
require_once 'classes/model/AdditionalTables.php'; require_once 'classes/model/AdditionalTables.php';
$oAdditionalTables = new AdditionalTables(); $oAdditionalTables = new AdditionalTables();
$aAdditionalTables = $oAdditionalTables->load( $_POST['form']['ADD_TAB_UID'], true ); $aAdditionalTables = $oAdditionalTables->load($_POST['form']['ADD_TAB_UID'], true);
$sErrorMessages = ''; $sErrorMessages = '';
$i = 1; $i = 1;
$conData = 0; $conData = 0;
$insert = 'REPLACE INTO ' . $aAdditionalTables['ADD_TAB_NAME'] . ' ('; $insert = 'REPLACE INTO ' . $aAdditionalTables['ADD_TAB_NAME'] . ' (';
$query = ''; $query = '';
$swHead = false; $swHead = false;
while (($aAux = fgetcsv( $oFile, 4096, $_POST['form']['CSV_DELIMITER'] )) !== false) { while (($aAux = fgetcsv($oFile, 4096, $_POST['form']['CSV_DELIMITER'], '"', '"')) !== false) {
if (! is_null( $aAux[0] )) { if (!is_null($aAux[0])) {
if (count( $aAdditionalTables['FIELDS'] ) > count( $aAux )) { if (count($aAdditionalTables['FIELDS']) > count($aAux)) {
$this->success = false; $this->success = false;
$this->message = G::LoadTranslation( 'INVALID_FILE' ); $this->message = G::LoadTranslation('INVALID_FILE');
return 0; return 0;
} }
if ($i == 1) { if ($i == 1) {
@@ -484,7 +486,7 @@ class pmTablesProxy extends HttpProxyController
if ($aField['FLD_NAME'] === $aAux[$j]) { if ($aField['FLD_NAME'] === $aAux[$j]) {
$swHead = true; $swHead = true;
} }
$j ++; $j++;
} }
$insert = substr($insert, 0, -2); $insert = substr($insert, 0, -2);
$insert .= ') VALUES '; $insert .= ') VALUES ';
@@ -495,13 +497,11 @@ class pmTablesProxy extends HttpProxyController
$j = 0; $j = 0;
foreach ($aAdditionalTables['FIELDS'] as $aField) { foreach ($aAdditionalTables['FIELDS'] as $aField) {
$conData++; $conData++;
if (array_key_exists($j, $aAux)) { if (array_key_exists($j, $aAux)) {
$temp = '"' . addslashes(stripslashes(G::is_utf8($aAux[$j]) ? $aAux[$j] : utf8_encode($aAux[$j]))) . '"'; $temp = '"' . addslashes(G::is_utf8($aAux[$j]) ? $aAux[$j] : utf8_encode($aAux[$j])) . '"';
} else { } else {
$temp = '""'; $temp = '""';
} }
if ($temp == '') { if ($temp == '') {
switch ($aField['FLD_TYPE']) { switch ($aField['FLD_TYPE']) {
case 'DATE': case 'DATE':
@@ -510,7 +510,7 @@ class pmTablesProxy extends HttpProxyController
break; break;
} }
} }
$j ++; $j++;
$queryRow .= $temp . ','; $queryRow .= $temp . ',';
} }
$query .= substr($queryRow, 0, -1) . '),'; $query .= substr($queryRow, 0, -1) . '),';
@@ -522,15 +522,15 @@ class pmTablesProxy extends HttpProxyController
$conData = 0; $conData = 0;
} }
} catch (Exception $oError) { } catch (Exception $oError) {
$sErrorMessages .= G::LoadTranslation( 'ID_ERROR_INSERT_LINE' ) . ': ' . G::LoadTranslation( 'ID_LINE' ) . ' ' . $i . '. '; $sErrorMessages .= G::LoadTranslation('ID_ERROR_INSERT_LINE') . ': ' . G::LoadTranslation('ID_LINE') . ' ' . $i . '. ';
} }
} else { } else {
$swHead = false; $swHead = false;
} }
$i ++; $i++;
} }
} }
fclose( $oFile ); fclose($oFile);
if ($conData > 0) { if ($conData > 0) {
$query = substr($query, 0, -1); $query = substr($query, 0, -1);
executeQuery($insert . $query . ';', $aAdditionalTables['DBS_UID']); executeQuery($insert . $query . ';', $aAdditionalTables['DBS_UID']);
@@ -541,12 +541,12 @@ class pmTablesProxy extends HttpProxyController
$this->message = $sErrorMessages; $this->message = $sErrorMessages;
} else { } else {
$this->success = true; $this->success = true;
$this->message = G::loadTranslation( 'ID_FILE_IMPORTED_SUCCESSFULLY', array ($filename $this->message = G::loadTranslation('ID_FILE_IMPORTED_SUCCESSFULLY', array($filename
) ); ));
G::auditLog("ImportTable", $filename); G::auditLog("ImportTable", $filename);
} }
} else { } else {
$sMessage = G::LoadTranslation( 'ID_UPLOAD_VALID_CSV_FILE' ); $sMessage = G::LoadTranslation('ID_UPLOAD_VALID_CSV_FILE');
$this->success = false; $this->success = false;
$this->message = $sMessage; $this->message = $sMessage;
} }
@@ -637,11 +637,11 @@ class pmTablesProxy extends HttpProxyController
} }
/** /**
* export a pm tables record to CSV * Export pmTable to CSV format
* * @param $httpData
* @param string $httpData->id * @return StdClass
*/ */
public function exportCSV ($httpData) public function exportCSV($httpData)
{ {
$result = new StdClass(); $result = new StdClass();
try { try {
@@ -653,50 +653,30 @@ class pmTablesProxy extends HttpProxyController
require_once 'classes/model/AdditionalTables.php'; require_once 'classes/model/AdditionalTables.php';
$oAdditionalTables = new AdditionalTables(); $oAdditionalTables = new AdditionalTables();
$aAdditionalTables = $oAdditionalTables->load( $_POST['ADD_TAB_UID'], true ); $aAdditionalTables = $oAdditionalTables->load($_POST['ADD_TAB_UID'], true);
$sErrorMessages = ''; $sErrorMessages = '';
$sDelimiter = $_POST['CSV_DELIMITER']; $sDelimiter = $_POST['CSV_DELIMITER'];
$resultData = $oAdditionalTables->getAllData( $_POST['ADD_TAB_UID'], null, null, false ); $resultData = $oAdditionalTables->getAllData($_POST['ADD_TAB_UID'], null, null, false);
$rows = $resultData['rows']; $rows = $resultData['rows'];
$count = $resultData['count']; $count = $resultData['count'];
$PUBLIC_ROOT_PATH = PATH_DATA . 'sites' . PATH_SEP . SYS_SYS . PATH_SEP . 'public' . PATH_SEP; $PUBLIC_ROOT_PATH = PATH_DATA . 'sites' . PATH_SEP . SYS_SYS . PATH_SEP . 'public' . PATH_SEP;
$filenameOnly = strtolower( $aAdditionalTables['ADD_TAB_NAME'] . "_" . date( "Y-m-d" ) . '_' . date( "Hi" ) . ".csv" ); $filenameOnly = strtolower($aAdditionalTables['ADD_TAB_NAME'] . "_" . date("Y-m-d") . '_' . date("Hi") . ".csv");
$filename = $PUBLIC_ROOT_PATH . $filenameOnly; $filename = $PUBLIC_ROOT_PATH . $filenameOnly;
$fp = fopen( $filename, "wb" ); $fp = fopen($filename, "wb");
$swColumns = true; $swColumns = true;
foreach ($rows as $keyCol => $cols) { foreach ($rows as $keyCol => $cols) {
$SDATA = ""; if ($swColumns) {
$header = ""; fputcsv($fp, array_keys($cols), $sDelimiter, '"', "\\");
$cnt = $cntC = count( $cols ); $swColumns = false;
foreach ($cols as $key => $val) {
if($swColumns){
$header .= $key;
if (-- $cntC > 0) {
$header .= $sDelimiter;
} else {
$header .= "\n";
$bytesSaved += fwrite( $fp, $header );
$swColumns = false;
}
}
$SDATA .= addslashes($val);
if (-- $cnt > 0) {
$SDATA .= $sDelimiter;
}
} }
$SDATA .= "\n"; fputcsv($fp, $cols, $sDelimiter, '"');
$bytesSaved += fwrite( $fp, $SDATA );
} }
fclose( $fp ); fclose($fp);
// $filenameLink = "pmTables/streamExported?f=$filenameOnly";
$filenameLink = "streamExported?f=$filenameOnly"; $filenameLink = "streamExported?f=$filenameOnly";
$size = round( ($bytesSaved / 1024), 2 ) . " Kb"; $size = filesize($filename);
$filename = $filenameOnly;
$link = $filenameLink; $link = $filenameLink;
$result->success = true; $result->success = true;