* Redesign SVDRP Communation to support more as one video disk recorder (Change database schema to version 30)

5 files changed, 117 insertions, 22 deletions

diff --git a/html/clist.tmpl b/html/clist.tmpl
index 039c57f..4cc980a 100644
--- a/html/clist.tmpl
+++ b/html/clist.tmpl
@@ -36,7 +36,7 @@
 <a href="?cmd=cedit&amp;data=<?% id %?>" title="<?% gettext("Edit channel") %?>">[E]</a>&nbsp;
 <?%- END -%?>
 <?%- IF allow('cdelete') -%?>
-<a href="javascript:sure(document.KanalListe, '<?% gettext("Would you like to delete this channel?") %?>\n\'<?% escape(name) %?>\' ?','?cmd=cdelete&amp;data=<?% POS %?>')"
+<a href="javascript:sure(document.KanalListe, '<?% gettext("Would you like to delete this channel?") %?>\n\'<?% escape(name) %?>\' ?','?cmd=cdelete&amp;data=<?% id %?>')"
    title="<?% gettext("Delete channel") %?>" >[D]</a>
 <?%- END -%?>
 <?% END %?>
@@ -45,7 +45,7 @@
         <tr<?% ' bgcolor="#F5F5F5"' IF loop.count mod 2 == 0 %?>>
           <td>
             <?% IF enableform %?>
-        			<input type="checkbox" value="<?% POS %?>" name="<?% name %?>" />
+        			<input type="checkbox" value="<?% id %?>" name="<?% name %?>" />
              <?% END %?>
           </td>
           <td>
@@ -142,8 +142,14 @@
         <th width="64" align="right"></th>
     </tr>
     <?% FOREACH zeile = data %?>
-        <?% id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;POS=zeile.15;CGRP=zeile.16 %?>
-        <?% IF CGRP != CGRP_OLD %?>
+        <?% id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;POS=zeile.15;CGRP=zeile.16;HOST=zeile.17; %?>
+        <?% IF not sortby.defined && OLDHOST != HOST  %?>
+            <tr>
+                <td colspan=10 bgcolor='#CCCCCC'><b><?% gettext("Video disk recorder") %?> : <?% HOST %?></b></td>
+            <tr>
+        <?% OLDHOST = HOST %?>
+        <?% END %?>
+        <?% IF not sortby.defined && CGRP != CGRP_OLD %?>
             <tr>
                 <td colspan=10 bgcolor='#DDDDDD'><b><?% CGRP %?></b></td>
             <tr>
diff --git a/html/help.tmpl b/html/help.tmpl
index 2989164..b03f955 100644
--- a/html/help.tmpl
+++ b/html/help.tmpl
@@ -51,7 +51,11 @@ var tree = new WebFXTree("XXV", "?cmd=<?% getModule('HTTPD').StartPage %?>");
     var program = new WebFXTreeItem("<?% gettext("Program guide") %?>","?cmd=schema",tree);
     <?% IF allow('topten') %?>program.add(new WebFXTreeItem("<?% gettext("Top ten entry") %?>",    "?cmd=t10"));<?% END %?>
     <?% FOREACH ch = param.CHANNELS %?>
-    program.add(new WebFXTreeItem("<?% escape(chop(ch.0,10)) %?>",  "?cmd=program&amp;data=<?% ch.1 %?>"));
+        <?% IF ch.2 != lastgroup;lastgroup = ch.2 %?>
+        <?% CNT = CNT + 1 %?>
+    var programgroup<?% CNT %?> = new WebFXTreeItem("<?% escape(chop(lastgroup,10)) %?>",  "?cmd=program&amp;data=<?% ch.1 %?>",program);
+        <?% END %?>
+        programgroup<?% CNT %?>.add(new WebFXTreeItem("<?% escape(chop(ch.0,10)) %?>",  "?cmd=program&amp;data=<?% ch.1 %?>"));
     <?% END %?>
 <?% END %?>
 
@@ -79,16 +83,6 @@ var tools = new WebFXTreeItem("<?% gettext("Tools",15) %?>",0,tree);
 <?% END %?>
 
 
-<?% IF allow('configedit') %?>
-    var prefs = new WebFXTreeItem("<?% gettext("Preferences") %?>","?cmd=configedit",tree);
-    <?% FOREACH co = param.CONFIGS %?>
-      <?% IF co != "CONFIG" %?>
-        prefs.add(new WebFXTreeItem("<?% chop(co,10) %?>",  "?cmd=configedit&amp;data=<?% co %?>"));
-      <?% END %?>
-    <?% END %?>
-    prefs.add(new WebFXTreeItem("<?% gettext("Edit channels",10) %?>",  "?cmd=cl"));
-<?% END %?>
-
 <?% IF allow('sa') %?>
 var status = new WebFXTreeItem("<?% gettext("Status") %?>","?cmd=sa",tree);
 status.add(new WebFXTreeItem("<?% gettext("Vitals") %?>",      "?cmd=sv"));
@@ -113,14 +107,25 @@ logger.add(new WebFXTreeItem("<?% gettext("Standard") %?>",  "?cmd=logger&data=m
 logger.add(new WebFXTreeItem("<?% gettext("Syslog") %?>",    "?cmd=logger&data=syslog"));
 <?% END %?>
 
-<?% IF allow('ul') || allow('uprefs') || allow('rel') || allow('restart') %?>
+<?% IF allow('ul') || allow('uprefs') || allow('vl') || allow('cl') || allow('rel') || allow('restart') %?>
 var admin = new WebFXTreeItem("<?% gettext("Administration") %?>",0,tree);
+<?% IF allow('vl') %?>admin.add(new WebFXTreeItem("<?% gettext("Video disk recorder",12) %?>",  "?cmd=vl"));<?% END %?>
+<?% IF allow('cl') %?>admin.add(new WebFXTreeItem("<?% gettext("Channels",12) %?>",  "?cmd=cl"));<?% END %?>
 <?% IF allow('ul') %?>admin.add(new WebFXTreeItem("<?% gettext("User") %?>","?cmd=ul"));
 <?% ELSIF allow('uprefs') %?>admin.add(new WebFXTreeItem("<?% gettext("Personality") %?>","?cmd=uprefs"));<?% END %?>
 <?% IF allow('rel') %?>admin.add(new WebFXTreeItem("<?% gettext("Reload") %?>","?cmd=rel"));<?% END %?>
 <?% IF allow('restart') %?>admin.add(new WebFXTreeItem("<?% gettext("Restart") %?>","?cmd=restart"));<?% END %?>
 <?% END %?>
 
+<?% IF allow('configedit') %?>
+    var prefs = new WebFXTreeItem("<?% gettext("Preferences") %?>","?cmd=configedit",tree);
+    <?% FOREACH co = param.CONFIGS %?>
+      <?% IF co != "CONFIG" %?>
+        prefs.add(new WebFXTreeItem("<?% chop(co,10) %?>",  "?cmd=configedit&amp;data=<?% co %?>"));
+      <?% END %?>
+    <?% END %?>
+<?% END %?>
+
 <?% IF allow('logout') %?>var lout = new WebFXTreeItem("<?% gettext("Logout") %?>","?cmd=logout",tree);<?% END %?>
 
 document.write(tree);
diff --git a/html/ulist.tmpl b/html/ulist.tmpl
index f7e7187..27811fb 100644
--- a/html/ulist.tmpl
+++ b/html/ulist.tmpl
@@ -27,7 +27,7 @@
                     [<?% gettext("Edit") %?>]</a>&nbsp;
                     <a title="<?% gettext("Delete user account") %?>"
                        href="javascript:sure(document.UserList, '<?% gettext("Would you like to delete this user account?") %?>: <?% escape(zeile.1) %?>','?cmd=udelete&amp;data=<?% zeile.0 %?>')">
-                    [<?% gettext("Del") %?>]
+                    [<?% gettext("Delete") %?>]
                     </a>
                 </td>
                 <?% ELSE %?>
diff --git a/html/vdrlist.tmpl b/html/vdrlist.tmpl
new file mode 100644
index 0000000..30e360d
--- /dev/null
+++ b/html/vdrlist.tmpl
@@ -0,0 +1,41 @@
+<!-- TableTemplate -->
+<h1><?% gettext("Administration of video disk recorder") %?></h1>
+
+<a href="?cmd=vdrnew">[<?% gettext("Create new definition of video disk recorder") %?>]</a>
+<p>
+
+<table border="0" width="95%">
+<form name='vdrlist'>
+<?% INCLUDE 'widgets/referer.tmpl' %?>
+<?% IF data.size %?>
+    <?% fields = data.shift %?>
+        <tr>
+        <?% FOREACH field = fields %?>
+            <th><?% field %?></th>
+        <?% END %?>
+        </tr>
+        <?% x = -1 %?>
+        <?% FOREACH zeile = data %?>
+        <?% x = x + 1 %?>
+        <tr class="<?% myclass %?>" <?% IF (x mod 2) != 0 %?>bgcolor='#F5F5F5'<?% END %?>>
+            <?% c = 0 %?>
+            <?% FOREACH field = zeile %?>
+                <?% c = c + 1 %?>
+                <?% IF c == 1; # Id Field %?>
+                <td>
+                    <a title="<?% gettext("Edit definition of video disk recorder") %?>" href="?cmd=vdredit&amp;data=<?% zeile.0 %?>">
+                    [<?% gettext("Edit") %?>]</a>&nbsp;
+                    <a title="<?% gettext("Delete definition of video disk recorder") %?>"
+                       href="#" onclick="sure(document.vdrlist, '<?% gettext("Would you like to delete this definition of video disk recorder?") %?>: <?% escape(zeile.3) %?>','?cmd=vdrdelete&amp;data=<?% zeile.0 %?>')">
+                    [<?% gettext("Delete") %?>]
+                    </a>
+                </td>
+                <?% ELSE %?>
+                <td><?% field %?></td>
+                <?% END %?>
+            <?% END %?>
+        </tr>
+        <?% END %?>
+<?% END %?>
+</form>
+</table>
diff --git a/html/widgets/remote.tmpl b/html/widgets/remote.tmpl
index 6c8e68f..3204c74 100644
--- a/html/widgets/remote.tmpl
+++ b/html/widgets/remote.tmpl
@@ -9,8 +9,15 @@
 var interval = 5
 var last = 0;
 
+function post(url) {
+    var vdr = ( document.remoteform.vdr.options ? document.remoteform.vdr.options[document.remoteform.vdr.options.selectedIndex].value : document.remoteform.vdr.value );
+    // Hmm, brutal und gemein, das Laden der URL als Bild funktioniert...
+    var img = new Image();
+    img.src = url + '&__vdr=' + vdr;
+}
+
 function switch_channel(url) {
-    parent.Status.location.href = url;
+    post(url);
 <?% IF monitor %?>
     if(last + 1000 < Date.UTC()) {
         grab();
@@ -21,8 +28,9 @@ function switch_channel(url) {
 <?% IF monitor %?>
 function grab() {
     if(document.remoteform.grabinterval.value > 0) {
-        Now = new Date();
-    	document.livepicture.src = '?cmd=gdisplay&random=' + Now.getTime();
+      Now = new Date();
+      var vdr = ( document.remoteform.vdr.options ? document.remoteform.vdr.options[document.remoteform.vdr.options.selectedIndex].value : document.remoteform.vdr.value );
+    	document.livepicture.src = '?cmd=gdisplay&__vdr='+vdr+'&random=' + Now.getTime();
     }
     last = Date.UTC();
 }
@@ -52,8 +60,8 @@ aktiv = window.setInterval("grab()", inter);
 <table border=0 cellpadding=0 cellspacing=0>
 <tr>
 <?% IF monitor %?>
-  <td rowspan="12">
-    <img src="?cmd=gdisplay&random=<?% date.now %?>" width="<?% param.width %?>" height="<?% param.height %?>" name="livepicture">
+  <td rowspan="14">
+    <img src="?cmd=gdisplay&random=<?% date.now %?>&amp;__vdr=<?% param.vdr %?>" width="<?% param.width %?>" height="<?% param.height %?>" name="livepicture">
   </td>
 <?% END %?>
   <td colspan="3"><nobr>
@@ -115,6 +123,41 @@ aktiv = window.setInterval("grab()", inter);
   <td align='center'>&nbsp;</td>
   <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=VolumePlus')" type="button" name="lauter" value="+"></td>
 </tr>
+<?% IF param.vdrlist.size > 1 %?>
+<tr>
+  <td colspan="3" align="center">
+      <select style="width:150px;" name="vdr">
+      <?% FOREACH l = param.vdrlist %?>
+          <option value='<?% l.1 %?>'<?% IF l.1 == param.vdr %?> selected<?% END %?>><?% l.0 %?></option>
+      <?% END %?>
+      </select>
+  </td>
+</tr>
+<?% ELSE %?>
+<tr>
+  <td colspan="7" align="center">
+  <input type="hidden" name="vdr" value="<?% param.vdr %?>" />
+  </td>
+</tr>
+<?% END %?>
+<tr>
+  <td colspan="3" align="center">
+      <select style="width:150px;" name="channels" onchange="post('?cmd=switch&amp;data='+ this.form.channels.options[this.form.channels.options.selectedIndex].value)">
+      <?% FOREACH l = param.channels %?>
+      <?% IF l.2 && l.2 != optgroup %?>
+        <?% IF optgroup %?>
+        </optgroup>
+        <?% END %?>
+        <optgroup label="<?% optgroup = l.2;l.2 %?>">
+      <?% END %?>
+          <option value='<?% l.1 %?>'><?% l.0 %?></option>
+      <?% END %?>
+      <?% IF optgroup %?>
+        </optgroup>
+      <?% END %?>
+      </select>
+  </td>
+</tr>
 <?% IF monitor %?>
 <tr>
     <td align='center' colspan="3">