PM-1123 Podar features enterprise de la version 3.0 para sacar el beta 3.0

Marcas para la deshabilitar code Scan
This commit is contained in:
norahmollo
2014-12-23 17:22:42 -04:00
parent 76096583c3
commit 6a62837acb
8 changed files with 39 additions and 22 deletions

View File

@@ -3283,7 +3283,9 @@ class Cases
public function executeTriggers($sTasUid, $sStepType, $sStepUidObj, $sTriggerType, $aFields = array())
{
/*----------------------------------********---------------------------------*/
G::LoadClass("codeScanner");
/*----------------------------------********---------------------------------*/
$aTriggers = $this->loadTriggers($sTasUid, $sStepType, $sStepUidObj, $sTriggerType);
@@ -3295,12 +3297,14 @@ class Cases
$arraySystemConfiguration = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
/*----------------------------------********---------------------------------*/
$cs = new CodeScanner((isset($arraySystemConfiguration["enable_blacklist"]) && (int)($arraySystemConfiguration["enable_blacklist"]) == 1)? "DISABLED_CODE" : "");
$strFoundDisabledCode = "";
/*----------------------------------********---------------------------------*/
foreach ($aTriggers as $aTrigger) {
//Check disabled code
/*----------------------------------********---------------------------------*/
$arrayFoundDisabledCode = $cs->checkDisabledCode("SOURCE", $aTrigger["TRI_WEBBOT"]);
if (count($arrayFoundDisabledCode) > 0) {
@@ -3313,7 +3317,7 @@ class Cases
$strFoundDisabledCode .= "<br />- " . $aTrigger["TRI_TITLE"] . ": " . $strCodeAndLine;
continue;
}
/*----------------------------------********---------------------------------*/
//Execute
$bExecute = true;
@@ -3327,10 +3331,11 @@ class Cases
$oPMScript->execute();
}
}
/*----------------------------------********---------------------------------*/
if ($strFoundDisabledCode != "") {
G::SendTemporalMessage(G::LoadTranslation("ID_DISABLED_CODE_TRIGGER_TO_EXECUTE", array($strFoundDisabledCode)), "", "string");
}
/*----------------------------------********---------------------------------*/
return $oPMScript->aFields;
} else {