Index: csp/getpage.cls.xml
===================================================================
diff -u -r117 -r307
--- csp/getpage.cls.xml	(.../getpage.cls.xml)	(revision 117)
+++ csp/getpage.cls.xml	(.../getpage.cls.xml)	(revision 307)
@@ -59,7 +59,7 @@
 	}
 	
 	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)
+ 	Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
  	Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("%CSP.Error","OnPage")   ; $LB("","OnPageMinimum")
 
 	Quit
Index: csp/tbx/test4errors.cls.xml
===================================================================
diff -u -r117 -r307
--- csp/tbx/test4errors.cls.xml	(.../test4errors.cls.xml)	(revision 117)
+++ csp/tbx/test4errors.cls.xml	(.../test4errors.cls.xml)	(revision 307)
@@ -6,6 +6,26 @@
 <Super>%CSP.Page</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Parameter name="CSPFILE">
+<Default>c:\cache\cache2005v021\csp\vhisie\tbx\Test4Errors.csp</Default>
+</Parameter>
+
+<Parameter name="CSPURL">
+<Default>/vhisie/tbx/Test4Errors.csp</Default>
+</Parameter>
+
+<Parameter name="ENCODED">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="FileTimestamp">
+<Default>62468,54876</Default>
+</Parameter>
+
+<Parameter name="PRIVATE">
+<Default>0</Default>
+</Parameter>
+
 <Method name="CustomEHandlerInit">
 <ClassMethod>1</ClassMethod>
 <CodeMode>code</CodeMode>
@@ -17,7 +37,7 @@
  	Do ##class(csp.errorvhtest).DefaultEHandlerInit(.lbErrTypes)
  	Set %cspEHandler("PageLoadError","ACTIONS")=$LB("LogDB","xEmail","ErrPage")
  	Set %cspEHandler("PageLoadError","ACTIONS","LogDB")=$LB("DFL","TEST Err CSP",$LB("CustomLogError",,1))
- 	;Set %cspEHandler("PageLoadError","ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB("wv@vanhoecke.be"),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
+ 	;Set %cspEHandler("PageLoadError","ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB("wv@vanhoecke.be"),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
  	Set %cspEHandler("PageLoadError","ACTIONS","ErrPage")=$LB("","OnPageMinimum")
  	;Set %cspEHandler("PageLoadError","ACTIONS")=$LB("Redir")
  	;Set %cspEHandler("PageLoadError","ACTIONS","Redir")=$LB("http://www.google.be")
@@ -70,6 +90,7 @@
  Write !,(..HyperEventBody())
  Write !,$c(9)
  Write "<FORM name=""frmTestError"">"
+ Write !,..InsertHiddenFields(""),!
  Write !,$c(9)_"<TABLE border=""0"" cellpadding=""10"" width=""750"" style=""border-collapse:collapse; background-color:#E4E4E4;"">",!
  Write " "_$c(9,9)_"<TR height=""70"" valign=""top"">",!
  Write $c(9,9,9)_"<TD>",!
@@ -86,11 +107,10 @@
  Write $c(9,9)_"<TR height=""20"" valign=""top"">",!
  Write $c(9,9,9)_"<TD height=""20"" style=""padding:3px;"">",!
  Write $c(9,9,9,9)
- Write "<TIMERX message=""Time remaining until session timeout. <a href=javascript:cspRenewSession()>Renew Session</a>"" timeoutcode='OnAppTimeOut();' document=""winLogout=window.open(); winLogout.location.href"" location=""about:blank"" style=""clsTmrSkeleton"">"
  Write !,"<div class=""clsTmrSkeleton"" id=""timer"">",!
  Write "&nbsp;",!
  Write "</div>",!
- Write "<script language=javascript>",!
+ Write !,"<script language=javascript>",!
  Write "var dd='"_(%session.AppTimeout-5)_"';",!
  Write "var csptimeout=0;",!
  Write !,"function RightStr (str, nChar) {",!
@@ -126,7 +146,6 @@
  Write $c(9,9)_"</TR>",!
  Write $c(9)_"</TABLE>",!
  Write $c(9)
- Write ..InsertHiddenFields(""),!
  Write "</FORM>"
  Write !,"</BODY>"
 ]]></Implementation>
@@ -226,25 +245,5 @@
  	Quit $L(TestData)
 ]]></Implementation>
 </Method>
-
-<Parameter name="CSPFILE">
-<Default>c:\cachesys\csp\vhisie\TBX\Test4Errors.csp</Default>
-</Parameter>
-
-<Parameter name="CSPURL">
-<Default>/vhisie/TBX/Test4Errors.csp</Default>
-</Parameter>
-
-<Parameter name="ENCODED">
-<Default>0</Default>
-</Parameter>
-
-<Parameter name="FileTimestamp">
-<Default>59941,49506</Default>
-</Parameter>
-
-<Parameter name="PRIVATE">
-<Default>0</Default>
-</Parameter>
 </Class>
 </Export>
Index: csp/errorvhtbx.cls.xml
===================================================================
diff -u -r193 -r307
--- csp/errorvhtbx.cls.xml	(.../errorvhtbx.cls.xml)	(revision 193)
+++ csp/errorvhtbx.cls.xml	(.../errorvhtbx.cls.xml)	(revision 307)
@@ -49,7 +49,7 @@
 dehBuildArPageLoadError        ; PageLoadError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","ErrPage")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL","TBX_Err_CSP",$LB("CustomLogError","cspBasis.GAProdTBox",1))
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4)_$$dehAddDomeinHein(),"§DFL_HTML§",,1)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4)_$$dehAddDomeinHein(),"§DFL_HTML§",,1)
  ;Set tmpAr("ACTIONS","Email")=$LB("Skip")
  Set tmpAr("ACTIONS","ErrPage")=$LB("","OnPageTBX")   ; $LB("~")
  Quit
@@ -61,7 +61,7 @@
 dehBuildArHyperEventError      ; HyperEventError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","JSAlert")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL","TBX_Err_CSP",$LB("CustomLogError","cspBasis.GAProdTBox",1))
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
  Set tmpAr("ACTIONS","JSAlert")=$LB("Error returned by server call")   ; overruled by ("MSG","JSAlert")
  Set tmpAr("MSG","JSAlert",1)=("TandemBox: "_$$$GetVertaling("jsHyperEventError",$G(Taal,"F"),"O"))
  Quit 
Index: csp/vhliblogging.cls.xml
===================================================================
diff -u -r2 -r307
--- csp/vhliblogging.cls.xml	(.../vhliblogging.cls.xml)	(revision 2)
+++ csp/vhliblogging.cls.xml	(.../vhliblogging.cls.xml)	(revision 307)
@@ -7,6 +7,7 @@
 <IncludeCode>vhLib.Macro,vhLib.cspError</IncludeCode>
 <Language>cache</Language>
 <Super>%CSP.Page</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="CustomEHandlerInit">
 <ClassMethod>1</ClassMethod>
@@ -22,7 +23,7 @@
  		Set cspMailOnError=0   ; ##class(TECH.Config.ConfigMgr).GetString(...) 
  		If cspMailOnError {
  			Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("Email","ErrPage")
- 			Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
+ 			Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
  			Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("csp.vhLibError","OnPageMinimum")
  		}
  		Else {
@@ -31,7 +32,6 @@
  		}
  		
  		Quit
- 
 ]]></Implementation>
 </Method>
 
@@ -469,7 +469,6 @@
  
  	Set CspPageTitle="VH LOGGING"
  	Quit 1
- 
 ]]></Implementation>
 </Method>
 
Index: csp/vhLibError.cls.xml
===================================================================
diff -u -r108 -r307
--- csp/vhLibError.cls.xml	(.../vhLibError.cls.xml)	(revision 108)
+++ csp/vhLibError.cls.xml	(.../vhLibError.cls.xml)	(revision 307)
@@ -42,7 +42,7 @@
 	Do ##class(csp.errorvh).DefaultEHandlerInit(.lbErrTypes)
 	Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("LogDB","Email","ErrPage")
 	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)
+ 	Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
  	Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("%CSP.Error","OnPage")   ; $LB("","OnPageMinimum")
 	Quit
 	*/
@@ -85,7 +85,7 @@
 dehBuildArPageLoadError        ; PageLoadError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","ErrPage")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL")
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
  Set tmpAr("ACTIONS","ErrPage")=$LB("~")
  Quit
 dehBuildArPreHTTPTimeOut       ; PreHTTPTimeOut
@@ -95,7 +95,7 @@
 dehBuildArHyperEventError      ; HyperEventError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","JSAlert")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL")
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
  Set tmpAr("ACTIONS","JSAlert")=$LB("Error returned by server call")
  Quit 
 dehBuildArHyperEventTimeOut    ;HyperEventTimeOut
@@ -420,7 +420,7 @@
 <FormalSpec><![CDATA[lbArgs:%List,&arErrInfo:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-#define DflFrom      """NoValue"" <ICT@vanhoecke.be>"
+#define DflFrom      $$$SystemMail("NoValue")
 #define DflSubject   "CSP ERROR"
 	Quit:($G(lbArgs)=$LB("Skip")) ""  ; Don't send E-mail
 	New From,lbTo,Subject,Body,BodyIsStream,blnHTML,msg,CustomMsg,sc,tmpStream
Index: csp/errorvh.cls.xml
===================================================================
diff -u -r108 -r307
--- csp/errorvh.cls.xml	(.../errorvh.cls.xml)	(revision 108)
+++ csp/errorvh.cls.xml	(.../errorvh.cls.xml)	(revision 307)
@@ -42,7 +42,7 @@
 	Do ##class(csp.errorvh).DefaultEHandlerInit(.lbErrTypes)
 	Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("LogDB","Email","ErrPage")
 	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)
+ 	Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1)
  	Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("%CSP.Error","OnPage")   ; $LB("","OnPageMinimum")
 	Quit
 	*/
@@ -85,7 +85,7 @@
 dehBuildArPageLoadError        ; PageLoadError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","ErrPage")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL")
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
  Set tmpAr("ACTIONS","ErrPage")=$LB("~")
  Quit
 dehBuildArPreHTTPTimeOut       ; PreHTTPTimeOut
@@ -95,7 +95,7 @@
 dehBuildArHyperEventError      ; HyperEventError
  Set tmpAr("ACTIONS")=$LB("LogDB","Email","JSAlert")
  Set tmpAr("ACTIONS","LogDB")=$LB("DFL")
- Set tmpAr("ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
+ Set tmpAr("ACTIONS","Email")=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,0)
  Set tmpAr("ACTIONS","JSAlert")=$LB("Error returned by server call")
  Quit 
 dehBuildArHyperEventTimeOut    ;HyperEventTimeOut
@@ -419,7 +419,7 @@
 <FormalSpec><![CDATA[lbArgs:%List,&arErrInfo:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-#define DflFrom      """NoValue"" <ICT@vanhoecke.be>"
+#define DflFrom      $$$SystemMail("NoValue")
 #define DflSubject   "CSP ERROR"
 	Quit:($G(lbArgs)=$LB("Skip")) ""  ; Don't send E-mail
 	New From,lbTo,Subject,Body,BodyIsStream,blnHTML,msg,CustomMsg,sc,tmpStream
Index: csp/tbx/errorreport.cls.xml
===================================================================
diff -u -r117 -r307
--- csp/tbx/errorreport.cls.xml	(.../errorreport.cls.xml)	(revision 117)
+++ csp/tbx/errorreport.cls.xml	(.../errorreport.cls.xml)	(revision 307)
@@ -37,7 +37,7 @@
 	; Send mail with the Error Report 
 	If blnActMail Do
 	. Set Action="Email"
-	. Set lbActionDefs=$LB("""CSPserver "_$system.Server.HostName()_""" <ICT@vanhoecke.be>",$LB($$$EmailToSysOp),"CSP - Error (JS) - "_$ZDT($H,4),"§DFL_HTML§",,1)
+	. Set lbActionDefs=$LB($$$SystemMail("CSPserver "_$system.Server.HostName()),$LB($$$EmailToSysOp),"CSP - Error (JS) - "_$ZDT($H,4),"§DFL_HTML§",,1)
 	. Set scMail=..ActEmail($LB($LG(lbActionDefs,1),$LG(lbActionDefs,2),$LG(lbActionDefs,3),$LG(lbActionDefs,4),0,$LG(lbActionDefs,6)),.arErrInfo)
 
 	Quit $$$OK