--- mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class	2011/02/07 20:03:29	1327
+++ mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class	2012/08/13 10:05:03	2015
@@ -12,24 +12,24 @@
 	local CONFIG
 
 	MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"
-	CONFIG="${MMINCLUDE}"
+	CONFIG="${MROOT}/${MMINCLUDE}"
 	clearconfig
-
-	for file in ${MCORE_CONFIG_PATH}/fluxbox/menu/*
+	for file in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f)
 	do
+		[[ ! -z ${MROOT} ]] && file=$(echo ${file} | sed "s:${MROOT}::")
 		addconfig "[include] (${file})"
 	done
 
 	# rebuild the user menu too atm
-	CONFIG="${MCORE_UNPRIV_HOME}/.fluxbox/menu"
-	if [[ ! -d ${MCORE_UNPRIV_HOME}/.fluxbox ]]
+	CONFIG="${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/menu"
+	if [[ ! -d ${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox ]]
 	then
-		install -o ${MCORE_UNPRIV_USER} -o ${MCORE_UNPRIV_GROUP} -d ${MCORE_UNPRIV_HOME}/.fluxbox
+		install -o ${MCORE_UNPRIV_USER} -o ${MCORE_UNPRIV_GROUP} -d ${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox
 	fi
 
 	# fluxbox menu header
 	clearconfig
-	local ver="$(< /etc/mageversion)"
+	local ver="$(< ${MROOT}/etc/mageversion)"
 	addconfig "[begin] (mCore-${ver}  #${MCORE_SERIAL})"
 
 	# add a newline (maybe there is no crlf in the header)
@@ -39,7 +39,8 @@
 	addconfig "[include] (${MMINCLUDE})"
 
 	# fluxbox menu footer
-	addconfig '[nop]  (__________)'
+	addconfig '[separator]'
+	addconfig '[exit] (Abmelden)'
 	addconfig '[exec] (Neustarten) {sudo /sbin/reboot}'
 	addconfig '[exec] (Herunterfahren) {sudo /sbin/halt}'
 	addconfig '[end]'
@@ -48,6 +49,21 @@
 	addconfig
 }
 
+helper_rebuild_fluxbox_autostart()
+{
+	local CONFIG
+
+	CONFIG="${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/apps"
+	clearconfig
+	for file in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart -type f)
+	do
+		addconfig "$(< ${file})"
+	done
+
+	# add a newline (maybe there is no crlf in the footer)
+	addconfig
+}
+
 help_fluxbox_menuitem()
 {
 	mecho "get fluxbox.menuitem"
@@ -83,18 +99,18 @@
 		add)
 			[[ -z ${name} ]] && help_fluxbox_menuitem && return 1
 			[[ -z ${exec} ]] && help_fluxbox_menuitem && return 1
-			CONFIG="${MCORE_CONFIG_PATH}/fluxbox/menu/${name}"
+			CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/${name}"
 			clearconfig
 			addconfig "[exec] (${name}) {${exec}}"
 			;;
 		del)
-			if [[ -f ${MCORE_CONFIG_PATH}/fluxbox/menu/${name} ]]
+			if [[ -f ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/${name} ]]
 			then
-				rm ${MCORE_CONFIG_PATH}/fluxbox/menu/"${name}"
+				rm ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/"${name}"
 			elif [[ -z ${name} ]]
 			then
 				# delete all items
-				rm ${MCORE_CONFIG_PATH}/fluxbox/menu/*
+				rm ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/*
 			fi
 			;;
 		*)
@@ -109,15 +125,7 @@
 # get_fluxbox_menuitem
 get_fluxbox_menuitem()
 {
-	local i
-	local item
-
-	for i in $(find ${MCORE_CONFIG_PATH}/fluxbox/menu -type f | sort)
-	do
-		item="${item} $(basename ${i})"
-	done
-
-	mecho "${item}"
+	list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu
 }
 
 help_fluxbox_theme()
@@ -159,16 +167,12 @@
 
 	case "${method}" in
 		system)
-			for i in $(find ${stylesdir} -mindepth 1 -maxdepth 1 | sort)
-			do
-				value="${value} $(basename ${i})"
-			done
-			mecho "${value}"
+			list_files_in_directory -type d -mindepth 1 -maxdepth 1 ${MROOT}/${stylesdir}
 			;;
 
 		current)
-			value=$(grep -i '^session.stylefile' ${MCORE_UNPRIV_HOME}/.fluxbox/init | sed 's:.*/\(.*\):\1:')
-			mecho "${value}"
+			value=$(grep -i '^session.stylefile' ${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/init | sed 's:.*/\(.*\):\1:')
+			rvecho "${value}"
 			;;
 		*) help_fluxbox_theme && return 1 ;;
 	esac