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

Merge pull request #2219 from marcoAntonioNina/BUG-FILES

Browse Source 
BUG-FILES Upload files templates IMPROVEMENT
This commit is contained in:
julceslauhub
2013-12-19 12:59:25 -08:00
parent abeb321d71 ba8368fb00
commit 6ea01aebb4
3 changed files with 90 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -498,11 +498,19 @@ try {
case 'saveFile': case 'saveFile':
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
global $RBAC;
if ( $RBAC->userCanAccess('PM_FACTORY') == 1) {
G::LoadClass('processes');
$app = new Processes();
if (!$app->processExists($_REQUEST['pro_uid'])) {
echo G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED');
die;
}
$sDir = ""; $sDir = "";
if (isset($_REQUEST['MAIN_DIRECTORY'])) { if (isset($_REQUEST['MAIN_DIRECTORY'])) {
$sDir = $_REQUEST['MAIN_DIRECTORY']; $sDir = $_REQUEST['MAIN_DIRECTORY'];
} }
switch ($sDir) { switch ($sDir) {
case 'mailTemplates': case 'mailTemplates':
$sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
@@ -514,7 +522,6 @@ try {
$sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
break; break;
} }
$fp = fopen($sDirectory, 'w'); $fp = fopen($sDirectory, 'w');
$content = stripslashes($_REQUEST['fcontent']); $content = stripslashes($_REQUEST['fcontent']);
$content = str_replace("@amp@", "&", $content); $content = str_replace("@amp@", "&", $content);
@@ -522,6 +529,7 @@ try {
fwrite($fp, $content); fwrite($fp, $content);
fclose($fp); fclose($fp);
echo 'saved: ' . $sDirectory; echo 'saved: ' . $sDirectory;
}
break; break;
case 'events': case 'events':
$oProcessMap->eventsList($oData->pro_uid, $oData->type); $oProcessMap->eventsList($oData->pro_uid, $oData->type);

16
workflow/engine/methods/processes/processes_UploadFiles.php
View File

@@ -1,6 +1,13 @@
<?php <?php
global $RBAC;
switch ($_POST['form']['MAIN_DIRECTORY']) { if ( $RBAC->userCanAccess('PM_FACTORY') == 1) {
G::LoadClass('processes');
$app = new Processes();
if (!$app->processExists($_POST['form']['PRO_UID'])) {
echo G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED');
die;
}
switch ($_POST['form']['MAIN_DIRECTORY']) {
case 'mailTemplates': case 'mailTemplates':
$sDirectory = PATH_DATA_MAILTEMPLATES . $_POST['form']['PRO_UID'] . PATH_SEP . ($_POST['form']['CURRENT_DIRECTORY'] != '' ? $_POST['form']['CURRENT_DIRECTORY'] . PATH_SEP : ''); $sDirectory = PATH_DATA_MAILTEMPLATES . $_POST['form']['PRO_UID'] . PATH_SEP . ($_POST['form']['CURRENT_DIRECTORY'] != '' ? $_POST['form']['CURRENT_DIRECTORY'] . PATH_SEP : '');
break; break;
@@ -10,10 +17,11 @@ switch ($_POST['form']['MAIN_DIRECTORY']) {
default: default:
die(); die();
break; break;
} }
for ($i = 1; $i <= 5; $i ++) { for ($i = 1; $i <= 5; $i ++) {
if ($_FILES['form']['tmp_name']['FILENAME' . (string) $i] != '') { if ($_FILES['form']['tmp_name']['FILENAME' . (string) $i] != '') {
G::uploadFile( $_FILES['form']['tmp_name']['FILENAME' . (string) $i], $sDirectory, $_FILES['form']['name']['FILENAME' . (string) $i] ); G::uploadFile( $_FILES['form']['tmp_name']['FILENAME' . (string) $i], $sDirectory, $_FILES['form']['name']['FILENAME' . (string) $i] );
} }
}
} }
die( '<script type="text/javascript">parent.goToDirectoryforie(\'' . $_POST['form']['PRO_UID'] . '\', \'' . $_POST['form']['MAIN_DIRECTORY'] . '\', \'' . $_POST['form']['CURRENT_DIRECTORY'] . '\');</script>' ); die( '<script type="text/javascript">parent.goToDirectoryforie(\'' . $_POST['form']['PRO_UID'] . '\', \'' . $_POST['form']['MAIN_DIRECTORY'] . '\', \'' . $_POST['form']['CURRENT_DIRECTORY'] . '\');</script>' );

24
workflow/engine/methods/processes/processes_doUpload.php
View File

@@ -1,8 +1,17 @@
<?php <?php
sleep( 1 ); sleep( 1 );
global $RBAC;
if (isset( $_SESSION['processes_upload'] )) { if ( $RBAC->userCanAccess('PM_FACTORY') == 1) {
if (isset( $_SESSION['processes_upload'] )) {
$form = $_SESSION['processes_upload']; $form = $_SESSION['processes_upload'];
G::LoadClass('processes');
$app = new Processes();
if (!$app->processExists($form['PRO_UID'])) {
$result = 0;
$msg = G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED');
echo "{'result': $result, 'msg':'$msg'}";
die;
}
switch ($form['MAIN_DIRECTORY']) { switch ($form['MAIN_DIRECTORY']) {
case 'mailTemplates': case 'mailTemplates':
$sDirectory = PATH_DATA_MAILTEMPLATES . $form['PRO_UID'] . PATH_SEP . ($form['CURRENT_DIRECTORY'] != '' ? $form['CURRENT_DIRECTORY'] . PATH_SEP : ''); $sDirectory = PATH_DATA_MAILTEMPLATES . $form['PRO_UID'] . PATH_SEP . ($form['CURRENT_DIRECTORY'] != '' ? $form['CURRENT_DIRECTORY'] . PATH_SEP : '');
@@ -14,16 +23,17 @@ if (isset( $_SESSION['processes_upload'] )) {
die(); die();
break; break;
} }
} }
if ($_FILES['form']['error'] == "0") { if ($_FILES['form']['error'] == "0") {
G::uploadFile( $_FILES['form']['tmp_name'], $sDirectory, $_FILES['form']['name'] ); G::uploadFile( $_FILES['form']['tmp_name'], $sDirectory, $_FILES['form']['name'] );
$msg = "Uploaded (" . (round( (filesize( $sDirectory . $_FILES['form']['name'] ) / 1024) * 10 ) / 10) . " kb)"; $msg = "Uploaded (" . (round( (filesize( $sDirectory . $_FILES['form']['name'] ) / 1024) * 10 ) / 10) . " kb)";
$result = 1; $result = 1;
//echo $sDirectory.$_FILES['form']['name']; //echo $sDirectory.$_FILES['form']['name'];
} else { } else {
$msg = "Failed"; $msg = "Failed";
$result = 0; $result = 0;
} }
echo "{'result': $result, 'msg':'$msg'}"; echo "{'result': $result, 'msg':'$msg'}";
}