Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r14 -r62
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 14)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 62)
@@ -27,11 +27,6 @@
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
-<Property name="GebruikerID">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context.RuntimeContext</ReturnType>
@@ -47,18 +42,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetGebruikerID">
-<FormalSpec>GebruikerID:%String</FormalSpec>
-<Implementation><![CDATA[	Set ..GebruikerID = GebruikerID
-]]></Implementation>
-</Method>
-
-<Method name="GeefGebruikerID">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GebruikerID
-]]></Implementation>
-</Method>
-
 <Method name="GeefGebruikerInitialen">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
@@ -78,6 +61,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIP">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim IP As %String = ""
+	If ($D(%request))
+	{	
+		Set IP = %request.GetCgiEnv("REMOTE_ADDR")
+	}
+	Else
+	{
+		Set IONaam = $I
+		If ($E(IONaam,1,5) = "|TNT|")
+		{
+			Set DeviceID = $P($E(IONaam,6,99),":",1)
+			If (DeviceID?3(1.3N1".")1.3N) // Controle op IP-formaat
+			{
+				Set IP = DeviceID
+			}
+		}
+	}
+	Quit IP
+]]></Implementation>
+</Method>
+
 <Method name="GeefComputerNaam">
 <Description>
 Werkt wanneer oproep via webservice of telnet binnenkomt binnen het netwerk.
@@ -86,58 +93,48 @@
 <Implementation><![CDATA[
 	If (..ComputerNaam = "")
 	{
-		Set IP = ""
-		Set ComputerNaam = ""
-		
-		If ($D(%request))
-		{	
-			Set IP = %request.GetCgiEnv("REMOTE_ADDR")
-		}
-		Else
+		Set IONaam = $I
+		If ($E(IONaam,1,5) = "|TNT|")
 		{
-			Set IONaam = $I
-			If ($E(IONaam,1,5) = "|TNT|")
+			Set DeviceID = $P($E(IONaam,6,99),":",1)
+			If (DeviceID'?3(1.3N1".")1.3N) // Controle op IP-formaat
 			{
-				Set DeviceID = $P($E(IONaam,6,99),":",1)
-				;if $zcvt(DeviceID,"U")="LOCALHOST" set DeviceID=$$$Server
-				If (DeviceID?3(1.3N1".")1.3N) // Controle op IP-formaat
-				{
-					Set IP = DeviceID
-				}
-				Else
-				{
-					Set ..ComputerNaam = DeviceID
-				}
+				Set ..ComputerNaam = DeviceID
 			}
 		}
-		// Als we enkel het IP kennen dan gaan we proberen de pc-naam op te zoeken
-		If (IP '= "")
+		
+		If (..ComputerNaam="")
 		{
-			Set FileName="PING"_$J_$$UPTRIMAN^vhRtn1(IP)
-			Set Exec="NSLOOKUP "_IP_" > c:\"_FileName  // ping vervangen door nslookup 
-			Set Ok=$ZF(-1,"NSLOOKUP "_IP_" > c:\"_FileName)
+			Set IP = ..GeefIP()
+			If (IP '= "")
+			{
+				Set FileName="PING"_$J_$$UPTRIMAN^vhRtn1(IP)
+				Set Exec="NSLOOKUP "_IP_" > c:\"_FileName  // ping vervangen door nslookup 
+				Set Ok=$ZF(-1,"NSLOOKUP "_IP_" > c:\"_FileName)
 			
-			Set Stream=##class(%FileCharacterStream).%New()
-			Set Stream.Filename="c:\"_FileName
+				Set Stream=##class(%FileCharacterStream).%New()
+				Set Stream.Filename="c:\"_FileName
 			
-			Do Stream.ReadLine()
-			Do Stream.ReadLine()
-			Do Stream.ReadLine()
-			Set ComputerNaamOutput = Stream.ReadLine()
+				Do Stream.ReadLine()
+				Do Stream.ReadLine()
+				Do Stream.ReadLine()
+				Set ComputerNaamOutput = Stream.ReadLine()
 			
-			Set PiecesIterator = ##class(TECH.PiecesIterator).%New(ComputerNaamOutput," ")
-			While (PiecesIterator.HasNext())
-			{
-				Set ..ComputerNaam = PiecesIterator.Next()
-			}
+				Set PiecesIterator = ##class(TECH.PiecesIterator).%New(ComputerNaamOutput," ")
+				While (PiecesIterator.HasNext())
+				{
+					Set ..ComputerNaam = PiecesIterator.Next()
+				}
 			
-			Set Stream = ""
+				Set Stream = ""
 			
-			Do ##class(%File).Delete("c:\"_FileName)
+				Do ##class(%File).Delete("c:\"_FileName)
+			}
 		}
+		
+		If ##class(TECH.StringUtils).ToUpper(..ComputerNaam)="LOCALHOST" Set ..ComputerNaam=$$$Server
 	}
 	
-	if $zcvt(..ComputerNaam,"U")="LOCALHOST" set ..ComputerNaam=$$$Server_".vanhoecke.be"
 	Quit ..ComputerNaam
 ]]></Implementation>
 </Method>