--- mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in	2014/01/13 15:41:42	2268
+++ mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in	2014/01/14 10:34:57	2269
@@ -57,13 +57,13 @@
 
 set_citrix_session()
 {
-	local action="$1"
-	local name="$2"
-	local session="$3"
-	local mode="$4"
-	local user="$5"
-	local domain="$6"
-	local password="$7"
+	local action="${CLASS_ARGV[0]}"
+	local name="${CLASS_ARGV[1]}"
+	local session="${CLASS_ARGV[2]}"
+	local mode="${CLASS_ARGV[3]}"
+	local user="$${CLASS_ARGV[4]}"
+	local domain="${CLASS_ARGV[5]}"
+	local password="${CLASS_ARGV[6]}"
 	local serverlist
 	local server
 	local server_num
@@ -175,8 +175,8 @@
 
 get_citrix_session()
 {
-	local action="$1"
-	local server="$2"
+	local action="${CLASS_ARGV[0]}"
+	local server="${CLASS_ARGV[1]}"
 	local sessionlist
 	local sessioncount
 	local i
@@ -212,8 +212,8 @@
 
 set_citrix_serverlist()
 {
-	local action="$1"
-	local server="$2"
+	local action="${CLASS_ARGV[0]}"
+	local server="${CLASS_ARGV[1]}"
 	local CONFIG
 	local serverlist
 	local servercount
@@ -273,8 +273,8 @@
 
 get_citrix_serverlist()
 {
-	local action="$1"
-	local server="$2"
+	local action="${CLASS_ARGV[0]}"
+	local server="${CLASS_ARGV[1]}"
 	local serverlist
 	local servercount
 	local i