From 092c7e3a397bd1f92a3bda7cbf8bada08934ca6c Mon Sep 17 00:00:00 2001 From: Carlos Pacha Date: Tue, 12 Apr 2011 11:20:30 -0400 Subject: [PATCH] BUG 5735 This issue has been fixed I've tried to reproduced this issue but I couldn't. However I could see that was not doing the validation for the users and this had a notice, these were in the case scheduler option. These were fixed. --- workflow/engine/classes/model/CaseScheduler.php | 2 +- workflow/engine/xmlform/cases/cases_Scheduler_New.xml | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php index b9ceb1c2c..3c0ad384a 100644 --- a/workflow/engine/classes/model/CaseScheduler.php +++ b/workflow/engine/classes/model/CaseScheduler.php @@ -529,7 +529,7 @@ class CaseScheduler extends BaseCaseScheduler { } } else if ($sActualDataHour == $dActualSysHour && $sActualDataMinutes <= $dActualSysMinutes) { - $_PORT = ($_SERVER ['SERVER_PORT'] != '80') ? ':' . $_SERVER ['SERVER_PORT'] : ''; + $_PORT = (isset($_SERVER ['SERVER_PORT']) && $_SERVER ['SERVER_PORT'] != '80') ? ':' . $_SERVER ['SERVER_PORT'] : ''; //$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2'; $defaultEndpoint = 'http://' . SERVER_NAME . $_PORT . '/sys' . SYS_SYS . '/en/green/services/wsdl2'; diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml index 971493b92..f9b562bb1 100644 --- a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml @@ -509,10 +509,17 @@ function case_userSchedulerValidate(username, password) { oRPC.callback = function(rpc){ //msgBox(rpc.xmlhttp.responseText,"alert"); sresponse = rpc.xmlhttp.responseText; - if(sresponse == "User does not have access to the system"){ + + switch(sresponse){ + case "User does not have access to the system": + case "Wrong password": + case "User inactive!": msgBox(rpc.xmlhttp.responseText,"alert"); + getField('BTNCANCEL').focus(); return false; - } + break + } + getField('SCH_USER_UID').value = rpc.xmlhttp.responseText; user_uid = rpc.xmlhttp.responseText; //alert(user_uid);