--- mcore-src/trunk/mcore-tools/daemon/client/include/citrix.client.class	2011/03/10 18:11:32	1641
+++ mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.client.class.in	2014/01/10 14:17:06	2179
@@ -26,7 +26,7 @@
 	mecho "get citrix.session"
 	mecho " Shows all configured ICA sessions"
 	mecho
-	mecho "set citrix.session [action] [session] [mode] [user] [domain] [password]"
+	mecho "set citrix.session [action] [name] [session] [mode] [user] [domain] [password]"
 	mecho "  Adds or delets a ICA session."
 	mecho "  Available actions:"
 	mecho "   add        - adds a new ica session"
@@ -49,24 +49,28 @@
 set_citrix_session()
 {
 	local action="$1"
-	local session="$2"
-	local mode="$3"
-	local user="$4"
-	local domain="$5"
-	local password="$6"
+	local name="$2"
+	local session="$3"
+	local mode="$4"
+	local user="$5"
+	local domain="$6"
+	local password="$7"
 	local serverlist
 	local server
 	local server_num
+	local icafile
 	local CONFIG
 	local i
 
 	[[ -z ${action} ]] && help_citrix_session && return 1
-	[[ -z ${session} ]] && help_citrix_session && return 1
+	[[ -z ${name} ]] && help_citrix_session && return 1
 
 	case "${action}" in
 		add)
 			# action 'add' need mode too
 			[[ -z ${mode} ]] && help_citrix_session && return 1
+			# and session
+			[[ -z ${session} ]] && help_citrix_session && return 1
 
 			# other sanity checks
 			case "${mode}" in
@@ -76,7 +80,8 @@
 				*) help_citrix_session && return 1
 			esac
 
-			CONFIG="${MCORE_CONFIG_PATH}/citrix/ica/${session}.ica"
+			icafile="${MCORE_CONFIG_PATH}/citrix/ica/${name}.ica"
+			CONFIG="${MROOT}/${icafile}"
 			clearconfig
 
 			addconfig '[WFClient]'
@@ -134,20 +139,20 @@
 			esac
 
 			# generate fluxbox menu entry
-			set_fluxbox_menuitem add "${session}" "wfica ${CONFIG}"
+			set_fluxbox_menuitem add "${name}" "wfica ${icafile}"
 			;;
 
 		del)
-			if [[ -f ${MCORE_CONFIG_PATH}/citrix/ica/${session}.ica ]]
+			if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica/"${name}".ica ]
 			then
-				rm ${MCORE_CONFIG_PATH}/citrix/ica/"${session}".ica
-				set_fluxbox_menuitem del "${session}"
+				rm ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica/"${name}".ica
+				set_fluxbox_menuitem del "${name}"
 
 			elif [[ -z ${file} ]]
 			then
 				# delete all items, needed to loop through every session
 				# or we delete *all* fluxbox menuitem too
-				for i in ${MCORE_CONFIG_PATH}/citrix/ica/*
+				for i in $(find ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica -type f)
 				do
 					rm ${i}
 					set_fluxbox_menuitem del "$(basename ${i} .ica)"
@@ -161,15 +166,7 @@
 
 get_citrix_session()
 {
-	local i
-	local item
-
-	for i in $(find ${MCORE_CONFIG_PATH}/citrix/ica -type f)
-	do
-		item="${item} $(basename ${i} .ica)"
-	done
-
-	rvecho "${item}"
+	list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica
 }
 
 set_citrix_serverlist()
@@ -183,19 +180,19 @@
 	case "${action}" in
 		add)
 			[[ -z ${server} ]] && help_citrix_serverlist && return 1
-			CONFIG="${MCORE_CONFIG_PATH}/citrix/serverlist/${server}"
+			CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist/${server}"
 			clearconfig
 			addconfig "${server}"
 			;;
 
 		del)
-			if [[ -f ${MCORE_CONFIG_PATH}/citrix/serverlist/${server} ]]
+			if [[ -f ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist/${server} ]]
 			then
-				rm ${MCORE_CONFIG_PATH}/citrix/serverlist/"${server}"
+				rm ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist/"${server}"
 			elif [[ -z ${server} ]]
 			then
 				# delete all items
-				rm ${MCORE_CONFIG_PATH}/citrix/serverlist/*
+				find ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist -type f | xargs --no-run-if-empty rm
 			fi
 			;;
 
@@ -205,13 +202,5 @@
 
 get_citrix_serverlist()
 {
-	local i
-	local item
-
-	for i in $(find ${MCORE_CONFIG_PATH}/citrix/serverlist -type f)
-	do
-		item="${item} $(basename ${i})"
-	done
-
-	rvecho "${item}"
+	list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/citrix/serverlist
 }