Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/modules/rdesktop/rdesktop.control.class.in

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

revision 2726 by niro, Thu Jan 28 14:20:01 2016 UTC revision 2739 by niro, Thu Jan 28 15:20:20 2016 UTC
# Line 43  set_rdesktop_session() Line 43  set_rdesktop_session()
43   id=$(mysqldo "select id from cfg_sessions_rdesktop where serial='${serial}' and name='${name}';")   id=$(mysqldo "select id from cfg_sessions_rdesktop where serial='${serial}' and name='${name}';")
44   if [[ -n ${id} ]]   if [[ -n ${id} ]]
45   then   then
46   mysqldo "update cfg_sessions_rdesktop set name='${name}', session='${session}', filename='${filename}', username='${username}', domain='${domain}', password='${password}', serverlist='${serverlist}', autostart='${autostart}', enabled='${enabled}' where id=${id};"   mysqldo "update cfg_sessions_rdesktop set name='${name}', server='${server}', filename='${filename}', username='${username}', domain='${domain}', password='${password}', shell='${shell}', autostart='${autostart}', enabled='${enabled}' where id=${id};"
47   else   else
48   mysqldo "insert into cfg_sessions_rdesktop(serial, name, session, filename, username, domain, password, serverlist, autostart, enabled) values('${serial}', '${name}', '${session}', ${store}', '${filename}', '${domain}', '${password}', '${serverlist}', '${autostart}', '${enabled}');"   mysqldo "insert into cfg_sessions_rdesktop(serial, name, server, filename, username, domain, password, shell, autostart, enabled) values('${serial}', '${name}', '${server}', '${filename}', '${domain}', '${password}', '${shell}', '${autostart}', '${enabled}');"
49   fi   fi
50  }  }
51    
# Line 61  push_config_80_rdesktop_session() Line 61  push_config_80_rdesktop_session()
61   local values   local values
62   local id   local id
63    
64   values=$(mysqldo "select id from cfg_rdesktop_citrix where serial='${serial}';")   values=$(mysqldo "select id from cfg_sessions_rdesktop where serial='${serial}';")
65   for id in ${values}   for id in ${values}
66   do   do
67   evaluate_table_xml cfg_sessions_rdesktop "where serial='${serial}'"   evaluate_table_xml cfg_sessions_rdesktop "where serial='${serial}'"
# Line 77  push_config_80_rdesktop_session() Line 77  push_config_80_rdesktop_session()
77   fi   fi
78   if [[ ${cfg_sessions_rdesktop_enabled} = 1 ]]   if [[ ${cfg_sessions_rdesktop_enabled} = 1 ]]
79   then   then
80   control_client "${serial}" set rdesktop.session add "${cfg_sessions_rdesktop_name}" "${cfg_sessions_rdesktop_server}" "fullscreen" "${cfg_sessions_rdesktop_username}" "${cfg_sessions_rdesktop_domain}" "${cfg_sessions_rdesktop_password}" "${cfg_sessions_rdesktop_password_shell}" "${cfg_sessions_rdesktop_autostart}"   [[ -z ${cfg_sessions_rdesktop_username} ]] && cfg_sessions_rdesktop_username="NULL"
81     [[ -z ${cfg_sessions_rdesktop_domain} ]] && cfg_sessions_rdesktop_domain="NULL"
82     [[ -z ${cfg_sessions_rdesktop_password} ]] && cfg_sessions_rdesktop_password="NULL"
83     [[ ${cfg_sessions_rdesktop_shell} ]] && cfg_sessions_rdesktop_shell="NULL"
84     control_client "${serial}" set rdesktop.session add "${cfg_sessions_rdesktop_name}" "${cfg_sessions_rdesktop_server}" "fullscreen" "${cfg_sessions_rdesktop_username}" "${cfg_sessions_rdesktop_domain}" "${cfg_sessions_rdesktop_password}" "${cfg_sessions_rdesktop_shell}" "${cfg_sessions_rdesktop_autostart}"
85   elif [[ ${cfg_sessions_rdesktop_enabled} = 0 ]]   elif [[ ${cfg_sessions_rdesktop_enabled} = 0 ]]
86   then   then
87   control_client "${serial}" set rdesktop.session del "${cfg_sessions_rdesktop_name}"   control_client "${serial}" set rdesktop.session del "${cfg_sessions_rdesktop_name}"

Legend:
Removed from v.2726  
changed lines
  Added in v.2739