← All changes | src/authorizer/options/class-login-access.php +11 -6 2.9.6 → 3.9.0 View file →

		@@ -14,9 +14,9 @@
14	14
15	15	/**
16	16	* Contains functions for rendering the Login Access tab in Authorizer Settings.
17	17	*/
18		-class Login_Access extends \Authorizer\Static_Instance {
	18	+class Login_Access extends \Authorizer\Singleton {
19	19
20	20	/**
21	21	* Settings print callback.
22	22	*
		@@ -45,10 +45,13 @@
45	45	$option = 'access_who_can_login';
46	46	$admin_mode = Helper::get_context( $args );
47	47	$auth_settings_option = $options->get( $option, $admin_mode, 'allow override', 'print overlay' );
48	48
49		- // If this site is configured independently of any multisite overrides, make sure we are not grabbing the multisite value; otherwise, grab the multisite value to show behind the disabled overlay.
50		- if ( is_multisite() && 1 === intval( $options->get( 'advanced_override_multisite' ) ) ) {
	49	+ // If this site is configured independently of any multisite overrides (and
	50	+ // is not prevented from doing so), make sure we are not grabbing the
	51	+ // multisite value; otherwise, grab the multisite value to show behind the
	52	+ // disabled overlay.
	53	+ if ( is_multisite() && 1 === intval( $options->get( 'advanced_override_multisite' ) ) && empty( $options->get( 'prevent_override_multisite', Helper::NETWORK_CONTEXT ) ) ) {
51	54	$auth_settings_option = $options->get( $option );
52	55	} elseif ( is_multisite() && Helper::SINGLE_CONTEXT === $admin_mode && $options->get( 'multisite_override', Helper::NETWORK_CONTEXT ) === '1' ) {
53	56	// Workaround: javascript code hides/shows other settings based
54	57	// on the selection in this option. If this option is overridden
		@@ -61,10 +64,13 @@
61	64	}
62	65
63	66	// Print option elements.
64	67	?>
65		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_external_users" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="external_users"<?php checked( 'external_users' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_external_users"><?php esc_html_e( 'All authenticated users (All external service users and all WordPress users)', 'authorizer' ); ?></label><br />
66		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_approved_users" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="approved_users"<?php checked( 'approved_users' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_approved_users"><?php esc_html_e( 'Only', 'authorizer' ); ?> <a href="javascript:chooseTab('access_lists' );" id="dashboard_link_approved_users"><?php esc_html_e( 'approved users', 'authorizer' ); ?></a> <?php esc_html_e( '(Approved external users and all WordPress users)', 'authorizer' ); ?></label><br />
	68	+ <fieldset>
	69	+ <label><input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_external_users" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="external_users"<?php checked( 'external_users' === $auth_settings_option ); ?> /> <?php esc_html_e( 'All authenticated users (All external service users and all WordPress users)', 'authorizer' ); ?></label>
	70	+ <br>
	71	+ <label><input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_approved_users" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="approved_users"<?php checked( 'approved_users' === $auth_settings_option ); ?> /> <?php esc_html_e( 'Only', 'authorizer' ); ?> <a href="javascript:chooseTab('access_lists' );" id="dashboard_link_approved_users"><?php esc_html_e( 'approved users', 'authorizer' ); ?></a> <?php esc_html_e( '(Approved external users and all WordPress users)', 'authorizer' ); ?></label>
	72	+ </fieldset>
67	73	<?php
68	74	}
69	75
70	76
		@@ -222,6 +228,5 @@
222	228	?>
223	229	</small>
224	230	<?php
225	231	}
226		-
227	232	}