* Tools: add date format with weekday

* Change language, now independent from external settings
* EPG/TIMERS: move time formating from template to perl code
* RECORDS: [Bug #13014] vfat-Recordings with '/' can't assign
* AUTOTIMER: [Bug #012960] AUTOTIMER with PDC ignore user settings
* AJAX: Ignore now unknown formats

14 files changed, 138 insertions, 128 deletions

diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl
index b5da892..b83d9c9 100644
--- a/skins/deltab/program.tmpl
+++ b/skins/deltab/program.tmpl
@@ -1,5 +1,4 @@
 <!-- program -->
-<?% USE date %?>
 <div id="body">
 <?% BLOCK dur %?>
     <?% height=6;d = d div 1 ; IF d >= 0 and d <= 100 %?>
@@ -68,7 +67,7 @@
 <h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?></h1>
 <?% ELSE %?>
 <?% fields = data.shift %?>
-<h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?> - <?% date.format(data.first.5, "%A, %x", locale) %?></h1>
+<h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?> - <?% data.first.5 %?></h1>
 	<table summary="" width="100%">
     <tr>
         <th></th>
@@ -81,7 +80,7 @@
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;
             description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9;
             timerid=zeile.10;recording=zeile.11;running=zeile.12;
-            day = date.format(zeile.5, "%A, %x", locale) %?>
+            day = zeile.5 %?>
 		<?% IF old.defined && day != old %?>
   		<tr>
             <td colspan="12" align="left">
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl
index 889fc09..7a07b6c 100644
--- a/skins/deltab/search.tmpl
+++ b/skins/deltab/search.tmpl
@@ -1,5 +1,4 @@
 <!-- search -->
-<?% USE date %?>
 <div id="body">
 <?% BLOCK dur %?>
     <?% height=6;d = d div 1 ; IF d >= 0 and d <= 100 %?>
@@ -66,7 +65,7 @@
 <h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?></h1>
 <?% ELSE %?>
 <?% fields = data.shift %?>
-<h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% date.format(data.first.7, "%A, %x", locale) %?></h1>
+<h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% data.first.7 %?></h1>
 <table summary="" width="100%">
     <tr>
         <th width="180"></th>
@@ -79,7 +78,7 @@
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
-            day = date.format(zeile.7, "%A, %x", locale) %?>
+            day = zeile.7 %?>
 		<?% IF old.defined && day != old %?>
    		  <tr>
             <td colspan="12" align="left">
@@ -124,7 +123,7 @@
             <?% gettext('Channel',30) %?><br />
             <select name='__channel'>
                 <option value="0"><?% gettext('All channels') %?></option>
-            <?% FOREACH chan = getModule('CHANNELS').ChannelArray('Name') %?>
+            <?% FOREACH chan = param.channels %?>
                 <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected="selected"<?% END %?>><?% chan.first %?></option>
             <?% END %?>
             </select>
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index a2583b7..345de96 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -1,5 +1,4 @@
 <!-- tlist -->
-<?% USE date %?>
 <div id="body">
 <?% ######################################################################## %?>
 <?% aus = gettext('Off') %?>
@@ -132,7 +131,7 @@
 <h1><?% gettext("Planned recordings") %?></h1>
 <?% ELSE %?>
 <?% fields = data.shift %?>
-<h1><?% gettext("Planned recordings") %?> - <?% date.format(data.first.9, "%A, %x", locale) %?></h1>
+<h1><?% gettext("Planned recordings") %?> - <?% data.first.4 %?></h1>
 <form name="tlist" action="">
 	<table summary=""  width="100%">
     <tr>
@@ -147,20 +146,19 @@
           aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
           sender=zeile.2;
           channel=zeile.3;
-          datum=zeile.4;
+          day=zeile.4;
           start=zeile.5;
           stop=zeile.6;
           title=zeile.7;
           priority=zeile.8;
-          conflict=zeile.10;
-          eventid=zeile.11;
-          autotimerid=zeile.12;
-          duration=zeile.13;
-          description=zeile.14;
-          running=zeile.15;
+          conflict=zeile.9;
+          eventid=zeile.10;
+          autotimerid=zeile.11;
+          duration=zeile.12;
+          description=zeile.13;
+          running=zeile.14;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
-          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
-	    	  day = date.format(zeile.9, "%A, %x", locale) %?>
+          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ) %?>
 		<?% IF old.defined && day != old %?>
   		<tr>
 		<?% IF total > 0 %?>
diff --git a/skins/deltab/tooltip.js b/skins/deltab/tooltip.js
index 7950b95..ea83b17 100644
--- a/skins/deltab/tooltip.js
+++ b/skins/deltab/tooltip.js
@@ -204,34 +204,41 @@ function ttp_make_tlist_visable(title, tlist, x, y){
         if(values && values.data && typeof(values.data) == 'object'){
           for (var i = 1; i < values.data.length; i++) {
             var x = values.data[i];
-              if ((x[1] & 1) == 0) { //Status
-                content += '<span class="deactive">';
-              }
-              //var d = new Date(x[9] * 1000);
-              content += x[4]; //Day
-              content += " - ";
-              content += x[5]; //Start
-              content += "-";
-              content += x[6]; //Stop
-              content += " - ";
-              if (x[2].length > 15) {//Channel
-                content += x[2].substring(0, 13);
-                content += '...';
-              } else {
-                content += x[2]; 
-              }
+            var len = 23;
+
+            if ((x[1] & 1) == 0) { //Status
+              content += '<span class="deactive">';
+            }
+            //var d = new Date(x[9] * 1000);
+            content += x[4]; //Day
+            content += " - ";
+            content += x[5]; //Start
+            content += "-";
+            content += x[6]; //Stop
+            content += " - ";
+            if (x[2].length > 15) {//Channel
+              content += x[2].substring(0, 13);
+              content += '...';
+            } else {
+              content += x[2]; 
+            }
+            if ((x[2].length + x[7].length) > 30) {
+              content += "<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+              len = 50;
+            } else {
               content += " - ";
-              if (x[7].length > 23) {
-                content += x[7].substring(0, 21);
-                content += '...';
-              } else {
-                content += x[7]; //File
-              }
-              if ((x[1] & 1) == 0) { //Status
-                content += "</span>";
-              }
-              content += "<br />";
             }
+            if (x[7].length > len) {
+              content += x[7].substring(0, len-2);
+              content += '...';
+            } else {
+              content += x[7]; //File
+            }
+            if ((x[1] & 1) == 0) { //Status
+              content += "</span>";
+            }
+            content += "<br />";
+          }
         } else {
             content = '...';
         }
diff --git a/skins/stone/program.tmpl b/skins/stone/program.tmpl
index 9ed0c9d..d69c7e2 100644
--- a/skins/stone/program.tmpl
+++ b/skins/stone/program.tmpl
@@ -1,5 +1,4 @@
 <!-- program -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% ######################################################################## %?>
@@ -116,13 +115,13 @@
 <h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?></h1>
 <?% ELSE %?>
 <?% fields = data.shift %?>
-<h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?> - <?% date.format(data.first.5, "%A, %x", locale) %?></h1>
+<h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?> - <?% data.first.5 %?></h1>
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;
             description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9;
             timerid=zeile.10;recording=zeile.11;running=zeile.12;
-            day = date.format(zeile.5, "%A, %x", locale) %?>
+            day = zeile.5 %?>
         <?% IF old.defined && day != old %?>
 <div class="areaclose"></div>
 <h2><?% day %?></h2>
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 45f58f8..cb4d614 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -1,5 +1,4 @@
 <!-- search -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% enableform = ( allow('tnew') ) && data.size > 1 %?>
@@ -9,14 +8,23 @@
                         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
                             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
                         </a>
-                        <?% IF timerid && allow('tedit') %?>
+                        <?% IF timerid %?>
+                          <?% IF allow('tedit') %?>
                         <a href="javascript:popup('tedit','<?% timerid %?>',620,670,1)">
                             <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
                         </a>
-                        <?% ELSIF allow('tnew') %?>
+                          <?% END %?>
+                          <?% IF allow('tdelete') %?>
+                        <a href="javascript:surecmd('<?% gettext("Would you like to delete this timer?") %?>','<?% escape(title) %?><?% IF subtitle != "";"~";escape(subtitle);END %?>','tdelete','<?% timerid %?>',620,670)">
+                            <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete timer") %?>" />
+                        </a>
+                          <?% END %?>
+                        <?% ELSE %?>
+                          <?% IF allow('tnew') %?>
                         <a href="javascript:popup('tnew','<?% id %?>',620,670,1)">
                             <img src="images/record.<?% global.imagetyp %?>" alt="" title="<?% gettext("To record") %?>" />
                         </a>
+                          <?% END %?>
                         <?% END %?>
 <?% END %?>
 <?% ######################################################################## %?>
@@ -94,14 +102,14 @@
 <h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?></h1>
 <?% ELSE %?>
 <?% fields = data.shift %?>
-<h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% date.format(data.first.7, "%A, %x", locale) %?></h1>
+<h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% data.first.7 %?></h1>
 <form name="searchlist" action="">
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
-            day = date.format(zeile.7, "%A, %x", locale) %?>
+            day = zeile.7 %?>
         <?% IF old.defined && day != old %?>
 <div class="areaclose"></div>
 <h2><?% day %?></h2>
@@ -122,7 +130,7 @@
         <form action="" name="searchform" >
             <input type='hidden' name='cmd' value='search' />
             <input type="text" id="epgtext" name="data" alt="<?% gettext("Search") %?>" 
-               onkeyup="suggest('esuggest&__channel=' + escape(this.form.__channel[this.form.__channel.options.selectedIndex].value),'epgtext','epgsuggest');"
+               onkeyup="suggest('esuggest&amp;__channel=' + escape(this.form.__channel[this.form.__channel.options.selectedIndex].value),'epgtext','epgsuggest');"
                value="<?% cgi.param('data') %?>"
                autocomplete="off" />
             <br /><div class="suggestbox" id="epgsuggest"></div>
@@ -147,7 +155,7 @@
             <?% gettext('Channel',30) %?><br />
             <select name='__channel'>
                 <option value="0"><?% gettext('All channels') %?></option>
-            <?% FOREACH chan = getModule('CHANNELS').ChannelArray('Name') %?>
+            <?% FOREACH chan = param.channels %?>
                 <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?>><?% chan.first %?></option>
             <?% END %?>
             </select>
@@ -175,8 +183,8 @@
     </tr>
     <tr>
     <td class="sidetext">
-        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&__fast=1',document.searchlist,620,670,'record')"><img src="images/record.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&__fast=1',document.searchlist,620,670,'record')"><?% gettext("Record selected events",20) %?></a><br />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&amp;__fast=1',document.searchlist,620,670,'record')"><img src="images/record.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&amp;__fast=1',document.searchlist,620,670,'record')"><?% gettext("Record selected events",20) %?></a><br />
     </td>
     </tr>
     <tr>
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index dbe918d..c36efe5 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -1,5 +1,4 @@
 <!-- tlist -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% ######################################################################## %?>
@@ -158,7 +157,7 @@
 <h1><?% gettext("Planned recordings") %?></h1>
 <?% ELSE %?>
 <?% fields = data.shift %?>
-<h1><?% gettext("Planned recordings") %?> - <?% date.format(data.first.9, "%A, %x", locale) %?></h1>
+<h1><?% gettext("Planned recordings") %?> - <?% data.first.4 %?></h1>
 <form name="tlist" action="">
 		<?% FOREACH zeile = data %?>
 			<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
@@ -166,20 +165,19 @@
           aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
           sender=zeile.2;
           channel=zeile.3;
-          datum=zeile.4;
+          day=zeile.4;
           start=zeile.5;
           stop=zeile.6;
           title=zeile.7;
           priority=zeile.8;
-          conflict=zeile.10;
-          eventid=zeile.11;
-          autotimerid=zeile.12;
-          duration=zeile.13;
-          description=zeile.14;
-          running=zeile.15;
+          conflict=zeile.9;
+          eventid=zeile.10;
+          autotimerid=zeile.11;
+          duration=zeile.12;
+          description=zeile.13;
+          running=zeile.14;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
-          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
-	    	  day = date.format(zeile.9, "%A, %x", locale) %?>
+          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ) %?>
 			<?% IF old.defined && day != old %?>
           <div class="areaclose"></div>
        		<?% PROCESS printsumme width=0 %?>
diff --git a/skins/stone/tooltip.js b/skins/stone/tooltip.js
index e8d7c97..02ed692 100644
--- a/skins/stone/tooltip.js
+++ b/skins/stone/tooltip.js
@@ -204,34 +204,41 @@ function ttp_make_tlist_visable(title, tlist, x, y){
         if(values && values.data && typeof(values.data) == 'object'){
           for (var i = 1; i < values.data.length; i++) {
             var x = values.data[i];
-              if ((x[1] & 1) == 0) { //Status
-                content += '<span class="deactive">';
-              }
-              //var d = new Date(x[9] * 1000);
-              content += x[4]; //Day
-              content += " - ";
-              content += x[5]; //Start
-              content += "-";
-              content += x[6]; //Stop
-              content += " - ";
-              if (x[2].length > 15) {//Channel
-                content += x[2].substring(0, 13);
-                content += '...';
-              } else {
-                content += x[2]; 
-              }
+            var len = 23;
+
+            if ((x[1] & 1) == 0) { //Status
+              content += '<span class="deactive">';
+            }
+            //var d = new Date(x[9] * 1000);
+            content += x[4]; //Day
+            content += " - ";
+            content += x[5]; //Start
+            content += "-";
+            content += x[6]; //Stop
+            content += " - ";
+            if (x[2].length > 15) {//Channel
+              content += x[2].substring(0, 13);
+              content += '...';
+            } else {
+              content += x[2]; 
+            }
+            if ((x[2].length + x[7].length) > 30) {
+              content += "<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+              len = 50;
+            } else {
               content += " - ";
-              if (x[7].length > 23) {
-                content += x[7].substring(0, 21);
-                content += '...';
-              } else {
-                content += x[7]; //File
-              }
-              if ((x[1] & 1) == 0) { //Status
-                content += "</span>";
-              }
-              content += "<br />";
             }
+            if (x[7].length > len) {
+              content += x[7].substring(0, len-2);
+              content += '...';
+            } else {
+              content += x[7]; //File
+            }
+            if ((x[1] & 1) == 0) { //Status
+              content += "</span>";
+            }
+            content += "<br />";
+          }
         } else {
             content = '...';
         }
diff --git a/skins/stone_flat/program.tmpl b/skins/stone_flat/program.tmpl
index c5e08ed..bb7506b 100644
--- a/skins/stone_flat/program.tmpl
+++ b/skins/stone_flat/program.tmpl
@@ -1,5 +1,4 @@
 <!-- program -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% ######################################################################## %?>
@@ -97,7 +96,7 @@
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;
             description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9;
             timerid=zeile.10;recording=zeile.11;running=zeile.12;
-            day = date.format(zeile.5, "%A, %x", locale) %?>
+            day = zeile.5 %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
             </table>
diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl
index 8174700..5d66e3c 100644
--- a/skins/stone_flat/search.tmpl
+++ b/skins/stone_flat/search.tmpl
@@ -1,5 +1,4 @@
 <!-- search -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% enableform = ( allow('tnew') ) && data.size > 1 %?>
@@ -82,7 +81,7 @@
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
             channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;
             pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
-            day = date.format(zeile.7, "%A, %x", locale) %?>
+            day = zeile.7 %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
             </table>
@@ -145,7 +144,7 @@
             <?% gettext('Channel',30) %?><br />
             <select name='__channel'>
                 <option value="0"><?% gettext('All channels') %?></option>
-            <?% FOREACH chan = getModule('CHANNELS').ChannelArray('Name') %?>
+            <?% FOREACH chan = param.channels %?>
                 <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?>><?% chan.first %?></option>
             <?% END %?>
             </select>
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index 584dec0..c85291b 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -1,5 +1,4 @@
 <!-- tlist -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% ######################################################################## %?>
@@ -148,20 +147,19 @@
           aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
           sender=zeile.2;
           channel=zeile.3;
-          datum=zeile.4;
+          day=zeile.4;
           start=zeile.5;
           stop=zeile.6;
           title=zeile.7;
           priority=zeile.8;
-          conflict=zeile.10;
-          eventid=zeile.11;
-          autotimerid=zeile.12;
-          duration=zeile.13;
-          description=zeile.14;
-          running=zeile.15;
+          conflict=zeile.9;
+          eventid=zeile.10;
+          autotimerid=zeile.11;
+          duration=zeile.12;
+          description=zeile.13;
+          running=zeile.14;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
-          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
-	    	  day = date.format(zeile.9, "%A, %x", locale) %?>
+          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ) %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
                         </table>
diff --git a/skins/xstyle/program.tmpl b/skins/xstyle/program.tmpl
index 3a739f4..31ed2fb 100644
--- a/skins/xstyle/program.tmpl
+++ b/skins/xstyle/program.tmpl
@@ -7,7 +7,6 @@
 </SCRIPT>
 
 <!-- TableTemplate -->
-<?% USE date %?>
 <?% FOREACH ch = param.channels %?>
     <?% IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1 %?>
         <?% channel = ch.0 %?>
@@ -40,7 +39,7 @@
         </tr>
         <?% FOREACH zeile = data %?>
             <?% c = 0 %?>
-            <?% day = date.format(zeile.5, "%A, %x", locale) %?>
+            <?% day = zeile.5 %?>
             <?% IF !oldday.defined || day != oldday %?>
                 <tr><td colspan="<?% zeile.size %?>" bgcolor='#DDDDDD'>
                 <b><?% day %?></b>
diff --git a/skins/xstyle/search.tmpl b/skins/xstyle/search.tmpl
index 6358ca6..70e0445 100644
--- a/skins/xstyle/search.tmpl
+++ b/skins/xstyle/search.tmpl
@@ -5,7 +5,6 @@
 
 -->
 </SCRIPT>
-<?% USE date %?>
 <?% enableform = ( allow('tnew') ) && data.size > 1 %?>
 <h1><?% gettext("Advanced Search") %?>&nbsp;
 <?% IF data.size %?>
@@ -56,7 +55,7 @@
     <td>
     <select name='__channel'>
         <option value="0"><?% gettext('All channels') %?>
-    <?% FOREACH chan = getModule('CHANNELS').ChannelArray('Name') %?>
+    <?% FOREACH chan = param.channels %?>
         <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?>><?% chan.first %?>
     <?% END %?>
     </select>
@@ -105,7 +104,7 @@
         </tr>
         <?% FOREACH zeile = data %?>
             <?% c = -1 %?>
-            <?% day = date.format(zeile.7, "%A, %x", locale) %?>
+            <?% day = zeile.7 %?>
             <?% IF !oldday.defined || day != oldday %?>
                 <tr><td colspan="<?% zeile.size %?>" bgcolor='#DDDDDD'>
                 <b><?% day %?></b>
diff --git a/skins/xstyle/tlist.tmpl b/skins/xstyle/tlist.tmpl
index d5e9fb8..ae015ea 100644
--- a/skins/xstyle/tlist.tmpl
+++ b/skins/xstyle/tlist.tmpl
@@ -1,5 +1,4 @@
 <!-- tlist -->
-<?% USE date %?>
 <?% enableform = allow('tdelete') || allow('ttoggle');
 	rest = param.capacity;
 %?>
@@ -7,7 +6,7 @@
 <?% IF data.size <= 1 %?>
 <h1><?% gettext("Planned recordings") %?></h1>
 <?% ELSE %?>
-<h1><?% gettext("Planned recordings") %?> - <?% date.format(data.1.9, "%A, %x", locale) %?></h1>
+<h1><?% gettext("Planned recordings") %?> - <?% data.1.4 %?></h1>
 <?% END %?>
 
 <div id="navcontainer">
@@ -35,36 +34,38 @@
 <table border="0" width="95%">
         <tr>
         <?% fields = data.shift %?>
+        <?% c = -1 %?>
         <?% FOREACH field = fields %?>
-            <?% NEXT IF field.match('^__') %?>
+            <?% c = c + 1 %?>
+            <?% NEXT IF field.match('^__') or c == 4 %?>
             <th><?% field %?></th>
         <?% END %?>
 <?% IF enableform %?>
-            <th><?% gettext("Selection") %?></th>
+            <th width="64"><?% gettext("Selection",7) %?></th>
 <?% END %?>
         </tr>
         <?% FOREACH zeile = data %?>
             <?% aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
                 pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
-                day = date.format(zeile.9, "%A, %x", locale);
-                IF aktiv; rest = rest - zeile.13; END;
+                day = zeile.4;
+                IF aktiv; rest = rest - zeile.12; END;
             %?>
             <?% IF oldDay != day %?>
-            <tr><td colspan='<?% zeile.size + 1 %?>' bgcolor='#DDDDDD'><b><?% day %?></b></td><tr>
+            <tr><td colspan='<?% zeile.size %?>' bgcolor='#DDDDDD'><b><?% day %?></b></td><tr>
             <?% END %?>
             <?% myclass = "normal" %?>
             <?% UNLESS aktiv %?>
                 <?% myclass = "deactive" %?>
-            <?% ELSIF zeile.10 %?>
+            <?% ELSIF zeile.9 %?>
                 <?% myclass = 'problem' %?>
-            <?% ELSIF zeile.15 %?>
+            <?% ELSIF zeile.14 %?>
                 <?% myclass = "active" %?>
             <?% END %?>
             <tr class="<?% myclass %?>" <?% IF (loop.count mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
                 <?% c = -1 %?>
                 <?% FOREACH field = zeile %?>
                     <?% c = c + 1 %?>
-                    <?% NEXT IF fields.$c.match('^__') %?>
+                    <?% NEXT IF fields.$c.match('^__') or c == 4 %?>
                     <?% IF c == 0; # Id Field %?>
                     <td>
                         <div id="icons">
@@ -87,15 +88,15 @@
     <?% IF allow('ttoggle') %?>
             			<a name='<?% zeile.0 %?>' href="javascript:tostatus('?cmd=ttoggle&amp;data=<?% zeile.0 %?>')" title="<?% gettext("Toggle timer") %?>&nbsp;<?% aktiv ? aus : an %?>"><img src="images/<?% aktiv ? "on.png" : "off.png" %?>"></a><br/>
 <!--
-                        <?% IF zeile.12 && allow('aedit') %?>
-            			<a href="?cmd=aedit&amp;data=<?% zeile.12 %?>" title="<?% gettext("Edit autotimer") %?>"><img src="images/at.png"></a><br>
+                        <?% IF zeile.11 && allow('aedit') %?>
+            			<a href="?cmd=aedit&amp;data=<?% zeile.11 %?>" title="<?% gettext("Edit autotimer") %?>"><img src="images/at.png"></a><br>
                         <?% END %?>
 -->
     <?% ELSE %?>
             			[<?% aktiv ? aus : an %?>]
     <?% END %?>
 <!--
-    <?% INCLUDE 'bloecke/stars.tmpl' eventid=zeile.11 umbruch='<br/>' %?>
+    <?% INCLUDE 'bloecke/stars.tmpl' eventid=zeile.10 umbruch='<br/>' %?>
     <?% IF pdc %?>
                             <img src='images/vps.png' /><br/>
     <?% END %?>
@@ -111,11 +112,11 @@
                     </td>
                     <?% ELSIF c == 7; # Title %?>
                     <td>
-                        <?% IF zeile.11 %?><?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field desc=zeile.14 eventid=zeile.11 linkid=zeile.11 ttp_offset=0 %?><?% END %?>
+                        <?% IF zeile.10 %?><?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field desc=zeile.13 eventid=zeile.10 linkid=zeile.10 ttp_offset=0 %?><?% END %?>
                         <?% FOREACH f = field.split('~') %?>
                             <div class="<?% myclass %?>"><?% f %?></div>
                         <?% END %?>
-                        <?% IF zeile.11 %?></a><?% END %?>
+                        <?% IF zeile.10 %?></a><?% END %?>
                     </td>
                     <?% ELSE %?>
                     <td><div class="<?% myclass %?>"><?% field %?></div></td>