From 3eaf87f78f1c287a0464afa78fb856d4e75f251f Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 30 Apr 2014 16:54:47 +0000
Subject: [PATCH] Fix some problems with calendar export causing a blank export
 popup - missing template - bad format on end date

---
 .../inc/class.calendar_export_csv.inc.php     |  2 +-
 .../templates/default/export_csv_select.xet   | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 calendar/templates/default/export_csv_select.xet

diff --git a/calendar/inc/class.calendar_export_csv.inc.php b/calendar/inc/class.calendar_export_csv.inc.php
index 8e5f86dd44..be1c5b44c4 100644
--- a/calendar/inc/class.calendar_export_csv.inc.php
+++ b/calendar/inc/class.calendar_export_csv.inc.php
@@ -285,7 +285,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 				'selection'	=> $prefs['selection'] ? $prefs['selection'] : 'criteria',
 				'criteria'	=> array(
 					'start'		=> is_object($start) ? $start->format('ts') : $start,
-					'end'		=> $end,
+					'end'		=> is_object($end) ? $end->format('ts') : $end,
 					'owner'		=> $states['owner']
 				)
 			)
diff --git a/calendar/templates/default/export_csv_select.xet b/calendar/templates/default/export_csv_select.xet
new file mode 100644
index 0000000000..ac53d88bab
--- /dev/null
+++ b/calendar/templates/default/export_csv_select.xet
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="calendar.export_csv_select" template="" lang="" group="0" version="1.9.003">
+		<grid>
+			<columns>
+				<column width="150"/>
+				<column/>
+			</columns>
+			<rows>
+				<row disabled="!@msg">
+					<description id="msg" span="all" class="message"/>
+					<description/>
+				</row>
+				<row>
+					<radio label="Use search results" id="selection" options="search_results" span="all"/>
+				</row>
+				<row>
+					<radio label="Use definition filter" id="selection" onclick="jQuery('div.filters').show();jQuery('.criteria').hide();" options="filter" span="all"/>
+				</row>
+				<row>
+					<radio label="Use given criteria:" id="selection" onchange="jQuery('.criteria').show();jQuery('div.filters').hide();" options="criteria" span="all"/>
+				</row>
+				<row>
+					<grid class="criteria" id="criteria">
+						<columns>
+							<column/>
+							<column/>
+						</columns>
+						<rows>
+							<row>
+								<description value="Start" font_style="1"/>
+								<date statustext="Startdate of the export" id="start"/>
+							</row>
+							<row>
+								<description value="End"/>
+								<date statustext="Enddate of the export" id="end"/>
+							</row>
+							<row>
+								<listbox type="select-account" id="owner" rows="5" options="both" span="2" class="shorter"/>
+							</row>
+						</rows>
+					</grid>
+				</row>
+				<row>
+					<description/>
+					<description/>
+				</row>
+			</rows>
+		</grid>
+		<styles>
+			.shorter select {
+  width: 170px;
+}
+		</styles>
+	</template>
+</overlay>
\ No newline at end of file