--- mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in	2014/01/13 15:37:44	2264
+++ mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in	2014/01/14 10:36:38	2270
@@ -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
@@ -195,11 +195,11 @@
 				then
 					exclude="| grep -v '${PNABROWSE_SESSION_EXCLUDE}'"
 				fi
-				sessionlist=( $(${MROOT}/${PNABROWSE_EXECUTABLE} -A "${PNABROWSE_CITRIX_BROWSER}" ${exclude}) )
+				eval sessionlist=( $(eval ${MROOT}/${PNABROWSE_EXECUTABLE} -A "${PNABROWSE_CITRIX_BROWSER}" ${exclude}) )
 				sessioncount="${#sessionlist[*]}"
 				for (( i=0; i<sessioncount; i++))
 				do
-					rvecho -n "${sessionlist[${i}]} "
+					rvecho -n "${sessionlist[${i}]};"
 				done
 				rvecho
 			else
@@ -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
@@ -253,7 +253,7 @@
 				then
 					exclude="| grep -v '${PNABROWSE_SERVER_EXCLUDE}'"
 				fi
-				serverlist=( $(${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER} ${exclude}) )
+				eval serverlist=( $(eval ${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER} ${exclude}) )
 				servercount="${#serverlist[*]}"
 				for (( i=0; i<servercount; i++))
 				do
@@ -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
@@ -284,17 +284,21 @@
 
 	case "${action}" in
 		print)
-		list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist ;;
+			list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist ;;
 		query)
 			[[ -n ${PNABROWSE_EXECUTABLE} ]] || eecho "\$PNABROWSE_EXECUTABLE not defined"
 			[[ -n ${PNABROWSE_CITRIX_BROWSER} ]] || eecho "\$PNABROWSE_CITRIX_BROWSER not defined"
 			if [ -x ${MROOT}/${PNABROWSE_EXECUTABLE} ]
 			then
-				serverlist=( $(${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER}) )
+				if [[ -n ${PNABROWSE_SERVER_EXCLUDE} ]]
+				then
+					exclude="| grep -v '${PNABROWSE_SERVER_EXCLUDE}'"
+				fi
+				eval serverlist=( $(eval ${MROOT}/${PNABROWSE_EXECUTABLE} -S ${PNABROWSE_CITRIX_BROWSER} ${exclude}) )
 				servercount="${#serverlist[*]}"
 				for (( i=0; i<servercount; i++))
 				do
-					rvecho -n "${serverlist[${i}]} "
+					rvecho -n "${serverlist[${i}]};"
 				done
 				rvecho
 			else