Rename 'pvr' to 'dvr'

diff --git a/access.c b/access.c
index 99972802b2d86cf1fbed1e9a040714a730e38f79..efc270439e87061164869bc3a75a2f0d2372fcd5 100644 (file)
--- a/access.c
+++ b/access.c
@@ -187,7 +187,7 @@ access_record_build(access_entry_t *ae)
   htsmsg_add_str(e, "prefix",   buf);
 
   htsmsg_add_u32(e, "streaming", ae->ae_rights & ACCESS_STREAMING     ? 1 : 0);
-  htsmsg_add_u32(e, "pvr"      , ae->ae_rights & ACCESS_RECORDER      ? 1 : 0);
+  htsmsg_add_u32(e, "dvr"      , ae->ae_rights & ACCESS_RECORDER      ? 1 : 0);
   htsmsg_add_u32(e, "webui"    , ae->ae_rights & ACCESS_WEB_INTERFACE ? 1 : 0);
   htsmsg_add_u32(e, "admin"    , ae->ae_rights & ACCESS_ADMIN         ? 1 : 0);
 
@@ -274,7 +274,7 @@ access_record_update(void *opaque, const char *id, htsmsg_t *values,
   if(!htsmsg_get_u32(values, "streaming", &u32))
     access_update_flag(ae, ACCESS_STREAMING, u32);
 
-  if(!htsmsg_get_u32(values, "pvr", &u32))
+  if(!htsmsg_get_u32(values, "dvr", &u32))
     access_update_flag(ae, ACCESS_RECORDER, u32);
 
   if(!htsmsg_get_u32(values, "admin", &u32))

diff --git a/webui/static/app/acleditor.js b/webui/static/app/acleditor.js
index 6b563742f478aa5ccfe0a9a892b63b2c9bda1ff1..915aecd021bdbfcac9bee7db7ec3c54b8cee8955 100644 (file)
--- a/webui/static/app/acleditor.js
+++ b/webui/static/app/acleditor.js
@@ -14,9 +14,9 @@ tvheadend.acleditor = function() {
        width: 100
     });
 
-    var pvrColumn = new Ext.grid.CheckColumn({
+    var dvrColumn = new Ext.grid.CheckColumn({
        header: "Video Recorder",
-       dataIndex: 'pvr',
+       dataIndex: 'dvr',
        width: 100
     });
 
@@ -48,7 +48,7 @@ tvheadend.acleditor = function() {
            editor: new fm.TextField({allowBlank: false})
        },
        streamingColumn,
-       pvrColumn,
+       dvrColumn,
        webuiColumn,
        adminColumn,
        {
@@ -60,13 +60,13 @@ tvheadend.acleditor = function() {
     ]);
     
     var UserRecord = Ext.data.Record.create([
-       'enabled','streaming','pvr','admin','webui','username',
+       'enabled','streaming','dvr','admin','webui','username',
        'prefix','password','comment'
     ]);
 
     return new tvheadend.tableEditor('Access control', 'accesscontrol', cm,
                                     UserRecord,
                                     [enabledColumn, streamingColumn,
-                                     pvrColumn, webuiColumn,
+                                     dvrColumn, webuiColumn,
                                      adminColumn]);
 }