/[alx-svn]/alx-src/branches/alxconf-060/functions/config_sessions.sh

Diff of /alx-src/branches/alxconf-060/functions/config_sessions.sh

Parent Directory | Revision Log | View Patch Patch

-revision 338 by niro,
Tue Sep 27 22:50:36 2005 UTC
+revision 342 by niro,
Sun Oct  9 21:30:41 2005 UTC
 Line 1
- # $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()
 Line 9 
 get_sessions_settings()
  	# ->  session1 session2 ... sessionN
  	# get settings from database
- 	all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	all=$(mysqldo "select filename from cfg_sessions where serial='${ALX_SERIAL}'")
- 			"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
-Line 27 
 get_sessions_settings()
+Line 26 
 get_sessions_settings()
  	fi
  	# get settings from database
- 	ALX_PROGRAMS=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	ALX_PROGRAMS=$(mysqldo "select name from cfg_other_menuitems where serial='${ALX_SERIAL}'")
- 		"select name from cfg_other_menuitems where serial='${ALX_SERIAL}'")
  	export ALX_SESSIONS
  	export ALX_PROGRAMS
-Line 37 
 get_sessions_settings()
+Line 35 
 get_sessions_settings()
  get_autostart_settings()
  {
  	# get settings from database
- 	ALX_AUTOSTART=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	ALX_AUTOSTART=$(mysqldo "select session from cfg_autostart where serial='${ALX_SERIAL}'")
- 		"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} \
+ 	ALX_SCRN_SAVER=$(mysqldo "select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")
- 		"select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")
+ 	ALX_SCRN_TIMEOUT=$(mysqldo "select timeout from cfg_screensaver where serial='${ALX_SERIAL}'")
- 	ALX_SCRN_TIMEOUT=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	ALX_SCRN_PASSWD=$(mysqldo "select password from cfg_screensaver where serial='${ALX_SERIAL}'")
- 		"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}'")
  	export ALX_SCRN_SAVER
  	export ALX_SCRN_TIMEOUT
-Line 72 
 generate_ica_session_files()
+Line 66 
 generate_ica_session_files()
  	local ses_colors
  	# get settings from database
- 	all_ids=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	all_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
- 			"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} \
+ 		ses_session=$(mysqldo "select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
- 				"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_filename=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 		ses_domain=$(mysqldo "select domain from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")
- 				"select filename 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}'")
- 		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}'")
  		# get the right colors
- 		ses_colors=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 		ses_colors=$(mysqldo "select depth from cfg_graphic where serial='${ALX_SERIAL}'")
- 			"select depth from cfg_graphic where serial='${ALX_SERIAL}'")
+ 		# convert to ica session file values
  		case ${ses_colors} in
 ) ses_colors="8";;
 ) ses_colors="4";;
-Line 197 
 get_other_menuitems()
+Line 179 
 get_other_menuitems()
  		unset workdir
  		unset icon
- 		name=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 		name=$(mysqldo "select name from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
- 			"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}'")
- 		exec=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 		icon=$(mysqldo "select icon from cfg_other_menuitems where serial='${ALX_SERIAL}' and name='${x}'")
- 			"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$
  		# 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}>"
-Line 307 
 generate_all_desktop_icons()
+Line 278 
 generate_all_desktop_icons()
  	local progsh_path
  	# get the resolution
- 	res=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
- 		"select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
  	# split res to x & y
  	xres="$(echo ${res} | cut -dx -f1)"
-Line 419 
 generate_all_desktop_icons()
+Line 389 
 generate_all_desktop_icons()
  	local osversion
  	osversion="$(< /etc/mageversion)"
- 	hostname=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+ 	hostname=$(mysqldo "select hostname from cfg_network where serial='${ALX_SERIAL}'")
- 		"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:
-Line 457 
 config_sessions()
+Line 426 
 config_sessions()
  	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

 Legend:



Removed from v.338
 


changed lines


 
Added in v.342
 Legend:



Removed from v.338
 


changed lines


 
Added in v.342
-Removed from v.338
+Added in v.342