ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/zoneminder

pull/3825/merge
Isaac Connor 2024-11-18 10:46:40 -05:00
parent 14f3f3bab1 d4d6438228
commit efe16fd62e
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
View File

@ -287,7 +287,7 @@ our @options = (
limited by their defined permissions.
`,
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_TYPE',
@ -311,7 +311,7 @@ our @options = (
pattern => qr|^([br])|i,
format => q( $1 =~ /^b/ ? 'builtin' : 'remote' )
},
category => 'system',
category => 'auth',
},
{
name => 'ZM_CASE_INSENSITIVE_USERNAMES',
@ -323,7 +323,7 @@ our @options = (
`,
requires => [ { name=>'ZM_OPT_USE_AUTH', value=>'yes' } ],
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_RELAY',
@ -348,7 +348,7 @@ our @options = (
pattern => qr|^([hpn])|i,
format => q( ($1 =~ /^h/) ? 'hashed' : ($1 =~ /^p/ ? 'plain' : 'none' ) )
},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_HASH_SECRET',
@ -367,7 +367,7 @@ our @options = (
],
type => $types{string},
private => 1,
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_HASH_IPS',
@ -390,7 +390,7 @@ our @options = (
{ name=>'ZM_AUTH_RELAY', value=>'hashed' }
],
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_HASH_TTL',
@ -405,7 +405,7 @@ our @options = (
{ name=>'ZM_AUTH_RELAY', value=>'hashed' }
],
type => $types{integer},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_HASH_LOGINS',
@ -431,7 +431,7 @@ our @options = (
{ name=>'ZM_AUTH_RELAY', value=>'hashed' }
],
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_RTSP2WEB_PATH',
@ -497,7 +497,7 @@ our @options = (
if you are exposing your ZM instance on the Internet.
`,
type => $types{boolean},
category => 'system',
category => 'api',
},
{
name => 'ZM_OPT_USE_LEGACY_API_AUTH',
@ -508,7 +508,7 @@ our @options = (
Authentication mechanism using JWT tokens. Older versions used a less secure MD5 based auth hash. It is recommended you turn this off after you are sure you don't need it. If you are using a 3rd party app that relies on the older API auth mechanisms, you will have to update that app if you turn this off. Note that zmNinja 1.3.057 onwards supports the new token system
`,
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_OPT_USE_EVENTNOTIFICATION',
@ -545,7 +545,7 @@ our @options = (
{name=>'ZM_OPT_USE_AUTH', value=>'yes'}
],
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_OPT_GOOG_RECAPTCHA_SITEKEY',
@ -560,7 +560,7 @@ our @options = (
],
type => $types{string},
private => 1,
category => 'system',
category => 'auth',
},
{
name => 'ZM_OPT_GOOG_RECAPTCHA_SECRETKEY',
@ -576,7 +576,7 @@ our @options = (
],
type => $types{string},
private => 1,
category => 'system',
category => 'auth',
},
{
name => 'ZM_OPT_USE_GEOLOCATION',

1
web/skins/classic/views/options.php
View File

@ -29,6 +29,7 @@ $tabs = array();
if (!defined('ZM_FORCE_CSS_DEFAULT') or !defined('ZM_FORCE_SKIN_DEFAULT'))
$tabs['skins'] = translate('Display');
$tabs['system'] = translate('System');
$tabs['auth'] = translate('Authentication');
$tabs['config'] = translate('Config');
if (defined('ZM_PATH_DNSMASQ_CONF') and ZM_PATH_DNSMASQ_CONF) {
$tabs['dnsmasq'] = translate('DHCP');