Merged in victorsl/processmaker/PM-939 (pull request #1351)

PM-1005 "WebEntry-Event (Endpoints)"
This commit is contained in:
Julio Cesar Laura Avendaño
2015-01-28 15:25:58 -04:00
20 changed files with 3296 additions and 43 deletions

View File

@@ -22,7 +22,7 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
use ProcessMaker\Importer\XmlImporter;
use \ProcessMaker\Importer\XmlImporter;
ini_set("max_execution_time", 0);
@@ -42,11 +42,11 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
if (is_object($data) && isset($data->triggers) && is_array($data->triggers) && count($data->triggers) > 0) {
/*----------------------------------********---------------------------------*/
G::LoadClass("codeScanner");
$arraySystemConfiguration = System::getSystemConfiguration(PATH_CONFIG . "env.ini");
$cs = new CodeScanner((isset($arraySystemConfiguration["enable_blacklist"]) && (int)($arraySystemConfiguration["enable_blacklist"]) == 1)? "DISABLED_CODE" : "");
$strFoundDisabledCode = "";
foreach ($data->triggers as $value) {
$arrayTriggerData = $value;
@@ -62,7 +62,7 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
$strFoundDisabledCode .= (($strFoundDisabledCode != "")? "\n" : "") . "- " . $arrayTriggerData["TRI_TITLE"] . ": " . $strCodeAndLine;
}
}
if ($strFoundDisabledCode != "") {
$response["status"] = "DISABLED-CODE";
$response["success"] = true;