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

Parent Directory | Revision Log | Patch

	alx-src/trunk/alxconfig-ng/functions/config_sessions.sh revision 338 by niro, Tue Sep 27 22:50:36 2005 UTC	alx-src/branches/alxconf-060/functions/config_sessions.sh revision 2401 by niro, Wed Jun 15 12:43:55 2011 UTC
#	Line 1	Line 1
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 $	# $Id$
2	# configures ica-sessions on the host via mysql db settings	# configures ica-sessions on the host via mysql db settings
3
4	get_sessions_settings()	fix_whitespaces()
5	{	{
6	local x i all count	local var="$@"
7		echo "${var//\ /_}"
	# all arrays:
	# ->  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}'")
	# split'em up and put in an array (only if $all not zero)
	declare -i i=0
	if [ -n "${all}" ]
	then
	for x in ${all}
	do
	ALX_SESSIONS[${i}]=${x}
	((i++))
	done
	count=${i}
	else
	count=0
	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}'")
	export ALX_SESSIONS
	export ALX_PROGRAMS
8	}	}
9
10	get_autostart_settings()	# helper function to create citrix session files
11		generate_ica_session_file()
12	{	{
	# 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}'")
	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}'")
	export ALX_SCRN_SAVER
	export ALX_SCRN_TIMEOUT
	export ALX_SCRN_PASSWD
	}
	generate_ica_session_files()
	{
	local all_ids
13	local i	local i
14	local x	local num
15	local server	local server
16	local ses_session	local ses_session
17	local ses_filename	local ses_filename
#	Line 69  generate_ica_session_files()	Line 19  generate_ica_session_files()
19	local ses_domain	local ses_domain
20	local ses_password	local ses_password
21	local ses_browseradrs	local ses_browseradrs
22	local ses_colors	local CONFIG
23
24		# very basic getops
25		for i in $*
26		do
27		case $1 in
28		--session) shift; ses_session="$1" ;;
29		--filename) shift; ses_filename="$1" ;;
30		--username) shift; ses_username="$1" ;;
31		--password) shift; ses_password="$1" ;;
32		--domain) shift; ses_domain="$1" ;;
33		--server) shift; ses_browseradrs="$1" ;;
34		esac
35		shift
36		done
37
38		# abort if session, filename or server not given
39		[[ -z ${ses_session} ]] && return 1
40		[[ -z ${ses_filename} ]] && return 1
41		[[ -z ${ses_browseradrs} ]] && return 1
42
43		# write session files
44		CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"
45		clearconfig
46
47	# get settings from database	addconfig '[WFClient]'
48	all_ids=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \	addconfig 'Version=2'
	"select id from cfg_sessions where serial='${ALX_SERIAL}'")
49
50	for i in ${all_ids}	# use ';' as ifs
51		declare -i i=0
52		for server in ${ses_browseradrs//;/ }
53	do	do
54	# get settings	(( i++ ))
55	ses_session=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \	num="${i}"
56	"select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")	# support newer ica-clients:
57		# the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!
58	ses_filename=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \	[[ ${i} -eq 1 ]] && num=""
59	"select filename from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")	addconfig "TcpBrowserAddress${num}=${server}"
	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} \
	"select depth from cfg_graphic where serial='${ALX_SERIAL}'")
	case ${ses_colors} in
	24) ses_colors="8";;
	16) ses_colors="4";;
	8) ses_colors="2";;
	*) ses_colors="2";;
	esac
	# write session files
	echo '[WFClient]' > ${ALX_ICA_SESSIONS}/${ses_filename}
	echo 'Version=2' >> ${ALX_ICA_SESSIONS}/${ses_filename}
	OLD_IFS="$IFS"
	IFS=";"
	declare -i x=0
	for server in ${ses_browseradrs}
	do
	(( x++ ))
	echo "TcpBrowserAddress${x}=${server}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	done
	IFS="${OLD_IFS}"
	unset x
	unset OLD_IFS
	echo 'ScreenPercent=0' >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo '[ApplicationServers]' >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "${ses_session}=" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "[${ses_session}]" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "Address=${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "InitialProgram=#${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "DesiredColor=${ses_colors}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo 'TransportDriver=TCP/IP' >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo 'WinStationDriver=ICA 3.0' >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "ClearPassword=${ses_password}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "Username=${ses_username}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo "Domain=${ses_domain}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo 'UseFullScreen=Yes' >> ${ALX_ICA_SESSIONS}/${ses_filename}
	echo 'NoWindowManager=True' >> ${ALX_ICA_SESSIONS}/${ses_filename}
60	done	done
61
62		addconfig 'ScreenPercent=0'
63		addconfig '[ApplicationServers]'
64		addconfig "${ses_session}="
65		addconfig "[${ses_session}]"
66		addconfig "Address=${ses_session}"
67		addconfig "InitialProgram=#${ses_session}"
68		addconfig 'TransportDriver=TCP/IP'
69		addconfig 'WinStationDriver=ICA 3.0'
70		addconfig "ClearPassword=${ses__password}"
71		addconfig "Username=${ses_username}"
72		addconfig "Domain=${ses_domain}"
73		addconfig 'UseFullScreen=Yes'
74		addconfig 'NoWindowManager=True'
75	}	}
76
77	# generates a sh file to start programs	# generates a sh file to start programs
#	Line 146  generate_program_sh()	Line 80  generate_program_sh()
80	local dest	local dest
81	local name	local name
82	local exec	local exec
83		local param
84	local workdir	local workdir
85		local CONFIG
86
87	# very basic getops	# very basic getops
88	for i in $*	for i in $*
#	Line 154  generate_program_sh()	Line 90  generate_program_sh()
90	case $1 in	case $1 in
91	--name|-n) shift; name="$1" ;;	--name|-n) shift; name="$1" ;;
92	--exec|-x) shift; exec="$1" ;;	--exec|-x) shift; exec="$1" ;;
93		--param|-p) shift; param="$1" ;;
94	--dest|-d) shift; dest="$1" ;;	--dest|-d) shift; dest="$1" ;;
95	--workdir|-w) shift; workdir="$1" ;;	--workdir|-w) shift; workdir="$1" ;;
96	esac	esac
#	Line 161  generate_program_sh()	Line 98  generate_program_sh()
98	done	done
99
100	# abort if name, dest or exec not given	# abort if name, dest or exec not given
101	[ -z "${name}" ] && return 1	[[ -z ${name} ]] && return 1
102	[ -z "${exec}" ] && return 1	[[ -z ${exec} ]] && return 1
103	[ -z "${dest}" ] && return 1	[[ -z ${dest} ]] && return 1
104
105	echo "#!/bin/sh" > ${dest}	CONFIG="${dest}"
106	[ -n "${workdir}" ] && echo "cd ${workdir}" >> ${dest}	addconfig "#!/bin/sh"
107	echo "exec ${exec}" >> ${dest}	[ -n "${workdir}" ] && addconfig "cd ${workdir}"
108		addconfig "exec ${exec} ${param}"
	chmod 0755 ${dest}
	}
	get_other_menuitems()
	{
	local x i progsh_path name exec icon workdir
	# all arrays:
	# ->  session1 session2 ... sessionN
109
110	# get settings from database -> now stored in ALX_PROGRAMS	chmod 0755 "${dest}"
	# abort if empty
	[ -z "${ALX_PROGRAMS}" ] && return 0
	progsh_path=${ALX_UNPRIV_HOME}/.alxprogs
	[ -d ${progsh_path} ] && rm -rf ${progsh_path}
	install -d ${progsh_path}
	# gen menu items
	for x in ${ALX_PROGRAMS}
	do
	# to be sure
	unset name
	unset exec
	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$
	# 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}>"
	# gen prog startup wrapper
	generate_program_sh \
	--name "${name}" \
	--exec "${exec}" \
	--dest "${progsh_path}/${name}" \
	"${workdir}"
	echo "[exec] (${name}) {${progsh_path}/${name}} ${icon}"
	done
111	}	}
112
113	# helper functions for generate all desktop icons	# helper functions for generate all desktop icons
#	Line 241  generate_icon()	Line 122  generate_icon()
122	local iwidth	local iwidth
123	local iheight	local iheight
124	local deficon	local deficon
125		local CONFIG
126		local utility
127
128	# very basic getops	# very basic getops
129	for i in $*	for i in $*
#	Line 259  generate_icon()	Line 142  generate_icon()
142	shift	shift
143	done	done
144
145	# some sanity checks :	# some sanity checks:
146
147	# abort if name or command not given	# abort if name or command not given
148	[ -z "${name}" ] && return 1	[[ -z ${name} ]] && return 1
149	[ -z "${command}" ] && return 1	[[ -z ${command} ]] && return 1
150
151		# which utility are we using idesk|xtdesk ?
152		if [ -x /usr/bin/idesk ]
153		then
154		utility="idesk"
155		[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
156		else
157		utility="xtdesk"
158		[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
159		fi
160
161	# use some defaults for icon, dest, {x,y}res	# use some defaults for icon, dest, {x,y}res
162	[ -z "${xres}" ] && xres=20	[[ -z ${xres} ]] && xres=30
163	[ -z "${yres}" ] && xres=20	[[ -z ${yres} ]] && xres=30
164	[ -z "${dest}" ] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"	if [[ -z ${icon} ]] || [ ! -f ${icon} ]
	if [ -z "${icon}" ] || [ ! -f "${icon}" ]
165	then	then
166	# if no default icon is given use default.png	# if no default icon is given use default.png
167	[ -z "${deficon}" ] && deficon="default.png"	[[ -z ${deficon} ]] && deficon="default.png"
168	icon="${ALX_SESSIONS_ICONS}/${deficon}"	icon="${ALX_SESSIONS_ICONS}/${deficon}"
169	fi	fi
170
171	echo "table Icon" > ${dest}	CONFIG="${dest}"
172	echo "  Type: Program" >> ${dest}	clearconfig
173	echo "  Caption: ${name}" >> ${dest}
174	echo "  Command: ${command}" >> ${dest}	addconfig 'table Icon'
175	echo "  Icon: ${icon}" >> ${dest}	[[ ${utility} = xtdesk ]] && addconfig '  Type: Program'
176	echo "  X: ${xres}" >> ${dest}	addconfig "  Caption: ${name}"
177	echo "  Y: ${yres}" >> ${dest}	addconfig "  Command: ${command}"
178		addconfig "  Icon: ${icon}"
179		addconfig "  X: ${xres}"
180		addconfig "  Y: ${yres}"
181
182	# add these only if not zero	# add these only if not zero
183	if [ -n "${iwidth}" ] && [ -n "${iheight}" ]	if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
184	then	then
185	echo "  IconWidth: ${iwidth}" >> ${dest}	if [[ ${utility} = xtdesk ]]
186	echo "  IconHeight: ${iheight}" >> ${dest}	then
187		addconfig "  IconWidth: ${iwidth}"
188		addconfig "  IconHeight: ${iheight}"
189		fi
190		if [[ ${utility} = idesk ]]
191		then
192		addconfig "  Width: ${iwidth}"
193		addconfig "  Height: ${iheight}"
194		fi
195	fi	fi
196
197	echo "end" >> ${dest}	addconfig 'end'
198		fi
199	}	}
200
201	generate_all_desktop_icons()	generate_all_desktop_icons()
202	{	{
203		local session_list="$1"
204		local other_menuitem_list="$2"
205	local res	local res
206	local xres	local xres
207	local yres	local yres
	local icon_list
208	local x	local x
209	local y	local y
210	local item	local i
211	local basename_item	local name
212	local progsh_path	local progsh_path
213		local utility
214		local dest
215		local rc
216
217		# which utility are we using idesk|xtdesk ?
218		if [ -x /usr/bin/idesk ]
219		then
220		utility="idesk"
221		dest="${ALX_UNPRIV_HOME}/.idesktop"
222		rc="${ALX_UNPRIV_HOME}/.ideskrc"
223		else
224		utility="xtdesk"
225		dest="${ALX_UNPRIV_HOME}/.xtdesktop"
226		rc="${ALX_UNPRIV_HOME}/.xtdeskrc"
227		fi
228
229
230		# progsh path
231		progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
232
233	# get the resolution	# get the resolution
234	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}'")
235
236	# split res to x & y	# split res to x & y
237	xres="$(echo ${res} | cut -dx -f1)"	xres="${res%x*}"
238	yres="$(echo ${res} | cut -dx -f2)"	yres="${res#*x}"
239
240	# top left edge of the icon is given in config file	# top left edge of the icon is given in config file
241	# remove a little bit to simulate the bottom-right edge	# remove a little bit to simulate the bottom-right edge
242	xres="$(( ${xres} - 120 ))"	xres="$(( ${xres} - 120 ))"
243	yres="$(( ${yres} - 80 ))"	yres="$(( ${yres} - 80 ))"
244
	# basic config
	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
245	# clean desktop icon location	# clean desktop icon location
246	[ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop	[ -d ${dest} ] && rm -rf ${dest}
247	install -d ${ALX_UNPRIV_HOME}/.xtdesktop	[ -f ${rc} ] && rm -f ${rc}
248		install -d ${dest}
249
250		if [[ ${utility} = xtdesk ]]
251		then
252		# basic config
253		cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc
254		fi
255
256	# default settings	# default settings
257	declare -i x=20	declare -i x=30
258	declare -i y=20	declare -i y=30
259
260	# first all ica sessions	# ica icons
261	local count=${#ALX_SESSIONS[*]}	for i in ${session_list}
	for (( i=0; i < count; i++ ))
	do
	# filenames !
	icon_list="${icon_list} ${ALX_SESSIONS[${i}]}"
	done
	for item in ${icon_list}
262	do	do
263	# abort if empty	# abort if empty
264	[ -z "${item}" ] && continue	[[ -z ${i} ]] && continue
265
266		# get database information
267		evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
268
269	# new line if x > xres	# new line if x > xres
270	if [ ${x} -ge ${xres} ];then	if [ ${x} -ge ${xres} ]
271	x=20	then
272		x=30
273	y=$((${y} + 80))	y=$((${y} + 80))
274	fi	fi
275
276	# new row if y > yres	# new row if y > yres
277	if [ ${y} -ge ${yres} ];then	if [ ${y} -ge ${yres} ]
278		then
279	x=$((${x} + 120))	x=$((${x} + 120))
280	y=20	y=30
281
282	# re-check x	# re-check x
283	[ ${x} -ge ${xres} ] && x=20	[ ${x} -ge ${xres} ] && x=30
284	fi	fi
285
	# ica icons
	# get basename (.ica must be suffix)
	basename_item="$(basename ${item} .ica)"
286	generate_icon \	generate_icon \
287	--name "${basename_item}" \	--name "${cfg_sessions_session}" \
288	--command "wfica ${ALX_ICA_SESSIONS}/${item}" \	--command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
289	--icon "${ALX_SESSIONS_ICONS}/${basename_item}.png" \	--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
290	--dest "${ALX_UNPRIV_HOME}/.xtdesktop/${basename_item}.lnk" \	--dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
291	--xres "${x}" \	--xres "${x}" \
292	--yres "${y}"	--yres "${y}"
293
294	y=$((${y} + 80))	y=$((${y} + 80))
295	done	done
296
297		for i in ${other_menuitem_list}
	# generate program icons
	icon_list="${ALX_PROGRAMS}"
	progsh_path=${ALX_UNPRIV_HOME}/.alxprogs
	for item in ${icon_list}
298	do	do
299	# abort if empty	# abort if empty
300	[ -z "${item}" ] && continue	[[ -z ${i} ]] && continue
301
302		# get database information
303		evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
304
305	# new line if x > xres	# new line if x > xres
306	if [ ${x} -ge ${xres} ];then	if [ ${x} -ge ${xres} ]
307	x=20	then
308		x=30
309	y=$((${y} + 80))	y=$((${y} + 80))
310	fi	fi
311
312	# new row if y > yres	# new row if y > yres
313	if [ ${y} -ge ${yres} ];then	if [ ${y} -ge ${yres} ]
314		then
315	x=$((${x} + 120))	x=$((${x} + 120))
316	y=20	y=30
317
318	# re-check x	# re-check x
319	[ ${x} -ge ${xres} ] && x=20	[ ${x} -ge ${xres} ] && x=30
320	fi	fi
321
322	generate_icon \	generate_icon \
323	--name "${item}" \	--name "${cfg_other_menuitems_name}" \
324	--command "${progsh_path}/${item}" \	--command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
325	--icon "${ALX_SESSIONS_ICONS}/${item}.png" \	--icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
326	--dest "${ALX_UNPRIV_HOME}/.xtdesktop/${item}.lnk" \	--dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
327	--xres "${x}" \	--xres "${x}" \
328	--yres "${y}" \	--yres "${y}" \
329	--default-icon "default_item.png"	--default-icon "default_item.png"
#	Line 411  generate_all_desktop_icons()	Line 331  generate_all_desktop_icons()
331	y=$((${y} + 80))	y=$((${y} + 80))
332	done	done
333
334	# last but not least gen a icon with some sys informations	# last but not least gen a icon with some sys informations
335	local sysinfo	local sysinfo
336	local hostname	local hostname
337	local osversion	local osversion
338
339	osversion="$(< /etc/mageversion)"	osversion="$(< /etc/mageversion)"
340	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}'")
341	sysinfo="Hostname: ${hostname} Serial: #${ALX_SERIAL} OS: alx-${osversion} Kernel: $(uname -r)"	sysinfo="Hostname: ${hostname} Serial: #${ALX_SERIAL} OS: alx-${osversion} Kernel: $(uname -r)"
342
343	# now get the right position:	# now get the right position:
#	Line 436  generate_all_desktop_icons()	Line 353  generate_all_desktop_icons()
353	--name "${sysinfo}" \	--name "${sysinfo}" \
354	--command "exit 0" \	--command "exit 0" \
355	--icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \	--icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
356	--dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \	--dest "${dest}/sysinfo.lnk" \
357	--xres "${xres}" \	--xres "${xres}" \
358	--yres "${yres}" \	--yres "${yres}" \
359	--icon-width "1" \	--icon-width "1" \
#	Line 445  generate_all_desktop_icons()	Line 362  generate_all_desktop_icons()
362
363	config_sessions()	config_sessions()
364	{	{
	# generate ica session files
	generate_ica_session_files
	# first of all get the vars
	get_sessions_settings
	get_autostart_settings
	get_screensaver_settings
	local count=${#ALX_SESSIONS[*]}
	local icon
365	local i	local i
366		local all_ses_ids
367	# DEBUG	local all_other_ids
368	# declare -i i=0	local CONFIG
369	# echo count=${count}	local screensaver_passwd_cmd
370	# echo "Number of new sessions: ${count}"
371	# for ((i=0; i < count; i++))	# get all session ids from database
372	# do	all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
373	# echo "${i} - ${ALX_SESSIONS[${i}]}"	# get all other_menutiem ids from database
374	# done	all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
375
376		# get screensaver settings
377		evaluate_table cfg_screensaver
378		# get autostart settings
379		evaluate_table cfg_autostart
380
381	# now setup fluxbox for user station	# now setup fluxbox for user station
382
#	Line 475  config_sessions()	Line 387  config_sessions()
387	# now generate fluxbox config files	# now generate fluxbox config files
388
389	# fluxbox main config	# fluxbox main config
390	cat ${ALX_SKELETONS}/fluxbox/init \	cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
	> ${ALX_UNPRIV_HOME}/.fluxbox/init
391
392	# fluxbox autostart	# fluxbox autostart
393	cat ${ALX_SKELETONS}/fluxbox/apps \	cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
	> ${ALX_UNPRIV_HOME}/.fluxbox/apps
394
395		CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
396	# add screensaver	# add screensaver
397	if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]	if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
398	then	then
399	local ALX_PASSWD_CMD	if [[ -z ${cfg_screensaver_password} ]] || [[ ${cfg_screensaver_password} = NULL ]]
	if [[ -z ${ALX_SCRN_PASSWD} ]] || [[ ${ALX_SCRN_PASSWD} = NULL ]]
400	then	then
401	ALX_PASSWD_CMD="-nolock"	screensaver_passwd_cmd="-nolock"
402	else	else
403	ALX_PASSWD_CMD="-cpasswd $(openssl passwd ${ALX_SCRN_PASSWD})"	screensaver_passwd_cmd="-cpasswd $(cryptpw -m des ${cfg_screensaver_password})"
404	fi	fi
405
406	echo "[startup] {nohup xautolock -time ${ALX_SCRN_TIMEOUT} -locker 'xlock -mode ${ALX_SCRN_SAVER} ${ALX_PASSWD_CMD}' > /dev/null &}" \	addconfig "[startup] {nohup xautolock -time ${cfg_screensaver_timeout} -locker 'xlock -mode ${cfg_screensaver_screensaver} ${screensaver_passwd_cmd}' > /dev/null &}"
	>> ${ALX_UNPRIV_HOME}/.fluxbox/apps
407	fi	fi
408
409	# add autostart session	# add autostart session
410	if [[ ${ALX_AUTOSTART} != "" ]]	if [[ ! -z ${cfg_autostart_session} ]]
411	then	then
412	echo "[startup] {wfica ${ALX_ICA_SESSIONS}/${ALX_AUTOSTART}}" \	# sleep one second to wait until busybox is fully initialized and the screen is really centered
413	>> ${ALX_UNPRIV_HOME}/.fluxbox/apps	addconfig "[startup] {sleep 1 && nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
414	fi	fi
415
416	# fluxbox hotkeys	# fluxbox hotkeys
417	cat ${ALX_SKELETONS}/fluxbox/keys \	cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys
	> ${ALX_UNPRIV_HOME}/.fluxbox/keys
418
419	# fluxbox menu header	# generate a fluxbox menu
420	cat ${ALX_SKELETONS}/fluxbox/menu.header \	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
421	> ${ALX_UNPRIV_HOME}/.fluxbox/menu	clearconfig
422
423		# fluxbox menu header
424		cat ${ALX_SKELETONS}/fluxbox/menu.header >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
425	# now fix it with proper messages :P	# now fix it with proper messages :P
426	local ver="$(< /etc/mageversion)"	local ver="$(< /etc/mageversion)"
427	sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \	sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
	${ALX_UNPRIV_HOME}/.fluxbox/menu
428	# add a newline (maybe there is no crlf in the header)	# add a newline (maybe there is no crlf in the header)
429	echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu	addconfig
430
431	# fluxbox menu sessions	# first generate session files
432	for (( i=0; i < count; i++ ))	for i in ${all_ses_ids}
433	do	do
434	[ -n "${ALX_SESSIONS[${i}]}" ] && \	evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
435	echo "[exec] ($(basename ${ALX_SESSIONS[${i}]} .ica)) {wfica ${ALX_ICA_SESSIONS}/${ALX_SESSIONS[${i}]}}" \	generate_ica_session_file \
436	>> ${ALX_UNPRIV_HOME}/.fluxbox/menu	--session "${cfg_sessions_session}" \
437		--filename "$(fix_whitespaces ${cfg_sessions_filename})" \
438		--username "${cfg_sessions_username}" \
439		--password "${cfg_sessions_password}" \
440		--domain "${cfg_sessions_domain}" \
441		--server "${cfg_sessions_browseradrs}"
442
443		# fluxbox menusession
444		addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
445	done	done
446
447		# delete all progs
448		progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
449		[ -d ${progsh_path} ] && rm -rf ${progsh_path}
450		install -d ${progsh_path}
451
452	# add other menuitems	# add other menuitems
453	get_other_menuitems >> ${ALX_UNPRIV_HOME}/.fluxbox/menu	for i in ${all_other_ids}
454		do
455		evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
456
457	# fluxbox menu footer	# now echo config line for fluxbox-menu
458	cat ${ALX_SKELETONS}/fluxbox/menu.footer \	# make it "configureable" :p
459	>> ${ALX_UNPRIV_HOME}/.fluxbox/menu	if [[ -n ${cfg_other_menuitems_workdir} ]]
460		then
461		workdir="--workdir ${cfg_other_menuitems_workdir}"
462		fi
463		if [[ -n ${cfg_other_menuitems_icon} ]]
464		then
465		cfg_other_menuitems_icon="<${cfg_other_menuitems_icon}>"
466		fi
467
468		# gen prog startup wrapper
469		generate_program_sh \
470		--name "${cfg_other_menuitems_name}" \
471		--exec "${cfg_other_menuitems_exec}" \
472		--param "${cfg_other_menuitems_param}" \
473		--dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
474		"${workdir}"
475
476		addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
477		done
478
479		# fluxbox menu footer
480		cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
481	# add a newline (maybe there is no crlf in the footer)	# add a newline (maybe there is no crlf in the footer)
482	echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu	addconfig
483
484	# now it's a good time to generate *all* icons :)	# now it's a good time to generate *all* icons :)
485	generate_all_desktop_icons	generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"
486
487	# set correct permissions	# fix permissions
488	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
489	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
490	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
491	chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop	chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
492	chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc	chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
	# unset vars
	unset ALX_SESSIONS
	unset ALX_PROGRAMS
	unset ALX_SCRN_SAVER
	unset ALX_SCRN_TIMEOUT
	unset ALX_SCRN_PASSWD
493	}	}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.338   changed lines   Added in v.2401