From: Jaroslav Kysela Date: Tue, 1 Dec 2015 17:33:26 +0000 (+0100) Subject: WEBUI: changes in access / mpegts for the new advanced/expert levels X-Git-Tag: v4.2.1~1422 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0644dc793ae44ff060165f0ba18a51cd2056994;p=thirdparty%2Ftvheadend.git WEBUI: changes in access / mpegts for the new advanced/expert levels --- diff --git a/src/access.c b/src/access.c index ba320096b..3ce3895be 100644 --- a/src/access.c +++ b/src/access.c @@ -1406,6 +1406,7 @@ const idclass_t access_entry_class = { .name = N_("Network prefix"), .set = access_entry_class_prefix_set, .get = access_entry_class_prefix_get, + .opts = PO_ADVANCED }, { .type = PT_INT, @@ -1429,6 +1430,7 @@ const idclass_t access_entry_class = { .name = N_("Web interface language"), .list = language_get_list, .off = offsetof(access_entry_t, ae_lang_ui), + .opts = PO_ADVANCED, }, { .type = PT_BOOL, @@ -1457,6 +1459,7 @@ const idclass_t access_entry_class = { .get = access_entry_profile_get, .list = profile_class_get_list, .rend = access_entry_profile_rend, + .opts = PO_ADVANCED, }, { .type = PT_BOOL, @@ -1498,6 +1501,7 @@ const idclass_t access_entry_class = { .get = access_entry_dvr_config_get, .list = dvr_entry_class_config_name_list, .rend = access_entry_dvr_config_rend, + .opts = PO_ADVANCED, }, { .type = PT_BOOL, @@ -1517,12 +1521,14 @@ const idclass_t access_entry_class = { .name = N_("Connection limit type"), .off = offsetof(access_entry_t, ae_conn_limit_type), .list = access_entry_conn_limit_type_enum, + .opts = PO_EXPERT }, { .type = PT_U32, .id = "conn_limit", .name = N_("Limit connections"), .off = offsetof(access_entry_t, ae_conn_limit), + .opts = PO_EXPERT }, { .type = PT_S64, @@ -1543,6 +1549,7 @@ const idclass_t access_entry_class = { .id = "channel_tag_exclude", .name = N_("Exclude channel tags"), .off = offsetof(access_entry_t, ae_chtags_exclude), + .opts = PO_ADVANCED, }, { .type = PT_STR, @@ -1553,6 +1560,7 @@ const idclass_t access_entry_class = { .get = access_entry_chtag_get, .list = channel_tag_class_get_list, .rend = access_entry_chtag_rend, + .opts = PO_ADVANCED, }, { .type = PT_STR, @@ -1785,7 +1793,7 @@ const idclass_t passwd_entry_class = { .id = "password2", .name = N_("Password2"), .off = offsetof(passwd_entry_t, pw_password2), - .opts = PO_PASSWORD | PO_HIDDEN | PO_ADVANCED | PO_WRONCE, + .opts = PO_PASSWORD | PO_HIDDEN | PO_EXPERT | PO_WRONCE, .set = passwd_entry_class_password2_set, }, { diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c index f5a9a415a..8a07611a7 100644 --- a/src/input/mpegts/mpegts_mux.c +++ b/src/input/mpegts/mpegts_mux.c @@ -519,7 +519,7 @@ const idclass_t mpegts_mux_class = .type = PT_STR, .id = "network_uuid", .name = N_("Network UUID"), - .opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN, + .opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_EXPERT, .get = mpegts_mux_class_get_network_uuid, }, { @@ -534,27 +534,27 @@ const idclass_t mpegts_mux_class = .id = "pnetwork_name", .name = N_("Provider network name"), .off = offsetof(mpegts_mux_t, mm_provider_network_name), - .opts = PO_RDONLY | PO_HIDDEN, + .opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT, }, { .type = PT_U16, .id = "onid", .name = N_("Original network ID"), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_ADVANCED, .off = offsetof(mpegts_mux_t, mm_onid), }, { .type = PT_U16, .id = "tsid", .name = N_("Transport stream ID"), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_ADVANCED, .off = offsetof(mpegts_mux_t, mm_tsid), }, { .type = PT_STR, .id = "cridauth", .name = N_("CRID authority"), - .opts = PO_RDONLY | PO_HIDDEN, + .opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT, .off = offsetof(mpegts_mux_t, mm_crid_authority), }, { @@ -603,14 +603,14 @@ const idclass_t mpegts_mux_class = .off = offsetof(mpegts_mux_t, mm_pmt_ac3), .def.i = MM_AC3_STANDARD, .list = mpegts_mux_ac3_list, - .opts = PO_HIDDEN | PO_ADVANCED + .opts = PO_HIDDEN | PO_EXPERT }, { .type = PT_BOOL, .id = "eit_tsid_nocheck", .name = N_("EIT - skip TSID check"), .off = offsetof(mpegts_mux_t, mm_eit_tsid_nocheck), - .opts = PO_HIDDEN | PO_ADVANCED + .opts = PO_HIDDEN | PO_EXPERT }, {} } diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c index 95d3d148b..91ff8edbc 100644 --- a/src/input/mpegts/mpegts_network.c +++ b/src/input/mpegts/mpegts_network.c @@ -163,6 +163,7 @@ const idclass_t mpegts_network_class = .id = "autodiscovery", .name = N_("Network discovery"), .off = offsetof(mpegts_network_t, mn_autodiscovery), + .opts = PO_ADVANCED, .def.i = 1 }, { @@ -170,6 +171,7 @@ const idclass_t mpegts_network_class = .id = "skipinitscan", .name = N_("Skip initial scan"), .off = offsetof(mpegts_network_t, mn_skipinitscan), + .opts = PO_EXPERT, .def.i = 1 }, { @@ -179,13 +181,14 @@ const idclass_t mpegts_network_class = .off = offsetof(mpegts_network_t, mn_idlescan), .def.i = 0, .notify = mpegts_network_class_idlescan_notify, - .opts = PO_ADVANCED | PO_HIDDEN, + .opts = PO_EXPERT | PO_HIDDEN, }, { .type = PT_BOOL, .id = "sid_chnum", .name = N_("Use service IDs as channel numbers"), .off = offsetof(mpegts_network_t, mn_sid_chnum), + .opts = PO_EXPERT, .def.i = 0, }, { @@ -193,6 +196,7 @@ const idclass_t mpegts_network_class = .id = "ignore_chnum", .name = N_("Ignore provider's channel numbers"), .off = offsetof(mpegts_network_t, mn_ignore_chnum), + .opts = PO_ADVANCED, .def.i = 0, }, #if ENABLE_SATIP_SERVER @@ -201,6 +205,7 @@ const idclass_t mpegts_network_class = .id = "satip_source", .name = N_("SAT>IP source number"), .off = offsetof(mpegts_network_t, mn_satip_source), + .opts = PO_ADVANCED }, #endif { @@ -216,7 +221,7 @@ const idclass_t mpegts_network_class = .id = "localtime", .name = N_("EIT broadcast in local time"), .off = offsetof(mpegts_network_t, mn_localtime), - .opts = PO_ADVANCED, + .opts = PO_EXPERT, }, { .type = PT_INT, diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c index 40422dfa6..6b848f50a 100644 --- a/src/input/mpegts/mpegts_service.c +++ b/src/input/mpegts/mpegts_service.c @@ -106,42 +106,42 @@ const idclass_t mpegts_service_class = .type = PT_STR, .id = "multiplex_uuid", .name = N_("Mux UUID"), - .opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN, + .opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_EXPERT, .get = mpegts_service_class_get_mux_uuid, }, { .type = PT_U16, .id = "sid", .name = N_("Service ID"), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_ADVANCED, .off = offsetof(mpegts_service_t, s_dvb_service_id), }, { .type = PT_U16, .id = "lcn", .name = N_("Local channel number"), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_ADVANCED, .off = offsetof(mpegts_service_t, s_dvb_channel_num), }, { .type = PT_U16, .id = "lcn_minor", .name = N_("Local channel minor"), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_EXPERT, .off = offsetof(mpegts_service_t, s_dvb_channel_minor), }, { .type = PT_U16, .id = "lcn2", .name = N_("OpenTV channel number"), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_EXPERT, .off = offsetof(mpegts_service_t, s_dvb_opentv_chnum), }, { .type = PT_U16, .id = "srcid", .name = N_("ATSC source ID"), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_EXPERT, .off = offsetof(mpegts_service_t, s_atsc_source_id), }, { @@ -162,14 +162,14 @@ const idclass_t mpegts_service_class = .type = PT_STR, .id = "cridauth", .name = N_("CRID authority"), - .opts = PO_RDONLY | PO_HIDDEN, + .opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT, .off = offsetof(mpegts_service_t, s_dvb_cridauth), }, { .type = PT_U16, .id = "dvb_servicetype", .name = N_("Service type"), - .opts = PO_RDONLY | PO_HIDDEN, + .opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT, .off = offsetof(mpegts_service_t, s_dvb_servicetype), }, { @@ -177,7 +177,7 @@ const idclass_t mpegts_service_class = .id = "dvb_ignore_eit", .name = N_("Ignore EPG (EIT)"), .off = offsetof(mpegts_service_t, s_dvb_ignore_eit), - .opts = PO_ADVANCED, + .opts = PO_EXPERT, }, { .type = PT_STR, @@ -185,21 +185,21 @@ const idclass_t mpegts_service_class = .name = N_("Character set"), .off = offsetof(mpegts_service_t, s_dvb_charset), .list = dvb_charset_enum, - .opts = PO_ADVANCED, + .opts = PO_EXPERT, }, { .type = PT_U16, .id = "prefcapid", .name = N_("Preferred CA PID"), .off = offsetof(mpegts_service_t, s_dvb_prefcapid), - .opts = PO_ADVANCED, + .opts = PO_EXPERT, }, { .type = PT_INT, .id = "prefcapid_lock", .name = N_("Lock preferred CA PID"), .off = offsetof(mpegts_service_t, s_dvb_prefcapid_lock), - .opts = PO_ADVANCED, + .opts = PO_EXPERT, .list = mpegts_service_pref_capid_lock_list, }, { @@ -207,7 +207,7 @@ const idclass_t mpegts_service_class = .id = "force_caid", .name = N_("Force CA ID (e.g. 0x2600)"), .off = offsetof(mpegts_service_t, s_dvb_forcecaid), - .opts = PO_ADVANCED | PO_HEXA, + .opts = PO_EXPERT | PO_HEXA, }, { .type = PT_TIME, diff --git a/src/satip/server.c b/src/satip/server.c index 9b90cae3a..fd4922e73 100644 --- a/src/satip/server.c +++ b/src/satip/server.c @@ -588,7 +588,7 @@ const idclass_t satip_server_class = { .id = "satip_uuid", .name = N_("Server UUID"), .off = offsetof(struct satip_server_conf, satip_uuid), - .opts = PO_RDONLY, + .opts = PO_RDONLY | PO_EXPERT, .group = 1, }, { @@ -603,6 +603,7 @@ const idclass_t satip_server_class = { .id = "satip_weight", .name = N_("Subscription weight"), .off = offsetof(struct satip_server_conf, satip_weight), + .opts = PO_ADVANCED, .group = 1, }, { @@ -610,6 +611,7 @@ const idclass_t satip_server_class = { .id = "satip_remote_weight", .name = N_("Allow remote subscription weight"), .off = offsetof(struct satip_server_conf, satip_allow_remote_weight), + .opts = PO_EXPERT, .group = 1, }, { @@ -617,6 +619,7 @@ const idclass_t satip_server_class = { .id = "satip_descramble", .name = N_("Descramble services (limit per mux)"), .off = offsetof(struct satip_server_conf, satip_descramble), + .opts = PO_ADVANCED, .group = 1, }, { @@ -624,6 +627,7 @@ const idclass_t satip_server_class = { .id = "satip_rewrite_pmt", .name = N_("Rewrite PMT"), .off = offsetof(struct satip_server_conf, satip_rewrite_pmt), + .opts = PO_EXPERT, .group = 1, }, { @@ -632,6 +636,7 @@ const idclass_t satip_server_class = { .name = N_("Mux handling"), .off = offsetof(struct satip_server_conf, satip_muxcnf), .list = satip_server_class_muxcfg_list, + .opts = PO_EXPERT, .group = 1, }, { @@ -639,6 +644,7 @@ const idclass_t satip_server_class = { .id = "satip_nat_ip", .name = N_("External IP (NAT)"), .off = offsetof(struct satip_server_conf, satip_nat_ip), + .opts = PO_EXPERT, .group = 1, }, { diff --git a/src/webui/static/app/acleditor.js b/src/webui/static/app/acleditor.js index 44e3cedec..b44e95c9e 100644 --- a/src/webui/static/app/acleditor.js +++ b/src/webui/static/app/acleditor.js @@ -13,7 +13,7 @@ tvheadend.acleditor = function(panel, index) 'channel_tag_exclude,channel_tag,comment'; var list2 = 'enabled,username,password,prefix,' + - 'lang,webui,langui,admin,' + + 'lang,webui,langui,uilevel,admin,' + 'streaming,adv_streaming,htsp_streaming,' + 'profile,conn_limit_type,conn_limit,' + 'dvr,htsp_dvr,all_dvr,all_rw_dvr,' +