--- alx-src/trunk/alxconfig-ng/functions/config_sessions.sh	2005/09/27 22:50:36	338
+++ alx-src/trunk/alxconfig-ng/functions/config_sessions.sh	2005/10/09 21:30:41	342
@@ -1,4 +1,4 @@
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.16 2005-09-27 22:50:36 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.17 2005-10-09 21:30:25 niro Exp $
 # configures ica-sessions on the host via mysql db settings
 
 get_sessions_settings()
@@ -9,8 +9,7 @@
 	# ->  session1 session2 ... sessionN
 
 	# get settings from database
-	all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"select filename from cfg_sessions where serial='${ALX_SERIAL}'")
+	all=$(mysqldo "select filename from cfg_sessions where serial='${ALX_SERIAL}'")
 
 	# split'em up and put in an array (only if $all not zero)
 	declare -i i=0
@@ -27,8 +26,7 @@
 	fi
 
 	# get settings from database
-	ALX_PROGRAMS=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select name from cfg_other_menuitems where serial='${ALX_SERIAL}'")
+	ALX_PROGRAMS=$(mysqldo "select name from cfg_other_menuitems where serial='${ALX_SERIAL}'")
 
 	export ALX_SESSIONS
 	export ALX_PROGRAMS
@@ -37,20 +35,16 @@
 get_autostart_settings()
 {
 	# get settings from database
-	ALX_AUTOSTART=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select session from cfg_autostart where serial='${ALX_SERIAL}'")
+	ALX_AUTOSTART=$(mysqldo "select session from cfg_autostart where serial='${ALX_SERIAL}'")
 
 	export ALX_AUTOSTART
 }
 
 get_screensaver_settings()
 {
-	ALX_SCRN_SAVER=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")
-	ALX_SCRN_TIMEOUT=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select timeout from cfg_screensaver where serial='${ALX_SERIAL}'")
-	ALX_SCRN_PASSWD=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select password from cfg_screensaver where serial='${ALX_SERIAL}'")
+	ALX_SCRN_SAVER=$(mysqldo "select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")
+	ALX_SCRN_TIMEOUT=$(mysqldo "select timeout from cfg_screensaver where serial='${ALX_SERIAL}'")
+	ALX_SCRN_PASSWD=$(mysqldo "select password from cfg_screensaver where serial='${ALX_SERIAL}'")
 
 	export ALX_SCRN_SAVER
 	export ALX_SCRN_TIMEOUT
@@ -72,33 +66,21 @@
 	local ses_colors
 
 	# get settings from database
-	all_ids=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"select id from cfg_sessions where serial='${ALX_SERIAL}'")
+	all_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
 
 	for i in ${all_ids}
 	do
 		# get settings
-		ses_session=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-				"select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
-
-		ses_filename=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-				"select filename from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
-
-		ses_username=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-				"select username from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
-
-		ses_domain=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-				"select domain from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
-
-		ses_password=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-				"select password from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
-
-		ses_browseradrs=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-				"select browseradrs from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
+		ses_session=$(mysqldo "select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
+		ses_filename=$(mysqldo "select filename from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
+		ses_username=$(mysqldo "select username from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
+		ses_domain=$(mysqldo "select domain from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
+		ses_password=$(mysqldo "select password from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
+		ses_browseradrs=$(mysqldo "select browseradrs from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
 
 		# get the right colors
-		ses_colors=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"select depth from cfg_graphic where serial='${ALX_SERIAL}'")
+		ses_colors=$(mysqldo "select depth from cfg_graphic where serial='${ALX_SERIAL}'")
+		# convert to ica session file values
 		case ${ses_colors} in
 			24) ses_colors="8";;
 			16) ses_colors="4";;
@@ -197,24 +179,13 @@
 		unset workdir
 		unset icon
 
-		name=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"select name from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
-
-		exec=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"select exec from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
-
-		workdir=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"select workdir from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
-
-		icon=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"select icon from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
-
-		# debug only
-		#echo "DEBUG: ${x}: name:'${name}' exec:'${exec}' workdir:'${workdir}' ic$
+		name=$(mysqldo "select name from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
+		exec=$(mysqldo "select exec from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
+		workdir=$(mysqldo "select workdir from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
+		icon=$(mysqldo "select icon from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
 
 		# now echo config line for fluxbox-menu
 		# make it "configureable" :P
-		#[ -n "${workdir}" ] && workdir="cd ${workdir};"
 		[ -n "${workdir}" ] && workdir="--workdir ${workdir}"
 		[ -n "${icon}" ] && icon="<${icon}>"
 
@@ -307,8 +278,7 @@
 	local progsh_path
 
 	# get the resolution
-	res=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
+	res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
 
 	# split res to x & y
 	xres="$(echo ${res} | cut -dx -f1)"
@@ -419,8 +389,7 @@
 	local osversion
 
 	osversion="$(< /etc/mageversion)"
-	hostname=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select hostname from cfg_network where serial='${ALX_SERIAL}'")
+	hostname=$(mysqldo "select hostname from cfg_network where serial='${ALX_SERIAL}'")
 	sysinfo="Hostname: ${hostname} Serial: #${ALX_SERIAL} OS: alx-${osversion} Kernel: $(uname -r)"
 
 	# now get the right position:
@@ -457,15 +426,6 @@
 	local icon
 	local i
 
-	# DEBUG
-# 	declare -i i=0
-# 	echo count=${count}
-# 	echo "Number of new sessions: ${count}"
-# 	for ((i=0; i < count; i++))
-# 	do
-# 		echo "${i} - ${ALX_SESSIONS[${i}]}"
-# 	done
-
 	# now setup fluxbox for user station
 
 	# create a fresh fluxbox directory