--- mcore-src/trunk/mcore-tools/src/modules/citrix/storefront.control.class.in	2015/09/17 10:44:16	2575
+++ mcore-src/trunk/mcore-tools/src/modules/citrix/storefront.control.class.in	2015/09/18 12:24:18	2593
@@ -1,6 +1,7 @@
 # $Id$
 
-push_config 70_storefront_store 80_storefront_session
+#push_config 70_storefront_store 80_storefront_session
+push_config 80_storefront_session
 
 help_storefront_store()
 {
@@ -20,9 +21,10 @@
 	local action="${CLASS_ARGV[1]}"
 	local name="${CLASS_ARGV[2]}"
 	local session="${CLASS_ARGV[3]}"
-	local user="${CLASS_ARGV[4]}"
-	local domain="${CLASS_ARGV[5]}"
-	local password="${CLASS_ARGV[6]}"
+	local store_uri="${CLASS_ARGV[4]}"
+	local user="${CLASS_ARGV[5]}"
+	local domain="${CLASS_ARGV[6]}"
+	local password="${CLASS_ARGV[7]}"
 	local id
 	local enabled
 
@@ -44,9 +46,9 @@
 	id=$(mysqldo "select id from cfg_sessions_storefront where serial='${serial}' and name='${name}';")
 	if [[ -n ${id} ]]
 	then
-		mysqldo "update cfg_sessions_storefront set name='${name}', session='${session}', filename='${filename}', username='${username}', domain='${domain}', password='${password}', store='${store}', enabled='${enabled}' where id=${id};"
+		mysqldo "update cfg_sessions_storefront set name='${name}', session='${session}', store='${store_uri}', filename='${filename}', username='${username}', domain='${domain}', password='${password}', store='${store}', enabled='${enabled}' where id=${id};"
 	else
-		mysqldo "insert into cfg_fluxbox_menuitem(serial, name, session, filename, username, domain, password, store, enabled) values('${serial}', '${name}', '${session}', '${filename}', '${domain}', '${password}', '${store}', '${enabled}');"
+		mysqldo "insert into cfg_fluxbox_menuitem(serial, name, session, store, filename, username, domain, password, store, enabled) values('${serial}', '${name}', '${session}', ${store_uri}', '${filename}', '${domain}', '${password}', '${store}', '${enabled}');"
 	fi
 }
 
@@ -78,7 +80,7 @@
 		fi
 		if [[ ${cfg_sessions_storefront_enabled} = 1 ]]
 		then
-			control_client "${serial}" set storefront.session add "${cfg_sessions_storefront_name}" "${cfg_sessions_storefront_session}" "${cfg_sessions_storefront_username}" "${cfg_sessions_storefront_domain} ${cfg_sessions_storefront_password}"
+			control_client "${serial}" set storefront.session add "${cfg_sessions_storefront_name}" "${cfg_sessions_storefront_session}" "${cfg_sessions_storefront_store}" "${cfg_sessions_storefront_username}" "${cfg_sessions_storefront_domain} ${cfg_sessions_storefront_password}"
 		elif [[ ${cfg_sessions_storefront_enabled} = 0 ]]
 		then
 			control_client "${serial}" set storefront.session del "${cfg_sessions_storefront_name}"