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

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

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

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

@@ -1,19 +1,27 @@
<?php <?php
global $RBAC;
switch ($_POST['form']['MAIN_DIRECTORY']) { if ( $RBAC->userCanAccess('PM_FACTORY') == 1) {
case 'mailTemplates': G::LoadClass('processes');
$sDirectory = PATH_DATA_MAILTEMPLATES . $_POST['form']['PRO_UID'] . PATH_SEP . ($_POST['form']['CURRENT_DIRECTORY'] != '' ? $_POST['form']['CURRENT_DIRECTORY'] . PATH_SEP : ''); $app = new Processes();
break; if (!$app->processExists($_POST['form']['PRO_UID'])) {
case 'public': echo G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED');
$sDirectory = PATH_DATA_PUBLIC . $_POST['form']['PRO_UID'] . PATH_SEP . ($_POST['form']['CURRENT_DIRECTORY'] != '' ? $_POST['form']['CURRENT_DIRECTORY'] . PATH_SEP : ''); die;
break;
default:
die();
break;
}
for ($i = 1; $i <= 5; $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] );
} }
switch ($_POST['form']['MAIN_DIRECTORY']) {
case 'mailTemplates':
$sDirectory = PATH_DATA_MAILTEMPLATES . $_POST['form']['PRO_UID'] . PATH_SEP . ($_POST['form']['CURRENT_DIRECTORY'] != '' ? $_POST['form']['CURRENT_DIRECTORY'] . PATH_SEP : '');
break;
case 'public':
$sDirectory = PATH_DATA_PUBLIC . $_POST['form']['PRO_UID'] . PATH_SEP . ($_POST['form']['CURRENT_DIRECTORY'] != '' ? $_POST['form']['CURRENT_DIRECTORY'] . PATH_SEP : '');
break;
default:
die();
break;
}
for ($i = 1; $i <= 5; $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] );
}
}
} }
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>' );

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

@@ -1,29 +1,39 @@
<?php <?php
sleep( 1 ); sleep( 1 );
global $RBAC;
if (isset( $_SESSION['processes_upload'] )) { if ( $RBAC->userCanAccess('PM_FACTORY') == 1) {
$form = $_SESSION['processes_upload']; if (isset( $_SESSION['processes_upload'] )) {
switch ($form['MAIN_DIRECTORY']) { $form = $_SESSION['processes_upload'];
case 'mailTemplates': G::LoadClass('processes');
$sDirectory = PATH_DATA_MAILTEMPLATES . $form['PRO_UID'] . PATH_SEP . ($form['CURRENT_DIRECTORY'] != '' ? $form['CURRENT_DIRECTORY'] . PATH_SEP : ''); $app = new Processes();
break; if (!$app->processExists($form['PRO_UID'])) {
case 'public': $result = 0;
$sDirectory = PATH_DATA_PUBLIC . $form['PRO_UID'] . PATH_SEP . ($form['CURRENT_DIRECTORY'] != '' ? $form['CURRENT_DIRECTORY'] . PATH_SEP : ''); $msg = G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED');
break; echo "{'result': $result, 'msg':'$msg'}";
default: die;
die(); }
break; switch ($form['MAIN_DIRECTORY']) {
case 'mailTemplates':
$sDirectory = PATH_DATA_MAILTEMPLATES . $form['PRO_UID'] . PATH_SEP . ($form['CURRENT_DIRECTORY'] != '' ? $form['CURRENT_DIRECTORY'] . PATH_SEP : '');
break;
case 'public':
$sDirectory = PATH_DATA_PUBLIC . $form['PRO_UID'] . PATH_SEP . ($form['CURRENT_DIRECTORY'] != '' ? $form['CURRENT_DIRECTORY'] . PATH_SEP : '');
break;
default:
die();
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'}";
}