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

BUG 14835 "php "if" statement generating error" SOLVED

Browse Source 
- php "if" statement generating error
- Problema resuelto, se ha completado las validaciones con los operadores faltantes.
This commit is contained in:
Luis Fernando Saisa Lopez
2014-08-29 15:44:41 -04:00
parent db57d8c81c
commit 9baa826b78
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,16 +219,16 @@ class PMScript
{ {
$sScript = ""; $sScript = "";
$iAux = 0; $iAux = 0;
$bEqual = false;
$iOcurrences = preg_match_all( '/\@(?:([\@\%\#\?\$\=])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]' . '*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/', $this->sScript, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ); $iOcurrences = preg_match_all( '/\@(?:([\@\%\#\?\$\=])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]' . '*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/', $this->sScript, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
if ($iOcurrences) { if ($iOcurrences) {
for ($i = 0; $i < $iOcurrences; $i ++) { for ($i = 0; $i < $iOcurrences; $i ++) {
$bEqual = false;
$sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux ); $sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );
if (! $bEqual) { if (! $bEqual) {
if (strpos( $sAux, '==' ) !== false) { if (strpos($sAux, "==") !== false || strpos($sAux, "!=") !== false || strpos($sAux, ">") !== false || strpos($sAux, "<") !== false || strpos($sAux, ">=") !== false || strpos($sAux, "<=") !== false || strpos($sAux, "<>") !== false || strpos($sAux, "===") !== false || strpos($sAux, "!==") !== false) {
$bEqual = false; $bEqual = false;
} else { } else {
if (strpos( $sAux, '=' ) !== false) { if (strpos($sAux, "=") !== false || strpos($sAux, "+=") !== false || strpos($sAux, "-=") !== false || strpos($sAux, "*=") !== false || strpos($sAux, "/=") !== false || strpos($sAux, "%=") !== false || strpos($sAux, ".=") !== false) {
$bEqual = true; $bEqual = true;
} }
} }
@@ -246,22 +246,6 @@ class PMScript
} }
} }
$sScript .= $sAux; $sScript .= $sAux;
/** patch1: support for the expression: @@a = @@b = @@c = @@d; */
$bEqual = true;
if ($i < $iOcurrences - 1) {
$ii = $aMatch[0][$i][1] + strlen($aMatch[0][$i][0]);
$ss = trim(substr($this->sScript, $ii, $aMatch[0][$i + 1][1] - $ii));
} else {
$ii = $aMatch[0][$i][1] + strlen($aMatch[0][$i][0]);
$ss = trim(substr($this->sScript, $ii));
}
$sw0 = strpos($ss, '=') === 0 || strpos($ss, '+=') === 0 || strpos($ss, '-=') === 0;
$sw1 = strpos($ss, '==') === 0 || strpos($ss, '===') === 0 || strpos($ss, '!=') === 0 || strpos($ss, '!==') === 0 || strpos($ss, '<=') === 0 || strpos($ss, '>=') === 0;
$sw3 = substr(trim($sAux), strlen(trim($sAux)) - 6, strlen(trim($sAux))) === "empty(";
if (($sw0 && !$sw1) || $sw3) {
$bEqual = false;
}
/** patch1 end */
$iAux = $aMatch[0][$i][1] + strlen( $aMatch[0][$i][0] ); $iAux = $aMatch[0][$i][1] + strlen( $aMatch[0][$i][0] );
switch ($aMatch[1][$i][0]) { switch ($aMatch[1][$i][0]) {
case '@': case '@':