Magellan Linux

Diff of /alx-src/trunk/alxconfig-ng/functions/config_sessions.sh

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

revision 327 by niro, Tue Sep 6 08:43:16 2005 UTC revision 338 by niro, Tue Sep 27 22:50:36 2005 UTC
# Line 1  Line 1 
1  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.15 2005-09-06 08:43:16 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.16 2005-09-27 22:50:36 niro Exp $
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()  get_sessions_settings()
# Line 38  get_autostart_settings() Line 38  get_autostart_settings()
38  {  {
39   # get settings from database   # get settings from database
40   ALX_AUTOSTART=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ALX_AUTOSTART=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
41   "select session from cfg_autostart where serial='${ALX_SERIAL}'")   "select session from cfg_autostart where serial='${ALX_SERIAL}'")
42    
43   export ALX_AUTOSTART   export ALX_AUTOSTART
44  }  }
45    
46    get_screensaver_settings()
47    {
48     ALX_SCRN_SAVER=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
49     "select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")
50     ALX_SCRN_TIMEOUT=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
51     "select timeout from cfg_screensaver where serial='${ALX_SERIAL}'")
52     ALX_SCRN_PASSWD=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
53     "select password from cfg_screensaver where serial='${ALX_SERIAL}'")
54    
55     export ALX_SCRN_SAVER
56     export ALX_SCRN_TIMEOUT
57     export ALX_SCRN_PASSWD
58    }
59    
60  generate_ica_session_files()  generate_ica_session_files()
61  {  {
62   local all_ids   local all_ids
# Line 437  config_sessions() Line 451  config_sessions()
451   # first of all get the vars   # first of all get the vars
452   get_sessions_settings   get_sessions_settings
453   get_autostart_settings   get_autostart_settings
454     get_screensaver_settings
455    
456   local count=${#ALX_SESSIONS[*]}   local count=${#ALX_SESSIONS[*]}
457   local icon   local icon
# Line 467  config_sessions() Line 482  config_sessions()
482   cat ${ALX_SKELETONS}/fluxbox/apps \   cat ${ALX_SKELETONS}/fluxbox/apps \
483   > ${ALX_UNPRIV_HOME}/.fluxbox/apps   > ${ALX_UNPRIV_HOME}/.fluxbox/apps
484    
485     # add screensaver
486     if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]
487     then
488     local ALX_PASSWD_CMD
489    
490     if [[ -z ${ALX_SCRN_PASSWD} ]] || [[ ${ALX_SCRN_PASSWD} = NULL ]]
491     then
492     ALX_PASSWD_CMD="-nolock"
493     else
494     ALX_PASSWD_CMD="-cpasswd $(openssl passwd ${ALX_SCRN_PASSWD})"
495     fi
496    
497     echo "[startup] {nohup xautolock -time ${ALX_SCRN_TIMEOUT} -locker 'xlock -mode ${ALX_SCRN_SAVER} ${ALX_PASSWD_CMD}' > /dev/null &}" \
498     >> ${ALX_UNPRIV_HOME}/.fluxbox/apps
499     fi
500    
501   # add autostart session   # add autostart session
502   if [[ ${ALX_AUTOSTART} != "" ]]   if [[ ${ALX_AUTOSTART} != "" ]]
503   then   then
# Line 475  config_sessions() Line 506  config_sessions()
506   fi   fi
507    
508   # fluxbox hotkeys   # fluxbox hotkeys
509   cat ${ALX_SKELETONS}/fluxbox/apps \   cat ${ALX_SKELETONS}/fluxbox/keys \
510   > ${ALX_UNPRIV_HOME}/.fluxbox/keys   > ${ALX_UNPRIV_HOME}/.fluxbox/keys
511    
512   # fluxbox menu header   # fluxbox menu header
# Line 515  config_sessions() Line 546  config_sessions()
546   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
547   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
548   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
549   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
550   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
551    
552   # unset vars   # unset vars
553   unset ALX_SESSIONS   unset ALX_SESSIONS
554   unset ALX_PROGRAMS   unset ALX_PROGRAMS
555     unset ALX_SCRN_SAVER
556     unset ALX_SCRN_TIMEOUT
557     unset ALX_SCRN_PASSWD
558  }  }
559    

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