From ab7e66a01fae40fb87f39f0c6e46eacaebdf45e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Thu, 22 Aug 2019 09:37:25 -0400 Subject: [PATCH] PMC-1094 --- config/deprecatedFiles.lst | 5 + .../translations/english/processmaker.en.po | 90 ---------- .../engine/methods/enterprise/enterprise.php | 2 +- .../engine/methods/messages/messages_List.php | 45 ----- .../methods/outputdocs/downloadFile.php | 23 --- .../methods/outputdocs/outputdocs_Edit.php | 25 --- .../methods/outputdocs/outputdocs_List.php | 42 ----- .../engine/methods/tracker/tracker_Ajax.php | 42 ++--- .../engine/methods/tracker/tracker_Save.php | 53 +++--- .../methods/tracker/tracker_ShowDocument.php | 161 +++++++++--------- .../tracker/tracker_ShowOutputDocument.php | 161 +++++++++--------- .../engine/xmlform/messages/messages_List.xml | 28 --- .../xmlform/outputdocs/outputdocs_List.xml | 28 --- 13 files changed, 213 insertions(+), 492 deletions(-) delete mode 100644 workflow/engine/methods/messages/messages_List.php delete mode 100644 workflow/engine/methods/outputdocs/downloadFile.php delete mode 100644 workflow/engine/methods/outputdocs/outputdocs_List.php delete mode 100644 workflow/engine/xmlform/messages/messages_List.xml delete mode 100644 workflow/engine/xmlform/outputdocs/outputdocs_List.xml diff --git a/config/deprecatedFiles.lst b/config/deprecatedFiles.lst index ab7aada64..24796208d 100644 --- a/config/deprecatedFiles.lst +++ b/config/deprecatedFiles.lst @@ -63,6 +63,9 @@ workflow/engine/methods/cases/saveFormSupervisor.php workflow/engine/methods/controls/buscador.php workflow/engine/methods/dbConnections/genericDbConnections.php workflow/engine/methods/login/dbInfo.php +workflow/engine/methods/messages/messages_List.php +workflow/engine/methods/outputdocs/downloadFile.php +workflow/engine/methods/outputdocs/outputdocs_List.php workflow/engine/methods/services/processHeartBeat_Ajax.php workflow/engine/methods/services/soap.php workflow/engine/methods/services/wsdl.php @@ -105,5 +108,7 @@ workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html workflow/engine/templates/login/init.js workflow/engine/templates/reportTables/mainLoad.php workflow/engine/test +workflow/engine/xmlform/messages/messages_List.xml +workflow/engine/xmlform/outputdocs/outputdocs_List.xml workflow/public_html/skins/JSForms.js workflow/public_html/skins/ajax.js diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 3d5142ded..e06f9aa23 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -38487,60 +38487,6 @@ msgstr "Content" msgid "[messages/messages_Edit.xml?ACCEPT] Save" msgstr "Save" -# messages/messages_List.xml?fMESS_TITLE -# messages/messages_List.xml -#: text - fMESS_TITLE -msgid "[messages/messages_List.xml?fMESS_TITLE] Output document" -msgstr "Output document" - -# messages/messages_List.xml?MESS_TYPE -# messages/messages_List.xml -#: dropdown - MESS_TYPE -msgid "[messages/messages_List.xml?MESS_TYPE] Type" -msgstr "Type" - -# messages/messages_List.xml?MESS_TYPE-HTML -# messages/messages_List.xml -#: dropdown - MESS_TYPE - HTML -msgid "[messages/messages_List.xml?MESS_TYPE-HTML]" -msgstr "HTML" - -# messages/messages_List.xml?MESS_TYPE-TEXT -# messages/messages_List.xml -#: dropdown - MESS_TYPE - TEXT -msgid "[messages/messages_List.xml?MESS_TYPE-TEXT]" -msgstr "Plain text" - -# messages/messages_List.xml?MESS_TYPE-SMS -# messages/messages_List.xml -#: dropdown - MESS_TYPE - SMS -msgid "[messages/messages_List.xml?MESS_TYPE-SMS]" -msgstr "SMS" - -# messages/messages_List.xml?fMESS_DESCRIPTION -# messages/messages_List.xml -#: textarea - fMESS_DESCRIPTION -msgid "[messages/messages_List.xml?fMESS_DESCRIPTION] Content" -msgstr "Content" - -# messages/messages_List.xml?EDIT -# messages/messages_List.xml -#: link - EDIT -msgid "[messages/messages_List.xml?EDIT] " -msgstr "" - -# messages/messages_List.xml?DELETE -# messages/messages_List.xml -#: link - DELETE -msgid "[messages/messages_List.xml?DELETE] " -msgstr "" - -# messages/messages_List.xml?SEARCH -# messages/messages_List.xml -#: button - SEARCH -msgid "[messages/messages_List.xml?SEARCH] Apply Filter" -msgstr "Apply Filter" - # messages/messages_Options.xml?MNU_ADD # messages/messages_Options.xml #: link - MNU_ADD @@ -38643,42 +38589,6 @@ msgstr "Save" msgid "[outputdocs/outputdocs_Edit.xml?BTN_CANCEL] Cancel" msgstr "Cancel" -# outputdocs/outputdocs_List.xml?OUT_DOC_TITLE -# outputdocs/outputdocs_List.xml -#: text - OUT_DOC_TITLE -msgid "[outputdocs/outputdocs_List.xml?OUT_DOC_TITLE] Output document" -msgstr "Output document" - -# outputdocs/outputdocs_List.xml?OUT_DOC_FILENAME -# outputdocs/outputdocs_List.xml -#: text - OUT_DOC_FILENAME -msgid "[outputdocs/outputdocs_List.xml?OUT_DOC_FILENAME] Filename" -msgstr "Filename" - -# outputdocs/outputdocs_List.xml?OUT_DOC_DESCRIPTION -# outputdocs/outputdocs_List.xml -#: textarea - OUT_DOC_DESCRIPTION -msgid "[outputdocs/outputdocs_List.xml?OUT_DOC_DESCRIPTION] Description" -msgstr "Description" - -# outputdocs/outputdocs_List.xml?EDIT -# outputdocs/outputdocs_List.xml -#: link - EDIT -msgid "[outputdocs/outputdocs_List.xml?EDIT] " -msgstr "" - -# outputdocs/outputdocs_List.xml?DELETE -# outputdocs/outputdocs_List.xml -#: link - DELETE -msgid "[outputdocs/outputdocs_List.xml?DELETE] " -msgstr "" - -# outputdocs/outputdocs_List.xml?SEARCH -# outputdocs/outputdocs_List.xml -#: button - SEARCH -msgid "[outputdocs/outputdocs_List.xml?SEARCH] Apply Filter" -msgstr "Apply Filter" - # outputdocs/outputdocs_New.xml?TITLE # outputdocs/outputdocs_New.xml #: title - TITLE diff --git a/workflow/engine/methods/enterprise/enterprise.php b/workflow/engine/methods/enterprise/enterprise.php index bc22c4e33..a943b6e99 100644 --- a/workflow/engine/methods/enterprise/enterprise.php +++ b/workflow/engine/methods/enterprise/enterprise.php @@ -15,7 +15,7 @@ set_include_path(PATH_PM_ENTERPRISE . PATH_SEPARATOR . get_include_path()); class enterprisePlugin extends PMPlugin { - public function enterprisePlugin($sNamespace, $sFilename = null) + public function __construct($sNamespace, $sFilename = null) { $pathPluginTrunk = PATH_CORE . "enterprise"; diff --git a/workflow/engine/methods/messages/messages_List.php b/workflow/engine/methods/messages/messages_List.php deleted file mode 100644 index f2a81ba5c..000000000 --- a/workflow/engine/methods/messages/messages_List.php +++ /dev/null @@ -1,45 +0,0 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ -if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) { - return $RBAC_Response; -} -//G::genericForceLogin( 'WF_MYINFO' , 'login/noViewPage', $urlLogin = 'login/login' ); - -$G_MAIN_MENU = 'processmaker'; -$G_SUB_MENU = 'processes'; -$G_ID_MENU_SELECTED = 'PROCESSES'; -$G_ID_SUB_MENU_SELECTED = 'MESSAGES'; - -$dbc = new DBConnection(); -$ses = new DBSession( $dbc ); - -//Hardcode: UID of the library by default -$PRO_UID = '746B734DC23311'; -$G_PUBLISH = new Publisher(); -$Fields = array ('SYS_LANG' => SYS_LANG,'PRO_UID' => $PRO_UID); - -$G_PUBLISH->AddContent( 'pagedtable', 'paged-table', 'messages/messages_List', '', $Fields, 'messages_Save' ); - -G::RenderPage( "publish" ); - diff --git a/workflow/engine/methods/outputdocs/downloadFile.php b/workflow/engine/methods/outputdocs/downloadFile.php deleted file mode 100644 index db76dbe8b..000000000 --- a/workflow/engine/methods/outputdocs/downloadFile.php +++ /dev/null @@ -1,23 +0,0 @@ -load( $uid ); -$type = $aFields['OUT_DOC_TYPE']; - -if ($type == 'JRXML') { - $extension = 'jrxml'; -} -if ($type == 'ACROFORM') { - $extension = 'pdf'; -} - -$fileJrxml = PATH_DYNAFORM . $aFields['PRO_UID'] . PATH_SEP . $aFields['OUT_DOC_UID'] . '.' . $extension; - -$bDownload = true; -// The ereg_replace function has been DEPRECATED as of PHP 5.3.0. -// $downFileName = ereg_replace('[^A-Za-z0-9_]', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension; - -$downFileName = preg_replace( '/[^A-Za-z0-9_]/i', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension; -G::streamFile( $fileJrxml, $bDownload, $downFileName ); - diff --git a/workflow/engine/methods/outputdocs/outputdocs_Edit.php b/workflow/engine/methods/outputdocs/outputdocs_Edit.php index 836577c74..7432a3112 100644 --- a/workflow/engine/methods/outputdocs/outputdocs_Edit.php +++ b/workflow/engine/methods/outputdocs/outputdocs_Edit.php @@ -86,31 +86,6 @@ try { G::RenderPage( 'publish', 'blank' ); die(); break; - case 'JRXML': - break; - case 'ACROFORM': - $type = $aFields['OUT_DOC_TYPE']; - if ($type == 'JRXML') { - $extension = 'jrxml'; - } - if ($type == 'ACROFORM') { - $extension = 'pdf'; - } - - // The ereg_replace function has been DEPRECATED as of PHP 5.3.0. - // $downFileName = ereg_replace('[^A-Za-z0-9_]', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension; - $downFileName = preg_replace( '/[^A-Za-z0-9_]/i', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension; - $filename = PATH_DYNAFORM . $aFields['PRO_UID'] . PATH_SEP . $aFields['OUT_DOC_UID'] . '.' . $extension; - if (file_exists( $filename )) { - $aFields['FILENAME'] = $downFileName; - } else { - $aFields['FILENAME'] = ''; - } - - $aFields['FILELINK'] = '../outputdocs/downloadFile?' . $aFields['OUT_DOC_UID']; - $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'outputdocs/outputdocsUploadFile', '', $aFields, '../outputdocs/uploadFile' ); - $G_PUBLISH->AddContent( 'view', 'outputdocs/editJrxml' ); - break; } G::RenderPage( 'publish', 'raw' ); } catch (Exception $oException) { diff --git a/workflow/engine/methods/outputdocs/outputdocs_List.php b/workflow/engine/methods/outputdocs/outputdocs_List.php deleted file mode 100644 index 06eb567bd..000000000 --- a/workflow/engine/methods/outputdocs/outputdocs_List.php +++ /dev/null @@ -1,42 +0,0 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ -if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) { - return $RBAC_Response; -} -//G::genericForceLogin( 'WF_MYINFO' , 'login/noViewPage', $urlLogin = 'login/login' ); -$G_MAIN_MENU = 'processmaker'; -$G_SUB_MENU = 'processes'; -$G_ID_MENU_SELECTED = 'PROCESSES'; -$G_ID_SUB_MENU_SELECTED = 'OUTPUTDOCS'; - -$dbc = new DBConnection(); -$ses = new DBSession( $dbc ); - -$G_PUBLISH = new Publisher(); -$Fields = array ('SYS_LANG' => SYS_LANG); - -$G_PUBLISH->AddContent( 'pagedtable', 'paged-table', 'outputdocs/outputdocs_List', '', $Fields, 'outputdocs_Save' ); - -G::RenderPage( "publish" ); - diff --git a/workflow/engine/methods/tracker/tracker_Ajax.php b/workflow/engine/methods/tracker/tracker_Ajax.php index 9056dfce9..10db86293 100644 --- a/workflow/engine/methods/tracker/tracker_Ajax.php +++ b/workflow/engine/methods/tracker/tracker_Ajax.php @@ -76,20 +76,20 @@ try { $G_PUBLISH = new Publisher(); $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $oHeadPublisher = headPublisher::getSingleton(); - $oHeadPublisher->addScriptCode(' - var pb=leimnud.dom.capture("tag.body 0"); - Sm=new stagesmap(); - Sm.options = { - target : "sm_target", - dataServer: "../tracker/tracker_Ajax", - uid : "' . $_POST['PRO_UID'] . '", - lang : "' . SYS_LANG . '", - theme : "processmaker", - size : {w:"780",h:"540"}, - images_dir: "/jscore/processmap/core/images/", - rw : true, - hideMenu : false - }; + $oHeadPublisher->addScriptCode(' + var pb=leimnud.dom.capture("tag.body 0"); + Sm=new stagesmap(); + Sm.options = { + target : "sm_target", + dataServer: "../tracker/tracker_Ajax", + uid : "' . $_POST['PRO_UID'] . '", + lang : "' . SYS_LANG . '", + theme : "processmaker", + size : {w:"780",h:"540"}, + images_dir: "/jscore/processmap/core/images/", + rw : true, + hideMenu : false + }; Sm.make();'); G::RenderPage('publish', 'raw'); break; @@ -197,13 +197,13 @@ try { break; case 'load': $oConnection = Propel::getConnection('workflow'); - $oStatement = $oConnection->prepareStatement("CREATE TABLE IF NOT EXISTS `STAGE` ( - `STG_UID` VARCHAR( 32 ) NOT NULL , - `PRO_UID` VARCHAR( 32 ) NOT NULL , - `STG_POSX` INT( 11 ) NOT NULL DEFAULT '0', - `STG_POSY` INT( 11 ) NOT NULL DEFAULT '0', - `STG_INDEX` INT( 11 ) NOT NULL DEFAULT '0', - PRIMARY KEY ( `STG_UID` ) + $oStatement = $oConnection->prepareStatement("CREATE TABLE IF NOT EXISTS `STAGE` ( + `STG_UID` VARCHAR( 32 ) NOT NULL , + `PRO_UID` VARCHAR( 32 ) NOT NULL , + `STG_POSX` INT( 11 ) NOT NULL DEFAULT '0', + `STG_POSY` INT( 11 ) NOT NULL DEFAULT '0', + `STG_INDEX` INT( 11 ) NOT NULL DEFAULT '0', + PRIMARY KEY ( `STG_UID` ) );"); $oStatement->executeQuery(); /** diff --git a/workflow/engine/methods/tracker/tracker_Save.php b/workflow/engine/methods/tracker/tracker_Save.php index 4e6e40dd6..d724ae7fc 100644 --- a/workflow/engine/methods/tracker/tracker_Save.php +++ b/workflow/engine/methods/tracker/tracker_Save.php @@ -1,28 +1,27 @@ -update( $sValue ); - -$infoProcess = new Process(); -$resultProcess = $infoProcess->load($sValue['PRO_UID']); - -if($sValue['CT_DERIVATION_HISTORY'] == 1) { - $type[] = "Routing History"; -} -if($sValue['CT_MESSAGE_HISTORY'] == 1) { - $type[] = "Messages History"; -} -G::auditLog('CaseTrackers','Save Case Tracker Properties ('.$sValue['CT_MAP_TYPE'].' - '.implode(', ',$type).') in Process "'.$resultProcess['PRO_TITLE'].'"'); - +else + $sValue = $_POST; + +unset( $sValue['SAVE'] ); +if (! isset( $sValue['CT_DERIVATION_HISTORY'] )) { + $sValue['CT_DERIVATION_HISTORY'] = 0; +} +if (! isset( $sValue['CT_MESSAGE_HISTORY'] )) { + $sValue['CT_MESSAGE_HISTORY'] = 0; +} +require_once 'classes/model/CaseTracker.php'; +$oCaseTracker = new CaseTracker(); +$oCaseTracker->update( $sValue ); + +$infoProcess = new Process(); +$resultProcess = $infoProcess->load($sValue['PRO_UID']); + +if($sValue['CT_DERIVATION_HISTORY'] == 1) { + $type[] = "Routing History"; +} +if($sValue['CT_MESSAGE_HISTORY'] == 1) { + $type[] = "Messages History"; +} +G::auditLog('CaseTrackers','Save Case Tracker Properties ('.$sValue['CT_MAP_TYPE'].' - '.implode(', ',$type).') in Process "'.$resultProcess['PRO_TITLE'].'"'); diff --git a/workflow/engine/methods/tracker/tracker_ShowDocument.php b/workflow/engine/methods/tracker/tracker_ShowDocument.php index b1a532ca1..848415a96 100644 --- a/workflow/engine/methods/tracker/tracker_ShowDocument.php +++ b/workflow/engine/methods/tracker/tracker_ShowDocument.php @@ -1,82 +1,81 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ - -require_once ("classes/model/AppDocumentPeer.php"); - -$oAppDocument = new AppDocument(); +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + */ + +require_once ("classes/model/AppDocumentPeer.php"); + +$oAppDocument = new AppDocument(); if (! isset( $_GET['v'] )) { //Load last version of the document - $docVersion = $oAppDocument->getLastAppDocVersion( $_GET['a'] ); -} else { - $docVersion = $_GET['v']; -} -$oAppDocument->Fields = $oAppDocument->load( $_GET['a'], $docVersion ); - -$sAppDocUid = $oAppDocument->getAppDocUid(); -$iDocVersion = $oAppDocument->getDocVersion(); -$info = pathinfo( $oAppDocument->getAppDocFilename() ); -$ext = $info['extension']; - -if (isset( $_GET['b'] )) { - if ($_GET['b'] == '0') { - $bDownload = false; - } else { - $bDownload = true; - } -} else { - $bDownload = true; -} - -$realPath = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/' . $sAppDocUid . '_' . $iDocVersion . '.' . $ext; -$realPath1 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/' . $sAppDocUid . '.' . $ext; -$sw_file_exists = false; -if (file_exists( $realPath )) { - $sw_file_exists = true; -} elseif (file_exists( $realPath1 )) { - $sw_file_exists = true; - $realPath = $realPath1; -} - -if (! $sw_file_exists) { - $error_message = "'" . $oAppDocument->Fields['APP_DOC_FILENAME'] . "' " . G::LoadTranslation( 'ID_ERROR_STREAMING_FILE' ); - if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { - $res['success'] = 'failure'; - $res['message'] = $error_message; - print G::json_encode( $res ); - } else { - G::SendMessageText( $error_message, "ERROR" ); - $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] ); - G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] ); - die(); - } - -} else { - if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { - $res['success'] = 'success'; - $res['message'] = $oAppDocument->Fields['APP_DOC_FILENAME']; - print G::json_encode( $res ); - } else { - G::streamFile( $realPath, $bDownload, $oAppDocument->Fields['APP_DOC_FILENAME'] ); - } -} - + $docVersion = $oAppDocument->getLastAppDocVersion( $_GET['a'] ); +} else { + $docVersion = $_GET['v']; +} +$oAppDocument->Fields = $oAppDocument->load( $_GET['a'], $docVersion ); + +$sAppDocUid = $oAppDocument->getAppDocUid(); +$iDocVersion = $oAppDocument->getDocVersion(); +$info = pathinfo( $oAppDocument->getAppDocFilename() ); +$ext = $info['extension']; + +if (isset( $_GET['b'] )) { + if ($_GET['b'] == '0') { + $bDownload = false; + } else { + $bDownload = true; + } +} else { + $bDownload = true; +} + +$realPath = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/' . $sAppDocUid . '_' . $iDocVersion . '.' . $ext; +$realPath1 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/' . $sAppDocUid . '.' . $ext; +$sw_file_exists = false; +if (file_exists( $realPath )) { + $sw_file_exists = true; +} elseif (file_exists( $realPath1 )) { + $sw_file_exists = true; + $realPath = $realPath1; +} + +if (! $sw_file_exists) { + $error_message = "'" . $oAppDocument->Fields['APP_DOC_FILENAME'] . "' " . G::LoadTranslation( 'ID_ERROR_STREAMING_FILE' ); + if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { + $res['success'] = 'failure'; + $res['message'] = $error_message; + print G::json_encode( $res ); + } else { + G::SendMessageText( $error_message, "ERROR" ); + $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] ); + G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] ); + die(); + } + +} else { + if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { + $res['success'] = 'success'; + $res['message'] = $oAppDocument->Fields['APP_DOC_FILENAME']; + print G::json_encode( $res ); + } else { + G::streamFile( $realPath, $bDownload, $oAppDocument->Fields['APP_DOC_FILENAME'] ); + } +} diff --git a/workflow/engine/methods/tracker/tracker_ShowOutputDocument.php b/workflow/engine/methods/tracker/tracker_ShowOutputDocument.php index c3dc3bdd3..c78e6160a 100644 --- a/workflow/engine/methods/tracker/tracker_ShowOutputDocument.php +++ b/workflow/engine/methods/tracker/tracker_ShowOutputDocument.php @@ -1,86 +1,85 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + */ /* * Created on 13-02-2008 * * @author David Callizaya - */ -require_once ("classes/model/AppDocumentPeer.php"); - -$oAppDocument = new AppDocument(); -$oAppDocument->Fields = $oAppDocument->load( $_GET['a'], (isset( $_GET['v'] )) ? $_GET['v'] : NULL ); - -$sAppDocUid = $oAppDocument->getAppDocUid(); -$info = pathinfo( $oAppDocument->getAppDocFilename() ); -if (! isset( $_GET['ext'] )) { - $ext = $info['extension']; -} else { - if ($_GET['ext'] != '') { - $ext = $_GET['ext']; - } else { - $ext = $info['extension']; - } -} -$ver = (isset( $_GET['v'] ) && $_GET['v'] != '') ? '_' . $_GET['v'] : ''; - + */ +require_once ("classes/model/AppDocumentPeer.php"); + +$oAppDocument = new AppDocument(); +$oAppDocument->Fields = $oAppDocument->load( $_GET['a'], (isset( $_GET['v'] )) ? $_GET['v'] : NULL ); + +$sAppDocUid = $oAppDocument->getAppDocUid(); +$info = pathinfo( $oAppDocument->getAppDocFilename() ); +if (! isset( $_GET['ext'] )) { + $ext = $info['extension']; +} else { + if ($_GET['ext'] != '') { + $ext = $_GET['ext']; + } else { + $ext = $info['extension']; + } +} +$ver = (isset( $_GET['v'] ) && $_GET['v'] != '') ? '_' . $_GET['v'] : ''; + if (! $ver) //This code is in the case the outputdocument won't be versioned - $ver = '_1'; - -$realPath = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $sAppDocUid . $ver . '.' . $ext; -$realPath1 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . $ver . '.' . $ext; -$realPath2 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . '.' . $ext; -$sw_file_exists = false; -if (file_exists( $realPath )) { - $sw_file_exists = true; -} elseif (file_exists( $realPath1 )) { - $sw_file_exists = true; - $realPath = $realPath1; -} elseif (file_exists( $realPath2 )) { - $sw_file_exists = true; - $realPath = $realPath2; -} -if (! $sw_file_exists) { - $error_message = "'" . $info['basename'] . $ver . '.' . $ext . "' " . G::LoadTranslation( 'ID_ERROR_STREAMING_FILE' ); - if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { - $res['success'] = 'failure'; - $res['message'] = $error_message; - print G::json_encode( $res ); - } else { - G::SendMessageText( $error_message, "ERROR" ); - $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] ); - G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] ); - die(); - } - -} else { - if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { - $res['success'] = 'success'; - $res['message'] = $info['basename'] . $ver . '.' . $ext; - print G::json_encode( $res ); - } else { - G::streamFile( $realPath, true, $info['basename'] . $ver . '.' . $ext ); - } -} -//G::streamFile ( $realPath, true); - + $ver = '_1'; + +$realPath = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $sAppDocUid . $ver . '.' . $ext; +$realPath1 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . $ver . '.' . $ext; +$realPath2 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . '.' . $ext; +$sw_file_exists = false; +if (file_exists( $realPath )) { + $sw_file_exists = true; +} elseif (file_exists( $realPath1 )) { + $sw_file_exists = true; + $realPath = $realPath1; +} elseif (file_exists( $realPath2 )) { + $sw_file_exists = true; + $realPath = $realPath2; +} +if (! $sw_file_exists) { + $error_message = "'" . $info['basename'] . $ver . '.' . $ext . "' " . G::LoadTranslation( 'ID_ERROR_STREAMING_FILE' ); + if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { + $res['success'] = 'failure'; + $res['message'] = $error_message; + print G::json_encode( $res ); + } else { + G::SendMessageText( $error_message, "ERROR" ); + $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] ); + G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] ); + die(); + } + +} else { + if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) { + $res['success'] = 'success'; + $res['message'] = $info['basename'] . $ver . '.' . $ext; + print G::json_encode( $res ); + } else { + G::streamFile( $realPath, true, $info['basename'] . $ver . '.' . $ext ); + } +} +//G::streamFile ( $realPath, true); diff --git a/workflow/engine/xmlform/messages/messages_List.xml b/workflow/engine/xmlform/messages/messages_List.xml deleted file mode 100644 index b04b05f8f..000000000 --- a/workflow/engine/xmlform/messages/messages_List.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -function pagedTableFilter( form ) { - @#PAGED_TABLE_ID.doFilter( form ); -} - - diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_List.xml b/workflow/engine/xmlform/outputdocs/outputdocs_List.xml deleted file mode 100644 index 32dc56416..000000000 --- a/workflow/engine/xmlform/outputdocs/outputdocs_List.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -function pagedTableFilter( form ) { - @#PAGED_TABLE_ID.doFilter( form ); -} - -