--- mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.control.class.in 2015/09/29 10:37:48 2633 +++ mcore-src/trunk/mcore-tools/src/modules/citrix/citrix.control.class.in 2015/09/29 11:43:12 2634 @@ -25,6 +25,7 @@ local user="${CLASS_ARGV[5]}" local domain="${CLASS_ARGV[6]}" local password="${CLASS_ARGV[7]}" + local serverlist="${CLASS_ARGV[8]}" local id local enabled @@ -46,9 +47,9 @@ id=$(mysqldo "select id from cfg_sessions_citrix where serial='${serial}' and name='${name}';") if [[ -n ${id} ]] then - mysqldo "update cfg_sessions_citrix set name='${name}', session='${session}', filename='${filename}', username='${username}', domain='${domain}', password='${password}', browseradrs='${browseradrs}', enabled='${enabled}' where id=${id};" + mysqldo "update cfg_sessions_citrix set name='${name}', session='${session}', filename='${filename}', username='${username}', domain='${domain}', password='${password}', serverlist='${serverlist}', enabled='${enabled}' where id=${id};" else - mysqldo "insert into cfg_sessions_citrix(serial, name, session, filename, username, domain, password, browseradrs, enabled) values('${serial}', '${name}', '${session}', ${store}', '${filename}', '${domain}', '${password}', '${browseradrs}', '${enabled}');" + mysqldo "insert into cfg_sessions_citrix(serial, name, session, filename, username, domain, password, serverlist, enabled) values('${serial}', '${name}', '${session}', ${store}', '${filename}', '${domain}', '${password}', '${serverlist}', '${enabled}');" fi } @@ -63,6 +64,7 @@ local serial="$1" local values local id + local serverlist values=$(mysqldo "select id from cfg_sessions_citrix where serial='${serial}';") for id in ${values} @@ -80,7 +82,11 @@ fi if [[ ${cfg_sessions_citrix_enabled} = 1 ]] then - control_client "${serial}" set citrix.session add "${cfg_sessions_citrix_name}" "${cfg_sessions_citrix_session}" "fullscreen" "${cfg_sessions_citrix_username}" "${cfg_sessions_citrix_domain} ${cfg_sessions_citrix_password}" + if [[ ! -z ${cfg_sessions_citrix_serverlist} ]] || [[ ${cfg_sessions_citrix_serverlist} != NULL ]] + then + serverlist="${cfg_sessions_citrix_serverlist}" + fi + control_client "${serial}" set citrix.session add "${cfg_sessions_citrix_name}" "${cfg_sessions_citrix_session}" "fullscreen" "${cfg_sessions_citrix_username}" "${cfg_sessions_citrix_domain} ${cfg_sessions_citrix_password}" "${serverlist}" elif [[ ${cfg_sessions_citrix_enabled} = 0 ]] then control_client "${serial}" set citrix.session del "${cfg_sessions_citrix_name}"