2005-11-04: 0.97-am3.4.2rc3v0.97-am3.4.2rc3

- Set "LANGUAGE" environment variable to "" on startup, so it causes no problems with language setting in VDRAdmin.
- Added caching of listing of recordings. Can be adjusted by "CACHE_REC_TIMEOUT=number of minutes" in vdradmind.conf. Defaults to "60", "0" disables caching.
- Remember sorting when toggling in timer or autotimer list.
- New configuration option for Timers: don't add summary.
- Email notification for AutoTimer can be set in configuration menu.
- Optimized AutoTimer matching a little bit.
- Reworked detection of another VDRAdmin process if pid file exists.
- No more config settings that require a VDRAdmin restart.
- Find "sendEmail" program in $PATH.

4 files changed, 49 insertions, 3 deletions

diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html
index 263d592..db2a7af 100644
--- a/template/default/at_timer_new.html
+++ b/template/default/at_timer_new.html
@@ -198,7 +198,7 @@
 				<td class="col_left"></td>
 				<td><tmpl_var otitle></td>
 				<td><tmpl_var subtitle></td>
-				<td><tmpl_var weekday>, <tmpl_var start> - <tmpl_var stop> (<tmpl_var channel>)</td>
+				<td><tmpl_var date>, <tmpl_var start> - <tmpl_var stop> (<tmpl_var channel>)</td>
 				<td><tmpl_var title></td>
 				<td class="col_right"></td>
 			</tr>
diff --git a/template/default/config.html b/template/default/config.html
index 7bfd04d..f6d88b4 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -302,6 +302,33 @@
 -->
 						<tr class="row_even">
 							<td class="col_left"></td>
+							<td class="col_label"><h5><%! Send email after programming timer: !%></h5></td>
+							<td class="col_value">
+								<input type="radio" name="AT_SENDMAIL" value="1" id="at_sendmail_yes" <tmpl_if at_sendmail>checked</tmpl_if> /><label for="at_sendmail_yes"><%! Yes !%></label>
+								<input type="radio" name="AT_SENDMAIL" value="0" id="at_sendmail_no" <tmpl_unless at_sendmail>checked</tmpl_unless> /><label for="at_sendmail_no"><%! No !%></label>
+							</td>
+							<td class="col_right"></td>
+						</tr>
+						<tr class="row_odd">
+							<td class="col_left"></td>
+							<td class="col_label"><h5><%! Send email as: !%></h5></td>
+							<td class="col_value">autotimer@<input type="text" name="MAIL_FROMDOMAIN" value="<tmpl_var MAIL_FROMDOMAIN>" size="20" maxlength="100" /></td>
+							<td class="col_right"></td>
+						</tr>
+						<tr class="row_even">
+							<td class="col_left"></td>
+							<td class="col_label"><h5><%! Send email to: !%></h5></td>
+							<td class="col_value"><input type="text" name="MAIL_TO" value="<tmpl_var MAIL_TO>" size="20" maxlength="100" /></td>
+							<td class="col_right"></td>
+						</tr>
+						<tr class="row_odd">
+							<td class="col_left"></td>
+							<td class="col_label"><h5><%! Mail server: !%></h5></td>
+							<td class="col_value"><input type="text" name="MAIL_SERVER" value="<tmpl_var MAIL_SERVER>" size="20" maxlength="100" /></td>
+							<td class="col_right"></td>
+						</tr>
+						<tr class="row_even">
+							<td class="col_left"></td>
 							<td class="col_label"><h5><%! Tooltips: !%></h5></td>
 							<td class="col_value">
 								<input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <tmpl_if at_tooltip>checked</tmpl_if> /><label for="at_tooltip_yes"><%! Yes !%></label>
@@ -369,6 +396,15 @@
 							</td>
 							<td class="col_right"></td>
 						</tr>
+						<tr class="row_odd">
+							<td class="col_left"></td>
+							<td class="col_label"><h5><%! Add summary to new timers: !%></h5></td>
+							<td class="col_value">
+								<input type="radio" name="TM_ADD_SUMMARY" value="1" id="tm_add_summary_yes" <tmpl_if tm_add_summary>checked</tmpl_if> /><label for="tm_add_summary_yes"><%! Yes !%></label>
+								<input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label>
+							</td>
+							<td class="col_right"></td>
+						</tr>
 						<tr class="footer">
 							<td class="col_left"></td>
 							<td colspan="2"></td>
diff --git a/template/default/help_config.html b/template/default/help_config.html
index 8d54fdc..2768d6c 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -105,6 +105,14 @@
 						<dd><%! An integer in the range <strong>0...99</strong>, defining the <strong>priority</strong> of this timer and of recordings created by this timer. <strong>0</strong> represents the lowest value, <strong>99</strong> the highest. The priority is used to decide which timer shall be started in case there are two or more timers with the exact same <strong>start</strong> time. The first timer in the list with the highest priority will be used.<br /><br />This value is also stored with the recording and is later used to decide which recording to remove from disk in order to free space for a new recording. If the disk runs full and a new recording needs more space, an existing recording with the lowest priority (and which has exceeded its guaranteed <strong>lifetime</strong>) will be removed.<br /><br />If all available DVB cards are currently occupied, a timer with a higher priority will interrupt the timer with the lowest priority in order to start recording. !%></dd>
 						<dt><%! Lifetime: !%></dt>
 						<dd><%! The <strong>guaranteed</strong> lifetime (in days) of a recording created by this timer. <strong>0</strong> means that this recording may be automatically deleted at any time by a new recording with higher priority. <strong>99</strong> means that this recording will never be automatically deleted. Any number in the range <strong>1...98</strong> means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the <strong>start</strong> time of the recording has passed by. !%></dd>
+						<dt><%! Send email after programming timer: !%></dt>
+						<dd><%! VDRAdmin will send an email whenever an event matches an AutoTimer and a timer has been programmed if you enable this feature. This requires that you have the sendEmail programm (which you will find <a target="_new" href="http://caspian.dotconf.net/menu/Software/SendEmail/">here</a>) located in PATH. !%></dd>
+						<dt><%! Send email as: !%></dt>
+						<dd><%! Here you set the sending domain of the generated email. !%></dd>
+						<dt><%! Send email to: !%></dt>
+						<dd><%! The email address the email is sent to. !%></dd>
+						<dt><%! Mail server: !%></dt>
+						<dd><%! The outgoing mail server. !%></dd>
 						<dt><%! Tooltips: !%></dt>
 						<dd><%! Here you can (de-)activate the tooltips. !%></dd>
 					</dl>
@@ -125,6 +133,8 @@
 						<dd><%! Here you can (de-)activate the tooltips in the timeline. !%></dd>
 						<dt><%! Tooltips in list: !%></dt>
 						<dd><%! Here you can (de-)activate the tooltips in the list. !%></dd>
+						<dt><%! Add summary to new timers: !%></dt>
+						<dd><%! If you don't want VDRAdmin to add the summary taken from EPG to new timers you can switch it off here. !%></dd>
 					</dl>
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index 09a7880..e2cea26 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -108,7 +108,7 @@
 %?>
 						<table cellspacing="0" cellpadding="0" border="0">
 							<tr>
-								<td bgcolor="#00000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" /></td>
+								<td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" /></td>
 							</tr>
 						</table>
 
@@ -159,7 +159,7 @@
 <?%
 					ELSE;
 %?>
-								<td class="<?% td_class %?>" id="prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" /></span></td>
+								<td class="<?% td_class %?>" id="prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" /></span></td>
 
 <?%
 					END;