--- mcore-src/trunk/mcore-tools/daemon/client/include/citrix.client.class	2012/08/13 11:37:56	2029
+++ mcore-src/trunk/mcore-tools/daemon/client/include/citrix.client.class	2013/04/17 14:15:26	2038
@@ -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,11 +49,12 @@
 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
@@ -62,12 +63,14 @@
 	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
@@ -77,7 +80,7 @@
 				*) help_citrix_session && return 1
 			esac
 
-			icafile="${MCORE_CONFIG_PATH}/citrix/ica/${session}.ica"
+			icafile="${MCORE_CONFIG_PATH}/citrix/ica/${name}.ica"
 			CONFIG="${MROOT}/${icafile}"
 			clearconfig
 
@@ -136,14 +139,14 @@
 			esac
 
 			# generate fluxbox menu entry
-			set_fluxbox_menuitem add "${session}" "wfica ${icafile}"
+			set_fluxbox_menuitem add "${name}" "wfica ${icafile}"
 			;;
 
 		del)
-			if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica/"${session}".ica ]
+			if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/citrix/ica/"${name}".ica ]
 			then
-				rm ${MROOT}/${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