From 43d10b6185583b849af3fbb54592a87423b36889 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 4 Feb 2013 15:49:46 -0400 Subject: [PATCH] BUG 10594 I added to validation in SSL and added memory limit SOLVED I added to validation in SSL and added memory limit --- workflow/engine/classes/class.pmFunctions.php | 4 ++++ workflow/engine/classes/class.wsBase.php | 13 +++++++++++-- workflow/engine/controllers/adminProxy.php | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index 38c223a0f..1fbeaedad 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -848,6 +848,10 @@ function PMFSendMessage( $showMessage = true, $delIndex = 0 ) { + ini_set ( "pcre.backtrack_limit", 1000000 ); + ini_set ( 'memory_limit', '-1' ); + @set_time_limit ( 100000 ); + global $oPMScript; if (isset( $oPMScript->aFields ) && is_array( $oPMScript->aFields )) { diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index dee9b05e1..9415b8219 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -770,8 +770,17 @@ class wsBase } $oSpool = new spoolRun(); - $oSpool->setConfig( array ('MESS_ENGINE' => $aSetup['MESS_ENGINE'],'MESS_SERVER' => $aSetup['MESS_SERVER'],'MESS_PORT' => $aSetup['MESS_PORT'],'MESS_ACCOUNT' => $aSetup['MESS_ACCOUNT'],'MESS_PASSWORD' => $aSetup['MESS_PASSWORD'],'SMTPAuth' => $aSetup['MESS_RAUTH'] - ) ); + $oSpool->setConfig( + array ( + 'MESS_ENGINE' => $aSetup['MESS_ENGINE'], + 'MESS_SERVER' => $aSetup['MESS_SERVER'], + 'MESS_PORT' => $aSetup['MESS_PORT'], + 'MESS_ACCOUNT' => $aSetup['MESS_ACCOUNT'], + 'MESS_PASSWORD' => $aSetup['MESS_PASSWORD'], + 'SMTPSecure' => $aSetup['SMTPSecure'], + 'SMTPAuth' => $aSetup['MESS_RAUTH'] + ) + ); $oCase = new Cases(); $oldFields = $oCase->loadCase( $caseId ); diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index af441642c..faea555d4 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -517,9 +517,11 @@ class adminProxy extends HttpProxyController if (strtolower($_POST["UseSecureCon"]) != "no") { $_POST["SMTPSecure"] = $_POST["UseSecureCon"]; } + /* if ($_POST['UseSecureCon'] == 'ssl') { $_POST['MESS_SERVER'] = 'ssl://'.$_POST['MESS_SERVER']; } + */ $resp = $this->sendTestMail(); if ($resp->status == '1') { $this->success=true;