* EPG/TIMERS/RECORDS : SQL-Query improve

7 files changed, 39 insertions, 35 deletions

diff --git a/html/bloecke/event_links.tmpl b/html/bloecke/event_links.tmpl
index ce37939..14c9d60 100644
--- a/html/bloecke/event_links.tmpl
+++ b/html/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/html/display.tmpl b/html/display.tmpl
index 4933ccd..7df96dc 100644
--- a/html/display.tmpl
+++ b/html/display.tmpl
@@ -12,8 +12,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 %?>
@@ -27,8 +27,8 @@
         <?% ELSIF field == gettext('Service') %?>
             <td>
             <a href="?cmd=search&amp;data=<?% url( data.first.1 ) %?>">[<?% gettext("Search for repeats") %?>]</a>
-            <?% IF param.timers.${data.first.$c} && allow('tedit') %?>
-                <a href="?cmd=tedit&amp;data=<?% param.timers.${data.first.$c}.id %?>"><span name='recordlink' class='normal'><b>[<?% gettext("Edit this timer") %?>]</b></span></a>
+            <?% IF data.first.10 && allow('tedit') %?>
+                <a href="?cmd=tedit&amp;data=<?% data.first.10 %?>"><span name='recordlink' class='normal'><b>[<?% gettext("Edit this timer") %?>]</b></span></a>
             <?% ELSIF allow('tnew')%?>
                 <a href="?cmd=tnew&amp;data=<?% data.first.$c %?>"><span name='recordlink' id='<?% data.first.$c %?>' class='normal'>[<?% gettext("To record") %?>]</span></a>
             <?% END %?>
@@ -70,7 +70,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/html/now.tmpl b/html/now.tmpl
index 81b8db1..cfd414b 100644
--- a/html/now.tmpl
+++ b/html/now.tmpl
@@ -60,10 +60,10 @@
             <?% END %?>
         <tr class="<?% myclass %?>" <?% IF (loop.count mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
                 <td><nobr>
-                <?% IF param.timers.${id} && param.timers.${id}.activ  %?><b><?% END %?>
+                <?% IF zeile.11  %?><b><?% END %?>
                     <a href="?cmd=search&amp;data=<?% url( title ) %?>">[<?% gettext("Rep") %?>]</a>
-                <?% IF param.timers.${id} && allow('tedit') %?>
-                    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">[<?% gettext("Edit") %?>]</a><br>
+                <?% IF zeile.10 && allow('tedit') %?>
+                    <a href="?cmd=tedit&amp;data=<?% zeile.10 %?>">[<?% gettext("Edit") %?>]</a><br>
                 <?% ELSIF allow('tnew') %?>
                     <a href="?cmd=tnew&amp;data=<?% id %?>"><span name='recordlink' id='<?% id %?>' class='normal'>[<?% gettext("Rec") %?>]</span></a><br>
                 <?% END %?>
@@ -72,18 +72,18 @@
                 <?% END %?>
                 </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)  %?>
@@ -91,8 +91,8 @@
                     <?% text = per div 1 | format("<br><font size='1'>${per}%%</font>") %?>
                     <table width="100%" cellspacing='0' cellpadding='0'>
                         <tr>
-                        <td bgcolor="#dedede"><img src='images/blank.png' width="<?% per %?>" height='1' hspace=0 vspace=0><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% (per > 19 ? text : "&nbsp;") %?></td>
-                        <td bgcolor="#ffffff"><img src='images/blank.png' width="<?% per2 %?>" height='1' hspace=0 vspace=0><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% (per < 20 ? text : "") %?></td>
+                        <td bgcolor="#dedede"><img src='images/blank.png' width="<?% per %?>" height='1' hspace=0 vspace=0><?% IF zeile.11 %?><b><?% END %?><?% (per > 19 ? text : "&nbsp;") %?></td>
+                        <td bgcolor="#ffffff"><img src='images/blank.png' width="<?% per2 %?>" height='1' hspace=0 vspace=0><?% IF zeile.11 %?><b><?% END %?><?% (per < 20 ? text : "") %?></td>
                         <tr>
                     </table>
                 </td>
diff --git a/html/program.tmpl b/html/program.tmpl
index 781f275..216c96e 100644
--- a/html/program.tmpl
+++ b/html/program.tmpl
@@ -64,8 +64,8 @@
                 <?% IF c == 1; # Id Field %?>
                 <td>
                     <a href="?cmd=search&amp;data=<?% url( zeile.1 ) %?>">[<?% gettext("Rep") %?>]</a>
-    <?% IF param.timers.${zeile.0} && allow('tedit') %?>
-                    <a href="?cmd=tedit&amp;data=<?% param.timers.${zeile.0}.id %?>"><b><span name='recordlink' id='<?% zeile.0 %?>' class='normal'>[<?% gettext("Edit this timer") %?>]</span></b></a>
+    <?% IF zeile.10 && allow('tedit') %?>
+                    <a href="?cmd=tedit&amp;data=<?% zeile.10 %?>"><b><span name='recordlink' id='<?% zeile.0 %?>' class='normal'>[<?% gettext("Edit this timer") %?>]</span></b></a>
     <?% ELSIF allow('tnew') %?>
                     <a href="?cmd=tnew&amp;data=<?% zeile.0 %?>"><span name='recordlink' id='<?% zeile.0 %?>' class='normal'>[<?% gettext("To record") %?>]</span></a>
     <?% END %?>
@@ -75,7 +75,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 %?>
@@ -92,7 +92,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/html/schema.tmpl b/html/schema.tmpl
index b933184..5f38ba0 100644
--- a/html/schema.tmpl
+++ b/html/schema.tmpl
@@ -117,6 +117,10 @@ Duration = param.zeitbis - param.zeitvon;
                 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;
@@ -145,7 +149,7 @@ Duration = param.zeitbis - param.zeitvon;
 <?% IF trun <= 3 %?>
         <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=epgTitle subtitle=epgSubTitle eventid=epgId linkid=epgId ttp_offset=-200 %?><img alt="" src='images/blank.png' width='<?% percent div 1 %?>' height=8 border=0 hspace=0 vspace=0 align='left' /></a>
 <?% ELSE %?>
-        <table class='<?% PROCESS getStatus e=event t=param.timers r=param.runningTimer %?>' align="left" width="<?% percent div 1 %?>" cellpadding="0" cellspacing="0"><tr><td>
+        <table class='<?% PROCESS getStatus e=event %?>' align="left" width="<?% percent div 1 %?>" cellpadding="0" cellspacing="0"><tr><td>
         <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=epgTitle subtitle=epgSubTitle eventid=epgId linkid=epgId ttp_offset=-200 %?>
         <?% chop(epgTitle,trun) %?></a></td></tr></table>
 <?% END %?>
@@ -166,10 +170,10 @@ Duration = param.zeitbis - param.zeitvon;
 <?%- BLOCK getStatus -%?>
 <?%-
     class = 'schema_normal';
-    IF t.exists(e.0) && t.${e.0}.activ;
+    IF event.14 && event.15;
         class = 'schema_record_plan';
     END;
-    IF t.exists(e.0) && r.exists(t.${e.0}.id);
+    IF event.14 && event.16;
         class = 'schema_record_now';
     END;
 class;
diff --git a/html/search.tmpl b/html/search.tmpl
index a64c3bc..a1d4cba 100644
--- a/html/search.tmpl
+++ b/html/search.tmpl
@@ -111,7 +111,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>
@@ -122,7 +122,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/html/tlist.tmpl b/html/tlist.tmpl
index 16ca69b..3629f2e 100644
--- a/html/tlist.tmpl
+++ b/html/tlist.tmpl
@@ -64,7 +64,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 %?>>