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

Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629

Browse Source
This commit is contained in:
Ronald Quenta
2017-08-10 18:33:14 -04:00
parent 9a1f8b7fdc 702eb8ac9d
commit 917c94784b
68 changed files with 818 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -162,8 +162,6 @@ function sendJsonResultGeneric($response, $callback)
function expandNode()
{
//require_once ("classes/model/AppFolder.php");
extract(getExtJSParams());
$oPMFolder = new AppFolder();

1
workflow/engine/methods/cases/cases_SaveData.php
View File

@@ -303,7 +303,6 @@ try {
}
//Save files
//require_once ("classes/model/AppDocument.php");
if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) {
$oInputDocument = new \ProcessMaker\BusinessModel\Cases\InputDocument();

2
workflow/engine/methods/cases/cases_SaveDataSupervisor.php
View File

@@ -130,8 +130,6 @@ if (isset( $_FILES["form"]["name"] ) && count( $_FILES["form"]["name"] ) > 0) {
}
if ($indocUid != null) {
//require_once ("classes/model/AppFolder.php");
//require_once ("classes/model/InputDocument.php");
$oInputDocument = new InputDocument();
$aID = $oInputDocument->load( $indocUid );

4
workflow/engine/methods/cases/cases_Step.php
View File

@@ -328,7 +328,7 @@ try {
* Added By erik 16-05-08
* Description: this was added for the additional database connections
*/
$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
$oDbConnections->loadAdditionalConnections();
$_SESSION['CURRENT_DYN_UID'] = $_GET['UID'];
@@ -1137,7 +1137,7 @@ try {
* Description: this was added for the additional database connections
*/
$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
$oDbConnections->loadAdditionalConnections();
$stepFilename = "$sNamespace/$sStepName";
G::evalJScript( "

2
workflow/engine/methods/cases/cases_StepToRevise.php
View File

@@ -139,7 +139,7 @@ if (! isset( $_GET['ex'] )) {
$_GET['ex'] = $_GET['position'];
}
$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
$oDbConnections->loadAdditionalConnections();
$G_PUBLISH = new Publisher();

2
workflow/engine/methods/cases/summary.php
View File

@@ -75,7 +75,7 @@ try {
}
if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) {
$_SESSION['PROCESS'] = $applicationFields['PRO_UID'];
$dbConnections = new dbConnections( $_SESSION['PROCESS'] );
$dbConnections = new DbConnections( $_SESSION['PROCESS'] );
$dbConnections->loadAdditionalConnections();
$_SESSION['CURRENT_DYN_UID'] = $_REQUEST['DYN_UID'];

6
workflow/engine/methods/dbConnections/dbConnectionsAjax.php
View File

@@ -93,7 +93,7 @@ switch ($action) {
G::RenderPage( 'publish', 'raw' );
break;
case 'newDdConnection':
$dbs = new dbConnections( $_SESSION['PROCESS'] );
$dbs = new DbConnections( $_SESSION['PROCESS'] );
$dbServices = $dbs->getDbServicesAvailables();
$dbService = $dbs->getEncondeList();
@@ -115,7 +115,7 @@ switch ($action) {
G::RenderPage( 'publish', 'raw' );
break;
case 'editDdConnection':
$dbs = new dbConnections( $_SESSION['PROCESS'] );
$dbs = new DbConnections( $_SESSION['PROCESS'] );
$dbServices = $dbs->getDbServicesAvailables();
$rows[] = array ('uid' => 'char','name' => 'char'
@@ -343,7 +343,7 @@ switch ($action) {
$engine = $_POST['engine'];
if ($engine != "0") {
$dbs = new dbConnections();
$dbs = new DbConnections();
$var = Bootstrap::json_encode($dbs->getEncondeList($filter->xssFilterHard($engine)));
G::outRes($var);

2
workflow/engine/methods/dbConnections/genericDbConnections.php
View File

@@ -9,7 +9,7 @@
if (isset( $_SESSION['PROCESS'] )) {
$pro = include (PATH_CORE . "config/databases.php");
$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
foreach ($oDbConnections->connections as $db) {
$db['DBS_PASSWORD'] = $oDbConnections->getPassWithoutEncrypt( $db );

4
workflow/engine/methods/dynaforms/conditionalShowHide_Ajax.php
View File

@@ -54,7 +54,7 @@ try {
$sFilter = isset( $_POST['filter'] ) ? $_POST['filter'] : '';
//$oJSON = new Services_JSON();
$oDynaformHandler = new dynaFormHandler( PATH_DYNAFORM . $_DYN_FILENAME . '.xml' );
$oDynaformHandler = new DynaformHandler( PATH_DYNAFORM . $_DYN_FILENAME . '.xml' );
$aFilter = explode( ',', $sFilter );
@@ -68,7 +68,7 @@ try {
$_DYN_FILENAME = $_SESSION['Current_Dynafom']['Parameters']['FILE'];
$sFilter = isset( $_POST['filter'] ) ? $_POST['filter'] : '';
$oDynaformHandler = new dynaFormHandler( PATH_DYNAFORM . $_DYN_FILENAME . '.xml' );
$oDynaformHandler = new DynaformHandler( PATH_DYNAFORM . $_DYN_FILENAME . '.xml' );
$aFilter = explode( ',', $sFilter );
$aAvailableFields = $oDynaformHandler->getFieldNames( $aFilter );

4
workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
View File

@@ -38,7 +38,7 @@ switch ($request) {
$tmpfilename = $filter->xssFilterHard($tmpfilename);
$o = new dynaFormHandler( PATH_DYNAFORM . "{$tmpfilename}.xml" );
$o = new DynaformHandler( PATH_DYNAFORM . "{$tmpfilename}.xml" );
$list_elements = explode( ',', $items );
@@ -59,7 +59,7 @@ switch ($request) {
$tmpfilename = $_SESSION['Current_Dynafom']['Parameters']['FILE'];
$tmpfilename = $filter->xssFilterHard($tmpfilename);
$o = new dynaFormHandler( PATH_DYNAFORM . "{$tmpfilename}.xml" );
$o = new DynaformHandler( PATH_DYNAFORM . "{$tmpfilename}.xml" );
$hidden_items = Array ();
$has_hidden_items = false;

2
workflow/engine/methods/dynaforms/fields_Ajax.php
View File

@@ -47,8 +47,6 @@ if (isset( $_SESSION['CURRENT_PAGE_INITILIZATION'] )) {
eval( $_SESSION['CURRENT_PAGE_INITILIZATION'] );
}
//require_once (PATH_THIRDPARTY . 'pear/json/class.json.php');
//$json = new Services_JSON();
$G_FORM = new form( G::getUIDName( urlDecode( $_POST['form'] ) ) );
$G_FORM->id = urlDecode( $_POST['form'] );
$G_FORM->values = $_SESSION[$G_FORM->id];

3
workflow/engine/methods/inputdocs/inputdocs_Save.php
View File

@@ -45,9 +45,6 @@ try {
// Bootstrap::mylog("post:".$_POST['function']);
switch ($sfunction) {
case 'lookForNameInput':
//require_once ('classes/model/Content.php');
//require_once ("classes/model/InputDocument.php");
$snameInput = urldecode( $_POST['NAMEINPUT'] );
$sPRO_UID = urldecode( $_POST['proUid'] );

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

@@ -901,7 +901,7 @@ try {
$proUid = isset($_REQUEST['PRO_UID']) ? $_REQUEST['PRO_UID'] : '';
$dynUid = isset($_REQUEST['DYN_UID']) ? $_REQUEST['DYN_UID'] : '';
if (is_file(PATH_DATA . '/sites/' . SYS_SYS . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') && filesize(PATH_DATA . '/sites/' . SYS_SYS . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') > 0) {
$dyn = new dynaFormHandler(PATH_DATA . '/sites/' . SYS_SYS . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml');
$dyn = new DynaformHandler(PATH_DATA . '/sites/' . SYS_SYS . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml');
$dynaformFields[] = $dyn->getFields();
}
foreach ($dynaformFields as $aDynFormFields) {

12
workflow/engine/methods/roles/roles_Ajax.php
View File

@@ -21,6 +21,18 @@
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
use ProcessMaker\Exception\RBACException;
global $RBAC;
switch ($RBAC->userCanAccess('PM_USERS')) {
case -2:
throw new RBACException('ID_USER_HAVENT_RIGHTS_SYSTEM', -2);
break;
case -1:
case -3:
throw new RBACException('ID_USER_HAVENT_RIGHTS_PAGE', -1);
break;
}
$REQUEST = (isset( $_GET['request'] )) ? $_GET['request'] : $_POST['request'];

3
workflow/engine/methods/services/soap2.php
View File

@@ -1,6 +1,7 @@
<?php
ini_set("soap.wsdl_cache_enabled", 0); //disabling WSDL cache
use ProcessMaker\Util\ParseSoapVariableName;
ini_set("soap.wsdl_cache_enabled", 0); //disabling WSDL cache
define( 'WEB_SERVICE_VERSION', '2.0' );

2
workflow/engine/methods/users/usersAjax.php
View File

@@ -318,7 +318,7 @@ switch ($_POST['action']) {
require_once 'classes/model/UsersProperties.php';
$oUserProperty = new UsersProperties();
$aUserProperty = $oUserProperty->loadOrCreateIfNotExists($aFields['USR_UID'], array('USR_PASSWORD_HISTORY' => serialize(array($aFields['USR_PASSWORD']))));
$aUserProperty = $oUserProperty->loadOrCreateIfNotExists($aFields['USR_UID'], array('USR_PASSWORD_HISTORY' => serialize(array($oUser->getUsrPassword()))));
$aFields['USR_LOGGED_NEXT_TIME'] = $aUserProperty['USR_LOGGED_NEXT_TIME'];
if (array_key_exists('USR_PASSWORD', $aFields)) {