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

Parent Directory | Revision Log | Patch

	revision 2454 by niro, Mon Jun 27 12:47:25 2011 UTC	revision 2611 by niro, Wed Jul 6 21:34:49 2011 UTC
#	Line 78  generate_ica_session_file()	Line 78  generate_ica_session_file()
78	addconfig "DesiredColor=${ses_colors}"	addconfig "DesiredColor=${ses_colors}"
79	addconfig 'TransportDriver=TCP/IP'	addconfig 'TransportDriver=TCP/IP'
80	addconfig 'WinStationDriver=ICA 3.0'	addconfig 'WinStationDriver=ICA 3.0'
81	addconfig "ClearPassword=${ses__password}"	addconfig "ClearPassword=${ses_password}"
82	addconfig "Username=${ses_username}"	addconfig "Username=${ses_username}"
83	addconfig "Domain=${ses_domain}"	addconfig "Domain=${ses_domain}"
84	addconfig 'UseFullScreen=Yes'	addconfig 'UseFullScreen=Yes'
#	Line 162  generate_icon()	Line 162  generate_icon()
162	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
163
164	# use some defaults for icon, dest, {x,y}res	# use some defaults for icon, dest, {x,y}res
165	[[ -z ${xres} ]] && xres=30	[[ -z ${xres} ]] && xres=50
166	[[ -z ${yres} ]] && xres=30	[[ -z ${yres} ]] && xres=50
167	if [[ -z ${icon} ]] || [ ! -f ${icon} ]	if [[ -z ${icon} ]] || [ ! -f ${icon} ]
168	then	then
169	# if no default icon is given use default.png	# if no default icon is given use default.png
#	Line 231  generate_all_desktop_icons()	Line 231  generate_all_desktop_icons()
231	install -d ${dest}	install -d ${dest}
232
233	# default settings	# default settings
234	declare -i x=30	declare -i x=50
235	declare -i y=30	declare -i y=50
236
237	# ica icons	# ica icons
238	for i in ${session_list}	for i in ${session_list}
#	Line 246  generate_all_desktop_icons()	Line 246  generate_all_desktop_icons()
246	# new line if x > xres	# new line if x > xres
247	if [ ${x} -ge ${xres} ]	if [ ${x} -ge ${xres} ]
248	then	then
249	x=30	x=50
250	y=$((${y} + 80))	y=$((${y} + 80))
251	fi	fi
252
#	Line 254  generate_all_desktop_icons()	Line 254  generate_all_desktop_icons()
254	if [ ${y} -ge ${yres} ]	if [ ${y} -ge ${yres} ]
255	then	then
256	x=$((${x} + 120))	x=$((${x} + 120))
257	y=30	y=50
258
259	# re-check x	# re-check x
260	[ ${x} -ge ${xres} ] && x=30	[ ${x} -ge ${xres} ] && x=50
261	fi	fi
262
263	generate_icon \	generate_icon \
#	Line 282  generate_all_desktop_icons()	Line 282  generate_all_desktop_icons()
282	# new line if x > xres	# new line if x > xres
283	if [ ${x} -ge ${xres} ]	if [ ${x} -ge ${xres} ]
284	then	then
285	x=30	x=50
286	y=$((${y} + 80))	y=$((${y} + 80))
287	fi	fi
288
#	Line 290  generate_all_desktop_icons()	Line 290  generate_all_desktop_icons()
290	if [ ${y} -ge ${yres} ]	if [ ${y} -ge ${yres} ]
291	then	then
292	x=$((${x} + 120))	x=$((${x} + 120))
293	y=30	y=50
294
295	# re-check x	# re-check x
296	[ ${x} -ge ${xres} ] && x=30	[ ${x} -ge ${xres} ] && x=50
297	fi	fi
298
299	generate_icon \	generate_icon \
#	Line 308  generate_all_desktop_icons()	Line 308  generate_all_desktop_icons()
308	y=$((${y} + 80))	y=$((${y} + 80))
309	done	done
310
311		# add shutdown, reboot icons
312		for i in shutdown reboot
313		do
314		# new line if x > xres
315		if [ ${x} -ge ${xres} ]
316		then
317		x=50
318		y=$((${y} + 80))
319		fi
320
321		# new row if y > yres
322		if [ ${y} -ge ${yres} ]
323		then
324		x=$((${x} + 120))
325		y=50
326
327		# re-check x
328		[ ${x} -ge ${xres} ] && x=50
329		fi
330
331		case ${i} in
332		shutdown) name="Herunterfahren" ;;
333		reboot) name="Neustarten" ;;
334		esac
335
336		generate_icon \
337		--name "${name}" \
338		--command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
339		--icon "${ALX_SESSIONS_ICONS}/${i}.png" \
340		--dest "${dest}/${i}.lnk" \
341		--xres "${x}" \
342		--yres "${y}" \
343		--icon-width "40" \
344		--icon-height "40"
345
346		y=$((${y} + 80))
347		done
348
349	# last but not least gen a icon with some sys informations	# last but not least gen a icon with some sys informations
350	local sysinfo	local sysinfo
351	local hostname	local hostname
#	Line 344  config_sessions()	Line 382  config_sessions()
382	local all_other_ids	local all_other_ids
383	local CONFIG	local CONFIG
384	local screensaver_passwd_cmd	local screensaver_passwd_cmd
385		local fbinit
386		local fbkeys
387
388	# get all session ids from database	# get all session ids from database
389	all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")	all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
#	Line 366  config_sessions()	Line 406  config_sessions()
406	# now generate fluxbox config files	# now generate fluxbox config files
407
408	# fluxbox main config	# fluxbox main config
409	cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init	if [ -f ${ALX_SKELETONS}/fluxbox/init ]
410		then
411		fbinit="${ALX_SKELETONS}/fluxbox/init"
412		else
413		fbinit="/usr/share/fluxbox/init"
414		fi
415		cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
416
417	# fluxbox autostart	# fluxbox autostart
418	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
#	Line 403  config_sessions()	Line 449  config_sessions()
449	fi	fi
450
451	# fluxbox hotkeys	# fluxbox hotkeys
452	cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys	if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
453		then
454		fbkeys="${ALX_SKELETONS}/fluxbox/keys"
455		else
456		fbkeys="/usr/share/fluxbox/keys"
457		fi
458		cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
459
460	# generate a fluxbox menu	# generate a fluxbox menu
461	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"

---

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

Legend: Removed from v.2454   changed lines   Added in v.2611