* SHARE: rewrite - holding data now into database

6 files changed, 92 insertions, 69 deletions

diff --git a/skins/deltab/topten.tmpl b/skins/deltab/topten.tmpl
index 517e315..7dbaf24 100644
--- a/skins/deltab/topten.tmpl
+++ b/skins/deltab/topten.tmpl
@@ -1,28 +1,28 @@
 <!-- topten -->
-<?% USE date %?>
 <div id="body">
 <?% ######################################################################## %?>
 <?% BLOCK RowButtons %?>
-                        <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 %?>">
-                            <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
-                        </a>
-                        <?% ELSIF allow('tnew') %?>
-                        <a href="?cmd=tnew&amp;data=<?% id %?>">
-                            <img src="images/record.<?% global.imagetyp %?>" alt="" title="<?% gettext("To record") %?>" />
-                        </a>
-                        <?% END %?>
+                <?% INCLUDE widgets/tooltip.inc cmd="display"  eventid=id linkid=id ttp_offset=-400 %?>
+                <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') %?>
+                <a href="?cmd=tedit&amp;data=<?% timerid %?>">
+                    <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
+                </a>
+                <?% ELSIF allow('tnew') %?>
+                <a href="?cmd=tnew&amp;data=<?% id %?>">
+                     <img src="images/record.<?% global.imagetyp %?>" alt="" title="<?% gettext("To record") %?>" />
+                </a>
+                <?% END %?>
 <?% END %?>
 <?% ######################################################################## %?>
 <?% 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" %?>
@@ -44,17 +44,20 @@
 				  </a>
             </td>
             <td class="subtitle<?% IF state != "";" ";state;END %?>" style="white-space: nowrap">
-              <?% date.format(start,"%x %X",locale) %?>
+              <?% day %?>
+            </td>
+            </td>
+            <td class="subtitle<?% IF state != "";" ";state;END %?>" style="white-space: nowrap">
+              <?% start %?>-<?% stop %?>
             </td>
             <td class="push">
-                <?% INCLUDE widgets/tooltip.inc cmd="display"  eventid=id linkid=id ttp_offset=-400 %?>
                 <?% PROCESS RowButtons %?>
             </td>
         </tr>
         <?% IF global.hideDescription != 1  && description.length > 0 %?>
         <tr<?% ' class="two"' IF z mod 2 == 0 %?>>
             <td>&nbsp;</td>
-            <td colspan="4">
+            <td colspan="5">
                   <a href="?cmd=display&amp;data=<?% id %?>">
                   <font class="description<?% IF state != "";" ";state;END %?>"><?% chop(description,100,1) %?></font>
 				  </a>
@@ -67,13 +70,14 @@
 <?% fields = data.shift %?>
 <h1><?% gettext("Top Ten entrys") %?></h1>
 <table  summary="" width="100%">
-  <tr height="0"><th width="120"></th><th></th><th width="60"></th><th width="40" align="right"></th></tr>
+  <tr height="0"><th width="120"></th><th></th><th width="100"></th><th width="40" align="right"></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;description=zeile.3;channel_id=zeile.4;start=zeile.5;video=zeile.6;audio=zeile.7;rank=zeile.8;level=zeile.9;count=zeile.10 %?>
-        <?% chid_enc = reentities(channel_id) %?>
-        <?% channel = param.channels.$chid_enc.POS %?>
-        <?% sender = param.channels.$chid_enc.Name %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8;
+            pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            video=zeile.13;audio=zeile.14;rank=zeile.15;level=zeile.16;quantity=zeile.17;
+            %?>
           <?% PROCESS ItemAsFlat %?>
         <?% END %?>
 </table> 
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 136f648..3387d44 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -107,9 +107,8 @@
     <?% 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 = zeile.7 %?>
+            channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8;
+            pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12 %?>
         <?% IF old.defined && day != old %?>
 <div class="areaclose"></div>
 <h2><?% day %?></h2>
diff --git a/skins/stone/topten.tmpl b/skins/stone/topten.tmpl
index ffbfdc3..0377522 100644
--- a/skins/stone/topten.tmpl
+++ b/skins/stone/topten.tmpl
@@ -1,5 +1,4 @@
 <!-- topten -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% ######################################################################## %?>
@@ -7,23 +6,34 @@
                         <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 %?>
+                          <?% 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 %?>
 <?% ######################################################################## %?>
 <?% 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" %?>
@@ -63,8 +73,9 @@
             <td class="fieldtext<?% IF state != "";" ";state;END %?>">
               <table class="fieldinline" summary="">
                 <tr>
-                    <td class="fieldinline" style="white-space: nowrap">
-                       <?% date.format(start,"%x %H:%M",locale) %?>
+                    <td class="fieldinline">
+                       <?% day %?><br />
+                       <?% start %?>-<?% stop %?>
                     </td>
                     <td class="fieldinline push">
                         <?% INCLUDE widgets/tooltip.inc cmd="display" eventid=id linkid=id ttp_offset=-200 %?>
@@ -86,10 +97,11 @@
 <h1><?% gettext("Top Ten entrys") %?></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;description=zeile.3;channel_id=zeile.4;start=zeile.5;video=zeile.6;audio=zeile.7;rank=zeile.8;level=zeile.9;count=zeile.10 %?>
-        <?% chid_enc = reentities(channel_id) %?>
-        <?% channel = param.channels.$chid_enc.POS %?>
-        <?% sender = param.channels.$chid_enc.Name %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;start=zeile.5;stop=zeile.6;day = zeile.7;description=zeile.8;
+            pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            video=zeile.13;audio=zeile.14;rank=zeile.15;level=zeile.16;quantity=zeile.17;
+            %?>
         <?% PROCESS ItemAsArea %?>
     <?% END %?>
 <?% END %?>
diff --git a/skins/stone_flat/topten.tmpl b/skins/stone_flat/topten.tmpl
index e09408c..9578ea6 100644
--- a/skins/stone_flat/topten.tmpl
+++ b/skins/stone_flat/topten.tmpl
@@ -1,5 +1,4 @@
 <!-- topten -->
-<?% USE date %?>
 <body class="frame">
 <div id="body">
 <?% ######################################################################## %?>
@@ -7,23 +6,35 @@
                         <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 %?>
+                          <?% 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 %?>
 <?% ######################################################################## %?>
 <?% 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,7 +56,7 @@
 				  </a>
             </td>
             <td class="fieldinline subtitle<?% IF state != "";" ";state;END %?>" style="white-space: nowrap">
-              <?% date.format(start,"%x %X",locale) %?>
+              <?% day %?>&nbsp;<?% start %?>-<?% stop %?>
             </td>
             <td class="fieldinline push">
                 <?% INCLUDE widgets/tooltip.inc cmd="display" eventid=id linkid=id ttp_offset=-300 %?>
@@ -69,10 +80,11 @@
 <h1><?% gettext("Top Ten entrys") %?></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;description=zeile.3;channel_id=zeile.4;start=zeile.5;video=zeile.6;audio=zeile.7;rank=zeile.8;level=zeile.9;count=zeile.10 %?>
-        <?% chid_enc = reentities(channel_id) %?>
-        <?% channel = param.channels.$chid_enc.POS %?>
-        <?% sender = param.channels.$chid_enc.Name %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;start=zeile.5;stop=zeile.6;day=zeile.7;description=zeile.8;
+            pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            rank=zeile.13;level=zeile.14;quantity=zeile.15;
+            %?>
         <?% IF !old.defined || 1 != old %?>
             <?% IF old.defined  %?>
             </table>
@@ -82,12 +94,12 @@
 </table> 
             <?% END %?>
 <table class="largetable" summary="">
-    <tr><td class="largehead"><?% day %?></td></tr>
+    <tr><td class="largehead"></td></tr>
         <tr>
             <td class="largetext" align="left">
             <table  summary="" width="100%">
             <?% z = 1 %?>
-            <tr height="0"><th width="120"></th><th></th><th width="60"></th><th width="40" align="right"></th></tr>
+            <tr height="0"><th width="120"></th><th></th><th width="100"></th><th width="40" align="right"></th></tr>
         <?% END %?>
         <?% PROCESS ItemAsFlat %?>
         <?% old = 1 %?>
diff --git a/skins/xstyle/bloecke/event_row.tmpl b/skins/xstyle/bloecke/event_row.tmpl
index 96edd9e..42b3cf0 100755
--- a/skins/xstyle/bloecke/event_row.tmpl
+++ b/skins/xstyle/bloecke/event_row.tmpl
@@ -7,7 +7,7 @@
     <?% ELSIF c == 2; # Text Field %?>
     <td>
         <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field subtitle=fielddata.2 desc=fielddata.4 eventid=fielddata.0 linkid=fielddata.0 ttp_offset=0 %?>
-        <?% IF param.timers.${fielddata.0} %?>
+        <?% IF timerid %?>
         <b><?% field %?></b>
         <?% ELSE %?>
         <?% field %?>
@@ -23,20 +23,13 @@
     <?% ELSIF c == 3; # Subtitle Field %?>
 
     <?% ELSIF c == 4; # Channel field %?>
-    <?% chid_enc = reentities(field) %?>
-    <?% channel = param.channels.$chid_enc.POS %?>
-    <?% sender = param.channels.$chid_enc.Name %?>
     <td>
     <a href='?cmd=program&data=<?% channel %?>'><?% sender %?></a>
     </td>
     <?% ELSIF c == 5; # Desc Field %?>
 
-    <?% ELSIF c == 7; # Rank Field %?>
-    <td>
-    <?% field | format('%d') %?>
-    </td>
     <?% ELSE %?>
-        <?% IF param.timers.${fielddata.11} && param.timers.${fielddata.11}.activ %?>
+        <?% IF timerid && recording %?>
                 <td><b><?% field %?></b></td>
         <?% ELSE %?>
                 <td><?% field %?></td>
diff --git a/skins/xstyle/topten.tmpl b/skins/xstyle/topten.tmpl
index 548fef5..84ecde3 100755
--- a/skins/xstyle/topten.tmpl
+++ b/skins/xstyle/topten.tmpl
@@ -11,8 +11,6 @@
 <h1><?% gettext("Top Ten entrys") %?></h1>
 <h6><?% gettext("This Screen list the most programmed EPG Events from all XXV Users. Of course, we list only Events these are exists in your EPG Table!") %?></h6>
 <p/>
-<table>
-<tr>
 
 <div id="navcontainer">
 <ul id="navlist">
@@ -26,16 +24,21 @@
 <?% IF data.size %?>
     <?% fields = data.shift %?>
         <tr>
-        <?% FOREACH field = [gettext('Service'),gettext('Title'),gettext('Channel'),gettext('Start'),gettext('Rank')] %?>
+        <?% FOREACH field = fields %?>
+            <?% NEXT IF field.match('^__') %?>
             <th><?% field %?></th>
         <?% END %?>
         </tr>
         <?% FOREACH zeile = data %?>
-        <?% c=0;id=zeile.0;title=zeile.1;subtitle=zeile.2;description=zeile.3;channel_id=zeile.4;start=zeile.5;video=zeile.6;audio=zeile.7;rank=zeile.8;level=zeile.9;count=zeile.10 %?>
+        <?% c=0 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;start=zeile.5;stop=zeile.6;day = zeile.7;description=zeile.8;
+            pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            video=zeile.13;audio=zeile.14;rank=zeile.15 div 1;level=zeile.16;quantity=zeile.17;
+            %?>
         <tr class="<?% myclass %?>"<?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
-        <?% INCLUDE 'bloecke/event_row.tmpl' fielddata=[id,title,subtitle,channel_id,description,date.format(start, "%x %X", locale),rank] %?>
+        <?% INCLUDE 'bloecke/event_row.tmpl' fielddata=[id,title,subtitle,channel,description,start,stop,day,rank] %?>
         </tr>
-        <?% oldday = day %?>
         <?% END %?>
 <?% END %?>
 </table>