fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-06-17 13:37:51 -04:00
parent b70073850b 1efc67a0f7
commit e4f0a4af6e
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/bin/cron_single.php
View File

@@ -91,7 +91,7 @@ if (!defined('PATH_HOME')) {
$e_all = $config['debug'] ? $e_all : $e_all & ~E_NOTICE;
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$filter = new InputFilter();
$config['debug'] = $filter->validateInput($config['debug']);
$config['memory_limit'] = $filter->validateInput($config['memory_limit']);
$config['wsdl_cache'] = $filter->validateInput($config['wsdl_cache'],'int');
@@ -508,7 +508,9 @@ if (!defined('SYS_SYS')) {
}
}
unlink(PATH_CORE . 'config/_databases_.php');
if (file_exists(PATH_CORE . "config" . PATH_SEP . "_databases_.php")) {
unlink(PATH_CORE . "config" . PATH_SEP . "_databases_.php");
}
} else {
processWorkspace();
}

8
workflow/engine/classes/model/AppDelegation.php
View File

@@ -195,9 +195,11 @@ class AppDelegation extends BaseAppDelegation
$resultAbe->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($resultAbe->next()) {
$dataAbe = $resultAbe->getRow();
G::LoadClass('actionsByEmailCore');
$actionsByEmail = new actionsByEmailCoreClass();
$actionsByEmail->sendActionsByEmail($data);
if($dataAbe['ABE_TYPE']!=''){
G::LoadClass('actionsByEmailCore');
$actionsByEmail = new actionsByEmailCoreClass();
$actionsByEmail->sendActionsByEmail($data);
}
}
}
/*----------------------------------********---------------------------------*/

6
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -355,7 +355,7 @@ class CaseScheduler extends BaseCaseScheduler
$criteria->add(
$criteria->getNewCriterion(CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dateCurrentIni, Criteria::GREATER_EQUAL)->addAnd(
$criteria->getNewCriterion(CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dateCurrentEnd, Criteria::LESS_EQUAL))->addOr(
$criteria->getNewCriterion(CaseSchedulerPeer::SCH_OPTION, 5, Criteria::GREATER_EQUAL))->addOr(
//$criteria->getNewCriterion(CaseSchedulerPeer::SCH_OPTION, 5, Criteria::GREATER_EQUAL))->addOr(
$criteria->getNewCriterion(CaseSchedulerPeer::SCH_TIME_NEXT_RUN, $dateCurrentIni, Criteria::LESS_THAN))
);
@@ -400,6 +400,7 @@ class CaseScheduler extends BaseCaseScheduler
}
if ($flagNewCase) {
println(" CASE SCHEDULER: " . $row["SCH_NAME"]);
println(" - Connecting webservice: $wsdl");
$user = $row["SCH_DEL_USER_NAME"];
@@ -428,6 +429,9 @@ class CaseScheduler extends BaseCaseScheduler
"WS_ROUTE_CASE_STATUS" => ""
);
$paramsLogResult = "FAILED";
$paramsRouteLogResult = "FAILED";
if ($result->status_code == 0) {
eprintln(" OK", "green");