Index: csp/errorvh.cls.xml
===================================================================
diff -u -r22 -r108
--- csp/errorvh.cls.xml	(.../errorvh.cls.xml)	(revision 22)
+++ csp/errorvh.cls.xml	(.../errorvh.cls.xml)	(revision 108)
@@ -14,7 +14,7 @@
 De foutgegevens en eventueel extra info kan via de array arErrInfo worden doorgegeven.
 Het uiteindelijke resultaat is meestal een ErrorPage, JS alert msg of een Redirect url.]]></Description>
 <Import>User</Import>
-<IncludeCode>%VHMacro,ErrorVHCNTs</IncludeCode>
+<IncludeCode>vhLib.Macro,ErrorVHCNTs</IncludeCode>
 <Language>cache</Language>
 <Super>%CSP.Error</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -441,12 +441,13 @@
 	. Set Body=""
 	Else  Do ; Nothing.  Use values as passed by lbArgs
 
-#If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()="DEV")
-	Do   ; Send to SoapSysOp only on WWW;  else replace by "WV"
-	. New i
-	. Set i=$LF(lbTo,"ICT_SOAPSysOp@vanhoecke.be")
-	. Set:(i>0) $LI(lbTo,i)=$S($G(%RemoteIP)="192.168.1.195":"jcl@vanhoecke.be",1:"wv@vanhoecke.be")
-#EndIf
+	Set RerouteTo = $$$Trim(##class(TECH.Config.ConfigMgr).Instance().GetString("csp.errorvh_RerouteMailTo"))
+	If $L(RerouteTo) {
+		// Send to "WV" instead of "ICT_SoapSysOp" 
+		New i
+		Set i=$LF(lbTo,"ICT_SOAPSysOp@vanhoecke.be")
+		Set:(i>0) $LI(lbTo,i)=$S($G(%RemoteIP)="192.168.1.195":"jcl@vanhoecke.be", 1:RerouteTo)
+	}
 	; Send E-mail
  	If $IsObject($G(tmpStream)) Do
  	. Set sc=$$SendMiniMailXtd^cspBasis.Library(From,lbTo,Subject,tmpStream,1,blnHTML)
Index: csp/getpage.cls.xml
===================================================================
diff -u -r2 -r108
--- csp/getpage.cls.xml	(.../getpage.cls.xml)	(revision 2)
+++ csp/getpage.cls.xml	(.../getpage.cls.xml)	(revision 108)
@@ -50,12 +50,13 @@
 	#define EmailTo "wv@vanhoecke.be"
 	Do ##class(csp.errorvh).DefaultEHandlerInit(.lbErrTypes)
 
-	If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()="PROD") { 
-		Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("Email","ErrPage","LogDB")
-	}
-	Else { 
+	If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("ProductLinks.csp_MailSturenBijCspError")=0 {   // Aangepast door WimV op 22/11/2011 
+		// In development geen mail sturen, maar de full csp-error tonen 
 		Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("ErrPage")
 	}
+	Else {
+		Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("Email","ErrPage","LogDB")
+	}
 	
 	Set %cspEHandler($$$etPageLoadError,"ACTIONS","LogDB")=$LB("DFL","TBX_Err_CSP",$LB("CustomLogError","cspBasis.GAProdTBox",1))
  	Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
Index: vhDeploy/WV/Deploy20111122xCspProductLinks.cls.xml
===================================================================
diff -u
--- vhDeploy/WV/Deploy20111122xCspProductLinks.cls.xml	(revision 0)
+++ vhDeploy/WV/Deploy20111122xCspProductLinks.cls.xml	(revision 108)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.WV.Deploy20111122xCspProductLinks">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>ConfigItem - Csp.ProductLinks MailBijError</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set IsProductieOmgeving = (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving() ["PROD")
+ 	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("ProductLinks.csp_MailSturenBijCspError",IsProductieOmgeving)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: csp/vhLibError.cls.xml
===================================================================
diff -u -r2 -r108
--- csp/vhLibError.cls.xml	(.../vhLibError.cls.xml)	(revision 2)
+++ csp/vhLibError.cls.xml	(.../vhLibError.cls.xml)	(revision 108)
@@ -442,12 +442,13 @@
 	. Set Body=""
 	Else  Do ; Nothing.  Use values as passed by lbArgs
 
-#If ($ZCVT($ZUTIL(110),"U")'["WWW")
-	Do   ; Send to SoapSysOp only on WWW;  else replace by "WV"
-	. New i
-	. Set i=$LF(lbTo,"ICT_SOAPSysOp@vanhoecke.be")
-	. Set:(i>0) $LI(lbTo,i)="wv@vanhoecke.be"
-#EndIf
+	Set RerouteTo = $$$Trim(##class(TECH.Config.ConfigMgr).Instance().GetString("csp.errorvh_RerouteMailTo"))
+	If $L(RerouteTo) {
+		// Send to "WV" instead of "ICT_SoapSysOp" 
+		New i
+		Set i=$LF(lbTo,"ICT_SOAPSysOp@vanhoecke.be")
+		Set:(i>0) $LI(lbTo,i)=$S($G(%RemoteIP)="192.168.1.195":"jcl@vanhoecke.be", 1:RerouteTo)
+	}
 	; Send E-mail
  	If $IsObject($G(tmpStream)) Do
  	. Set sc=$$SendMiniMailXtd^vhLib.Mail(From,lbTo,Subject,tmpStream,1,blnHTML)
Index: vhDeploy/WV/Deploy20111122xCspBasisSOAPlib.cls.xml
===================================================================
diff -u
--- vhDeploy/WV/Deploy20111122xCspBasisSOAPlib.cls.xml	(revision 0)
+++ vhDeploy/WV/Deploy20111122xCspBasisSOAPlib.cls.xml	(revision 108)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.WV.Deploy20111122xCspBasisSOAPlib">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>ConfigItem - cspBasis.SoapLib Reroute mail</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set RerouteTo=""
+	
+	Set NietProductieOmgeving = (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving() '["PROD")
+	If NietProductieOmgeving {
+		Set RerouteTo="WV@vanhoecke.be"
+	}
+ 	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("cspBasis.SOAPlib_RerouteMailTo",RerouteTo)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhDeploy/WV/Deploy20111122xCspErrorVH.cls.xml
===================================================================
diff -u
--- vhDeploy/WV/Deploy20111122xCspErrorVH.cls.xml	(revision 0)
+++ vhDeploy/WV/Deploy20111122xCspErrorVH.cls.xml	(revision 108)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.WV.Deploy20111122xCspErrorVH">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>ConfigItem - csp.ErrorVH Reroute mail</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set RerouteTo=""
+	
+	Set NietProductieOmgeving = (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving() '["PROD")
+	If NietProductieOmgeving {
+		Set RerouteTo="WV@vanhoecke.be"
+	}
+ 	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("csp.errorvh_RerouteMailTo",RerouteTo)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: cspBasis/SOAPlib.mac.rou
===================================================================
diff -u -r22 -r108
--- cspBasis/SOAPlib.mac.rou	(.../SOAPlib.mac.rou)	(revision 22)
+++ cspBasis/SOAPlib.mac.rou	(.../SOAPlib.mac.rou)	(revision 108)
@@ -1,6 +1,6 @@
  
 #include %occInclude
-#include %VHMacro
+#include vhLib.Macro
 #include BL.Sys.FOP.Common
  
  
@@ -63,19 +63,18 @@
 	Set Body=Body_$$$CRLF_"Device: "_$I_"  Job: "_$J
 	Set Body=Body_$$$CRLF_"Server: "_$$$Server_"  NameSpace: "_$$$NSpace
  
-	;Set Body=$G(Body,"Msg: "_msg)
-#If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()'?1(1"PROD",1"DMZ-PROD")) 
-	Do   ; Send to SoapSysOp or FopSysOp if not Cache02,  else replace by "WV"   ; only on WWW;  
-	. New i
-	. Set i=$LF(lbTo,"ICT_SOAPSysOp@vanhoecke.be")
-	. Set:(i>0) $LI(lbTo,i)="WV@vanhoecke.be"
-	. Set i=$LF(lbTo,"ICT_FOPSysOp@vanhoecke.be")
-	. Set:(i>0) $LI(lbTo,i)="WV@vanhoecke.be"
-	Do   ; Send to DynaPlugSysOp if not Cache02,  else replace by "TR"   ; only on WWW;  
-	. New i
-	. Set i=$LF(lbTo,"ICT_DynaPlugSysOp@vanhoecke.be")
-	. Set:(i>0) $LI(lbTo,i)="jcl@vanhoecke.be"
-#EndIf
+	Set RerouteTo = $$$Trim(##class(TECH.Config.ConfigMgr).Instance().GetString("cspBasis.SOAPlib_RerouteMailTo"))
+	If $L(RerouteTo) {
+		// Send to "WV" instead of "ICT_SoapSysOp" or "ICT_FopSysOp" or "ICT_DynaPlugSysOp" 
+		New i
+		Set i=$LF(lbTo,"ICT_SOAPSysOp@vanhoecke.be")
+		Set:(i>0) $LI(lbTo,i)=RerouteTo
+		Set i=$LF(lbTo,"ICT_FOPSysOp@vanhoecke.be")
+		Set:(i>0) $LI(lbTo,i)=RerouteTo
+		Set i=$LF(lbTo,"ICT_DynaPlugSysOp@vanhoecke.be")
+		Set:(i>0) $LI(lbTo,i)=RerouteTo
+	}
+ 
 	Set sc=$$SendMiniMailXtd^cspBasis.Library(From,lbTo,Subject,Body,$G(BodyIsStream,0))
 	If 'sc   ; Set errmsg=$$ParseStatus^vhLib(sc)_" From="_From
 	Quit