Merge commit 'winni/master'

1 files changed, 6 insertions, 4 deletions

diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index d5cef43..c269055 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -23,7 +23,7 @@ using namespace vdrlive;
 	tChannelID channel;
 	bool active = true;
 	string title = "";
-	string day = "";
+	string date = "";
 	bool wday_mon = false;
 	bool wday_tue = false;
 	bool wday_wed = false;
@@ -77,7 +77,9 @@ cTimer* timer;
 			message = tr("Please set a title for the timer!");
 		else
 		{
-			LiveTimerManager().UpdateTimer( timer, flags, channel, weekdays, day, start, stop, priority, lifetime, title, aux );
+			time_t tdate = GetDateFromDatePicker(date, tr("mm/dd/yyyy"));
+			string sdate = DatePickerToC(tdate, "yyyy-mm-dd");
+			LiveTimerManager().UpdateTimer( timer, flags, channel, weekdays, sdate, start, stop, priority, lifetime, title, aux );
 			return reply.redirect(!edit_timerreferer.empty()?edit_timerreferer:"timers.html");
 		}
 	}
@@ -107,7 +109,7 @@ cTimer* timer;
 		active = timer->Flags() & tfActive;
 		channel = timer->Channel()->GetChannelID();
 		title = timer->File() ? timer->File() : "";
-		day = timer->Day() ? FormatDateTime( "%d", timer->Day() ) : "";
+		date = timer->Day() ? DatePickerToC(timer->Day(), tr("mm/dd/yyyy")) : "";
 		wday_mon = timer->WeekDays() & 0x01;
 		wday_tue = timer->WeekDays() & 0x02;
 		wday_wed = timer->WeekDays() & 0x04;
@@ -170,7 +172,7 @@ cTimer* timer;
 
 					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ trVDR("Day") $>:</div></td>
-						<td class="rightcol"><input type="text" name="day" value="<$ day $>" size="2" maxlength="2" /></td>
+						<td class="rightcol"><input id="date" name="date" type="text" class="DatePicker" value="<$ date $>" /></td>
 					</tr>
 
 					<tr>