--- mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in	2014/01/14 13:29:57	2275
+++ mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in	2015/09/29 11:43:12	2634
@@ -64,7 +64,9 @@
 	local user="${CLASS_ARGV[4]}"
 	local domain="${CLASS_ARGV[5]}"
 	local password="${CLASS_ARGV[6]}"
+	local serverlist="${CLASS_ARGV[7]}"
 	local i
+	local opts
 
 	[[ -z ${action} ]] && help_citrix_session && return 1
 
@@ -85,6 +87,11 @@
 				*) help_citrix_session && return 1 ;;
 			esac
 
+			if [[ -n ${serverlist} ]]
+			then
+				opts="--serverlist '${serverlist}'"
+			fi
+
 			# create citrix session file
 			${MCORE_LIBDIR}/citrix-session \
 				--add \
@@ -93,22 +100,20 @@
 				--mode "${mode}" \
 				--user "${user}" \
 				--domain "${domain}" \
-				--password "${password}"
-
-			# generate fluxbox menu entry
-			set_fluxbox_menuitem add "${name}" "wfica ${icafile}"
+				--password "${password}" \
+				${opts}
 			;;
 
 		del)
 			if [[ -n ${name} ]]
 			then
 				${MCORE_LIBDIR}/citrix-session --del --name "${name}"
-				set_fluxbox_menuitem del "${name}"
 			else
-				for i in $(NOCOLORS=true ${MCORE_LIBDIR}/citrix-session --print)
+				for i in $(NOCOLORS=1 ${MCORE_LIBDIR}/citrix-session --print)
 				do
-					${MCORE_LIBDIR}/citrix-session --del --name "${i}"
-					set_fluxbox_menuitem del "${name}"
+					# basename
+					name="${i%.*}"
+					${MCORE_LIBDIR}/citrix-session --del --name "${name}"
 				done
 			fi
 			;;
@@ -124,8 +129,8 @@
 	[[ -z ${action} ]] && help_citrix_serverlist && return 1
 
 	case "${action}" in
-		print) citrix-session --print ;;
-		query) citrix-session --query ;;
+		print) ${MCORE_LIBDIR}/citrix-session --print ;;
+		query) ${MCORE_LIBDIR}/citrix-session --query ;;
 		*) help_citrix_session && return 1 ;;
 	esac
 }
@@ -146,7 +151,7 @@
 				${MCORE_LIBDIR}/citrix-serverlist --del --server "${server}"
 			else
 				# delete all items
-				for i in $(NOCOLORS=true ${MCORE_LIBDIR}/citrix-serverlist --print)
+				for i in $(NOCOLORS=1 ${MCORE_LIBDIR}/citrix-serverlist --print)
 				do
 					${MCORE_LIBDIR}/citrix-serverlist --del --server "${i}"
 				done
@@ -164,8 +169,8 @@
 	[[ -z ${action} ]] && help_citrix_serverlist && return 1
 
 	case "${action}" in
-		print) citrix-serverlist --print ;;
-		query) citrix-serverlist --query ;;
+		print) ${MCORE_LIBDIR}/citrix-serverlist --print ;;
+		query) ${MCORE_LIBDIR}/citrix-serverlist --query ;;
 		*) help_citrix_session && return 1 ;;
 	esac
 }