Index: BL/Flow/Basis/Doc.cls.xml
===================================================================
diff -u -r66529 -r73453
--- BL/Flow/Basis/Doc.cls.xml	(.../Doc.cls.xml)	(revision 66529)
+++ BL/Flow/Basis/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73453)
@@ -278,6 +278,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -311,7 +313,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -320,15 +322,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -347,8 +349,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  ;d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  ;d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
Index: BL/Flow/Basis/DocNew.cls.xml
===================================================================
diff -u -r48852 -r73453
--- BL/Flow/Basis/DocNew.cls.xml	(.../DocNew.cls.xml)	(revision 48852)
+++ BL/Flow/Basis/DocNew.cls.xml	(.../DocNew.cls.xml)	(revision 73453)
@@ -676,6 +676,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -710,7 +712,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -719,15 +721,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -746,8 +748,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))