Index: vhUSER.mac.rou
===================================================================
diff -u -r734 -r1503
--- vhUSER.mac.rou	(.../vhUSER.mac.rou)	(revision 734)
+++ vhUSER.mac.rou	(.../vhUSER.mac.rou)	(revision 1503)
@@ -306,7 +306,7 @@
  Set:$G(LB) Users=$$PiecesToList^vhLib(Users,";")
  Quit Users
  ;
-USERNAMESQL(Users,Long)   ; Added by WimV on 2007/07/03
+USERNAMESQL(Users,Long)   ; Added by WimV on 2007/07/2003
  New I,UserIds,D
  Set D="\"
  Set Users=$G(Users),Long=$G(Long),UserIds=$$USERID^vhUSER(Users),Users=""
@@ -322,8 +322,11 @@
 	Quit $$DEVUSER()
  
  ; De gebruikers id van een device
-DEVUSER(Device,Select) 
+DEVUSER(Device,Select)
+ If $IsObject($G(%request)) Quit "" ; Webservice kunnen geen gebruik maken van cQ5 alleen TELNET gebruikers, PV 23/06/2011
+ If '$D(Device)&&'$D(Select)&&$D(QU(1)) Quit QU(1) ; LoggedInUser ipv via Device, PV 15/10/2010
  Set:'$D(Device) Device=$$IO^cQ5
+ If (Device=$$IO^cQ5)&&'$D(Select)&&$D(QU(1)) Quit QU(1) ; LoggedInUser ipv via Device, PV 15/10/2010
  Set Select=$S($G(Select):"C;C",1:0)
  Quit $$USELECT^vhUSER("","",Device,"","","","","","",Select)
  ;
@@ -496,6 +499,7 @@
  New UserId
  Set:$G(Titel)="" Titel="Gebruiker"
  If $P($G(sUser),D) Set UserId=$P(sUser,D)
+ Else  If $D(QU(1)) Set UserId=$$LoggedInUser()
  Else  If $O(^($O(^vhUSER("ID",$$IO^cQ5,""))))="" Set UserId=$O(^vhUSER("ID",$$IO^cQ5,""))
  Else  Do  Quit:'UserId
  .Set UserId=$$USELECT("",Titel,$$IO^cQ5,"","","","","","","C;C")