Skip to content

Commit

Permalink
Move authentication options to it's own tab
Browse files Browse the repository at this point in the history
  • Loading branch information
Isaac Connor committed Nov 17, 2024
1 parent ce862d4 commit 70c7152
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
26 changes: 13 additions & 13 deletions scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ our @options = (
limited by their defined permissions.
`,
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_TYPE',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -367,7 +367,7 @@ our @options = (
],
type => $types{string},
private => 1,
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_HASH_IPS',
Expand All @@ -390,7 +390,7 @@ our @options = (
{ name=>'ZM_AUTH_RELAY', value=>'hashed' }
],
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_HASH_TTL',
Expand All @@ -405,7 +405,7 @@ our @options = (
{ name=>'ZM_AUTH_RELAY', value=>'hashed' }
],
type => $types{integer},
category => 'system',
category => 'auth',
},
{
name => 'ZM_AUTH_HASH_LOGINS',
Expand All @@ -431,7 +431,7 @@ our @options = (
{ name=>'ZM_AUTH_RELAY', value=>'hashed' }
],
type => $types{boolean},
category => 'system',
category => 'auth',
},
{
name => 'ZM_RTSP2WEB_PATH',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -560,7 +560,7 @@ our @options = (
],
type => $types{string},
private => 1,
category => 'system',
category => 'auth',
},
{
name => 'ZM_OPT_GOOG_RECAPTCHA_SECRETKEY',
Expand All @@ -576,7 +576,7 @@ our @options = (
],
type => $types{string},
private => 1,
category => 'system',
category => 'auth',
},
{
name => 'ZM_OPT_USE_GEOLOCATION',
Expand Down
1 change: 1 addition & 0 deletions web/skins/classic/views/options.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
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');
Expand Down

0 comments on commit 70c7152

Please sign in to comment.