From 5f9ba6df6db7856102e987648d1a8eaef1b25bb6 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 20 Jan 2008 12:31:09 +0000
Subject: * EPG/TIMERS/RECORDS : SQL-Query improve

---
 skins/deltab/display.tmpl             | 21 ++++++++++++---------
 skins/deltab/now.tmpl                 | 16 ++++++++++------
 skins/deltab/program.tmpl             | 16 +++++++++-------
 skins/deltab/schema.tmpl              | 11 +++++++----
 skins/deltab/search.tmpl              | 16 +++++++++-------
 skins/deltab/tlist.tmpl               |  3 ++-
 skins/stone/display.tmpl              | 19 +++++++++++--------
 skins/stone/now.tmpl                  | 16 ++++++++++------
 skins/stone/program.tmpl              | 16 +++++++++-------
 skins/stone/schema.tmpl               | 11 +++++++----
 skins/stone/search.tmpl               | 18 ++++++++++--------
 skins/stone/tlist.tmpl                |  3 ++-
 skins/stone/widgets/footer.tmpl       | 25 +++++++++++++++++++++++++
 skins/stone_flat/display.tmpl         | 19 +++++++++++--------
 skins/stone_flat/now.tmpl             | 16 ++++++++++------
 skins/stone_flat/program.tmpl         | 16 +++++++++-------
 skins/stone_flat/schema.tmpl          | 11 +++++++----
 skins/stone_flat/search.tmpl          | 18 ++++++++++--------
 skins/stone_flat/tlist.tmpl           |  3 ++-
 skins/xstyle/bloecke/event_links.tmpl | 22 +++++++++++-----------
 skins/xstyle/display.tmpl             |  6 +++---
 skins/xstyle/now.tmpl                 |  8 ++++----
 skins/xstyle/program.tmpl             |  4 ++--
 skins/xstyle/schema.tmpl              |  5 ++++-
 skins/xstyle/search.tmpl              |  4 ++--
 skins/xstyle/tlist.tmpl               |  2 +-
 26 files changed, 199 insertions(+), 126 deletions(-)

diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl
index de3addb..954769e 100644
--- a/skins/deltab/display.tmpl
+++ b/skins/deltab/display.tmpl
@@ -12,12 +12,15 @@
   stopp = data.last.4;
   channel = data.last.5;
   description = data.last.6;
-  bild = data.last.7;
-  d = data.last.8;
-  video = data.last.9;
-  audio = data.last.10;
-  pdc = data.last.11;
-  channelid = data.last.12;
+  video = data.last.7;
+  audio = data.last.8;
+  d = data.last.9;
+  timerid=data.last.10;
+  recording=data.last.11;
+  running=data.last.12;
+  bild = data.last.13;
+  pdc = data.last.14;
+  channelid = data.last.15;
 %?>
 <?% ######################################################################## %?>
 <div id="body">
@@ -96,12 +99,12 @@ END %?>
 
       <br />
 
-    <?% IF param.timers.${id} && allow('tedit') %?>
-    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+    <?% IF timerid && allow('tedit') %?>
+    <a href="?cmd=tedit&amp;data=<?% timerid %?>">
         <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
     </a>
     &nbsp;
-    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+    <a href="?cmd=tedit&amp;data=<?% timerid %?>">
         <?% gettext("Edit this timer",20) %?>
     </a>
     <br />
diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl
index d67afc7..351679e 100644
--- a/skins/deltab/now.tmpl
+++ b/skins/deltab/now.tmpl
@@ -15,10 +15,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -62,8 +62,8 @@
         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
         </a>
-        <?% IF param.timers.${id} && allow('tedit') %?>
-        <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+        <?% IF timerid && allow('tedit') %?>
+        <a href="?cmd=tedit&amp;data=<?% timerid %?>">
             <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
         </a>
         <?% ELSIF allow('tnew') %?>
@@ -107,7 +107,11 @@
 <?% FOREACH zeile = data %?>
     <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;pdc=zeile.10 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
+            description=zeile.8;duration=zeile.9;
+            timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            pdc=zeile.13; %?>
         <?% IF old.defined && group != old %?>
     </tr>
 </table>
diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl
index 1978892..b5da892 100644
--- a/skins/deltab/program.tmpl
+++ b/skins/deltab/program.tmpl
@@ -14,10 +14,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -45,8 +45,8 @@
         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
         </a>
-        <?% IF param.timers.${id} && allow('tedit') %?>
-        <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+        <?% IF timerid && allow('tedit') %?>
+        <a href="?cmd=tedit&amp;data=<?% timerid %?>">
             <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
         </a>
         <?% ELSIF allow('tnew') %?>
@@ -78,8 +78,10 @@
 
 	<?% 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 %?>
-        <?% day = date.format(zeile.5, "%A, %x", locale) %?>
+        <?% 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) %?>
 		<?% IF old.defined && day != old %?>
   		<tr>
             <td colspan="12" align="left">
diff --git a/skins/deltab/schema.tmpl b/skins/deltab/schema.tmpl
index 2d80abf..280a803 100644
--- a/skins/deltab/schema.tmpl
+++ b/skins/deltab/schema.tmpl
@@ -114,6 +114,9 @@
                                 video = event.11;
                                 audio = event.12;
                                 image = event.13;
+                                timerid     = event.14;
+                                recording   = event.15;
+                                running     = event.16;
                                 IF second_start > oldend;
                                     laenge = second_start - oldend;
                                     percent = (laenge / Duration) * width;
@@ -141,7 +144,7 @@
                             <img style="float:left" alt="" src="images/blank.gif" width="<?% percent div 1 %?>" height="1" align="left" />
                         <!-- </a> -->
                         <?% ELSE %?>
-                        <?% PROCESS SetState t=param.timers r=param.runningTimer %?>
+                        <?% PROCESS SetState %?>
                         <table summary="" class="schema" style="width:<?% percent div 1 %?>px">
                             <tr>
                                 <td>
@@ -163,10 +166,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl
index 4ca1814..889fc09 100644
--- a/skins/deltab/search.tmpl
+++ b/skins/deltab/search.tmpl
@@ -14,10 +14,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -50,8 +50,8 @@
         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
         </a>
-        <?% IF param.timers.${id} && allow('tedit') %?>
-        <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+        <?% IF timerid && allow('tedit') %?>
+        <a href="?cmd=tedit&amp;data=<?% timerid %?>">
             <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
         </a>
         <?% ELSIF allow('tnew') %?>
@@ -76,8 +76,10 @@
     </tr>
 	<?% 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 %?>
-        <?% day = date.format(zeile.7, "%A, %x", locale) %?>
+        <?% 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) %?>
 		<?% IF old.defined && day != old %?>
    		  <tr>
             <td colspan="12" align="left">
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index 7f724f1..a2583b7 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -52,7 +52,7 @@
         <?% state = "deactive" %?>
     <?% ELSIF conflict %?>
         <?% state = "problem" %?>
-    <?% ELSIF param.runningTimer.exists(id) %?>
+    <?% ELSIF running %?>
         <?% state = "active" %?>
     <?% END %?>
 <?% END %?>
@@ -157,6 +157,7 @@
           autotimerid=zeile.12;
           duration=zeile.13;
           description=zeile.14;
+          running=zeile.15;
           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) %?>
diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl
index d101948..594ab2c 100644
--- a/skins/stone/display.tmpl
+++ b/skins/stone/display.tmpl
@@ -16,12 +16,15 @@
   stopp = data.last.4;
   channel = data.last.5;
   description = data.last.6;
-  bild = data.last.7;
-  d = data.last.8;
-  video = data.last.9;
-  audio = data.last.10;
-  pdc = data.last.11;
-  channelid = data.last.12;
+  video = data.last.7;
+  audio = data.last.8;
+  d = data.last.9;
+  timerid=data.last.10;
+  recording=data.last.11;
+  running=data.last.12;
+  bild = data.last.13;
+  pdc = data.last.14;
+  channelid = data.last.15;
 %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur %?>
@@ -58,8 +61,8 @@ END %?>
     <a target="_blank" href="?cmd=search&amp;data=<?% url( title ) %?>">
         <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
     </a>
-    <?% IF param.timers.${id} && allow('tedit') %?>
-    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+    <?% IF timerid && allow('tedit') %?>
+    <a href="?cmd=tedit&amp;data=<?% timerid %?>">
         <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
     </a>
     <?% ELSIF allow('tnew') %?>
diff --git a/skins/stone/now.tmpl b/skins/stone/now.tmpl
index 3456bcc..6ab3650 100644
--- a/skins/stone/now.tmpl
+++ b/skins/stone/now.tmpl
@@ -19,8 +19,8 @@
                         <a href="?cmd=search&amp;data=<?% ( title ) %?>">
                             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
                         </a>
-                        <?% IF param.timers.${id} && allow('tedit') %?>
-                        <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
+                        <?% IF timerid && 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') %?>
@@ -32,10 +32,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -134,7 +134,11 @@
 <?% fields = data.shift %?>
     <?% 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;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;pdc=zeile.10 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
+            description=zeile.8;duration=zeile.9;
+            timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            pdc=zeile.13; %?>
         <?% IF old.defined && group != old %?>
 <div class="areaclose"></div>
 <h2><?% group %?></h2>
diff --git a/skins/stone/program.tmpl b/skins/stone/program.tmpl
index 8d88ff3..9ed0c9d 100644
--- a/skins/stone/program.tmpl
+++ b/skins/stone/program.tmpl
@@ -17,8 +17,8 @@
                         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
                             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
                         </a>
-                        <?% IF param.timers.${id} && allow('tedit') %?>
-                        <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
+                        <?% IF timerid && 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') %?>
@@ -30,10 +30,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -119,8 +119,10 @@
 <h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?> - <?% date.format(data.first.5, "%A, %x", locale) %?></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 %?>
-        <?% day = date.format(zeile.5, "%A, %x", locale) %?>
+        <?% 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) %?>
         <?% IF old.defined && day != old %?>
 <div class="areaclose"></div>
 <h2><?% day %?></h2>
diff --git a/skins/stone/schema.tmpl b/skins/stone/schema.tmpl
index 76ab1af..a7fe955 100644
--- a/skins/stone/schema.tmpl
+++ b/skins/stone/schema.tmpl
@@ -131,6 +131,9 @@
                                 video = event.11;
                                 audio = event.12;
                                 image = event.13;
+                                timerid     = event.14;
+                                recording   = event.15;
+                                running     = event.16;
                                 IF second_start > oldend;
                                     laenge = second_start - oldend;
                                     percent = (laenge / Duration) * width;
@@ -158,7 +161,7 @@
                             <img style="float:left" alt="" src="images/blank.gif" width="<?% percent div 1 %?>" height="1" align="left" />
                         <!-- </a> -->
                         <?% ELSE %?>
-                        <?% PROCESS SetState t=param.timers r=param.runningTimer %?>
+                        <?% PROCESS SetState %?>
                         <table summary="" class="schema" style="width:<?% percent div 1 %?>px">
                             <tr>
                                 <td>
@@ -184,10 +187,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 013b221..45f58f8 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -9,8 +9,8 @@
                         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
                             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
                         </a>
-                        <?% IF param.timers.${id} && allow('tedit') %?>
-                        <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
+                        <?% IF timerid && 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') %?>
@@ -22,10 +22,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -66,7 +66,7 @@
               <table class="fieldinline" summary="">
                 <tr>
                     <td valign="middle" align="left" style="white-space: nowrap">
-                        <?% IF enableform && !param.timers.exists(id); activeform = 1 %?>
+                        <?% IF enableform && !timerid; activeform = 1 %?>
                   			<input class="push" type="checkbox" value="<?% id %?>" name="<?% title %?><?% IF subtitle != "";"~";subtitle;END %?>" />
     	 		              <?% END %?>
                     </td>
@@ -98,8 +98,10 @@
 <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 %?>
-        <?% day = date.format(zeile.7, "%A, %x", locale) %?>
+        <?% 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) %?>
         <?% IF old.defined && day != old %?>
 <div class="areaclose"></div>
 <h2><?% day %?></h2>
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index 7d00c02..dbe918d 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -69,7 +69,7 @@
         <?% state = "deactive" %?>
     <?% ELSIF conflict %?>
         <?% state = "problem" %?>
-    <?% ELSIF param.runningTimer.exists(id) %?>
+    <?% ELSIF running %?>
         <?% state = "running" %?>
     <?% END %?>
 <?% END %?>
@@ -176,6 +176,7 @@
           autotimerid=zeile.12;
           duration=zeile.13;
           description=zeile.14;
+          running=zeile.15;
           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) %?>
diff --git a/skins/stone/widgets/footer.tmpl b/skins/stone/widgets/footer.tmpl
index c9a3b3f..e0e3334 100644
--- a/skins/stone/widgets/footer.tmpl
+++ b/skins/stone/widgets/footer.tmpl
@@ -3,6 +3,31 @@
 <?% END %?>
 <!-- ###### Ende ###### -->
 <?% IF debug %?>
+<?% benchdata = bench() %?>
+<?% IF benchdata.keys %?>
+<table class="editortable" summary="">
+    <tr><td class="editorhead"><div class="editorhead">Benchmark</div></td></tr>
+    <tr>  
+        <td class="editortext" align="left">
+            <table summary="" width="100%">
+                <?% FOREACH n = benchdata.keys.sort %?>
+                    <?% NEXT IF benchdata.$n > 1000 %?>
+                    <?% ges = benchdata.$n + ges %?>
+                <tr>
+                    <td><?% n %?></td>
+                    <td><?% benchdata.$n %?></td>
+                </tr>
+                <?% END %?>
+                <tr>
+                    <td>Summary:</td>
+                    <td><?% ges %?></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr><td class="editorbottom"></td></tr>
+</table>
+<?% END %?>
 <!-- 
 <?% PERL %?>
 use Data::Dumper;
diff --git a/skins/stone_flat/display.tmpl b/skins/stone_flat/display.tmpl
index deb3a61..305f3cf 100644
--- a/skins/stone_flat/display.tmpl
+++ b/skins/stone_flat/display.tmpl
@@ -16,12 +16,15 @@
   stopp = data.last.4;
   channel = data.last.5;
   description = data.last.6;
-  bild = data.last.7;
-  d = data.last.8;
-  video = data.last.9;
-  audio = data.last.10;
-  pdc = data.last.11;
-  channelid = data.last.12;
+  video = data.last.7;
+  audio = data.last.8;
+  d = data.last.9;
+  timerid=data.last.10;
+  recording=data.last.11;
+  running=data.last.12;
+  bild = data.last.13;
+  pdc = data.last.14;
+  channelid = data.last.15;
 %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur %?>
@@ -58,8 +61,8 @@ END %?>
     <a target="_blank" href="?cmd=search&amp;data=<?% url( title ) %?>">
         <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
     </a>
-    <?% IF param.timers.${id} && allow('tedit') %?>
-    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+    <?% IF timerid && allow('tedit') %?>
+    <a href="?cmd=tedit&amp;data=<?% timerid %?>">
         <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
     </a>
     <?% ELSIF allow('tnew') %?>
diff --git a/skins/stone_flat/now.tmpl b/skins/stone_flat/now.tmpl
index ec75e8c..d5a3c6d 100644
--- a/skins/stone_flat/now.tmpl
+++ b/skins/stone_flat/now.tmpl
@@ -17,8 +17,8 @@
                         <a href="?cmd=search&amp;data=<?% ( title ) %?>">
                             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
                         </a>
-                        <?% IF param.timers.${id} && allow('tedit') %?>
-                        <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
+                        <?% IF timerid && 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') %?>
@@ -30,10 +30,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -129,7 +129,11 @@
                         <tr><th width="150"></th><th></th><th width="140"></th><th width="110"></th><th width="40"></th></tr>
     <?% 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;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;pdc=zeile.10 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
+            description=zeile.8;duration=zeile.9;
+            timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            pdc=zeile.13; %?>
         <?% IF old.defined && group != old %?>
                         </table>
                         </td>
diff --git a/skins/stone_flat/program.tmpl b/skins/stone_flat/program.tmpl
index f712998..c5e08ed 100644
--- a/skins/stone_flat/program.tmpl
+++ b/skins/stone_flat/program.tmpl
@@ -17,8 +17,8 @@
                         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
                             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
                         </a>
-                        <?% IF param.timers.${id} && allow('tedit') %?>
-                        <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
+                        <?% IF timerid && 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') %?>
@@ -30,10 +30,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -94,8 +94,10 @@
     <?% z = 0 %?>
     <?% 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 %?>
-        <?% day = date.format(zeile.5, "%A, %x", locale) %?>
+        <?% 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) %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
             </table>
diff --git a/skins/stone_flat/schema.tmpl b/skins/stone_flat/schema.tmpl
index 73714e6..b80cfc1 100644
--- a/skins/stone_flat/schema.tmpl
+++ b/skins/stone_flat/schema.tmpl
@@ -131,6 +131,9 @@
                                 video = event.11;
                                 audio = event.12;
                                 image = event.13;
+                                timerid     = event.14;
+                                recording   = event.15;
+                                running     = event.16;
                                 IF second_start > oldend;
                                     laenge = second_start - oldend;
                                     percent = (laenge / Duration) * width;
@@ -158,7 +161,7 @@
                             <img style="float:left" alt="" src="images/blank.gif" width="<?% percent div 1 %?>" height="1" align="left" />
                         <!-- </a> -->
                         <?% ELSE %?>
-                        <?% PROCESS SetState t=param.timers r=param.runningTimer %?>
+                        <?% PROCESS SetState %?>
                         <table summary="" class="schema" style="width:<?% percent div 1 %?>px">
                             <tr>
                                 <td>
@@ -184,10 +187,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl
index 53adfeb..8174700 100644
--- a/skins/stone_flat/search.tmpl
+++ b/skins/stone_flat/search.tmpl
@@ -9,8 +9,8 @@
                         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
                             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
                         </a>
-                        <?% IF param.timers.${id} && allow('tedit') %?>
-                        <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
+                        <?% IF timerid && 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') %?>
@@ -22,10 +22,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -48,7 +48,7 @@
 				  </a>
             </td>
             <td valign="middle" align="left" style="white-space: nowrap">
-                <?% IF enableform && !param.timers.exists(id); activeform = 1 %?>
+                <?% IF enableform && !timerid; activeform = 1 %?>
           			<input class="push" type="checkbox" value="<?% id %?>" name="<?% title %?><?% IF subtitle != "";"~";subtitle;END %?>" />
 	              <?% END %?>
             </td>
@@ -79,8 +79,10 @@
 <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 %?>
-        <?% day = date.format(zeile.7, "%A, %x", locale) %?>
+        <?% 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) %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
             </table>
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index 4f591c5..584dec0 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -69,7 +69,7 @@
         <?% state = "deactive" %?>
     <?% ELSIF conflict %?>
         <?% state = "problem" %?>
-    <?% ELSIF param.runningTimer.exists(id) %?>
+    <?% ELSIF running %?>
         <?% state = "running" %?>
     <?% END %?>
 <?% END %?>
@@ -158,6 +158,7 @@
           autotimerid=zeile.12;
           duration=zeile.13;
           description=zeile.14;
+          running=zeile.15;
           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) %?>
diff --git a/skins/xstyle/bloecke/event_links.tmpl b/skins/xstyle/bloecke/event_links.tmpl
index 26fe5a4..a3489ab 100644
--- a/skins/xstyle/bloecke/event_links.tmpl
+++ b/skins/xstyle/bloecke/event_links.tmpl
@@ -2,27 +2,27 @@
     <?% IF with_display_button %?>
 <a href="?cmd=display&data=<?% epgId %?>" title='<?% gettext("Detailed program information") %?>'><img src="images/view_event.png"></a><?% umbruch %?>
     <?% END %?>
-<a href="?cmd=search&amp;data=<?% url( data.1 ) %?>"><img src="images/repeat.png" title="[<?% gettext("Rep") %?>]"></a><?% umbruch %?>
-    <?% IF param.timers.${data.0}.id && allow('tedit') %?>
-<a href="?cmd=tedit&amp;data=<?% param.timers.${data.0}.id %?>"><img src="images/record_blue.png" title="[<?% gettext("Edit this timer") %?>]" /></a><?% umbruch %?>
+<a href="?cmd=search&amp;data=<?% url( data.1 ) %?>"><img src="images/repeat.png" title="<?% gettext("Search for repeats") %?>"></a><?% umbruch %?>
+    <?% IF data.10 && allow('tedit') %?>
+<a href="?cmd=tedit&amp;data=<?% data.10 %?>"><img src="images/record_blue.png" title="<?% gettext("Edit this timer") %?>" /></a><?% umbruch %?>
     <?% ELSIF allow('tnew') %?>
-<a href="?cmd=tnew&amp;data=<?% data.0 %?>"><img src="images/record.png" title="[<?% gettext("To record") %?>]" name='recordlink' id='<?% data.0 %?>' /></a><?% umbruch %?>
+<a href="?cmd=tnew&amp;data=<?% data.0 %?>"><img src="images/record.png" title="<?% gettext("To record") %?>" name='recordlink' id='<?% data.0 %?>' /></a><?% umbruch %?>
     <?% END %?>
 <?% IF allow('switch') && switch %?>
-    <a href="?cmd=switch&amp;data=<?% url(data.4) %?>"><img src="images/switch.png" title="[<?% gettext("Swt") %?>]" /></a><?% umbruch %?>
+    <a href="?cmd=switch&amp;data=<?% url(data.4) %?>"><img src="images/switch.png" title="<?% gettext("Switch to channel") %?>&nbsp;<?% data.4 %?>" /></a><?% umbruch %?>
 <?% END %?>
 <?% INCLUDE 'bloecke/stars.tmpl' eventid=data.0 %?>
-<?% IF data.-2;
-    vid = data.-2.split(' ');
+<?% IF data.7;
+    vid = data.7.split(' ');
     video = (vid.3 == '16:9' ? '16_9Screen.png' : '4_3Screen.png');
     videotext = (vid.3 == '16:9' ? '16:9' : '4:3') %?>
-    <img src="images/<?% video %?>" title="[<?% gettext("Videoformat: ") %?><?% videotext %?>]" /><?% umbruch %?>
+    <img src="images/<?% video %?>" title="<?% gettext("Video format") %?> : <?% videotext %?>" /><?% umbruch %?>
 <?% END %?>
-<?% IF data.-1;
-    aud = data.-1.split("\n");
+<?% IF data.8;
+    aud = data.8.split("\n");
     audio = (aud.size > 2 ? 'Dolby' : 'Stereo') %?>
     <?% IF audio == 'Dolby' %?>
-    <img src="images/dolby.png" title="[<?% gettext("Audioformat: ") %?><?% audio %?>]" /><?% umbruch %?>
+    <img src="images/dolby.png" title="<?% gettext("Audio format") %?> : <?% audio %?>" /><?% umbruch %?>
     <?% END %?>
 <?% END %?>
 </div>
diff --git a/skins/xstyle/display.tmpl b/skins/xstyle/display.tmpl
index fe915a8..2e16e37 100644
--- a/skins/xstyle/display.tmpl
+++ b/skins/xstyle/display.tmpl
@@ -27,8 +27,8 @@
 <table border="0" width="95%">
 <?% fields = data.shift %?>
     <?% c = -1 %?>
-    <?% IF data.first.7 %?>
-       <?% Image = data.first.7 %?>
+    <?% IF data.first.13 %?>
+       <?% Image = data.first.13 %?>
     <?% END %?>
     <?% FOREACH field = fields %?>
         <?% c = c + 1 %?>
@@ -71,7 +71,7 @@
             <td>
 			          <?% date.format(data.first.$c,"%A, %x",locale) %?>&nbsp;
                 <?% date.format(data.first.$c,"%H:%M",locale) %?>
-                <?% IF data.first.11 && data.first.11 != data.first.$c %?>&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(data.first.11,"%H:%M",locale) %?>) <?% END %?>
+                <?% IF data.first.14 && data.first.14 != data.first.$c %?>&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(data.first.14,"%H:%M",locale) %?>) <?% END %?>
             </td>
         <?% ELSIF field == gettext('Stop') %?>
             <td>
diff --git a/skins/xstyle/now.tmpl b/skins/xstyle/now.tmpl
index 2d0530b..460bc38 100644
--- a/skins/xstyle/now.tmpl
+++ b/skins/xstyle/now.tmpl
@@ -64,18 +64,18 @@
                 <?% INCLUDE 'bloecke/event_links.tmpl' data=zeile switch=1 %?>
                 </td>
                 <td>
-                    <?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?>
+                    <?% IF zeile.11 %?><b><?% END %?>
                     <?% INCLUDE bloecke/tooltip.tmpl cmd="display" eventid=id linkid=id ttp_offset=0 %?><?% title %?></a>
                     <?% IF subtitle != "" %?>
                     <br><small><?% subtitle %?></small>
                     <?% END %?>
                 </td>
                 <td>
-                    <?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?>
+                    <?% IF zeile.11 %?><b><?% END %?>
                     <a href="?cmd=program&amp;data=<?% channel %?>"><?% sender %?></a>
                 </td>
-                <td><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% start %?><?% IF param.timers.${id} && param.timers.${id}.activ %?></b><?% END %?></td>
-                <td><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% stop %?><?% IF param.timers.${id} && param.timers.${id}.activ %?></b><?% END %?></td>
+                <td><?% IF zeile.11 %?><b><?% END %?><?% start %?><?% IF zeile.11 %?></b><?% END %?></td>
+                <td><?% IF zeile.11 %?><b><?% END %?><?% stop %?><?% IF zeile.11 %?></b><?% END %?></td>
                 <?% UNLESS duration > 100 OR duration <= 0 %?>
                 <td width="100" valign='bottom'><nobr>
                     <?% per = (100 - duration) + 0.999 div 1; per = (per > 100 ? 100 : per)  %?>
diff --git a/skins/xstyle/program.tmpl b/skins/xstyle/program.tmpl
index 048d252..3a739f4 100644
--- a/skins/xstyle/program.tmpl
+++ b/skins/xstyle/program.tmpl
@@ -56,7 +56,7 @@
                 <?% ELSIF c == 2; # Text Field %?>
                 <td>
                     <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field subtitle=zeile.2 desc=zeile.6 eventid=zeile.0 linkid=zeile.0 ttp_offset=0 %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
+                    <?% IF zeile.11 %?>
                     <b><?% field %?></b>
                     <?% ELSE %?>
                     <?% field %?>
@@ -73,7 +73,7 @@
                 <?% ELSIF c == 6; # Day Field %?>
                 <?% ELSIF c >= 7; # Desc Field %?>
                 <?% ELSE %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
+                    <?% IF zeile.11 %?>
                             <td><b><?% field %?></b></td>
                     <?% ELSE %?>
                             <td><?% field %?></td>
diff --git a/skins/xstyle/schema.tmpl b/skins/xstyle/schema.tmpl
index 04a5bbe..806ebce 100644
--- a/skins/xstyle/schema.tmpl
+++ b/skins/xstyle/schema.tmpl
@@ -177,6 +177,9 @@ sec_height = 0.1;
     video       = e.11;
     audio       = e.12;
     image       = e.13;
+    timerid     = e.14;
+    recording   = e.15;
+    running     = e.16;
 
     # Schon früher angefangende Sendung ...
     IF second_start < param.zeitvon;
@@ -209,7 +212,7 @@ sec_height = 0.1;
     END;
  %?>
 
-<div id='eventbox' style="<?% IF param.timers.$epgId.id && param.timers.$epgId.activ %?>border-color:#F00;<?% END %?><?% IF param.runningTimer.$epgId.Id %?>border-color:#0F0;<?% END %?>height: <?% (durat * sec_height) | format('%d') %?>px;<?%- IF date.now < second_start || date.now > second_stop -%?>color : #777;<?%- END -%?>
+<div id='eventbox' style="<?% IF timerid && recording %?>border-color:#F00;<?% END %?><?% IF running %?>border-color:#0F0;<?% END %?>height: <?% (durat * sec_height) | format('%d') %?>px;<?%- IF date.now < second_start || date.now > second_stop -%?>color : #777;<?%- END -%?>
 <?%- IF second_start == param.zeitvon -%?>
 top: 0px;border-top-style:dashed;border-top-color:green;border-top-width:2px;
 <?%- ELSE -%?>
diff --git a/skins/xstyle/search.tmpl b/skins/xstyle/search.tmpl
index b995310..6358ca6 100644
--- a/skins/xstyle/search.tmpl
+++ b/skins/xstyle/search.tmpl
@@ -118,7 +118,7 @@
                 <?% IF c == 0; # Id Field %?>
                 <?% IF enableform %?>
                 <td>
-                <?% IF !param.timers.exists(zeile.0); %?>
+                <?% IF !zeile.10 %?>
             			<input type="checkbox" value="<?% zeile.0 %?>" name="<?% zeile.1 %?><?% IF zeile.2 != "";"~";zeile.2;END %?>" />
 	              <?% END %?>
                 </td>
@@ -129,7 +129,7 @@
                 <?% ELSIF c == 1; # Text Field %?>
                 <td>
                     <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field subtitle=zeile.2 desc=zeile.8 eventid=zeile.0 linkid=zeile.0 ttp_offset=0 %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
+                    <?% IF zeile.11 %?>
                     <b><?% field %?></b>
                     <?% ELSE %?>
                     <?% field %?>
diff --git a/skins/xstyle/tlist.tmpl b/skins/xstyle/tlist.tmpl
index e290b48..d5e9fb8 100644
--- a/skins/xstyle/tlist.tmpl
+++ b/skins/xstyle/tlist.tmpl
@@ -57,7 +57,7 @@
                 <?% myclass = "deactive" %?>
             <?% ELSIF zeile.10 %?>
                 <?% myclass = 'problem' %?>
-            <?% ELSIF param.runningTimer.exists(zeile.0) %?>
+            <?% ELSIF zeile.15 %?>
                 <?% myclass = "active" %?>
             <?% END %?>
             <tr class="<?% myclass %?>" <?% IF (loop.count mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
-- 
cgit v1.2.3