Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/functions/config_sessions.sh

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

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch 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 2469 by niro, Mon Jun 27 15:07:00 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 70  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=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   for i in $*
      "select id from cfg_sessions where serial='${ALX_SERIAL}'")  
       
      for i in ${all_ids}  
    27   do   do
    28   # get settings   case $1 in
    29   ses_session=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   --session) shift; ses_session="$1" ;;
    30   "select session from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --filename) shift; ses_filename="$1" ;;
    31     --username) shift; ses_username="$1" ;;
    32   ses_filename=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   --password) shift; ses_password="$1" ;;
    33   "select filename from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   --domain) shift; ses_domain="$1" ;;
    34     --server) shift; ses_browseradrs="$1" ;;
    35   ses_username=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   --colordepth) shift; ses_colors="$1" ;;
    36   "select username from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")           esac
    37     shift
    38   ses_domain=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   done
    39   "select domain from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")  
    40     # abort if session, filename or server not given
    41   ses_password=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   [[ -z ${ses_session} ]] && return 1
    42   "select password from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   [[ -z ${ses_filename} ]] && return 1
    43     [[ -z ${ses_browseradrs} ]] && return 1
    44   ses_browseradrs=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
    45   "select browseradrs from cfg_sessions where serial='${ALX_SERIAL}' and id='${i}'")   # write session files
    46     CONFIG="${ALX_ICA_SESSIONS}/${ses_filename}"
    47   # get the right colors   clearconfig
      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  
    48    
    49   # write session files   addconfig '[WFClient]'
    50   echo '[WFClient]' > ${ALX_ICA_SESSIONS}/${ses_filename}   addconfig 'Version=2'
    51   echo 'Version=2' >> ${ALX_ICA_SESSIONS}/${ses_filename}  
    52   OLD_IFS="$IFS"   # use ';' as ifs
    53   IFS=";"   declare -i i=0
    54   declare -i x=0   for server in ${ses_browseradrs//;/ }
    55   for server in ${ses_browseradrs}   do
    56   do   (( i++ ))
    57   (( x++ ))   num="${i}"
    58   echo "TcpBrowserAddress${x}=${server}" >> ${ALX_ICA_SESSIONS}/${ses_filename}   # support newer ica-clients:
    59   done   # the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!
    60   IFS="${OLD_IFS}"   [[ ${i} -eq 1 ]] && num=""
    61   unset x   addconfig "TcpBrowserAddress${num}=${server}"
      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}  
    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 146  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 154  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 161  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  
    120    
    121   # all arrays:   chmod 0755 "${dest}"
      # ->  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=$(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  
    122  }  }
    123    
    124  # helper functions for generate all desktop icons  # helper functions for generate all desktop icons
    # Line 241  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 259  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=20   [[ -z ${xres} ]] && xres=30
    166   [ -z "${yres}" ] && xres=20   [[ -z ${yres} ]] && xres=30
    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 res   local res
    199   local xres   local xres
    200   local yres   local yres
      local icon_list  
    201   local x   local x
    202   local y   local y
    203   local item   local i
    204   local basename_item   local name
    205   local progsh_path   local progsh_path
    206     local utility
    207     local dest
    208     local rc
    209    
    210     dest="${ALX_UNPRIV_HOME}/.idesktop"
    211     rc="${ALX_UNPRIV_HOME}/.ideskrc"
    212    
    213     # progsh path
    214     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    215    
    216   # get the resolution   # get the resolution
    217   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}'")  
    218    
    219   # split res to x & y   # split res to x & y
    220   xres="$(echo ${res} | cut -dx -f1)"   xres="${res%x*}"
    221   yres="$(echo ${res} | cut -dx -f2)"   yres="${res#*x}"
    222    
    223   # top left edge of the icon is given in config file   # top left edge of the icon is given in config file
    224   # remove a little bit to simulate the bottom-right edge   # remove a little bit to simulate the bottom-right edge
    225   xres="$(( ${xres} - 120 ))"   xres="$(( ${xres} - 120 ))"
    226   yres="$(( ${yres} - 80 ))"   yres="$(( ${yres} - 80 ))"
    227    
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    228   # clean desktop icon location   # clean desktop icon location
    229   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${dest} ] && rm -rf ${dest}
    230   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   [ -f ${rc} ] && rm -f ${rc}
    231     install -d ${dest}
    232    
    233   # default settings   # default settings
    234   declare -i x=20   declare -i x=30
    235   declare -i y=20   declare -i y=30
    236    
    237   # first all ica sessions   # ica icons
    238   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}  
    239   do   do
    240   # abort if empty   # abort if empty
    241   [ -z "${item}" ] && continue   [[ -z ${i} ]] && continue
    242    
    243     # get database information
    244     evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
    245    
    246   # new line if x > xres   # new line if x > xres
    247   if [ ${x} -ge ${xres} ];then   if [ ${x} -ge ${xres} ]
    248   x=20   then
    249     x=30
    250   y=$((${y} + 80))   y=$((${y} + 80))
    251   fi   fi
    252    
    253   # new row if y > yres   # new row if y > yres
    254   if [ ${y} -ge ${yres} ];then   if [ ${y} -ge ${yres} ]
    255     then
    256   x=$((${x} + 120))   x=$((${x} + 120))
    257   y=20   y=30
    258    
    259   # re-check x   # re-check x
    260   [ ${x} -ge ${xres} ] && x=20   [ ${x} -ge ${xres} ] && x=30
    261   fi   fi
    262    
      # ica icons  
      # get basename (.ica must be suffix)  
      basename_item="$(basename ${item} .ica)"  
    263   generate_icon \   generate_icon \
    264   --name "${basename_item}" \   --name "${cfg_sessions_session}" \
    265   --command "wfica ${ALX_ICA_SESSIONS}/${item}" \   --command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})" \
    266   --icon "${ALX_SESSIONS_ICONS}/${basename_item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_sessions_session}).png" \
    267   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${basename_item}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_sessions_session}).lnk" \
    268   --xres "${x}" \   --xres "${x}" \
    269   --yres "${y}"   --yres "${y}"
    270    
    271   y=$((${y} + 80))   y=$((${y} + 80))
    272   done   done
    273    
    274     for i in ${other_menuitem_list}
      # generate program icons  
      icon_list="${ALX_PROGRAMS}"  
       
      progsh_path=${ALX_UNPRIV_HOME}/.alxprogs  
       
      for item in ${icon_list}  
    275   do   do
    276   # abort if empty   # abort if empty
    277   [ -z "${item}" ] && continue   [[ -z ${i} ]] && continue
    278    
    279     # get database information
    280     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
    281    
    282   # new line if x > xres   # new line if x > xres
    283   if [ ${x} -ge ${xres} ];then   if [ ${x} -ge ${xres} ]
    284   x=20   then
    285     x=30
    286   y=$((${y} + 80))   y=$((${y} + 80))
    287   fi   fi
    288    
    289   # new row if y > yres   # new row if y > yres
    290   if [ ${y} -ge ${yres} ];then   if [ ${y} -ge ${yres} ]
    291     then
    292   x=$((${x} + 120))   x=$((${x} + 120))
    293   y=20   y=30
    294    
    295   # re-check x   # re-check x
    296   [ ${x} -ge ${xres} ] && x=20   [ ${x} -ge ${xres} ] && x=30
    297   fi   fi
    298    
    299   generate_icon \   generate_icon \
    300   --name "${item}" \   --name "${cfg_other_menuitems_name}" \
    301   --command "${progsh_path}/${item}" \   --command "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    302   --icon "${ALX_SESSIONS_ICONS}/${item}.png" \   --icon "${ALX_SESSIONS_ICONS}/$(fix_whitespaces ${cfg_other_menuitems_name}).png" \
    303   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/${item}.lnk" \   --dest "${dest}/$(fix_whitespaces ${cfg_other_menuitems_name}).lnk" \
    304   --xres "${x}" \   --xres "${x}" \
    305   --yres "${y}" \   --yres "${y}" \
    306   --default-icon "default_item.png"   --default-icon "default_item.png"
    # Line 411  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     # abort if empty
    315     [[ -z ${i} ]] && continue
    316    
    317     # new line if x > xres
    318     if [ ${x} -ge ${xres} ]
    319     then
    320     x=30
    321     y=$((${y} + 80))
    322     fi
    323    
    324     # new row if y > yres
    325     if [ ${y} -ge ${yres} ]
    326     then
    327     x=$((${x} + 120))
    328     y=30
    329    
    330     # re-check x
    331     [ ${x} -ge ${xres} ] && x=30
    332     fi
    333    
    334     case ${i} in
    335     shutdown) name="Herunterfahren"
    336     reboot) name="Neustarten"
    337     esac
    338    
    339     generate_icon \
    340     --name "${name}" \
    341     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    342     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    343     --dest "${dest}/${i}.lnk" \
    344     --xres "${x}" \
    345     --yres "${y}"
    346    
    347     y=$((${y} + 80))
    348     done
    349    
    350   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    351   local sysinfo   local sysinfo
    # Line 419  generate_all_desktop_icons() Line 353  generate_all_desktop_icons()
    353   local osversion   local osversion
    354    
    355   osversion="$(< /etc/mageversion)"   osversion="$(< /etc/mageversion)"
    356   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}'")  
    357   sysinfo="Hostname: ${hostname} Serial: #${ALX_SERIAL} OS: alx-${osversion} Kernel: $(uname -r)"   sysinfo="Hostname: ${hostname} Serial: #${ALX_SERIAL} OS: alx-${osversion} Kernel: $(uname -r)"
    358    
    359   # now get the right position:   # now get the right position:
    # Line 436  generate_all_desktop_icons() Line 369  generate_all_desktop_icons()
    369   --name "${sysinfo}" \   --name "${sysinfo}" \
    370   --command "exit 0" \   --command "exit 0" \
    371   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    372   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${dest}/sysinfo.lnk" \
    373   --xres "${xres}" \   --xres "${xres}" \
    374   --yres "${yres}" \   --yres "${yres}" \
    375   --icon-width "1" \   --icon-width "1" \
    # Line 445  generate_all_desktop_icons() Line 378  generate_all_desktop_icons()
    378    
    379  config_sessions()  config_sessions()
    380  {  {
      # 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  
    381   local i   local i
    382     local all_ses_ids
    383   # DEBUG   local all_other_ids
    384  # declare -i i=0   local CONFIG
    385  # echo count=${count}   local screensaver_passwd_cmd
    386  # echo "Number of new sessions: ${count}"   local fbinit
    387  # for ((i=0; i < count; i++))   local fbkeys
    388  # do  
    389  # echo "${i} - ${ALX_SESSIONS[${i}]}"   # get all session ids from database
    390  # done   all_ses_ids=$(mysqldo "select id from cfg_sessions where serial='${ALX_SERIAL}'")
    391     # get all other_menutiem ids from database
    392     all_other_ids=$(mysqldo "select id from cfg_other_menuitems where serial='${ALX_SERIAL}'")
    393    
    394     # get screensaver settings
    395     evaluate_table cfg_screensaver
    396     # get autostart settings
    397     evaluate_table cfg_autostart
    398     # get current color depth
    399     evaluate_table cfg_graphic
    400    
    401   # now setup fluxbox for user station   # now setup fluxbox for user station
    402    
    # Line 475  config_sessions() Line 407  config_sessions()
    407   # now generate fluxbox config files   # now generate fluxbox config files
    408    
    409   # fluxbox main config   # fluxbox main config
    410   cat ${ALX_SKELETONS}/fluxbox/init \   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    411   > ${ALX_UNPRIV_HOME}/.fluxbox/init   then
    412     fbinit="${ALX_SKELETONS}/fluxbox/init"
    413     else
    414     fbinit="/usr/share/fluxbox/init"
    415     fi
    416     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    417    
    418   # fluxbox autostart   # fluxbox autostart
    419   cat ${ALX_SKELETONS}/fluxbox/apps \   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    420   > ${ALX_UNPRIV_HOME}/.fluxbox/apps   # do not show decorations on messages generated with xmessage
    421     if [ -x /usr/bin/xmessage ]
    422     then
    423     addconfig '[app] (xmessage)'
    424     addconfig ' [Deco] {NONE}'
    425     addconfig '[end]'
    426     fi
    427     # add icon utility
    428     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    429     # add numlock utility
    430     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    431    
    432   # add screensaver   # add screensaver
    433   if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]   if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
    434   then   then
    435   local ALX_PASSWD_CMD   if [[ -z ${cfg_screensaver_password} ]] || [[ ${cfg_screensaver_password} = NULL ]]
       
      if [[ -z ${ALX_SCRN_PASSWD} ]] || [[ ${ALX_SCRN_PASSWD} = NULL ]]  
    436   then   then
    437   ALX_PASSWD_CMD="-nolock"   screensaver_passwd_cmd="-nolock"
    438   else   else
    439   ALX_PASSWD_CMD="-cpasswd $(openssl passwd ${ALX_SCRN_PASSWD})"   screensaver_passwd_cmd="-cpasswd $(cryptpw -m des ${cfg_screensaver_password})"
    440   fi   fi
    441    
    442   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  
    443   fi   fi
    444    
    445   # add autostart session   # add autostart session
    446   if [[ ${ALX_AUTOSTART} != "" ]]   if [[ ! -z ${cfg_autostart_session} ]]
    447   then   then
    448   echo "[startup] {wfica ${ALX_ICA_SESSIONS}/${ALX_AUTOSTART}}" \   # sleep one second to wait until busybox is fully initialized and the screen is really centered
    449   >> ${ALX_UNPRIV_HOME}/.fluxbox/apps   addconfig "[startup] {sleep 1 && nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_autostart_session}) &}"
    450   fi   fi
    451    
    452   # fluxbox hotkeys   # fluxbox hotkeys
    453   cat ${ALX_SKELETONS}/fluxbox/keys \   if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    454   > ${ALX_UNPRIV_HOME}/.fluxbox/keys   then
    455     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    456     else
    457     fbkeys="/usr/share/fluxbox/keys"
    458     fi
    459     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    460    
    461   # fluxbox menu header   # generate a fluxbox menu
    462   cat ${ALX_SKELETONS}/fluxbox/menu.header \   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/menu"
    463   > ${ALX_UNPRIV_HOME}/.fluxbox/menu   clearconfig
    464    
    465     # fluxbox menu header
    466     cat ${ALX_SKELETONS}/fluxbox/menu.header >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    467   # now fix it with proper messages :P   # now fix it with proper messages :P
    468   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
    469   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  
       
    470   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
    471   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   addconfig
    472    
    473   # fluxbox menu sessions   # first generate session files
    474   for (( i=0; i < count; i++ ))   for i in ${all_ses_ids}
    475   do   do
    476   [ -n "${ALX_SESSIONS[${i}]}" ] && \   evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
    477   echo "[exec] ($(basename ${ALX_SESSIONS[${i}]} .ica)) {wfica ${ALX_ICA_SESSIONS}/${ALX_SESSIONS[${i}]}}" \   generate_ica_session_file \
    478   >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   --session "${cfg_sessions_session}" \
    479     --filename "$(fix_whitespaces ${cfg_sessions_filename})" \
    480     --username "${cfg_sessions_username}" \
    481     --password "${cfg_sessions_password}" \
    482     --domain "${cfg_sessions_domain}" \
    483     --server "${cfg_sessions_browseradrs}" \
    484     --colordepth "${cfg_graphic_depth}"
    485    
    486     # fluxbox menusession
    487     addconfig "[exec] (${cfg_sessions_session}) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/$(fix_whitespaces ${cfg_sessions_filename})}"
    488   done   done
    489    
    490     # delete all progs
    491     progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
    492     [ -d ${progsh_path} ] && rm -rf ${progsh_path}
    493     install -d ${progsh_path}
    494    
    495   # add other menuitems   # add other menuitems
    496   get_other_menuitems >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   for i in ${all_other_ids}
    497     do
    498     evaluate_table cfg_other_menuitems "where serial='${ALX_SERIAL}' and id='${i}'"
    499    
    500   # fluxbox menu footer   # now echo config line for fluxbox-menu
    501   cat ${ALX_SKELETONS}/fluxbox/menu.footer \   # make it "configureable" :p
    502   >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   if [[ -n ${cfg_other_menuitems_workdir} ]]
    503     then
    504     workdir="--workdir ${cfg_other_menuitems_workdir}"
    505     fi
    506     if [[ -n ${cfg_other_menuitems_icon} ]]
    507     then
    508     cfg_other_menuitems_icon="<${cfg_other_menuitems_icon}>"
    509     fi
    510    
    511     # gen prog startup wrapper
    512     generate_program_sh \
    513     --name "${cfg_other_menuitems_name}" \
    514     --exec "${cfg_other_menuitems_exec}" \
    515     --param "${cfg_other_menuitems_param}" \
    516     --dest "${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})" \
    517     "${workdir}"
    518    
    519     addconfig "[exec] (${cfg_other_menuitems_name}) {${progsh_path}/$(fix_whitespaces ${cfg_other_menuitems_name})} ${cfg_other_menuitems_icon}"
    520     done
    521    
    522     # fluxbox menu footer
    523     cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    524   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    525   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   addconfig
    526    
    527   # now it's a good time to generate *all* icons :)   # now it's a good time to generate *all* icons :)
    528   generate_all_desktop_icons   generate_all_desktop_icons "${all_ses_ids}" "${all_other_ids}"
    529    
    530   # set correct permissions   # fix permissions
    531   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    532   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    533   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    534   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    535   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
       
      # unset vars  
      unset ALX_SESSIONS  
      unset ALX_PROGRAMS  
      unset ALX_SCRN_SAVER  
      unset ALX_SCRN_TIMEOUT  
      unset ALX_SCRN_PASSWD  
    536  }  }
       
    Legend:
    Removed from v.338  
    changed lines
      Added in v.2469