Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

alx-src/branches/alxconf_20060908/functions/config_sessions.sh revision 1704 by niro, Mon Jan 24 23:28:22 2011 UTC alx-src/branches/alxconf-060/functions/config_sessions.sh revision 3504 by niro, Thu Apr 19 13:27:58 2012 UTC
# Line 1  Line 1 
1  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.18 2006-01-26 19:55:53 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=$(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  
  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=$(mysqldo "select name from cfg_other_menuitems where serial='${ALX_SERIAL}'")  
   
  export ALX_SESSIONS  
  export ALX_PROGRAMS  
 }  
   
 get_autostart_settings()  
 {  
  # get settings from database  
  ALX_AUTOSTART=$(mysqldo "select session from cfg_autostart where serial='${ALX_SERIAL}'")  
   
  export ALX_AUTOSTART  
 }  
   
 get_screensaver_settings()  
 {  
  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  
  export ALX_SCRN_PASSWD  
8  }  }
9    
10  generate_ica_session_files()  # helper function to create citrix session files
11    generate_ica_session_file()
12  {  {
  local all_ids  
13   local i   local i
14   local x   local num
  local browser_address_num  
15   local server   local server
16   local ses_session   local ses_session
17   local ses_filename   local ses_filename
# Line 65  generate_ica_session_files() Line 20  generate_ica_session_files()
20   local ses_password   local ses_password
21   local ses_browseradrs   local ses_browseradrs
22   local ses_colors   local ses_colors
23     local CONFIG
24    
25   # get settings from database   # very basic getops
26   all_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")   for i in $*
   
  for i in ${all_ids}  
27   do   do
28   # get settings   case $1 in
29   ses_session=$(mysqldo "select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --session) shift; ses_session="$1" ;;
30   ses_filename=$(mysqldo "select filename from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --filename) shift; ses_filename="$1" ;;
31   ses_username=$(mysqldo "select username from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --username) shift; ses_username="$1" ;;
32   ses_domain=$(mysqldo "select domain from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --password) shift; ses_password="$1" ;;
33   ses_password=$(mysqldo "select password from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --domain) shift; ses_domain="$1" ;;
34   ses_browseradrs=$(mysqldo "select browseradrs from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --server) shift; ses_browseradrs="$1" ;;
35     --colordepth) shift; ses_colors="$1" ;;
36   # get the right colors           esac
37   ses_colors=$(mysqldo "select depth from cfg_graphic where serial='${ALX_SERIAL}'")   shift
38   # convert to ica session file values   done
  case ${ses_colors} in  
  24) ses_colors="8";;  
  16) ses_colors="4";;  
  8) ses_colors="2";;  
  *) ses_colors="2";;  
  esac  
39    
40   # write session files   # abort if session, filename or server not given
41   echo '[WFClient]' > ${ALX_ICA_SESSIONS}/${ses_filename}   [[ -z ${ses_session} ]] && return 1
42   echo 'Version=2' >> ${ALX_ICA_SESSIONS}/${ses_filename}   [[ -z ${ses_filename} ]] && return 1
43   OLD_IFS="$IFS"   [[ -z ${ses_browseradrs} ]] && return 1
44   IFS=";"  
45   declare -i x=0   # write session files
46   for server in ${ses_browseradrs}   CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"
47   do   clearconfig
48   (( x++ ))  
49   browser_address_num="${x}"   addconfig '[WFClient]'
50   # support newer ica-clients:   addconfig 'Version=2'
51   # the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!  
52   [[ ${x} -eq 1 ]] && browser_address_num=""   # use ';' as ifs
53   echo "TcpBrowserAddress${browser_address_num}=${server}" >> ${ALX_ICA_SESSIONS}/${ses_filename}   declare -i i=0
54   done   for server in ${ses_browseradrs//;/ }
55   IFS="${OLD_IFS}"   do
56   unset x   (( i++ ))
57   unset OLD_IFS   num="${i}"
58     # support newer ica-clients:
59   echo 'ScreenPercent=0' >> ${ALX_ICA_SESSIONS}/${ses_filename}   # the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!
60     [[ ${i} -eq 1 ]] && num=""
61   echo '[ApplicationServers]' >> ${ALX_ICA_SESSIONS}/${ses_filename}   addconfig "TcpBrowserAddress${num}=${server}"
  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}  
62   done   done
63    
64     addconfig 'ScreenPercent=0'
65     addconfig '[ApplicationServers]'
66     addconfig "${ses_session}="
67     addconfig "[${ses_session}]"
68     addconfig "Address=${ses_session}"
69     addconfig "InitialProgram=#${ses_session}"
70    
71     # convert to ica session file values
72     case ${ses_colors} in
73     24|32) ses_colors="8";;
74     16) ses_colors="4";;
75     8) ses_colors="2";;
76     *) ses_colors="4";; # default to 16bit
77     esac
78     addconfig "DesiredColor=${ses_colors}"
79     addconfig 'TransportDriver=TCP/IP'
80     addconfig 'WinStationDriver=ICA 3.0'
81     addconfig "ClearPassword=${ses_password}"
82     addconfig "Username=${ses_username}"
83     addconfig "Domain=${ses_domain}"
84     addconfig 'UseFullScreen=Yes'
85     addconfig 'NoWindowManager=True'
86  }  }
87    
88  # generates a sh file to start programs  # generates a sh file to start programs
# Line 133  generate_program_sh() Line 91  generate_program_sh()
91   local dest   local dest
92   local name   local name
93   local exec   local exec
94     local param
95   local workdir   local workdir
96     local CONFIG
97    
98   # very basic getops   # very basic getops
99   for i in $*   for i in $*
# Line 141  generate_program_sh() Line 101  generate_program_sh()
101   case $1 in   case $1 in
102   --name|-n) shift; name="$1" ;;   --name|-n) shift; name="$1" ;;
103   --exec|-x) shift; exec="$1" ;;   --exec|-x) shift; exec="$1" ;;
104     --param|-p) shift; param="$1" ;;
105   --dest|-d) shift; dest="$1" ;;   --dest|-d) shift; dest="$1" ;;
106   --workdir|-w) shift; workdir="$1" ;;   --workdir|-w) shift; workdir="$1" ;;
107           esac           esac
# Line 148  generate_program_sh() Line 109  generate_program_sh()
109   done   done
110    
111   # abort if name, dest or exec not given   # abort if name, dest or exec not given
112   [ -z "${name}" ] && return 1   [[ -z ${name} ]] && return 1
113   [ -z "${exec}" ] && return 1   [[ -z ${exec} ]] && return 1
114   [ -z "${dest}" ] && return 1   [[ -z ${dest} ]] && return 1
115    
116   echo "#!/bin/sh" > ${dest}   CONFIG="${dest}"
117   [ -n "${workdir}" ] && echo "cd ${workdir}" >> ${dest}   addconfig "#!/bin/sh"
118   echo "exec ${exec}" >> ${dest}   [ -n "${workdir}" ] && addconfig "cd ${workdir}"
119     addconfig "exec ${exec} ${param}"
  chmod 0755 ${dest}  
 }  
   
 get_other_menuitems()  
 {  
  local x i progsh_path name exec icon workdir  
   
  # all arrays:  
  # ->  session1 session2 ... sessionN  
   
  # get settings from database -> now stored in ALX_PROGRAMS  
   
  # 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=$(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="--workdir ${workdir}"  
  [ -n "${icon}" ] && icon="<${icon}>"  
   
  # gen prog startup wrapper  
  generate_program_sh \  
  --name "${name}" \  
  --exec "${exec}" \  
  --dest "${progsh_path}/${name}" \  
  "${workdir}"  
120    
121   echo "[exec] (${name}) {${progsh_path}/${name}} ${icon}"   chmod 0755 "${dest}"
  done  
122  }  }
123    
124  # helper functions for generate all desktop icons  # helper functions for generate all desktop icons
# Line 217  generate_icon() Line 133  generate_icon()
133   local iwidth   local iwidth
134   local iheight   local iheight
135   local deficon   local deficon
136     local CONFIG
137     local utility
138    
139   # very basic getops   # very basic getops
140   for i in $*   for i in $*
# Line 235  generate_icon() Line 153  generate_icon()
153   shift   shift
154   done   done
155    
156   # some sanity checks :   # some sanity checks:
157    
158   # abort if name or command not given   # abort if name or command not given
159   [ -z "${name}" ] && return 1   [[ -z ${name} ]] && return 1
160   [ -z "${command}" ] && return 1   [[ -z ${command} ]] && return 1
161    
162     [[ -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   [ -z "${dest}" ] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"   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
170   [ -z "${deficon}" ] && deficon="default.png"   [[ -z ${deficon} ]] && deficon="default.png"
171   icon="${ALX_SESSIONS_ICONS}/${deficon}"   icon="${ALX_SESSIONS_ICONS}/${deficon}"
172   fi   fi
173    
174   echo "table Icon" > ${dest}   CONFIG="${dest}"
175   echo "  Type: Program" >> ${dest}   clearconfig
176   echo "  Caption: ${name}" >> ${dest}  
177   echo "  Command: ${command}" >> ${dest}   addconfig 'table Icon'
178   echo "  Icon: ${icon}" >> ${dest}   addconfig "  Caption: ${name}"
179   echo "  X: ${xres}" >> ${dest}   addconfig "  Command: ${command}"
180   echo "  Y: ${yres}" >> ${dest}   addconfig "  Icon: ${icon}"
181     addconfig "  X: ${xres}"
182     addconfig "  Y: ${yres}"
183    
184   # add these only if not zero   # add these only if not zero
185   if [ -n "${iwidth}" ] && [ -n "${iheight}" ]   if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
186   then   then
187   echo "  IconWidth: ${iwidth}" >> ${dest}   addconfig "  Width: ${iwidth}"
188   echo "  IconHeight: ${iheight}" >> ${dest}   addconfig "  Height: ${iheight}"
189   fi   fi
190    
191   echo "end" >> ${dest}   addconfig 'end'
192  }  }
193    
194  generate_all_desktop_icons()  generate_all_desktop_icons()
195  {  {
196     local session_list="$1"
197     local other_menuitem_list="$2"
198     local plugin_list="$3"
199   local res   local res
200   local xres   local xres
201   local yres   local yres
  local icon_list  
202   local x   local x
203   local y   local y
204   local item   local i
205   local basename_item   local name
206   local progsh_path   local progsh_path
207     local utility
208     local dest
209     local rc
210    
211     dest="${ALX_UNPRIV_HOME}/.idesktop"
212     rc="${ALX_UNPRIV_HOME}/.ideskrc"
213    
214     # progsh path
215     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
216    
217   # get the resolution   # get the resolution
218   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")   res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
219    
220   # split res to x & y   # split res to x & y
221   xres="$(echo ${res} | cut -dx -f1)"   xres="${res%x*}"
222   yres="$(echo ${res} | cut -dx -f2)"   yres="${res#*x}"
223    
224   # top left edge of the icon is given in config file   # top left edge of the icon is given in config file
225   # remove a little bit to simulate the bottom-right edge   # remove a little bit to simulate the bottom-right edge
226   xres="$(( ${xres} - 120 ))"   xres="$(( ${xres} - 120 ))"
227   yres="$(( ${yres} - 80 ))"   yres="$(( ${yres} - 80 ))"
228    
  # basic config  
  cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
   
229   # clean desktop icon location   # clean desktop icon location
230   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${dest} ] && rm -rf ${dest}
231   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   [ -f ${rc} ] && rm -f ${rc}
232     install -d ${dest}
233    
234   # default settings   # default settings
235   declare -i x=30   declare -i x=50
236   declare -i y=30   declare -i y=50
   
  # first all ica sessions  
  local count=${#ALX_SESSIONS[*]}  
  for (( i=0; i < count; i++ ))  
  do  
  # filenames !  
  icon_list="${icon_list} ${ALX_SESSIONS[${i}]}"  
  done  
237    
238   for item in ${icon_list}   # ica icons
239     for i in ${session_list}
240   do   do
241   # abort if empty   # abort if empty
242   [ -z "${item}" ] && continue   [[ -z ${i} ]] && continue
243    
244     # get database information
245     evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
246    
247   # new line if x > xres   # new line if x > xres
248   if [ ${x} -ge ${xres} ];then   if [ ${x} -ge ${xres} ]
249   x=30   then
250     x=50
251   y=$((${y} + 80))   y=$((${y} + 80))
252   fi   fi
253    
254   # new row if y > yres   # new row if y > yres
255   if [ ${y} -ge ${yres} ];then   if [ ${y} -ge ${yres} ]
256     then
257   x=$((${x} + 120))   x=$((${x} + 120))
258   y=30   y=50
259    
260   # re-check x   # re-check x
261   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
262   fi   fi
263    
  # ica icons  
  # get basename (.ica must be suffix)  
  basename_item="$(basename ${item} .ica)"  
264   generate_icon \   generate_icon \
265   --name "${basename_item}" \   --name "${cfg_sessions_session}" \
266   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/${item}" \   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
267   --icon "${ALX_SESSIONS_ICONS}/${basename_item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
268   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${basename_item}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
269   --xres "${x}" \   --xres "${x}" \
270   --yres "${y}"   --yres "${y}"
271    
272   y=$((${y} + 80))   y=$((${y} + 80))
273   done   done
274    
275     for i in ${other_menuitem_list}
  # generate program icons  
  icon_list="${ALX_PROGRAMS}"  
   
  progsh_path=${ALX_UNPRIV_HOME}/.alxprogs  
   
  for item in ${icon_list}  
276   do   do
277   # abort if empty   # abort if empty
278   [ -z "${item}" ] && continue   [[ -z ${i} ]] && continue
279    
280     # get database information
281     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
282    
283   # new line if x > xres   # new line if x > xres
284   if [ ${x} -ge ${xres} ];then   if [ ${x} -ge ${xres} ]
285   x=30   then
286     x=50
287   y=$((${y} + 80))   y=$((${y} + 80))
288   fi   fi
289    
290   # new row if y > yres   # new row if y > yres
291   if [ ${y} -ge ${yres} ];then   if [ ${y} -ge ${yres} ]
292     then
293   x=$((${x} + 120))   x=$((${x} + 120))
294   y=30   y=50
295    
296   # re-check x   # re-check x
297   [ ${x} -ge ${xres} ] && x=30   [ ${x} -ge ${xres} ] && x=50
298   fi   fi
299    
300   generate_icon \   generate_icon \
301   --name "${item}" \   --name "${cfg_other_menuitems_name}" \
302   --command "${progsh_path}/${item}" \   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
303   --icon "${ALX_SESSIONS_ICONS}/${item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
304   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${item}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
305   --xres "${x}" \   --xres "${x}" \
306   --yres "${y}" \   --yres "${y}" \
307   --default-icon "default_item.png"   --default-icon "default_item.png"
308    
309   y=$((${y} + 80))   y=$((${y} + 80))
310   done   done
311    
312     for i in ${plugin_list}
313     do
314     # abort if empty
315     [[ -z ${i} ]] && continue
316    
317     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
318     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
319     then
320     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
321    
322     # abort if name or exec is empty
323     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
324     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
325    
326     # new line if x > xres
327     if [ ${x} -ge ${xres} ]
328     then
329     x=50
330     y=$((${y} + 80))
331     fi
332    
333     # new row if y > yres
334     if [ ${y} -ge ${yres} ]
335     then
336     x=$((${x} + 120))
337     y=50
338    
339     # re-check x
340     [ ${x} -ge ${xres} ] && x=50
341     fi
342    
343     generate_icon \
344     --name "${PLUGIN_MENUITEM_NAME}" \
345     --command "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
346     --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).png" \
347     --dest "${dest}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}).lnk" \
348     --xres "${x}" \
349     --yres "${y}" \
350     --default-icon "default_item.png"
351    
352     y=$((${y} + 80))
353     fi
354    
355     # unset all variables
356     unset PLUGIN_MENUITEM_NAME
357     unset PLUGIN_MENUITEM_EXEC
358     unset PLUGIN_MENUITEM_PARAM
359     unset PLUGIN_MENUITEM_WORKDIR
360     unset PLUGIN_MENUITEM_ICON
361     done
362    
363     # add shutdown, reboot icons
364     for i in shutdown reboot
365     do
366     # new line if x > xres
367     if [ ${x} -ge ${xres} ]
368     then
369     x=50
370     y=$((${y} + 80))
371     fi
372    
373     # new row if y > yres
374     if [ ${y} -ge ${yres} ]
375     then
376     x=$((${x} + 120))
377     y=50
378    
379     # re-check x
380     [ ${x} -ge ${xres} ] && x=50
381     fi
382    
383     case ${i} in
384     shutdown) name="Herunterfahren" ;;
385     reboot) name="Neustarten" ;;
386     esac
387    
388     generate_icon \
389     --name "${name}" \
390     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
391     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
392     --dest "${dest}/${i}.lnk" \
393     --xres "${x}" \
394     --yres "${y}" \
395     --icon-width "40" \
396     --icon-height "40"
397    
398     y=$((${y} + 80))
399     done
400    
401   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
402   local sysinfo   local sysinfo
# Line 410  generate_all_desktop_icons() Line 420  generate_all_desktop_icons()
420   --name "${sysinfo}" \   --name "${sysinfo}" \
421   --command "exit 0" \   --command "exit 0" \
422   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
423   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${dest}/sysinfo.lnk" \
424   --xres "${xres}" \   --xres "${xres}" \
425   --yres "${yres}" \   --yres "${yres}" \
426   --icon-width "1" \   --icon-width "1" \
# Line 419  generate_all_desktop_icons() Line 429  generate_all_desktop_icons()
429    
430  config_sessions()  config_sessions()
431  {  {
432   # generate ica session files   local i
433   generate_ica_session_files   local all_ses_ids
434     local all_other_ids
435     local CONFIG
436     local screensaver_passwd_cmd
437     local fbinit
438     local fbkeys
439     local progsh_path
440    
441   # first of all get the vars   progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
  get_sessions_settings  
  get_autostart_settings  
  get_screensaver_settings  
442    
443   local count=${#ALX_SESSIONS[*]}   # get all session ids from database
444   local icon   all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
445   local i   # get all other_menuitem ids from database
446     all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
447     # get all plugin ids from database
448     all_plugin_ids=$(mysqldo "select id from cfg_plugins where serial='${ALX_SERIAL}'")
449    
450     # get screensaver settings
451     evaluate_table cfg_screensaver
452     # get autostart settings
453     evaluate_table cfg_autostart
454     # get current color depth
455     evaluate_table cfg_graphic
456    
457   # now setup fluxbox for user station   # now setup fluxbox for user station
458    
# Line 440  config_sessions() Line 463  config_sessions()
463   # now generate fluxbox config files   # now generate fluxbox config files
464    
465   # fluxbox main config   # fluxbox main config
466   cat ${ALX_SKELETONS}/fluxbox/init \   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
467   > ${ALX_UNPRIV_HOME}/.fluxbox/init   then
468     fbinit="${ALX_SKELETONS}/fluxbox/init"
469     else
470     fbinit="/usr/share/fluxbox/init"
471     fi
472     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
473    
474   # fluxbox autostart   # fluxbox autostart
475   cat ${ALX_SKELETONS}/fluxbox/apps \   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
476   > ${ALX_UNPRIV_HOME}/.fluxbox/apps   # do not show decorations on messages generated with xmessage
477     if [ -x /usr/bin/xmessage ]
478     then
479     addconfig '[app] (xmessage)'
480     addconfig ' [Deco] {NONE}'
481     addconfig '[end]'
482     fi
483     # add icon utility
484     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
485     # add numlock utility
486     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
487    
488   # add screensaver   # add screensaver
489   if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
490   then   then
491   local ALX_PASSWD_CMD   if [[ -z ${cfg_screensaver_password} ]] || [[ ${cfg_screensaver_password} = NULL ]]
   
  if [[ -z ${ALX_SCRN_PASSWD} ]] || [[ ${ALX_SCRN_PASSWD} = NULL ]]  
492   then   then
493   ALX_PASSWD_CMD="-nolock"   screensaver_passwd_cmd="-nolock"
494   else   else
495   ALX_PASSWD_CMD="-cpasswd $(openssl passwd ${ALX_SCRN_PASSWD})"   screensaver_passwd_cmd="-cpasswd $(cryptpw -m des ${cfg_screensaver_password})"
496   fi   fi
497    
498   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  
499   fi   fi
500    
501     # add plugins autostart
502     for i in ${all_plugin_ids}
503     do
504     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
505     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
506     then
507     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh autostart)
508    
509     if [[ ${PLUGIN_AUTOSTART} = 1 ]]
510     then
511     addconfig "[startup] {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME}) &}"
512     fi
513     # unset all variables
514     unset PLUGIN_AUTOSTART
515     unset PLUGIN_MENUITEM_NAME
516     fi
517     done
518    
519   # add autostart session   # add autostart session
520   if [[ ${ALX_AUTOSTART} != "" ]]   if [[ ! -z ${cfg_autostart_session} ]]
521   then   then
522   echo "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_AUTOSTART} &}" \   # sleep one second to wait until busybox is fully initialized and the screen is really centered
523   >> ${ALX_UNPRIV_HOME}/.fluxbox/apps   addconfig "[startup] {sleep 1 && nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
524   fi   fi
525    
526   # fluxbox hotkeys   # fluxbox hotkeys
527   cat ${ALX_SKELETONS}/fluxbox/keys \   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
528   > ${ALX_UNPRIV_HOME}/.fluxbox/keys   then
529     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
530     else
531     fbkeys="/usr/share/fluxbox/keys"
532     fi
533     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
534    
535   # fluxbox menu header   # generate a fluxbox menu
536   cat ${ALX_SKELETONS}/fluxbox/menu.header \   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
537   > ${ALX_UNPRIV_HOME}/.fluxbox/menu   clearconfig
538    
539     # fluxbox menu header
540     cat ${ALX_SKELETONS}/fluxbox/menu.header >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
541   # now fix it with proper messages :P   # now fix it with proper messages :P
542   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
543   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  
   
544   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
545   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   addconfig
546    
547   # fluxbox menu sessions   # first generate session files
548   for (( i=0; i < count; i++ ))   for i in ${all_ses_ids}
549   do   do
550   [ -n "${ALX_SESSIONS[${i}]}" ] && \   evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
551   echo "[exec] ($(basename ${ALX_SESSIONS[${i}]} .ica)) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_SESSIONS[${i}]}}" \   generate_ica_session_file \
552   >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   --session "${cfg_sessions_session}" \
553     --filename "$(fix_whitespaces ${cfg_sessions_filename})" \
554     --username "${cfg_sessions_username}" \
555     --password "${cfg_sessions_password}" \
556     --domain "${cfg_sessions_domain}" \
557     --server "${cfg_sessions_browseradrs}" \
558     --colordepth "${cfg_graphic_depth}"
559    
560     # fluxbox menusession
561     addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
562   done   done
563    
564     # delete all progs
565     [ -d ${progsh_path} ] && rm -rf ${progsh_path}
566     install -d ${progsh_path}
567    
568   # add other menuitems   # add other menuitems
569   get_other_menuitems >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   for i in ${all_other_ids}
570     do
571     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
572    
573   # fluxbox menu footer   # now echo config line for fluxbox-menu
574   cat ${ALX_SKELETONS}/fluxbox/menu.footer \   # make it "configureable" :p
575   >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   if [[ -n ${cfg_other_menuitems_workdir} ]]
576     then
577     workdir="--workdir ${cfg_other_menuitems_workdir}"
578     fi
579     if [[ -n ${cfg_other_menuitems_icon} ]]
580     then
581     cfg_other_menuitems_icon="<${cfg_other_menuitems_icon}>"
582     fi
583    
584     # gen prog startup wrapper
585     generate_program_sh \
586     --name "${cfg_other_menuitems_name}" \
587     --exec "${cfg_other_menuitems_exec}" \
588     --param "${cfg_other_menuitems_param}" \
589     --dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
590     "${workdir}"
591    
592     addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
593     done
594    
595     # add plugins
596     for i in ${all_plugin_ids}
597     do
598     evaluate_table cfg_plugins "where serial='${ALX_SERIAL}' and id='${i}'"
599     if [[ -x ${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh ]]
600     then
601     eval $(${ALX_PLUGINS}/${cfg_plugins_plugin}/plugin.sh menuitem)
602    
603     # abort if name or exec is empty
604     [[ -z ${PLUGIN_MENUITEM_NAME} ]] && continue
605     [[ -z ${PLUGIN_MENUITEM_EXEC} ]] && continue
606    
607     # now echo config line for fluxbox-menu
608     # make it "configureable" :p
609     if [[ -n ${PLUGIN_MENUITEM_WORKDIR} ]]
610     then
611     workdir="--workdir ${PLUGIN_MENUITEM_WORKDIR}"
612     fi
613     if [[ -n ${PLUGIN_MENUITEM_ICON} ]]
614     then
615     PLUGIN_MENUITEM_ICON="<${PLUGIN_MENUITEM_ICON}>"
616     fi
617    
618     # gen prog startup wrapper
619     generate_program_sh \
620     --name "${PLUGIN_MENUITEM_NAME}" \
621     --exec "${PLUGIN_MENUITEM_EXEC}" \
622     --param "${PLUGIN_MENUITEM_PARAM}" \
623     --dest "${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})" \
624     "${workdir}"
625    
626     addconfig "[exec] (${PLUGIN_MENUITEM_NAME}) {${progsh_path}/$(fix_whitespaces ${PLUGIN_MENUITEM_NAME})} ${PLUGIN_MENUITEM_ICON}"
627     fi
628    
629     # unset all variables
630     unset PLUGIN_MENUITEM_NAME
631     unset PLUGIN_MENUITEM_EXEC
632     unset PLUGIN_MENUITEM_PARAM
633     unset PLUGIN_MENUITEM_WORKDIR
634     unset PLUGIN_MENUITEM_ICON
635     done
636    
637     # fluxbox menu footer
638     cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
639   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
640   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   addconfig
641    
642   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
643   generate_all_desktop_icons   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}" "${all_plugin_ids}"
644    
645   # set correct permissions   # fix permissions
646   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
647   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
648   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
649   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
  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  
650  }  }
   

Legend:
Removed from v.1704  
changed lines
  Added in v.3504