2008-06-30: 3.6.2v3.6.2

- Changed: No need to set the VFAT option in VDRAdmin-AM any longer as both filename codings will be searched for.
- Fixed: some bugs in tv.html.
- Fixed: command line options parsing.
- Fixed: pattern titles that contain double quotes.
- Fixed: timer titles that contain double quotes.
- Added: new command line switch "--ipv6" to use IO::Socket::INET6 for networking (See bug report #462).
- Updated: Dutch translation (Submitted by Roel Koelewijn).
- Added: ST_STREAMDEV_HOST config option to set the name/ip to be used for streaming.
- Fixed: m3u files for Xine (Reported by Robert C. Helling).
- Updated: Italian translation (Submitted by Gringo).
- Updated: Spanish translation (Submitted by Rüdiger Jung).
- Updated: Finnish translation (Submitted by Rolf Ahrenberg).
- Changed: include UTF8 locales by default.
- Introduced new config options "GUI_POPUP_WIDTH" and "GUI_POPUP_HEIGHT" for setting the prog_detail's window size (Requested by Viking @vdr-portal.de).
- Added prev/next arrows in prog_list after each day (Requested by Faudeer @vdr-portal.de).
- Show channel in prog_list even if it's not in the current channel list; this is useful if prog_list is called by a link (e.g. timer_list) (Requested by Faudeer @vdr-portal.de).
- Added support for modifying EPGSearch blacklists (Requested by dings @vdr-portal.de).
- Show stream and switch buttons in prog_summary on channels without EPG information (Reported by Faudeer @vdr-portal.de).
- Added: Show channelname in recording's details (Suggested by Stefan Seyfried).
- Minor bugfixes and improvements.

18 files changed, 273 insertions, 146 deletions

diff --git a/template/default/about.html b/template/default/about.html
index 5bcba29..a101ae0 100644
--- a/template/default/about.html
+++ b/template/default/about.html
@@ -20,7 +20,7 @@
 			<td class="col_label"><h5></h5></td>
 			<td class="col_value">
 				<p>
-					<strong>VDRAdmin-AM</strong> © 2005-2007 Andreas Mair.
+					<strong>VDRAdmin-AM</strong> &copy; 2005-2008 Andreas Mair.
 				</p>
 				<p>
 					This program is free software; you can redistribute it and/or modify<br />
@@ -74,7 +74,7 @@
 		</tr>
 		<tr class="row_even">
 			<td class="col_label"><h5><?% gettext('French:') %?></h5></td>
-			<td class="col_value"><!-- <?% gettext('At the moment unmaintained, former translations by:') %?> -->Trois Six (also at vdrportal.de), map, lobotomise, bads, Mickaël Nival</td>
+			<td class="col_value"><!-- <?% gettext('At the moment unmaintained, former translations by:') %?> -->Trois Six (also at vdrportal.de), map, lobotomise, bads, Micka&euml;l Nival</td>
 		</tr>
 		<tr class="row_even">
 			<td class="col_label"><h5><?% gettext('Spanish:') %?></h5></td>
diff --git a/template/default/config.html b/template/default/config.html
index 8688afc..f4659fa 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -273,13 +273,6 @@
 					<input type="radio" name="TM_TT_LIST" value="0" id="tm_tl_list_no" <?% UNLESS config.TM_TT_LIST %?>checked="checked"<?% END %?> /><label for="tm_tl_list_no"><?% gettext('No') %?></label>
 				</td>
 			</tr>
-<!--						<tr class="row_odd">
-				<td class="col_label"><h5><?% gettext('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" <?% IF config.TM_ADD_SUMMARY %?>checked="checked"<?% END %?> /><label for="tm_add_summary_yes"><?% gettext('Yes') %?></label>
-					<input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <?% UNLESS config.TM_ADD_SUMMARY %?>checked="checked"<?% END %?> /><label for="tm_add_summary_no"><?% gettext('No') %?></label>
-				</td>
-			</tr>-->
 		</table>
 
 <?% IF config.ST_FUNC %?>
@@ -389,26 +382,6 @@
 				<td class="col_label"><h5><?% gettext('Update EPG every:') %?></h5></td>
 				<td class="col_value"><input type="text" name="CACHE_TIMEOUT" value="<?% config.CACHE_TIMEOUT %?>" size="4" /> <?% gettext('minutes') %?></td>
 			</tr>
-<!-- no longer supported
-			<tr class="row_odd">
-				<td class="col_label"><h5><?% gettext('Read EPG directly using epg.data:') %?></h5></td>
-				<td class="col_value">
-					<input type="radio" name="EPG_DIRECT" value="1" id="epg_yes" <?% IF config.EPG_DIRECT %?>checked="checked"<?% END %?> /><label for="epg_yes"><?% gettext('Yes') %?></label>
-					<input type="radio" name="EPG_DIRECT" value="0" id="epg_no" <?% UNLESS config.EPG_DIRECT %?>checked="checked"<?% END %?> /><label for="epg_no"><?% gettext('No') %?></label>
-				</td>
-			</tr>
-			<tr class="row_even">
-				<td class="col_label"><h5><?% gettext('epg.data filename:') %?></h5></td>
-				<td class="col_value"><input type="text" name="EPG_FILENAME" value="<?% config.EPG_FILENAME %?>" size="20" maxlength="256" /></td>
-			</tr>
--->
-			<tr class="row_odd">
-				<td class="col_label"><h5><?% gettext('VFAT:') %?></h5></td>
-				<td class="col_value">
-					<input type="radio" name="VDRVFAT" value="1" id="vfat_yes" <?% IF config.VDRVFAT %?>checked="checked"<?% END %?> /><label for="vfat_yes"><?% gettext('Yes') %?></label>
-					<input type="radio" name="VDRVFAT" value="0" id="vfat_no" <?% UNLESS config.VDRVFAT %?>checked="checked"<?% END %?> /><label for="vfat_no"><?% gettext('No') %?></label>
-				</td>
-			</tr>
 		</table>
 
 		<table border="0" cellspacing="0" cellpadding="0" class="group">
@@ -422,79 +395,40 @@
 					<input type="radio" name="CHANNELS_WITHOUT_EPG" value="0" id="chnoepg_no" <?% UNLESS config.CHANNELS_WITHOUT_EPG %?>checked="checked"<?% END %?> /><label for="chnoepg_no"><?% gettext('No') %?></label>
 				</td>
 			</tr>
-<!-- Now can be set in individual section
-						<tr class="row_odd">
-							<td class="col_label"><h5><?% gettext('In "Timeline"?') %?></h5></td>
-							<td class="col_value" colspan="2">
-								<input type="radio" name="CHANNELS_WANTED_TIMELINE" value="1" id="tl_yes" <?% IF config.CHANNELS_WANTED_TIMELINE %?>checked="checked"<?% END %?> /><label for="tl_yes"><?% gettext('Yes') %?></label>
-								<input type="radio" name="CHANNELS_WANTED_TIMELINE" value="0" id="tl_no" <?% UNLESS config.CHANNELS_WANTED_TIMELINE %?>checked="checked"<?% END %?> /><label for="tl_no"><?% gettext('No') %?></label>
-							</td>
-            </tr>
-						<tr class="row_odd">
-							<td class="col_label"><h5><?% gettext('In "Channels"?') %?></h5></td>
-							<td class="col_value" colspan="2">
-								<input type="radio" name="CHANNELS_WANTED_PRG" value="1" id="prg_yes" <?% IF config.CHANNELS_WANTED_PRG %?>checked="checked"<?% END %?> /><label for="prg_yes"><?% gettext('Yes') %?></label>
-								<input type="radio" name="CHANNELS_WANTED_PRG" value="0" id="prg_no"<?% UNLESS config.CHANNELS_WANTED_PRG %?>checked="checked"<?% END %?> /><label for="prg_no"><?% gettext('No') %?> </label>
-							</td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_label"><h5><?% gettext('In "Playing Today"?') %?></h5></td>
-							<td class="col_value" colspan="2">
-								<input type="radio" name="CHANNELS_WANTED_PRG2" value="1" id="prg2_yes" <?% IF config.CHANNELS_WANTED_PRG2 %?>checked="checked"<?% END %?> /><label for="prg2_yes"><?% gettext('Yes') %?></label>
-								<input type="radio" name="CHANNELS_WANTED_PRG2" value="0" id="prg2_no"<?% UNLESS config.CHANNELS_WANTED_PRG2 %?>checked="checked"<?% END %?> /><label for="prg2_no"><?% gettext('No') %?> </label>
-							</td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_label"><h5><?% gettext('In "What\'s On Now"?') %?></h5></td>
-							<td class="col_value" colspan="2">
-								<input type="radio" name="CHANNELS_WANTED_SUMMARY" value="1" id="sum_yes" <?% IF config.CHANNELS_WANTED_SUMMARY %?>checked="checked"<?% END %?> /><label for="sum_yes"><?% gettext('Yes') %?></label>
-								<input type="radio" name="CHANNELS_WANTED_SUMMARY" value="0" id="sum_no" <?% UNLESS config.CHANNELS_WANTED_SUMMARY %?>checked="checked"<?% END %?> /><label for="sum_no"><?% gettext('No') %?></label>
-							</td>
-						</tr>
--->
 <?% IF features.AUTOTIMER %?>
-						<tr class="row_even">
-							<td class="col_label"><h5><?% gettext('In "AutoTimer"?') %?></h5></td>
-							<td class="col_value" colspan="2">
-								<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="1" id="wat_yes" <?% IF config.CHANNELS_WANTED_AUTOTIMER %?>checked="checked"<?% END %?> /><label for="wat_yes"><?% gettext('Yes') %?></label>
-								<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="0" id="wat_no" <?% UNLESS config.CHANNELS_WANTED_AUTOTIMER %?>checked="checked"<?% END %?> /><label for="wat_no"><?% gettext('No') %?></label>
-							</td>
-						</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><?% gettext('In "AutoTimer"?') %?></h5></td>
+				<td class="col_value" colspan="2">
+					<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="1" id="wat_yes" <?% IF config.CHANNELS_WANTED_AUTOTIMER %?>checked="checked"<?% END %?> /><label for="wat_yes"><?% gettext('Yes') %?></label>
+					<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="0" id="wat_no" <?% UNLESS config.CHANNELS_WANTED_AUTOTIMER %?>checked="checked"<?% END %?> /><label for="wat_no"><?% gettext('No') %?></label>
+				</td>
+			</tr>
 <?% ELSE %?>
-						<tr class="row_even">
-							<td class="col_label"><h5>&nbsp;</h5></td>
-							<td class="col_value" colspan="2">&nbsp;</td>
-						</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5>&nbsp;</h5></td>
+				<td class="col_value" colspan="2">&nbsp;</td>
+			</tr>
 <?% END %?>
-<!-- Now can be set in individual section
-						<tr class="row_even">
-							<td class="col_label"><h5><?% gettext('In "Watch TV"?') %?></h5></td>
-							<td class="col_value" colspan="2">
-								<input type="radio" name="CHANNELS_WANTED_WATCHTV" value="1" id="wtv_yes" <?% IF config.CHANNELS_WANTED_WATCHTV %?>checked="checked"<?% END %?> /><label for="wtv_yes"><?% gettext('Yes') %?></label>
-								<input type="radio" name="CHANNELS_WANTED_WATCHTV" value="0" id="wtv_no" <?% UNLESS config.CHANNELS_WANTED_WATCHTV %?>checked="checked"<?% END %?> /><label for="wtv_no"><?% gettext('No') %?></label>
-							</td>
-						</tr>
--->
-						<tr class="row_odd">
-							<td class="col_channels">
-								<select name="all_channels" size="8" multiple="multiple" class="channels">
+			<tr class="row_odd">
+				<td class="col_channels">
+					<select name="all_channels" size="8" multiple="multiple" class="channels">
 <?% FOREACH chan = ALL_CHANNELS %?>
-									<option value="<?% chan.vdr_id %?>"><?% chan.name | html %?></option>
+						<option value="<?% chan.vdr_id %?>"><?% chan.name | html %?></option>
 <?% END %?>
-								</select>
-							</td>
-							<td>
-								<input type="submit" class="submit" name="submit" value="&gt;&gt;&gt;&gt;&gt;" /><br />
-								<input type="submit" class="submit" name="submit" value="&lt;&lt;&lt;&lt;&lt;" />
-							</td>
-							<td class="col_wanted_channels">
-								<select name="selected_channels" size="8" multiple="multiple" class="channels">
+					</select>
+				</td>
+				<td>
+					<input type="submit" class="submit" name="submit" value="&gt;&gt;&gt;&gt;&gt;" /><br />
+					<input type="submit" class="submit" name="submit" value="&lt;&lt;&lt;&lt;&lt;" />
+				</td>
+				<td class="col_wanted_channels">
+					<select name="selected_channels" size="8" multiple="multiple" class="channels">
 <?% FOREACH chan = SELECTED_CHANNELS %?>
-									<option value="<?% chan.vdr_id %?>"><?% chan.name | html %?></option>
+						<option value="<?% chan.vdr_id %?>"><?% chan.name | html %?></option>
 <?% END %?>
-								</select>
-							</td>
-						</tr>
+					</select>
+				</td>
+			</tr>
 		</table>
 
 		<div id="buttons">
diff --git a/template/default/default/configure.png b/template/default/default/configure.png
new file mode 100644
index 0000000..95bd319
--- /dev/null
+++ b/template/default/default/configure.png
diff --git a/template/default/epgsearch_config.html b/template/default/epgsearch_config.html
new file mode 100644
index 0000000..c01d0ee
--- /dev/null
+++ b/template/default/epgsearch_config.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html id="scroller">
+<?% USE JavaScript, HTML %?>
+<head>
+	<meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
+	<title>VDRAdmin-AM - <?% gettext('EPG Search Blacklists') %?></title>
+	<link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+	<?% IF usercss %?>
+		<link href="user.css" rel="stylesheet" media="screen" type="text/css"/>
+	<?% END %?>
+	<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+	<?% IF config.AT_TOOLTIP %?>
+		<script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script>
+	<?% END %?>
+</head>
+
+<body id="epgsearch_config">
+<?% UNLESS did_search %?>
+	<form action="<?% url %?>" method="get" name="FormName0">
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+			<tr>
+				<td class="col_title">
+					<h1><?% gettext('EPG Search Blacklists') %?></h1>
+				</td>
+				<td class="col_other">
+					<input type="submit" class="submit" name="new_blacklist" value="<?% gettext('New Blacklist') %?>" />
+					<input type="hidden" name="aktion" value="epgsearch_bl_edit" />
+				</td>
+<?% IF help_url %?>
+				<td class="col_help">
+					<a href="javascript:open_help('<?% help_url %?>');"><img src="bilder/help.png" border="0" alt="help" title="<?% gettext('Help') %?>"/></a>
+				</td>
+<?% END %?>
+			</tr>
+		</table>
+	</form>
+
+	<form action="<?% url %?>" method="get" name="FormName">
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list hilight">
+			<tr class="heading">
+        <td class="col_name <?% IF sortbypattern %?>selected<?% END %?>">
+					<h2>
+						<?% gettext('Search pattern') %?>
+						<!--
+						<a href="<?% sortbypattern %?>"><?% gettext('Channel') %?>
+							<?% IF sortbypattern %?>
+								<img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/>
+							<?% ELSE %?>
+								<img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/>
+							<?% END %?>
+						</a>
+						-->
+					</h2>
+				</td>
+				<td class="col_channel <?% IF sortbychannel %?>selected<?% END %?>">
+					<h2>
+						<?% gettext('Channel') %?>
+						<!--
+						<a href="<?% sortbychannelurl %?>"><?% gettext('Channel') %?>
+							<?% IF sortbychannel %?>
+								<img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/>
+							<?% ELSE %?>
+								<img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/>
+							<?% END %?>
+						</a>
+						-->
+					</h2>
+				</td>
+				<td class="col_start <?% IF sortbystart %?>selected<?% END %?>">
+					<h2>
+						<?% gettext('From') %?>
+						<!--
+						<a href="<?% sortbystarturl %?>"><?% gettext('Start') %?>
+							<?% IF sortbystart %?>
+								<img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/>
+							<?% ELSE %?>
+								<img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/>
+							<?% END %?>
+						</a>
+						-->
+					</h2>
+				</td>
+				<td class="col_stop <?% IF sortbystop %?>selected<?% END %?>">
+					<h2>
+						<?% gettext('To') %?>
+						<!--
+						<a href="<?% sortbystopurl %?>"><?% gettext('Stop') %?>
+							<?% IF sortbystop %?>
+								<img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/>
+							<?% ELSE %?>
+								<img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/>
+							<?% END %?>
+						</a>
+						-->
+					</h2>
+				</td>
+				<td class="col_buttons"></td>
+				<td class="col_checkbox"><input type="checkbox" name="SELALL" value="SELALL" onclick="AllMessages(this.form);" title="<?% gettext('Select all/none') %?>"/></td>
+			</tr>
+
+<?% FOREACH list %?>
+			<tr class="<?% IF loop.count % 2 == 0 %?>row_even<?% ELSE %?>row_odd<?% END %?>">
+				<td class="col_name">
+					<div>
+            <a href="<?% modurl %?>" title="<?% gettext('Edit') %?>"><?% pattern | html %?></a>
+					</div>
+				</td>
+				<td class="col_channel <?% IF sortbychannel %?>selected<?% END %?>">
+					<div>
+						<?% SWITCH use_channel %?>
+						<?% CASE 1 %?>
+							<?% channel_from_name %?><?% IF channel_from_name != channel_to_name %?> - <?% channel_to_name %?><?% END %?>
+						<?% CASE 2 %?>
+							<?% channels %?>
+						<?% CASE %?>
+							-
+						<?% END %?>
+					</div>
+				</td>
+				<td class="col_start <?% IF sortbystart %?>selected<?% END %?>">
+					<div>
+						<?% IF time_start %?><?% time_start %?><?% ELSE %?>--:--<?% END %?>
+					</div>
+				</td>
+				<td class="col_stop <?% IF sortbystop %?>selected<?% END %?>">
+					<div>
+						<?% IF time_stop %?><?% time_stop %?><?% ELSE %?>--:--<?% END %?>
+					</div>
+				</td>
+				<td class="col_buttons">
+					<span class="action edit">
+						<a href="<?% modurl %?>"><img src="bilder/edit.png" alt="edit" border="0" title="<?% gettext('Edit') %?>"/></a>
+					</span>
+					<span class="action delete">
+						<a href="javascript:del('<?% gettext('Delete blacklist?') %?>\n\n&quot;<?% pattern | js %?>&quot;', '<?% delurl %?>');"><img src="bilder/delete.png" alt="delete" border="0" title="<?% gettext('Delete') %?>"/></a>
+					</span>
+				</td>
+				<td class="col_checkbox">
+					<div>
+						<input type="checkbox" name="xxxx_<?% id %?>"/>
+					</div>
+				</td>
+			</tr>
+<?% END %?>
+		</table>
+
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons">
+			<tr>
+				<td align="right">
+					<input type="submit" class="submit" name="delete" value="<?% gettext('Delete Selected Blacklists') %?>" onclick="return mdel(this, '<?% gettext('Delete all selected blacklists?') %?>');" />
+				</td>
+			</tr>
+		</table>
+		<input type="hidden" name="aktion" value="epgsearch_config_aktion"/>
+
+	</form>
+<?% END %?>
+
+</body>
+
+</html>
diff --git a/template/default/epgsearch_list.html b/template/default/epgsearch_list.html
index bc96c64..94841b2 100644
--- a/template/default/epgsearch_list.html
+++ b/template/default/epgsearch_list.html
@@ -34,11 +34,14 @@
 					<input type="submit" class="submit" name="new_search" value="<?% gettext('New Search') %?>" />
 					<input type="hidden" name="aktion" value="epgsearch_edit" />
 				</td>
-<?% IF help_url %?>
 				<td class="col_help">
+<?% IF config_url %?>
+          <a href="<?% config_url %?>"><img src="bilder/configure.png" border="0" alt="settings" title="<?% gettext('Settings') %?>"/></a>
+<?% END %?>
+<?% IF help_url %?>
 					<a href="javascript:open_help('<?% help_url %?>');"><img src="bilder/help.png" border="0" alt="help" title="<?% gettext('Help') %?>"/></a>
-				</td>
 <?% END %?>
+				</td>
 			</tr>
 		</table>
 	</form>
@@ -239,7 +242,7 @@
 					<td class="col_center">
 						<div class="epg_title">
 							<?% IF infurl %?>
-								<a href="javascript:popup('<?% infurl %?>');" title="<?% gettext('More Information') %?>">
+								<a href="javascript:popup('<?% infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);" title="<?% gettext('More Information') %?>">
 							<?% END %?>
 							<?% title %?>
 							<?% IF infurl %?>
diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html
index 993ab8a..9262529 100644
--- a/template/default/epgsearch_new.html
+++ b/template/default/epgsearch_new.html
@@ -3,7 +3,11 @@
 
 <head>
 	<meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
-	<title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Define New Search') %?><?% ELSE %?><?% gettext('Edit Search') %?><?% END %?></title>
+<?% IF mode_blacklist %?>
+  <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Blacklist') %?><?% ELSE %?><?% gettext('Edit Blacklist') %?><?% END %?></title>
+<?% ELSE %?>
+  <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Search') %?><?% ELSE %?><?% gettext('Edit Search') %?><?% END %?></title>
+<?% END %?>
 	<link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
 	<?% IF usercss %?>
 		<link href="user.css" rel="stylesheet" media="screen" type="text/css"/>
@@ -23,11 +27,13 @@
 			changedUseTime(document.getElementById("use_time"));
 			changedUseDuration(document.getElementById("use_duration"));
 			changedUseDays(document.getElementById("use_days"));
+<?% UNLESS mode_blacklist %?>
 			changedUseBlacklists(document.getElementById("use_blacklists"));
 			changedAction(document.getElementById("select_action"));
 			changedHasAction(document.getElementById("has_action"));
 			changedAvoidRepeats(document.getElementById("avoid_repeats"));
 			changedAutoDelete(document.getElementById("select_autodelete"));
+<?% END %?>
 		}
 
 		function changedSearchMode(mySelect)
@@ -78,6 +84,7 @@
 			document.getElementById("use_days_settings").style.display = (myCheckbox.checked ? "block" : "none");
 		}
 
+<?% UNLESS mode_blacklist %?>
 		function changedUseBlacklists(mySelect)
 		{
 			document.getElementById("select_blacklists").style.display = (mySelect.options[mySelect.selectedIndex].value == 1 ? "block" : "none");
@@ -161,6 +168,7 @@
 		{
 			document.getElementById("results").style.display = "none";
 		}
+<?% END %?>
 	//-->
 	</script>
 </head>
@@ -170,7 +178,11 @@
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
 			<tr>
 				<td class="col_title">
+<?% IF mode_blacklist %?>
+					<h1><?% IF do_edit %?><?% gettext('Edit Blacklist') %?><?% ELSE %?><?% gettext('Add New Blacklist') %?><?% END %?></h1>
+<?% ELSE %?>
 					<h1><?% IF do_edit %?><?% gettext('Edit Search') %?><?% ELSE %?><?% gettext('Add New Search') %?><?% END %?></h1>
+<?% END %?>
 				</td>
 <?% IF help_url %?>
 				<td class="col_help">
@@ -200,7 +212,7 @@
 							<td class="col_center">
 								<div class="epg_title">
 									<?% IF infurl %?>
-										<a href="javascript:popup('<?% infurl %?>');" title="<?% gettext('More Information') %?>">
+										<a href="javascript:popup('<?% infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);" title="<?% gettext('More Information') %?>">
 									<?% END %?>
 									<?% title %?>
 									<?% IF infurl %?>
@@ -242,7 +254,7 @@
 					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Search Term:') %?></h5></td>
 					<td class="col_value">
-						<input type="text" name="pattern" id="pattern" value="<?% epgsearch.pattern %?>" size="40" />
+						<input type="text" name="pattern" id="pattern" value="<?% epgsearch.pattern | html %?>" size="40" />
 					</td>
 				</tr>
 				<tr class="<?% tr_class %?>">
@@ -315,8 +327,8 @@
 								</table>
 							<?% END %?>
 						</div>
- 	    		</td>
-			 	</tr>
+					</td>
+				</tr>
 <?% END %?>
 				<tr class="<?% tr_class %?>">
 					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
@@ -392,7 +404,7 @@
 									</td>
 								</tr>
 								<tr>
-						  		<td class="col_label"><h5><?% gettext('Max. Duration:') %?></h5></td>
+									<td class="col_label"><h5><?% gettext('Max. Duration:') %?></h5></td>
 									<td class="col_value">
 										<input type="text" name="max_duration" value="<?% epgsearch.max_duration %?>" size="5" maxlength="5" />
 										&nbsp;(<?% gettext('hh:mm') %?>)
@@ -416,8 +428,9 @@
 							<input type="checkbox" name="saturday" value="1" id="saturday" <?% IF epgsearch.saturday %?>checked="checked"<?% END %?> /><label for="saturday"><?% gettext('Saturday') %?></label>
 							<input type="checkbox" name="sunday" value="1" id="sunday" <?% IF epgsearch.sunday %?>checked="checked"<?% END %?> /><label for="sunday"><?% gettext('Sunday') %?></label>
 						</div>
- 	       </td>
+					</td>
 				</tr>
+<?% UNLESS mode_blacklist %?>
 				<tr class="<?% tr_class %?>">
 					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label" valign="top"><h5><?% gettext('Use Blacklists:') %?></h5></td>
@@ -482,8 +495,10 @@
 						</div>
 					</td>
 				</tr>
+<?% END %?>
 			</table>
 
+<?% UNLESS mode_blacklist %?>
 			<div id="action_record_settings">
 				<table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
 					<tr class="heading">
@@ -598,6 +613,7 @@
 				</table>
 			</div>
 		</div>
+<?% END %?>
 
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons">
 			<tr>
@@ -608,16 +624,23 @@
 				-->
 				<td align="right">
 					<input type="submit" class="submit" name="save" value="<?% gettext('Save') %?>" onclick="return checkSearchPattern();" />
-					<input type="submit" class="submit" name="single_test" value="<?% gettext('Run') %?>" onclick="return checkSearchPattern();" />
+<?% UNLESS mode_blacklist %?>
+          <input type="submit" class="submit" name="single_test" value="<?% gettext('Run') %?>" onclick="return checkSearchPattern();" />
+<?% END %?>
 					<input type="submit" class="submit" name="exit" value="<?% gettext('Cancel') %?>" />
 				</td>
 			</tr>
 		</table>
-		<input type="hidden" name="aktion" value="epgsearch_aktion" />
 		<?% IF do_edit %?>
 			<input type="hidden" name="id" value="<?% epgsearch.id %?>" />
 		<?% END %?>
+<?% IF mode_blacklist %?>
+		<input type="hidden" name="aktion" value="epgsearch_bl_aktion" />
+		<input type="hidden" name="mode_blacklist" value="1" />
+<?% ELSE %?>
+		<input type="hidden" name="aktion" value="epgsearch_aktion" />
 		<input type="hidden" name="results_menu" value="<?% epgsearch.results_menu %?>" />
+<?% END %?>
 		<input type="hidden" name="unused" value="<?% epgsearch.unused %?>" />
 	</form>
 </body>
diff --git a/template/default/help_config.html b/template/default/help_config.html
index d0e3531..179841c 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -182,19 +182,12 @@
 						<dd><?% gettext('If set to "yes" VDRAdmin-AM will periodically refresh its local EPG cache. Else the EPG will be refreshed if the user accesses any EPG view at the web interface and the timeout set at "Update EPG every" has been reached.') %?></dd>
 						<dt><?% gettext('Update EPG every:') %?></dt>
 						<dd><?% gettext('The interval, the EPG data is refreshed from VDR and AutoTimer updates are performed (if AutoTimer feature is used).') %?></dd>
-<!--
-						<dt><?% gettext('Read EPG directly using epg.data:') %?></dt>
-						<dd><?% gettext('Accessing VDR\'s EPG through VDR\'s SVDRPort seems to block VDR for some time. If this option is activated VDRAdmin-AM will read the <span class="ref_file">epg.data</span> file directly so that VDR doesn\'t get blocked.') %?></dd>
-						<dt><?% gettext('epg.data filename:') %?></dt>
-						<dd><?% gettext('If you\'ve enabled the option above you need to tell VDRAdmin-AM where the <span class="ref_file">epg.data</span> file is located.') %?></dd>
--->
-						<dt><?% gettext('VFAT:') %?></dt>
-						<dd><?% gettext('If you have compiled VDR with the VFAT define you have to enable this option. If this option is set to the wrong value, you may have problems with certain recordings if you want to stream them or run reccmds on them.') %?></dd>
 					</dl>
 					<div class="top_link">[<a href="#top"><?% gettext('Top') %?></a>]</div>
 				</div>
 
 				<div class="group"><a id="channels" name="channels"></a><h3><?% gettext('Channel Selections') %?></h3>
+					<!-- TODO: remove reference to radios -->
 					<?% gettext('<p>If you want to limit the number of channels used in some parts of VDRAdmin-AM, this is for you!</p>
 					<p>Use the radio buttons to activate or deactivate the wanted channels in the named menu.</p>
 					<p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <input type="submit" class="submit" value="&gt;&gt;&gt;&gt;&gt;"/>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <input type="submit" class="submit" value="&lt;&lt;&lt;&lt;&lt;"/>.</p>') %?>
diff --git a/template/default/library.js b/template/default/library.js
index 778fb3e..d7f65f3 100644
--- a/template/default/library.js
+++ b/template/default/library.js
@@ -25,8 +25,8 @@ function callurl( url ) {
 	image.src = url + "&rand=" + Now.getTime();
 }
 
-function popup(URL) {
-	window.open(URL, '_new', 'width=500, height=250, scrollbars=yes, resizable=yes, toolbar=no, status=no');
+function popup(URL, win_w, win_h) {
+	window.open(URL, '_new', 'width=' + win_w + ', height=' + win_h + ', scrollbars=yes, resizable=yes, toolbar=no, status=no');
 }
 
 function toolbar(URL) {
diff --git a/template/default/prog_list.html b/template/default/prog_list.html
index 4686982..ab5ddec 100644
--- a/template/default/prog_list.html
+++ b/template/default/prog_list.html
@@ -70,7 +70,7 @@
 					<td class="col_title">
 						<div class="epg_title">
 						<?% IF bc.infurl %?>
-							<a href="javascript:popup('<?% bc.infurl %?>');" title="<?% gettext('More Information') %?>">
+							<a href="javascript:popup('<?% bc.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);" title="<?% gettext('More Information') %?>">
 						<?% END %?>
 						<?% bc.title %?>
 						<?% IF bc.infurl %?>
@@ -86,7 +86,7 @@
 					<td class="col_buttons">
 						<span class="action repeatings"><a href="vdradmin.pl?search=<?% bc.find_title %?>&amp;aktion=prog_summary&amp;submit=go11"><img src="bilder/find.png" border="0" alt="<?% gettext('Search for other show times') %?>" onmouseover="window.status='<?% gettext('Search for other show times') %?>';return true" title="<?% gettext('Search for other show times') %?>" /></a></span>
 						<?% IF bc.infurl %?>
-							<span class="action info"><a href="javascript:popup('<?% bc.infurl %?>');" title="<?% gettext('More Information') %?>"><img src="bilder/info_button.png" border="0" alt="info" /></a></span>
+							<span class="action info"><a href="javascript:popup('<?% bc.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);" title="<?% gettext('More Information') %?>"><img src="bilder/info_button.png" border="0" alt="info" /></a></span>
 						<?% ELSE %?>
 							<span class="action info"><img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<?% gettext('No Information') %?>" /></span>
 						<?% END %?>
@@ -103,6 +103,10 @@
 			<?% END %?>
 		<?% END %?>
 		<?% IF bc.endd %?>
+				<tr class="heading">
+					<td colspan="2"></td>
+					<td class="col_navi"><?% IF bc.prev_channel %?><a href="<?% bc.prev_channel %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?><?% IF bc.next_channel %?><a href="<?% bc.next_channel %?>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /><?% END %?></td>
+				</tr>
 			</table>
 		<?% END %?>
 	<?% END %?>
diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html
index f22ab09..877d8b5 100644
--- a/template/default/prog_list2.html
+++ b/template/default/prog_list2.html
@@ -76,7 +76,7 @@
 					<td class="col_title">
 						<div class="epg_title">
 							<?% IF bc.infurl %?>
-								<a href="javascript:popup('<?% bc.infurl %?>');" title="<?% gettext('More Information') %?>">
+								<a href="javascript:popup('<?% bc.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);" title="<?% gettext('More Information') %?>">
 							<?% END %?>
 							<?% bc.title %?>
 							<?% IF bc.infurl %?>
@@ -95,7 +95,7 @@
 						<?% IF bc.anchor %?>
 							<span class="action repeatings"><a href="vdradmin.pl?search=<?% bc.find_title %?>&amp;aktion=prog_summary&amp;submit=go11"><img src="bilder/find.png" border="0" alt="<?% gettext('Search for other show times') %?>" onmouseover="window.status='<?% gettext('Search for other show times') %?>';return true" title="<?% gettext('Search for other show times') %?>" /></a></span>
 							<?% IF bc.infurl %?>
-								<span class="action info"><a href="javascript:popup('<?% bc.infurl %?>');"><img src="bilder/info_button.png" border="0" title="<?% gettext('More Information') %?>" alt="info"/></a></span>
+								<span class="action info"><a href="javascript:popup('<?% bc.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);"><img src="bilder/info_button.png" border="0" title="<?% gettext('More Information') %?>" alt="info"/></a></span>
 							<?% ELSE %?>
 								<span class="action info"><img src="bilder/info_button_disabled.png" border="0" title="<?% gettext('No Information') %?>" alt="noinfo"/></span>
 							<?% END %?>
diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html
index 49106af..04bdace 100644
--- a/template/default/prog_summary.html
+++ b/template/default/prog_summary.html
@@ -76,18 +76,18 @@
 											<a href="<?% row.streamurl %?>" title="<?% gettext('Stream') %?>"><img src="bilder/stream.png" border="0" alt="<?% gettext('Stream') %?>" onmouseover="window.status='<?% gettext('Stream') %?>';return true" title="<?% gettext('Stream') %?>" /></a>
 										</span>
 									<?% END %?>
+									<?% IF row.switchurl %?>
+										<span class="action switch">
+											<a href="javascript:callurl('<?% row.switchurl %?>');"><img src="bilder/view.png" border="0" alt="<?% gettext('TV select') %?>" onmouseover="window.status='<?% gettext('TV select') %?>';return true" title="<?% gettext('TV select') %?>" /></a>
+										</span>
+									<?% END %?>
 									<?% IF row.recurl %?>
-										<?% IF row.switchurl %?>
-											<span class="action switch">
-												<a href="javascript:callurl('<?% row.switchurl %?>');"><img src="bilder/view.png" border="0" alt="<?% gettext('TV select') %?>" onmouseover="window.status='<?% gettext('TV select') %?>';return true" title="<?% gettext('TV select') %?>" /></a>
-											</span>
-										<?% END %?>
 										<span class="action repeatings">
 											<a href="vdradmin.pl?search=<?% row.find_title %?>&amp;aktion=prog_summary&amp;submit=go11"><img src="bilder/find.png" border="0" alt="<?% gettext('Search for other show times') %?>" onmouseover="window.status='<?% gettext('Search for other show times') %?>';return true" title="<?% gettext('Search for other show times') %?>" /></a>
 										</span>
 										<span class="action info">
 											<?% IF row.summary %?>
-												<a href="javascript:popup('<?% row.infurl %?>');"><img src="bilder/info_button.png" border="0" alt="<?% gettext('More Information') %?>" onmouseover="window.status='<?% gettext('More Information') %?>';return true" title="<?% gettext('More Information') %?>" /></a>
+												<a href="javascript:popup('<?% row.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);"><img src="bilder/info_button.png" border="0" alt="<?% gettext('More Information') %?>" onmouseover="window.status='<?% gettext('More Information') %?>';return true" title="<?% gettext('More Information') %?>" /></a>
 											<?% ELSE %?>
 												<img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<?% gettext('No Information') %?>" />
 											<?% END %?>
@@ -115,7 +115,7 @@
 									</div>
 									<div class="epg_title">
 										<?% IF row.summary %?>
-											<a href="javascript:popup('<?% row.infurl %?>');" title="<?% gettext('More Information') %?>" >
+											<a href="javascript:popup('<?% row.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);" title="<?% gettext('More Information') %?>" >
 										<?% END %?>
 										<?% row.title %?>
 										<?% IF row.summary %?>
diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html
index e657eb0..1320d31 100644
--- a/template/default/prog_summary2.html
+++ b/template/default/prog_summary2.html
@@ -75,7 +75,7 @@
 				<td class="col_center">
 					<div class="epg_title">
 						<?% IF broadcast.summary %?>
-							<a href="javascript:popup('<?% broadcast.infurl %?>');" title="<?% gettext('More Information') %?>">
+							<a href="javascript:popup('<?% broadcast.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);" title="<?% gettext('More Information') %?>">
 						<?% END %?>
 						<?% broadcast.title %?>
 						<?% IF broadcast.summary %?>
@@ -96,15 +96,15 @@
 					<?% IF broadcast.stream_live_on %?>
 						<span class="action stream"><a href="<?% broadcast.streamurl %?>"><img src="bilder/stream.png" border="0" alt="<?% gettext('Stream') %?>" onmouseover="window.status='<?% gettext('Stream') %?>';return true" title="<?% gettext('Stream') %?>" /></a></span>
 					<?% END %?>
+					<?% IF broadcast.switchurl %?>
+						<span class="action switch">
+							<a href="javascript:callurl('<?% broadcast.switchurl %?>');"><img src="bilder/view.png" border="0" alt="<?% gettext('TV select') %?>" onmouseover="window.status='<?% gettext('TV select') %?>';return true" title="<?% gettext('TV select') %?>" /></a>
+						</span>
+					<?% END %?>
 					<?% IF broadcast.recurl %?>
-						<?% IF broadcast.switchurl %?>
-							<span class="action switch">
-								<a href="javascript:callurl('<?% broadcast.switchurl %?>');"><img src="bilder/view.png" border="0" alt="<?% gettext('TV select') %?>" onmouseover="window.status='<?% gettext('TV select') %?>';return true" title="<?% gettext('TV select') %?>" /></a>
-							</span>
-						<?% END %?>
 						<span class="action repeatings"><a href="vdradmin.pl?search=<?% broadcast.find_title %?>&amp;aktion=prog_summary&amp;submit=go11"><img src="bilder/find.png" border="0" alt="<?% gettext('Search for other show times') %?>" onmouseover="window.status='<?% gettext('Search for other show times') %?>';return true" title="<?% gettext('Search for other show times') %?>" /></a></span>
 						<?% IF broadcast.summary %?>
-							<span class="action info"><a href="javascript:popup('<?% broadcast.infurl %?>');"><img src="bilder/info_button.png" border="0" alt="<?% gettext('More Information') %?>" onmouseover="window.status='<?% gettext('More Information') %?>';return true" title="<?% gettext('More Information') %?>" /></a></span>
+							<span class="action info"><a href="javascript:popup('<?% broadcast.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);"><img src="bilder/info_button.png" border="0" alt="<?% gettext('More Information') %?>" onmouseover="window.status='<?% gettext('More Information') %?>';return true" title="<?% gettext('More Information') %?>" /></a></span>
 						<?% ELSE %?>
 							<span class="action info"><img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<?% gettext('No Information') %?>" /></span>
 						<?% END %?>
diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html
index f0bf83f..dd5db20 100644
--- a/template/default/prog_timeline.html
+++ b/template/default/prog_timeline.html
@@ -147,6 +147,8 @@
 	<form action="<?% nowurl %?>" method="get" name="FormName">
 		<script type="text/javascript" language="JavaScript1.2">
 			var tl = new TimeLine(<?% now_sec %?>, "<?% nowurl %?>", <?% px_per_min %?>, <?% end_min %?>);
+			var popup_width = <?% config.GUI_POPUP_WIDTH %?>;
+			var popup_height = <?% config.GUI_POPUP_HEIGHT %?>;
 		</script>
 
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
diff --git a/template/default/rec_list.html b/template/default/rec_list.html
index d1b9a85..b987803 100644
--- a/template/default/rec_list.html
+++ b/template/default/rec_list.html
@@ -101,7 +101,7 @@
 						<?% IF rec.isfolder %?>
 							<a href="<?% rec.infurl %?>"><img align="middle" src="bilder/folder_video.png" border="0" alt="" />&nbsp;<?% rec.name %?></a>
 						<?% ELSE %?>
-							<a href="javascript:popup('<?% rec.infurl %?>');"><img align="middle" src="bilder/aktion.png" border="0" alt="" />&nbsp;<?% rec.name %?></a>
+							<a href="javascript:popup('<?% rec.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);"><img align="middle" src="bilder/aktion.png" border="0" alt="" />&nbsp;<?% rec.name %?></a>
 						<?% END %?>
 					</td>
 					<td class="col_buttons">
diff --git a/template/default/style.css b/template/default/style.css
index dc1f2d1..ad27dd1 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -241,6 +241,10 @@ body.help .heading {
 	padding: 2px;
 }
 
+#prog_list .list {
+	margin-bottom: 0.5em;
+}
+
 #prog_summary .action,
 #prog_detail .action {
 	display: block;
@@ -349,6 +353,7 @@ body.help .heading {
 #prog_list .col_buttons,
 #rec_list .col_buttons,
 #epgsearch_list .col_buttons,
+#epgsearch_config .col_buttons,
 #prog_summary2 .col_buttons {
 	width: 120px;
 	text-align: right;
diff --git a/template/default/timeline.js b/template/default/timeline.js
index 75aa6c4..4daf797 100644
--- a/template/default/timeline.js
+++ b/template/default/timeline.js
@@ -414,7 +414,7 @@ function BuildEvent(vdr_id, counter, event, td_class, px_w)
                {

                   anchor_start = '<a href="javascript:popup(' 

                                + "'./vdradmin.pl?aktion=prog_detail&amp;epg_id=" 

-                               + event.epg_id + "&amp;vdr_id=" + vdr_id + "');" + '">';

+                               + event.epg_id + "&amp;vdr_id=" + vdr_id + "', " + popup_width + ", " + popup_height + ");" + '">';

                   anchor_end = '</a>';

                }

                W(anchor_start);

diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index 20b127a..c54e016 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -302,7 +302,7 @@
 						<div <?% IF config.TM_TT_LIST %?>onmouseover="tip('VDR-<?% timer.id %?>'); return true;" onmouseout="untip(); return true;"<?% END %?>>
 							<?% IF timer.recording %?><img align="middle" src="bilder/rec.gif" border="0" alt="" />&nbsp;<?% END %?>
 							<?% IF timer.infurl %?>
-								<a href="javascript:popup('<?% timer.infurl %?>');"><?% timer.title %?></a>
+								<a href="javascript:popup('<?% timer.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);"><?% timer.title %?></a>
 							<?% ELSE %?>
 								<?% timer.title %?>
 							<?% END %?>
diff --git a/template/default/tv.html b/template/default/tv.html
index 0a9d103..9c02583 100644
--- a/template/default/tv.html
+++ b/template/default/tv.html
@@ -13,6 +13,7 @@
 		<!--
 		var timeout;
 		var interval = <?% interval %?>;
+		var tmpImage = new Image();
 		<?% IF full_tv %?>
 			var size = "<?% size %?>";
 		<?% ELSE %?>
@@ -37,9 +38,10 @@
 
 		function WebcamUpdate() {
 			Before = new Date();
-			NewPicUrl = "<?% url %?>&size=" + size + "&interval=" + interval + "&rand=" + Before.getTime();
-			document.Bild.src = NewPicUrl;
-//TODO      document.getElementById('sect_tv').style.width = (size == 'full' ? 780 : (size == 'half' ? 400 : 210));
+			tmpImage.src = "<?% url %?>&size=" + size + "&interval=" + interval + "&rand=" + Before.getTime();
+			//TODO: wait until (tmpImage.complete == true)?
+			document.Bild.src = tmpImage.src;
+      document.getElementById('sect_tv').style.width = (size == 'full' ? 780 : (size == 'half' ? 400 : 210)) + "px";
 			if(interval > 0) {
 				After = new Date();
 				wait_sec = (interval * 1000) - (After - Before);
@@ -106,12 +108,12 @@
 
 		<table border="0" cellspacing="0" cellpadding="0" id="content">
 			<tr>
-        <td id="sect_tv" width="<?% IF size == 'full' %?>780<?% ELSE %?><?% IF size == 'half' %?>400<?% ELSE %?>210<?% END %?><?% END %?>" align="center">
+        <td id="sect_tv" style="width:<?% IF size == 'full' %?>780<?% ELSE %?><?% IF size == 'half' %?>400<?% ELSE %?>210<?% END %?><?% END %?>px;" align="center">
 					<img name="Bild" src="<?% url %?>" border="1" hspace="2" vspace="2" class="tv" alt="" />
 					<img src="bilder/spacer.gif" name="switchimage" width="2" height="1" alt="" />
 				</td>
 <?% IF full_tv %?>
-				<td id="sect_rc">
+				<td id="sect_rc" valign="top">
 					<table width="200" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td></td>
@@ -202,7 +204,7 @@
 				  <table border="0" cellpadding="0" cellspacing="0">
 						<tr>
 							<td> 
-								<select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value,'main')" style="width:100%">
+								<select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value,'main')">
 <?% FOREACH ch_grp = ch_groups %?> 
 									<option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
 <?% END %?>
@@ -211,12 +213,12 @@
 						</tr>
 						<tr>
 							<td> 
-								<select name="channel" size="32" onchange="javascript:switch_channel('./vdradmin.pl?aktion=tv_switch&amp;channel=' + encodeURIComponent(this.options[this.selectedIndex].value));" style="width:100%">
+								<select name="channel" size="32" onchange="javascript:switch_channel('./vdradmin.pl?aktion=tv_switch&amp;channel=' + encodeURIComponent(this.options[this.selectedIndex].value));" style="width:100%;">
 <?% FOREACH chan = channels %?>
       						<option value="<?% chan.vdr_id %?>" <?% IF chan.cur %?>selected="selected"<?% END %?>><?% chan.name | html %?></option>
 <?% END %?>
 			      		</select>
-<!--						<a class="submit" href="javascript:switch_by_select();">Switch</a>-->
+<!--						<a class="submit" href="javascript:switch_by_select();">Switch</a> -->
 							</td>
 						</tr>
 					</table>