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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	workflow/engine/classes/class.processMap.php
	workflow/engine/classes/model/AdditionalTables.php
This commit is contained in:
Erik Amaru Ortiz
2014-04-02 09:34:54 -04:00
parent e5e62da380 92947e646a
commit 7a47472ea1
60 changed files with 597 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
workflow/engine/classes/class.pmScript.php
View File

@@ -151,6 +151,39 @@ class PMScript
*/
public function setScript ($sScript = '')
{
if (!defined("T_ML_COMMENT")) {
define("T_ML_COMMENT", T_COMMENT);
} else {
define("T_DOC_COMMENT", T_ML_COMMENT);
}
$script = "<?php " . $sScript;
$tokens = token_get_all($script);
$result = "";
foreach ($tokens as $token) {
if (is_string($token)) {
$result = $result . $token;
} else {
list($id, $text) = $token;
switch ($id) {
case T_OPEN_TAG:
case T_CLOSE_TAG:
case T_COMMENT:
case T_ML_COMMENT: //we've defined this
case T_DOC_COMMENT: //and this
break;
default:
$result = $result . $text;
break;
}
}
}
$result = trim($result);
$sScript = $result;
$this->sScript = $sScript;
}
@@ -582,7 +615,7 @@ function handleFatalErrors ($buffer)
if (strpos( $_SERVER['REQUEST_URI'], '&ACTION=GENERATE' ) !== false) {
$aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
if ($_SESSION['TRIGGER_DEBUG']['ISSET']) {
$_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
$_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER'));
$_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
$aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug';
}
@@ -605,7 +638,7 @@ function handleFatalErrors ($buffer)
} else {
$aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
if (isset($_SESSION['TRIGGER_DEBUG']['ISSET']) && $_SESSION['TRIGGER_DEBUG']['ISSET']) {
$_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
$_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER'));
$_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
$aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug';
}