From 14a0fbcb75bcac34998e1101c40d773ac5edc444 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 5 Dec 2018 13:25:34 -0700
Subject: [PATCH] Import/Export - add support for quotes in definition names

---
 importexport/inc/class.importexport_import_ui.inc.php   | 2 +-
 importexport/inc/class.importexport_schedule_ui.inc.php | 5 ++++-
 importexport/templates/default/definition_index.xet     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php
index ba08a2fc1c..4b2326245f 100644
--- a/importexport/inc/class.importexport_import_ui.inc.php
+++ b/importexport/inc/class.importexport_import_ui.inc.php
@@ -54,7 +54,7 @@ use EGroupware\Api\Etemplate;
 
 			if($definition)
 			{
-				$definition_obj = new importexport_definition($content['definition']);
+				$definition_obj = new importexport_definition($definition);
 			}
 
 			// Load application's translations
diff --git a/importexport/inc/class.importexport_schedule_ui.inc.php b/importexport/inc/class.importexport_schedule_ui.inc.php
index 9321594596..6e22c26656 100644
--- a/importexport/inc/class.importexport_schedule_ui.inc.php
+++ b/importexport/inc/class.importexport_schedule_ui.inc.php
@@ -251,7 +251,10 @@ class importexport_schedule_ui
 			}
 			if (($title = $definition->get_title()))
 			{
-				$options['definition'][$title] = $title;
+				$options['definition'][] = array(
+					'value' => $definition->get_identifier(),
+					'label' => $title
+				);
 			}
 			unset($definition);
 		}
diff --git a/importexport/templates/default/definition_index.xet b/importexport/templates/default/definition_index.xet
index cf82c83cf7..3e7e7cd285 100644
--- a/importexport/templates/default/definition_index.xet
+++ b/importexport/templates/default/definition_index.xet
@@ -21,7 +21,7 @@
 					<nextmatch-accountfilter empty_label="Owner" id="owner"/>
 				</row>
 				<row class="row $row_cont[class]">
-					<image src="${row}[type]" no_lang="1" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_${row_cont[type]}_ui.{$row_cont[type]}_dialog&amp;appname=${row_cont[application]}&amp;definition=${row_cont[name]}'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" class="lr_padding button"/>
+					<image src="${row}[type]" no_lang="1" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_${row_cont[type]}_ui.{$row_cont[type]}_dialog&amp;appname=${row_cont[application]}&amp;definition=${row_cont[definition_id]}'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" class="lr_padding button"/>
 					<description id="${row}[name]" no_lang="1" class="lr_padding"/>
 					<description id="${row}[application]" class="lr_padding"/>
 					<listbox type="select-account" id="${row}[allowed_users]" no_lang="1" readonly="true" rows="5" empty_label='Private' class="lr_padding"/>