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

Fixing Bpmn::getEvent()

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-02-11 17:50:14 -04:00
parent f4bca968b8
commit ea1f82ed3e
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -48,6 +48,7 @@
}, },
"require-dev":{ "require-dev":{
"guzzle/guzzle":"~3.1.1", "guzzle/guzzle":"~3.1.1",
"behat/behat":"2.4.*@stable" "behat/behat":"2.4.*@stable",
"lisachenko/go-aop-php": "*"
} }
} }

12
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -314,19 +314,15 @@ class Bpmn extends Handler
} }
} }
public function getEvent($evnUid) public function getEvent($evnUid, $retType = 'array')
{ {
if (empty($this->events) || ! array_key_exists($evnUid, $this->activities)) {
$event = EventPeer::retrieveByPK($evnUid); $event = EventPeer::retrieveByPK($evnUid);
if (! is_object($event)) { if ($retType != "object" && ! empty($activity)) {
return null; $event = $event->toArray();
} }
$this->events[$evnUid] = $event; return $event;
}
return $this->events[$evnUid];
} }
public function getEvents($start = null, $limit = null, $filter = '', $changeCaseTo = CASE_UPPER) public function getEvents($start = null, $limit = null, $filter = '', $changeCaseTo = CASE_UPPER)

10
workflow/engine/src/ProcessMaker/Util/Logger.php
View File

@@ -17,6 +17,12 @@ class Logger
protected function __construct() protected function __construct()
{ {
$this->logFile = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'processmaker.log'; $this->logFile = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'processmaker.log';
if (! file_exists($this->logFile)) {
file_put_contents($this->logFile, "");
chmod($this->logFile, 0777);
}
$this->fp = fopen($this->logFile, "a+"); $this->fp = fopen($this->logFile, "a+");
} }
@@ -40,8 +46,8 @@ class Logger
fwrite($this->fp, "- " . date('Y-m-d H:i:s') . " " . $arg . PHP_EOL); fwrite($this->fp, "- " . date('Y-m-d H:i:s') . " " . $arg . PHP_EOL);
} }
if (count($args) > 1) //if (count($args) > 1)
fwrite($this->fp, PHP_EOL); // fwrite($this->fp, PHP_EOL);
} }
public static function log() public static function log()

14
workflow/public_html/sysGeneric.php
View File

@@ -884,6 +884,20 @@ try {
$RBAC = &RBAC::getSingleton( PATH_DATA, session_id() ); $RBAC = &RBAC::getSingleton( PATH_DATA, session_id() );
$RBAC->sSystem = 'PROCESSMAKER'; $RBAC->sSystem = 'PROCESSMAKER';
if (\System::isDebugMode()) {
$applicationAspectKernel = \Kernel\ApplicationAspectKernel::getInstance();
$applicationAspectKernel->init(array(
'debug' => true, // Use 'false' for production mode
// Cache directory
'cacheDir' => sys_get_temp_dir() . DIRECTORY_SEPARATOR, // Adjust this path if needed
// Include paths restricts the directories where aspects should be applied, or empty for all source files
'includePaths' => array(
PATH_HOME . 'engine/src/'
)
));
}
// define and send Headers for all pages // define and send Headers for all pages
if (! defined( 'EXECUTE_BY_CRON' )) { if (! defined( 'EXECUTE_BY_CRON' )) {
header( "Expires: " . gmdate( "D, d M Y H:i:s", mktime( 0, 0, 0, date( 'm' ), date( 'd' ) - 1, date( 'Y' ) ) ) . " GMT" ); header( "Expires: " . gmdate( "D, d M Y H:i:s", mktime( 0, 0, 0, date( 'm' ), date( 'd' ) - 1, date( 'Y' ) ) ) . " GMT" );