From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 6 Apr 2016 15:55:06 +0000 (+0200)
Subject: mdhelp: add passwd and ipblocking classes
X-Git-Tag: v4.2.1~716
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2438985d7801aad34db023f6e5e5fc56f221605d;p=thirdparty%2Ftvheadend.git

mdhelp: add passwd and ipblocking classes
---

diff --git a/docs/class/ipblocking.md b/docs/class/ipblocking.md
new file mode 100644
index 000000000..82933c11d
--- /dev/null
+++ b/docs/class/ipblocking.md
@@ -0,0 +1,4 @@
+##Configuration - IP Blocking Records
+
+This tab allows to configure blocked IP ranges. Users within these ranges
+are not allowed to login (use any Tvheadend service).
diff --git a/docs/class/passwd.md b/docs/class/passwd.md
new file mode 100644
index 000000000..d3fb1ce4a
--- /dev/null
+++ b/docs/class/passwd.md
@@ -0,0 +1,6 @@
+##Configuration - Passwords
+
+This tab is the second part of Tvheadend's access control mechanism. It is
+where you set and maintain all user passwords (e.g. for streaming or DVR access).
+
+One user name might have multiple passwords.
diff --git a/src/access.c b/src/access.c
index cc45a854b..d2c9be464 100644
--- a/src/access.c
+++ b/src/access.c
@@ -1897,11 +1897,14 @@ passwd_entry_class_password2_set(void *o, const void *v)
   return 0;
 }
 
+extern const char *tvh_doc_passwd_class[];
+
 const idclass_t passwd_entry_class = {
   .ic_class      = "passwd",
   .ic_caption    = N_("Passwords"),
   .ic_event      = "passwd",
   .ic_perm_def   = ACCESS_ADMIN,
+  .ic_doc        = tvh_doc_passwd_class,
   .ic_save       = passwd_entry_class_save,
   .ic_get_title  = passwd_entry_class_get_title,
   .ic_delete     = passwd_entry_class_delete,
@@ -2046,11 +2049,15 @@ ipblock_entry_class_prefix_get(void *o)
   return &ret;
 }
 
+extern const char *tvh_doc_ipblocking_class[];
+
+
 const idclass_t ipblock_entry_class = {
   .ic_class      = "ipblocking",
   .ic_caption    = N_("IP blocking"),
   .ic_event      = "ipblocking",
   .ic_perm_def   = ACCESS_ADMIN,
+  .ic_doc        = tvh_doc_ipblocking_class,
   .ic_save       = ipblock_entry_class_save,
   .ic_get_title  = ipblock_entry_class_get_title,
   .ic_delete     = ipblock_entry_class_delete,
diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js
index 8f06c58c4..1c55f1f70 100644
--- a/src/webui/static/app/config.js
+++ b/src/webui/static/app/config.js
@@ -41,7 +41,7 @@ tvheadend.baseconf = function(panel, index) {
                 if (l !== tvheadend.uilevel)
                     reload = 1;
             }
-            var n = data['theme'];
+            var n = data['theme_ui'];
             if (n !== tvheadend.theme)
               reload = 1;
             var n = data['uilevel_nochange'] ? true : false;