From 81eb5beedfc4a27b13a0487bf0d0af0e0381f214 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Tue, 23 Feb 2010 11:04:14 +0100
Subject: corrected timer form not filled

---
 includes/inc_edittimer.php | 10 +++++-----
 includes/include.php       | 10 +++++-----
 javascript/functions.js    |  9 ++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/includes/inc_edittimer.php b/includes/inc_edittimer.php
index 3df8f4a..db819e5 100755
--- a/includes/inc_edittimer.php
+++ b/includes/inc_edittimer.php
@@ -19,7 +19,7 @@ print "<form name=\"timer\" id=\"timer\" method=\"post\" action=\"index.php\">\r
 print "  <ul class=\"pageitem\">\r\n";
 print "    <li class=\"textbox\"><span class=\"header\">Recording name</span></li>\r\n";
 print "    <li class=\"bigfield\">\r\n";
-print "      <input type=\"text\" placeholder=\"Enter recording name\" name=\"desc\" value=\"{$desc}\" />\r\n";
+print "      <input type=\"text\" placeholder=\"Enter recording name\" name=\"timer_name\" value=\"{$desc}\" />\r\n";
 print "    </li>\r\n";
 print "  </ul>\r\n";
 print "  <ul class=\"pageitem\">\r\n";
@@ -27,7 +27,7 @@ print "    <li class=\"textbox\"><span class=\"header\">Channel</span></li>\r\n"
 print "    <li class=\"select\">\r\n";
 
 // Channel selection
-print "      <select name=\"chan\">\r\n";
+print "      <select name=\"timer_chan\">\r\n";
 
 vdrlistchannelsdrop($channame);
 
@@ -72,9 +72,9 @@ print "  <span class=\"name\" id=\"layer_endtime\">{$emin}h{$esec}</span><span c
 print "  </ul>\r\n";
 
 print "<input name=\"action\" type=\"hidden\" id=\"action\" value=\"addtimer\"/>\r\n";
-print "<input name=\"timer_date\" type=\"hidden\" id=\"date\" value=\"\" />\r\n";
-print "<input name=\"timer_starttime\" type=\"hidden\" id=\"stime\" value=\"\" />\r\n";
-print "<input name=\"timer_endtime\" type=\"hidden\" id=\"etime\" value=\"\" />\r\n";
+print "<input name=\"timer_date\" type=\"hidden\" id=\"timer_date\" value=\"\" />\r\n";
+print "<input name=\"timer_starttime\" type=\"hidden\" id=\"timer_starttime\" value=\"\" />\r\n";
+print "<input name=\"timer_endtime\" type=\"hidden\" id=\"timer_endtime\" value=\"\" />\r\n";
 print "<input name=\"prevtimer\" type=\"hidden\" id=\"prevtimer\" value=\"{$timer}\" />\r\n";
 
 print "<ul class=\"pageitem\">\r\n";
diff --git a/includes/include.php b/includes/include.php
index 4cf2834..2dd59e9 100755
--- a/includes/include.php
+++ b/includes/include.php
@@ -56,11 +56,11 @@ function selectpage()
 			delete_timer($timer);
 			break;
 		case ("addtimer"):
-			$channame = $_REQUEST['chan'];
-			$date = $_REQUEST['date'];
-			$stime = $_REQUEST['stime'];
-			$etime = $_REQUEST['etime'];
-			$desc = $_REQUEST['desc'];
+			$channame = $_REQUEST['timer_chan'];
+			$date = $_REQUEST['timer_date'];
+			$stime = $_REQUEST['timer_starttime'];
+			$etime = $_REQUEST['timer_endtime'];
+			$desc = $_REQUEST['timer_name'];
 			$prevtimer = $_REQUEST['prevtimer'];
 			set_timer($channame, $date, $stime, $etime, $desc, $prevtimer);
 			break;
diff --git a/javascript/functions.js b/javascript/functions.js
index d18b675..d3d3263 100755
--- a/javascript/functions.js
+++ b/javascript/functions.js
@@ -39,7 +39,7 @@ function updateOrientation() {
      document.body.setAttribute("orient", orient);
      window.scrollTo(0, 1);
 
- }
+}
 function sendForm(formid) {
 	var frm;
 	frm = document.getElementById(formid);
@@ -76,10 +76,9 @@ function openSelectDate(timer_year,timer_month,timer_day) {
 		years[i] = i;
 	}
 
-	SpinningWheel.addSlot(days, 'right', now_day);
-	SpinningWheel.addSlot(months, '', now_month);
 	SpinningWheel.addSlot(years, 'right', now_year );
-	
+	SpinningWheel.addSlot(months, '', now_month);
+	SpinningWheel.addSlot(days, 'right', now_day);	
 	SpinningWheel.setCancelAction(cancel_date);
 	SpinningWheel.setDoneAction(done_date);
 	
@@ -118,7 +117,7 @@ function openSelectTime(layer,timer_hour,timer_minute) {
 	}
 
 	SpinningWheel.addSlot(hours, 'right', now_hour);
-	SpinningWheel.addSlot({ separator: 'h' }, 'readonly shrink');
+	//SpinningWheel.addSlot({ separator: 'h' }, 'readonly shrink');
 	SpinningWheel.addSlot(minutes, '', now_minute);
 	
 	SpinningWheel.setCancelAction( function() {} );
-- 
cgit v1.2.3