2005-03-20: 0.97-am2v0.97-am2

- TV and remote templates have same remote control.

Added patches:
- fix for timers.conf of vdr1.3.23+ (Submitted by x-stefan @vdrportal.de)
- Localnet Patch; no password request if client ip in given ip range) (Submitted by "Reiner Buehl" <reiner@buehl.net>)

2005-03-19:
Templates cleanup:
- timer_list.html
- timer_new.html
- toolbar.html
- tv_flash.html
- tv.html

2005-03-18:
- reworked summary display of recordings
- summary editbox preserves linefeeds while editing timers

Templates cleanup:
- prog_timeline.html
- rc.html
- rec_edit.html
- rec_list.html

2005-03-12:
- Added stream button in prog_summmary (suggested by Unimatrix0 @vdrportal.de)

Templates cleanup:
- at_new.html
- at_timer_list.html
- config.html
- error.html
- index.html
- left.html
- noauth.html
- noperm.html
- prog_details.html (TODO)
- prog_list2.html
- prog_list.html
- prog_summary.html (TODO)

Added patches:
- vdradmin-0.96_For_vdr-1.3_StoreAutotimerChannelID_And_EventIdCheckDisable.diff (posted at the VDR mailinglist by "Rantanen Teemu" <teemu.rantanen@tekla.com>)
- vdradmin-0.96_OneShot_Timers_English_Only.diff and merged it to "Deutsch" template (posted at the VDR mailinglist by "Rantanen Teemu" <teemu.rantanen@tekla.com>)
- included changes from vdradmin-0.96-3-ctvdr-1 (see HISTORY.ct).

Changes that have been forgotten while merging previous patches:
- Fixed: timer listing now shows "VPS" instead of "Auto (alt)".
- removed unneeded <br>. They are still used for display only.

1 files changed, 44 insertions, 0 deletions

diff --git a/contrib/vdradmin-0.97-am1-vdr1.3.23-timer.diff b/contrib/vdradmin-0.97-am1-vdr1.3.23-timer.diff
new file mode 100755
index 0000000..14ad12b
--- /dev/null
+++ b/contrib/vdradmin-0.97-am1-vdr1.3.23-timer.diff
@@ -0,0 +1,44 @@
+--- vdradmind.pl.save	2005-03-20 19:38:06.000000000 +0100
++++ vdradmind.pl	2005-03-20 19:43:51.000000000 +0100
+@@ -1435,26 +1435,25 @@
+         substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1,
+         ($2 - 1), $1);
+     } else { # regular timer
+-      $startsse = my_mktime(substr($start, 2, 2),
+-				substr($start, 0, 2), $dor, (my_strftime("%m") - 1),
+-				my_strftime("%Y"));
++      $dor =~ /(\d\d\d\d)-(\d\d)-(\d\d)/;
++      $startsse = my_mktime(substr($start, 2, 2), substr($start, 0, 2), $3, ($2 - 1), $1);
+ 			
+       $stopsse = my_mktime(substr($stop, 2, 2),
+-        substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1,
+-        (my_strftime("%m") - 1), my_strftime("%Y"));
++        substr($stop, 0, 2), $stop > $start ? $3 : $3 + 1, ($2 - 1), $1);
+     }
+ 
+-    # move timers which have expired one month into the future
+-    if(length($dor) != 7 && $stopsse < time) {
+-			$startsse = my_mktime(substr($start, 2, 2),
+-        substr($start, 0, 2), $dor, (my_strftime("%m") % 12),
+-        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
+-
+-      $stopsse = my_mktime(substr($stop, 2, 2),
+-        substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1,
+-        (my_strftime("%m") % 12),
+-        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
+-    }
++#    vdr-1.3.23 changes day format to yyyy-mm-dd
++#    # move timers which have expired one month into the future
++#    if(length($dor) != 7 && $stopsse < time) {
++#			$startsse = my_mktime(substr($start, 2, 2),
++#        substr($start, 0, 2), $dor, (my_strftime("%m") % 12),
++#        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
++#
++#      $stopsse = my_mktime(substr($stop, 2, 2),
++#        substr($stop, 0, 2), $stop > $start ? $dor : $dor + 1,
++#        (my_strftime("%m") % 12),
++#        (my_strftime("%Y") + (my_strftime("%m") == 12 ? 1 : 0)));
++#    }
+ 
+     if($CONFIG{RECORDINGS} && length($dor) == 7)  { # repeating timer
+       # generate repeating timer entries for up to 28 days