← All changes | authorizer.php +2083 -3878 2.8.3 → 2.6.12 View file →

		@@ -1,31 +1,51 @@
1	1	<?php
2		-/**
3		- * Plugin Name: Authorizer
4		- * Description: Authorizer limits login attempts, restricts access to specified users, and authenticates against external sources (e.g., Google, LDAP, or CAS).
5		- * Author: Paul Ryan <prar@hawaii.edu>
6		- * Plugin URI: https://github.com/uhm-coe/authorizer
7		- * Text Domain: authorizer
8		- * Domain Path: /languages
9		- * License: GPL2
10		- * Version: 2.8.3
11		- *
12		- * @package authorizer
13		- */
	2	+/*
	3	+Plugin Name: Authorizer
	4	+Plugin URI: https://github.com/uhm-coe/authorizer
	5	+Description: Authorizer limits login attempts, restricts access to specified users, and authenticates against external sources (e.g., Google, LDAP, or CAS).
	6	+Version: 2.6.12
	7	+Author: Paul Ryan
	8	+Author URI: http://www.linkedin.com/in/paulrryan/
	9	+Text Domain: authorizer
	10	+Domain Path: /languages
	11	+License: GPL2
	12	+*/
14	13
15		-/**
16		- * Portions forked from Restricted Site Access plugin: http://wordpress.org/plugins/restricted-site-access/
17		- * Portions forked from wpCAS plugin: http://wordpress.org/extend/plugins/cas-authentication/
18		- * Portions forked from Limit Login Attempts: http://wordpress.org/plugins/limit-login-attempts/
19		- */
20	14
21		-/**
22		- * Add phpCAS library if it's not included.
23		- *
24		- * @see https://wiki.jasig.org/display/CASC/phpCAS+installation+guide
25		- */
	15	+/*
	16	+Copyright 2014 Paul Ryan (email: prar@hawaii.edu)
	17	+
	18	+This program is free software; you can redistribute it and/or modify
	19	+it under the terms of the GNU General Public License, version 2, as
	20	+published by the Free Software Foundation.
	21	+
	22	+This program is distributed in the hope that it will be useful,
	23	+but WITHOUT ANY WARRANTY; without even the implied warranty of
	24	+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	25	+GNU General Public License for more details.
	26	+
	27	+You should have received a copy of the GNU General Public License
	28	+along with this program; if not, write to the Free Software
	29	+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	30	+*/
	31	+
	32	+
	33	+/*
	34	+Portions forked from Restricted Site Access plugin: http://wordpress.org/plugins/restricted-site-access/
	35	+Portions forked from wpCAS plugin: http://wordpress.org/extend/plugins/cas-authentication/
	36	+Portions forked from Limit Login Attempts: http://wordpress.org/plugins/limit-login-attempts/
	37	+*/
	38	+
	39	+
	40	+define( 'MULTISITE_ADMIN', 'multisite_admin' );
	41	+define( 'SINGLE_ADMIN', 'single_admin' );
	42	+
	43	+
	44	+// Add phpCAS library if it's not included.
	45	+// @see https://wiki.jasig.org/display/CASC/phpCAS+installation+guide
26	46	if ( ! defined( 'PHPCAS_VERSION' ) ) {
27		- require_once dirname( __FILE__ ) . '/vendor/CAS-1.3.5/CAS.php';
	47	+ require_once dirname( __FILE__ ) . '/vendor/CAS-1.3.4/CAS.php';
28	48	}
29	49
30	50
31	51	if ( ! class_exists( 'WP_Plugin_Authorizer' ) ) {
		@@ -39,87 +59,18 @@
39	59	* @link http://hawaii.edu/coe/dcdc/wordpress/authorizer/doc/
40	60	*/
41	61	class WP_Plugin_Authorizer {
42	62
43		- /**
44		- * Constants for determining our admin context (network or individual site).
45		- */
46		- const NETWORK_CONTEXT = 'multisite_admin';
47		- const SINGLE_CONTEXT = 'single_admin';
48	63
49	64	/**
50		- * Current site ID (Multisite).
51		- *
52		- * @var string
53		- */
54		- public $current_site_blog_id = 1;
55		-
56		- /**
57		- * HTML allowed when rendering translatable strings in the Authorizer UI.
58		- * This is passed to wp_kses() when sanitizing HMTL strings.
59		- *
60		- * @var array
61		- */
62		- private $allowed_html = array(
63		- 'a' => array(
64		- 'class' => array(),
65		- 'href' => array(),
66		- 'style' => array(),
67		- 'target' => array(),
68		- 'title' => array(),
69		- ),
70		- 'b' => array(),
71		- 'br' => array(),
72		- 'div' => array(
73		- 'class' => array(),
74		- ),
75		- 'em' => array(),
76		- 'hr' => array(),
77		- 'i' => array(),
78		- 'input' => array(
79		- 'aria-describedby' => array(),
80		- 'class' => array(),
81		- 'id' => array(),
82		- 'name' => array(),
83		- 'size' => array(),
84		- 'type' => array(),
85		- 'value' => array(),
86		- ),
87		- 'label' => array(
88		- 'class' => array(),
89		- 'for' => array(),
90		- ),
91		- 'p' => array(
92		- 'style' => array(),
93		- ),
94		- 'span' => array(
95		- 'aria-hidden' => array(),
96		- 'class' => array(),
97		- 'id' => array(),
98		- 'style' => array(),
99		- ),
100		- 'strong' => array(),
101		- );
102		-
103		- /**
104	65	* Constructor.
105	66	*/
106	67	public function __construct() {
107		- // Save reference to current blog id in the network (support deprecated
108		- // constant BLOGID_CURRENT_SITE).
109		- if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
110		- $this->current_site_blog_id = BLOG_ID_CURRENT_SITE;
111		- } elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
112		- $this->current_site_blog_id = BLOGID_CURRENT_SITE;
113		- }
114		-
115	68	// Installation and uninstallation hooks.
116	69	register_activation_hook( __FILE__, array( $this, 'activate' ) );
117	70	register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) );
118	71
119		- /**
120		- * Register filters.
121		- */
	72	+ // Register filters.
122	73
123	74	// Custom wp authentication routine using external service.
124	75	add_filter( 'authenticate', array( $this, 'custom_authenticate' ), 1, 3 );
125	76
		@@ -125,9 +76,13 @@
125	76
126	77	// Custom logout action using external service.
127	78	add_action( 'wp_logout', array( $this, 'custom_logout' ) );
128	79
129		- // Create settings link on Plugins page.
	80	+ // Removing this bypasses Wordpress authentication (so if external auth fails,
	81	+ // no one can log in); with it enabled, it will run if external auth fails.
	82	+ //remove_filter('authenticate', 'wp_authenticate_username_password', 20, 3);
	83	+
	84	+ // Create settings link on Plugins page
130	85	add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_settings_link' ) );
131	86	add_filter( 'network_admin_plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'network_admin_plugin_settings_link' ) );
132	87
133	88	// Modify login page with a custom password url (if option is set).
		@@ -138,11 +93,9 @@
138	93	if ( $error && strlen( $error ) > 0 ) {
139	94	add_filter( 'login_errors', array( $this, 'show_advanced_login_error' ) );
140	95	}
141	96
142		- /**
143		- * Register actions.
144		- */
	97	+ // Register actions.
145	98
146	99	// Enable localization. Translation files stored in /languages.
147	100	add_action( 'plugins_loaded', array( $this, 'load_textdomain' ) );
148	101
		@@ -154,20 +107,18 @@
154	107
155	108	// Add users who successfully login to the approved list.
156	109	add_action( 'wp_login', array( $this, 'ensure_wordpress_user_in_approved_list_on_login' ), 10, 2 );
157	110
158		- // Create menu item in Settings.
	111	+ // Create menu item in Settings
159	112	add_action( 'admin_menu', array( $this, 'add_plugin_page' ) );
160	113
161		- // Create options page.
	114	+ // Create options page
162	115	add_action( 'admin_init', array( $this, 'page_init' ) );
163	116
164	117	// Update user role in approved list if it's changed in the WordPress edit user page.
165		- add_action( 'user_profile_update_errors', array( $this, 'edit_user_profile_update_role' ), 10, 3 );
	118	+ add_action( 'edit_user_profile_update', array( $this, 'edit_user_profile_update_role' ) );
	119	+ add_action( 'personal_options_update', array( $this, 'edit_user_profile_update_role' ) );
166	120
167		- // Update user email in approved list if it's changed in the WordPress edit user page.
168		- add_filter( 'send_email_change_email', array( $this, 'edit_user_profile_update_email' ), 10, 3 );
169		-
170	121	// Enqueue javascript and css on the plugin's options page, the
171	122	// dashboard (for the widget), and the network admin.
172	123	add_action( 'load-settings_page_authorizer', array( $this, 'load_options_page' ) );
173	124	add_action( 'admin_head-index.php', array( $this, 'load_options_page' ) );
		@@ -172,16 +123,13 @@
172	123	add_action( 'load-settings_page_authorizer', array( $this, 'load_options_page' ) );
173	124	add_action( 'admin_head-index.php', array( $this, 'load_options_page' ) );
174	125	add_action( 'load-toplevel_page_authorizer', array( $this, 'load_options_page' ) );
175	126
176		- // Add custom css and js to wp-login.php.
	127	+ // Add custom css and js to wp-login.php
177	128	add_action( 'login_enqueue_scripts', array( $this, 'login_enqueue_scripts_and_styles' ) );
178	129	add_action( 'login_footer', array( $this, 'load_login_footer_js' ) );
179	130
180		- // Create google nonce cookie when loading wp-login.php if Google is enabled.
181		- add_action( 'login_init', array( $this, 'login_init__maybe_set_google_nonce_cookie' ) );
182		-
183		- // Modify login page with external auth links (if enabled; e.g., google or cas).
	131	+ // Modify login page with external auth links (if enabled; e.g., google or cas)
184	132	add_action( 'login_form', array( $this, 'login_form_add_external_service_links' ) );
185	133
186	134	// Redirect to CAS login when visiting login page (only if option is
187	135	// enabled, CAS is the only service, and WordPress logins are hidden).
		@@ -190,28 +138,25 @@
190	138	// output is started (so the redirect header doesn't complain about data
191	139	// already being sent).
192	140	add_filter( 'wp_login_errors', array( $this, 'wp_login_errors__maybe_redirect_to_cas' ), 10, 2 );
193	141
194		- // Verify current user has access to page they are visiting.
	142	+ // Verify current user has access to page they are visiting
195	143	add_action( 'parse_request', array( $this, 'restrict_access' ), 9 );
196	144	add_action( 'init', array( $this, 'init__maybe_add_network_approved_user' ) );
197	145
198		- // AJAX: Save options from dashboard widget.
	146	+ // ajax save options from dashboard widget
199	147	add_action( 'wp_ajax_update_auth_user', array( $this, 'ajax_update_auth_user' ) );
200	148
201		- // AJAX: Save options from multisite options page.
	149	+ // ajax save options from multisite options page
202	150	add_action( 'wp_ajax_save_auth_multisite_settings', array( $this, 'ajax_save_auth_multisite_settings' ) );
203	151
204		- // AJAX: Save usermeta from options page.
	152	+ // ajax save usermeta from options page
205	153	add_action( 'wp_ajax_update_auth_usermeta', array( $this, 'ajax_update_auth_usermeta' ) );
206	154
207		- // AJAX: Verify google login.
	155	+ // ajax verify google login
208	156	add_action( 'wp_ajax_process_google_login', array( $this, 'ajax_process_google_login' ) );
209	157	add_action( 'wp_ajax_nopriv_process_google_login', array( $this, 'ajax_process_google_login' ) );
210	158
211		- // AJAX: Refresh approved user list.
212		- add_action( 'wp_ajax_refresh_approved_user_list', array( $this, 'ajax_refresh_approved_user_list' ) );
213		-
214	159	// Add dashboard widget so instructors can add/edit users with access.
215	160	// Hint: For Multisite Network Admin Dashboard use wp_network_dashboard_setup instead of wp_dashboard_setup.
216	161	add_action( 'wp_dashboard_setup', array( $this, 'add_dashboard_widgets' ) );
217	162
		@@ -226,12 +171,17 @@
226	171	add_action( 'wp_enqueue_scripts', array( $this, 'auth_public_scripts' ), 20 );
227	172
228	173	// Multisite-specific actions.
229	174	if ( is_multisite() ) {
230		- // Add network admin options page (global settings for all sites).
	175	+ // Add network admin options page (global settings for all sites)
231	176	add_action( 'network_admin_menu', array( $this, 'network_admin_menu' ) );
232	177	}
233	178
	179	+ // Create login cookie (used by google login)
	180	+ if ( ! isset( $_COOKIE['login_unique'] ) ) {
	181	+ setcookie( 'login_unique', $this->get_cookie_value(), time()+1800, '/', defined( 'COOKIE_DOMAIN' ) ? COOKIE_DOMAIN : '' );
	182	+ }
	183	+
234	184	// Remove user from authorizer lists when that user is deleted in WordPress.
235	185	add_action( 'delete_user', array( $this, 'remove_user_from_authorizer_when_deleted' ) );
236	186	if ( is_multisite() ) {
237	187	// Remove multisite user from authorizer lists when that user is deleted from Network Users.
		@@ -264,20 +214,16 @@
264	214	* Will also activate the plugin for all sites/blogs if this is a "Network enable."
265	215	*
266	216	* @return void
267	217	*/
268		- public function activate( $network_wide ) {
	218	+ public function activate() {
269	219	global $wpdb;
270	220
271		- // If we're in a multisite environment, run the plugin activation for each
272		- // site when network enabling.
273		- // Note: wp-cli does not use nonces, so we skip the nonce check here to
274		- // allow the "wp plugin activate authorizer" command.
275		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
276		- if ( is_multisite() && $network_wide ) {
	221	+ // If we're in a multisite environment, run the plugin activation for each site when network enabling
	222	+ if ( is_multisite() && isset( $_GET['networkwide'] ) && $_GET['networkwide'] == 1 ) {
277	223
278	224	// Add super admins to the multisite approved list.
279		- $auth_multisite_settings_access_users_approved = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', array() );
	225	+ $auth_multisite_settings_access_users_approved = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', array() );
280	226	$should_update_auth_multisite_settings_access_users_approved = false;
281	227	foreach ( get_super_admins() as $super_admin ) {
282	228	$user = get_user_by( 'login', $super_admin );
283	229	// Add to approved list if not there.
		@@ -282,10 +228,10 @@
282	228	$user = get_user_by( 'login', $super_admin );
283	229	// Add to approved list if not there.
284	230	if ( ! $this->in_multi_array( $user->user_email, $auth_multisite_settings_access_users_approved ) ) {
285	231	$approved_user = array(
286		- 'email' => $this->lowercase( $user->user_email ),
287		- 'role' => count( $user->roles ) > 0 ? $user->roles[0] : 'administrator',
	232	+ 'email' => $user->user_email,
	233	+ 'role' => count( $user->roles ) > 0 ? $user->roles[0] : 'administrator',
288	234	'date_added' => date( 'M Y', strtotime( $user->user_registered ) ),
289	235	'local_user' => true,
290	236	);
291	237	array_push( $auth_multisite_settings_access_users_approved, $approved_user );
		@@ -292,14 +238,13 @@
292	238	$should_update_auth_multisite_settings_access_users_approved = true;
293	239	}
294	240	}
295	241	if ( $should_update_auth_multisite_settings_access_users_approved ) {
296		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	242	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
297	243	}
298	244
299	245	// Run plugin activation on each site in the network.
300	246	$current_blog_id = $wpdb->blogid;
301		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
302	247	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
303	248	foreach ( $sites as $site ) {
304	249	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
305	250	switch_to_blog( $blog_id );
		@@ -328,13 +273,13 @@
328	273	* @return void
329	274	*/
330	275	private function add_wp_users_to_approved_list() {
331	276	// Add current WordPress users to the approved list.
332		- $auth_multisite_settings_access_users_approved = is_multisite() ? get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', array() ) : array();
333		- $auth_settings_access_users_pending = $this->get_plugin_option( 'access_users_pending', WP_Plugin_Authorizer::SINGLE_CONTEXT );
334		- $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
335		- $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT );
336		- $updated = false;
	277	+ $auth_multisite_settings_access_users_approved = is_multisite() ? get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', array() ) : array();
	278	+ $auth_settings_access_users_pending = $this->get_plugin_option( 'access_users_pending', SINGLE_ADMIN );
	279	+ $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN );
	280	+ $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN );
	281	+ $updated = false;
337	282	foreach ( get_users() as $user ) {
338	283	// Skip if user is in blocked list.
339	284	if ( $this->in_multi_array( $user->user_email, $auth_settings_access_users_blocked ) ) {
340	285	continue;
		@@ -340,10 +285,10 @@
340	285	continue;
341	286	}
342	287	// Remove from pending list if there.
343	288	foreach ( $auth_settings_access_users_pending as $key => $pending_user ) {
344		- if ( 0 === strcasecmp( $pending_user['email'], $user->user_email ) ) {
345		- unset( $auth_settings_access_users_pending[ $key ] );
	289	+ if ( $pending_user['email'] == $user->user_email ) {
	290	+ unset( $auth_settings_access_users_pending[$key] );
346	291	$updated = true;
347	292	}
348	293	}
349	294	// Skip if user is in multisite approved list.
		@@ -352,10 +297,10 @@
352	297	}
353	298	// Add to approved list if not there.
354	299	if ( ! $this->in_multi_array( $user->user_email, $auth_settings_access_users_approved ) ) {
355	300	$approved_user = array(
356		- 'email' => $this->lowercase( $user->user_email ),
357		- 'role' => count( $user->roles ) > 0 ? $user->roles[0] : '',
	301	+ 'email' => $user->user_email,
	302	+ 'role' => count( $user->roles ) > 0 ? $user->roles[0] : '',
358	303	'date_added' => date( 'M Y', strtotime( $user->user_registered ) ),
359	304	'local_user' => true,
360	305	);
361	306	array_push( $auth_settings_access_users_approved, $approved_user );
		@@ -390,14 +335,13 @@
390	335
391	336	/**
392	337	* Authenticate against an external service.
393	338	*
394		- * Filter: authenticate
395		- *
396		- * @param WP_User $user user to authenticate.
	339	+ * @param WP_User $user user to authenticate
397	340	* @param string $username optional username to authenticate.
398	341	* @param string $password optional password to authenticate.
399		- * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
	342	+ *
	343	+ * @return WP_User or WP_Error
400	344	*/
401	345	public function custom_authenticate( $user, $username, $password ) {
402	346	// Pass through if already authenticated.
403	347	if ( is_a( $user, 'WP_User' ) ) {
		@@ -405,20 +349,20 @@
405	349	} else {
406	350	$user = null;
407	351	}
408	352
409		- // If username and password are blank, this isn't a log in attempt.
	353	+ // If username and password are blank, this isn't a log in attempt
410	354	$is_login_attempt = strlen( $username ) > 0 && strlen( $password ) > 0;
411	355
412	356	// Check to make sure that $username is not locked out due to too
413	357	// many invalid login attempts. If it is, tell the user how much
414	358	// time remains until they can try again.
415		- $unauthenticated_user = $is_login_attempt ? get_user_by( 'login', $username ) : false;
	359	+ $unauthenticated_user = $is_login_attempt ? get_user_by( 'login', $username ) : false;
416	360	$unauthenticated_user_is_blocked = false;
417		- if ( $is_login_attempt && false !== $unauthenticated_user ) {
	361	+ if ( $is_login_attempt && $unauthenticated_user !== false ) {
418	362	$last_attempt = get_user_meta( $unauthenticated_user->ID, 'auth_settings_advanced_lockouts_time_last_failed', true );
419	363	$num_attempts = get_user_meta( $unauthenticated_user->ID, 'auth_settings_advanced_lockouts_failed_attempts', true );
420		- // Also check the auth_blocked user_meta flag (users in blocked list will get this flag).
	364	+ // Also check the auth_blocked user_meta flag (users in blocked list will get this flag)
421	365	$unauthenticated_user_is_blocked = get_user_meta( $unauthenticated_user->ID, 'auth_blocked', true ) === 'yes';
422	366	} else {
423	367	$last_attempt = get_option( 'auth_settings_advanced_lockouts_time_last_failed' );
424	368	$num_attempts = get_option( 'auth_settings_advanced_lockouts_failed_attempts' );
		@@ -432,9 +376,9 @@
432	376	return new WP_Error( 'empty_password', __( '<strong>ERROR</strong>: Incorrect username or password.', 'authorizer' ) );
433	377	}
434	378
435	379	// Grab plugin settings.
436		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	380	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
437	381
438	382	// Make sure $last_attempt (time) and $num_attempts are positive integers.
439	383	// Note: this addresses resetting them if either is unset from above.
440	384	$last_attempt = abs( intval( $last_attempt ) );
		@@ -440,17 +384,17 @@
440	384	$last_attempt = abs( intval( $last_attempt ) );
441	385	$num_attempts = abs( intval( $num_attempts ) );
442	386
443	387	// Create semantic lockout variables.
444		- $lockouts = $auth_settings['advanced_lockouts'];
445		- $time_since_last_fail = time() - $last_attempt;
446		- $reset_duration = $lockouts['reset_duration'] * 60; // minutes to seconds.
447		- $num_attempts_long_lockout = $lockouts['attempts_1'] + $lockouts['attempts_2'];
448		- $num_attempts_short_lockout = $lockouts['attempts_1'];
449		- $seconds_remaining_long_lockout = $lockouts['duration_2'] * 60 - $time_since_last_fail;
	388	+ $lockouts = $auth_settings['advanced_lockouts'];
	389	+ $time_since_last_fail = time() - $last_attempt;
	390	+ $reset_duration = $lockouts['reset_duration'] * 60; // minutes to seconds
	391	+ $num_attempts_long_lockout = $lockouts['attempts_1'] + $lockouts['attempts_2'];
	392	+ $num_attempts_short_lockout = $lockouts['attempts_1'];
	393	+ $seconds_remaining_long_lockout = $lockouts['duration_2'] * 60 - $time_since_last_fail;
450	394	$seconds_remaining_short_lockout = $lockouts['duration_1'] * 60 - $time_since_last_fail;
451	395
452		- // Check if we need to institute a lockout delay.
	396	+ // Check if we need to institute a lockout delay
453	397	if ( $is_login_attempt && $time_since_last_fail > $reset_duration ) {
454	398	// Enough time has passed since the last invalid attempt and
455	399	// now that we can reset the failed attempt count, and let this
456	400	// login attempt go through.
		@@ -463,9 +407,8 @@
463	407	remove_filter( 'authenticate', 'wp_authenticate_username_password', 20, 3 );
464	408	return new WP_Error(
465	409	'empty_password',
466	410	sprintf(
467		- /* TRANSLATORS: 1: username 2: duration of lockout in seconds 3: duration of lockout as a phrase 4: lost password URL */
468	411	__( '<strong>ERROR</strong>: There have been too many invalid login attempts for the username <strong>%1$s</strong>. Please wait <strong id="seconds_remaining" data-seconds="%2$s">%3$s</strong> before trying again. <a href="%4$s" title="Password Lost and Found">Lost your password</a>?', 'authorizer' ),
469	412	$username,
470	413	$seconds_remaining_long_lockout,
471	414	$this->seconds_as_sentence( $seconds_remaining_long_lockout ),
		@@ -480,9 +423,8 @@
480	423	remove_filter( 'authenticate', 'wp_authenticate_username_password', 20, 3 );
481	424	return new WP_Error(
482	425	'empty_password',
483	426	sprintf(
484		- /* TRANSLATORS: 1: username 2: duration of lockout in seconds 3: duration of lockout as a phrase 4: lost password URL */
485	427	__( '<strong>ERROR</strong>: There have been too many invalid login attempts for the username <strong>%1$s</strong>. Please wait <strong id="seconds_remaining" data-seconds="%2$s">%3$s</strong> before trying again. <a href="%4$s" title="Password Lost and Found">Lost your password</a>?', 'authorizer' ),
486	428	$username,
487	429	$seconds_remaining_short_lockout,
488	430	$this->seconds_as_sentence( $seconds_remaining_short_lockout ),
		@@ -492,16 +434,16 @@
492	434	}
493	435
494	436	// Start external authentication.
495	437	$externally_authenticated_emails = array();
496		- $authenticated_by = '';
497		- $result = null;
	438	+ $authenticated_by = '';
	439	+ $result = null;
498	440
499	441	// Try Google authentication if it's enabled and we don't have a
500	442	// successful login yet.
501	443	if (
502		- '1' === $auth_settings['google'] &&
503		- 0 === count( $externally_authenticated_emails ) &&
	444	+ $auth_settings['google'] === '1' &&
	445	+ count( $externally_authenticated_emails ) === 0 &&
504	446	! is_wp_error( $result )
505	447	) {
506	448	$result = $this->custom_authenticate_google( $auth_settings );
507	449	if ( ! is_null( $result ) && ! is_wp_error( $result ) ) {
		@@ -516,10 +458,10 @@
516	458
517	459	// Try CAS authentication if it's enabled and we don't have a
518	460	// successful login yet.
519	461	if (
520		- '1' === $auth_settings['cas'] &&
521		- 0 === count( $externally_authenticated_emails ) &&
	462	+ $auth_settings['cas'] === '1' &&
	463	+ count( $externally_authenticated_emails ) === 0 &&
522	464	! is_wp_error( $result )
523	465	) {
524	466	$result = $this->custom_authenticate_cas( $auth_settings );
525	467	if ( ! is_null( $result ) && ! is_wp_error( $result ) ) {
		@@ -534,10 +476,10 @@
534	476
535	477	// Try LDAP authentication if it's enabled and we don't have an
536	478	// authenticated user yet.
537	479	if (
538		- '1' === $auth_settings['ldap'] &&
539		- 0 === count( $externally_authenticated_emails ) &&
	480	+ $auth_settings['ldap'] === '1' &&
	481	+ count( $externally_authenticated_emails ) === 0 &&
540	482	! is_wp_error( $result )
541	483	) {
542	484	$result = $this->custom_authenticate_ldap( $auth_settings, $username, $password );
543	485	if ( ! is_null( $result ) && ! is_wp_error( $result ) ) {
		@@ -558,33 +500,31 @@
558	500
559	501	// Remove duplicate and blank emails, if any.
560	502	$externally_authenticated_emails = array_filter( array_unique( $externally_authenticated_emails ) );
561	503
562		- /**
563		- * If we've made it this far, we should have an externally
564		- * authenticated user. The following should be set:
565		- * $externally_authenticated_emails
566		- * $authenticated_by
567		- */
	504	+ // If we've made it this far, we should have an externally
	505	+ // authenticated user. The following should be set:
	506	+ // $externally_authenticated_emails
	507	+ // $authenticated_by
568	508
569	509	// Get the external user's WordPress account by email address.
570	510	foreach ( $externally_authenticated_emails as $externally_authenticated_email ) {
571		- $user = get_user_by( 'email', $this->lowercase( $externally_authenticated_email ) );
	511	+ $user = get_user_by( 'email', $externally_authenticated_email );
572	512
573	513	// If we've already found a WordPress user associated with one
574	514	// of the supplied email addresses, don't keep examining other
575	515	// email addresses associated with the externally authenticated user.
576		- if ( false !== $user ) {
	516	+ if ( $user !== FALSE ) {
577	517	break;
578	518	}
579	519	}
580	520
581	521	// Check this external user's access against the access lists
582		- // (pending, approved, blocked).
	522	+ // (pending, approved, blocked)
583	523	$result = $this->check_user_access( $user, $externally_authenticated_emails, $result );
584	524
585	525	// Fail with message if there was an error creating/adding the user.
586		- if ( is_wp_error( $result ) || 0 === $result ) {
	526	+ if ( is_wp_error( $result ) || $result === 0 ) {
587	527	return $result;
588	528	}
589	529
590	530	// If we created a new user in check_user_access(), log that user in.
		@@ -605,30 +545,27 @@
605	545	/**
606	546	* This function will fail with a wp_die() message to the user if they
607	547	* don't have access.
608	548	*
609		- * @param WP_User $user User to check.
610		- * @param array $user_emails Array of user's plaintext emails (in case current user doesn't have a WP account).
611		- * @param array $user_data Array of keys for email, username, first_name, last_name,
612		- * authenticated_by, google_attributes, cas_attributes, ldap_attributes.
613		- * @return WP_Error|void|null|WP_User
614		- * WP_Error if there was an error on user creation / adding user to blog.
615		- * wp_die() if user does not have access.
616		- * null if user has access (success).
617		- * WP_User if user has access and a new account was created for them.
	549	+ * @param WP_User $user User to check
	550	+ * @param [type] $user_emails Array of user's plaintext emails (in case current user doesn't have a WP account)
	551	+ * @param [type] $user_data Array of keys for email, username, first_name, last_name,
	552	+ * authenticated_by, google_attributes, cas_attributes, ldap_attributes.
	553	+ * @return WP_Error if there was an error on user creation / adding user to blog
	554	+ * wp_die() if user does not have access
	555	+ * null if user has access (success)
	556	+ * WP_User if user has access and a new account was created for them
618	557	*/
619	558	private function check_user_access( $user, $user_emails, $user_data = array() ) {
620	559	// Grab plugin settings.
621		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
622		- $auth_settings_access_users_pending = $this->sanitize_user_list(
623		- $this->get_plugin_option( 'access_users_pending', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	560	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
	561	+ $auth_settings_access_users_pending = $this->sanitize_user_list(
	562	+ $this->get_plugin_option( 'access_users_pending', SINGLE_ADMIN )
624	563	);
625		- $auth_settings_access_users_approved_single = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
626		- $auth_settings_access_users_approved_multi = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT );
627		- $auth_settings_access_users_approved = $this->sanitize_user_list(
	564	+ $auth_settings_access_users_approved = $this->sanitize_user_list(
628	565	array_merge(
629		- $auth_settings_access_users_approved_single,
630		- $auth_settings_access_users_approved_multi
	566	+ $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN ),
	567	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
631	568	)
632	569	);
633	570
634	571	/**
		@@ -637,9 +574,9 @@
637	574	*
638	575	* @param bool $allow_login Whether to block the currently logging in user.
639	576	* @param array $user_data User data returned from external service.
640	577	*/
641		- $allow_login = apply_filters( 'authorizer_allow_login', true, $user_data );
	578	+ $allow_login = apply_filters( 'authorizer_allow_login', true, $user_data );
642	579	$blocked_by_filter = ! $allow_login; // Use this for better readability.
643	580
644	581	// Check our externally authenticated user against the block list.
645	582	// If any of their email addresses are blocked, set the relevant user
		@@ -649,16 +586,14 @@
649	586
650	587	// Add user to blocked list if it was blocked via the filter.
651	588	if ( $blocked_by_filter && ! $this->is_email_in_list( $user_email, 'blocked' ) ) {
652	589	$auth_settings_access_users_blocked = $this->sanitize_user_list(
653		- $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	590	+ $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN )
654	591	);
655		- array_push(
656		- $auth_settings_access_users_blocked, array(
657		- 'email' => $this->lowercase( $user_email ),
658		- 'date_added' => date( 'M Y' ),
659		- )
660		- );
	592	+ array_push( $auth_settings_access_users_blocked, array(
	593	+ 'email' => $user_email,
	594	+ 'date_added' => date( 'M Y' ),
	595	+ ));
661	596	update_option( 'auth_settings_access_users_blocked', $auth_settings_access_users_blocked );
662	597	}
663	598
664	599	// If the blocked external user has a WordPress account, mark it as
		@@ -667,11 +602,10 @@
667	602	update_user_meta( $user->ID, 'auth_blocked', 'yes' );
668	603	}
669	604
670	605	// Notify user about blocked status and return without authenticating them.
671		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
672		- $redirect_to = ! empty( $_REQUEST['redirect_to'] ) ? esc_url_raw( wp_unslash( $_REQUEST['redirect_to'] ) ) : home_url();
673		- $page_title = sprintf(
	606	+ $redirect_to = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : home_url();
	607	+ $page_title = sprintf(
674	608	/* TRANSLATORS: %s: Name of blog */
675	609	__( '%s - Access Restricted', 'authorizer' ),
676	610	get_bloginfo( 'name' )
677	611	);
		@@ -682,14 +616,13 @@
682	616	'<a class="button" href="' . wp_logout_url( $redirect_to ) . '">' .
683	617	__( 'Back', 'authorizer' ) .
684	618	'</a></p>';
685	619	update_option( 'auth_settings_advanced_login_error', $error_message );
686		- wp_die( wp_kses( $error_message, $this->allowed_html ), esc_html( $page_title ) );
	620	+ wp_die( $error_message, $page_title );
687	621	}
688	622	}
689	623
690		- // Get the default role for this user (or their current role, if they
691		- // already have an account).
	624	+ // Get the default role for this new user.
692	625	$default_role = $user && is_array( $user->roles ) && count( $user->roles ) > 0 ? $user->roles[0] : $auth_settings['access_default_role'];
693	626	/**
694	627	* Filter the role of the user currently logging in. The role will be
695	628	* set to the default (specified in Authorizer options) for new users,
		@@ -694,9 +627,8 @@
694	627	* Filter the role of the user currently logging in. The role will be
695	628	* set to the default (specified in Authorizer options) for new users,
696	629	* or the user's current role for existing users. This filter allows
697	630	* changing user roles based on custom CAS/LDAP attributes.
698		- *
699	631	* @param bool $role Role of the user currently logging in.
700	632	* @param array $user_data User data returned from external service.
701	633	*/
702	634	$approved_role = apply_filters( 'authorizer_custom_role', $default_role, $user_data );
		@@ -729,12 +661,14 @@
729	661	// and login access is set to "All authenticated users," or if they were
730	662	// automatically approved in the "authorizer_approve_login" filter
731	663	// above, then add them to the approved list (they'll get an account
732	664	// created below if they don't have one yet).
733		- if (
	665	+ if ( (
734	666	! $this->is_email_in_list( $user_email, 'approved' ) &&
735		- ( 'external_users' === $auth_settings['access_who_can_login'] || $automatically_approve_login )
736		- ) {
	667	+ $auth_settings['access_who_can_login'] === 'external_users'
	668	+ ) || (
	669	+ $automatically_approve_login
	670	+ ) ) {
737	671	$is_newly_approved_user = true;
738	672
739	673	// If this user happens to be in the pending list (rare),
740	674	// remove them from pending before adding them to approved.
		@@ -739,9 +673,9 @@
739	673	// If this user happens to be in the pending list (rare),
740	674	// remove them from pending before adding them to approved.
741	675	if ( $this->is_email_in_list( $user_email, 'pending' ) ) {
742	676	foreach ( $auth_settings_access_users_pending as $key => $pending_user ) {
743		- if ( 0 === strcasecmp( $pending_user['email'], $user_email ) ) {
	677	+ if ( $pending_user['email'] === $user_email ) {
744	678	unset( $auth_settings_access_users_pending[ $key ] );
745	679	update_option( 'auth_settings_access_users_pending', $auth_settings_access_users_pending );
746	680	break;
747	681	}
		@@ -749,15 +683,14 @@
749	683	}
750	684
751	685	// Add this user to the approved list.
752	686	$approved_user = array(
753		- 'email' => $this->lowercase( $user_email ),
754		- 'role' => $approved_role,
755		- 'date_added' => date( 'Y-m-d H:i:s' ),
	687	+ 'email' => $user_email,
	688	+ 'role' => $approved_role,
	689	+ 'date_added' => date( "Y-m-d H:i:s" ),
756	690	);
757	691	array_push( $auth_settings_access_users_approved, $approved_user );
758		- array_push( $auth_settings_access_users_approved_single, $approved_user );
759		- update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved_single );
	692	+ update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
760	693	}
761	694
762	695	// Check our externally authenticated user against the approved
763	696	// list. If they are approved, log them in (and create their account
		@@ -771,9 +704,9 @@
771	704	if ( $default_role !== $approved_role ) {
772	705	$user_info['role'] = $approved_role;
773	706	}
774	707
775		- // If the approved external user does not have a WordPress account, create it.
	708	+ // If the approved external user does not have a WordPress account, create it
776	709	if ( ! $user ) {
777	710	// If there's already a user with this username (e.g.,
778	711	// johndoe/johndoe@gmail.com exists, and we're trying to add
779	712	// johndoe/johndoe@example.com), use the full email address
		@@ -788,47 +721,26 @@
788	721	$username = $user_info['email'];
789	722	}
790	723	$result = wp_insert_user(
791	724	array(
792		- 'user_login' => strtolower( $username ),
793		- 'user_pass' => wp_generate_password(), // random password.
794		- 'first_name' => array_key_exists( 'first_name', $user_data ) ? $user_data['first_name'] : '',
795		- 'last_name' => array_key_exists( 'last_name', $user_data ) ? $user_data['last_name'] : '',
796		- 'user_email' => $this->lowercase( $user_info['email'] ),
	725	+ 'user_login' => strtolower( $username ),
	726	+ 'user_pass' => wp_generate_password(), // random password
	727	+ 'first_name' => array_key_exists( 'first_name', $user_data ) ? $user_data['first_name'] : '',
	728	+ 'last_name' => array_key_exists( 'last_name', $user_data ) ? $user_data['last_name'] : '',
	729	+ 'user_email' => strtolower( $user_info['email'] ),
797	730	'user_registered' => date( 'Y-m-d H:i:s' ),
798		- 'role' => $user_info['role'],
	731	+ 'role' => $user_info['role'],
799	732	)
800	733	);
801	734
802	735	// Fail with message if error.
803		- if ( is_wp_error( $result ) || 0 === $result ) {
	736	+ if ( is_wp_error( $result ) || $result === 0 ) {
804	737	return $result;
805	738	}
806	739
807		- // Authenticate as new user.
	740	+ // Authenticate as new user
808	741	$user = new WP_User( $result );
809	742
810		- /**
811		- * Fires after an external user is authenticated for the first time
812		- * and a new WordPress account is created for them.
813		- *
814		- * @since 2.8.0
815		- *
816		- * @param WP_User $user User object.
817		- * @param array $user_data User data from external service.
818		- *
819		- * Example $user_data:
820		- * array(
821		- * 'email' => 'user@example.edu',
822		- * 'username' => 'user',
823		- * 'first_name' => 'First',
824		- * 'last_name' => 'Last',
825		- * 'authenticated_by' => 'cas',
826		- * 'cas_attributes' => array( ... ),
827		- * );
828		- */
829		- do_action( 'authorizer_user_register', $user, $user_data );
830		-
831	743	// If multisite, iterate through all sites in the network and add the user
832	744	// currently logging in to any of them that have the user on the approved list.
833	745	// Note: this is useful for first-time logins--some users will have access
834	746	// to multiple sites, and this prevents them from having to log into each
		@@ -834,21 +746,18 @@
834	746	// to multiple sites, and this prevents them from having to log into each
835	747	// site individually to get access.
836	748	if ( is_multisite() ) {
837	749	$site_ids_of_user = array_map(
838		- function ( $site_of_user ) {
839		- return intval( $site_of_user->userblog_id );
840		- },
	750	+ function ( $site_of_user ) { return $site_of_user->userblog_id; },
841	751	get_blogs_of_user( $user->ID )
842	752	);
843	753
844		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
845	754	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
846	755	foreach ( $sites as $site ) {
847	756	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
848	757
849	758	// Skip if user is already added to this site.
850		- if ( in_array( intval( $blog_id ), $site_ids_of_user, true ) ) {
	759	+ if ( in_array( $blog_id, $site_ids_of_user ) ) {
851	760	continue;
852	761	}
853	762
854	763	// Check if user is on the approved list of this site they are not added to.
		@@ -874,9 +783,9 @@
874	783	if ( $meta_key === $user_info['usermeta']['meta_key'] ) {
875	784	// Update user's usermeta value for usermeta key stored in authorizer options.
876	785	if ( strpos( $meta_key, 'acf___' ) === 0 && class_exists( 'acf' ) ) {
877	786	// We have an ACF field value, so use the ACF function to update it.
878		- update_field( str_replace( 'acf___', '', $meta_key ), $user_info['usermeta']['meta_value'], 'user_' . $user->ID );
	787	+ update_field( str_replace('acf___', '', $meta_key ), $user_info['usermeta']['meta_value'], 'user_' . $user->ID );
879	788	} else {
880	789	// We have a normal usermeta value, so just update it via the WordPress function.
881	790	update_user_meta( $user->ID, $meta_key, $user_info['usermeta']['meta_value'] );
882	791	}
		@@ -892,9 +801,9 @@
892	801	switch_to_blog( $blog_id );
893	802	// Update user's usermeta value for usermeta key stored in authorizer options.
894	803	if ( strpos( $meta_key, 'acf___' ) === 0 && class_exists( 'acf' ) ) {
895	804	// We have an ACF field value, so use the ACF function to update it.
896		- update_field( str_replace( 'acf___', '', $meta_key ), $usermeta['meta_value'], 'user_' . $user->ID );
	805	+ update_field( str_replace('acf___', '', $meta_key ), $usermeta['meta_value'], 'user_' . $user->ID );
897	806	} else {
898	807	// We have a normal usermeta value, so just update it via the WordPress function.
899	808	update_user_meta( $user->ID, $meta_key, $usermeta['meta_value'] );
900	809	}
		@@ -905,24 +814,20 @@
905	814	}
906	815	} else {
907	816	// Update first/last names of WordPress user from external
908	817	// service if that option is set.
909		- if ( ( array_key_exists( 'authenticated_by', $user_data ) && 'cas' === $user_data['authenticated_by'] && array_key_exists( 'cas_attr_update_on_login', $auth_settings ) && 1 === intval( $auth_settings['cas_attr_update_on_login'] ) ) || ( array_key_exists( 'authenticated_by', $user_data ) && 'ldap' === $user_data['authenticated_by'] && array_key_exists( 'ldap_attr_update_on_login', $auth_settings ) && 1 === intval( $auth_settings['ldap_attr_update_on_login'] ) ) ) {
910		- if ( array_key_exists( 'first_name', $user_data ) && 0 < strlen( $user_data['first_name'] ) ) {
911		- wp_update_user(
912		- array(
913		- 'ID' => $user->ID,
914		- 'first_name' => $user_data['first_name'],
915		- )
916		- );
	818	+ if ( ( array_key_exists( 'authenticated_by', $user_data ) && $user_data['authenticated_by'] === 'cas' && array_key_exists( 'cas_attr_update_on_login', $auth_settings ) && $auth_settings['cas_attr_update_on_login'] == 1 ) || ( array_key_exists( 'authenticated_by', $user_data ) && $user_data['authenticated_by'] === 'ldap' && array_key_exists( 'ldap_attr_update_on_login', $auth_settings ) && $auth_settings['ldap_attr_update_on_login'] == 1 ) ) {
	819	+ if ( array_key_exists( 'first_name', $user_data ) && strlen( $user_data['first_name'] ) > 0 ) {
	820	+ wp_update_user( array(
	821	+ 'ID' => $user->ID,
	822	+ 'first_name' => $user_data['first_name'],
	823	+ ));
917	824	}
918	825	if ( array_key_exists( 'last_name', $user_data ) && strlen( $user_data['last_name'] ) > 0 ) {
919		- wp_update_user(
920		- array(
921		- 'ID' => $user->ID,
922		- 'last_name' => $user_data['last_name'],
923		- )
924		- );
	826	+ wp_update_user( array(
	827	+ 'ID' => $user->ID,
	828	+ 'last_name' => $user_data['last_name'],
	829	+ ));
925	830	}
926	831	}
927	832
928	833	// Update this user's role if it was modified in the
		@@ -927,19 +832,12 @@
927	832
928	833	// Update this user's role if it was modified in the
929	834	// authorizer_custom_role filter.
930	835	if ( $default_role !== $approved_role ) {
931		- // Update user's role in WordPress.
932		- $user->set_role( $approved_role );
933		-
934		- // Update user's role in this site's approved list and save.
935		- foreach ( $auth_settings_access_users_approved_single as $key => $existing_user ) {
936		- if ( 0 === strcasecmp( $user->user_email, $existing_user['email'] ) ) {
937		- $auth_settings_access_users_approved_single[ $key ]['role'] = $approved_role;
938		- break;
939		- }
940		- }
941		- update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved_single );
	836	+ wp_update_user( array(
	837	+ 'ID' => $user->ID,
	838	+ 'role' => $approved_role,
	839	+ ));
942	840	}
943	841	}
944	842
945	843	// If this is multisite, add new user to current blog.
		@@ -952,34 +850,33 @@
952	850	}
953	851	}
954	852
955	853	// Ensure user has the same role as their entry in the approved list.
956		- if ( $user_info && ! in_array( $user_info['role'], $user->roles, true ) ) {
	854	+ // (This is just a precaution, the role should already be set when
	855	+ // saving admin options in the sanitizing function.)
	856	+ if ( $user_info && ! array_key_exists( $user_info['role'], $user->roles ) ) {
957	857	$user->set_role( $user_info['role'] );
958	858	}
959	859
960	860	return $user;
961	861
962		- } elseif ( 0 === strcasecmp( $user_email, $last_email ) ) {
963		- /**
964		- * Note: only do this for the last email address we are checking (we need
965		- * to iterate through them all to make sure one of them isn't approved).
966		- */
967		-
	862	+ // Note: only do this for the last email address we are checking (we need
	863	+ // to iterate through them all to make sure one of them isn't approved).
	864	+ } elseif ( $user_email === $last_email ) {
968	865	// User isn't an admin, is not blocked, and is not approved.
969	866	// Add them to the pending list and notify them and their instructor.
970	867	if ( strlen( $user_email ) > 0 && ! $this->is_email_in_list( $user_email, 'pending' ) ) {
971		- $pending_user = array();
972		- $pending_user['email'] = $this->lowercase( $user_email );
973		- $pending_user['role'] = $approved_role;
	868	+ $pending_user = array();
	869	+ $pending_user['email'] = $user_email;
	870	+ $pending_user['role'] = $approved_role;
974	871	$pending_user['date_added'] = '';
975	872	array_push( $auth_settings_access_users_pending, $pending_user );
976	873	update_option( 'auth_settings_access_users_pending', $auth_settings_access_users_pending );
977	874
978	875	// Create strings used in the email notification.
979		- $site_name = get_bloginfo( 'name' );
980		- $site_url = get_bloginfo( 'url' );
981		- $authorizer_options_url = 'settings' === $auth_settings['advanced_admin_menu'] ? admin_url( 'options-general.php?page=authorizer' ) : admin_url( '?page=authorizer' );
	876	+ $site_name = get_bloginfo( 'name' );
	877	+ $site_url = get_bloginfo( 'url' );
	878	+ $authorizer_options_url = $auth_settings['advanced_admin_menu'] === 'settings' ? admin_url( 'options-general.php?page=authorizer' ) : admin_url( '?page=authorizer' );
982	879
983	880	// Notify users with the role specified in "Which role should
984	881	// receive email notifications about pending users?".
985	882	if ( strlen( $auth_settings['access_role_receive_pending_emails'] ) > 0 ) {
		@@ -1004,11 +901,10 @@
1004	901	}
1005	902	}
1006	903
1007	904	// Notify user about pending status and return without authenticating them.
1008		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
1009		- $redirect_to = ! empty( $_REQUEST['redirect_to'] ) ? esc_url_raw( wp_unslash( $_REQUEST['redirect_to'] ) ) : home_url();
1010		- $page_title = get_bloginfo( 'name' ) . ' - Access Pending';
	905	+ $redirect_to = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : home_url();
	906	+ $page_title = get_bloginfo( 'name' ) . ' - Access Pending';
1011	907	$error_message =
1012	908	apply_filters( 'the_content', $auth_settings['access_pending_redirect_to_message'] ) .
1013	909	'<hr />' .
1014	910	'<p style="text-align: center;">' .
		@@ -1015,9 +911,9 @@
1015	911	'<a class="button" href="' . wp_logout_url( $redirect_to ) . '">' .
1016	912	__( 'Back', 'authorizer' ) .
1017	913	'</a></p>';
1018	914	update_option( 'auth_settings_advanced_login_error', $error_message );
1019		- wp_die( wp_kses( $error_message, $this->allowed_html ), esc_html( $page_title ) );
	915	+ wp_die( $error_message, $page_title );
1020	916	}
1021	917	}
1022	918
1023	919	// Sanity check: if we made it here without returning, something has gone wrong.
		@@ -1040,34 +936,24 @@
1040	936	* custom_authenticate_google() runs to verify the token; once verified
1041	937	* custom_authenticate proceeds as normal with the google email address
1042	938	* as a successfully authenticated external user.
1043	939	*
1044		- * Action: wp_ajax_process_google_login
1045		- * Action: wp_ajax_nopriv_process_google_login
1046		- *
1047		- * @return void, but die with the value to return to the success() function in AJAX call signInCallback().
	940	+ * @return void, but die with the value to return to the success() function in AJAX call signInCallback()
1048	941	*/
1049		- public function ajax_process_google_login() {
	942	+ function ajax_process_google_login() {
	943	+ $nonce = array_key_exists( 'nonce', $_POST ) ? $_POST['nonce'] : '';
	944	+ $code = array_key_exists( 'code', $_POST ) ? $_POST['code'] : null;
	945	+
1050	946	// Nonce check.
1051		- if (
1052		- ! isset( $_POST['nonce'] ) ||
1053		- ! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), 'google_csrf_nonce' )
1054		- ) {
1055		- die( '' );
	947	+ if ( ! wp_verify_nonce( $nonce, 'google_csrf_nonce' ) ) {
	948	+ return '';
1056	949	}
1057	950
1058		- // Google authentication token.
1059		- // phpcs:ignore WordPress.VIP.ValidatedSanitizedInput.InputNotSanitized
1060		- $code = isset( $_POST['code'] ) ? wp_unslash( $_POST['code'] ) : null;
1061		-
1062	951	// Grab plugin settings.
1063		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	952	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
1064	953
1065		- /**
1066		- * Add Google API PHP Client.
1067		- *
1068		- * @see https://github.com/google/google-api-php-client branch:v1-master
1069		- */
	954	+ // Add Google API PHP Client.
	955	+ // @see https://github.com/google/google-api-php-client branch:v1-master
1070	956	require_once dirname( __FILE__ ) . '/vendor/google-api-php-client/src/Google/autoload.php';
1071	957
1072	958	// Build the Google Client.
1073	959	$client = new Google_Client();
		@@ -1075,26 +961,19 @@
1075	961	$client->setClientId( $auth_settings['google_clientid'] );
1076	962	$client->setClientSecret( $auth_settings['google_clientsecret'] );
1077	963	$client->setRedirectUri( 'postmessage' );
1078	964
1079		- /**
1080		- * If the hosted domain parameter is set, restrict logins to that domain.
1081		- *
1082		- * Note: Will have to upgrade to google-api-php-client v2 or higher for
1083		- * this to function server-side; it's not complete in v1, so this check
1084		- * is performed manually below.
1085		- *
1086		- * if (
1087		- * array_key_exists( 'google_hosteddomain', $auth_settings ) &&
1088		- * strlen( $auth_settings['google_hosteddomain'] ) > 0
1089		- * ) {
1090		- * $google_hosteddomains = explode( "\n", str_replace( "\r", '', $auth_settings['google_hosteddomain'] ) );
1091		- * $google_hosteddomain = trim( $google_hosteddomains[0] );
1092		- * $client->setHostedDomain( $google_hosteddomain );
1093		- * }
1094		- */
	965	+ // If the hosted domain parameter is set, restrict logins to that domain.
	966	+ // Note: Will have to upgrade to google-api-php-client v2 or higher for
	967	+ // this to function server-side; it's not complete in v1, so this check
	968	+ // is performed manually below.
	969	+ // if ( array_key_exists( 'google_hosteddomain', $auth_settings ) && strlen( $auth_settings['google_hosteddomain'] ) > 0 ) {
	970	+ // $google_hosteddomains = explode( "\n", str_replace( "\r", '', $auth_settings['google_hosteddomain'] ) );
	971	+ // $google_hosteddomain = trim( $google_hosteddomains[0] );
	972	+ // $client->setHostedDomain( $google_hosteddomain );
	973	+ // }
1095	974
1096		- // Get one time use token (if it doesn't exist, we'll create one below).
	975	+ // Get one time use token (if it doesn't exist, we'll create one below)
1097	976	session_start();
1098	977	$token = array_key_exists( 'token', $_SESSION ) ? json_decode( $_SESSION['token'] ) : null;
1099	978
1100	979	if ( empty( $token ) ) {
		@@ -1102,18 +981,18 @@
1102	981	$client->authenticate( $code );
1103	982	$token = json_decode( $client->getAccessToken() );
1104	983
1105	984	// Store the token in the session for later use.
1106		- $_SESSION['token'] = wp_json_encode( $token );
	985	+ $_SESSION['token'] = json_encode( $token );
1107	986
1108		- $response = 'Successfully authenticated.';
	987	+ $response = "Successfully authenticated.";
1109	988	} else {
1110		- $client->setAccessToken( wp_json_encode( $token ) );
	989	+ $client->setAccessToken( json_encode( $token ) );
1111	990
1112	991	$response = 'Already authenticated.';
1113	992	}
1114	993
1115		- die( esc_html( $response ) );
	994	+ die( $response );
1116	995	}
1117	996
1118	997
1119	998	/**
		@@ -1118,22 +997,22 @@
1118	997
1119	998	/**
1120	999	* Validate this user's credentials against Google.
1121	1000	*
1122		- * @param array $auth_settings Plugin settings.
1123		- * @return array|WP_Error Array containing email, authenticated_by, first_name,
1124		- * last_name, and username strings for the successfully
1125		- * authenticated user, or WP_Error() object on failure,
1126		- * or null if not attempting a google login.
	1001	+ * @param array $auth_settings Plugin settings
	1002	+ * @return [mixed] Array containing email, authenticated_by,
	1003	+ * first_name, last_name, and username
	1004	+ * strings for the successfully authenticated
	1005	+ * user, or WP_Error() object on failure,
	1006	+ * or null if not attempting a google login.
1127	1007	*/
1128	1008	private function custom_authenticate_google( $auth_settings ) {
1129	1009	// Move on if Google auth hasn't been requested here.
1130		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
1131		- if ( empty( $_GET['external'] ) || 'google' !== $_GET['external'] ) {
	1010	+ if ( empty( $_GET['external'] ) || $_GET['external'] !== 'google' ) {
1132	1011	return null;
1133	1012	}
1134	1013
1135		- // Get one time use token.
	1014	+ // Get one time use token
1136	1015	session_start();
1137	1016	$token = array_key_exists( 'token', $_SESSION ) ? json_decode( $_SESSION['token'] ) : null;
1138	1017
1139	1018	// No token, so this is not a succesful Google login.
		@@ -1140,13 +1019,10 @@
1140	1019	if ( is_null( $token ) ) {
1141	1020	return null;
1142	1021	}
1143	1022
1144		- /**
1145		- * Add Google API PHP Client.
1146		- *
1147		- * @see https://github.com/google/google-api-php-client branch:v1-master
1148		- */
	1023	+ // Add Google API PHP Client.
	1024	+ // @see https://github.com/google/google-api-php-client branch:v1-master
1149	1025	require_once dirname( __FILE__ ) . '/vendor/google-api-php-client/src/Google/autoload.php';
1150	1026
1151	1027	// Build the Google Client.
1152	1028	$client = new Google_Client();
		@@ -1154,24 +1030,19 @@
1154	1030	$client->setClientId( $auth_settings['google_clientid'] );
1155	1031	$client->setClientSecret( $auth_settings['google_clientsecret'] );
1156	1032	$client->setRedirectUri( 'postmessage' );
1157	1033
1158		- /**
1159		- * If the hosted domain parameter is set, restrict logins to that domain.
1160		- * Note: Will have to upgrade to google-api-php-client v2 or higher for
1161		- * this to function server-side; it's not complete in v1, so this check
1162		- * is performed manually later.
1163		- * if (
1164		- * array_key_exists( 'google_hosteddomain', $auth_settings ) &&
1165		- * strlen( $auth_settings['google_hosteddomain'] ) > 0
1166		- * ) {
1167		- * $google_hosteddomains = explode( "\n", str_replace( "\r", '', $auth_settings['google_hosteddomain'] ) );
1168		- * $google_hosteddomain = trim( $google_hosteddomains[0] );
1169		- * $client->setHostedDomain( $google_hosteddomain );
1170		- * }
1171		- */
	1034	+ // If the hosted domain parameter is set, restrict logins to that domain.
	1035	+ // Note: Will have to upgrade to google-api-php-client v2 or higher for
	1036	+ // this to function server-side; it's not complete in v1, so this check
	1037	+ // is performed manually below.
	1038	+ // if ( array_key_exists( 'google_hosteddomain', $auth_settings ) && strlen( $auth_settings['google_hosteddomain'] ) > 0 ) {
	1039	+ // $google_hosteddomains = explode( "\n", str_replace( "\r", '', $auth_settings['google_hosteddomain'] ) );
	1040	+ // $google_hosteddomain = trim( $google_hosteddomains[0] );
	1041	+ // $client->setHostedDomain( $google_hosteddomain );
	1042	+ // }
1172	1043
1173		- // Verify this is a successful Google authentication.
	1044	+ // Verify this is a successful Google authentication
1174	1045	try {
1175	1046	$ticket = $client->verifyIdToken( $token->id_token, $auth_settings['google_clientid'] );
1176	1047	} catch ( Google_Auth_Exception $e ) {
1177	1048	// Invalid ticket, so this in not a successful Google login.
		@@ -1182,29 +1053,25 @@
1182	1053	if ( ! $ticket ) {
1183	1054	return new WP_Error( 'invalid_google_login', __( 'Invalid Google credentials provided.', 'authorizer' ) );
1184	1055	}
1185	1056
1186		- // Get email address.
1187		- $attributes = $ticket->getAttributes();
1188		- $email = $this->lowercase( $attributes['payload']['email'] );
	1057	+ // Get email address
	1058	+ $attributes = $ticket->getAttributes();
	1059	+ $email = $attributes['payload']['email'];
1189	1060	$email_domain = substr( strrchr( $email, '@' ), 1 );
1190		- $username = current( explode( '@', $email ) );
	1061	+ $username = current( explode( '@', $email ) );
1191	1062
1192		- /**
1193		- * Fail if hd param is set and the logging in user's email address doesn't
1194		- * match the allowed hosted domain.
1195		- *
1196		- * See: https://developers.google.com/identity/protocols/OpenIDConnect#hd-param
1197		- * See: https://github.com/google/google-api-php-client/blob/v1-master/src/Google/Client.php#L407-L416
1198		- *
1199		- * Note: Will have to upgrade to google-api-php-client v2 or higher for
1200		- * this to function server-side; it's not complete in v1, so this check
1201		- * is only performed here.
1202		- */
	1063	+ // Fail if hd param is set and the logging in user's email address doesn't
	1064	+ // match the allowed hosted domain.
	1065	+ // See: https://developers.google.com/identity/protocols/OpenIDConnect#hd-param
	1066	+ // See: https://github.com/google/google-api-php-client/blob/v1-master/src/Google/Client.php#L407-L416
	1067	+ // Note: Will have to upgrade to google-api-php-client v2 or higher for
	1068	+ // this to function server-side; it's not complete in v1, so this check
	1069	+ // is only performed here.
1203	1070	if ( array_key_exists( 'google_hosteddomain', $auth_settings ) && strlen( $auth_settings['google_hosteddomain'] ) > 0 ) {
1204	1071	// Allow multiple whitelisted domains.
1205	1072	$google_hosteddomains = explode( "\n", str_replace( "\r", '', $auth_settings['google_hosteddomain'] ) );
1206		- if ( ! in_array( $email_domain, $google_hosteddomains, true ) ) {
	1073	+ if ( ! in_array( $email_domain, $google_hosteddomains ) ) {
1207	1074	$this->custom_logout();
1208	1075	return new WP_Error( 'invalid_google_login', __( 'Google credentials do not match the allowed hosted domain', 'authorizer' ) );
1209	1076	}
1210	1077	}
		@@ -1209,13 +1076,13 @@
1209	1076	}
1210	1077	}
1211	1078
1212	1079	return array(
1213		- 'email' => $email,
1214		- 'username' => $username,
1215		- 'first_name' => '',
1216		- 'last_name' => '',
1217		- 'authenticated_by' => 'google',
	1080	+ 'email' => $email,
	1081	+ 'username' => $username,
	1082	+ 'first_name' => '',
	1083	+ 'last_name' => '',
	1084	+ 'authenticated_by' => 'google',
1218	1085	'google_attributes' => $attributes,
1219	1086	);
1220	1087	}
1221	1088
		@@ -1222,47 +1089,40 @@
1222	1089
1223	1090	/**
1224	1091	* Validate this user's credentials against CAS.
1225	1092	*
1226		- * @param array $auth_settings Plugin settings.
1227		- * @return array|WP_Error Array containing 'email' and 'authenticated_by' strings
1228		- * for the successfully authenticated user, or WP_Error()
1229		- * object on failure, or null if not attempting a CAS login.
	1093	+ * @param array $auth_settings Plugin settings
	1094	+ * @return [mixed] Array containing 'email' and 'authenticated_by'
	1095	+ * strings for the successfully authenticated
	1096	+ * user, or WP_Error() object on failure,
	1097	+ * or null if not attempting a CAS login.
1230	1098	*/
1231	1099	private function custom_authenticate_cas( $auth_settings ) {
1232	1100	// Move on if CAS hasn't been requested here.
1233		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
1234		- if ( empty( $_GET['external'] ) || 'cas' !== $_GET['external'] ) {
	1101	+ if ( empty( $_GET['external'] ) || $_GET['external'] !== 'cas' ) {
1235	1102	return null;
1236	1103	}
1237	1104
1238		- /**
1239		- * Get the CAS server version (default to SAML_VERSION_1_1).
1240		- *
1241		- * @see: https://developer.jasig.org/cas-clients/php/1.3.4/docs/api/group__public.html
1242		- */
	1105	+ // Get the CAS server version (default to SAML_VERSION_1_1).
	1106	+ // See: https://developer.jasig.org/cas-clients/php/1.3.4/docs/api/group__public.html
1243	1107	$cas_version = SAML_VERSION_1_1;
1244		- if ( 'CAS_VERSION_3_0' === $auth_settings['cas_version'] ) {
	1108	+ if ( $auth_settings['cas_version'] === 'CAS_VERSION_3_0' ) {
1245	1109	$cas_version = CAS_VERSION_3_0;
1246		- } elseif ( 'CAS_VERSION_2_0' === $auth_settings['cas_version'] ) {
	1110	+ } elseif ( $auth_settings['cas_version'] === 'CAS_VERSION_2_0' ) {
1247	1111	$cas_version = CAS_VERSION_2_0;
1248		- } elseif ( 'CAS_VERSION_1_0' === $auth_settings['cas_version'] ) {
	1112	+ } elseif ( $auth_settings['cas_version'] === 'CAS_VERSION_1_0' ) {
1249	1113	$cas_version = CAS_VERSION_1_0;
1250	1114	}
1251	1115
1252		- // Set the CAS client configuration.
	1116	+ // Set the CAS client configuration
1253	1117	phpCAS::client( $cas_version, $auth_settings['cas_host'], intval( $auth_settings['cas_port'] ), $auth_settings['cas_path'] );
1254	1118
1255		- // Allow redirects at the CAS server endpoint (e.g., allow connections
1256		- // at an old CAS URL that redirects to a newer CAS URL).
1257		- phpCAS::setExtraCurlOption( CURLOPT_FOLLOWLOCATION, true );
1258		-
1259	1119	// Update server certificate bundle if it doesn't exist or is older
1260	1120	// than 6 months, then use it to ensure CAS server is legitimate.
1261	1121	// Note: only try to update if the system has the php_openssl extension.
1262		- $cacert_url = 'https://curl.haxx.se/ca/cacert.pem';
1263		- $cacert_path = plugin_dir_path( __FILE__ ) . 'vendor/cacert.pem';
1264		- $time_180_days = 180 * 24 * 60 * 60; // days * hours * minutes * seconds.
	1122	+ $cacert_url = 'https://curl.haxx.se/ca/cacert.pem';
	1123	+ $cacert_path = plugin_dir_path( __FILE__ ) . 'vendor/cacert.pem';
	1124	+ $time_180_days = 180 * 24 * 60 * 60; // days * hours * minutes * seconds
1265	1125	$time_180_days_ago = time() - $time_180_days;
1266	1126	if (
1267	1127	extension_loaded( 'openssl' ) &&
1268	1128	( ! file_exists( $cacert_path ) || filemtime( $cacert_path ) < $time_180_days_ago )
		@@ -1278,34 +1138,28 @@
1278	1138	}
1279	1139	$cacert_contents = $response['body'];
1280	1140
1281	1141	// Write out the updated certs to the plugin directory.
1282		- // Note: Don't use WP_Filesystem because we are not in an admin context
1283		- // and don't want to potentially prompt the end user for credentials.
1284		- // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_file_put_contents
1285	1142	file_put_contents( $cacert_path, $cacert_contents );
1286	1143	}
1287	1144	phpCAS::setCasServerCACert( $cacert_path );
1288	1145
1289	1146	// Set the CAS service URL (including the redirect URL for WordPress when it comes back from CAS).
1290		- $cas_service_url = site_url( '/wp-login.php?external=cas' );
1291		- $login_querystring = array();
1292		- if ( isset( $_SERVER['QUERY_STRING'] ) ) {
1293		- parse_str( $_SERVER['QUERY_STRING'], $login_querystring ); // phpcs:ignore WordPress.VIP.ValidatedSanitizedInput
1294		- }
	1147	+ $cas_service_url = site_url( '/wp-login.php?external=cas' );
	1148	+ $login_querystring = array(); parse_str( $_SERVER['QUERY_STRING'], $login_querystring );
1295	1149	if ( isset( $login_querystring['redirect_to'] ) ) {
1296		- $cas_service_url .= '&redirect_to=' . rawurlencode( $login_querystring['redirect_to'] );
	1150	+ $cas_service_url .= '&redirect_to=' . urlencode( $login_querystring['redirect_to'] );
1297	1151	}
1298	1152	phpCAS::setFixedServiceURL( $cas_service_url );
1299	1153
1300		- // Authenticate against CAS.
	1154	+ // Authenticate against CAS
1301	1155	try {
1302	1156	phpCAS::forceAuthentication();
1303	1157	} catch ( CAS_AuthenticationException $e ) {
1304	1158	// CAS server threw an error in isAuthenticated(), potentially because
1305	1159	// the cached ticket is outdated. Try renewing the authentication.
1306		- error_log( __( 'CAS server returned an Authentication Exception. Details:', 'authorizer' ) ); // phpcs:ignore
1307		- error_log( print_r( $e, true ) ); // phpcs:ignore
	1160	+ error_log( __( 'CAS server returned an Authentication Exception. Details:', 'authorizer' ) );
	1161	+ error_log( print_r( $e, true ) );
1308	1162
1309	1163	// CAS server is throwing errors on this login, so try logging the
1310	1164	// user out of CAS and redirecting them to the login page.
1311	1165	phpCAS::logoutWithRedirectService( wp_login_url() );
		@@ -1320,10 +1174,10 @@
1320	1174	if ( ! filter_var( $externally_authenticated_email, FILTER_VALIDATE_EMAIL ) ) {
1321	1175	// If we can't get the user's email address from a CAS attribute,
1322	1176	// try to guess the domain from the CAS server hostname. This will only
1323	1177	// be used if we can't discover the email address from CAS attributes.
1324		- $domain_guess = preg_match( '/[^.]*\.[^.]*$/', $auth_settings['cas_host'], $matches ) === 1 ? $matches[0] : '';
1325		- $externally_authenticated_email = $this->lowercase( $username ) . '@' . $domain_guess;
	1178	+ $domain_guess = preg_match( '/[^.]*\.[^.]*$/', $auth_settings['cas_host'], $matches ) === 1 ? $matches[0] : '';
	1179	+ $externally_authenticated_email = strtolower( $username ) . '@' . $domain_guess;
1326	1180	}
1327	1181
1328	1182	// Retrieve the user attributes (e.g., email address, first name, last name) from the CAS server.
1329	1183	$cas_attributes = phpCAS::getAttributes();
		@@ -1334,45 +1188,37 @@
1334	1188	// email domain is manually entered there (instead of a reference to a
1335	1189	// CAS attribute), and combine that with the username to create the email.
1336	1190	// Otherwise, look up the CAS attribute for email.
1337	1191	if ( substr( $auth_settings['cas_attr_email'], 0, 1 ) === '@' ) {
1338		- $externally_authenticated_email = $this->lowercase( $username . $auth_settings['cas_attr_email'] );
	1192	+ $externally_authenticated_email = strtolower( $username . $auth_settings['cas_attr_email'] );
1339	1193	} elseif (
1340	1194	// If a CAS attribute has been specified as containing the email address, use that instead.
1341	1195	// Email attribute can be a string or an array of strings.
1342	1196	array_key_exists( $auth_settings['cas_attr_email'], $cas_attributes ) && (
1343	1197	(
1344		- is_array( $cas_attributes[ $auth_settings['cas_attr_email'] ] ) &&
1345		- count( $cas_attributes[ $auth_settings['cas_attr_email'] ] ) > 0
	1198	+ is_array( $cas_attributes[$auth_settings['cas_attr_email']] ) &&
	1199	+ count( $cas_attributes[$auth_settings['cas_attr_email']] ) > 0
1346	1200	) || (
1347		- is_string( $cas_attributes[ $auth_settings['cas_attr_email'] ] ) &&
1348		- strlen( $cas_attributes[ $auth_settings['cas_attr_email'] ] ) > 0
	1201	+ is_string( $cas_attributes[$auth_settings['cas_attr_email']] ) &&
	1202	+ strlen( $cas_attributes[$auth_settings['cas_attr_email']] ) > 0
1349	1203	)
1350	1204	)
1351	1205	) {
1352		- // Each of the emails in the array needs to be set to lowercase.
1353		- if ( is_array( $cas_attributes[ $auth_settings['cas_attr_email'] ] ) ) {
1354		- $externally_authenticated_email = array();
1355		- foreach ( $cas_attributes[ $auth_settings['cas_attr_email'] ] as $external_email ) {
1356		- $externally_authenticated_email[] = $this->lowercase( $external_email );
1357		- }
1358		- } else {
1359		- $externally_authenticated_email = $this->lowercase( $cas_attributes[ $auth_settings['cas_attr_email'] ] );
1360		- }
	1206	+ $externally_authenticated_email = $cas_attributes[$auth_settings['cas_attr_email']];
1361	1207	}
1362	1208	}
1363	1209
1364	1210	// Get user first name and last name.
1365		- $first_name = array_key_exists( 'cas_attr_first_name', $auth_settings ) && strlen( $auth_settings['cas_attr_first_name'] ) > 0 && array_key_exists( $auth_settings['cas_attr_first_name'], $cas_attributes ) && strlen( $cas_attributes[ $auth_settings['cas_attr_first_name'] ] ) > 0 ? $cas_attributes[ $auth_settings['cas_attr_first_name'] ] : '';
1366		- $last_name = array_key_exists( 'cas_attr_last_name', $auth_settings ) && strlen( $auth_settings['cas_attr_last_name'] ) > 0 && array_key_exists( $auth_settings['cas_attr_last_name'], $cas_attributes ) && strlen( $cas_attributes[ $auth_settings['cas_attr_last_name'] ] ) > 0 ? $cas_attributes[ $auth_settings['cas_attr_last_name'] ] : '';
	1211	+ $first_name = array_key_exists( 'cas_attr_first_name', $auth_settings ) && strlen( $auth_settings['cas_attr_first_name'] ) > 0 && array_key_exists( $auth_settings['cas_attr_first_name'], $cas_attributes ) && strlen( $cas_attributes[$auth_settings['cas_attr_first_name']] ) > 0 ? $cas_attributes[$auth_settings['cas_attr_first_name']] : '';
	1212	+ $last_name = array_key_exists( 'cas_attr_last_name', $auth_settings ) && strlen( $auth_settings['cas_attr_last_name'] ) > 0 && array_key_exists( $auth_settings['cas_attr_last_name'], $cas_attributes ) && strlen( $cas_attributes[$auth_settings['cas_attr_last_name']] ) > 0 ? $cas_attributes[$auth_settings['cas_attr_last_name']] : '';
1367	1213
1368	1214	return array(
1369		- 'email' => $externally_authenticated_email,
1370		- 'username' => $username,
1371		- 'first_name' => $first_name,
1372		- 'last_name' => $last_name,
	1215	+ 'email' => $externally_authenticated_email,
	1216	+ 'username' => $username,
	1217	+ 'first_name' => $first_name,
	1218	+ 'last_name' => $last_name,
1373	1219	'authenticated_by' => 'cas',
1374		- 'cas_attributes' => $cas_attributes,
	1220	+ 'cas_attributes' => $cas_attributes,
1375	1221	);
1376	1222	}
1377	1223
1378	1224
		@@ -1378,32 +1224,24 @@
1378	1224
1379	1225	/**
1380	1226	* Validate this user's credentials against LDAP.
1381	1227	*
1382		- * @param array $auth_settings Plugin settings.
1383		- * @param string $username Attempted username from authenticate action.
1384		- * @param string $password Attempted password from authenticate action.
1385		- * @return array|WP_Error Array containing 'email' and 'authenticated_by' strings
1386		- * for the successfully authenticated user, or WP_Error()
1387		- * object on failure, or null if skipping LDAP auth and
1388		- * falling back to WP auth.
	1228	+ * @param array $auth_settings Plugin settings
	1229	+ * @param string $username Attempted username from authenticate action
	1230	+ * @param string $password Attempted password from authenticate action
	1231	+ * @return [mixed] Array containing 'email' and 'authenticated_by'
	1232	+ * strings for the successfully authenticated
	1233	+ * user, or WP_Error() object on failure,
	1234	+ * or null if skipping LDAP auth and falling back to WP auth.
1389	1235	*/
1390	1236	private function custom_authenticate_ldap( $auth_settings, $username, $password ) {
1391		- // Get LDAP search base(s).
1392		- $search_bases = explode( "\n", str_replace( "\r", '', trim( $auth_settings['ldap_search_base'] ) ) );
1393		-
1394		- // Fail silently (fall back to WordPress authentication) if no search base specified.
1395		- if ( count( $search_bases ) < 1 ) {
1396		- return null;
1397		- }
1398		-
1399		- // Get the FQDN from the first LDAP search base domain components (dc). For
1400		- // example, ou=people,dc=example,dc=edu,dc=uk would yield user@example.edu.uk.
1401		- $search_base_components = explode( ',', trim( $search_bases[0] ) );
1402		- $domain = array();
	1237	+ // Get the FQDN from the LDAP search base domain components (dc). For
	1238	+ // example, ou=people,dc=example,dc=edu,dc=uk would yield user@example.edu.uk
	1239	+ $search_base_components = explode( ',', trim( $auth_settings['ldap_search_base'] ) );
	1240	+ $domain = array();
1403	1241	foreach ( $search_base_components as $search_base_component ) {
1404	1242	$component = explode( '=', $search_base_component );
1405		- if ( 2 === count( $component ) && 'dc' === $component[0] ) {
	1243	+ if ( count( $component ) === 2 && $component[0] === 'dc' ) {
1406	1244	$domain[] = $component[1];
1407	1245	}
1408	1246	}
1409	1247	$domain = implode( '.', $domain );
		@@ -1414,9 +1252,9 @@
1414	1252	if ( empty( $domain ) ) {
1415	1253	$domain = preg_match( '/[^.]*\.[^.]*$/', $auth_settings['ldap_host'], $matches ) === 1 ? $matches[0] : '';
1416	1254	}
1417	1255
1418		- // remove @domain if it exists in the username (i.e., if user entered their email).
	1256	+ // remove @domain if it exists in the username (i.e., if user entered their email)
1419	1257	$username = str_replace( '@' . $domain, '', $username );
1420	1258
1421	1259	// Fail silently (fall back to WordPress authentication) if both username
1422	1260	// and password are empty (this will be the case when visiting wp-login.php
		@@ -1439,13 +1277,13 @@
1439	1277	return null;
1440	1278	}
1441	1279
1442	1280	// Authenticate against LDAP using options provided in plugin settings.
1443		- $result = false;
	1281	+ $result = false;
1444	1282	$ldap_user_dn = '';
1445		- $first_name = '';
1446		- $last_name = '';
1447		- $email = '';
	1283	+ $first_name = '';
	1284	+ $last_name = '';
	1285	+ $email = '';
1448	1286
1449	1287	// Construct LDAP connection parameters. ldap_connect() takes either a
1450	1288	// hostname or a full LDAP URI as its first parameter (works with OpenLDAP
1451	1289	// 2.x.x or later). If it's an LDAP URI, the second parameter, $port, is
		@@ -1450,13 +1288,13 @@
1450	1288	// hostname or a full LDAP URI as its first parameter (works with OpenLDAP
1451	1289	// 2.x.x or later). If it's an LDAP URI, the second parameter, $port, is
1452	1290	// ignored, and port must be specified in the full URI. An LDAP URI is of
1453	1291	// the form ldap://hostname:port or ldaps://hostname:port.
1454		- $ldap_host = $auth_settings['ldap_host'];
1455		- $ldap_port = intval( $auth_settings['ldap_port'] );
1456		- $parsed_host = wp_parse_url( $ldap_host );
	1292	+ $ldap_host = $auth_settings['ldap_host'];
	1293	+ $ldap_port = intval( $auth_settings['ldap_port'] );
	1294	+ $parsed_host = parse_url( $ldap_host );
1457	1295	// Fail (fall back to WordPress auth) if invalid host is specified.
1458		- if ( false === $parsed_host ) {
	1296	+ if ( $parsed_host === false ) {
1459	1297	return null;
1460	1298	}
1461	1299	// If a scheme is in the LDAP host, use full LDAP URI instead of just hostname.
1462	1300	if ( array_key_exists( 'scheme', $parsed_host ) ) {
		@@ -1469,24 +1307,24 @@
1469	1307
1470	1308	// Establish LDAP connection.
1471	1309	$ldap = ldap_connect( $ldap_host, $ldap_port );
1472	1310	ldap_set_option( $ldap, LDAP_OPT_PROTOCOL_VERSION, 3 );
1473		- if ( 1 === intval( $auth_settings['ldap_tls'] ) ) {
1474		- if ( ! ldap_start_tls( $ldap ) ) {
	1311	+ if ( $auth_settings['ldap_tls'] == 1 ) {
	1312	+ if( ! ldap_start_tls( $ldap ) ) {
1475	1313	return null;
1476	1314	}
1477	1315	}
1478	1316
1479	1317	// Set bind credentials; attempt an anonymous bind if not provided.
1480		- $bind_rdn = null;
1481		- $bind_password = null;
	1318	+ $bind_rdn = NULL;
	1319	+ $bind_password = NULL;
1482	1320	if ( strlen( $auth_settings['ldap_user'] ) > 0 ) {
1483		- $bind_rdn = $auth_settings['ldap_user'];
	1321	+ $bind_rdn = $auth_settings['ldap_user'];
1484	1322	$bind_password = $this->decrypt( $auth_settings['ldap_password'] );
1485	1323	}
1486	1324
1487	1325	// Attempt LDAP bind.
1488		- $result = @ldap_bind( $ldap, $bind_rdn, stripslashes( $bind_password ) ); // phpcs:ignore
	1326	+ $result = @ldap_bind( $ldap, $bind_rdn, stripslashes( $bind_password ) );
1489	1327	if ( ! $result ) {
1490	1328	// Can't connect to LDAP, so fall back to WordPress authentication.
1491	1329	return null;
1492	1330	}
		@@ -1500,40 +1338,18 @@
1500	1338	if ( array_key_exists( 'ldap_attr_last_name', $auth_settings ) && strlen( $auth_settings['ldap_attr_last_name'] ) > 0 ) {
1501	1339	array_push( $ldap_attributes_to_retrieve, $auth_settings['ldap_attr_last_name'] );
1502	1340	}
1503	1341	if ( array_key_exists( 'ldap_attr_email', $auth_settings ) && strlen( $auth_settings['ldap_attr_email'] ) > 0 && substr( $auth_settings['ldap_attr_email'], 0, 1 ) !== '@' ) {
1504		- array_push( $ldap_attributes_to_retrieve, $this->lowercase( $auth_settings['ldap_attr_email'] ) );
	1342	+ array_push( $ldap_attributes_to_retrieve, $auth_settings['ldap_attr_email'] );
1505	1343	}
	1344	+ $ldap_search = ldap_search(
	1345	+ $ldap,
	1346	+ $auth_settings['ldap_search_base'],
	1347	+ "(" . $auth_settings['ldap_uid'] . "=" . $username . ")",
	1348	+ $ldap_attributes_to_retrieve
	1349	+ );
	1350	+ $ldap_entries = ldap_get_entries( $ldap, $ldap_search );
1506	1351
1507		- // Create default LDAP search filter (uid=$username).
1508		- $search_filter = '(' . $auth_settings['ldap_uid'] . '=' . $username . ')';
1509		-
1510		- /**
1511		- * Filter LDAP search filter.
1512		- *
1513		- * Allows for custom LDAP authentication rules (e.g., restricting login
1514		- * access to users in multiple groups, or having certain attributes).
1515		- *
1516		- * @param string $search_filter The filter to pass to ldap_search().
1517		- * @param string $ldap_uid The attribute to compare username against (from Authorizer Settings).
1518		- * @param string $username The username attempting to log in.
1519		- */
1520		- $search_filter = apply_filters( 'authorizer_ldap_search_filter', $search_filter, $auth_settings['ldap_uid'], $username );
1521		-
1522		- // Multiple search bases can be provided, so iterate through them until a match is found.
1523		- foreach ( $search_bases as $search_base ) {
1524		- $ldap_search = ldap_search(
1525		- $ldap,
1526		- $search_base,
1527		- $search_filter,
1528		- $ldap_attributes_to_retrieve
1529		- );
1530		- $ldap_entries = ldap_get_entries( $ldap, $ldap_search );
1531		- if ( $ldap_entries['count'] > 0 ) {
1532		- break;
1533		- }
1534		- }
1535		-
1536	1352	// If we didn't find any users in ldap, fall back to WordPress authentication.
1537	1353	if ( $ldap_entries['count'] < 1 ) {
1538	1354	return null;
1539	1355	}
		@@ -1539,21 +1355,21 @@
1539	1355	}
1540	1356
1541	1357	// Get the bind dn and first/last names; if there are multiple results returned, just get the last one.
1542	1358	for ( $i = 0; $i < $ldap_entries['count']; $i++ ) {
1543		- $ldap_user_dn = $ldap_entries[ $i ]['dn'];
	1359	+ $ldap_user_dn = $ldap_entries[$i]['dn'];
1544	1360
1545	1361	// Get user first name and last name.
1546		- $ldap_attr_first_name = array_key_exists( 'ldap_attr_first_name', $auth_settings ) ? $this->lowercase( $auth_settings['ldap_attr_first_name'] ) : '';
1547		- if ( strlen( $ldap_attr_first_name ) > 0 && array_key_exists( $ldap_attr_first_name, $ldap_entries[ $i ] ) && $ldap_entries[ $i ][ $ldap_attr_first_name ]['count'] > 0 && strlen( $ldap_entries[ $i ][ $ldap_attr_first_name ][0] ) > 0 ) {
1548		- $first_name = $ldap_entries[ $i ][ $ldap_attr_first_name ][0];
	1362	+ $ldap_attr_first_name = array_key_exists( 'ldap_attr_first_name', $auth_settings ) ? strtolower( $auth_settings['ldap_attr_first_name'] ) : '';
	1363	+ if ( strlen( $ldap_attr_first_name ) > 0 && array_key_exists( $ldap_attr_first_name, $ldap_entries[$i] ) && $ldap_entries[$i][$ldap_attr_first_name]['count'] > 0 && strlen( $ldap_entries[$i][$ldap_attr_first_name][0] ) > 0 ) {
	1364	+ $first_name = $ldap_entries[$i][$ldap_attr_first_name][0];
1549	1365	}
1550		- $ldap_attr_last_name = array_key_exists( 'ldap_attr_last_name', $auth_settings ) ? $this->lowercase( $auth_settings['ldap_attr_last_name'] ) : '';
1551		- if ( strlen( $ldap_attr_last_name ) > 0 && array_key_exists( $ldap_attr_last_name, $ldap_entries[ $i ] ) && $ldap_entries[ $i ][ $ldap_attr_last_name ]['count'] > 0 && strlen( $ldap_entries[ $i ][ $ldap_attr_last_name ][0] ) > 0 ) {
1552		- $last_name = $ldap_entries[ $i ][ $ldap_attr_last_name ][0];
	1366	+ $ldap_attr_last_name = array_key_exists( 'ldap_attr_last_name', $auth_settings ) ? strtolower( $auth_settings['ldap_attr_last_name'] ) : '';
	1367	+ if ( strlen( $ldap_attr_last_name ) > 0 && array_key_exists( $ldap_attr_last_name, $ldap_entries[$i] ) && $ldap_entries[$i][$ldap_attr_last_name]['count'] > 0 && strlen( $ldap_entries[$i][$ldap_attr_last_name][0] ) > 0 ) {
	1368	+ $last_name = $ldap_entries[$i][$ldap_attr_last_name][0];
1553	1369	}
1554	1370	// Get user email if it is specified in another field.
1555		- $ldap_attr_email = array_key_exists( 'ldap_attr_email', $auth_settings ) ? $this->lowercase( $auth_settings['ldap_attr_email'] ) : '';
	1371	+ $ldap_attr_email = array_key_exists( 'ldap_attr_email', $auth_settings ) ? strtolower( $auth_settings['ldap_attr_email'] ) : '';
1556	1372	if ( strlen( $ldap_attr_email ) > 0 ) {
1557	1373	// If the email attribute starts with an at symbol (@), assume that the
1558	1374	// email domain is manually entered there (instead of a reference to an
1559	1375	// LDAP attribute), and combine that with the username to create the email.
		@@ -1558,16 +1374,16 @@
1558	1374	// email domain is manually entered there (instead of a reference to an
1559	1375	// LDAP attribute), and combine that with the username to create the email.
1560	1376	// Otherwise, look up the LDAP attribute for email.
1561	1377	if ( substr( $ldap_attr_email, 0, 1 ) === '@' ) {
1562		- $email = $this->lowercase( $username . $ldap_attr_email );
1563		- } elseif ( array_key_exists( $ldap_attr_email, $ldap_entries[ $i ] ) && $ldap_entries[ $i ][ $ldap_attr_email ]['count'] > 0 && strlen( $ldap_entries[ $i ][ $ldap_attr_email ][0] ) > 0 ) {
1564		- $email = $this->lowercase( $ldap_entries[ $i ][ $ldap_attr_email ][0] );
	1378	+ $email = strtolower( $username . $ldap_attr_email );
	1379	+ } elseif ( array_key_exists( $ldap_attr_email, $ldap_entries[$i] ) && $ldap_entries[$i][$ldap_attr_email]['count'] > 0 && strlen( $ldap_entries[$i][$ldap_attr_email][0] ) > 0 ) {
	1380	+ $email = strtolower( $ldap_entries[$i][$ldap_attr_email][0] );
1565	1381	}
1566	1382	}
1567	1383	}
1568	1384
1569		- $result = @ldap_bind( $ldap, $ldap_user_dn, stripslashes( $password ) ); // phpcs:ignore
	1385	+ $result = @ldap_bind( $ldap, $ldap_user_dn, stripslashes( $password ) );
1570	1386	if ( ! $result ) {
1571	1387	// We have a real ldap user, but an invalid password. Pass
1572	1388	// through to wp authentication after failing LDAP (since
1573	1389	// this could be a local account that happens to be the
		@@ -1575,22 +1391,22 @@
1575	1391	return null;
1576	1392	}
1577	1393
1578	1394	// User successfully authenticated against LDAP, so set the relevant variables.
1579		- $externally_authenticated_email = $this->lowercase( $username . '@' . $domain );
	1395	+ $externally_authenticated_email = $username . '@' . $domain;
1580	1396
1581	1397	// If an LDAP attribute has been specified as containing the email address, use that instead.
1582	1398	if ( strlen( $email ) > 0 ) {
1583		- $externally_authenticated_email = $this->lowercase( $email );
	1399	+ $externally_authenticated_email = $email;
1584	1400	}
1585	1401
1586	1402	return array(
1587		- 'email' => $externally_authenticated_email,
1588		- 'username' => $username,
1589		- 'first_name' => $first_name,
1590		- 'last_name' => $last_name,
	1403	+ 'email' => $externally_authenticated_email,
	1404	+ 'username' => $username,
	1405	+ 'first_name' => $first_name,
	1406	+ 'last_name' => $last_name,
1591	1407	'authenticated_by' => 'ldap',
1592		- 'ldap_attributes' => $ldap_entries,
	1408	+ 'ldap_attributes' => $ldap_entries,
1593	1409	);
1594	1410	}
1595	1411
1596	1412
		@@ -1596,20 +1412,18 @@
1596	1412
1597	1413	/**
1598	1414	* Log out of the attached external service.
1599	1415	*
1600		- * Action: wp_logout
1601		- *
1602	1416	* @return void
1603	1417	*/
1604	1418	public function custom_logout() {
1605	1419	// Grab plugin settings.
1606		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	1420	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
1607	1421
1608	1422	// Reset option containing old error messages.
1609	1423	delete_option( 'auth_settings_advanced_login_error' );
1610	1424
1611		- if ( session_id() === '' ) {
	1425	+ if ( session_id() == '' ) {
1612	1426	session_start();
1613	1427	}
1614	1428
1615	1429	$current_user_authenticated_by = get_user_meta( get_current_user_id(), 'authenticated_by', true );
		@@ -1614,53 +1428,38 @@
1614	1428
1615	1429	$current_user_authenticated_by = get_user_meta( get_current_user_id(), 'authenticated_by', true );
1616	1430
1617	1431	// If logged in to CAS, Log out of CAS.
1618		- if ( 'cas' === $current_user_authenticated_by && '1' === $auth_settings['cas'] ) {
	1432	+ if ( $current_user_authenticated_by === 'cas' && $auth_settings['cas'] === '1' ) {
1619	1433	if ( ! array_key_exists( 'PHPCAS_CLIENT', $GLOBALS ) || ! array_key_exists( 'phpCAS', $_SESSION ) ) {
1620	1434
1621		- /**
1622		- * Get the CAS server version (default to SAML_VERSION_1_1).
1623		- *
1624		- * @see: https://developer.jasig.org/cas-clients/php/1.3.4/docs/api/group__public.html
1625		- */
	1435	+ // Get the CAS server version (default to SAML_VERSION_1_1).
	1436	+ // See: https://developer.jasig.org/cas-clients/php/1.3.4/docs/api/group__public.html
1626	1437	$cas_version = SAML_VERSION_1_1;
1627		- if ( 'CAS_VERSION_3_0' === $auth_settings['cas_version'] ) {
	1438	+ if ( $auth_settings['cas_version'] === 'CAS_VERSION_3_0' ) {
1628	1439	$cas_version = CAS_VERSION_3_0;
1629		- } elseif ( 'CAS_VERSION_2_0' === $auth_settings['cas_version'] ) {
	1440	+ } elseif ( $auth_settings['cas_version'] === 'CAS_VERSION_2_0' ) {
1630	1441	$cas_version = CAS_VERSION_2_0;
1631		- } elseif ( 'CAS_VERSION_1_0' === $auth_settings['cas_version'] ) {
	1442	+ } elseif ( $auth_settings['cas_version'] === 'CAS_VERSION_1_0' ) {
1632	1443	$cas_version = CAS_VERSION_1_0;
1633	1444	}
1634	1445
1635	1446	// Set the CAS client configuration if it hasn't been set already.
1636	1447	phpCAS::client( $cas_version, $auth_settings['cas_host'], intval( $auth_settings['cas_port'] ), $auth_settings['cas_path'] );
1637		- // Allow redirects at the CAS server endpoint (e.g., allow connections
1638		- // at an old CAS URL that redirects to a newer CAS URL).
1639		- phpCAS::setExtraCurlOption( CURLOPT_FOLLOWLOCATION, true );
1640	1448	// Restrict logout request origin to the CAS server only (prevent DDOS).
1641	1449	phpCAS::handleLogoutRequests( true, array( $auth_settings['cas_host'] ) );
1642	1450	}
1643		- if ( phpCAS::isAuthenticated() || phpCAS::isInitialized() ) {
1644		- // Redirect to home page, or specified page if it's been provided.
1645		- $redirect_to = site_url( '/' );
1646		- if ( ! empty( $_REQUEST['redirect_to'] ) && isset( $_REQUEST['_wpnonce'] ) && wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'log-out' ) ) {
1647		- $redirect_to = esc_url_raw( wp_unslash( $_REQUEST['redirect_to'] ) );
1648		- }
1649		-
1650		- phpCAS::logoutWithRedirectService( $redirect_to );
	1451	+ if ( phpCAS::isAuthenticated() ) {
	1452	+ phpCAS::logoutWithRedirectService( site_url( '/' ) );
1651	1453	}
1652	1454	}
1653	1455
1654	1456	// If session token set, log out of Google.
1655		- if ( 'google' === $current_user_authenticated_by || array_key_exists( 'token', $_SESSION ) ) {
	1457	+ if ( $current_user_authenticated_by === 'google' || array_key_exists( 'token', $_SESSION ) ) {
1656	1458	$token = json_decode( $_SESSION['token'] )->access_token;
1657	1459
1658		- /**
1659		- * Add Google API PHP Client.
1660		- *
1661		- * @see https://github.com/google/google-api-php-client branch:v1-master
1662		- */
	1460	+ // Add Google API PHP Client.
	1461	+ // @see https://github.com/google/google-api-php-client branch:v1-master
1663	1462	require_once dirname( __FILE__ ) . '/vendor/google-api-php-client/src/Google/autoload.php';
1664	1463
1665	1464	// Build the Google Client.
1666	1465	$client = new Google_Client();
		@@ -1668,9 +1467,9 @@
1668	1467	$client->setClientId( $auth_settings['google_clientid'] );
1669	1468	$client->setClientSecret( $auth_settings['google_clientsecret'] );
1670	1469	$client->setRedirectUri( 'postmessage' );
1671	1470
1672		- // Revoke the token.
	1471	+ // Revoke the token
1673	1472	$client->revokeToken( $token );
1674	1473
1675	1474	// Remove the credentials from the user's session.
1676	1475	unset( $_SESSION['token'] );
		@@ -1689,37 +1488,36 @@
1689	1488
1690	1489
1691	1490	/**
1692	1491	* Restrict access to WordPress site based on settings (everyone, logged_in_users).
	1492	+ * Hook: parse_request http://codex.wordpress.org/Plugin_API/Action_Reference/parse_request
1693	1493	*
1694		- * Action: parse_request
	1494	+ * @param array $wp WordPress object.
1695	1495	*
1696		- * @param array $wp WordPress object.
1697		- * @return WP|void WP object when passing through to WordPress authentication, or void.
	1496	+ * @return void
1698	1497	*/
1699	1498	public function restrict_access( $wp ) {
1700	1499	// Grab plugin settings.
1701		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	1500	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
1702	1501
1703	1502	// Grab current user.
1704	1503	$current_user = wp_get_current_user();
1705	1504
1706	1505	$has_access = (
1707		- // Always allow access if WordPress is installing.
1708		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
	1506	+ // Always allow access if WordPress is installing
1709	1507	( defined( 'WP_INSTALLING' ) && isset( $_GET['key'] ) ) ||
1710		- // Always allow access to admins.
	1508	+ // Always allow access to admins
1711	1509	( current_user_can( 'create_users' ) ) ||
1712		- // Allow access if option is set to 'everyone'.
1713		- ( 'everyone' === $auth_settings['access_who_can_view'] ) ||
1714		- // Allow access to approved external users and logged in users if option is set to 'logged_in_users'.
1715		- ( 'logged_in_users' === $auth_settings['access_who_can_view'] && $this->is_user_logged_in_and_blog_user() && $this->is_email_in_list( $current_user->user_email, 'approved' ) ) ||
1716		- // Allow access for requests to /wp-json/oauth1 so oauth clients can authenticate to use the REST API.
1717		- ( property_exists( $wp, 'matched_query' ) && stripos( $wp->matched_query, 'rest_oauth1=' ) === 0 ) ||
1718		- // Allow access for non-GET requests to /wp-json/*, since REST API authentication already covers them.
1719		- ( property_exists( $wp, 'matched_query' ) && 0 === stripos( $wp->matched_query, 'rest_route=' ) && isset( $_SERVER['REQUEST_METHOD'] ) && 'GET' !== $_SERVER['REQUEST_METHOD'] ) ||
1720		- // Allow access for GET requests to /wp-json/ (root), since REST API discovery calls rely on this.
1721		- ( property_exists( $wp, 'matched_query' ) && 'rest_route=/' === $wp->matched_query )
	1510	+ // Allow access if option is set to 'everyone'
	1511	+ ( $auth_settings['access_who_can_view'] == 'everyone' ) ||
	1512	+ // Allow access to approved external users and logged in users if option is set to 'logged_in_users'
	1513	+ ( $auth_settings['access_who_can_view'] == 'logged_in_users' && $this->is_user_logged_in_and_blog_user() && $this->is_email_in_list( $current_user->user_email, 'approved' ) ) ||
	1514	+ // Allow access for requests to /wp-json/oauth1 so oauth clients can authenticate to use the REST API
	1515	+ ( property_exists( $wp, 'matched_query' ) && stripos( $wp->matched_query, "rest_oauth1=" ) === 0 ) ||
	1516	+ // Allow access for non-GET requests to /wp-json/*, since REST API authentication already covers them
	1517	+ ( property_exists( $wp, 'matched_query' ) && stripos( $wp->matched_query, "rest_route=" ) === 0 && $_SERVER['REQUEST_METHOD'] !== 'GET' ) ||
	1518	+ // Allow access for GET requests to /wp-json/ (root), since REST API discovery calls rely on this
	1519	+ ( property_exists( $wp, 'matched_query' ) && $wp->matched_query === 'rest_route=/' )
1722	1520	// Note that GET requests to a rest endpoint will be restricted by authorizer. In that case, error messages will be returned as JSON.
1723	1521	);
1724	1522
1725	1523	/**
		@@ -1741,9 +1539,9 @@
1741	1539	* }
1742	1540	* add_filter( 'authorizer_has_access', 'my_rsa_feed_access_override' );
1743	1541	*/
1744	1542	if ( apply_filters( 'authorizer_has_access', $has_access, $wp ) === true ) {
1745		- // Turn off the public notice about browsing anonymously.
	1543	+ // Turn off the public notice about browsing anonymously
1746	1544	update_option( 'auth_settings_advanced_public_notice', false );
1747	1545
1748	1546	// We've determined that the current user has access, so simply return to grant access.
1749	1547	return $wp;
		@@ -1749,13 +1547,13 @@
1749	1547	return $wp;
1750	1548	}
1751	1549
1752	1550	// Allow HEAD requests to the root (usually discovery from a REST client).
1753		- if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && empty( $wp->request ) && empty( $wp->matched_query ) ) {
	1551	+ if ( $_SERVER['REQUEST_METHOD'] === 'HEAD' && empty( $wp->request ) && empty( $wp->matched_query ) ) {
1754	1552	return $wp;
1755	1553	}
1756	1554
1757		- /* We've determined that the current user doesn't have access, so we deal with them now. */
	1555	+ // We've determined that the current user doesn't have access, so we deal with them now.
1758	1556
1759	1557	// Fringe case: In a multisite, a user of a different blog can successfully
1760	1558	// log in, but they aren't on the 'approved' whitelist for this blog.
1761	1559	// If that's the case, add them to the pending list for this blog.
		@@ -1766,19 +1564,29 @@
1766	1564	$result = $this->check_user_access( $current_user, array( $current_user->user_email ) );
1767	1565	}
1768	1566
1769	1567	// Check to see if the requested page is public. If so, show it.
	1568	+ $current_page_name = property_exists( $wp, 'query_vars' ) && array_key_exists( 'name', $wp->query_vars ) && strlen( $wp->query_vars['name'] ) > 0 ? $wp->query_vars['name'] : '';
	1569	+ if ( ! $current_page_name ) {
	1570	+ // Different WordPress versions store the page slug in different places; look for it elsewhere.
	1571	+ if ( property_exists( $wp, 'query_vars' ) && array_key_exists( 'pagename', $wp->query_vars ) && strlen( $wp->query_vars['pagename'] ) > 0 ) {
	1572	+ $current_page_name = $wp->query_vars['pagename'];
	1573	+ }
	1574	+ }
	1575	+ $current_page_id = '';
1770	1576	if ( empty( $wp->request ) ) {
1771	1577	$current_page_id = 'home';
1772	1578	} else {
1773		- $request_query = isset( $wp->query_vars ) ? new WP_Query( $wp->query_vars ) : null;
1774		- $current_page_id = isset( $request_query->post_count ) && $request_query->post_count > 0 ? $request_query->post->ID : '';
	1579	+ $current_page = get_page_by_path( $current_page_name );
	1580	+ if ( is_object( $current_page ) && isset( $current_page->ID ) ) {
	1581	+ $current_page_id = $current_page->ID;
	1582	+ }
1775	1583	}
1776	1584	if ( ! array_key_exists( 'access_public_pages', $auth_settings ) || ! is_array( $auth_settings['access_public_pages'] ) ) {
1777	1585	$auth_settings['access_public_pages'] = array();
1778	1586	}
1779		- if ( in_array( strval( $current_page_id ), $auth_settings['access_public_pages'], true ) ) {
1780		- if ( 'no_warning' === $auth_settings['access_public_warning'] ) {
	1587	+ if ( in_array( $current_page_id, $auth_settings['access_public_pages'] ) ) {
	1588	+ if ( $auth_settings['access_public_warning'] === 'no_warning' ) {
1781	1589	update_option( 'auth_settings_advanced_public_notice', false );
1782	1590	} else {
1783	1591	update_option( 'auth_settings_advanced_public_notice', true );
1784	1592	}
		@@ -1786,11 +1594,11 @@
1786	1594	}
1787	1595
1788	1596	// Check to see if any category assigned to the requested page is public. If so, show it.
1789	1597	$current_page_categories = wp_get_post_categories( $current_page_id, array( 'fields' => 'slugs' ) );
1790		- foreach ( $current_page_categories as $current_page_category ) {
1791		- if ( in_array( 'cat_' . $current_page_category, $auth_settings['access_public_pages'], true ) ) {
1792		- if ( 'no_warning' === $auth_settings['access_public_warning'] ) {
	1598	+ foreach( $current_page_categories as $current_page_category ) {
	1599	+ if ( in_array( 'cat_' . $current_page_category, $auth_settings['access_public_pages'] ) ) {
	1600	+ if ( $auth_settings['access_public_warning'] === 'no_warning' ) {
1793	1601	update_option( 'auth_settings_advanced_public_notice', false );
1794	1602	} else {
1795	1603	update_option( 'auth_settings_advanced_public_notice', true );
1796	1604	}
		@@ -1798,11 +1606,11 @@
1798	1606	}
1799	1607	}
1800	1608
1801	1609	// Check to see if this page can't be found. If so, allow showing the 404 page.
1802		- if ( strlen( $current_page_id ) < 1 ) {
1803		- if ( in_array( 'auth_public_404', $auth_settings['access_public_pages'], true ) ) {
1804		- if ( 'no_warning' === $auth_settings['access_public_warning'] ) {
	1610	+ if ( strlen( $current_page_name ) > 0 && strlen( $current_page_id ) < 1 ) {
	1611	+ if ( in_array( 'auth_public_404', $auth_settings['access_public_pages'] ) ) {
	1612	+ if ( $auth_settings['access_public_warning'] === 'no_warning' ) {
1805	1613	update_option( 'auth_settings_advanced_public_notice', false );
1806	1614	} else {
1807	1615	update_option( 'auth_settings_advanced_public_notice', true );
1808	1616	}
		@@ -1807,8 +1615,9 @@
1807	1615	update_option( 'auth_settings_advanced_public_notice', true );
1808	1616	}
1809	1617	return $wp;
1810	1618	}
	1619	+
1811	1620	}
1812	1621
1813	1622	// Check to see if the requested category is public. If so, show it.
1814	1623	$current_category_name = property_exists( $wp, 'query_vars' ) && array_key_exists( 'category_name', $wp->query_vars ) && strlen( $wp->query_vars['category_name'] ) > 0 ? $wp->query_vars['category_name'] : '';
		@@ -1813,10 +1622,10 @@
1813	1622	// Check to see if the requested category is public. If so, show it.
1814	1623	$current_category_name = property_exists( $wp, 'query_vars' ) && array_key_exists( 'category_name', $wp->query_vars ) && strlen( $wp->query_vars['category_name'] ) > 0 ? $wp->query_vars['category_name'] : '';
1815	1624	if ( $current_category_name ) {
1816	1625	$current_category_name = end( explode( '/', $current_category_name ) );
1817		- if ( in_array( 'cat_' . $current_category_name, $auth_settings['access_public_pages'], true ) ) {
1818		- if ( 'no_warning' === $auth_settings['access_public_warning'] ) {
	1626	+ if ( in_array( 'cat_' . $current_category_name, $auth_settings['access_public_pages'] ) ) {
	1627	+ if ( $auth_settings['access_public_warning'] === 'no_warning' ) {
1819	1628	update_option( 'auth_settings_advanced_public_notice', false );
1820	1629	} else {
1821	1630	update_option( 'auth_settings_advanced_public_notice', true );
1822	1631	}
		@@ -1826,20 +1635,18 @@
1826	1635
1827	1636	// User is denied access, so show them the error message. Render as JSON
1828	1637	// if this is a REST API call; otherwise, show the error message via
1829	1638	// wp_die() (rendered html), or redirect to the login URL.
1830		- $current_path = ! empty( $_SERVER['REQUEST_URI'] ) ? esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : home_url();
1831		- if ( property_exists( $wp, 'matched_query' ) && stripos( $wp->matched_query, 'rest_route=' ) === 0 && 'GET' === $_SERVER['REQUEST_METHOD'] ) {
1832		- wp_send_json(
1833		- array(
1834		- 'code' => 'rest_cannot_view',
1835		- 'message' => strip_tags( $auth_settings['access_redirect_to_message'] ),
1836		- 'data' => array(
1837		- 'status' => 401,
1838		- ),
1839		- )
1840		- );
1841		- } elseif ( 'message' === $auth_settings['access_redirect'] ) {
	1639	+ $current_path = empty( $_SERVER['REQUEST_URI'] ) ? home_url() : $_SERVER['REQUEST_URI'];
	1640	+ if ( property_exists( $wp, 'matched_query' ) && stripos( $wp->matched_query, "rest_route=" ) === 0 && $_SERVER['REQUEST_METHOD'] === 'GET' ) {
	1641	+ wp_send_json( array(
	1642	+ 'code' => 'rest_cannot_view',
	1643	+ 'message' => strip_tags( $auth_settings['access_redirect_to_message'] ),
	1644	+ 'data' => array(
	1645	+ 'status' => 401,
	1646	+ ),
	1647	+ ));
	1648	+ } elseif ( $auth_settings['access_redirect'] === 'message' ) {
1842	1649	$page_title = sprintf(
1843	1650	/* TRANSLATORS: %s: Name of blog */
1844	1651	__( '%s - Access Restricted', 'authorizer' ),
1845	1652	get_bloginfo( 'name' )
		@@ -1850,15 +1657,15 @@
1850	1657	'<p style="text-align: center;margin-bottom: -15px;">' .
1851	1658	'<a class="button" href="' . wp_login_url( $current_path ) . '">' .
1852	1659	__( 'Log In', 'authorizer' ) .
1853	1660	'</a></p>';
1854		- wp_die( wp_kses( $error_message, $this->allowed_html ), esc_html( $page_title ) );
1855		- } else {
	1661	+ wp_die( $error_message, $page_title );
	1662	+ } else { // if ( $auth_settings['access_redirect'] === 'login' ) {
1856	1663	wp_redirect( wp_login_url( $current_path ), 302 );
1857	1664	exit;
1858	1665	}
1859	1666
1860		- // Sanity check: we should never get here.
	1667	+ // Sanity check: we should never get here
1861	1668	wp_die( '<p>Access denied.</p>', 'Site Access Restricted' );
1862	1669	}
1863	1670
1864	1671
		@@ -1867,11 +1674,9 @@
1867	1674	* not yet been added to this particular blog in a multisite). Note: we do
1868	1675	* this because check_user_access() runs on the parse_request hook, which
1869	1676	* does not fire on wp-admin pages.
1870	1677	*
1871		- * Action: init
1872		- *
1873		- * @return void
	1678	+ * Hook: admin_menu
1874	1679	*/
1875	1680	public function init__maybe_add_network_approved_user() {
1876	1681	global $current_user;
1877	1682
		@@ -1886,10 +1691,10 @@
1886	1691	) {
1887	1692	// Get all approved users.
1888	1693	$auth_settings_access_users_approved = $this->sanitize_user_list(
1889	1694	array_merge(
1890		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT ),
1891		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
	1695	+ $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN ),
	1696	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
1892	1697	)
1893	1698	);
1894	1699
1895	1700	// Get user info (we need user role).
		@@ -1901,9 +1706,9 @@
1901	1706	// Add user to blog.
1902	1707	add_user_to_blog( get_current_blog_id(), $current_user->ID, $user_info['role'] );
1903	1708
1904	1709	// Refresh user permissions.
1905		- $current_user = new WP_User( $current_user->ID ); // phpcs:ignore WordPress.Variables.GlobalVariables.OverrideProhibited
	1710	+ $current_user = new WP_User( $current_user->ID );
1906	1711	}
1907	1712	}
1908	1713
1909	1714
		@@ -1917,15 +1722,11 @@
1917	1722
1918	1723
1919	1724	/**
1920	1725	* Add custom error message to login screen.
1921		- *
1922	1726	* Filter: login_errors
1923		- *
1924		- * @param string $errors Error description.
1925		- * @return string Error description with Authorizer errors added.
1926	1727	*/
1927		- public function show_advanced_login_error( $errors ) {
	1728	+ function show_advanced_login_error( $errors ) {
1928	1729	$error = get_option( 'auth_settings_advanced_login_error' );
1929	1730	delete_option( 'auth_settings_advanced_login_error' );
1930	1731	$errors = ' ' . $error . "<br />\n";
1931	1732	return $errors;
		@@ -1933,25 +1734,24 @@
1933	1734
1934	1735
1935	1736	/**
1936	1737	* Load external resources for the public-facing site.
1937		- *
1938		- * Action: wp_enqueue_scripts
1939	1738	*/
1940		- public function auth_public_scripts() {
1941		- // Load (and localize) public scripts.
1942		- $current_path = ! empty( $_SERVER['REQUEST_URI'] ) ? esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : home_url();
1943		- wp_enqueue_script( 'auth_public_scripts', plugins_url( '/js/authorizer-public.js', __FILE__ ), array( 'jquery' ), '2.8.0' );
	1739	+ function auth_public_scripts() {
	1740	+ // Load (and localize) public scripts
	1741	+ $current_path = empty( $_SERVER['REQUEST_URI'] ) ? home_url() : $_SERVER['REQUEST_URI'];
	1742	+ wp_enqueue_script( 'auth_public_scripts', plugins_url( '/js/authorizer-public.js', __FILE__ ), array( 'jquery' ), '2.3.2' );
1944	1743	$auth_localized = array(
1945		- 'wpLoginUrl' => wp_login_url( $current_path ),
1946		- 'publicWarning' => get_option( 'auth_settings_advanced_public_notice' ),
1947		- 'anonymousNotice' => $this->get_plugin_option( 'access_redirect_to_message' ),
1948		- 'logIn' => esc_html__( 'Log In', 'authorizer' ),
	1744	+ 'wp_login_url' => wp_login_url( $current_path ),
	1745	+ 'public_warning' => get_option( 'auth_settings_advanced_public_notice' ),
	1746	+ 'anonymous_notice' => $this->get_plugin_option( 'access_redirect_to_message' ),
	1747	+ 'log_in' => esc_html__( 'Log In', 'authorizer' ),
1949	1748	);
1950	1749	wp_localize_script( 'auth_public_scripts', 'auth', $auth_localized );
	1750	+ //update_option( 'auth_settings_advanced_public_notice', false);
1951	1751
1952		- // Load public css.
1953		- wp_register_style( 'authorizer-public-css', plugins_url( 'css/authorizer-public.css', __FILE__ ), array(), '2.8.0' );
	1752	+ // Load public css
	1753	+ wp_register_style( 'authorizer-public-css', plugins_url( 'css/authorizer-public.css', __FILE__ ), array(), '2.3.2' );
1954	1754	wp_enqueue_style( 'authorizer-public-css' );
1955	1755	}
1956	1756
1957	1757
		@@ -1957,21 +1757,19 @@
1957	1757
1958	1758	/**
1959	1759	* Enqueue JS scripts and CSS styles appearing on wp-login.php.
1960	1760	*
1961		- * Action: login_enqueue_scripts
1962		- *
1963	1761	* @return void
1964	1762	*/
1965		- public function login_enqueue_scripts_and_styles() {
	1763	+ function login_enqueue_scripts_and_styles() {
1966	1764	// Grab plugin settings.
1967		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	1765	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
1968	1766
1969	1767	// Enqueue scripts appearing on wp-login.php.
1970		- wp_enqueue_script( 'auth_login_scripts', plugins_url( '/js/authorizer-login.js', __FILE__ ), array( 'jquery' ), '2.8.0' );
	1768	+ wp_enqueue_script( 'auth_login_scripts', plugins_url( '/js/authorizer-login.js', __FILE__ ), array( 'jquery' ), '2.3.2' );
1971	1769
1972	1770	// Enqueue styles appearing on wp-login.php.
1973		- wp_register_style( 'authorizer-login-css', plugins_url( '/css/authorizer-login.css', __FILE__ ), array(), '2.8.0' );
	1771	+ wp_register_style( 'authorizer-login-css', plugins_url( '/css/authorizer-login.css', __FILE__ ), array(), '2.3.2' );
1974	1772	wp_enqueue_style( 'authorizer-login-css' );
1975	1773
1976	1774	/**
1977	1775	* Developers can use the `authorizer_add_branding_option` filter
		@@ -1976,8 +1774,9 @@
1976	1774	/**
1977	1775	* Developers can use the `authorizer_add_branding_option` filter
1978	1776	* to add a radio button for "Custom WordPress login branding"
1979	1777	* under the "Advanced" tab in Authorizer options. Example:
	1778	+ *
1980	1779	* function my_authorizer_add_branding_option( $branding_options ) {
1981	1780	* $new_branding_option = array(
1982	1781	* 'value' => 'your_brand'
1983	1782	* 'description' => 'Custom Your Brand Login Screen',
		@@ -1991,23 +1790,23 @@
1991	1790	*/
1992	1791	$branding_options = array();
1993	1792	$branding_options = apply_filters( 'authorizer_add_branding_option', $branding_options );
1994	1793	foreach ( $branding_options as $branding_option ) {
1995		- // Make sure the custom brands have the required values.
	1794	+ // Make sure the custom brands have the required values
1996	1795	if ( ! ( is_array( $branding_option ) && array_key_exists( 'value', $branding_option ) && array_key_exists( 'css_url', $branding_option ) && array_key_exists( 'js_url', $branding_option ) ) ) {
1997	1796	continue;
1998	1797	}
1999	1798	if ( $auth_settings['advanced_branding'] === $branding_option['value'] ) {
2000		- wp_enqueue_script( 'auth_login_custom_scripts-' . sanitize_title( $branding_option['value'] ), $branding_option['js_url'], array( 'jquery' ), '2.8.0' );
2001		- wp_register_style( 'authorizer-login-custom-css-' . sanitize_title( $branding_option['value'] ), $branding_option['css_url'], array(), '2.8.0' );
	1799	+ wp_enqueue_script( 'auth_login_custom_scripts-' . sanitize_title( $branding_option['value'] ), $branding_option['js_url'], array( 'jquery' ), '2.3.2' );
	1800	+ wp_register_style( 'authorizer-login-custom-css-' . sanitize_title( $branding_option['value'] ), $branding_option['css_url'], array(), '2.3.2' );
2002	1801	wp_enqueue_style( 'authorizer-login-custom-css-' . sanitize_title( $branding_option['value'] ) );
2003	1802	}
2004	1803	}
2005	1804
2006	1805	// If we're using Google logins, load those resources.
2007		- if ( '1' === $auth_settings['google'] ) {
2008		- wp_enqueue_script( 'authorizer-login-custom-google', plugins_url( '/js/authorizer-login-custom_google.js', __FILE__ ), array( 'jquery' ), '2.8.0' ); ?>
2009		- <meta name="google-signin-clientid" content="<?php echo esc_attr( $auth_settings['google_clientid'] ); ?>" />
	1806	+ if ( $auth_settings['google'] === '1' ) {
	1807	+ wp_enqueue_script( 'authorizer-login-custom-google', plugins_url( '/js/authorizer-login-custom_google.js', __FILE__ ), array( 'jquery' ), '2.3.2' ); ?>
	1808	+ <meta name="google-signin-clientid" content="<?php echo $auth_settings['google_clientid']; ?>" />
2010	1809	<meta name="google-signin-scope" content="email" />
2011	1810	<meta name="google-signin-cookiepolicy" content="single_host_origin" />
2012	1811	<?php
2013	1812	}
		@@ -2015,127 +1814,110 @@
2015	1814
2016	1815
2017	1816	/**
2018	1817	* Load external resources in the footer of the wp-login.php page.
2019		- *
2020		- * Action: login_footer
	1818	+ * Run on action hook: login_footer
2021	1819	*/
2022		- public function load_login_footer_js() {
	1820	+ function load_login_footer_js() {
2023	1821	// Grab plugin settings.
2024		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
2025		- $ajaxurl = admin_url( 'admin-ajax.php' );
2026		- if ( '1' === $auth_settings['google'] ) :
2027		- ?>
2028		-<script type="text/javascript">
2029		-/* global location, window */
2030		-// Reload login page if reauth querystring param exists,
2031		-// since reauth interrupts external logins (e.g., google).
2032		-if ( location.search.indexOf( 'reauth=1' ) >= 0 ) {
2033		- location.href = location.href.replace( 'reauth=1', '' );
2034		-}
	1822	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' ); ?>
	1823	+ <?php if ( $auth_settings['google'] === '1' ): ?>
	1824	+ <script type="text/javascript">
	1825	+ // Reload login page if reauth querystring param exists,
	1826	+ // since reauth interrupts external logins (e.g., google).
	1827	+ if ( location.search.indexOf( 'reauth=1' ) >= 0 ) {
	1828	+ location.href = location.href.replace( 'reauth=1', '' );
	1829	+ }
2035	1830
2036		-// eslint-disable-next-line no-implicit-globals
2037		-function authUpdateQuerystringParam( uri, key, value ) {
2038		- var re = new RegExp( '([?&])' + key + '=.*?(&|$)', 'i' );
2039		- var separator = uri.indexOf( '?' ) !== -1 ? '&' : '?';
2040		- if ( uri.match( re ) ) {
2041		- return uri.replace( re, '$1' + key + '=' + value + '$2' );
2042		- } else {
2043		- return uri + separator + key + '=' + value;
2044		- }
2045		-}
	1831	+ function auth_update_querystring_param( uri, key, value ) {
	1832	+ var re = new RegExp( '([?&])' + key + '=.*?(&|$)', 'i' );
	1833	+ var separator = uri.indexOf( '?' ) !== -1 ? '&' : '?';
	1834	+ if ( uri.match( re ) ) {
	1835	+ return uri.replace( re, '$1' + key + '=' + value + '$2' );
	1836	+ } else {
	1837	+ return uri + separator + key + '=' + value;
	1838	+ }
	1839	+ }
2046	1840
2047		-// eslint-disable-next-line
2048		-function signInCallback( authResult ) { // jshint ignore:line
2049		- var $ = jQuery;
2050		- if ( authResult.status && authResult.status.signed_in ) {
2051		- // Hide the sign-in button now that the user is authorized, for example:
2052		- $( '#googleplus_button' ).attr( 'style', 'display: none' );
	1841	+ function signInCallback( authResult ) {
	1842	+ var $ = jQuery;
	1843	+ if ( authResult['status'] && authResult['status']['signed_in'] ) {
	1844	+ // Hide the sign-in button now that the user is authorized, for example:
	1845	+ $( '#googleplus_button' ).attr( 'style', 'display: none' );
2053	1846
2054		- // Send the code to the server
2055		- var ajaxurl = '<?php echo esc_attr( $ajaxurl ); ?>';
2056		- $.post(ajaxurl, {
2057		- action: 'process_google_login',
2058		- code: authResult.code,
2059		- nonce: $('#nonce_google_auth-<?php echo esc_attr( $this->get_cookie_value() ); ?>' ).val(),
2060		- }, function() {
2061		- // Handle or verify the server response if necessary.
2062		- // console.log( response );
	1847	+ // Send the code to the server
	1848	+ var ajaxurl = '<?php echo admin_url( "admin-ajax.php" ); ?>';
	1849	+ $.post(ajaxurl, {
	1850	+ action: 'process_google_login',
	1851	+ 'code': authResult['code'],
	1852	+ 'nonce': $('#nonce_google_auth-<?php echo $this->get_cookie_value(); ?>' ).val(),
	1853	+ }, function( response ) {
	1854	+ // Handle or verify the server response if necessary.
	1855	+ //console.log( response );
2063	1856
2064		- // Reload wp-login.php to continue the authentication process.
2065		- var newHref = authUpdateQuerystringParam( location.href, 'external', 'google' );
2066		- if ( location.href === newHref ) {
2067		- location.reload();
2068		- } else {
2069		- location.href = newHref;
2070		- }
2071		- });
2072		- } else {
2073		- // Update the app to reflect a signed out user
2074		- // Possible error values:
2075		- // "user_signed_out" - User is signed-out
2076		- // "access_denied" - User denied access to your app
2077		- // "immediate_failed" - Could not automatically log in the user
2078		- // console.log('Sign-in state: ' + authResult['error']);
	1857	+ // Reload wp-login.php to continue the authentication process.
	1858	+ var new_href = auth_update_querystring_param( location.href, 'external', 'google' );
	1859	+ if ( location.href === new_href ) {
	1860	+ location.reload();
	1861	+ } else {
	1862	+ location.href = new_href;
	1863	+ }
	1864	+ });
	1865	+ } else {
	1866	+ // Update the app to reflect a signed out user
	1867	+ // Possible error values:
	1868	+ // "user_signed_out" - User is signed-out
	1869	+ // "access_denied" - User denied access to your app
	1870	+ // "immediate_failed" - Could not automatically log in the user
	1871	+ //console.log('Sign-in state: ' + authResult['error']);
2079	1872
2080		- // If user denies access, reload the login page.
2081		- if ( authResult.error === 'access_denied' || authResult.error === 'user_signed_out' ) {
2082		- window.location.reload();
	1873	+ // If user denies access, reload the login page.
	1874	+ if ( authResult['error'] === 'access_denied' || authResult['error'] === 'user_signed_out' ) {
	1875	+ window.location.reload();
	1876	+ }
	1877	+ }
	1878	+ }
	1879	+ </script>
	1880	+ <?php endif;
2083	1881	}
2084		- }
2085		-}
2086		-</script>
2087		- <?php
2088		- endif;
2089		- }
2090	1882
2091	1883
2092	1884	/**
2093	1885	* Create links for any external authentication services that are enabled.
2094		- *
2095		- * Action: login_form
2096	1886	*/
2097		- public function login_form_add_external_service_links() {
	1887	+ function login_form_add_external_service_links() {
2098	1888	// Grab plugin settings.
2099		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
2100		- ?>
	1889	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' ); ?>
2101	1890	<div id="auth-external-service-login">
2102		- <?php if ( '1' === $auth_settings['google'] ) : ?>
2103		- <p><a id="googleplus_button" class="button button-primary button-external button-google"><span class="dashicons dashicons-googleplus"></span><span class="label"><?php esc_html_e( 'Sign in with Google', 'authorizer' ); ?></span></a></p>
	1891	+ <?php if ( $auth_settings['google'] === '1' ): ?>
	1892	+ <p><a id="googleplus_button" class="button button-primary button-external button-google"><span class="dashicons dashicons-googleplus"></span><span class="label"><?php _e( 'Sign in with Google', 'authorizer' ); ?></span></a></p>
2104	1893	<?php wp_nonce_field( 'google_csrf_nonce', 'nonce_google_auth-' . $this->get_cookie_value() ); ?>
2105	1894	<?php endif; ?>
2106	1895
2107		- <?php if ( '1' === $auth_settings['cas'] ) : ?>
2108		- <p><a class="button button-primary button-external button-cas" href="<?php echo esc_attr( $this->modify_current_url_for_cas_login() ); ?>">
	1896	+ <?php if ( $auth_settings['cas'] === '1' ): ?>
	1897	+ <p><a class="button button-primary button-external button-cas" href="<?php echo $this->modify_current_url_for_cas_login(); ?>">
2109	1898	<span class="dashicons dashicons-lock"></span>
2110		- <span class="label">
2111		- <?php
2112		- echo esc_html(
2113		- sprintf(
2114		- /* TRANSLATORS: %s: Custom CAS label from authorizer options */
2115		- __( 'Sign in with %s', 'authorizer' ),
2116		- $auth_settings['cas_custom_label']
2117		- )
	1899	+ <span class="label"><?php
	1900	+ printf(
	1901	+ /* TRANSLATORS: %s: Custom CAS label from authorizer options */
	1902	+ __( 'Sign in with %s', 'authorizer' ),
	1903	+ $auth_settings['cas_custom_label']
2118	1904	);
2119		- ?>
2120		- </span>
	1905	+ ?></span>
2121	1906	</a></p>
2122	1907	<?php endif; ?>
2123	1908
2124		- <?php if ( '1' === $auth_settings['advanced_hide_wp_login'] && isset( $_SERVER['QUERY_STRING'] ) && false === strpos( $_SERVER['QUERY_STRING'], 'external=wordpress' ) ) : // phpcs:ignore WordPress.VIP.ValidatedSanitizedInput ?>
	1909	+ <?php if ( $auth_settings['advanced_hide_wp_login'] === '1' && strpos( $_SERVER['QUERY_STRING'], 'external=wordpress' ) === false ): ?>
2125	1910	<style type="text/css">
2126		- body.login-action-login form {
2127		- padding-bottom: 8px;
	1911	+ #loginform {
	1912	+ padding-bottom: 8px !important;
2128	1913	}
2129		- body.login-action-login form p > label,
2130		- body.login-action-login form .forgetmenot,
2131		- body.login-action-login form .submit,
2132		- body.login-action-login #nav { /* csslint allow: ids */
2133		- display: none;
	1914	+ #loginform p>label, #loginform p.forgetmenot, #loginform p.submit, p#nav {
	1915	+ display: none !important;
2134	1916	}
2135	1917	</style>
2136		- <?php elseif ( '1' === $auth_settings['cas'] || '1' === $auth_settings['google'] ) : ?>
2137		- <h3> &mdash; <?php esc_html_e( 'or', 'authorizer' ); ?> &mdash; </h3>
	1918	+ <?php elseif ( $auth_settings['cas'] === '1' || $auth_settings['google'] === '1' ): ?>
	1919	+ <h3> &mdash; <?php _e( 'or', 'authorizer' ); ?> &mdash; </h3>
2138	1920	<?php endif; ?>
2139	1921	</div>
2140	1922	<?php
2141	1923
		@@ -2148,28 +1930,21 @@
2148	1930	* Note: hook into wp_login_errors filter so this fires after the
2149	1931	* authenticate hook (where the redirect to CAS happens), but before html
2150	1932	* output is started (so the redirect header doesn't complain about data
2151	1933	* already being sent).
2152		- *
2153		- * Filter: wp_login_errors
2154		- *
2155		- * @param object $errors WP Error object.
2156		- * @param string $redirect_to Where to redirect on error.
2157		- * @return WP_Error|void WP Error object or void on redirect.
2158	1934	*/
2159		- public function wp_login_errors__maybe_redirect_to_cas( $errors, $redirect_to ) {
	1935	+ function wp_login_errors__maybe_redirect_to_cas( $errors, $redirect_to ) {
2160	1936	// Grab plugin settings.
2161		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	1937	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
2162	1938
2163	1939	// Check whether we should redirect to CAS.
2164	1940	if (
2165		- isset( $_SERVER['QUERY_STRING'] ) &&
2166		- strpos( $_SERVER['QUERY_STRING'], 'external=wordpress' ) === false && // phpcs:ignore WordPress.VIP.ValidatedSanitizedInput
2167		- array_key_exists( 'cas_auto_login', $auth_settings ) && '1' === $auth_settings['cas_auto_login'] &&
2168		- array_key_exists( 'cas', $auth_settings ) && '1' === $auth_settings['cas'] &&
2169		- ( ! array_key_exists( 'ldap', $auth_settings ) || '1' !== $auth_settings['ldap'] ) &&
2170		- ( ! array_key_exists( 'google', $auth_settings ) || '1' !== $auth_settings['google'] ) &&
2171		- array_key_exists( 'advanced_hide_wp_login', $auth_settings ) && '1' === $auth_settings['advanced_hide_wp_login']
	1941	+ strpos( $_SERVER['QUERY_STRING'], 'external=wordpress' ) === false &&
	1942	+ array_key_exists( 'cas_auto_login', $auth_settings ) && $auth_settings['cas_auto_login'] === '1' &&
	1943	+ array_key_exists( 'cas', $auth_settings ) && $auth_settings['cas'] === '1' &&
	1944	+ ( ! array_key_exists( 'ldap', $auth_settings ) || $auth_settings['ldap'] !== '1' ) &&
	1945	+ ( ! array_key_exists( 'google', $auth_settings ) || $auth_settings['google'] !== '1' ) &&
	1946	+ array_key_exists( 'advanced_hide_wp_login', $auth_settings ) && $auth_settings['advanced_hide_wp_login'] === '1'
2172	1947	) {
2173	1948	wp_redirect( $this->modify_current_url_for_cas_login() );
2174	1949	exit;
2175	1950	}
		@@ -2178,45 +1953,15 @@
2178	1953	}
2179	1954
2180	1955
2181	1956	/**
2182		- * Set a unique cookie to add to Google auth nonce to avoid CSRF detection.
2183		- * Note: hook into login_init so this fires at the start of the visit to
2184		- * wp-login.php, but before any html output is started (so setting the
2185		- * cookie header doesn't complain about data already being sent).
2186		- *
2187		- * Action: login_init
2188		- *
2189		- * @return void
2190		- */
2191		- public function login_init__maybe_set_google_nonce_cookie() {
2192		- // Grab plugin settings.
2193		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
2194		-
2195		- // If Google logins are enabled, make sure the cookie is set.
2196		- if ( array_key_exists( 'google', $auth_settings ) && '1' === $auth_settings['google'] ) {
2197		- if ( ! isset( $_COOKIE['login_unique'] ) ) {
2198		- $this->cookie_value = md5( rand() );
2199		- setcookie( 'login_unique', $this->cookie_value, time() + 1800, '/', defined( 'COOKIE_DOMAIN' ) ? COOKIE_DOMAIN : '' );
2200		- $_COOKIE['login_unique'] = $this->cookie_value;
2201		- }
2202		- }
2203		- }
2204		-
2205		-
2206		- /**
2207	1957	* Implements hook: do_action( 'wp_login_failed', $username );
2208	1958	* Update the user meta for the user that just failed logging in.
2209	1959	* Keep track of time of last failed attempt and number of failed attempts.
2210		- *
2211		- * Action: wp_login_failed
2212		- *
2213		- * @param string $username Username to update login count for.
2214		- * @return void
2215	1960	*/
2216		- public function update_login_failed_count( $username ) {
	1961	+ function update_login_failed_count( $username ) {
2217	1962	// Grab plugin settings.
2218		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	1963	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
2219	1964
2220	1965	// Get user trying to log in.
2221	1966	// If this isn't a real user, update the global failed attempt
2222	1967	// variables. We'll use these global variables to institute the
		@@ -2224,9 +1969,9 @@
2224	1969	// won't be able to determine which accounts are real by which
2225	1970	// accounts get locked out on multiple invalid attempts.
2226	1971	$user = get_user_by( 'login', $username );
2227	1972
2228		- if ( false !== $user ) {
	1973	+ if ( $user !== FALSE ) {
2229	1974	$last_attempt = get_user_meta( $user->ID, 'auth_settings_advanced_lockouts_time_last_failed', true );
2230	1975	$num_attempts = get_user_meta( $user->ID, 'auth_settings_advanced_lockouts_failed_attempts', true );
2231	1976	} else {
2232	1977	$last_attempt = get_option( 'auth_settings_advanced_lockouts_time_last_failed' );
		@@ -2240,15 +1985,15 @@
2240	1985
2241	1986	// Reset the failed attempt count if the time since the last
2242	1987	// failed attempt is greater than the reset duration.
2243	1988	$time_since_last_fail = time() - $last_attempt;
2244		- $reset_duration = $auth_settings['advanced_lockouts']['reset_duration'] * 60; // minutes to seconds.
	1989	+ $reset_duration = $auth_settings['advanced_lockouts']['reset_duration'] * 60; // minutes to seconds
2245	1990	if ( $time_since_last_fail > $reset_duration ) {
2246	1991	$num_attempts = 0;
2247	1992	}
2248	1993
2249	1994	// Set last failed time to now and increment last failed count.
2250		- if ( false !== $user ) {
	1995	+ if ( $user !== FALSE ) {
2251	1996	update_user_meta( $user->ID, 'auth_settings_advanced_lockouts_time_last_failed', time() );
2252	1997	update_user_meta( $user->ID, 'auth_settings_advanced_lockouts_failed_attempts', $num_attempts + 1 );
2253	1998	} else {
2254	1999	update_option( 'auth_settings_advanced_lockouts_time_last_failed', time() );
		@@ -2259,16 +2004,16 @@
2259	2004
2260	2005	/**
2261	2006	* When they successfully log in, make sure WordPress users are in the approved list.
2262	2007	*
2263		- * Action: wp_login
	2008	+ * @action wp_login
2264	2009	*
2265	2010	* @param string $user_login Username of the user logging in.
2266		- * @param object $user WP_User object of the user logging in.
2267		- * @return void
	2011	+ * @param WP_User $user WP_User object of the user logging in.
	2012	+ * @return null
2268	2013	*/
2269		- public function ensure_wordpress_user_in_approved_list_on_login( $user_login, $user ) {
2270		- $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->roles );
	2014	+ function ensure_wordpress_user_in_approved_list_on_login( $user_login, $user ) {
	2015	+ $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->user_roles );
2271	2016	}
2272	2017
2273	2018
2274	2019	/**
		@@ -2274,17 +2019,12 @@
2274	2019	/**
2275	2020	* Overwrite the URL for the lost password link on the login form.
2276	2021	* If we're authenticating against an external service, standard
2277	2022	* WordPress password resets won't work.
2278		- *
2279		- * Filter: lostpassword_url
2280		- *
2281		- * @param string $lostpassword_url URL to reset password.
2282		- * @return string URL to reset password.
2283	2023	*/
2284		- public function custom_lostpassword_url( $lostpassword_url ) {
	2024	+ function custom_lostpassword_url( $lostpassword_url ) {
2285	2025	// Grab plugin settings.
2286		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	2026	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
2287	2027
2288	2028	if (
2289	2029	array_key_exists( 'ldap_lostpassword_url', $auth_settings ) &&
2290	2030	filter_var( $auth_settings['ldap_lostpassword_url'], FILTER_VALIDATE_URL )
		@@ -2307,16 +2047,15 @@
2307	2047	/**
2308	2048	* Add a link to this plugin's settings page from the WordPress Plugins page.
2309	2049	* Called from "plugin_action_links" filter in __construct() above.
2310	2050	*
2311		- * Filter: plugin_action_links_authorizer.php
	2051	+ * @param array $links array of links in the admin sidebar
2312	2052	*
2313		- * @param array $links Admin sidebar links.
2314		- * @return array Admin sidebar links with Authorizer added.
	2053	+ * @return array of links to show in the admin sidebar.
2315	2054	*/
2316	2055	public function plugin_settings_link( $links ) {
2317		- $admin_menu = $this->get_plugin_option( 'advanced_admin_menu' );
2318		- $settings_url = 'settings' === $admin_menu ? admin_url( 'options-general.php?page=authorizer' ) : admin_url( 'admin.php?page=authorizer' );
	2056	+ $admin_menu = $this->get_plugin_option( 'advanced_admin_menu' );
	2057	+ $settings_url = $admin_menu === 'settings' ? admin_url( 'options-general.php?page=authorizer' ) : admin_url( 'admin.php?page=authorizer' );
2319	2058	array_unshift( $links, '<a href="' . $settings_url . '">' . __( 'Settings', 'authorizer' ) . '</a>' );
2320	2059	return $links;
2321	2060	}
2322	2061
		@@ -2324,12 +2063,11 @@
2324	2063	/**
2325	2064	* Add a link to this plugin's network settings page from the WordPress Plugins page.
2326	2065	* Called from "network_admin_plugin_action_links" filter in __construct() above.
2327	2066	*
2328		- * Filter: network_admin_plugin_action_links_authorizer.php
	2067	+ * @param array $links array of links in the network admin sidebar
2329	2068	*
2330		- * @param array $links Network admin sidebar links.
2331		- * @return array Network admin sidebar links with Authorizer added.
	2069	+ * @return array of links to show in the network admin sidebar.
2332	2070	*/
2333	2071	public function network_admin_plugin_settings_link( $links ) {
2334	2072	$settings_link = '<a href="admin.php?page=authorizer">' . __( 'Network Settings', 'authorizer' ) . '</a>';
2335	2073	array_unshift( $links, $settings_link );
		@@ -2337,33 +2075,32 @@
2337	2075	}
2338	2076
2339	2077
2340	2078	/**
2341		- * Create the options page under Dashboard > Settings.
2342		- *
2343		- * Action: admin_menu
	2079	+ * Create the options page under Dashboard > Settings
	2080	+ * Run on action hook: admin_menu
2344	2081	*/
2345	2082	public function add_plugin_page() {
2346	2083	$admin_menu = $this->get_plugin_option( 'advanced_admin_menu' );
2347		- if ( 'settings' === $admin_menu ) {
	2084	+ if ( $admin_menu === 'settings' ) {
2348	2085	// @see http://codex.wordpress.org/Function_Reference/add_options_page
2349	2086	add_options_page(
2350		- 'Authorizer',
2351		- 'Authorizer',
2352		- 'create_users',
2353		- 'authorizer',
2354		- array( $this, 'create_admin_page' )
	2087	+ 'Authorizer', // Page title
	2088	+ 'Authorizer', // Menu title
	2089	+ 'create_users', // Capability
	2090	+ 'authorizer', // Menu slug
	2091	+ array( $this, 'create_admin_page' ) // function
2355	2092	);
2356	2093	} else {
2357	2094	// @see http://codex.wordpress.org/Function_Reference/add_menu_page
2358	2095	add_menu_page(
2359		- 'Authorizer',
2360		- 'Authorizer',
2361		- 'create_users',
2362		- 'authorizer',
2363		- array( $this, 'create_admin_page' ),
2364		- 'dashicons-groups',
2365		- '99.0018465' // position (decimal is to make overlap with other plugins less likely).
	2096	+ 'Authorizer', // Page title
	2097	+ 'Authorizer', // Menu title
	2098	+ 'create_users', // Capability
	2099	+ 'authorizer', // Menu slug
	2100	+ array( $this, 'create_admin_page' ), // callback
	2101	+ 'dashicons-groups', // icon
	2102	+ '99.0018465' // position (decimal is to make overlap with other plugins less likely)
2366	2103	);
2367	2104	}
2368	2105	}
2369	2106
		@@ -2368,75 +2105,56 @@
2368	2105	}
2369	2106
2370	2107
2371	2108	/**
2372		- * Output the HTML for the options page.
	2109	+ * Output the HTML for the options page
2373	2110	*/
2374		- public function create_admin_page() {
2375		- ?>
	2111	+ public function create_admin_page() { ?>
2376	2112	<div class="wrap">
2377		- <h2><?php esc_html_e( 'Authorizer Settings', 'authorizer' ); ?></h2>
2378		- <form method="post" action="options.php" autocomplete="off">
2379		- <?php
2380		- // This prints out all hidden settings fields.
	2113	+ <h2><?php _e( 'Authorizer Settings', 'authorizer' ); ?></h2>
	2114	+ <form method="post" action="options.php" autocomplete="off"><?php
	2115	+ // This prints out all hidden settings fields
	2116	+ // @see http://codex.wordpress.org/Function_Reference/settings_fields
2381	2117	settings_fields( 'auth_settings_group' );
2382		- // This prints out all the sections.
	2118	+ // This prints out all the sections
	2119	+ // @see http://codex.wordpress.org/Function_Reference/do_settings_sections
2383	2120	do_settings_sections( 'authorizer' );
2384		- submit_button();
2385		- ?>
	2121	+ submit_button(); ?>
2386	2122	</form>
2387		- </div>
2388		- <?php
	2123	+ </div><?php
2389	2124	}
2390	2125
2391	2126
2392	2127	/**
2393	2128	* Load external resources on this plugin's options page.
2394		- *
2395		- * Action: load-settings_page_authorizer
2396		- * Action: load-toplevel_page_authorizer
2397		- * Action: admin_head-index.php
	2129	+ * Run on action hooks: load-settings_page_authorizer, load-toplevel_page_authorizer, admin_head-index.php
2398	2130	*/
2399	2131	public function load_options_page() {
2400	2132	wp_enqueue_script(
2401	2133	'authorizer',
2402	2134	plugins_url( 'js/authorizer.js', __FILE__ ),
2403		- array( 'jquery-effects-shake' ), '2.8.0', true
	2135	+ array( 'jquery-effects-shake' ), '2.3.2', true
2404	2136	);
2405		- wp_localize_script(
2406		- 'authorizer', 'authL10n', array(
2407		- 'baseurl' => get_bloginfo( 'url' ),
2408		- 'saved' => esc_html__( 'Saved', 'authorizer' ),
2409		- 'duplicate' => esc_html__( 'Duplicate', 'authorizer' ),
2410		- 'failed' => esc_html__( 'Failed', 'authorizer' ),
2411		- 'local_wordpress_user' => esc_html__( 'Local WordPress user', 'authorizer' ),
2412		- 'block_ban_user' => esc_html__( 'Block/Ban user', 'authorizer' ),
2413		- 'remove_user' => esc_html__( 'Remove user', 'authorizer' ),
2414		- 'no_users_in' => esc_html__( 'No users in', 'authorizer' ),
2415		- 'save_changes' => esc_html__( 'Save Changes', 'authorizer' ),
2416		- 'private_pages' => esc_html__( 'Private Pages', 'authorizer' ),
2417		- 'public_pages' => esc_html__( 'Public Pages', 'authorizer' ),
2418		- 'first_page' => esc_html__( 'First page' ),
2419		- 'previous_page' => esc_html__( 'Previous page' ),
2420		- 'next_page' => esc_html__( 'Next page' ),
2421		- 'last_page' => esc_html__( 'Last page' ),
2422		- 'is_network_admin' => is_network_admin() ? '1' : '0',
2423		- )
2424		- );
	2137	+ wp_localize_script( 'authorizer', 'auth_L10n', array(
	2138	+ 'baseurl' => get_bloginfo( 'url' ),
	2139	+ 'saved' => esc_html__( 'Saved', 'authorizer' ),
	2140	+ 'failed' => esc_html__( 'Failed', 'authorizer' ),
	2141	+ 'local_wordpress_user' => esc_html__( 'Local WordPress user', 'authorizer' ),
	2142	+ 'block_ban_user' => esc_html__( 'Block/Ban user', 'authorizer' ),
	2143	+ 'remove_user' => esc_html__( 'Remove user', 'authorizer' ),
	2144	+ 'no_users_in' => esc_html__( 'No users in', 'authorizer' ),
	2145	+ 'save_changes' => esc_html__( 'Save Changes', 'authorizer' ),
	2146	+ 'private_pages' => esc_html__( 'Private Pages', 'authorizer' ),
	2147	+ 'public_pages' => esc_html__( 'Public Pages', 'authorizer' ),
	2148	+ ));
2425	2149
2426	2150	wp_enqueue_script(
2427		- 'jquery-autogrow-textarea',
2428		- plugins_url( 'vendor/jquery.autogrow-textarea/jquery.autogrow-textarea.js', __FILE__ ),
2429		- array( 'jquery' ), '2.7.0', true
2430		- );
2431		-
2432		- wp_enqueue_script(
2433	2151	'jquery.multi-select',
2434	2152	plugins_url( 'vendor/jquery.multi-select/js/jquery.multi-select.js', __FILE__ ),
2435	2153	array( 'jquery' ), '1.8', true
2436	2154	);
2437	2155
2438		- wp_register_style( 'authorizer-css', plugins_url( 'css/authorizer.css', __FILE__ ), array(), '2.7.3' );
	2156	+ wp_register_style( 'authorizer-css', plugins_url( 'css/authorizer.css', __FILE__ ), array(), '2.3.2' );
2439	2157	wp_enqueue_style( 'authorizer-css' );
2440	2158
2441	2159	wp_register_style( 'jquery-multi-select-css', plugins_url( 'vendor/jquery.multi-select/css/multi-select.css', __FILE__ ), array(), '1.8' );
2442	2160	wp_enqueue_style( 'jquery-multi-select-css' );
		@@ -2447,26 +2165,18 @@
2447	2165
2448	2166
2449	2167	/**
2450	2168	* Show custom admin notice.
2451		- *
2452		- * Note: currently unused, but if anywhere we:
2453		- * add_option( 'auth_settings_advanced_admin_notice, 'Your message.' );
2454		- * It will display and then delete that message on the admin dashboard.
2455		- *
2456		- * Filter: admin_notices
2457		- * filter: network_admin_notices
	2169	+ * Filter: admin_notice
2458	2170	*/
2459		- public function show_advanced_admin_notice() {
	2171	+ function show_advanced_admin_notice() {
2460	2172	$notice = get_option( 'auth_settings_advanced_admin_notice' );
2461	2173	delete_option( 'auth_settings_advanced_admin_notice' );
2462	2174
2463		- if ( $notice && strlen( $notice ) > 0 ) {
2464		- ?>
	2175	+ if ( $notice && strlen( $notice ) > 0 ) { ?>
2465	2176	<div class="error">
2466		- <p><?php echo wp_kses( $notice, $this->allowed_html ); ?></p>
2467		- </div>
2468		- <?php
	2177	+ <p><?php echo $notice; ?></p>
	2178	+ </div><?php
2469	2179	}
2470	2180	}
2471	2181
2472	2182
		@@ -2471,11 +2181,9 @@
2471	2181
2472	2182
2473	2183	/**
2474	2184	* Add notices to the top of the options page.
2475		- *
2476		- * Action: load-settings_page_authorizer > admin_notices
2477		- *
	2185	+ * Run on action hook chain: load-settings_page_authorizer > admin_notices
2478	2186	* Description: Check for invalid settings combinations and show a warning message, e.g.:
2479	2187	* if ( cas url inaccessible ) : ?>
2480	2188	* <div class='updated settings-error'><p>Can't reach CAS server.</p></div>
2481	2189	* <?php endif;
		@@ -2481,23 +2189,20 @@
2481	2189	* <?php endif;
2482	2190	*/
2483	2191	public function admin_notices() {
2484	2192	// Grab plugin settings.
2485		- $auth_settings = $this->get_plugin_options( WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	2193	+ $auth_settings = $this->get_plugin_options( SINGLE_ADMIN, 'allow override' );
2486	2194
2487		- if ( '1' === $auth_settings['cas'] ) :
	2195	+ if ( $auth_settings['cas'] === '1' ) :
2488	2196	// Check if provided CAS URL is accessible.
2489		- $protocol = in_array( strval( $auth_settings['cas_port'] ), array( '80', '8080' ), true ) ? 'http' : 'https';
2490		- $cas_url = $protocol . '://' . $auth_settings['cas_host'] . ':' . $auth_settings['cas_port'] . $auth_settings['cas_path'];
2491		- $legacy_cas_url = trailingslashit( $cas_url ) . 'login'; // Check the specific CAS login endpoint (old; some servers don't register a ./login endpoint, use serviceValidate instead).
2492		- $cas_url = trailingslashit( $cas_url ) . 'serviceValidate'; // Check the specific CAS login endpoint.
2493		- if ( ! $this->url_is_accessible( $cas_url ) && ! $this->url_is_accessible( $legacy_cas_url ) ) :
2494		- $authorizer_options_url = 'settings' === $auth_settings['advanced_admin_menu'] ? admin_url( 'options-general.php?page=authorizer' ) : admin_url( '?page=authorizer' );
2495		- ?>
2496		- <div class='notice notice-warning is-dismissible'>
2497		- <p><?php esc_html_e( "Can't reach CAS server. Please provide", 'authorizer' ); ?> <a href='<?php echo esc_attr( $authorizer_options_url ); ?>&tab=external'><?php esc_html_e( 'accurate CAS settings', 'authorizer' ); ?></a> <?php esc_html_e( 'if you intend to use it.', 'authorizer' ); ?></p>
2498		- </div>
2499		- <?php
	2197	+ $protocol = in_array( $auth_settings['cas_port'], array( '80', '8080' ) ) ? 'http' : 'https';
	2198	+ $cas_url = $protocol . '://' . $auth_settings['cas_host'] . ':' . $auth_settings['cas_port'] . $auth_settings['cas_path'];
	2199	+ $cas_url = trailingslashit( $cas_url ) . 'login'; // Check the specific CAS login endpoint
	2200	+ if ( ! $this->url_is_accessible( $cas_url ) ) :
	2201	+ $authorizer_options_url = $auth_settings['advanced_admin_menu'] === 'settings' ? admin_url( 'options-general.php?page=authorizer' ) : admin_url( '?page=authorizer' );
	2202	+ ?><div class='notice notice-warning is-dismissible'>
	2203	+ <p><?php _e( "Can't reach CAS server. Please provide", 'authorizer' ); ?> <a href='<?php echo $authorizer_options_url; ?>&tab=external'><?php _e( 'accurate CAS settings', 'authorizer' ); ?></a> <?php _e( 'if you intend to use it.', 'authorizer' ); ?></p>
	2204	+ </div><?php
2500	2205	endif;
2501	2206	endif;
2502	2207	}
2503	2208
		@@ -2502,430 +2207,399 @@
2502	2207	}
2503	2208
2504	2209
2505	2210	/**
2506		- * Create sections and options.
2507		- *
2508		- * Action: admin_init
	2211	+ * Create sections and options
	2212	+ * Run on action hook: admin_init
2509	2213	*/
2510	2214	public function page_init() {
2511		- /**
2512		- * Create one setting that holds all the options (array).
2513		- *
2514		- * @see http://codex.wordpress.org/Function_Reference/register_setting
2515		- * @see http://codex.wordpress.org/Function_Reference/add_settings_section
2516		- * @see http://codex.wordpress.org/Function_Reference/add_settings_field
2517		- */
	2215	+ // Create one setting that holds all the options (array)
	2216	+ // @see http://codex.wordpress.org/Function_Reference/register_setting
	2217	+ // @see http://codex.wordpress.org/Function_Reference/add_settings_section
	2218	+ // @see http://codex.wordpress.org/Function_Reference/add_settings_field
2518	2219	register_setting(
2519		- 'auth_settings_group',
2520		- 'auth_settings',
2521		- array( $this, 'sanitize_options' )
	2220	+ 'auth_settings_group', // Option group
	2221	+ 'auth_settings', // Option name
	2222	+ array( $this, 'sanitize_options' ) // Sanitize callback
2522	2223	);
2523	2224
2524	2225	add_settings_section(
2525		- 'auth_settings_tabs',
2526		- '',
2527		- array( $this, 'print_section_info_tabs' ),
2528		- 'authorizer'
	2226	+ 'auth_settings_tabs', // HTML element ID
	2227	+ '', // HTML element Title
	2228	+ array( $this, 'print_section_info_tabs' ), // Callback (echos section content)
	2229	+ 'authorizer' // Page this section is shown on (slug)
2529	2230	);
2530	2231
2531		- // Create Access Lists section.
	2232	+ // Create Access Lists section
2532	2233	add_settings_section(
2533		- 'auth_settings_lists',
2534		- '',
2535		- array( $this, 'print_section_info_access_lists' ),
2536		- 'authorizer'
	2234	+ 'auth_settings_lists', // HTML element ID
	2235	+ '', // HTML element Title
	2236	+ array( $this, 'print_section_info_access_lists' ), // Callback (echos section content)
	2237	+ 'authorizer' // Page this section is shown on (slug)
2537	2238	);
2538	2239
2539		- // Create Login Access section.
	2240	+ // Create Login Access section
2540	2241	add_settings_section(
2541		- 'auth_settings_access_login',
2542		- '',
2543		- array( $this, 'print_section_info_access_login' ),
2544		- 'authorizer'
	2242	+ 'auth_settings_access_login', // HTML element ID
	2243	+ '', // HTML element Title
	2244	+ array( $this, 'print_section_info_access_login' ), // Callback (echos section content)
	2245	+ 'authorizer' // Page this section is shown on (slug)
2545	2246	);
2546	2247	add_settings_field(
2547		- 'auth_settings_access_who_can_login',
2548		- __( 'Who can log into the site?', 'authorizer' ),
2549		- array( $this, 'print_radio_auth_access_who_can_login' ),
2550		- 'authorizer',
2551		- 'auth_settings_access_login'
	2248	+ 'auth_settings_access_who_can_login', // HTML element ID
	2249	+ __( 'Who can log into the site?', 'authorizer' ), // HTML element Title
	2250	+ array( $this, 'print_radio_auth_access_who_can_login' ), // Callback (echos form element)
	2251	+ 'authorizer', // Page this setting is shown on (slug)
	2252	+ 'auth_settings_access_login' // Section this setting is shown on
2552	2253	);
2553	2254	add_settings_field(
2554		- 'auth_settings_access_role_receive_pending_emails',
2555		- __( 'Which role should receive email notifications about pending users?', 'authorizer' ),
2556		- array( $this, 'print_select_auth_access_role_receive_pending_emails' ),
2557		- 'authorizer',
2558		- 'auth_settings_access_login'
	2255	+ 'auth_settings_access_role_receive_pending_emails', // HTML element ID
	2256	+ __( 'Which role should receive email notifications about pending users?', 'authorizer' ), // HTML element Title
	2257	+ array( $this, 'print_select_auth_access_role_receive_pending_emails' ), // Callback (echos form element)
	2258	+ 'authorizer', // Page this setting is shown on (slug)
	2259	+ 'auth_settings_access_login' // Section this setting is shown on
2559	2260	);
2560	2261	add_settings_field(
2561		- 'auth_settings_access_pending_redirect_to_message',
2562		- __( 'What message should pending users see after attempting to log in?', 'authorizer' ),
2563		- array( $this, 'print_wysiwyg_auth_access_pending_redirect_to_message' ),
2564		- 'authorizer',
2565		- 'auth_settings_access_login'
	2262	+ 'auth_settings_access_pending_redirect_to_message', // HTML element ID
	2263	+ __( 'What message should pending users see after attempting to log in?', 'authorizer' ), // HTML element Title
	2264	+ array( $this, 'print_wysiwyg_auth_access_pending_redirect_to_message' ), // Callback (echos form element)
	2265	+ 'authorizer', // Page this setting is shown on (slug)
	2266	+ 'auth_settings_access_login' // Section this setting is shown on
2566	2267	);
2567	2268	add_settings_field(
2568		- 'auth_settings_access_blocked_redirect_to_message',
2569		- __( 'What message should blocked users see after attempting to log in?', 'authorizer' ),
2570		- array( $this, 'print_wysiwyg_auth_access_blocked_redirect_to_message' ),
2571		- 'authorizer',
2572		- 'auth_settings_access_login'
	2269	+ 'auth_settings_access_blocked_redirect_to_message', // HTML element ID
	2270	+ __( 'What message should blocked users see after attempting to log in?', 'authorizer' ), // HTML element Title
	2271	+ array( $this, 'print_wysiwyg_auth_access_blocked_redirect_to_message' ), // Callback (echos form element)
	2272	+ 'authorizer', // Page this setting is shown on (slug)
	2273	+ 'auth_settings_access_login' // Section this setting is shown on
2573	2274	);
2574	2275	add_settings_field(
2575		- 'auth_settings_access_should_email_approved_users',
2576		- __( 'Send welcome email to new approved users?', 'authorizer' ),
2577		- array( $this, 'print_checkbox_auth_access_should_email_approved_users' ),
2578		- 'authorizer',
2579		- 'auth_settings_access_login'
	2276	+ 'auth_settings_access_should_email_approved_users', // HTML element ID
	2277	+ __( 'Send welcome email to new approved users?', 'authorizer' ), // HTML element Title
	2278	+ array( $this, 'print_checkbox_auth_access_should_email_approved_users' ), // Callback (echos form element)
	2279	+ 'authorizer', // Page this setting is shown on (slug)
	2280	+ 'auth_settings_access_login' // Section this setting is shown on
2580	2281	);
2581	2282	add_settings_field(
2582		- 'auth_settings_access_email_approved_users_subject',
2583		- __( 'Welcome email subject', 'authorizer' ),
2584		- array( $this, 'print_text_auth_access_email_approved_users_subject' ),
2585		- 'authorizer',
2586		- 'auth_settings_access_login'
	2283	+ 'auth_settings_access_email_approved_users_subject', // HTML element ID
	2284	+ __( 'Welcome email subject', 'authorizer' ), // HTML element Title
	2285	+ array( $this, 'print_text_auth_access_email_approved_users_subject' ), // Callback (echos form element)
	2286	+ 'authorizer', // Page this setting is shown on (slug)
	2287	+ 'auth_settings_access_login' // Section this setting is shown on
2587	2288	);
2588	2289	add_settings_field(
2589		- 'auth_settings_access_email_approved_users_body',
2590		- __( 'Welcome email body', 'authorizer' ),
2591		- array( $this, 'print_wysiwyg_auth_access_email_approved_users_body' ),
2592		- 'authorizer',
2593		- 'auth_settings_access_login'
	2290	+ 'auth_settings_access_email_approved_users_body', // HTML element ID
	2291	+ __( 'Welcome email body', 'authorizer' ), // HTML element Title
	2292	+ array( $this, 'print_wysiwyg_auth_access_email_approved_users_body' ), // Callback (echos form element)
	2293	+ 'authorizer', // Page this setting is shown on (slug)
	2294	+ 'auth_settings_access_login' // Section this setting is shown on
2594	2295	);
2595	2296
2596		- // Create Public Access section.
	2297	+
	2298	+ // Create Public Access section
2597	2299	add_settings_section(
2598		- 'auth_settings_access_public',
2599		- '',
2600		- array( $this, 'print_section_info_access_public' ),
2601		- 'authorizer'
	2300	+ 'auth_settings_access_public', // HTML element ID
	2301	+ '', // HTML element Title
	2302	+ array( $this, 'print_section_info_access_public' ), // Callback (echos section content)
	2303	+ 'authorizer' // Page this section is shown on (slug)
2602	2304	);
2603	2305	add_settings_field(
2604		- 'auth_settings_access_who_can_view',
2605		- __( 'Who can view the site?', 'authorizer' ),
2606		- array( $this, 'print_radio_auth_access_who_can_view' ),
2607		- 'authorizer',
2608		- 'auth_settings_access_public'
	2306	+ 'auth_settings_access_who_can_view', // HTML element ID
	2307	+ __( 'Who can view the site?', 'authorizer' ), // HTML element Title
	2308	+ array( $this, 'print_radio_auth_access_who_can_view' ), // Callback (echos form element)
	2309	+ 'authorizer', // Page this setting is shown on (slug)
	2310	+ 'auth_settings_access_public' // Section this setting is shown on
2609	2311	);
2610	2312	add_settings_field(
2611		- 'auth_settings_access_public_pages',
2612		- __( 'What pages (if any) should be available to everyone?', 'authorizer' ),
2613		- array( $this, 'print_multiselect_auth_access_public_pages' ),
2614		- 'authorizer',
2615		- 'auth_settings_access_public'
	2313	+ 'auth_settings_access_public_pages', // HTML element ID
	2314	+ __( 'What pages (if any) should be available to everyone?', 'authorizer' ), // HTML element Title
	2315	+ array( $this, 'print_multiselect_auth_access_public_pages' ), // Callback (echos form element)
	2316	+ 'authorizer', // Page this setting is shown on (slug)
	2317	+ 'auth_settings_access_public' // Section this setting is shown on
2616	2318	);
2617	2319	add_settings_field(
2618		- 'auth_settings_access_redirect',
2619		- __( 'What happens to people without access when they visit a private page?', 'authorizer' ),
2620		- array( $this, 'print_radio_auth_access_redirect' ),
2621		- 'authorizer',
2622		- 'auth_settings_access_public'
	2320	+ 'auth_settings_access_redirect', // HTML element ID
	2321	+ __( 'What happens to people without access when they visit a private page?', 'authorizer' ), // HTML element Title
	2322	+ array( $this, 'print_radio_auth_access_redirect' ), // Callback (echos form element)
	2323	+ 'authorizer', // Page this setting is shown on (slug)
	2324	+ 'auth_settings_access_public' // Section this setting is shown on
2623	2325	);
2624	2326	add_settings_field(
2625		- 'auth_settings_access_public_warning',
2626		- __( 'What happens to people without access when they visit a public page?', 'authorizer' ),
2627		- array( $this, 'print_radio_auth_access_public_warning' ),
2628		- 'authorizer',
2629		- 'auth_settings_access_public'
	2327	+ 'auth_settings_access_public_warning', // HTML element ID
	2328	+ __( 'What happens to people without access when they visit a public page?', 'authorizer' ), // HTML element Title
	2329	+ array( $this, 'print_radio_auth_access_public_warning' ), // Callback (echos form element)
	2330	+ 'authorizer', // Page this setting is shown on (slug)
	2331	+ 'auth_settings_access_public' // Section this setting is shown on
2630	2332	);
2631	2333	add_settings_field(
2632		- 'auth_settings_access_redirect_to_message',
2633		- __( 'What message should people without access see?', 'authorizer' ),
2634		- array( $this, 'print_wysiwyg_auth_access_redirect_to_message' ),
2635		- 'authorizer',
2636		- 'auth_settings_access_public'
	2334	+ 'auth_settings_access_redirect_to_message', // HTML element ID
	2335	+ __( 'What message should people without access see?', 'authorizer' ), // HTML element Title
	2336	+ array( $this, 'print_wysiwyg_auth_access_redirect_to_message' ), // Callback (echos form element)
	2337	+ 'authorizer', // Page this setting is shown on (slug)
	2338	+ 'auth_settings_access_public' // Section this setting is shown on
2637	2339	);
2638	2340
2639		- // Create External Service Settings section.
	2341	+ // Create External Service Settings section
2640	2342	add_settings_section(
2641		- 'auth_settings_external',
2642		- '',
2643		- array( $this, 'print_section_info_external' ),
2644		- 'authorizer'
	2343	+ 'auth_settings_external', // HTML element ID
	2344	+ '', // HTML element Title
	2345	+ array( $this, 'print_section_info_external' ), // Callback (echos section content)
	2346	+ 'authorizer' // Page this section is shown on (slug)
2645	2347	);
2646	2348	add_settings_field(
2647		- 'auth_settings_access_default_role',
2648		- __( 'Default role for new users', 'authorizer' ),
2649		- array( $this, 'print_select_auth_access_default_role' ),
2650		- 'authorizer',
2651		- 'auth_settings_external'
	2349	+ 'auth_settings_access_default_role', // HTML element ID
	2350	+ __( 'Default role for new users', 'authorizer' ), // HTML element Title
	2351	+ array( $this, 'print_select_auth_access_default_role' ), // Callback (echos form element)
	2352	+ 'authorizer', // Page this setting is shown on (slug)
	2353	+ 'auth_settings_external' // Section this setting is shown on
2652	2354	);
2653	2355	add_settings_field(
2654		- 'auth_settings_external_google',
2655		- __( 'Google Logins', 'authorizer' ),
2656		- array( $this, 'print_checkbox_auth_external_google' ),
2657		- 'authorizer',
2658		- 'auth_settings_external'
	2356	+ 'auth_settings_external_google', // HTML element ID
	2357	+ __( 'Google Logins', 'authorizer' ), // HTML element Title
	2358	+ array( $this, 'print_checkbox_auth_external_google' ), // Callback (echos form element)
	2359	+ 'authorizer', // Page this setting is shown on (slug)
	2360	+ 'auth_settings_external' // Section this setting is shown on
2659	2361	);
2660	2362	add_settings_field(
2661		- 'auth_settings_google_clientid',
2662		- __( 'Google Client ID', 'authorizer' ),
2663		- array( $this, 'print_text_google_clientid' ),
2664		- 'authorizer',
2665		- 'auth_settings_external'
	2363	+ 'auth_settings_google_clientid', // HTML element ID
	2364	+ __( 'Google Client ID', 'authorizer' ), // HTML element Title
	2365	+ array( $this, 'print_text_google_clientid' ), // Callback (echos form element)
	2366	+ 'authorizer', // Page this setting is shown on (slug)
	2367	+ 'auth_settings_external' // Section this setting is shown on
2666	2368	);
2667	2369	add_settings_field(
2668		- 'auth_settings_google_clientsecret',
2669		- __( 'Google Client Secret', 'authorizer' ),
2670		- array( $this, 'print_text_google_clientsecret' ),
2671		- 'authorizer',
2672		- 'auth_settings_external'
	2370	+ 'auth_settings_google_clientsecret', // HTML element ID
	2371	+ __( 'Google Client Secret', 'authorizer' ), // HTML element Title
	2372	+ array( $this, 'print_text_google_clientsecret' ), // Callback (echos form element)
	2373	+ 'authorizer', // Page this setting is shown on (slug)
	2374	+ 'auth_settings_external' // Section this setting is shown on
2673	2375	);
2674	2376	add_settings_field(
2675		- 'auth_settings_google_hosteddomain',
2676		- __( 'Google Hosted Domain', 'authorizer' ),
2677		- array( $this, 'print_text_google_hosteddomain' ),
2678		- 'authorizer',
2679		- 'auth_settings_external'
	2377	+ 'auth_settings_google_hosteddomain', // HTML element ID
	2378	+ __( 'Google Hosted Domain', 'authorizer' ), // HTML element Title
	2379	+ array( $this, 'print_text_google_hosteddomain' ), // Callback (echos form element)
	2380	+ 'authorizer', // Page this setting is shown on (slug)
	2381	+ 'auth_settings_external' // Section this setting is shown on
2680	2382	);
2681	2383	add_settings_field(
2682		- 'auth_settings_external_cas',
2683		- __( 'CAS Logins', 'authorizer' ),
2684		- array( $this, 'print_checkbox_auth_external_cas' ),
2685		- 'authorizer',
2686		- 'auth_settings_external'
	2384	+ 'auth_settings_external_cas', // HTML element ID
	2385	+ __( 'CAS Logins', 'authorizer' ), // HTML element Title
	2386	+ array( $this, 'print_checkbox_auth_external_cas' ), // Callback (echos form element)
	2387	+ 'authorizer', // Page this setting is shown on (slug)
	2388	+ 'auth_settings_external' // Section this setting is shown on
2687	2389	);
2688	2390	add_settings_field(
2689		- 'auth_settings_cas_custom_label',
2690		- __( 'CAS custom label', 'authorizer' ),
2691		- array( $this, 'print_text_cas_custom_label' ),
2692		- 'authorizer',
2693		- 'auth_settings_external'
	2391	+ 'auth_settings_cas_custom_label', // HTML element ID
	2392	+ __( 'CAS custom label', 'authorizer' ), // HTML element Title
	2393	+ array( $this, 'print_text_cas_custom_label' ), // Callback (echos form element)
	2394	+ 'authorizer', // Page this setting is shown on (slug)
	2395	+ 'auth_settings_external' // Section this setting is shown on
2694	2396	);
2695	2397	add_settings_field(
2696		- 'auth_settings_cas_host',
2697		- __( 'CAS server hostname', 'authorizer' ),
2698		- array( $this, 'print_text_cas_host' ),
2699		- 'authorizer',
2700		- 'auth_settings_external'
	2398	+ 'auth_settings_cas_host', // HTML element ID
	2399	+ __( 'CAS server hostname', 'authorizer' ), // HTML element Title
	2400	+ array( $this, 'print_text_cas_host' ), // Callback (echos form element)
	2401	+ 'authorizer', // Page this setting is shown on (slug)
	2402	+ 'auth_settings_external' // Section this setting is shown on
2701	2403	);
2702	2404	add_settings_field(
2703		- 'auth_settings_cas_port',
2704		- __( 'CAS server port', 'authorizer' ),
2705		- array( $this, 'print_text_cas_port' ),
2706		- 'authorizer',
2707		- 'auth_settings_external'
	2405	+ 'auth_settings_cas_port', // HTML element ID
	2406	+ __( 'CAS server port', 'authorizer' ), // HTML element Title
	2407	+ array( $this, 'print_text_cas_port' ), // Callback (echos form element)
	2408	+ 'authorizer', // Page this setting is shown on (slug)
	2409	+ 'auth_settings_external' // Section this setting is shown on
2708	2410	);
2709	2411	add_settings_field(
2710		- 'auth_settings_cas_path',
2711		- __( 'CAS server path/context', 'authorizer' ),
2712		- array( $this, 'print_text_cas_path' ),
2713		- 'authorizer',
2714		- 'auth_settings_external'
	2412	+ 'auth_settings_cas_path', // HTML element ID
	2413	+ __( 'CAS server path/context', 'authorizer' ), // HTML element Title
	2414	+ array( $this, 'print_text_cas_path' ), // Callback (echos form element)
	2415	+ 'authorizer', // Page this setting is shown on (slug)
	2416	+ 'auth_settings_external' // Section this setting is shown on
2715	2417	);
2716	2418	add_settings_field(
2717		- 'auth_settings_cas_version',
2718		- 'CAS server version',
2719		- array( $this, 'print_select_cas_version' ),
2720		- 'authorizer',
2721		- 'auth_settings_external'
	2419	+ 'auth_settings_cas_version', // HTML element ID
	2420	+ 'CAS server version', // HTML element Title
	2421	+ array( $this, 'print_select_cas_version' ), // Callback (echos form element)
	2422	+ 'authorizer', // Page this setting is shown on (slug)
	2423	+ 'auth_settings_external' // Section this setting is shown on
2722	2424	);
2723	2425	add_settings_field(
2724		- 'auth_settings_cas_attr_email',
2725		- __( 'CAS attribute containing email address', 'authorizer' ),
2726		- array( $this, 'print_text_cas_attr_email' ),
2727		- 'authorizer',
2728		- 'auth_settings_external'
	2426	+ 'auth_settings_cas_attr_email', // HTML element ID
	2427	+ __( 'CAS attribute containing email address', 'authorizer' ), // HTML element Title
	2428	+ array( $this, 'print_text_cas_attr_email' ), // Callback (echos form element)
	2429	+ 'authorizer', // Page this setting is shown on (slug)
	2430	+ 'auth_settings_external' // Section this setting is shown on
2729	2431	);
2730	2432	add_settings_field(
2731		- 'auth_settings_cas_attr_first_name',
2732		- __( 'CAS attribute containing first name', 'authorizer' ),
2733		- array( $this, 'print_text_cas_attr_first_name' ),
2734		- 'authorizer',
2735		- 'auth_settings_external'
	2433	+ 'auth_settings_cas_attr_first_name', // HTML element ID
	2434	+ __( 'CAS attribute containing first name', 'authorizer' ), // HTML element Title
	2435	+ array( $this, 'print_text_cas_attr_first_name' ), // Callback (echos form element)
	2436	+ 'authorizer', // Page this setting is shown on (slug)
	2437	+ 'auth_settings_external' // Section this setting is shown on
2736	2438	);
2737	2439	add_settings_field(
2738		- 'auth_settings_cas_attr_last_name',
2739		- __( 'CAS attribute containing last name', 'authorizer' ),
2740		- array( $this, 'print_text_cas_attr_last_name' ),
2741		- 'authorizer',
2742		- 'auth_settings_external'
	2440	+ 'auth_settings_cas_attr_last_name', // HTML element ID
	2441	+ __( 'CAS attribute containing last name', 'authorizer' ), // HTML element Title
	2442	+ array( $this, 'print_text_cas_attr_last_name' ), // Callback (echos form element)
	2443	+ 'authorizer', // Page this setting is shown on (slug)
	2444	+ 'auth_settings_external' // Section this setting is shown on
2743	2445	);
2744	2446	add_settings_field(
2745		- 'auth_settings_cas_attr_update_on_login',
2746		- __( 'CAS attribute update', 'authorizer' ),
2747		- array( $this, 'print_checkbox_cas_attr_update_on_login' ),
2748		- 'authorizer',
2749		- 'auth_settings_external'
	2447	+ 'auth_settings_cas_attr_update_on_login', // HTML element ID
	2448	+ __( 'CAS attribute update', 'authorizer' ), // HTML element Title
	2449	+ array( $this, 'print_checkbox_cas_attr_update_on_login' ), // Callback (echos form element)
	2450	+ 'authorizer', // Page this setting is shown on (slug)
	2451	+ 'auth_settings_external' // Section this setting is shown on
2750	2452	);
2751	2453	add_settings_field(
2752		- 'auth_settings_cas_auto_login',
2753		- __( 'CAS automatic login', 'authorizer' ),
2754		- array( $this, 'print_checkbox_cas_auto_login' ),
2755		- 'authorizer',
2756		- 'auth_settings_external'
	2454	+ 'auth_settings_cas_auto_login', // HTML element ID
	2455	+ __( 'CAS automatic login', 'authorizer' ), // HTML element Title
	2456	+ array( $this, 'print_checkbox_cas_auto_login' ), // Callback (echos form element)
	2457	+ 'authorizer', // Page this setting is shown on (slug)
	2458	+ 'auth_settings_external' // Section this setting is shown on
2757	2459	);
2758	2460	add_settings_field(
2759		- 'auth_settings_external_ldap',
2760		- __( 'LDAP Logins', 'authorizer' ),
2761		- array( $this, 'print_checkbox_auth_external_ldap' ),
2762		- 'authorizer',
2763		- 'auth_settings_external'
	2461	+ 'auth_settings_external_ldap', // HTML element ID
	2462	+ __( 'LDAP Logins', 'authorizer' ), // HTML element Title
	2463	+ array( $this, 'print_checkbox_auth_external_ldap' ), // Callback (echos form element)
	2464	+ 'authorizer', // Page this setting is shown on (slug)
	2465	+ 'auth_settings_external' // Section this setting is shown on
2764	2466	);
2765	2467	add_settings_field(
2766		- 'auth_settings_ldap_host',
2767		- __( 'LDAP Host', 'authorizer' ),
2768		- array( $this, 'print_text_ldap_host' ),
2769		- 'authorizer',
2770		- 'auth_settings_external'
	2468	+ 'auth_settings_ldap_host', // HTML element ID
	2469	+ __( 'LDAP Host', 'authorizer' ), // HTML element Title
	2470	+ array( $this, 'print_text_ldap_host' ), // Callback (echos form element)
	2471	+ 'authorizer', // Page this setting is shown on (slug)
	2472	+ 'auth_settings_external' // Section this setting is shown on
2771	2473	);
2772	2474	add_settings_field(
2773		- 'auth_settings_ldap_port',
2774		- __( 'LDAP Port', 'authorizer' ),
2775		- array( $this, 'print_text_ldap_port' ),
2776		- 'authorizer',
2777		- 'auth_settings_external'
	2475	+ 'auth_settings_ldap_port', // HTML element ID
	2476	+ __( 'LDAP Port', 'authorizer' ), // HTML element Title
	2477	+ array( $this, 'print_text_ldap_port' ), // Callback (echos form element)
	2478	+ 'authorizer', // Page this setting is shown on (slug)
	2479	+ 'auth_settings_external' // Section this setting is shown on
2778	2480	);
2779	2481	add_settings_field(
2780		- 'auth_settings_ldap_tls',
2781		- __( 'Use TLS', 'authorizer' ),
2782		- array( $this, 'print_checkbox_ldap_tls' ),
2783		- 'authorizer',
2784		- 'auth_settings_external'
	2482	+ 'auth_settings_ldap_tls', // HTML element ID
	2483	+ __( 'Secure Connection (TLS)', 'authorizer' ), // HTML element Title
	2484	+ array( $this, 'print_checkbox_ldap_tls' ), // Callback (echos form element)
	2485	+ 'authorizer', // Page this setting is shown on (slug)
	2486	+ 'auth_settings_external' // Section this setting is shown on
2785	2487	);
2786	2488	add_settings_field(
2787		- 'auth_settings_ldap_search_base',
2788		- __( 'LDAP Search Base', 'authorizer' ),
2789		- array( $this, 'print_text_ldap_search_base' ),
2790		- 'authorizer',
2791		- 'auth_settings_external'
	2489	+ 'auth_settings_ldap_search_base', // HTML element ID
	2490	+ __( 'LDAP Search Base', 'authorizer' ), // HTML element Title
	2491	+ array( $this, 'print_text_ldap_search_base' ), // Callback (echos form element)
	2492	+ 'authorizer', // Page this setting is shown on (slug)
	2493	+ 'auth_settings_external' // Section this setting is shown on
2792	2494	);
2793	2495	add_settings_field(
2794		- 'auth_settings_ldap_uid',
2795		- __( 'LDAP attribute containing username', 'authorizer' ),
2796		- array( $this, 'print_text_ldap_uid' ),
2797		- 'authorizer',
2798		- 'auth_settings_external'
	2496	+ 'auth_settings_ldap_uid', // HTML element ID
	2497	+ __( 'LDAP attribute containing username', 'authorizer' ), // HTML element Title
	2498	+ array( $this, 'print_text_ldap_uid' ), // Callback (echos form element)
	2499	+ 'authorizer', // Page this setting is shown on (slug)
	2500	+ 'auth_settings_external' // Section this setting is shown on
2799	2501	);
2800	2502	add_settings_field(
2801		- 'auth_settings_ldap_attr_email',
2802		- __( 'LDAP attribute containing email address', 'authorizer' ),
2803		- array( $this, 'print_text_ldap_attr_email' ),
2804		- 'authorizer',
2805		- 'auth_settings_external'
	2503	+ 'auth_settings_ldap_attr_email', // HTML element ID
	2504	+ __( 'LDAP attribute containing email address', 'authorizer' ), // HTML element Title
	2505	+ array( $this, 'print_text_ldap_attr_email' ), // Callback (echos form element)
	2506	+ 'authorizer', // Page this setting is shown on (slug)
	2507	+ 'auth_settings_external' // Section this setting is shown on
2806	2508	);
2807	2509	add_settings_field(
2808		- 'auth_settings_ldap_user',
2809		- __( 'LDAP Directory User', 'authorizer' ),
2810		- array( $this, 'print_text_ldap_user' ),
2811		- 'authorizer',
2812		- 'auth_settings_external'
	2510	+ 'auth_settings_ldap_user', // HTML element ID
	2511	+ __( 'LDAP Directory User', 'authorizer' ), // HTML element Title
	2512	+ array( $this, 'print_text_ldap_user' ), // Callback (echos form element)
	2513	+ 'authorizer', // Page this setting is shown on (slug)
	2514	+ 'auth_settings_external' // Section this setting is shown on
2813	2515	);
2814	2516	add_settings_field(
2815		- 'auth_settings_ldap_password',
2816		- __( 'LDAP Directory User Password', 'authorizer' ),
2817		- array( $this, 'print_password_ldap_password' ),
2818		- 'authorizer',
2819		- 'auth_settings_external'
	2517	+ 'auth_settings_ldap_password', // HTML element ID
	2518	+ __( 'LDAP Directory User Password', 'authorizer' ), // HTML element Title
	2519	+ array( $this, 'print_password_ldap_password' ), // Callback (echos form element)
	2520	+ 'authorizer', // Page this setting is shown on (slug)
	2521	+ 'auth_settings_external' // Section this setting is shown on
2820	2522	);
2821	2523	add_settings_field(
2822		- 'auth_settings_ldap_lostpassword_url',
2823		- __( 'Custom lost password URL', 'authorizer' ),
2824		- array( $this, 'print_text_ldap_lostpassword_url' ),
2825		- 'authorizer',
2826		- 'auth_settings_external'
	2524	+ 'auth_settings_ldap_lostpassword_url', // HTML element ID
	2525	+ __( 'Custom lost password URL', 'authorizer' ), // HTML element Title
	2526	+ array( $this, 'print_text_ldap_lostpassword_url' ), // Callback (echos form element)
	2527	+ 'authorizer', // Page this setting is shown on (slug)
	2528	+ 'auth_settings_external' // Section this setting is shown on
2827	2529	);
2828	2530	add_settings_field(
2829		- 'auth_settings_ldap_attr_first_name',
2830		- __( 'LDAP attribute containing first name', 'authorizer' ),
2831		- array( $this, 'print_text_ldap_attr_first_name' ),
2832		- 'authorizer',
2833		- 'auth_settings_external'
	2531	+ 'auth_settings_ldap_attr_first_name', // HTML element ID
	2532	+ __( 'LDAP attribute containing first name', 'authorizer' ), // HTML element Title
	2533	+ array( $this, 'print_text_ldap_attr_first_name' ), // Callback (echos form element)
	2534	+ 'authorizer', // Page this setting is shown on (slug)
	2535	+ 'auth_settings_external' // Section this setting is shown on
2834	2536	);
2835	2537	add_settings_field(
2836		- 'auth_settings_ldap_attr_last_name',
2837		- __( 'LDAP attribute containing last name', 'authorizer' ),
2838		- array( $this, 'print_text_ldap_attr_last_name' ),
2839		- 'authorizer',
2840		- 'auth_settings_external'
	2538	+ 'auth_settings_ldap_attr_last_name', // HTML element ID
	2539	+ __( 'LDAP attribute containing last name', 'authorizer' ), // HTML element Title
	2540	+ array( $this, 'print_text_ldap_attr_last_name' ), // Callback (echos form element)
	2541	+ 'authorizer', // Page this setting is shown on (slug)
	2542	+ 'auth_settings_external' // Section this setting is shown on
2841	2543	);
2842	2544	add_settings_field(
2843		- 'auth_settings_ldap_attr_update_on_login',
2844		- __( 'LDAP attribute update', 'authorizer' ),
2845		- array( $this, 'print_checkbox_ldap_attr_update_on_login' ),
2846		- 'authorizer',
2847		- 'auth_settings_external'
	2545	+ 'auth_settings_ldap_attr_update_on_login', // HTML element ID
	2546	+ __( 'LDAP attribute update', 'authorizer' ), // HTML element Title
	2547	+ array( $this, 'print_checkbox_ldap_attr_update_on_login' ), // Callback (echos form element)
	2548	+ 'authorizer', // Page this setting is shown on (slug)
	2549	+ 'auth_settings_external' // Section this setting is shown on
2848	2550	);
2849	2551
2850		- // Create Advanced Settings section.
	2552	+ // Create Advanced Settings section
2851	2553	add_settings_section(
2852		- 'auth_settings_advanced',
2853		- '',
2854		- array( $this, 'print_section_info_advanced' ),
2855		- 'authorizer'
	2554	+ 'auth_settings_advanced', // HTML element ID
	2555	+ '', // HTML element Title
	2556	+ array( $this, 'print_section_info_advanced' ), // Callback (echos section content)
	2557	+ 'authorizer' // Page this section is shown on (slug)
2856	2558	);
2857	2559	add_settings_field(
2858		- 'auth_settings_advanced_lockouts',
2859		- __( 'Limit invalid login attempts', 'authorizer' ),
2860		- array( $this, 'print_text_auth_advanced_lockouts' ),
2861		- 'authorizer',
2862		- 'auth_settings_advanced'
	2560	+ 'auth_settings_advanced_lockouts', // HTML element ID
	2561	+ __( 'Limit invalid login attempts', 'authorizer' ), // HTML element Title
	2562	+ array( $this, 'print_text_auth_advanced_lockouts' ), // Callback (echos form element)
	2563	+ 'authorizer', // Page this setting is shown on (slug)
	2564	+ 'auth_settings_advanced' // Section this setting is shown on
2863	2565	);
2864	2566	add_settings_field(
2865		- 'auth_settings_advanced_hide_wp_login',
2866		- __( 'Hide WordPress Login', 'authorizer' ),
2867		- array( $this, 'print_checkbox_auth_advanced_hide_wp_login' ),
2868		- 'authorizer',
2869		- 'auth_settings_advanced'
	2567	+ 'auth_settings_advanced_hide_wp_login', // HTML element ID
	2568	+ __( 'Hide WordPress Login', 'authorizer' ), // HTML element Title
	2569	+ array( $this, 'print_checkbox_auth_advanced_hide_wp_login' ), // Callback (echos form element)
	2570	+ 'authorizer', // Page this setting is shown on (slug)
	2571	+ 'auth_settings_advanced' // Section this setting is shown on
2870	2572	);
2871	2573	add_settings_field(
2872		- 'auth_settings_advanced_branding',
2873		- __( 'Custom WordPress login branding', 'authorizer' ),
2874		- array( $this, 'print_radio_auth_advanced_branding' ),
2875		- 'authorizer',
2876		- 'auth_settings_advanced'
	2574	+ 'auth_settings_advanced_branding', // HTML element ID
	2575	+ __( 'Custom WordPress login branding', 'authorizer' ), // HTML element Title
	2576	+ array( $this, 'print_radio_auth_advanced_branding' ), // Callback (echos form element)
	2577	+ 'authorizer', // Page this setting is shown on (slug)
	2578	+ 'auth_settings_advanced' // Section this setting is shown on
2877	2579	);
2878	2580	add_settings_field(
2879		- 'auth_settings_advanced_admin_menu',
2880		- __( 'Authorizer admin menu item location', 'authorizer' ),
2881		- array( $this, 'print_radio_auth_advanced_admin_menu' ),
2882		- 'authorizer',
2883		- 'auth_settings_advanced'
	2581	+ 'auth_settings_advanced_admin_menu', // HTML element ID
	2582	+ __( 'Authorizer admin menu item location', 'authorizer' ), // HTML element Title
	2583	+ array( $this, 'print_radio_auth_advanced_admin_menu' ), // Callback (echos form element)
	2584	+ 'authorizer', // Page this setting is shown on (slug)
	2585	+ 'auth_settings_advanced' // Section this setting is shown on
2884	2586	);
2885	2587	add_settings_field(
2886		- 'auth_settings_advanced_usermeta',
2887		- __( 'Show custom usermeta in user list', 'authorizer' ),
2888		- array( $this, 'print_select_auth_advanced_usermeta' ),
2889		- 'authorizer',
2890		- 'auth_settings_advanced'
	2588	+ 'auth_settings_advanced_usermeta', // HTML element ID
	2589	+ __( 'Show custom usermeta in user list', 'authorizer' ), // HTML element Title
	2590	+ array( $this, 'print_select_auth_advanced_usermeta' ), // Callback (echos form element)
	2591	+ 'authorizer', // Page this setting is shown on (slug)
	2592	+ 'auth_settings_advanced' // Section this setting is shown on
2891	2593	);
2892		- add_settings_field(
2893		- 'auth_settings_advanced_users_per_page',
2894		- __( 'Number of users per page', 'authorizer' ),
2895		- array( $this, 'print_text_auth_advanced_users_per_page' ),
2896		- 'authorizer',
2897		- 'auth_settings_advanced'
2898		- );
2899		- add_settings_field(
2900		- 'auth_settings_advanced_users_sort_by',
2901		- __( 'Approved users sort method', 'authorizer' ),
2902		- array( $this, 'print_select_auth_advanced_users_sort_by' ),
2903		- 'authorizer',
2904		- 'auth_settings_advanced'
2905		- );
2906		- add_settings_field(
2907		- 'auth_settings_advanced_users_sort_order',
2908		- __( 'Approved users sort order', 'authorizer' ),
2909		- array( $this, 'print_select_auth_advanced_users_sort_order' ),
2910		- 'authorizer',
2911		- 'auth_settings_advanced'
2912		- );
2913		- add_settings_field(
2914		- 'auth_settings_advanced_widget_enabled',
2915		- __( 'Show dashboard widget to admin users', 'authorizer' ),
2916		- array( $this, 'print_checkbox_auth_advanced_widget_enabled' ),
2917		- 'authorizer',
2918		- 'auth_settings_advanced'
2919		- );
2920	2594	// On multisite installs, add an option to override all multisite settings on individual sites.
2921	2595	if ( is_multisite() ) {
2922	2596	add_settings_field(
2923		- 'auth_settings_advanced_override_multisite',
2924		- __( 'Override multisite options', 'authorizer' ),
2925		- array( $this, 'print_checkbox_auth_advanced_override_multisite' ),
2926		- 'authorizer',
2927		- 'auth_settings_advanced'
	2597	+ 'auth_settings_advanced_override_multisite', // HTML element ID
	2598	+ __( 'Override multisite options', 'authorizer' ), // HTML element Title
	2599	+ array( $this, 'print_checkbox_auth_advanced_override_multisite' ), // Callback (echos form element)
	2600	+ 'authorizer', // Page this setting is shown on (slug)
	2601	+ 'auth_settings_advanced' // Section this setting is shown on
2928	2602	);
2929	2603	}
2930	2604	}
2931	2605
		@@ -2931,30 +2605,29 @@
2931	2605
2932	2606
2933	2607	/**
2934	2608	* Set meaningful defaults for the plugin options.
2935		- *
2936	2609	* Note: This function is called on plugin activation.
2937	2610	*/
2938		- private function set_default_options() {
	2611	+ function set_default_options() {
2939	2612	global $wp_roles;
2940	2613
2941	2614	$auth_settings = get_option( 'auth_settings' );
2942		- if ( false === $auth_settings ) {
	2615	+ if ( $auth_settings === FALSE ) {
2943	2616	$auth_settings = array();
2944	2617	}
2945	2618
2946	2619	// Access Lists Defaults.
2947	2620	$auth_settings_access_users_pending = get_option( 'auth_settings_access_users_pending' );
2948		- if ( false === $auth_settings_access_users_pending ) {
	2621	+ if ( $auth_settings_access_users_pending === FALSE ) {
2949	2622	$auth_settings_access_users_pending = array();
2950	2623	}
2951	2624	$auth_settings_access_users_approved = get_option( 'auth_settings_access_users_approved' );
2952		- if ( false === $auth_settings_access_users_approved ) {
	2625	+ if ( $auth_settings_access_users_approved === FALSE ) {
2953	2626	$auth_settings_access_users_approved = array();
2954	2627	}
2955	2628	$auth_settings_access_users_blocked = get_option( 'auth_settings_access_users_blocked' );
2956		- if ( false === $auth_settings_access_users_blocked ) {
	2629	+ if ( $auth_settings_access_users_blocked === FALSE ) {
2957	2630	$auth_settings_access_users_blocked = array();
2958	2631	}
2959	2632
2960	2633	// Login Access Defaults.
		@@ -3006,12 +2679,13 @@
3006	2679	if ( ! array_key_exists( 'access_redirect_to_message', $auth_settings ) ) {
3007	2680	$auth_settings['access_redirect_to_message'] = '<p>' . __( 'Notice: You are browsing this site anonymously, and only have access to a portion of its content.', 'authorizer' ) . '</p>';
3008	2681	}
3009	2682
	2683	+
3010	2684	// External Service Defaults.
3011	2685	if ( ! array_key_exists( 'access_default_role', $auth_settings ) ) {
3012	2686	// Set default role to 'student' if that role exists, 'subscriber' otherwise.
3013		- $all_roles = $wp_roles->roles;
	2687	+ $all_roles = $wp_roles->roles;
3014	2688	$editable_roles = apply_filters( 'editable_roles', $all_roles );
3015	2689	if ( array_key_exists( 'student', $editable_roles ) ) {
3016	2690	$auth_settings['access_default_role'] = 'student';
3017	2691	} else {
		@@ -3109,12 +2783,12 @@
3109	2783
3110	2784	// Advanced defaults.
3111	2785	if ( ! array_key_exists( 'advanced_lockouts', $auth_settings ) ) {
3112	2786	$auth_settings['advanced_lockouts'] = array(
3113		- 'attempts_1' => 10,
3114		- 'duration_1' => 1,
3115		- 'attempts_2' => 10,
3116		- 'duration_2' => 10,
	2787	+ 'attempts_1' => 10,
	2788	+ 'duration_1' => 1,
	2789	+ 'attempts_2' => 10,
	2790	+ 'duration_2' => 10,
3117	2791	'reset_duration' => 120,
3118	2792	);
3119	2793	}
3120	2794	if ( ! array_key_exists( 'advanced_hide_wp_login', $auth_settings ) ) {
		@@ -3128,20 +2802,8 @@
3128	2802	}
3129	2803	if ( ! array_key_exists( 'advanced_usermeta', $auth_settings ) ) {
3130	2804	$auth_settings['advanced_usermeta'] = '';
3131	2805	}
3132		- if ( ! array_key_exists( 'advanced_users_per_page', $auth_settings ) ) {
3133		- $auth_settings['advanced_users_per_page'] = 20;
3134		- }
3135		- if ( ! array_key_exists( 'advanced_users_sort_by', $auth_settings ) ) {
3136		- $auth_settings['advanced_users_sort_by'] = 'created';
3137		- }
3138		- if ( ! array_key_exists( 'advanced_users_sort_order', $auth_settings ) ) {
3139		- $auth_settings['advanced_users_sort_order'] = 'asc';
3140		- }
3141		- if ( ! array_key_exists( 'advanced_widget_enabled', $auth_settings ) ) {
3142		- $auth_settings['advanced_widget_enabled'] = '1';
3143		- }
3144	2806	if ( ! array_key_exists( 'advanced_override_multisite', $auth_settings ) ) {
3145	2807	$auth_settings['advanced_override_multisite'] = '';
3146	2808	}
3147	2809
		@@ -3152,11 +2814,11 @@
3152	2814	update_option( 'auth_settings_access_users_blocked', $auth_settings_access_users_blocked );
3153	2815
3154	2816	// Multisite defaults.
3155	2817	if ( is_multisite() ) {
3156		- $auth_multisite_settings = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', array() );
	2818	+ $auth_multisite_settings = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', array() );
3157	2819
3158		- if ( false === $auth_multisite_settings ) {
	2820	+ if ( $auth_multisite_settings === FALSE ) {
3159	2821	$auth_multisite_settings = array();
3160	2822	}
3161	2823	// Global switch for enabling multisite options.
3162	2824	if ( ! array_key_exists( 'multisite_override', $auth_multisite_settings ) ) {
		@@ -3162,10 +2824,10 @@
3162	2824	if ( ! array_key_exists( 'multisite_override', $auth_multisite_settings ) ) {
3163	2825	$auth_multisite_settings['multisite_override'] = '';
3164	2826	}
3165	2827	// Access Lists Defaults.
3166		- $auth_multisite_settings_access_users_approved = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved' );
3167		- if ( false === $auth_multisite_settings_access_users_approved ) {
	2828	+ $auth_multisite_settings_access_users_approved = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved' );
	2829	+ if ( $auth_multisite_settings_access_users_approved === FALSE ) {
3168	2830	$auth_multisite_settings_access_users_approved = array();
3169	2831	}
3170	2832	// Login Access Defaults.
3171	2833	if ( ! array_key_exists( 'access_who_can_login', $auth_multisite_settings ) ) {
		@@ -3177,9 +2839,9 @@
3177	2839	}
3178	2840	// External Service Defaults.
3179	2841	if ( ! array_key_exists( 'access_default_role', $auth_multisite_settings ) ) {
3180	2842	// Set default role to 'student' if that role exists, 'subscriber' otherwise.
3181		- $all_roles = $wp_roles->roles;
	2843	+ $all_roles = $wp_roles->roles;
3182	2844	$editable_roles = apply_filters( 'editable_roles', $all_roles );
3183	2845	if ( array_key_exists( 'student', $editable_roles ) ) {
3184	2846	$auth_multisite_settings['access_default_role'] = 'student';
3185	2847	} else {
		@@ -3272,12 +2934,12 @@
3272	2934	}
3273	2935	// Advanced defaults.
3274	2936	if ( ! array_key_exists( 'advanced_lockouts', $auth_multisite_settings ) ) {
3275	2937	$auth_multisite_settings['advanced_lockouts'] = array(
3276		- 'attempts_1' => 10,
3277		- 'duration_1' => 1,
3278		- 'attempts_2' => 10,
3279		- 'duration_2' => 10,
	2938	+ 'attempts_1' => 10,
	2939	+ 'duration_1' => 1,
	2940	+ 'attempts_2' => 10,
	2941	+ 'duration_2' => 10,
3280	2942	'reset_duration' => 120,
3281	2943	);
3282	2944	}
3283	2945	if ( ! array_key_exists( 'advanced_hide_wp_login', $auth_multisite_settings ) ) {
		@@ -3282,23 +2944,11 @@
3282	2944	}
3283	2945	if ( ! array_key_exists( 'advanced_hide_wp_login', $auth_multisite_settings ) ) {
3284	2946	$auth_multisite_settings['advanced_hide_wp_login'] = '';
3285	2947	}
3286		- if ( ! array_key_exists( 'advanced_users_per_page', $auth_multisite_settings ) ) {
3287		- $auth_multisite_settings['advanced_users_per_page'] = 20;
3288		- }
3289		- if ( ! array_key_exists( 'advanced_users_sort_by', $auth_multisite_settings ) ) {
3290		- $auth_multisite_settings['advanced_users_sort_by'] = 'created';
3291		- }
3292		- if ( ! array_key_exists( 'advanced_users_sort_order', $auth_multisite_settings ) ) {
3293		- $auth_multisite_settings['advanced_users_sort_order'] = 'asc';
3294		- }
3295		- if ( ! array_key_exists( 'advanced_widget_enabled', $auth_multisite_settings ) ) {
3296		- $auth_multisite_settings['advanced_widget_enabled'] = '1';
3297		- }
3298	2948	// Save default network options to database.
3299		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', $auth_multisite_settings );
3300		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	2949	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', $auth_multisite_settings );
	2950	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
3301	2951	}
3302	2952
3303	2953	return $auth_settings;
3304	2954	}
		@@ -3305,15 +2955,12 @@
3305	2955
3306	2956
3307	2957	/**
3308	2958	* List sanitizer.
3309		- *
3310		- * @param array $list Array of users to sanitize.
3311		- * @param string $side_effect Set to 'update roles' if role syncing should be performed.
3312		- * @param string $multisite_mode Set to 'multisite' to sync roles on all sites the user belongs to.
3313		- * @return array Array of sanitized users.
	2959	+ * $side_effect = 'none' or 'update roles' to make sure WP user roles match
	2960	+ * $multisite_mode = 'single' or 'multisite' to indicate which user roles to change (this site or all sites)
3314	2961	*/
3315		- private function sanitize_user_list( $list, $side_effect = 'none', $multisite_mode = 'single' ) {
	2962	+ function sanitize_user_list( $list, $side_effect = 'none', $multisite_mode = 'single' ) {
3316	2963	// If it's not a list, make it so.
3317	2964	if ( ! is_array( $list ) ) {
3318	2965	$list = array();
3319	2966	}
		@@ -3318,16 +2965,16 @@
3318	2965	$list = array();
3319	2966	}
3320	2967	foreach ( $list as $key => $user_info ) {
3321	2968	if ( strlen( $user_info['email'] ) < 1 ) {
3322		- // Make sure there are no empty entries in the list.
3323		- unset( $list[ $key ] );
3324		- } elseif ( 'update roles' === $side_effect ) {
	2969	+ // Make sure there are no empty entries in the list
	2970	+ unset( $list[$key] );
	2971	+ } elseif ( $side_effect === 'update roles' ) {
3325	2972	// Make sure the WordPress user accounts have the same role
3326	2973	// as that indicated in the list.
3327	2974	$wp_user = get_user_by( 'email', $user_info['email'] );
3328	2975	if ( $wp_user ) {
3329		- if ( is_multisite() && 'multisite' === $multisite_mode ) {
	2976	+ if ( is_multisite() && $multisite_mode === 'multisite' ) {
3330	2977	foreach ( get_blogs_of_user( $wp_user->ID ) as $blog ) {
3331	2978	add_user_to_blog( $blog->userblog_id, $wp_user->ID, $user_info['role'] );
3332	2979	}
3333	2980	} else {
		@@ -3340,21 +2987,18 @@
3340	2987	}
3341	2988
3342	2989
3343	2990	/**
3344		- * Settings sanitizer callback.
3345		- *
3346		- * @param array $auth_settings Authorizer settings array.
3347		- * @return array Sanitized Authorizer settings array.
	2991	+ * Settings sanitizer callback
3348	2992	*/
3349		- public function sanitize_options( $auth_settings ) {
	2993	+ function sanitize_options( $auth_settings ) {
3350	2994	// Default to "Approved Users" login access restriction.
3351		- if ( ! in_array( $auth_settings['access_who_can_login'], array( 'external_users', 'approved_users' ), true ) ) {
	2995	+ if ( ! in_array( $auth_settings['access_who_can_login'], array( 'external_users', 'approved_users' ) ) ) {
3352	2996	$auth_settings['access_who_can_login'] = 'approved_users';
3353	2997	}
3354	2998
3355	2999	// Default to "Everyone" view access restriction.
3356		- if ( ! in_array( $auth_settings['access_who_can_view'], array( 'everyone', 'logged_in_users' ), true ) ) {
	3000	+ if ( ! in_array( $auth_settings['access_who_can_view'], array( 'everyone', 'logged_in_users' ) ) ) {
3357	3001	$auth_settings['access_who_can_view'] = 'everyone';
3358	3002	}
3359	3003
3360	3004	// Default to WordPress login access redirect.
		@@ -3359,9 +3003,9 @@
3359	3003
3360	3004	// Default to WordPress login access redirect.
3361	3005	// Note: this option doesn't exist in multisite options, so we first
3362	3006	// check to see if it exists.
3363		- if ( array_key_exists( 'access_redirect', $auth_settings ) && ! in_array( $auth_settings['access_redirect'], array( 'login', 'page', 'message' ), true ) ) {
	3007	+ if ( array_key_exists( 'access_redirect', $auth_settings ) && ! in_array( $auth_settings['access_redirect'], array( 'login', 'page', 'message' ) ) ) {
3364	3008	$auth_settings['access_redirect'] = 'login';
3365	3009	}
3366	3010
3367	3011	// Default to warning message for anonymous users on public pages.
		@@ -3366,61 +3010,61 @@
3366	3010
3367	3011	// Default to warning message for anonymous users on public pages.
3368	3012	// Note: this option doesn't exist in multisite options, so we first
3369	3013	// check to see if it exists.
3370		- if ( array_key_exists( 'access_public_warning', $auth_settings ) && ! in_array( $auth_settings['access_public_warning'], array( 'no_warning', 'warning' ), true ) ) {
	3014	+ if ( array_key_exists( 'access_public_warning', $auth_settings ) && ! in_array( $auth_settings['access_public_warning'], array( 'no_warning', 'warning' ) ) ) {
3371	3015	$auth_settings['access_public_warning'] = 'no_warning';
3372	3016	}
3373	3017
3374		- // Sanitize Send welcome email (checkbox: value can only be '1' or empty string).
	3018	+ // Sanitize Send welcome email (checkbox: value can only be '1' or empty string)
3375	3019	$auth_settings['access_should_email_approved_users'] = array_key_exists( 'access_should_email_approved_users', $auth_settings ) && strlen( $auth_settings['access_should_email_approved_users'] ) > 0 ? '1' : '';
3376	3020
3377		- // Sanitize Enable Google Logins (checkbox: value can only be '1' or empty string).
	3021	+ // Sanitize Enable Google Logins (checkbox: value can only be '1' or empty string)
3378	3022	$auth_settings['google'] = array_key_exists( 'google', $auth_settings ) && strlen( $auth_settings['google'] ) > 0 ? '1' : '';
3379	3023
3380		- // Sanitize Enable CAS Logins (checkbox: value can only be '1' or empty string).
	3024	+ // Sanitize Enable CAS Logins (checkbox: value can only be '1' or empty string)
3381	3025	$auth_settings['cas'] = array_key_exists( 'cas', $auth_settings ) && strlen( $auth_settings['cas'] ) > 0 ? '1' : '';
3382	3026
3383		- // Sanitize CAS Host setting.
	3027	+ // Sanitize CAS Host setting
3384	3028	$auth_settings['cas_host'] = filter_var( $auth_settings['cas_host'], FILTER_SANITIZE_URL );
3385	3029
3386		- // Sanitize CAS Port (int).
	3030	+ // Sanitize CAS Port (int)
3387	3031	$auth_settings['cas_port'] = filter_var( $auth_settings['cas_port'], FILTER_SANITIZE_NUMBER_INT );
3388	3032
3389		- // Sanitize CAS attribute update (checkbox: value can only be '1' or empty string).
	3033	+ // Sanitize CAS attribute update (checkbox: value can only be '1' or empty string)
3390	3034	$auth_settings['cas_attr_update_on_login'] = array_key_exists( 'cas_attr_update_on_login', $auth_settings ) && strlen( $auth_settings['cas_attr_update_on_login'] ) > 0 ? '1' : '';
3391	3035
3392		- // Sanitize CAS auto-login (checkbox: value can only be '1' or empty string).
	3036	+ // Sanitize CAS auto-login (checkbox: value can only be '1' or empty string)
3393	3037	$auth_settings['cas_auto_login'] = array_key_exists( 'cas_auto_login', $auth_settings ) && strlen( $auth_settings['cas_auto_login'] ) > 0 ? '1' : '';
3394	3038
3395		- // Sanitize Enable LDAP Logins (checkbox: value can only be '1' or empty string).
	3039	+ // Sanitize Enable LDAP Logins (checkbox: value can only be '1' or empty string)
3396	3040	$auth_settings['ldap'] = array_key_exists( 'ldap', $auth_settings ) && strlen( $auth_settings['ldap'] ) > 0 ? '1' : '';
3397	3041
3398		- // Sanitize LDAP Host setting.
	3042	+ // Sanitize LDAP Host setting
3399	3043	$auth_settings['ldap_host'] = filter_var( $auth_settings['ldap_host'], FILTER_SANITIZE_URL );
3400	3044
3401		- // Sanitize LDAP Port (int).
	3045	+ // Sanitize LDAP Port (int)
3402	3046	$auth_settings['ldap_port'] = filter_var( $auth_settings['ldap_port'], FILTER_SANITIZE_NUMBER_INT );
3403	3047
3404		- // Sanitize LDAP TLS (checkbox: value can only be '1' or empty string).
	3048	+ // Sanitize LDAP TLS (checkbox: value can only be '1' or empty string)
3405	3049	$auth_settings['ldap_tls'] = array_key_exists( 'ldap_tls', $auth_settings ) && strlen( $auth_settings['ldap_tls'] ) > 0 ? '1' : '';
3406	3050
3407		- // Sanitize LDAP attributes (basically make sure they don't have any parentheses).
	3051	+ // Sanitize LDAP attributes (basically make sure they don't have any parentheses)
3408	3052	$auth_settings['ldap_uid'] = filter_var( $auth_settings['ldap_uid'], FILTER_SANITIZE_EMAIL );
3409	3053
3410		- // Sanitize LDAP Lost Password URL.
	3054	+ // Sanitize LDAP Lost Password URL
3411	3055	$auth_settings['ldap_lostpassword_url'] = filter_var( $auth_settings['ldap_lostpassword_url'], FILTER_SANITIZE_URL );
3412	3056
3413		- // Obfuscate LDAP directory user password.
	3057	+ // Obfuscate LDAP directory user password
3414	3058	if ( strlen( $auth_settings['ldap_password'] ) > 0 ) {
3415	3059	// encrypt the directory user password for some minor obfuscation in the database.
3416	3060	$auth_settings['ldap_password'] = $this->encrypt( $auth_settings['ldap_password'] );
3417	3061	}
3418	3062
3419		- // Sanitize LDAP attribute update (checkbox: value can only be '1' or empty string).
	3063	+ // Sanitize LDAP attribute update (checkbox: value can only be '1' or empty string)
3420	3064	$auth_settings['ldap_attr_update_on_login'] = array_key_exists( 'ldap_attr_update_on_login', $auth_settings ) && strlen( $auth_settings['ldap_attr_update_on_login'] ) > 0 ? '1' : '';
3421	3065
3422		- // Make sure public pages is an empty array if it's empty.
	3066	+ // Make sure public pages is an empty array if it's empty
3423	3067	// Note: this option doesn't exist in multisite options, so we first
3424	3068	// check to see if it exists.
3425	3069	if ( array_key_exists( 'access_public_pages', $auth_settings ) && ! is_array( $auth_settings['access_public_pages'] ) ) {
3426	3070	$auth_settings['access_public_pages'] = array();
		@@ -3428,31 +3072,15 @@
3428	3072
3429	3073	// Make sure all lockout options are integers (attempts_1,
3430	3074	// duration_1, attempts_2, duration_2, reset_duration).
3431	3075	foreach ( $auth_settings['advanced_lockouts'] as $key => $value ) {
3432		- $auth_settings['advanced_lockouts'][ $key ] = filter_var( $value, FILTER_SANITIZE_NUMBER_INT );
	3076	+ $auth_settings['advanced_lockouts'][$key] = filter_var( $value, FILTER_SANITIZE_NUMBER_INT );
3433	3077	}
3434	3078
3435		- // Sanitize Hide WordPress logins (checkbox: value can only be '1' or empty string).
	3079	+ // Sanitize Hide WordPress logins (checkbox: value can only be '1' or empty string)
3436	3080	$auth_settings['advanced_hide_wp_login'] = array_key_exists( 'advanced_hide_wp_login', $auth_settings ) && strlen( $auth_settings['advanced_hide_wp_login'] ) > 0 ? '1' : '';
3437	3081
3438		- // Sanitize Users per page (text: value can only int from 1 to MAX_INT).
3439		- $auth_settings['advanced_users_per_page'] = array_key_exists( 'advanced_users_per_page', $auth_settings ) && intval( $auth_settings['advanced_users_per_page'] ) > 0 ? intval( $auth_settings['advanced_users_per_page'] ) : 1;
3440		-
3441		- // Sanitize Sort users by (select: value can be 'email', 'role', 'date_added', 'created').
3442		- if ( ! isset( $auth_settings['advanced_users_sort_by'] ) || ! in_array( $auth_settings['advanced_users_sort_by'], array( 'email', 'role', 'date_added', 'created' ), true ) ) {
3443		- $auth_settings['advanced_users_sort_by'] = 'created';
3444		- }
3445		-
3446		- // Sanitize Sort users order (select: value can be 'asc', 'desc').
3447		- if ( ! isset( $auth_settings['advanced_users_sort_order'] ) || ! in_array( $auth_settings['advanced_users_sort_order'], array( 'asc', 'desc' ), true ) ) {
3448		- $auth_settings['advanced_users_sort_order'] = 'asc';
3449		- }
3450		-
3451		- // Sanitize Show Dashboard Widget (checkbox: value can only be '1' or empty string).
3452		- $auth_settings['advanced_widget_enabled'] = array_key_exists( 'advanced_widget_enabled', $auth_settings ) && strlen( $auth_settings['advanced_widget_enabled'] ) > 0 ? '1' : '';
3453		-
3454		- // Sanitize Override multisite options (checkbox: value can only be '1' or empty string).
	3082	+ // Sanitize Override multisite options (checkbox: value can only be '1' or empty string)
3455	3083	$auth_settings['advanced_override_multisite'] = array_key_exists( 'advanced_override_multisite', $auth_settings ) && strlen( $auth_settings['advanced_override_multisite'] ) > 0 ? '1' : '';
3456	3084
3457	3085	return $auth_settings;
3458	3086	}
		@@ -3459,201 +3087,90 @@
3459	3087
3460	3088
3461	3089	/**
3462	3090	* Keep authorizer approved users' roles in sync with WordPress roles
3463		- * if someone changes the role via the WordPress Edit User page
3464		- * (wp-admin/user-edit.php or wp-admin/profile.php).
	3091	+ * if someone changes the role via the WordPress Edit User options page.
3465	3092	*
3466		- * Action: user_profile_update_errors
3467		- *
3468		- * @param WP_Error $errors Errors object to add any custom errors to (passed by reference).
3469		- * @param bool $update True if updating existing user, false if saving a new one.
3470		- * @param stdClass $user Updated WP_User object for user being edited (passed by reference).
	3093	+ * @action edit_user_profile_update
	3094	+ * @ref https://codex.wordpress.org/Plugin_API/Action_Reference/edit_user_profile_update
	3095	+ * @param int $user_id The user ID of the user being edited
	3096	+
	3097	+ * @action personal_options_update
	3098	+ * @ref https://codex.wordpress.org/Plugin_API/Action_Reference/personal_options_update
	3099	+ * @param int $user_id The user ID of the user being edited
3471	3100	*/
3472		- public function edit_user_profile_update_role( &$errors, $update, &$user ) {
3473		- // Do nothing if we're not updating role.
3474		- if ( ! property_exists( $user, 'role' ) ) {
	3101	+ function edit_user_profile_update_role( $user_id ) {
	3102	+ if ( ! current_user_can( 'edit_user', $user_id ) ) {
3475	3103	return;
3476	3104	}
3477	3105
3478		- // Safety check; will likely not fire if we reach this function.
3479		- if ( ! current_user_can( 'edit_user', $user->ID ) ) {
3480		- return;
3481		- }
3482		-
3483		- // Don't perform Authorizer updates if we have a WordPress error.
3484		- $errors_on_user_update = $errors->get_error_codes();
3485		- if ( ! empty( $errors_on_user_update ) ) {
3486		- return;
3487		- }
3488		-
3489		- // Get original user object (fail if not a real WordPress user).
3490		- $userdata = get_userdata( $user->ID );
3491		- if ( ! $userdata ) {
3492		- return;
3493		- }
3494		-
3495	3106	// If user is in approved list, update his/her associated role.
3496		- if ( $this->is_email_in_list( $userdata->user_email, 'approved' ) ) {
3497		- $auth_settings_access_users_approved = $this->sanitize_user_list( $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT ) );
3498		- foreach ( $auth_settings_access_users_approved as $key => $check_user ) {
3499		- if ( 0 === strcasecmp( $check_user['email'], $userdata->user_email ) ) {
3500		- $auth_settings_access_users_approved[ $key ]['role'] = $user->role;
3501		- }
3502		- }
3503		- update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
3504		- }
3505		- }
3506		-
3507		-
3508		- /**
3509		- * Sync any email address changes to WordPress accounts to the corresponding
3510		- * entry in the Authorizer approved list.
3511		- *
3512		- * Note: This filter fires in wp_update_user() if the update includes an
3513		- * email address change, and fires after all security and integrity checks
3514		- * have been performed, so we can simply update the Authorizer approved
3515		- * list, changing the email address on the approved entry, and removing any
3516		- * existing entries that also have the new email address (duplicates).
3517		- *
3518		- * Filter: send_email_change_email
3519		- *
3520		- * @param bool $send Whether to send the email.
3521		- * @param array $user The original user array.
3522		- * @param array $userdata The updated user array.
3523		- */
3524		- public function edit_user_profile_update_email( $send, $user, $userdata ) {
3525		- // If we're in multisite, update the email on all sites in the network
3526		- // (and remove from any subsites if it's a network-approved user).
3527		- if ( is_multisite() ) {
3528		- // If it's a multisite approved user, sync the email there.
3529		- $changed_user_is_multisite_user = false;
3530		- if ( $this->is_email_in_list( $user['user_email'], 'approved', 'multisite' ) ) {
3531		- $changed_user_is_multisite_user = true;
3532		- $auth_multisite_settings_access_users_approved = $this->sanitize_user_list(
3533		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
3534		- );
3535		- foreach ( $auth_multisite_settings_access_users_approved as $key => $check_user ) {
3536		- // Update old user email in approved list to the new email.
3537		- if ( 0 === strcasecmp( $check_user['email'], $user['user_email'] ) ) {
3538		- $auth_multisite_settings_access_users_approved[ $key ]['email'] = $this->lowercase( $userdata['user_email'] );
	3107	+ $wp_user = get_user_by( 'id', $user_id );
	3108	+ if ( $this->is_email_in_list( $wp_user->get( 'user_email' ), 'approved' ) ) {
	3109	+ $auth_settings_access_users_approved = $this->sanitize_user_list( $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN ) );
	3110	+ // Find approved user and sync with the corresponding WP_User.
	3111	+ foreach ( $auth_settings_access_users_approved as $key => $user ) {
	3112	+ if ( $user['email'] === $wp_user->user_email ) {
	3113	+ // Sync user role.
	3114	+ if ( array_key_exists( 'role', $_REQUEST ) ) {
	3115	+ $auth_settings_access_users_approved[$key]['role'] = $_REQUEST['role'];
3539	3116	}
3540		- // If new user email is already in approved list, remove that entry.
3541		- if ( 0 === strcasecmp( $check_user['email'], $userdata['user_email'] ) ) {
3542		- unset( $auth_multisite_settings_access_users_approved[ $key ] );
	3117	+ // Sync email address.
	3118	+ if ( array_key_exists( 'email', $_REQUEST ) ) {
	3119	+ $auth_settings_access_users_approved[$key]['email'] = $_REQUEST['email'];
3543	3120	}
3544	3121	}
3545		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
3546	3122	}
3547	3123
3548		- // Go through all approved lists on individual sites and sync this user there.
3549		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
3550		- $sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
3551		- foreach ( $sites as $site ) {
3552		- $updated = false;
3553		- $blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
3554		- $auth_settings_access_users_approved = get_blog_option( $blog_id, 'auth_settings_access_users_approved', array() );
3555		- foreach ( $auth_settings_access_users_approved as $key => $check_user ) {
3556		- // Update old user email in approved list to the new email.
3557		- if ( 0 === strcasecmp( $check_user['email'], $user['user_email'] ) ) {
3558		- // But if the user is already a multisite user, just remove the entry in the subsite.
3559		- if ( $changed_user_is_multisite_user ) {
3560		- unset( $auth_settings_access_users_approved[ $key ] );
3561		- } else {
3562		- $auth_settings_access_users_approved[ $key ]['email'] = $this->lowercase( $userdata['user_email'] );
3563		- }
3564		- $updated = true;
3565		- }
3566		- // If new user email is already in approved list, remove that entry.
3567		- if ( 0 === strcasecmp( $check_user['email'], $userdata['user_email'] ) ) {
3568		- unset( $auth_settings_access_users_approved[ $key ] );
3569		- $updated = true;
3570		- }
3571		- }
3572		- if ( $updated ) {
3573		- update_blog_option( $blog_id, 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
3574		- }
3575		- }
3576		- } else {
3577		- // In a single site environment, just find the old user in the approved list and update the email.
3578		- if ( $this->is_email_in_list( $user['user_email'], 'approved' ) ) {
3579		- $auth_settings_access_users_approved = $this->sanitize_user_list( $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT ) );
3580		- foreach ( $auth_settings_access_users_approved as $key => $check_user ) {
3581		- // Update old user email in approved list to the new email.
3582		- if ( 0 === strcasecmp( $check_user['email'], $user['user_email'] ) ) {
3583		- $auth_settings_access_users_approved[ $key ]['email'] = $this->lowercase( $userdata['user_email'] );
3584		- }
3585		- // If new user email is already in approved list, remove that entry.
3586		- if ( 0 === strcasecmp( $check_user['email'], $userdata['user_email'] ) ) {
3587		- unset( $auth_settings_access_users_approved[ $key ] );
3588		- }
3589		- }
3590		- update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
3591		- }
	3124	+ update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
3592	3125	}
3593		-
3594		- // We're hooking into this filter merely for its location in the codebase,
3595		- // so make sure to return the filter value unmodified.
3596		- return $send;
3597	3126	}
3598	3127
3599	3128
3600	3129	/**
3601		- * Settings print callback.
3602		- *
3603		- * @param string $args Args (e.g., multisite admin mode).
3604		- * @return void
	3130	+ * Settings print callbacks
3605	3131	*/
3606		- public function print_section_info_tabs( $args = '' ) {
3607		- if ( WP_Plugin_Authorizer::NETWORK_CONTEXT === $this->get_admin_mode( $args ) ) :
3608		- ?>
	3132	+ function print_section_info_tabs( $args = '' ) {
	3133	+ if ( MULTISITE_ADMIN === $this->get_admin_mode( $args )): ?>
3609	3134	<h2 class="nav-tab-wrapper">
3610		- <a class="nav-tab nav-tab-access_lists nav-tab-active" href="javascript:chooseTab('access_lists' );"><?php esc_html_e( 'Access Lists', 'authorizer' ); ?></a>
3611		- <a class="nav-tab nav-tab-external" href="javascript:chooseTab('external' );"><?php esc_html_e( 'External Service', 'authorizer' ); ?></a>
3612		- <a class="nav-tab nav-tab-advanced" href="javascript:chooseTab('advanced' );"><?php esc_html_e( 'Advanced', 'authorizer' ); ?></a>
	3135	+ <a class="nav-tab nav-tab-access_lists nav-tab-active" href="javascript:choose_tab('access_lists' );"><?php _e( 'Access Lists', 'authorizer' ); ?></a>
	3136	+ <a class="nav-tab nav-tab-external" href="javascript:choose_tab('external' );"><?php _e( 'External Service', 'authorizer' ); ?></a>
	3137	+ <a class="nav-tab nav-tab-advanced" href="javascript:choose_tab('advanced' );"><?php _e( 'Advanced', 'authorizer' ); ?></a>
3613	3138	</h2>
3614		- <?php else : ?>
	3139	+ <?php else: ?>
3615	3140	<h2 class="nav-tab-wrapper">
3616		- <a class="nav-tab nav-tab-access_lists nav-tab-active" href="javascript:chooseTab('access_lists' );"><?php esc_html_e( 'Access Lists', 'authorizer' ); ?></a>
3617		- <a class="nav-tab nav-tab-access_login" href="javascript:chooseTab('access_login' );"><?php esc_html_e( 'Login Access', 'authorizer' ); ?></a>
3618		- <a class="nav-tab nav-tab-access_public" href="javascript:chooseTab('access_public' );"><?php esc_html_e( 'Public Access', 'authorizer' ); ?></a>
3619		- <a class="nav-tab nav-tab-external" href="javascript:chooseTab('external' );"><?php esc_html_e( 'External Service', 'authorizer' ); ?></a>
3620		- <a class="nav-tab nav-tab-advanced" href="javascript:chooseTab('advanced' );"><?php esc_html_e( 'Advanced', 'authorizer' ); ?></a>
	3141	+ <a class="nav-tab nav-tab-access_lists nav-tab-active" href="javascript:choose_tab('access_lists' );"><?php _e( 'Access Lists', 'authorizer' ); ?></a>
	3142	+ <a class="nav-tab nav-tab-access_login" href="javascript:choose_tab('access_login' );"><?php _e( 'Login Access', 'authorizer' ); ?></a>
	3143	+ <a class="nav-tab nav-tab-access_public" href="javascript:choose_tab('access_public' );"><?php _e( 'Public Access', 'authorizer' ); ?></a>
	3144	+ <a class="nav-tab nav-tab-external" href="javascript:choose_tab('external' );"><?php _e( 'External Service', 'authorizer' ); ?></a>
	3145	+ <a class="nav-tab nav-tab-advanced" href="javascript:choose_tab('advanced' );"><?php _e( 'Advanced', 'authorizer' ); ?></a>
3621	3146	</h2>
3622		- <?php
3623		- endif;
	3147	+ <?php endif;
3624	3148	}
3625	3149
3626	3150
3627		- /**
3628		- * Settings print callback.
3629		- *
3630		- * @param string $args Args (e.g., multisite admin mode).
3631		- * @return void
3632		- */
3633		- public function print_section_info_access_lists( $args = '' ) {
	3151	+ function print_section_info_access_lists( $args = '' ) {
3634	3152	$admin_mode = $this->get_admin_mode( $args );
3635		- ?>
3636		- <div id="section_info_access_lists" class="section_info">
3637		- <p><?php esc_html_e( 'Manage who has access to this site using these lists.', 'authorizer' ); ?></p>
	3153	+ ?><div id="section_info_access_lists" class="section_info">
	3154	+ <p><?php _e( 'Manage who has access to this site using these lists.', 'authorizer' ); ?></p>
3638	3155	<ol>
3639		- <li><?php echo wp_kses( __( "<strong>Pending</strong> users are users who have successfully logged in to the site, but who haven't yet been approved (or blocked) by you.", 'authorizer' ), $this->allowed_html ); ?></li>
3640		- <li><?php echo wp_kses( __( '<strong>Approved</strong> users have access to the site once they successfully log in.', 'authorizer' ), $this->allowed_html ); ?></li>
3641		- <li><?php echo wp_kses( __( '<strong>Blocked</strong> users will receive an error message when they try to visit the site after authenticating.', 'authorizer' ), $this->allowed_html ); ?></li>
	3156	+ <li><?php _e( "<strong>Pending</strong> users are users who have successfully logged in to the site, but who haven't yet been approved (or blocked) by you.", 'authorizer' ); ?></li>
	3157	+ <li><?php _e( '<strong>Approved</strong> users have access to the site once they successfully log in.', 'authorizer' ); ?></li>
	3158	+ <li><?php _e( '<strong>Blocked</strong> users will receive an error message when they try to visit the site after authenticating.', 'authorizer' ); ?></li>
3642	3159	</ol>
3643	3160	</div>
3644	3161	<table class="form-table">
3645	3162	<tbody>
3646	3163	<tr>
3647		- <th scope="row"><?php esc_html_e( 'Pending Users', 'authorizer' ); ?> <em>(<?php echo esc_html( $this->get_user_count_from_list( 'pending', $admin_mode ) ); ?>)</em></th>
	3164	+ <th scope="row"><?php _e( 'Pending Users', 'authorizer' ); ?> <em>(<?php echo $this->get_user_count_from_list( 'pending', $admin_mode ); ?>)</em></th>
3648	3165	<td><?php $this->print_combo_auth_access_users_pending(); ?></td>
3649	3166	</tr>
3650	3167	<tr>
3651		- <th scope="row"><?php esc_html_e( 'Approved Users', 'authorizer' ); ?> <em>(<?php echo esc_html( $this->get_user_count_from_list( 'approved', $admin_mode ) ); ?>)</em></th>
	3168	+ <th scope="row"><?php _e( 'Approved Users', 'authorizer' ); ?> <em>(<?php echo $this->get_user_count_from_list( 'approved', $admin_mode ); ?>)</em></th>
3652	3169	<td><?php $this->print_combo_auth_access_users_approved(); ?></td>
3653	3170	</tr>
3654	3171	<tr>
3655		- <th scope="row"><?php esc_html_e( 'Blocked Users', 'authorizer' ); ?> <em>(<?php echo esc_html( $this->get_user_count_from_list( 'blocked', $admin_mode ) ); ?>)</em></th>
	3172	+ <th scope="row"><?php _e( 'Blocked Users', 'authorizer' ); ?> <em>(<?php echo $this->get_user_count_from_list( 'blocked', $admin_mode ); ?>)</em></th>
3656	3173	<td><?php $this->print_combo_auth_access_users_blocked(); ?></td>
3657	3174	</tr>
3658	3175	</tbody>
3659	3176	</table>
		@@ -3660,516 +3177,276 @@
3660	3177	<?php
3661	3178	}
3662	3179
3663	3180
3664		- /**
3665		- * Settings print callback.
3666		- *
3667		- * @param string $args Args (e.g., multisite admin mode).
3668		- * @return void
3669		- */
3670		- public function print_combo_auth_access_users_pending( $args = '' ) {
	3181	+ function print_combo_auth_access_users_pending( $args = '' ) {
3671	3182	// Get plugin option.
3672		- $option = 'access_users_pending';
	3183	+ $option = 'access_users_pending';
3673	3184	$auth_settings_option = $this->get_plugin_option( $option );
3674	3185	$auth_settings_option = is_array( $auth_settings_option ) ? $auth_settings_option : array();
3675	3186
3676		- // Render wrapper div (for aligning pager to width of content).
3677		- ?>
3678		- <div class="wrapper_<?php echo esc_attr( $option ); ?>">
3679		- <ul id="list_auth_settings_access_users_pending" style="margin:0;">
3680		- <?php
3681		- if ( count( $auth_settings_option ) > 0 ) :
3682		- foreach ( $auth_settings_option as $key => $pending_user ) :
3683		- if ( empty( $pending_user ) || count( $pending_user ) < 1 ) :
3684		- continue;
3685		- endif;
3686		- $pending_user['is_wp_user'] = false;
3687		- ?>
3688		- <li>
3689		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( $pending_user['email'] ); ?>" readonly="true" class="auth-email" />
3690		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>_<?php echo esc_attr( $key ); ?>_role" class="auth-role">
3691		- <?php $this->wp_dropdown_permitted_roles( $pending_user['role'] ); ?>
3692		- </select>
3693		- <a href="javascript:void(0);" class="button-primary" id="approve_user_<?php echo esc_attr( $key ); ?>" onclick="authAddUser( this, 'approved', false ); authIgnoreUser( this, 'pending' );"><span class="glyphicon glyphicon-ok"></span> <?php esc_html_e( 'Approve', 'authorizer' ); ?></a>
3694		- <a href="javascript:void(0);" class="button-primary" id="block_user_<?php echo esc_attr( $key ); ?>" onclick="authAddUser( this, 'blocked', false ); authIgnoreUser( this, 'pending' );"><span class="glyphicon glyphicon-ban-circle"></span> <?php esc_html_e( 'Block', 'authorizer' ); ?></a>
3695		- <a href="javascript:void(0);" class="button button-secondary" id="ignore_user_<?php echo esc_attr( $key ); ?>" onclick="authIgnoreUser( this, 'pending' );" title="<?php esc_html_e( 'Remove user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-remove"></span> <?php esc_html_e( 'Ignore', 'authorizer' ); ?></a>
3696		- </li>
3697		- <?php endforeach; ?>
3698		- <?php else : ?>
3699		- <li class="auth-empty"><em><?php esc_html_e( 'No pending users', 'authorizer' ); ?></em></li>
3700		- <?php endif; ?>
3701		- </ul>
3702		- </div>
	3187	+ // Print option elements.
	3188	+ ?><ul id="list_auth_settings_access_users_pending" style="margin:0;">
	3189	+ <?php if ( count( $auth_settings_option ) > 0 ) : ?>
	3190	+ <?php foreach ( $auth_settings_option as $key => $pending_user ): ?>
	3191	+ <?php if ( empty( $pending_user ) || count( $pending_user ) < 1 ) continue; ?>
	3192	+ <?php $pending_user['is_wp_user'] = false; ?>
	3193	+ <li>
	3194	+ <input type="text" id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>" value="<?php echo $pending_user['email']; ?>" readonly="true" class="auth-email" />
	3195	+ <select id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_role" class="auth-role">
	3196	+ <?php $this->wp_dropdown_permitted_roles( $pending_user['role'] ); ?>
	3197	+ </select>
	3198	+ <a href="javascript:void(0);" class="button-primary" id="approve_user_<?php echo $key; ?>" onclick="auth_add_user( this, 'approved', false ); auth_ignore_user( this, 'pending' );"><span class="glyphicon glyphicon-ok"></span> <?php _e( 'Approve', 'authorizer' ); ?></a>
	3199	+ <a href="javascript:void(0);" class="button-primary" id="block_user_<?php echo $key; ?>" onclick="auth_add_user( this, 'blocked', false ); auth_ignore_user( this, 'pending' );"><span class="glyphicon glyphicon-ban-circle"></span> <?php _e( 'Block', 'authorizer' ); ?></a>
	3200	+ <a href="javascript:void(0);" class="button button-secondary" id="ignore_user_<?php echo $key; ?>" onclick="auth_ignore_user( this, 'pending' );" title="<?php _e( 'Remove user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-remove"></span> <?php _e( 'Ignore', 'authorizer' ); ?></a>
	3201	+ </li>
	3202	+ <?php endforeach; ?>
	3203	+ <?php else: ?>
	3204	+ <li class="auth-empty"><em><?php _e( 'No pending users', 'authorizer' ); ?></em></li>
	3205	+ <?php endif; ?>
	3206	+ </ul>
3703	3207	<?php
3704	3208	}
3705	3209
3706	3210
3707		- /**
3708		- * Settings print callback.
3709		- *
3710		- * @param string $args Args (e.g., multisite admin mode).
3711		- * @return void
3712		- */
3713		- public function print_combo_auth_access_users_approved( $args = '' ) {
	3211	+ function print_combo_auth_access_users_approved( $args = '' ) {
3714	3212	// Get plugin option.
3715		- $option = 'access_users_approved';
3716		- $admin_mode = $this->get_admin_mode( $args );
	3213	+ $option = 'access_users_approved';
	3214	+ $admin_mode = $this->get_admin_mode( $args );
3717	3215	$auth_settings_option = $this->get_plugin_option( $option, $admin_mode, 'no override' );
3718	3216	$auth_settings_option = is_array( $auth_settings_option ) ? $auth_settings_option : array();
3719	3217
3720		- // Get multisite approved users (will be added to top of list, greyed out).
3721		- $auth_override_multisite = $this->get_plugin_option( 'advanced_override_multisite' );
3722		- $auth_multisite_settings = $this->get_plugin_options( WP_Plugin_Authorizer::NETWORK_CONTEXT );
	3218	+ // Get multisite approved users (add them to top of list, greyed out).
	3219	+ $auth_override_multisite = $this->get_plugin_option( 'advanced_override_multisite' );
	3220	+ $auth_multisite_settings = $this->get_plugin_options( MULTISITE_ADMIN );
3723	3221	$auth_settings_option_multisite = array();
3724	3222	if (
3725	3223	is_multisite() &&
3726		- ! is_network_admin() &&
3727		- '1' !== intval( $auth_override_multisite ) &&
	3224	+ $auth_override_multisite != '1' &&
3728	3225	array_key_exists( 'multisite_override', $auth_multisite_settings ) &&
3729		- '1' === $auth_multisite_settings['multisite_override']
	3226	+ $auth_multisite_settings['multisite_override'] === '1'
3730	3227	) {
3731		- $auth_settings_option_multisite = $this->get_plugin_option( $option, WP_Plugin_Authorizer::NETWORK_CONTEXT, 'allow override' );
	3228	+ $auth_settings_option_multisite = $this->get_plugin_option( $option, MULTISITE_ADMIN, 'allow override' );
3732	3229	$auth_settings_option_multisite = is_array( $auth_settings_option_multisite ) ? $auth_settings_option_multisite : array();
3733		- // Add multisite users to the beginning of the main user array.
3734		- foreach ( array_reverse( $auth_settings_option_multisite ) as $approved_user ) {
3735		- $approved_user['multisite_user'] = true;
3736		- array_unshift( $auth_settings_option, $approved_user );
3737		- }
3738	3230	}
3739	3231
3740	3232	// Get default role for new user dropdown.
3741		- $access_default_role = $this->get_plugin_option( 'access_default_role', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	3233	+ $access_default_role = $this->get_plugin_option( 'access_default_role', SINGLE_ADMIN, 'allow override' );
3742	3234
3743	3235	// Get custom usermeta field to show.
3744	3236	$advanced_usermeta = $this->get_plugin_option( 'advanced_usermeta' );
3745	3237
3746	3238	// Adjust javascript function prefixes if multisite.
3747		- $js_function_prefix = WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode ? 'authMultisite' : 'auth';
3748		- $is_multisite_admin_page = WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode;
	3239	+ $js_function_prefix = $admin_mode === MULTISITE_ADMIN ? 'auth_multisite_' : 'auth_';
	3240	+ $multisite_admin_page = $admin_mode === MULTISITE_ADMIN;
3749	3241
3750		- // Filter user list to search terms.
3751		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
3752		- if ( isset( $_REQUEST['search'] ) && strlen( sanitize_text_field( wp_unslash( $_REQUEST['search'] ) ) ) > 0 ) {
3753		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
3754		- $search_term = sanitize_text_field( wp_unslash( $_REQUEST['search'] ) );
3755		- $auth_settings_option = array_filter(
3756		- $auth_settings_option, function ( $user ) use ( $search_term ) {
3757		- return stripos( $user['email'], $search_term ) !== false ||
3758		- stripos( $user['role'], $search_term ) !== false ||
3759		- stripos( $user['date_added'], $search_term ) !== false;
3760		- }
3761		- );
3762		- }
3763		-
3764		- // Sort user list.
3765		- $sort_by = $this->get_plugin_option( 'advanced_users_sort_by', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' ); // email, role, date_added (registered), created (date approved).
3766		- $sort_order = $this->get_plugin_option( 'advanced_users_sort_order', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' ); // asc or desc.
3767		- $sort_dimension = array();
3768		- if ( in_array( $sort_by, array( 'email', 'role', 'date_added' ), true ) ) {
3769		- foreach ( $auth_settings_option as $key => $user ) {
3770		- if ( 'date_added' === $sort_by ) {
3771		- $sort_dimension[ $key ] = date( 'Ymd', strtotime( $user[ $sort_by ] ) );
3772		- } else {
3773		- $sort_dimension[ $key ] = strtolower( $user[ $sort_by ] );
3774		- }
3775		- }
3776		- $sort_order = 'asc' === $sort_order ? SORT_ASC : SORT_DESC;
3777		- array_multisort( $sort_dimension, $sort_order, $auth_settings_option );
3778		- } elseif ( 'created' === $sort_by && 'asc' !== $sort_order ) {
3779		- // If default sort method and reverse order, just reverse the array.
3780		- $auth_settings_option = array_reverse( $auth_settings_option );
3781		- }
3782		-
3783		- // Ensure array keys run from 0..max (keys in database will be the original,
3784		- // index, and removing users will not reorder the array keys of other users).
3785		- $auth_settings_option = array_values( $auth_settings_option );
3786		-
3787		- // Get pager params.
3788		- $total_users = count( $auth_settings_option );
3789		- $users_per_page = intval( $this->get_plugin_option( 'advanced_users_per_page', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' ) );
3790		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
3791		- $current_page = isset( $_REQUEST['paged'] ) ? intval( $_REQUEST['paged'] ) : 1;
3792		- $total_pages = ceil( $total_users / $users_per_page );
3793		- if ( $total_pages < 1 ) {
3794		- $total_pages = 1;
3795		- }
3796		-
3797		- // Make sure current_page is between 1 and max pages.
3798		- if ( $current_page < 1 ) {
3799		- $current_page = 1;
3800		- } elseif ( $current_page > $total_pages ) {
3801		- $current_page = $total_pages;
3802		- }
3803		-
3804		- // Render wrapper div (for aligning pager to width of content).
3805		- ?>
3806		- <div class="wrapper_<?php echo esc_attr( $option ); ?>">
3807		- <?php $this->render_user_pager( $current_page, $users_per_page, $total_users, 'top' ); ?>
3808		- <ul id="list_auth_settings_access_users_approved" class="<?php echo strlen( $advanced_usermeta ) > 0 ? 'has-usermeta' : ''; ?>">
3809		- <?php
3810		- $offset = ( $current_page - 1 ) * $users_per_page;
3811		- $max = min( $offset + $users_per_page, count( $auth_settings_option ) );
3812		- for ( $key = $offset; $key < $max; $key++ ) :
3813		- $approved_user = $auth_settings_option[ $key ];
	3242	+ ?><ul id="list_auth_settings_access_users_approved" style="margin:0;">
	3243	+ <?php if ( ! $multisite_admin_page ) :
	3244	+ foreach ( $auth_settings_option_multisite as $key => $approved_user ) :
3814	3245	if ( empty( $approved_user ) || count( $approved_user ) < 1 ) :
3815	3246	continue;
3816	3247	endif;
3817		- $this->render_user_element( $approved_user, $key, $option, $admin_mode, $advanced_usermeta );
3818		- endfor;
3819		- ?>
3820		- </ul>
	3248	+ $approved_wp_user = get_user_by( 'email', $approved_user['email'] );
	3249	+ if ( $approved_wp_user ) :
	3250	+ $approved_user['email'] = $approved_wp_user->user_email;
	3251	+ $approved_user['role'] = $multisite_admin_page || count( $approved_wp_user->roles ) === 0 ? $approved_user['role'] : array_shift( $approved_wp_user->roles );
	3252	+ $approved_user['date_added'] = $approved_wp_user->user_registered;
	3253	+ // Get usermeta field from the WordPress user's real usermeta.
	3254	+ if ( strlen( $advanced_usermeta ) > 0 ) :
	3255	+ if ( strpos( $advanced_usermeta, 'acf___' ) === 0 && class_exists( 'acf' ) ) :
	3256	+ // Get ACF Field value for the user
	3257	+ $approved_user['usermeta'] = get_field( str_replace('acf___', '', $advanced_usermeta ), 'user_' . $approved_wp_user->ID );
	3258	+ else :
	3259	+ // Get regular usermeta value for the user.
	3260	+ $approved_user['usermeta'] = get_user_meta( $approved_wp_user->ID, $advanced_usermeta, true );
	3261	+ endif;
3821	3262
3822		- <div id="new_auth_settings_<?php echo esc_attr( $option ); ?>">
3823		- <textarea id="new_approved_user_email" placeholder="<?php esc_attr_e( 'email address', 'authorizer' ); ?>" class="auth-email new autogrow-short" rows="1"></textarea>
3824		- <select id="new_approved_user_role" class="auth-role">
3825		- <?php $this->wp_dropdown_permitted_roles( $access_default_role, 'not disabled', $admin_mode ); ?>
3826		- </select>
3827		- <div class="btn-group">
3828		- <a href="javascript:void(0);" class="btn button-primary dropdown-toggle button-add-user" id="approve_user_new" onclick="<?php echo esc_attr( $js_function_prefix ); ?>AddUser(this, 'approved' );"><span class="glyphicon glyphicon-ok"></span> <?php esc_html_e( 'Approve', 'authorizer' ); ?></a>
3829		- <button type="button" class="btn button-primary dropdown-toggle" data-toggle="dropdown">
3830		- <span class="caret"></span>
3831		- <span class="sr-only"><?php esc_html_e( 'Toggle Dropdown', 'authorizer' ); ?></span>
3832		- </button>
3833		- <ul class="dropdown-menu" role="menu">
3834		- <li><a href="javascript:void(0);" onclick="<?php echo esc_attr( $js_function_prefix ); ?>AddUser( document.getElementById( 'approve_user_new' ), 'approved', true);"><?php esc_html_e( 'Create a local WordPress account instead, and email the user their password.', 'authorizer' ); ?></a></li>
3835		- </ul>
3836		- </div>
3837		- </div>
3838		- <?php $this->render_user_pager( $current_page, $users_per_page, $total_users, 'bottom' ); ?>
3839		- </div>
3840		- <?php
3841		- }
	3263	+ if ( is_array( $approved_user['usermeta'] ) || is_object( $approved_user['usermeta'] ) ) :
	3264	+ $approved_user['usermeta'] = serialize( $approved_user['usermeta'] );
	3265	+ endif;
	3266	+ endif;
	3267	+ endif;
	3268	+ if ( ! array_key_exists( 'usermeta', $approved_user ) ) :
	3269	+ $approved_user['usermeta'] = '';
	3270	+ endif; ?>
	3271	+ <li>
	3272	+ <input type="text" id="auth_multisite_settings_<?php echo $option; ?>_<?php echo $key; ?>" value="<?php echo $approved_user['email']; ?>" readonly="true" class="auth-email auth-multisite-email" />
	3273	+ <select id="auth_multisite_settings_<?php echo $option; ?>_<?php echo $key; ?>_role" class="auth-role auth-multisite-role" disabled="disabled">
	3274	+ <?php $this->wp_dropdown_permitted_roles( $approved_user['role'] ); ?>
	3275	+ </select>
	3276	+ <input type="text" id="auth_multisite_settings_<?php echo $option; ?>_<?php echo $key; ?>_date_added" value="<?php echo date( 'M Y', strtotime( $approved_user['date_added'] ) ); ?>" readonly="true" class="auth-date-added auth-multisite-date-added" disabled="disabled" />
	3277	+ <?php if ( strlen( $advanced_usermeta ) > 0 ) :
	3278	+ $should_show_usermeta_in_text_field = true; // Fallback renderer for usermeta; try to use a select first.
	3279	+ if ( strpos( $advanced_usermeta, 'acf___' ) === 0 && class_exists( 'acf' ) ) :
	3280	+ $field_object = get_field_object( str_replace('acf___', '', $advanced_usermeta ) );
	3281	+ if ( is_array( $field_object ) && array_key_exists( 'type', $field_object ) && $field_object['type'] === 'select' ) :
	3282	+ $should_show_usermeta_in_text_field = false; ?>
	3283	+ <select id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_usermeta" class="auth-usermeta auth-multisite-usermeta" onchange="<?php echo $js_function_prefix; ?>update_usermeta( this );">
	3284	+ <option value=""<?php if ( empty( $approved_user['usermeta'] ) ) echo ' selected="selected"'; ?>><?php _e( '-- None --', 'authorizer' ); ?></option>
	3285	+ <?php foreach ( $field_object['choices'] as $key => $label ) : ?>
	3286	+ <option value="<?php echo $key; ?>"<?php if ( $key === $approved_user['usermeta'] || ( is_array( $approved_user['usermeta'] ) && array_key_exists( get_current_blog_id(), $approved_user['usermeta'] ) && $key === $approved_user['usermeta'][get_current_blog_id()]['meta_value'] ) ) echo ' selected="selected"'; ?>><?php echo $label; ?></option>
	3287	+ <?php endforeach; ?>
	3288	+ </select>
	3289	+ <?php endif; ?>
	3290	+ <?php endif; ?>
	3291	+ <?php if ( $should_show_usermeta_in_text_field ) : ?>
	3292	+ <input type="text" id="auth_multisite_settings_<?php echo $option; ?>_<?php echo $key; ?>_usermeta" value="<?php echo htmlspecialchars( $approved_user['usermeta'], ENT_COMPAT ); ?>" class="auth-usermeta auth-multisite-usermeta" />
	3293	+ <a class="button button-small button-primary update-usermeta" id="update_usermeta_<?php echo $key; ?>" onclick="<?php echo $js_function_prefix; ?>update_usermeta( this );" title="Update usermeta"><span class="glyphicon glyphicon-floppy-saved"></span></a>
	3294	+ <?php endif; ?>
	3295	+ <?php endif; ?>
	3296	+ &nbsp;&nbsp;<a title="WordPress Multisite user" class="auth-multisite-user"><span class="glyphicon glyphicon-globe"></span></a>
	3297	+ </li>
	3298	+ <?php endforeach;
	3299	+ endif;
	3300	+ foreach ( $auth_settings_option as $key => $approved_user ):
	3301	+ $is_current_user = false;
	3302	+ $local_user_icon = array_key_exists( 'local_user', $approved_user ) && $approved_user['local_user'] === 'true' ? '&nbsp;<a title="Local WordPress user" class="auth-local-user"><span class="glyphicon glyphicon-user"></span></a>' : '';
	3303	+ if ( empty( $approved_user ) || count( $approved_user ) < 1 ) :
	3304	+ continue;
	3305	+ endif;
	3306	+ $approved_wp_user = get_user_by( 'email', $approved_user['email'] );
	3307	+ if ( $approved_wp_user ) :
	3308	+ $approved_user['email'] = $approved_wp_user->user_email;
	3309	+ $approved_user['role'] = $multisite_admin_page || count( $approved_wp_user->roles ) === 0 ? $approved_user['role'] : array_shift( $approved_wp_user->roles );
	3310	+ $approved_user['date_added'] = $approved_wp_user->user_registered;
	3311	+ $approved_user['is_wp_user'] = true;
	3312	+ $is_current_user = $approved_wp_user->ID === get_current_user_id();
	3313	+ // Get usermeta field from the WordPress user's real usermeta.
	3314	+ if ( strlen( $advanced_usermeta ) > 0 ) :
	3315	+ if ( strpos( $advanced_usermeta, 'acf___' ) === 0 && class_exists( 'acf' ) ) :
	3316	+ // Get ACF Field value for the user
	3317	+ $approved_user['usermeta'] = get_field( str_replace('acf___', '', $advanced_usermeta ), 'user_' . $approved_wp_user->ID );
	3318	+ else :
	3319	+ // Get regular usermeta value for the user.
	3320	+ $approved_user['usermeta'] = get_user_meta( $approved_wp_user->ID, $advanced_usermeta, true );
	3321	+ endif;
3842	3322
3843		-
3844		- /**
3845		- * Renders the html elements for the pager above and below the Approved User list.
3846		- *
3847		- * @param integer $current_page Which page we are currently viewing.
3848		- * @param integer $users_per_page How many users to show per page.
3849		- * @param integer $total_users Total count of users in list.
3850		- * @param string $which Where to render the pager ('top' or 'bottom').
3851		- * @return void
3852		- */
3853		- private function render_user_pager( $current_page = 1, $users_per_page = 20, $total_users = 0, $which = 'top' ) {
3854		- $total_pages = ceil( $total_users / $users_per_page );
3855		- if ( $total_pages < 1 ) {
3856		- $total_pages = 1;
3857		- }
3858		-
3859		- /* TRANSLATORS: %s: number of users */
3860		- $output = ' <span class="displaying-num">' . sprintf( _n( '%s user', '%s users', $total_users, 'authorizer' ), number_format_i18n( $total_users ) ) . '</span>';
3861		-
3862		- $disable_first = $current_page <= 1;
3863		- $disable_prev = $current_page <= 1;
3864		- $disable_next = $current_page >= $total_pages;
3865		- $disable_last = $current_page >= $total_pages;
3866		-
3867		- $current_url = '';
3868		- if ( isset( $_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'] ) ) {
3869		- $current_url = set_url_scheme( esc_url_raw( wp_unslash( $_SERVER['HTTP_HOST'] ) ) . esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
3870		- $current_url = remove_query_arg( wp_removable_query_args(), $current_url );
3871		- }
3872		-
3873		- $page_links = array();
3874		-
3875		- $total_pages_before = '<span class="paging-input">';
3876		- $total_pages_after = '</span></span>';
3877		-
3878		- if ( $disable_first ) {
3879		- $page_links[] = '<span class="first-page tablenav-pages-navspan" aria-hidden="true">&laquo;</span>';
3880		- } else {
3881		- $page_links[] = sprintf(
3882		- "<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
3883		- esc_url( remove_query_arg( 'paged', $current_url ) ),
3884		- __( 'First page' ),
3885		- '&laquo;'
3886		- );
3887		- }
3888		-
3889		- if ( $disable_prev ) {
3890		- $page_links[] = '<span class="prev-page tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
3891		- } else {
3892		- $page_links[] = sprintf(
3893		- "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
3894		- esc_url( add_query_arg( 'paged', max( 1, $current_page - 1 ), $current_url ) ),
3895		- __( 'Previous page' ),
3896		- '&lsaquo;'
3897		- );
3898		- }
3899		-
3900		- if ( 'bottom' === $which ) {
3901		- $html_current_page = '<span class="current-page-text">' . $current_page . '</span>';
3902		- $total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input"><span class="tablenav-paging-text">';
3903		- } else {
3904		- $html_current_page = sprintf(
3905		- "%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' /><span class='tablenav-paging-text'>",
3906		- '<label for="current-page-selector" class="screen-reader-text">' . __( 'Current Page' ) . '</label>',
3907		- $current_page,
3908		- strlen( $total_pages )
3909		- );
3910		- }
3911		- /* TRANSLATORS: %s: number of pages */
3912		- $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
3913		- /* TRANSLATORS: 1: number of current page 2: number of total pages */
3914		- $page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
3915		-
3916		- if ( $disable_next ) {
3917		- $page_links[] = '<span class="next-page tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
3918		- } else {
3919		- $page_links[] = sprintf(
3920		- "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
3921		- esc_url( add_query_arg( 'paged', min( $total_pages, $current_page + 1 ), $current_url ) ),
3922		- __( 'Next page' ),
3923		- '&rsaquo;'
3924		- );
3925		- }
3926		-
3927		- if ( $disable_last ) {
3928		- $page_links[] = '<span class="last-page tablenav-pages-navspan" aria-hidden="true">&raquo;</span>';
3929		- } else {
3930		- $page_links[] = sprintf(
3931		- "<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
3932		- esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
3933		- __( 'Last page' ),
3934		- '&raquo;'
3935		- );
3936		- }
3937		-
3938		- $pagination_links_class = 'pagination-links';
3939		- $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
3940		-
3941		- $search_form = array();
3942		- if ( 'top' === $which ) {
3943		- // phpcs:ignore WordPress.CSRF.NonceVerification.NoNonceVerification
3944		- $search_term = isset( $_REQUEST['search'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['search'] ) ) : '';
3945		- $search_form[] = '<div class="search-box">';
3946		- $search_form[] = '<label class="screen-reader-text" for="user-search-input">' . __( 'Search Users', 'authorizer' ) . '</label>';
3947		- $search_form[] = '<input type="search" size="14" id="user-search-input" name="search" value="' . $search_term . '">';
3948		- $search_form[] = '<input type="button" id="search-submit" class="button" value="' . __( 'Search', 'authorizer' ) . '">';
3949		- $search_form[] = '</div>';
3950		- }
3951		- $search_form = join( "\n", $search_form );
3952		-
3953		- $output = "<div class='tablenav-pages'>$output</div>";
3954		- ?>
3955		- <div class="tablenav top">
3956		- <?php echo wp_kses( $output, $this->allowed_html ); ?>
3957		- <?php echo wp_kses( $search_form, $this->allowed_html ); ?>
3958		- </div>
3959		- <?php
3960		- }
3961		-
3962		-
3963		- /**
3964		- * Renders the html <li> element for a given user in a list.
3965		- *
3966		- * @param array $approved_user User array to render.
3967		- * @param int $key Index of user in list of users.
3968		- * @param string $option List user is in (e.g., 'access_users_approved').
3969		- * @param string $admin_mode Current admin context.
3970		- * @param string $advanced_usermeta Usermeta field to display.
3971		- * @return void
3972		- */
3973		- private function render_user_element( $approved_user, $key, $option, $admin_mode, $advanced_usermeta ) {
3974		- $is_local_user = array_key_exists( 'local_user', $approved_user ) && 'true' === $approved_user['local_user'];
3975		- $is_multisite_user = array_key_exists( 'multisite_user', $approved_user ) && true === $approved_user['multisite_user'];
3976		- $option_prefix = $is_multisite_user ? 'auth_multisite_settings_' : 'auth_settings_';
3977		- $option_id = $option_prefix . $option . '_' . $key;
3978		- $approved_wp_user = get_user_by( 'email', $approved_user['email'] );
3979		- $is_current_user = $approved_wp_user && get_current_user_id() === $approved_wp_user->ID;
3980		-
3981		- // Adjust javascript function prefixes if multisite.
3982		- $js_function_prefix = WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode ? 'authMultisite' : 'auth';
3983		- $is_multisite_admin_page = WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode;
3984		-
3985		- if ( ! $approved_wp_user ) :
3986		- $approved_user['is_wp_user'] = false;
3987		- else :
3988		- $approved_user['is_wp_user'] = true;
3989		- $approved_user['email'] = $approved_wp_user->user_email;
3990		- $approved_user['role'] = $is_multisite_admin_page || count( $approved_wp_user->roles ) === 0 ? $approved_user['role'] : array_shift( $approved_wp_user->roles );
3991		- $approved_user['date_added'] = $approved_wp_user->user_registered;
3992		-
3993		- // Get usermeta field from the WordPress user's real usermeta.
3994		- if ( strlen( $advanced_usermeta ) > 0 ) :
3995		- if ( strpos( $advanced_usermeta, 'acf___' ) === 0 && class_exists( 'acf' ) ) :
3996		- // Get ACF Field value for the user.
3997		- $approved_user['usermeta'] = get_field( str_replace( 'acf___', '', $advanced_usermeta ), 'user_' . $approved_wp_user->ID );
	3323	+ if ( is_array( $approved_user['usermeta'] ) || is_object( $approved_user['usermeta'] ) ) :
	3324	+ $approved_user['usermeta'] = serialize( $approved_user['usermeta'] );
	3325	+ endif;
	3326	+ endif;
3998	3327	else :
3999		- // Get regular usermeta value for the user.
4000		- $approved_user['usermeta'] = get_user_meta( $approved_wp_user->ID, $advanced_usermeta, true );
	3328	+ $approved_user['is_wp_user'] = false;
4001	3329	endif;
4002		- if ( is_array( $approved_user['usermeta'] ) || is_object( $approved_user['usermeta'] ) ) :
4003		- $approved_user['usermeta'] = serialize( $approved_user['usermeta'] );
4004		- endif;
4005		- endif;
4006		- endif;
4007		- if ( ! array_key_exists( 'usermeta', $approved_user ) ) :
4008		- $approved_user['usermeta'] = '';
4009		- endif;
4010		- ?>
4011		- <li>
4012		- <input
4013		- type="text"
4014		- id="<?php echo esc_attr( $option_id ); ?>"
4015		- value="<?php echo esc_attr( $approved_user['email'] ); ?>"
4016		- readonly="true"
4017		- class="<?php echo esc_attr( $this->create_class_name( 'email', $is_multisite_user ) ); ?>"
4018		- />
4019		- <select
4020		- id="<?php echo esc_attr( $option_id ); ?>_role"
4021		- class="<?php echo esc_attr( $this->create_class_name( 'role', $is_multisite_user ) ); ?>"
4022		- onchange="<?php echo esc_attr( $js_function_prefix ); ?>ChangeRole( this );"
4023		- <?php if ( $is_multisite_user ) : ?>
4024		- disabled="disabled"
4025		- <?php endif; ?>
4026		- >
4027		- <?php $disable_input = $is_current_user ? 'disabled' : null; ?>
4028		- <?php $this->wp_dropdown_permitted_roles( $approved_user['role'], $disable_input, $admin_mode ); ?>
	3330	+ if ( ! array_key_exists( 'usermeta', $approved_user ) ) :
	3331	+ $approved_user['usermeta'] = '';
	3332	+ endif; ?>
	3333	+ <li>
	3334	+ <input type="text" id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>" value="<?php echo $approved_user['email']; ?>" readonly="true" class="auth-email" />
	3335	+ <select id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_role" class="auth-role" onchange="<?php echo $js_function_prefix; ?>change_role( this );">
	3336	+ <?php $disable_input = $is_current_user ? 'disabled' : null; ?>
	3337	+ <?php $this->wp_dropdown_permitted_roles( $approved_user['role'], $disable_input, $admin_mode ); ?>
	3338	+ </select>
	3339	+ <input type="text" id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_date_added" value="<?php echo date( 'M Y', strtotime( $approved_user['date_added'] ) ); ?>" readonly="true" class="auth-date-added" />
	3340	+ <?php if ( strlen( $advanced_usermeta ) > 0 ) :
	3341	+ $should_show_usermeta_in_text_field = true; // Fallback renderer for usermeta; try to use a select first.
	3342	+ if ( strpos( $advanced_usermeta, 'acf___' ) === 0 && class_exists( 'acf' ) ) :
	3343	+ $field_object = get_field_object( str_replace('acf___', '', $advanced_usermeta ) );
	3344	+ if ( is_array( $field_object ) && array_key_exists( 'type', $field_object ) && $field_object['type'] === 'select' ) :
	3345	+ $should_show_usermeta_in_text_field = false; ?>
	3346	+ <select id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_usermeta" class="auth-usermeta" onchange="<?php echo $js_function_prefix; ?>update_usermeta( this );" >
	3347	+ <option value=""<?php if ( empty( $approved_user['usermeta'] ) ) echo ' selected="selected"'; ?>><?php _e( '-- None --', 'authorizer' ); ?></option>
	3348	+ <?php foreach ( $field_object['choices'] as $key => $label ) : ?>
	3349	+ <option value="<?php echo $key; ?>"<?php if ( $key === $approved_user['usermeta'] || ( is_array( $approved_user['usermeta'] ) && $key === $approved_user['usermeta']['meta_value'] ) ) echo ' selected="selected"'; ?>><?php echo $label; ?></option>
	3350	+ <?php endforeach; ?>
	3351	+ </select>
	3352	+ <?php endif; ?>
	3353	+ <?php endif; ?>
	3354	+ <?php if ( $should_show_usermeta_in_text_field ) : ?>
	3355	+ <input type="text" id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_usermeta" value="<?php echo htmlspecialchars( $approved_user['usermeta'], ENT_COMPAT ); ?>" class="auth-usermeta" />
	3356	+ <a class="button button-small button-primary update-usermeta" id="update_usermeta_<?php echo $key; ?>" onclick="<?php echo $js_function_prefix; ?>update_usermeta( this );" title="Update usermeta"><span class="glyphicon glyphicon-floppy-saved"></span></a>
	3357	+ <?php endif; ?>
	3358	+ <?php endif; ?>
	3359	+ <?php if ( ! $is_current_user ): ?>
	3360	+ <?php if ( ! $multisite_admin_page ) : ?>
	3361	+ <a class="button" id="block_user_<?php echo $key; ?>" onclick="<?php echo $js_function_prefix; ?>add_user( this, 'blocked', false ); <?php echo $js_function_prefix; ?>ignore_user( this, 'approved' );" title="<?php _e( 'Block/Ban user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-ban-circle"></span></a>
	3362	+ <?php endif; ?>
	3363	+ <a class="button" id="ignore_user_<?php echo $key; ?>" onclick="<?php echo $js_function_prefix; ?>ignore_user(this, 'approved' );" title="<?php _e( 'Remove user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-remove"></span></a>
	3364	+ <?php endif; ?>
	3365	+ <?php echo $local_user_icon; ?>
	3366	+ </li>
	3367	+ <?php endforeach; ?>
	3368	+ </ul>
	3369	+ <div id="new_auth_settings_<?php echo $option; ?>">
	3370	+ <input type="text" id="new_approved_user_email" placeholder="<?php _e( 'email address', 'authorizer' ); ?>" class="auth-email new" />
	3371	+ <select id="new_approved_user_role" class="auth-role">
	3372	+ <?php $this->wp_dropdown_permitted_roles( $access_default_role, 'not disabled', $admin_mode ); ?>
4029	3373	</select>
4030		- <input
4031		- type="text"
4032		- id="<?php echo esc_attr( $option_id ); ?>_date_added"
4033		- value="<?php echo esc_attr( date( 'M Y', strtotime( $approved_user['date_added'] ) ) ); ?>"
4034		- readonly="true"
4035		- class="<?php echo esc_attr( $this->create_class_name( 'date-added', $is_multisite_user ) ); ?>"
4036		- />
4037		- <?php
4038		- if ( strlen( $advanced_usermeta ) > 0 ) :
4039		- $should_show_usermeta_in_text_field = true; // Fallback renderer for usermeta; try to use a select first.
4040		- if ( strpos( $advanced_usermeta, 'acf___' ) === 0 && class_exists( 'acf' ) ) :
4041		- $field_object = get_field_object( str_replace( 'acf___', '', $advanced_usermeta ) );
4042		- if ( is_array( $field_object ) && array_key_exists( 'type', $field_object ) && 'select' === $field_object['type'] ) :
4043		- $should_show_usermeta_in_text_field = false;
4044		- ?>
4045		- <select
4046		- id="<?php echo esc_attr( $option_id ); ?>_usermeta"
4047		- class="<?php echo esc_attr( $this->create_class_name( 'usermeta', $is_multisite_user ) ); ?>"
4048		- onchange="<?php echo esc_attr( $js_function_prefix ); ?>UpdateUsermeta( this );"
4049		- >
4050		- <option value=""<?php selected( empty( $approved_user['usermeta'] ) ); ?>><?php esc_html_e( '-- None --', 'authorizer' ); ?></option>
4051		- <?php foreach ( $field_object['choices'] as $key => $label ) : ?>
4052		- <option value="<?php echo esc_attr( $key ); ?>"<?php selected( $key === $approved_user['usermeta'] || ( isset( $approved_user['usermeta']['meta_value'] ) && $key === $approved_user['usermeta']['meta_value'] ) ); ?>><?php echo esc_html( $label ); ?></option>
4053		- <?php endforeach; ?>
4054		- </select>
4055		- <?php endif; ?>
4056		- <?php endif; ?>
4057		- <?php if ( $should_show_usermeta_in_text_field ) : ?>
4058		- <input
4059		- type="text"
4060		- id="<?php echo esc_attr( $option_id ); ?>_usermeta"
4061		- value="<?php echo esc_attr( $approved_user['usermeta'], ENT_COMPAT ); ?>"
4062		- class="<?php echo esc_attr( $this->create_class_name( 'usermeta', $is_multisite_user ) ); ?>"
4063		- />
4064		- <a class="button button-small button-primary update-usermeta" id="update_usermeta_<?php echo esc_attr( $key ); ?>" onclick="<?php echo esc_attr( $js_function_prefix ); ?>UpdateUsermeta( this );" title="Update usermeta"><span class="glyphicon glyphicon-floppy-saved"></span></a>
4065		- <?php endif; ?>
4066		- <?php endif; ?>
4067		- <?php if ( ! $is_current_user && ! $is_multisite_user ) : ?>
4068		- <?php if ( ! $is_multisite_admin_page ) : ?>
4069		- <a class="button" id="block_user_<?php echo esc_attr( $key ); ?>" onclick="<?php echo esc_attr( $js_function_prefix ); ?>AddUser( this, 'blocked', false ); <?php echo esc_attr( $js_function_prefix ); ?>IgnoreUser( this, 'approved' );" title="<?php esc_attr_e( 'Block/Ban user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-ban-circle"></span></a>
4070		- <?php endif; ?>
4071		- <a class="button" id="ignore_user_<?php echo esc_attr( $key ); ?>" onclick="<?php echo esc_attr( $js_function_prefix ); ?>IgnoreUser(this, 'approved' );" title="<?php esc_attr_e( 'Remove user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-remove"></span></a>
4072		- <?php endif; ?>
4073		- <?php if ( $is_local_user ) : ?>
4074		- &nbsp;<a title="Local WordPress user" class="auth-local-user"><span class="glyphicon glyphicon-user"></span></a>
4075		- <?php endif; ?>
4076		- <?php if ( $is_multisite_user ) : ?>
4077		- &nbsp;<a title="WordPress Multisite user" class="auth-multisite-user"><span class="glyphicon glyphicon-globe"></span></a>
4078		- <?php endif; ?>
4079		- </li>
	3374	+ <div class="btn-group">
	3375	+ <a href="javascript:void(0);" class="btn button-primary dropdown-toggle" id="approve_user_new" onclick="<?php echo $js_function_prefix; ?>add_user(this, 'approved' );"><span class="glyphicon glyphicon-ok"></span> <?php _e( 'Approve', 'authorizer' ); ?></a>
	3376	+ <button type="button" class="btn button-primary dropdown-toggle" data-toggle="dropdown">
	3377	+ <span class="caret"></span>
	3378	+ <span class="sr-only"><?php _e( 'Toggle Dropdown', 'authorizer' ); ?></span>
	3379	+ </button>
	3380	+ <ul class="dropdown-menu" role="menu">
	3381	+ <li><a href="javascript:void(0);" onclick="<?php echo $js_function_prefix; ?>add_user( document.getElementById('approve_user_new' ), 'approved', true);"><?php _e( 'Create a local WordPress <br />account instead, and email <br />the user their password.', 'authorizer' ); ?></a></li>
	3382	+ </ul>
	3383	+ </div>
	3384	+ </div>
4080	3385	<?php
4081	3386	}
4082	3387
4083	3388
4084		- /**
4085		- * Settings print callback.
4086		- *
4087		- * @param string $args Args (e.g., multisite admin mode).
4088		- * @return void
4089		- */
4090		- public function print_combo_auth_access_users_blocked( $args = '' ) {
	3389	+ function print_combo_auth_access_users_blocked( $args = '' ) {
4091	3390	// Get plugin option.
4092		- $option = 'access_users_blocked';
	3391	+ $option = 'access_users_blocked';
4093	3392	$auth_settings_option = $this->get_plugin_option( $option );
4094	3393	$auth_settings_option = is_array( $auth_settings_option ) ? $auth_settings_option : array();
4095	3394
4096	3395	// Get default role for new blocked user dropdown.
4097		- $access_default_role = $this->get_plugin_option( 'access_default_role', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
	3396	+ $access_default_role = $this->get_plugin_option( 'access_default_role', SINGLE_ADMIN, 'allow override' );
4098	3397
4099		- // Render wrapper div (for aligning pager to width of content).
4100		- ?>
4101		- <div class="wrapper_<?php echo esc_attr( $option ); ?>">
4102		- <ul id="list_auth_settings_<?php echo esc_attr( $option ); ?>" style="margin:0;">
4103		- <?php
4104		- foreach ( $auth_settings_option as $key => $blocked_user ) :
4105		- if ( empty( $blocked_user ) || count( $blocked_user ) < 1 ) :
4106		- continue;
4107		- endif;
4108		- $blocked_wp_user = get_user_by( 'email', $blocked_user['email'] );
4109		- if ( $blocked_wp_user ) :
4110		- $blocked_user['email'] = $blocked_wp_user->user_email;
4111		- $blocked_user['role'] = array_shift( $blocked_wp_user->roles );
4112		- $blocked_user['date_added'] = $blocked_wp_user->user_registered;
4113		- $blocked_user['is_wp_user'] = true;
4114		- else :
4115		- $blocked_user['is_wp_user'] = false;
4116		- endif;
4117		- ?>
4118		- <li>
4119		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_<?php echo esc_attr( $key ); ?>" value="<?php echo esc_attr( $blocked_user['email'] ); ?>" readonly="true" class="auth-email" />
4120		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>_<?php echo esc_attr( $key ); ?>_role" class="auth-role">
4121		- <?php $this->wp_dropdown_permitted_roles( $blocked_user['role'] ); ?>
4122		- </select>
4123		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_<?php echo esc_attr( $key ); ?>_date_added" value="<?php echo esc_attr( date( 'M Y', strtotime( $blocked_user['date_added'] ) ) ); ?>" readonly="true" class="auth-date-added" />
4124		- <a class="button" id="ignore_user_<?php echo esc_attr( $key ); ?>" onclick="authIgnoreUser( this, 'blocked' );" title="<?php esc_attr_e( 'Remove user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-remove"></span></a>
4125		- </li>
4126		- <?php endforeach; ?>
4127		- </ul>
4128		- <div id="new_auth_settings_<?php echo esc_attr( $option ); ?>">
4129		- <input type="text" id="new_blocked_user_email" placeholder="<?php esc_attr_e( 'email address', 'authorizer' ); ?>" class="auth-email new" />
4130		- <select id="new_blocked_user_role" class="auth-role">
4131		- <option value="<?php echo esc_attr( $access_default_role ); ?>"><?php echo esc_html( ucfirst( $access_default_role ) ); ?></option>
4132		- </select>
4133		- <a href="javascript:void(0);" class="button-primary button-add-user" id="block_user_new" onclick="authAddUser( this, 'blocked' );"><span class="glyphicon glyphicon-ban-circle"></span> <?php esc_html_e( 'Block', 'authorizer' ); ?></a>
4134		- </div>
	3398	+ // Print option elements.
	3399	+ ?><ul id="list_auth_settings_<?php echo $option; ?>" style="margin:0;">
	3400	+ <?php foreach ( $auth_settings_option as $key => $blocked_user ): ?>
	3401	+ <?php if ( empty( $blocked_user ) || count( $blocked_user ) < 1 ) continue; ?>
	3402	+ <?php if ( $blocked_wp_user = get_user_by( 'email', $blocked_user['email'] ) ): ?>
	3403	+ <?php $blocked_user['email'] = $blocked_wp_user->user_email; ?>
	3404	+ <?php $blocked_user['role'] = array_shift( $blocked_wp_user->roles ); ?>
	3405	+ <?php $blocked_user['date_added'] = $blocked_wp_user->user_registered; ?>
	3406	+ <?php $blocked_user['is_wp_user'] = true; ?>
	3407	+ <?php else: ?>
	3408	+ <?php $blocked_user['is_wp_user'] = false; ?>
	3409	+ <?php endif; ?>
	3410	+ <li>
	3411	+ <input type="text" id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>" value="<?php echo $blocked_user['email']; ?>" readonly="true" class="auth-email" />
	3412	+ <select id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_role" class="auth-role">
	3413	+ <?php $this->wp_dropdown_permitted_roles( $blocked_user['role'] ); ?>
	3414	+ </select>
	3415	+ <input type="text" id="auth_settings_<?php echo $option; ?>_<?php echo $key; ?>_date_added" value="<?php echo date( 'M Y', strtotime( $blocked_user['date_added'] ) ); ?>" readonly="true" class="auth-date-added" />
	3416	+ <a class="button" id="ignore_user_<?php echo $key; ?>" onclick="auth_ignore_user(this, 'blocked' );" title="<?php _e( 'Remove user', 'authorizer' ); ?>"><span class="glyphicon glyphicon-remove"></span></a>
	3417	+ </li>
	3418	+ <?php endforeach; ?>
	3419	+ </ul>
	3420	+ <div id="new_auth_settings_<?php echo $option; ?>">
	3421	+ <input type="text" id="new_blocked_user_email" placeholder="<?php _e( 'email address', 'authorizer' ); ?>" class="auth-email new" />
	3422	+ <select id="new_blocked_user_role" class="auth-role">
	3423	+ <option value="<?php echo $access_default_role; ?>"><?php echo ucfirst( $access_default_role ); ?></option>
	3424	+ </select>
	3425	+ <a href="javascript:void(0);" class="button-primary" id="block_user_new" onclick="auth_add_user(this, 'blocked' );"><span class="glyphicon glyphicon-ban-circle"></span> <?php _e( 'Block', 'authorizer' ); ?></a>
4135	3426	</div>
4136	3427	<?php
4137	3428	}
4138	3429
4139	3430
4140		- /**
4141		- * Settings print callback.
4142		- *
4143		- * @param string $args Args (e.g., multisite admin mode).
4144		- * @return void
4145		- */
4146		- public function print_section_info_access_login( $args = '' ) {
4147		- ?>
4148		- <div id="section_info_access_login" class="section_info">
	3431	+ function print_section_info_access_login( $args = '' ) {
	3432	+ ?><div id="section_info_access_login" class="section_info">
4149	3433	<?php wp_nonce_field( 'save_auth_settings', 'nonce_save_auth_settings' ); ?>
4150		- <p><?php esc_html_e( 'Choose who is able to log into this site below.', 'authorizer' ); ?></p>
4151		- </div>
4152		- <?php
	3434	+ <p><?php _e( 'Choose who is able to log into this site below.', 'authorizer' ); ?></p>
	3435	+ </div><?php
4153	3436	}
4154	3437
4155	3438
4156		- /**
4157		- * Settings print callback.
4158		- *
4159		- * @param string $args Args (e.g., multisite admin mode).
4160		- * @return void
4161		- */
4162		- public function print_radio_auth_access_who_can_login( $args = '' ) {
	3439	+ function print_radio_auth_access_who_can_login( $args = '' ) {
4163	3440	// Get plugin option.
4164		- $option = 'access_who_can_login';
4165		- $admin_mode = $this->get_admin_mode( $args );
	3441	+ $option = 'access_who_can_login';
	3442	+ $admin_mode = $this->get_admin_mode( $args );
4166	3443	$auth_settings_option = $this->get_plugin_option( $option, $admin_mode, 'allow override', 'print overlay' );
4167	3444
4168	3445	// 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.
4169		- if ( is_multisite() && 1 === intval( $this->get_plugin_option( 'advanced_override_multisite' ) ) ) {
	3446	+ if ( is_multisite() && $this->get_plugin_option( 'advanced_override_multisite' ) == '1' ) {
4170	3447	$auth_settings_option = $this->get_plugin_option( $option );
4171		- } elseif ( is_multisite() && WP_Plugin_Authorizer::SINGLE_CONTEXT === $admin_mode && $this->get_plugin_option( 'multisite_override', WP_Plugin_Authorizer::NETWORK_CONTEXT ) === '1' ) {
	3448	+ } elseif ( is_multisite() && $admin_mode === SINGLE_ADMIN && $this->get_plugin_option( 'multisite_override', MULTISITE_ADMIN ) === '1' ) {
4172	3449	// Workaround: javascript code hides/shows other settings based
4173	3450	// on the selection in this option. If this option is overridden
4174	3451	// by a multisite option, it should show that value in order to
4175	3452	// correctly display the other appropriate options.
		@@ -4175,49 +3452,33 @@
4175	3452	// correctly display the other appropriate options.
4176	3453	// Side effect: this site option will be overwritten by the
4177	3454	// multisite option on save. Since this is a 2-item radio, we
4178	3455	// determined this was acceptable.
4179		- $auth_settings_option = $this->get_plugin_option( $option, WP_Plugin_Authorizer::NETWORK_CONTEXT );
	3456	+ $auth_settings_option = $this->get_plugin_option( $option, MULTISITE_ADMIN );
4180	3457	}
4181	3458
4182	3459	// Print option elements.
4183		- ?>
4184		- <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 />
4185		- <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 />
4186		- <?php
	3460	+ ?><input type="radio" id="radio_auth_settings_<?php echo $option; ?>_external_users" name="auth_settings[<?php echo $option; ?>]" value="external_users"<?php checked( 'external_users' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_external_users"><?php _e( 'All authenticated users (All external service users and all WordPress users)', 'authorizer' ); ?></label><br />
	3461	+ <input type="radio" id="radio_auth_settings_<?php echo $option; ?>_approved_users" name="auth_settings[<?php echo $option; ?>]" value="approved_users"<?php checked( 'approved_users' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_approved_users"><?php _e( 'Only', 'authorizer' ); ?> <a href="javascript:choose_tab('access_lists' );" id="dashboard_link_approved_users"><?php _e( 'approved users', 'authorizer' ); ?></a> <?php _e( '(Approved external users and all WordPress users)', 'authorizer' ); ?></label><br /><?php
4187	3462	}
4188	3463
4189	3464
4190		- /**
4191		- * Settings print callback.
4192		- *
4193		- * @param string $args Args (e.g., multisite admin mode).
4194		- * @return void
4195		- */
4196		- public function print_select_auth_access_role_receive_pending_emails( $args = '' ) {
	3465	+ function print_select_auth_access_role_receive_pending_emails( $args = '' ) {
4197	3466	// Get plugin option.
4198		- $option = 'access_role_receive_pending_emails';
	3467	+ $option = 'access_role_receive_pending_emails';
4199	3468	$auth_settings_option = $this->get_plugin_option( $option );
4200	3469
4201	3470	// Print option elements.
4202		- ?>
4203		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]">
4204		- <option value="---" <?php selected( $auth_settings_option, '---' ); ?>><?php esc_html_e( "None (Don't send notification emails)", 'authorizer' ); ?></option>
	3471	+ ?><select id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]">
	3472	+ <option value="---" <?php selected( $auth_settings_option, '---' ); ?>><?php _e( "None (Don't send notification emails)", 'authorizer' ); ?></option>
4205	3473	<?php wp_dropdown_roles( $auth_settings_option ); ?>
4206		- </select>
4207		- <?php
	3474	+ </select><?php
4208	3475	}
4209	3476
4210	3477
4211		- /**
4212		- * Settings print callback.
4213		- *
4214		- * @param string $args Args (e.g., multisite admin mode).
4215		- * @return void
4216		- */
4217		- public function print_wysiwyg_auth_access_pending_redirect_to_message( $args = '' ) {
	3478	+ function print_wysiwyg_auth_access_pending_redirect_to_message( $args = '' ) {
4218	3479	// Get plugin option.
4219		- $option = 'access_pending_redirect_to_message';
	3480	+ $option = 'access_pending_redirect_to_message';
4220	3481	$auth_settings_option = $this->get_plugin_option( $option );
4221	3482
4222	3483	// Print option elements.
4223	3484	wp_editor(
		@@ -4226,25 +3487,19 @@
4226	3487	array(
4227	3488	'media_buttons' => false,
4228	3489	'textarea_name' => "auth_settings[$option]",
4229	3490	'textarea_rows' => 5,
4230		- 'tinymce' => true,
4231		- 'teeny' => true,
4232		- 'quicktags' => false,
	3491	+ 'tinymce' => true,
	3492	+ 'teeny' => true,
	3493	+ 'quicktags' => false,
4233	3494	)
4234	3495	);
4235	3496	}
4236	3497
4237	3498
4238		- /**
4239		- * Settings print callback.
4240		- *
4241		- * @param string $args Args (e.g., multisite admin mode).
4242		- * @return void
4243		- */
4244		- public function print_wysiwyg_auth_access_blocked_redirect_to_message( $args = '' ) {
	3499	+ function print_wysiwyg_auth_access_blocked_redirect_to_message( $args = '' ) {
4245	3500	// Get plugin option.
4246		- $option = 'access_blocked_redirect_to_message';
	3501	+ $option = 'access_blocked_redirect_to_message';
4247	3502	$auth_settings_option = $this->get_plugin_option( $option );
4248	3503
4249	3504	// Print option elements.
4250	3505	wp_editor(
		@@ -4253,61 +3508,39 @@
4253	3508	array(
4254	3509	'media_buttons' => false,
4255	3510	'textarea_name' => "auth_settings[$option]",
4256	3511	'textarea_rows' => 5,
4257		- 'tinymce' => true,
4258		- 'teeny' => true,
4259		- 'quicktags' => false,
	3512	+ 'tinymce' => true,
	3513	+ 'teeny' => true,
	3514	+ 'quicktags' => false,
4260	3515	)
4261	3516	);
4262	3517	}
4263	3518
4264	3519
4265		- /**
4266		- * Settings print callback.
4267		- *
4268		- * @param string $args Args (e.g., multisite admin mode).
4269		- * @return void
4270		- */
4271		- public function print_checkbox_auth_access_should_email_approved_users( $args = '' ) {
	3520	+ function print_checkbox_auth_access_should_email_approved_users( $args = '' ) {
4272	3521	// Get plugin option.
4273		- $option = 'access_should_email_approved_users';
	3522	+ $option = 'access_should_email_approved_users';
4274	3523	$auth_settings_option = $this->get_plugin_option( $option );
4275	3524
4276	3525	// Print option elements.
4277		- ?>
4278		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Send a welcome email when approving a new user', 'authorizer' ); ?></label>
4279		- <?php
	3526	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Send a welcome email when approving a new user', 'authorizer' ); ?></label><?php
4280	3527	}
4281	3528
4282	3529
4283		- /**
4284		- * Settings print callback.
4285		- *
4286		- * @param string $args Args (e.g., multisite admin mode).
4287		- * @return void
4288		- */
4289		- public function print_text_auth_access_email_approved_users_subject( $args = '' ) {
	3530	+ function print_text_auth_access_email_approved_users_subject( $args = '' ) {
4290	3531	// Get plugin option.
4291		- $option = 'access_email_approved_users_subject';
	3532	+ $option = 'access_email_approved_users_subject';
4292	3533	$auth_settings_option = $this->get_plugin_option( $option );
4293	3534
4294	3535	// Print option elements.
4295		- ?>
4296		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="Welcome to [site_name]!" style="width:320px;" /><br /><small><?php echo wp_kses( __( 'You can use the <b>[site_name]</b> shortcode.', 'authorizer' ), $this->allowed_html ); ?></small>
4297		- <?php
	3536	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="Welcome to [site_name]!" style="width:320px;" /><br /><small><?php _e( 'You can use the <b>[site_name]</b> shortcode.', 'authorizer' ); ?></small><?php
4298	3537	}
4299	3538
4300	3539
4301		- /**
4302		- * Settings print callback.
4303		- *
4304		- * @param string $args Args (e.g., multisite admin mode).
4305		- * @return void
4306		- */
4307		- public function print_wysiwyg_auth_access_email_approved_users_body( $args = '' ) {
	3540	+ function print_wysiwyg_auth_access_email_approved_users_body( $args = '' ) {
4308	3541	// Get plugin option.
4309		- $option = 'access_email_approved_users_body';
	3542	+ $option = 'access_email_approved_users_body';
4310	3543	$auth_settings_option = $this->get_plugin_option( $option );
4311	3544
4312	3545	// Print option elements.
4313	3546	wp_editor(
		@@ -4316,60 +3549,42 @@
4316	3549	array(
4317	3550	'media_buttons' => false,
4318	3551	'textarea_name' => "auth_settings[$option]",
4319	3552	'textarea_rows' => 9,
4320		- 'tinymce' => true,
4321		- 'teeny' => true,
4322		- 'quicktags' => false,
	3553	+ 'tinymce' => true,
	3554	+ 'teeny' => true,
	3555	+ 'quicktags' => false,
4323	3556	)
4324	3557	);
4325		- ?>
4326		- <small>
4327		- <?php
4328		- printf(
4329		- /* TRANSLATORS: 1: Shortcode for site name 2: Shortcode for site URL 3: Shortcode for user email */
4330		- wp_kses( __( 'You can use %1$s, %2$s, and %3$s shortcodes.', 'authorizer' ), $this->allowed_html ),
4331		- '<b>[site_name]</b>',
4332		- '<b>[site_url]</b>',
4333		- '<b>[user_email]</b>'
4334		- );
4335		- ?>
4336		- </small>
4337		- <?php
	3558	+
	3559	+ ?><small><?php printf(
	3560	+ /* TRANSLATORS: 1: Shortcode for site name 2: Shortcode for site URL 3: Shortcode for user email */
	3561	+ __( 'You can use %1$s, %2$s, and %3$s shortcodes.', 'authorizer' ),
	3562	+ '<b>[site_name]</b>',
	3563	+ '<b>[site_url]</b>',
	3564	+ '<b>[user_email]</b>'
	3565	+ ); ?></small><?php
	3566	+
4338	3567	}
4339	3568
4340	3569
4341		- /**
4342		- * Settings print callback.
4343		- *
4344		- * @param string $args Args (e.g., multisite admin mode).
4345		- * @return void
4346		- */
4347		- public function print_section_info_access_public( $args = '' ) {
4348		- ?>
4349		- <div id="section_info_access_public" class="section_info">
4350		- <p><?php esc_html_e( 'Choose your public access options here.', 'authorizer' ); ?></p>
4351		- </div>
4352		- <?php
	3570	+ function print_section_info_access_public( $args = '' ) {
	3571	+ ?><div id="section_info_access_public" class="section_info">
	3572	+ <p><?php _e( 'Choose your public access options here.', 'authorizer' ); ?></p>
	3573	+ </div><?php
4353	3574	}
4354	3575
4355	3576
4356		- /**
4357		- * Settings print callback.
4358		- *
4359		- * @param string $args Args (e.g., multisite admin mode).
4360		- * @return void
4361		- */
4362		- public function print_radio_auth_access_who_can_view( $args = '' ) {
	3577	+ function print_radio_auth_access_who_can_view( $args = '' ) {
4363	3578	// Get plugin option.
4364		- $option = 'access_who_can_view';
4365		- $admin_mode = $this->get_admin_mode( $args );
	3579	+ $option = 'access_who_can_view';
	3580	+ $admin_mode = $this->get_admin_mode( $args );
4366	3581	$auth_settings_option = $this->get_plugin_option( $option, $admin_mode, 'allow override', 'print overlay' );
4367	3582
4368	3583	// 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.
4369		- if ( is_multisite() && 1 === intval( $this->get_plugin_option( 'advanced_override_multisite' ) ) ) {
	3584	+ if ( is_multisite() && $this->get_plugin_option( 'advanced_override_multisite' ) == '1' ) {
4370	3585	$auth_settings_option = $this->get_plugin_option( $option );
4371		- } elseif ( is_multisite() && WP_Plugin_Authorizer::SINGLE_CONTEXT === $admin_mode && '1' === $this->get_plugin_option( 'multisite_override', WP_Plugin_Authorizer::NETWORK_CONTEXT ) ) {
	3586	+ } elseif ( is_multisite() && $admin_mode === SINGLE_ADMIN && $this->get_plugin_option( 'multisite_override', MULTISITE_ADMIN ) === '1' ) {
4372	3587	// Workaround: javascript code hides/shows other settings based
4373	3588	// on the selection in this option. If this option is overridden
4374	3589	// by a multisite option, it should show that value in order to
4375	3590	// correctly display the other appropriate options.
		@@ -4375,66 +3590,42 @@
4375	3590	// correctly display the other appropriate options.
4376	3591	// Side effect: this site option will be overwritten by the
4377	3592	// multisite option on save. Since this is a 2-item radio, we
4378	3593	// determined this was acceptable.
4379		- $auth_settings_option = $this->get_plugin_option( $option, WP_Plugin_Authorizer::NETWORK_CONTEXT );
	3594	+ $auth_settings_option = $this->get_plugin_option( $option, MULTISITE_ADMIN );
4380	3595	}
4381	3596
4382	3597	// Print option elements.
4383		- ?>
4384		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_everyone" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="everyone"<?php checked( 'everyone' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_everyone"><?php esc_html_e( 'Everyone can see the site', 'authorizer' ); ?></label><br />
4385		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_logged_in_users" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="logged_in_users"<?php checked( 'logged_in_users' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_logged_in_users"><?php esc_html_e( 'Only logged in users can see the site', 'authorizer' ); ?></label><br />
4386		- <?php
	3598	+ ?><input type="radio" id="radio_auth_settings_<?php echo $option; ?>_everyone" name="auth_settings[<?php echo $option; ?>]" value="everyone"<?php checked( 'everyone' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_everyone"><?php _e( 'Everyone can see the site', 'authorizer' ); ?></label><br />
	3599	+ <input type="radio" id="radio_auth_settings_<?php echo $option; ?>_logged_in_users" name="auth_settings[<?php echo $option; ?>]" value="logged_in_users"<?php checked( 'logged_in_users' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_logged_in_users"><?php _e( 'Only logged in users can see the site', 'authorizer' ); ?></label><br /><?php
4387	3600	}
4388	3601
4389	3602
4390		- /**
4391		- * Settings print callback.
4392		- *
4393		- * @param string $args Args (e.g., multisite admin mode).
4394		- * @return void
4395		- */
4396		- public function print_radio_auth_access_redirect( $args = '' ) {
	3603	+ function print_radio_auth_access_redirect( $args = '' ) {
4397	3604	// Get plugin option.
4398		- $option = 'access_redirect';
	3605	+ $option = 'access_redirect';
4399	3606	$auth_settings_option = $this->get_plugin_option( $option );
4400	3607
4401	3608	// Print option elements.
4402		- ?>
4403		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_to_login" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="login"<?php checked( 'login' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_to_login"><?php esc_html_e( 'Send them to the login screen', 'authorizer' ); ?></label><br />
4404		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_to_message" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="message"<?php checked( 'message' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_to_message"><?php esc_html_e( 'Show them the anonymous access message (below)', 'authorizer' ); ?></label>
4405		- <?php
	3609	+ ?><input type="radio" id="radio_auth_settings_<?php echo $option; ?>_to_login" name="auth_settings[<?php echo $option; ?>]" value="login"<?php checked( 'login' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_to_login"><?php _e( 'Send them to the login screen', 'authorizer' ); ?></label><br />
	3610	+ <input type="radio" id="radio_auth_settings_<?php echo $option; ?>_to_message" name="auth_settings[<?php echo $option; ?>]" value="message"<?php checked( 'message' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_to_message"><?php _e( 'Show them the anonymous access message (below)', 'authorizer' ); ?></label><?php
4406	3611	}
4407	3612
4408	3613
4409		- /**
4410		- * Settings print callback.
4411		- *
4412		- * @param string $args Args (e.g., multisite admin mode).
4413		- * @return void
4414		- */
4415		- public function print_radio_auth_access_public_warning( $args = '' ) {
	3614	+ function print_radio_auth_access_public_warning( $args = '' ) {
4416	3615	// Get plugin option.
4417		- $option = 'access_public_warning';
	3616	+ $option = 'access_public_warning';
4418	3617	$auth_settings_option = $this->get_plugin_option( $option );
4419	3618
4420	3619	// Print option elements.
4421		- ?>
4422		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_no" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="no_warning"<?php checked( 'no_warning' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_no"><?php echo wp_kses( __( 'Show them the page <strong>without</strong> the anonymous access message', 'authorizer' ), $this->allowed_html ); ?></label><br />
4423		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="warning"<?php checked( 'warning' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>"><?php echo wp_kses( __( 'Show them the page <strong>with</strong> the anonymous access message (marked up as a <a href="http://getbootstrap.com/components/#alerts-dismissible" target="_blank">Bootstrap Dismissible Alert</a>)', 'authorizer' ), $this->allowed_html ); ?></label>
4424		- <?php
	3620	+ ?><input type="radio" id="radio_auth_settings_<?php echo $option; ?>_no" name="auth_settings[<?php echo $option; ?>]" value="no_warning"<?php checked( 'no_warning' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_no"><?php _e( 'Show them the page <strong>without</strong> the anonymous access message', 'authorizer' ); ?></label><br />
	3621	+ <input type="radio" id="radio_auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="warning"<?php checked( 'warning' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>"><?php _e( 'Show them the page <strong>with</strong> the anonymous access message (marked up as a <a href="http://getbootstrap.com/components/#alerts-dismissible" target="_blank">Bootstrap Dismissible Alert</a>)', 'authorizer' ); ?></label><?php
4425	3622	}
4426	3623
4427	3624
4428		- /**
4429		- * Settings print callback.
4430		- *
4431		- * @param string $args Args (e.g., multisite admin mode).
4432		- * @return void
4433		- */
4434		- public function print_wysiwyg_auth_access_redirect_to_message( $args = '' ) {
	3625	+ function print_wysiwyg_auth_access_redirect_to_message( $args = '' ) {
4435	3626	// Get plugin option.
4436		- $option = 'access_redirect_to_message';
	3627	+ $option = 'access_redirect_to_message';
4437	3628	$auth_settings_option = $this->get_plugin_option( $option );
4438	3629
4439	3630	// Print option elements.
4440	3631	wp_editor(
		@@ -4443,25 +3634,19 @@
4443	3634	array(
4444	3635	'media_buttons' => false,
4445	3636	'textarea_name' => "auth_settings[$option]",
4446	3637	'textarea_rows' => 5,
4447		- 'tinymce' => true,
4448		- 'teeny' => true,
4449		- 'quicktags' => false,
	3638	+ 'tinymce' => true,
	3639	+ 'teeny' => true,
	3640	+ 'quicktags' => false,
4450	3641	)
4451	3642	);
4452	3643	}
4453	3644
4454	3645
4455		- /**
4456		- * Settings print callback.
4457		- *
4458		- * @param string $args Args (e.g., multisite admin mode).
4459		- * @return void
4460		- */
4461		- public function print_multiselect_auth_access_public_pages( $args = '' ) {
	3646	+ function print_multiselect_auth_access_public_pages( $args = '' ) {
4462	3647	// Get plugin option.
4463		- $option = 'access_public_pages';
	3648	+ $option = 'access_public_pages';
4464	3649	$auth_settings_option = $this->get_plugin_option( $option );
4465	3650	$auth_settings_option = is_array( $auth_settings_option ) ? $auth_settings_option : array();
4466	3651
4467	3652	$post_types = array_merge( array( 'page', 'post' ), get_post_types( array( '_builtin' => false ), 'names' ) );
		@@ -4467,31 +3652,23 @@
4467	3652	$post_types = array_merge( array( 'page', 'post' ), get_post_types( array( '_builtin' => false ), 'names' ) );
4468	3653	$post_types = is_array( $post_types ) ? $post_types : array();
4469	3654
4470	3655	// Print option elements.
4471		- ?>
4472		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>" multiple="multiple" name="auth_settings[<?php echo esc_attr( $option ); ?>][]">
4473		- <optgroup label="<?php esc_attr_e( 'Home', 'authorizer' ); ?>">
4474		- <option value="home" <?php selected( in_array( 'home', $auth_settings_option, true ) ); ?>><?php esc_html_e( 'Home Page', 'authorizer' ); ?></option>
4475		- <option value="auth_public_404" <?php selected( in_array( 'auth_public_404', $auth_settings_option, true ) ); ?>><?php esc_html_e( 'Nonexistent (404) Pages', 'authorizer' ); ?></option>
	3656	+ ?><select id="auth_settings_<?php echo $option; ?>" multiple="multiple" name="auth_settings[<?php echo $option; ?>][]">
	3657	+ <optgroup label="<?php _e( 'Home', 'authorizer' ); ?>">
	3658	+ <option value="home" <?php echo in_array( 'home', $auth_settings_option ) ? 'selected="selected"' : ''; ?>><?php _e( 'Home Page', 'authorizer' ); ?></option>
	3659	+ <option value="auth_public_404" <?php echo in_array( 'auth_public_404', $auth_settings_option ) ? 'selected="selected"' : ''; ?>><?php _e( 'Nonexistent (404) Pages', 'authorizer' ); ?></option>
4476	3660	</optgroup>
4477		- <?php foreach ( $post_types as $post_type ) : ?>
4478		- <optgroup label="<?php echo esc_attr( ucfirst( $post_type ) ); ?>">
4479		- <?php
4480		- $pages = get_posts(
4481		- array(
4482		- 'post_type' => $post_type,
4483		- 'posts_per_page' => 1000, // phpcs:ignore WordPress.VIP.PostsPerPage.posts_per_page_posts_per_page
4484		- )
4485		- );
4486		- $pages = is_array( $pages ) ? $pages : array();
4487		- foreach ( $pages as $page ) :
4488		- ?>
4489		- <option value="<?php echo esc_attr( $page->ID ); ?>" <?php selected( in_array( strval( $page->ID ), $auth_settings_option, true ) ); ?>><?php echo esc_html( $page->post_title ); ?></option>
	3661	+ <?php foreach ( $post_types as $post_type ): ?>
	3662	+ <optgroup label="<?php echo ucfirst( $post_type ); ?>">
	3663	+ <?php $pages = get_posts( array( 'post_type' => $post_type, 'posts_per_page' => -1 ) ); ?>
	3664	+ <?php $pages = is_array( $pages ) ? $pages : array(); ?>
	3665	+ <?php foreach ( $pages as $page ): ?>
	3666	+ <option value="<?php echo $page->ID; ?>" <?php echo in_array( $page->ID, $auth_settings_option ) ? 'selected="selected"' : ''; ?>><?php echo $page->post_title; ?></option>
4490	3667	<?php endforeach; ?>
4491	3668	</optgroup>
4492	3669	<?php endforeach; ?>
4493		- <optgroup label="<?php esc_attr_e( 'Categories', 'authorizer' ); ?>">
	3670	+ <optgroup label="<?php _e( 'Categories', 'authorizer' ); ?>">
4494	3671	<?php
4495	3672	// If sitepress-multilingual-cms plugin is enabled, temporarily disable
4496	3673	// its terms_clauses filter since it conflicts with the category handling.
4497	3674	if ( array_key_exists( 'sitepress', $GLOBALS ) && is_object( $GLOBALS['sitepress'] ) ) {
		@@ -4500,155 +3677,107 @@
4500	3677	add_filter( 'terms_clauses', array( $GLOBALS['sitepress'], 'terms_clauses' ) );
4501	3678	} else {
4502	3679	$categories = get_categories( array( 'hide_empty' => false ) );
4503	3680	}
4504		- foreach ( $categories as $category ) :
4505		- ?>
4506		- <option value="<?php echo esc_attr( 'cat_' . $category->slug ); ?>" <?php selected( in_array( 'cat_' . $category->slug, $auth_settings_option, true ) ); ?>><?php echo esc_html( $category->name ); ?></option>
	3681	+ foreach ( $categories as $category ) : ?>
	3682	+ <option value="<?php echo 'cat_' . $category->slug; ?>" <?php echo in_array( 'cat_' . $category->slug, $auth_settings_option ) ? 'selected="selected"' : ''; ?>><?php echo $category->name; ?></option>
4507	3683	<?php endforeach; ?>
4508	3684	</optgroup>
4509		- </select>
4510		- <?php
	3685	+ </select><?php
4511	3686	}
4512	3687
4513	3688
4514		- /**
4515		- * Settings print callback.
4516		- *
4517		- * @param string $args Args (e.g., multisite admin mode).
4518		- * @return void
4519		- */
4520		- public function print_section_info_external( $args = '' ) {
4521		- ?>
4522		- <div id="section_info_external" class="section_info">
4523		- <p><?php esc_html_e( 'Enter your external server settings below.', 'authorizer' ); ?></p>
4524		- </div>
4525		- <?php
	3689	+ function print_section_info_external( $args = '' ) {
	3690	+ ?><div id="section_info_external" class="section_info">
	3691	+ <p><?php _e( 'Enter your external server settings below.', 'authorizer' ); ?></p>
	3692	+ </div><?php
4526	3693	}
4527	3694
4528	3695
4529		- /**
4530		- * Settings print callback.
4531		- *
4532		- * @param string $args Args (e.g., multisite admin mode).
4533		- * @return void
4534		- */
4535		- public function print_select_auth_access_default_role( $args = '' ) {
	3696	+ function get_admin_mode( $args ) {
	3697	+ if ( is_array( $args ) && array_key_exists( MULTISITE_ADMIN, $args ) && $args[MULTISITE_ADMIN] === true ) {
	3698	+ return MULTISITE_ADMIN;
	3699	+ } else {
	3700	+ return SINGLE_ADMIN;
	3701	+ }
	3702	+ }
	3703	+
	3704	+
	3705	+ function print_select_auth_access_default_role( $args = '' ) {
4536	3706	// Get plugin option.
4537		- $option = 'access_default_role';
	3707	+ $option = 'access_default_role';
4538	3708	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4539	3709
4540	3710	// Print option elements.
4541		- ?>
4542		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]">
	3711	+ ?><select id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]">
4543	3712	<?php wp_dropdown_roles( $auth_settings_option ); ?>
4544		- <option value=""<?php selected( '' === $auth_settings_option ); ?>><?php esc_html_e( '-- None --', 'authorizer' ); ?></option>
4545		- </select>
4546		- <?php
	3713	+ </select><?php
4547	3714	}
4548	3715
4549	3716
4550		- /**
4551		- * Settings print callback.
4552		- *
4553		- * @param string $args Args (e.g., multisite admin mode).
4554		- * @return void
4555		- */
4556		- public function print_checkbox_auth_external_google( $args = '' ) {
	3717	+ function print_checkbox_auth_external_google( $args = '' ) {
4557	3718	// Get plugin option.
4558		- $option = 'google';
	3719	+ $option = 'google';
4559	3720	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4560	3721
4561	3722	// Print option elements.
4562		- ?>
4563		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Enable Google Logins', 'authorizer' ); ?></label>
4564		- <?php
	3723	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Enable Google Logins', 'authorizer' ); ?></label><?php
4565	3724	}
4566	3725
4567	3726
4568		- /**
4569		- * Settings print callback.
4570		- *
4571		- * @param string $args Args (e.g., multisite admin mode).
4572		- * @return void
4573		- */
4574		- public function print_text_google_clientid( $args = '' ) {
	3727	+ function print_text_google_clientid( $args = '' ) {
4575	3728	// Get plugin option.
4576		- $option = 'google_clientid';
	3729	+ $option = 'google_clientid';
4577	3730	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4578	3731
4579	3732	// Print option elements.
4580		- $site_url_parts = wp_parse_url( get_site_url() );
4581		- $site_url_host = $site_url_parts['scheme'] . '://' . $site_url_parts['host'] . '/';
4582		-
4583		- esc_html_e( "If you don't have a Google Client ID and Secret, generate them by following these instructions:", 'authorizer' );
4584		- ?>
	3733	+ $site_url_parts = parse_url( get_site_url() );
	3734	+ $site_url_host = $site_url_parts['scheme'] . '://' . $site_url_parts['host'] . '/';
	3735	+ ?><?php _e( "If you don't have a Google Client ID and Secret, generate them by following these instructions:", 'authorizer' ); ?>
4585	3736	<ol>
4586		- <li><?php echo wp_kses( __( 'Click <strong>Create a Project</strong> on the <a href="https://cloud.google.com/console" target="_blank">Google Developers Console</a>. You can name it whatever you want.', 'authorizer' ), $this->allowed_html ); ?></li>
4587		- <li><?php echo wp_kses( __( 'Within the project, navigate to <em>APIs and Auth</em> &gt; <em>Credentials</em>, then click <strong>Create New Client ID</strong> under OAuth. Use these settings:', 'authorizer' ), $this->allowed_html ); ?>
	3737	+ <li><?php _e( 'Click <strong>Create a Project</strong> on the <a href="https://cloud.google.com/console" target="_blank">Google Developers Console</a>. You can name it whatever you want.', 'authorizer' ); ?></li>
	3738	+ <li><?php _e( 'Within the project, navigate to <em>APIs and Auth</em> &gt; <em>Credentials</em>, then click <strong>Create New Client ID</strong> under OAuth. Use these settings:', 'authorizer' ); ?>
4588	3739	<ul>
4589		- <li><?php echo wp_kses( __( 'Application Type: <strong>Web application</strong>', 'authorizer' ), $this->allowed_html ); ?></li>
4590		- <li><?php esc_html_e( 'Authorized Javascript Origins:', 'authorizer' ); ?> <strong><?php echo esc_html( rtrim( $site_url_host, '/' ) ); ?></strong></li>
4591		- <li><?php echo wp_kses( __( 'Authorized Redirect URI: <em>none</em>', 'authorizer' ), $this->allowed_html ); ?></li>
	3740	+ <li><?php _e( 'Application Type: <strong>Web application</strong>', 'authorizer' ); ?></li>
	3741	+ <li><?php _e( 'Authorized Javascript Origins:', 'authorizer' ); ?> <strong><?php echo rtrim( $site_url_host, '/' ); ?></strong></li>
	3742	+ <li><?php _e( 'Authorized Redirect URI: <em>none</em>', 'authorizer' ); ?></li>
4592	3743	</ul>
4593	3744	</li>
4594		- <li><?php esc_html_e( 'Copy/paste your new Client ID/Secret pair into the fields below.', 'authorizer' ); ?></li>
4595		- <li><?php echo wp_kses( __( '<strong>Note</strong>: Navigate to <em>APIs and Auth</em> &gt; <em>Consent screen</em> to change the way the Google consent screen appears after a user has successfully entered their password, but before they are redirected back to WordPress.', 'authorizer' ), $this->allowed_html ); ?></li>
4596		- <li><?php echo wp_kses( __( 'Note: Google may have a more recent version of these instructions in their <a href="https://developers.google.com/identity/sign-in/web/devconsole-project" target="_blank">developer documentation</a>.', 'authorizer' ), $this->allowed_html ); ?></li>
	3745	+ <li><?php _e( 'Copy/paste your new Client ID/Secret pair into the fields below.', 'authorizer' ); ?></li>
	3746	+ <li><?php _e( '<strong>Note</strong>: Navigate to <em>APIs and Auth</em> &gt; <em>Consent screen</em> to change the way the Google consent screen appears after a user has successfully entered their password, but before they are redirected back to WordPress.', 'authorizer' ); ?></li>
	3747	+ <li><?php _e( 'Note: Google may have a more recent version of these instructions in their <a href="https://developers.google.com/identity/sign-in/web/devconsole-project" target="_blank">developer documentation</a>.', 'authorizer' ); ?></li>
4597	3748	</ol>
4598		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width:560px;" />
4599		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: 1234567890123-kdjr85yt6vjr6d8g7dhr8g7d6durjf7g.apps.googleusercontent.com', 'authorizer' ); ?></label>
4600		- <?php
	3749	+ <input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:560px;" />
	3750	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: 1234567890123-kdjr85yt6vjr6d8g7dhr8g7d6durjf7g.apps.googleusercontent.com', 'authorizer'); ?></label><?php
4601	3751	}
4602	3752
4603	3753
4604		- /**
4605		- * Settings print callback.
4606		- *
4607		- * @param string $args Args (e.g., multisite admin mode).
4608		- * @return void
4609		- */
4610		- public function print_text_google_clientsecret( $args = '' ) {
	3754	+ function print_text_google_clientsecret( $args = '' ) {
4611	3755	// Get plugin option.
4612		- $option = 'google_clientsecret';
	3756	+ $option = 'google_clientsecret';
4613	3757	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4614	3758
4615	3759	// Print option elements.
4616		- ?>
4617		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width:220px;" />
4618		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: sDNgX5_pr_5bly-frKmvp8jT', 'authorizer' ); ?></label>
4619		- <?php
	3760	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:220px;" />
	3761	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: sDNgX5_pr_5bly-frKmvp8jT', 'authorizer'); ?></label><?php
4620	3762	}
4621	3763
4622	3764
4623		- /**
4624		- * Settings print callback.
4625		- *
4626		- * @param string $args Args (e.g., multisite admin mode).
4627		- * @return void
4628		- */
4629		- public function print_text_google_hosteddomain( $args = '' ) {
	3765	+ function print_text_google_hosteddomain( $args = '' ) {
4630	3766	// Get plugin option.
4631		- $option = 'google_hosteddomain';
	3767	+ $option = 'google_hosteddomain';
4632	3768	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4633	3769
4634	3770	// Print option elements.
4635		- ?>
4636		- <textarea id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" placeholder="" style="width:220px;"><?php echo esc_html( $auth_settings_option ); ?></textarea>
4637		- <br /><small><?php esc_html_e( 'Restrict Google logins to a specific Google Apps hosted domain (for example, mycollege.edu). Leave blank to allow all Google sign-ins.', 'authorizer' ); ?><br /><?php esc_html_e( 'If restricting to multiple domains, add one domain per line.', 'authorizer' ); ?></small>
	3771	+ ?><textarea id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" placeholder="" style="width:220px;"><?php echo $auth_settings_option; ?></textarea>
	3772	+ <br /><small><?php _e( 'Restrict Google logins to a specific Google Apps hosted domain (for example, mycollege.edu). Leave blank to allow all Google sign-ins.', 'authorizer' ); ?><br /><?php _e( 'If restricting to multiple domains, add one domain per line.', 'authorizer' ); ?></small>
4638	3773	<?php
4639	3774	}
4640	3775
4641	3776
4642		- /**
4643		- * Settings print callback.
4644		- *
4645		- * @param string $args Args (e.g., multisite admin mode).
4646		- * @return void
4647		- */
4648		- public function print_checkbox_auth_external_cas( $args = '' ) {
	3777	+ function print_checkbox_auth_external_cas( $args = '' ) {
4649	3778	// Get plugin option.
4650		- $option = 'cas';
	3779	+ $option = 'cas';
4651	3780	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4652	3781
4653	3782	// Make sure php5-curl extension is installed on server.
4654	3783	$curl_installed_message = ! function_exists( 'curl_init' ) ? __( '<a href="http://www.php.net//manual/en/curl.installation.php" target="_blank" style="color: red;">PHP CURL extension</a> is not installed', 'authorizer' ) : '';
		@@ -4667,217 +3796,128 @@
4667	3796	')</span>';
4668	3797	}
4669	3798
4670	3799	// Print option elements.
4671		- ?>
4672		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Enable CAS Logins', 'authorizer' ); ?></label> <?php echo wp_kses( $error_message, $this->allowed_html ); ?>
4673		- <?php
	3800	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Enable CAS Logins', 'authorizer' ); ?></label> <?php echo $error_message; ?><?php
4674	3801	}
4675	3802
4676	3803
4677		- /**
4678		- * Settings print callback.
4679		- *
4680		- * @param string $args Args (e.g., multisite admin mode).
4681		- * @return void
4682		- */
4683		- public function print_text_cas_custom_label( $args = '' ) {
	3804	+ function print_text_cas_custom_label( $args = '' ) {
4684	3805	// Get plugin option.
4685		- $option = 'cas_custom_label';
	3806	+ $option = 'cas_custom_label';
4686	3807	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4687	3808
4688	3809	// Print option elements.
4689		- esc_html_e( 'The button on the login page will read:', 'authorizer' );
4690		- ?>
4691		- <p><a class="button-primary button-large" style="padding: 3px 16px; height: 36px;"><span class="dashicons dashicons-lock" style="margin: 4px 4px 0 0;"></span> <strong><?php esc_html_e( 'Sign in with', 'authorizer' ); ?> </strong><input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="CAS" style="width: 100px;" /></a></p>
4692		- <?php
	3810	+ ?><?php _e( 'The button on the login page will read:', 'authorizer' ); ?><p><a class="button-primary button-large" style="padding: 3px 16px; height: 36px;"><span class="dashicons dashicons-lock" style="margin: 4px 4px 0 0;"></span> <strong><?php _e( 'Sign in with', 'authorizer' ); ?> </strong><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="CAS" style="width: 100px;" /></a></p><?php
4693	3811	}
4694	3812
4695	3813
4696		- /**
4697		- * Settings print callback.
4698		- *
4699		- * @param string $args Args (e.g., multisite admin mode).
4700		- * @return void
4701		- */
4702		- public function print_text_cas_host( $args = '' ) {
	3814	+ function print_text_cas_host( $args = '' ) {
4703	3815	// Get plugin option.
4704		- $option = 'cas_host';
	3816	+ $option = 'cas_host';
4705	3817	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4706	3818
4707	3819	// Print option elements.
4708		- ?>
4709		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
4710		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: authn.example.edu', 'authorizer' ); ?></label>
4711		- <?php
	3820	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	3821	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: authn.example.edu', 'authorizer'); ?></label><?php
4712	3822	}
4713	3823
4714	3824
4715		- /**
4716		- * Settings print callback.
4717		- *
4718		- * @param string $args Args (e.g., multisite admin mode).
4719		- * @return void
4720		- */
4721		- public function print_text_cas_port( $args = '' ) {
	3825	+ function print_text_cas_port( $args = '' ) {
4722	3826	// Get plugin option.
4723		- $option = 'cas_port';
	3827	+ $option = 'cas_port';
4724	3828	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4725	3829
4726	3830	// Print option elements.
4727		- ?>
4728		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width:50px;" />
4729		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: 443', 'authorizer' ); ?></label>
4730		- <?php
	3831	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:50px;" />
	3832	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: 443', 'authorizer'); ?></label><?php
4731	3833	}
4732	3834
4733	3835
4734		- /**
4735		- * Settings print callback.
4736		- *
4737		- * @param string $args Args (e.g., multisite admin mode).
4738		- * @return void
4739		- */
4740		- public function print_text_cas_path( $args = '' ) {
	3836	+ function print_text_cas_path( $args = '' ) {
4741	3837	// Get plugin option.
4742		- $option = 'cas_path';
	3838	+ $option = 'cas_path';
4743	3839	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4744	3840
4745	3841	// Print option elements.
4746		- ?>
4747		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
4748		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: /cas', 'authorizer' ); ?></label>
4749		- <?php
	3842	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	3843	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: /cas', 'authorizer'); ?></label><?php
4750	3844	}
4751	3845
4752	3846
4753		- /**
4754		- * Settings print callback.
4755		- *
4756		- * @param string $args Args (e.g., multisite admin mode).
4757		- * @return void
4758		- */
4759		- public function print_select_cas_version( $args = '' ) {
	3847	+ function print_select_cas_version( $args = '' ) {
4760	3848	// Get plugin option.
4761		- $option = 'cas_version';
	3849	+ $option = 'cas_version';
4762	3850	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4763	3851
4764	3852	// Print option elements.
4765		- ?>
4766		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]">
	3853	+ ?><select id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]">
4767	3854	<option value="SAML_VERSION_1_1" <?php selected( $auth_settings_option, 'SAML_VERSION_1_1' ); ?>>SAML_VERSION_1_1</option>
4768	3855	<option value="CAS_VERSION_3_0" <?php selected( $auth_settings_option, 'CAS_VERSION_3_0' ); ?>>CAS_VERSION_3_0</option>
4769	3856	<option value="CAS_VERSION_2_0" <?php selected( $auth_settings_option, 'CAS_VERSION_2_0' ); ?>>CAS_VERSION_2_0</option>
4770	3857	<option value="CAS_VERSION_1_0" <?php selected( $auth_settings_option, 'CAS_VERSION_1_0' ); ?>>CAS_VERSION_1_0</option>
4771		- </select>
4772		- <?php
	3858	+ </select><?php
4773	3859	}
4774	3860
4775	3861
4776		- /**
4777		- * Settings print callback.
4778		- *
4779		- * @param string $args Args (e.g., multisite admin mode).
4780		- * @return void
4781		- */
4782		- public function print_text_cas_attr_email( $args = '' ) {
	3862	+ function print_text_cas_attr_email( $args = '' ) {
4783	3863	// Get plugin option.
4784		- $option = 'cas_attr_email';
	3864	+ $option = 'cas_attr_email';
4785	3865	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4786	3866
4787	3867	// Print option elements.
4788		- ?>
4789		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
4790		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: mail', 'authorizer' ); ?></label>
4791		- <br /><small><?php echo wp_kses( __( "Note: If your CAS server doesn't return an attribute containing an email, you can specify the @domain portion of the email address here, and the email address will be constructed from it and the username. For example, if user 'bob' logs in and his email address should be bob@example.edu, then enter <strong>@example.edu</strong> in this field.", 'authorizer' ), $this->allowed_html ); ?></small>
4792		- <?php
	3868	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	3869	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: mail', 'authorizer'); ?></label>
	3870	+ <br /><small><?php _e( "Note: If your CAS server doesn't return an attribute containing an email, you can specify the @domain portion of the email address here, and the email address will be constructed from it and the username. For example, if user 'bob' logs in and his email address should be bob@example.edu, then enter <strong>@example.edu</strong> in this field.", 'authorizer' ); ?></small><?php
4793	3871	}
4794	3872
4795	3873
4796		- /**
4797		- * Settings print callback.
4798		- *
4799		- * @param string $args Args (e.g., multisite admin mode).
4800		- * @return void
4801		- */
4802		- public function print_text_cas_attr_first_name( $args = '' ) {
	3874	+ function print_text_cas_attr_first_name( $args = '' ) {
4803	3875	// Get plugin option.
4804		- $option = 'cas_attr_first_name';
	3876	+ $option = 'cas_attr_first_name';
4805	3877	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4806	3878
4807	3879	// Print option elements.
4808		- ?>
4809		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
4810		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: givenName', 'authorizer' ); ?></label>
4811		- <?php
	3880	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	3881	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: givenName', 'authorizer'); ?></label><?php
4812	3882	}
4813	3883
4814	3884
4815		- /**
4816		- * Settings print callback.
4817		- *
4818		- * @param string $args Args (e.g., multisite admin mode).
4819		- * @return void
4820		- */
4821		- public function print_text_cas_attr_last_name( $args = '' ) {
	3885	+ function print_text_cas_attr_last_name( $args = '' ) {
4822	3886	// Get plugin option.
4823		- $option = 'cas_attr_last_name';
	3887	+ $option = 'cas_attr_last_name';
4824	3888	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4825	3889
4826	3890	// Print option elements.
4827		- ?>
4828		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
4829		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: sn', 'authorizer' ); ?></label>
4830		- <?php
	3891	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	3892	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: sn', 'authorizer'); ?></label><?php
4831	3893	}
4832	3894
4833	3895
4834		- /**
4835		- * Settings print callback.
4836		- *
4837		- * @param string $args Args (e.g., multisite admin mode).
4838		- * @return void
4839		- */
4840		- public function print_checkbox_cas_attr_update_on_login( $args = '' ) {
	3896	+ function print_checkbox_cas_attr_update_on_login( $args = '' ) {
4841	3897	// Get plugin option.
4842		- $option = 'cas_attr_update_on_login';
	3898	+ $option = 'cas_attr_update_on_login';
4843	3899	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4844	3900
4845	3901	// Print option elements.
4846		- ?>
4847		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Update first and last name fields on login (will overwrite any name the user has supplied in their profile)', 'authorizer' ); ?></label>
4848		- <?php
	3902	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Update first and last name fields on login (will overwrite any name the user has supplied in their profile)', 'authorizer' ); ?></label><?php
4849	3903	}
4850	3904
4851	3905
4852		- /**
4853		- * Settings print callback.
4854		- *
4855		- * @param string $args Args (e.g., multisite admin mode).
4856		- * @return void
4857		- */
4858		- public function print_checkbox_cas_auto_login( $args = '' ) {
	3906	+ function print_checkbox_cas_auto_login( $args = '' ) {
4859	3907	// Get plugin option.
4860		- $option = 'cas_auto_login';
	3908	+ $option = 'cas_auto_login';
4861	3909	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4862	3910
4863	3911	// Print option elements.
4864		- ?>
4865		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( "Immediately redirect to CAS login form if it's the only enabled external service and WordPress logins are hidden", 'authorizer' ); ?></label>
4866		- <p><small><?php esc_html_e( 'Note: This feature will only work if you have checked "Hide WordPress Logins" in Advanced settings, and if CAS is the only enabled service (i.e., no Google or LDAP). If you have enabled CAS Single Sign-On (SSO), and a user has already logged into CAS elsewhere, enabling this feature will allow automatic logins without any user interaction.', 'authorizer' ); ?></small></p>
4867		- <?php
	3912	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( "Immediately redirect to CAS login form if it's the only enabled external service and WordPress logins are hidden", 'authorizer' ); ?></label>
	3913	+ <p><small><?php _e( 'Note: This feature will only work if you have checked "Hide WordPress Logins" in Advanced settings, and if CAS is the only enabled service (i.e., no Google or LDAP). If you have enabled CAS Single Sign-On (SSO), and a user has already logged into CAS elsewhere, enabling this feature will allow automatic logins without any user interaction.', 'authorizer' ); ?></small></p><?php
4868	3914	}
4869	3915
4870	3916
4871		- /**
4872		- * Settings print callback.
4873		- *
4874		- * @param string $args Args (e.g., multisite admin mode).
4875		- * @return void
4876		- */
4877		- public function print_checkbox_auth_external_ldap( $args = '' ) {
	3917	+ function print_checkbox_auth_external_ldap( $args = '' ) {
4878	3918	// Get plugin option.
4879		- $option = 'ldap';
	3919	+ $option = 'ldap';
4880	3920	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4881	3921
4882	3922	// Make sure php5-ldap extension is installed on server.
4883	3923	$ldap_installed_message = ! function_exists( 'ldap_connect' ) ? '<span style="color: red;">(' . __( 'Warning: <a href="http://www.php.net/manual/en/ldap.installation.php" target="_blank" style="color: red;">PHP LDAP extension</a> is <strong>not</strong> installed', 'authorizer' ) . ')</span>' : '';
		@@ -4882,324 +3922,193 @@
4882	3922	// Make sure php5-ldap extension is installed on server.
4883	3923	$ldap_installed_message = ! function_exists( 'ldap_connect' ) ? '<span style="color: red;">(' . __( 'Warning: <a href="http://www.php.net/manual/en/ldap.installation.php" target="_blank" style="color: red;">PHP LDAP extension</a> is <strong>not</strong> installed', 'authorizer' ) . ')</span>' : '';
4884	3924
4885	3925	// Print option elements.
4886		- ?>
4887		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Enable LDAP Logins', 'authorizer' ); ?></label> <?php echo wp_kses( $ldap_installed_message, $this->allowed_html ); ?>
4888		- <?php
	3926	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Enable LDAP Logins', 'authorizer' ); ?></label> <?php echo $ldap_installed_message; ?><?php
4889	3927	}
4890	3928
4891	3929
4892		- /**
4893		- * Settings print callback.
4894		- *
4895		- * @param string $args Args (e.g., multisite admin mode).
4896		- * @return void
4897		- */
4898		- public function print_text_ldap_host( $args = '' ) {
	3930	+ function print_text_ldap_host( $args = '' ) {
4899	3931	// Get plugin option.
4900		- $option = 'ldap_host';
	3932	+ $option = 'ldap_host';
4901	3933	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4902	3934
4903	3935	// Print option elements.
4904		- ?>
4905		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width:330px;" />
4906		- <br /><small><?php esc_html_e( 'Specify either a hostname (for example, ldap.example.edu) or a full LDAP URI (for example, ldaps://ldap.example.edu:636).', 'authorizer' ); ?></small>
4907		- <?php
	3936	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:330px;" />
	3937	+ <br /><small><?php _e( "Specify either a hostname (for example, ldap.example.edu) or a full LDAP URI (for example, ldaps://ldap.example.edu:636).", 'authorizer' ); ?></small><?php
4908	3938	}
4909	3939
4910	3940
4911		- /**
4912		- * Settings print callback.
4913		- *
4914		- * @param string $args Args (e.g., multisite admin mode).
4915		- * @return void
4916		- */
4917		- public function print_text_ldap_port( $args = '' ) {
	3941	+ function print_text_ldap_port( $args = '' ) {
4918	3942	// Get plugin option.
4919		- $option = 'ldap_port';
	3943	+ $option = 'ldap_port';
4920	3944	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4921	3945
4922	3946	// Print option elements.
4923		- ?>
4924		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width:50px;" />
4925		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: 389', 'authorizer' ); ?></label>
4926		- <br /><small><?php esc_html_e( 'If a full LDAP URI (ldaps://hostname:port) is specified above, this field is ignored.', 'authorizer' ); ?></small>
4927		- <?php
	3947	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:50px;" />
	3948	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: 389', 'authorizer' ); ?></label>
	3949	+ <br /><small><?php _e( "If a full LDAP URI (ldaps://hostname:port) is specified above, this field is ignored.", 'authorizer' ); ?></small><?php
4928	3950	}
4929	3951
4930	3952
4931		- /**
4932		- * Settings print callback.
4933		- *
4934		- * @param string $args Args (e.g., multisite admin mode).
4935		- * @return void
4936		- */
4937		- public function print_checkbox_ldap_tls( $args = '' ) {
	3953	+ function print_checkbox_ldap_tls( $args = '' ) {
4938	3954	// Get plugin option.
4939		- $option = 'ldap_tls';
	3955	+ $option = 'ldap_tls';
4940	3956	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4941	3957
4942	3958	// Print option elements.
4943		- ?>
4944		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Use TLS', 'authorizer' ); ?></label>
4945		- <br /><small><?php esc_html_e( 'If ldaps is used, this should be unchecked', 'authorizer' ); ?></small>
4946		- <?php
	3959	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Use TLS', 'authorizer' ); ?></label><?php
4947	3960	}
4948	3961
4949	3962
4950		- /**
4951		- * Settings print callback.
4952		- *
4953		- * @param string $args Args (e.g., multisite admin mode).
4954		- * @return void
4955		- */
4956		- public function print_text_ldap_search_base( $args = '' ) {
	3963	+ function print_text_ldap_search_base( $args = '' ) {
4957	3964	// Get plugin option.
4958		- $option = 'ldap_search_base';
	3965	+ $option = 'ldap_search_base';
4959	3966	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4960	3967
4961	3968	// Print option elements.
4962		- ?>
4963		- <textarea id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" placeholder="" style="width:330px;"><?php echo esc_attr( $auth_settings_option ); ?></textarea>
4964		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: ou=people,dc=example,dc=edu', 'authorizer' ); ?></label>
4965		- <br /><small><?php esc_html_e( 'If you have multiple search bases, separate them by newlines (one per line).', 'authorizer' ); ?></small>
4966		- <?php
	3969	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:330px;" />
	3970	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: ou=people,dc=example,dc=edu', 'authorizer'); ?></label><?php
4967	3971	}
4968	3972
4969	3973
4970		- /**
4971		- * Settings print callback.
4972		- *
4973		- * @param string $args Args (e.g., multisite admin mode).
4974		- * @return void
4975		- */
4976		- public function print_text_ldap_uid( $args = '' ) {
	3974	+ function print_text_ldap_uid( $args = '' ) {
4977	3975	// Get plugin option.
4978		- $option = 'ldap_uid';
	3976	+ $option = 'ldap_uid';
4979	3977	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4980	3978
4981	3979	// Print option elements.
4982		- ?>
4983		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width:80px;" />
4984		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: uid', 'authorizer' ); ?></label>
4985		- <?php
	3980	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:80px;" />
	3981	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: uid', 'authorizer' ); ?></label><?php
4986	3982	}
4987	3983
4988	3984
4989		- /**
4990		- * Settings print callback.
4991		- *
4992		- * @param string $args Args (e.g., multisite admin mode).
4993		- * @return void
4994		- */
4995		- public function print_text_ldap_attr_email( $args = '' ) {
	3985	+ function print_text_ldap_attr_email( $args = '' ) {
4996	3986	// Get plugin option.
4997		- $option = 'ldap_attr_email';
	3987	+ $option = 'ldap_attr_email';
4998	3988	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
4999	3989
5000	3990	// Print option elements.
5001		- ?>
5002		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
5003		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: mail', 'authorizer' ); ?></label>
5004		- <br /><small><?php echo wp_kses( __( "Note: If your LDAP server doesn't return an attribute containing an email, you can specify the @domain portion of the email address here, and the email address will be constructed from it and the username. For example, if user 'bob' logs in and his email address should be bob@example.edu, then enter <strong>@example.edu</strong> in this field.", 'authorizer' ), $this->allowed_html ); ?></small>
5005		- <?php
	3991	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	3992	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: mail', 'authorizer' ); ?></label>
	3993	+ <br /><small><?php _e( "Note: If your LDAP server doesn't return an attribute containing an email, you can specify the @domain portion of the email address here, and the email address will be constructed from it and the username. For example, if user 'bob' logs in and his email address should be bob@example.edu, then enter <strong>@example.edu</strong> in this field.", 'authorizer' ); ?></small><?php
5006	3994	}
5007	3995
5008	3996
5009		- /**
5010		- * Settings print callback.
5011		- *
5012		- * @param string $args Args (e.g., multisite admin mode).
5013		- * @return void
5014		- */
5015		- public function print_text_ldap_user( $args = '' ) {
	3997	+ function print_text_ldap_user( $args = '' ) {
5016	3998	// Get plugin option.
5017		- $option = 'ldap_user';
	3999	+ $option = 'ldap_user';
5018	4000	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5019	4001
5020	4002	// Print option elements.
5021		- ?>
5022		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width:330px;" />
5023		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: cn=directory-user,ou=specials,dc=example,dc=edu', 'authorizer' ); ?></label>
5024		- <?php
	4003	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width:330px;" />
	4004	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: cn=directory-user,ou=specials,dc=example,dc=edu', 'authorizer' ); ?></label><?php
5025	4005	}
5026	4006
5027	4007
5028		- /**
5029		- * Settings print callback.
5030		- *
5031		- * @param string $args Args (e.g., multisite admin mode).
5032		- * @return void
5033		- */
5034		- public function print_password_ldap_password( $args = '' ) {
	4008	+ function print_password_ldap_password( $args = '' ) {
5035	4009	// Get plugin option.
5036		- $option = 'ldap_password';
	4010	+ $option = 'ldap_password';
5037	4011	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5038	4012
5039	4013	// Print option elements.
5040		- ?>
5041		- <input type="password" id="garbage_to_stop_autofill" name="garbage" value="" autocomplete="off" style="display:none;" />
5042		- <input type="password" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $this->decrypt( $auth_settings_option ) ); ?>" autocomplete="off" />
5043		- <?php
	4014	+ ?><input type="password" id="garbage_to_stop_autofill" name="garbage" value="" autocomplete="off" style="display:none;" />
	4015	+ <input type="password" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $this->decrypt( $auth_settings_option ); ?>" autocomplete="off" /><?php
5044	4016	}
5045	4017
5046	4018
5047		- /**
5048		- * Settings print callback.
5049		- *
5050		- * @param string $args Args (e.g., multisite admin mode).
5051		- * @return void
5052		- */
5053		- public function print_text_ldap_lostpassword_url( $args = '' ) {
	4019	+ function print_text_ldap_lostpassword_url( $args = '' ) {
5054	4020	// Get plugin option.
5055		- $option = 'ldap_lostpassword_url';
	4021	+ $option = 'ldap_lostpassword_url';
5056	4022	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5057	4023
5058	4024	// Print option elements.
5059		- ?>
5060		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" style="width: 400px;" />
5061		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: https://myschool.example.edu:8888/am-forgot-password', 'authorizer' ); ?></label>
5062		- <?php
	4025	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" style="width: 400px;" />
	4026	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: https://myschool.example.edu:8888/am-forgot-password', 'authorizer' ); ?></label><?php
5063	4027	}
5064	4028
5065	4029
5066		- /**
5067		- * Settings print callback.
5068		- *
5069		- * @param string $args Args (e.g., multisite admin mode).
5070		- * @return void
5071		- */
5072		- public function print_text_ldap_attr_first_name( $args = '' ) {
	4030	+ function print_text_ldap_attr_first_name( $args = '' ) {
5073	4031	// Get plugin option.
5074		- $option = 'ldap_attr_first_name';
	4032	+ $option = 'ldap_attr_first_name';
5075	4033	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5076	4034
5077	4035	// Print option elements.
5078		- ?>
5079		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
5080		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: givenname', 'authorizer' ); ?></label>
5081		- <?php
	4036	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	4037	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: givenname', 'authorizer' ); ?></label><?php
5082	4038	}
5083	4039
5084	4040
5085		- /**
5086		- * Settings print callback.
5087		- *
5088		- * @param string $args Args (e.g., multisite admin mode).
5089		- * @return void
5090		- */
5091		- public function print_text_ldap_attr_last_name( $args = '' ) {
	4041	+ function print_text_ldap_attr_last_name( $args = '' ) {
5092	4042	// Get plugin option.
5093		- $option = 'ldap_attr_last_name';
	4043	+ $option = 'ldap_attr_last_name';
5094	4044	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5095	4045
5096	4046	// Print option elements.
5097		- ?>
5098		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" />
5099		- <br /><label for="auth_settings_<?php echo esc_attr( $option ); ?>" class="helper"><?php esc_html_e( 'Example: sn', 'authorizer' ); ?></label>
5100		- <?php
	4047	+ ?><input type="text" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $auth_settings_option; ?>" placeholder="" />
	4048	+ <br /><label for="auth_settings_<?php echo $option; ?>" class="helper"><?php _e( 'Example: sn', 'authorizer' ); ?></label><?php
5101	4049	}
5102	4050
5103	4051
5104		- /**
5105		- * Settings print callback.
5106		- *
5107		- * @param string $args Args (e.g., multisite admin mode).
5108		- * @return void
5109		- */
5110		- public function print_checkbox_ldap_attr_update_on_login( $args = '' ) {
	4052	+ function print_checkbox_ldap_attr_update_on_login( $args = '' ) {
5111	4053	// Get plugin option.
5112		- $option = 'ldap_attr_update_on_login';
	4054	+ $option = 'ldap_attr_update_on_login';
5113	4055	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5114	4056
5115	4057	// Print option elements.
5116		- ?>
5117		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Update first and last name fields on login (will overwrite any name the user has supplied in their profile)', 'authorizer' ); ?></label>
5118		- <?php
	4058	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Update first and last name fields on login (will overwrite any name the user has supplied in their profile)', 'authorizer' ); ?></label><?php
5119	4059	}
5120	4060
5121	4061
5122		- /**
5123		- * Settings print callback.
5124		- *
5125		- * @param string $args Args (e.g., multisite admin mode).
5126		- * @return void
5127		- */
5128		- public function print_section_info_advanced( $args = '' ) {
5129		- ?>
5130		- <div id="section_info_advanced" class="section_info">
5131		- <p><?php esc_html_e( 'You may optionally specify some advanced settings below.', 'authorizer' ); ?></p>
5132		- </div>
5133		- <?php
	4062	+ function print_section_info_advanced( $args = '' ) {
	4063	+ ?><div id="section_info_advanced" class="section_info">
	4064	+ <p><?php _e( 'You may optionally specify some advanced settings below.', 'authorizer' ); ?></p>
	4065	+ </div><?php
5134	4066	}
5135	4067
5136	4068
5137		- /**
5138		- * Settings print callback.
5139		- *
5140		- * @param string $args Args (e.g., multisite admin mode).
5141		- * @return void
5142		- */
5143		- public function print_text_auth_advanced_lockouts( $args = '' ) {
	4069	+ function print_text_auth_advanced_lockouts( $args = '' ) {
5144	4070	// Get plugin option.
5145		- $option = 'advanced_lockouts';
	4071	+ $option = 'advanced_lockouts';
5146	4072	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5147	4073
5148	4074	// Print option elements.
5149		- esc_html_e( 'After', 'authorizer' );
5150		- ?>
5151		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_attempts_1" name="auth_settings[<?php echo esc_attr( $option ); ?>][attempts_1]" value="<?php echo esc_attr( $auth_settings_option['attempts_1'] ); ?>" placeholder="10" style="width:30px;" />
5152		- <?php esc_html_e( 'invalid password attempts, delay further attempts on that user for', 'authorizer' ); ?>
5153		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_duration_1" name="auth_settings[<?php echo esc_attr( $option ); ?>][duration_1]" value="<?php echo esc_attr( $auth_settings_option['duration_1'] ); ?>" placeholder="1" style="width:30px;" />
5154		- <?php esc_html_e( 'minute(s).', 'authorizer' ); ?>
	4075	+ ?><?php _e( 'After', 'authorizer' ); ?>
	4076	+ <input type="text" id="auth_settings_<?php echo $option; ?>_attempts_1" name="auth_settings[<?php echo $option; ?>][attempts_1]" value="<?php echo $auth_settings_option['attempts_1']; ?>" placeholder="10" style="width:30px;" />
	4077	+ <?php _e( 'invalid password attempts, delay further attempts on that user for', 'authorizer' ); ?>
	4078	+ <input type="text" id="auth_settings_<?php echo $option; ?>_duration_1" name="auth_settings[<?php echo $option; ?>][duration_1]" value="<?php echo $auth_settings_option['duration_1']; ?>" placeholder="1" style="width:30px;" />
	4079	+ <?php _e( 'minute(s).', 'authorizer' ); ?>
5155	4080	<br />
5156		- <?php esc_html_e( 'After', 'authorizer' ); ?>
5157		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_attempts_2" name="auth_settings[<?php echo esc_attr( $option ); ?>][attempts_2]" value="<?php echo esc_attr( $auth_settings_option['attempts_2'] ); ?>" placeholder="10" style="width:30px;" />
5158		- <?php esc_html_e( 'more invalid attempts, increase the delay to', 'authorizer' ); ?>
5159		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_duration_2" name="auth_settings[<?php echo esc_attr( $option ); ?>][duration_2]" value="<?php echo esc_attr( $auth_settings_option['duration_2'] ); ?>" placeholder="10" style="width:30px;" />
5160		- <?php esc_html_e( 'minutes.', 'authorizer' ); ?>
	4081	+ <?php _e( 'After', 'authorizer' ); ?>
	4082	+ <input type="text" id="auth_settings_<?php echo $option; ?>_attempts_2" name="auth_settings[<?php echo $option; ?>][attempts_2]" value="<?php echo $auth_settings_option['attempts_2']; ?>" placeholder="10" style="width:30px;" />
	4083	+ <?php _e( 'more invalid attempts, increase the delay to', 'authorizer' ); ?>
	4084	+ <input type="text" id="auth_settings_<?php echo $option; ?>_duration_2" name="auth_settings[<?php echo $option; ?>][duration_2]" value="<?php echo $auth_settings_option['duration_2']; ?>" placeholder="10" style="width:30px;" />
	4085	+ <?php _e( 'minutes.', 'authorizer' ); ?>
5161	4086	<br />
5162		- <?php esc_html_e( 'Reset the delays after', 'authorizer' ); ?>
5163		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>_reset_duration" name="auth_settings[<?php echo esc_attr( $option ); ?>][reset_duration]" value="<?php echo esc_attr( $auth_settings_option['reset_duration'] ); ?>" placeholder="240" style="width:40px;" />
5164		- <?php esc_html_e( 'minutes with no invalid attempts.', 'authorizer' ); ?>
5165		- <?php
	4087	+ <?php _e( 'Reset the delays after', 'authorizer' ); ?>
	4088	+ <input type="text" id="auth_settings_<?php echo $option; ?>_reset_duration" name="auth_settings[<?php echo $option; ?>][reset_duration]" value="<?php echo $auth_settings_option['reset_duration']; ?>" placeholder="240" style="width:40px;" />
	4089	+ <?php _e( 'minutes with no invalid attempts.', 'authorizer' ); ?><?php
5166	4090	}
5167	4091
5168	4092
5169		- /**
5170		- * Settings print callback.
5171		- *
5172		- * @param string $args Args (e.g., multisite admin mode).
5173		- * @return void
5174		- */
5175		- public function print_checkbox_auth_advanced_hide_wp_login( $args = '' ) {
	4093	+ function print_checkbox_auth_advanced_hide_wp_login( $args = '' ) {
5176	4094	// Get plugin option.
5177		- $option = 'advanced_hide_wp_login';
	4095	+ $option = 'advanced_hide_wp_login';
5178	4096	$auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5179	4097
5180	4098	// Print option elements.
5181		- ?>
5182		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Hide WordPress Logins', 'authorizer' ); ?></label>
5183		- <p><small><?php esc_html_e( 'Note: You can always access the WordPress logins by adding external=wordpress to the wp-login URL, like so:', 'authorizer' ); ?><br /><a href="<?php echo esc_attr( wp_login_url() ); ?>?external=wordpress" target="_blank"><?php echo esc_html( wp_login_url() ); ?>?external=wordpress</a>.</p>
5184		- <?php
	4099	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( 'Hide WordPress Logins', 'authorizer' ); ?></label>
	4100	+ <p><small><?php _e( 'Note: You can always access the WordPress logins by adding external=wordpress to the wp-login URL, like so:', 'authorizer' ); ?><br /><a href="<?php echo wp_login_url(); ?>?external=wordpress" target="_blank"><?php echo wp_login_url(); ?>?external=wordpress</a>.</p><?php
5185	4101	}
5186	4102
5187	4103
5188		- /**
5189		- * Settings print callback.
5190		- *
5191		- * @param string $args Args (e.g., multisite admin mode).
5192		- * @return void
5193		- */
5194		- public function print_radio_auth_advanced_branding( $args = '' ) {
	4104	+ function print_radio_auth_advanced_branding( $args = '' ) {
5195	4105	// Get plugin option.
5196		- $option = 'advanced_branding';
	4106	+ $option = 'advanced_branding';
5197	4107	$auth_settings_option = $this->get_plugin_option( $option );
5198	4108
5199	4109	// Print option elements.
5200		- ?>
5201		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_default" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="default"<?php checked( 'default' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_default"><?php esc_html_e( 'Default WordPress login screen', 'authorizer' ); ?></label><br />
	4110	+ ?><input type="radio" id="radio_auth_settings_<?php echo $option; ?>_default" name="auth_settings[<?php echo $option; ?>]" value="default"<?php checked( 'default' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_default"><?php _e( 'Default WordPress login screen', 'authorizer' ); ?></label><br />
5202	4111	<?php
5203	4112
5204	4113	/**
5205	4114	* Developers can use the `authorizer_add_branding_option` filter
		@@ -5204,8 +4113,9 @@
5204	4113	/**
5205	4114	* Developers can use the `authorizer_add_branding_option` filter
5206	4115	* to add a radio button for "Custom WordPress login branding"
5207	4116	* under the "Advanced" tab in Authorizer options. Example:
	4117	+ *
5208	4118	* function my_authorizer_add_branding_option( $branding_options ) {
5209	4119	* $new_branding_option = array(
5210	4120	* 'value' => 'your_brand'
5211	4121	* 'description' => 'Custom Your Brand Login Screen',
		@@ -5219,274 +4129,133 @@
5219	4129	*/
5220	4130	$branding_options = array();
5221	4131	$branding_options = apply_filters( 'authorizer_add_branding_option', $branding_options );
5222	4132	foreach ( $branding_options as $branding_option ) {
5223		- // Make sure the custom brands have the required values.
	4133	+ // Make sure the custom brands have the required values
5224	4134	if ( ! ( is_array( $branding_option ) && array_key_exists( 'value', $branding_option ) && array_key_exists( 'description', $branding_option ) ) ) {
5225	4135	continue;
5226	4136	}
5227		- ?>
5228		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_<?php echo esc_attr( sanitize_title( $branding_option['value'] ) ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $branding_option['value'] ); ?>"<?php checked( $branding_option['value'] === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_<?php echo esc_attr( sanitize_title( $branding_option['value'] ) ); ?>"><?php echo esc_html( $branding_option['description'] ); ?></label><br />
5229		- <?php
	4137	+ ?><input type="radio" id="radio_auth_settings_<?php echo $option; ?>_<?php echo sanitize_title( $branding_option['value'] ); ?>" name="auth_settings[<?php echo $option; ?>]" value="<?php echo $branding_option['value']; ?>"<?php checked( $branding_option['value'] == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_<?php echo sanitize_title( $branding_option['value'] ); ?>"><?php echo $branding_option['description']; ?></label><br /><?php
5230	4138	}
5231	4139
5232	4140	// Print message about adding custom brands if there are none.
5233	4141	if ( count( $branding_options ) === 0 ) {
5234		- ?>
5235		- <p><em><?php echo wp_kses( __( '<strong>Note for theme developers</strong>: Add more options here by using the `authorizer_add_branding_option` filter in your theme. You can see an example theme that implements this filter in the plugin directory under sample-theme-add-branding.', 'authorizer' ), $this->allowed_html ); ?></em></p>
5236		- <?php
	4142	+ ?><p><em><?php _e( '<strong>Note for theme developers</strong>: Add more options here by using the `authorizer_add_branding_option` filter in your theme. You can see an example theme that implements this filter in the plugin directory under sample-theme-add-branding.', 'authorizer' ); ?></em></p><?php
5237	4143	}
5238	4144	}
5239	4145
5240	4146
5241		- /**
5242		- * Settings print callback.
5243		- *
5244		- * @param string $args Args (e.g., multisite admin mode).
5245		- * @return void
5246		- */
5247		- public function print_radio_auth_advanced_admin_menu( $args = '' ) {
	4147	+ function print_radio_auth_advanced_admin_menu( $args = '' ) {
5248	4148	// Get plugin option.
5249		- $option = 'advanced_admin_menu';
	4149	+ $option = 'advanced_admin_menu';
5250	4150	$auth_settings_option = $this->get_plugin_option( $option );
5251	4151
5252	4152	// Print option elements.
5253		- ?>
5254		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_settings" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="settings"<?php checked( 'settings' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_settings"><?php esc_html_e( 'Show in Settings menu', 'authorizer' ); ?></label><br />
5255		- <input type="radio" id="radio_auth_settings_<?php echo esc_attr( $option ); ?>_top" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="top"<?php checked( 'top' === $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo esc_attr( $option ); ?>_top"><?php esc_html_e( 'Show in sidebar (top level)', 'authorizer' ); ?></label><br />
5256		- <?php
	4153	+ ?><input type="radio" id="radio_auth_settings_<?php echo $option; ?>_settings" name="auth_settings[<?php echo $option; ?>]" value="settings"<?php checked( 'settings' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_settings"><?php _e( 'Show in Settings menu', 'authorizer' ); ?></label><br />
	4154	+ <input type="radio" id="radio_auth_settings_<?php echo $option; ?>_top" name="auth_settings[<?php echo $option; ?>]" value="top"<?php checked( 'top' == $auth_settings_option ); ?> /><label for="radio_auth_settings_<?php echo $option; ?>_top"><?php _e( 'Show in sidebar (top level)', 'authorizer' ); ?></label><br /><?php
5257	4155
5258	4156	}
5259	4157
5260	4158
5261		- /**
5262		- * Settings print callback.
5263		- *
5264		- * @param string $args Args (e.g., multisite admin mode).
5265		- * @return void
5266		- */
5267		- public function print_select_auth_advanced_usermeta( $args = '' ) {
	4159	+ function print_select_auth_advanced_usermeta( $args = '' ) {
5268	4160	// Get plugin option.
5269		- $option = 'advanced_usermeta';
	4161	+ $option = 'advanced_usermeta';
5270	4162	$auth_settings_option = $this->get_plugin_option( $option );
5271	4163
5272	4164	// Print option elements.
5273		- ?>
5274		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]">
5275		- <option value=""><?php esc_html_e( '-- None --', 'authorizer' ); ?></option>
5276		- <?php
5277		- if ( class_exists( 'acf' ) ) :
	4165	+ ?><select id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]">
	4166	+ <option value=""><?php _e( '-- None --', 'authorizer' ); ?></option>
	4167	+ <?php if ( class_exists( 'acf' ) ) :
5278	4168	// Get ACF 5 fields. Note: it would be much easier to use `get_field_objects()`
5279	4169	// or `get_field_objects( 'user_' . get_current_user_id() )`, but neither will
5280	4170	// list fields that have never been given values for users (i.e., new ACF
5281	4171	// fields). Therefore we fall back on finding any ACF fields applied to users
5282	4172	// (user_role or user_form location rules in the field group definition).
5283		- $fields = array();
	4173	+ $fields = array();
5284	4174	$acf_field_group_ids = array();
5285		- $acf_field_groups = new WP_Query(
5286		- array(
5287		- 'post_type' => 'acf-field-group',
5288		- )
5289		- );
	4175	+ $acf_field_groups = new WP_Query( array(
	4176	+ 'post_type' => 'acf-field-group',
	4177	+ ));
5290	4178	while ( $acf_field_groups->have_posts() ) : $acf_field_groups->the_post();
5291	4179	if ( strpos( get_the_content(), 's:5:"param";s:9:"user_role"' ) !== false || strpos( get_the_content(), 's:5:"param";s:9:"user_form"' ) !== false ) :
5292	4180	array_push( $acf_field_group_ids, get_the_ID() );
5293	4181	endif;
5294		- endwhile;
5295		- wp_reset_postdata();
	4182	+ endwhile; wp_reset_postdata();
5296	4183	foreach ( $acf_field_group_ids as $acf_field_group_id ) :
5297		- $acf_fields = new WP_Query(
5298		- array(
5299		- 'post_type' => 'acf-field',
5300		- 'post_parent' => $acf_field_group_id,
5301		- )
5302		- );
	4184	+ $acf_fields = new WP_Query( array(
	4185	+ 'post_type' => 'acf-field',
	4186	+ 'post_parent' => $acf_field_group_id,
	4187	+ ));
5303	4188	while ( $acf_fields->have_posts() ) : $acf_fields->the_post();
5304	4189	global $post;
5305		- $fields[ $post->post_name ] = get_field_object( $post->post_name );
5306		- endwhile;
5307		- wp_reset_postdata();
	4190	+ $fields[$post->post_name] = get_field_object( $post->post_name );
	4191	+ endwhile; wp_reset_postdata();
5308	4192	endforeach;
5309	4193	// Get ACF 4 fields.
5310		- $acf4_field_groups = new WP_Query(
5311		- array(
5312		- 'post_type' => 'acf',
5313		- )
5314		- );
	4194	+ $acf4_field_groups = new WP_Query( array(
	4195	+ 'post_type' => 'acf',
	4196	+ ));
5315	4197	while ( $acf4_field_groups->have_posts() ) : $acf4_field_groups->the_post();
5316	4198	$field_group_rules = get_post_meta( get_the_ID(), 'rule', true );
5317		- if ( is_array( $field_group_rules ) && array_key_exists( 'param', $field_group_rules ) && 'ef_user' === $field_group_rules['param'] ) :
	4199	+ if ( is_array( $field_group_rules ) && array_key_exists( 'param', $field_group_rules ) && $field_group_rules['param'] === 'ef_user' ) :
5318	4200	$acf4_fields = get_post_custom( get_the_ID() );
5319	4201	foreach ( $acf4_fields as $meta_key => $meta_value ) :
5320	4202	if ( strpos( $meta_key, 'field_' ) === 0 ) :
5321		- $meta_value = unserialize( $meta_value[0] );
5322		- $fields[ $meta_key ] = $meta_value;
	4203	+ $meta_value = unserialize( $meta_value[0] );
	4204	+ $fields[$meta_key] = $meta_value;
5323	4205	endif;
5324	4206	endforeach;
5325	4207	endif;
5326		- endwhile;
5327		- wp_reset_postdata();
5328		- ?>
	4208	+ endwhile; wp_reset_postdata(); ?>
5329	4209	<optgroup label="ACF User Fields:">
5330		- <?php foreach ( (array) $fields as $field => $field_object ) : ?>
5331		- <option value="acf___<?php echo esc_attr( $field_object['key'] ); ?>"<?php selected( "acf___{$field_object['key']}" === $auth_settings_option ); ?>><?php echo esc_html( $field_object['label'] ); ?></option>
	4210	+ <?php foreach ( (array)$fields as $field => $field_object ) : ?>
	4211	+ <option value="acf___<?php echo $field_object['key']; ?>"<?php if ( $auth_settings_option === "acf___{$field_object['key']}" ) echo ' selected="selected"'; ?>><?php echo $field_object['label']; ?></option>
5332	4212	<?php endforeach; ?>
5333	4213	</optgroup>
5334	4214	<?php endif; ?>
5335		- <optgroup label="<?php esc_attr_e( 'All Usermeta:', 'authorizer' ); ?>">
5336		- <?php
5337		- foreach ( $this->get_all_usermeta_keys() as $meta_key ) :
5338		- if ( substr( $meta_key, 0, 3 ) === 'wp_' ) :
5339		- continue;
5340		- endif;
5341		- ?>
5342		- <option value="<?php echo esc_attr( $meta_key ); ?>"<?php selected( $auth_settings_option === $meta_key ); ?>><?php echo esc_html( $meta_key ); ?></option>
	4215	+ <optgroup label="<?php _e( 'All Usermeta:', 'authorizer' ); ?>">
	4216	+ <?php foreach ( $this->get_all_usermeta_keys() as $meta_key ) : if ( substr( $meta_key, 0, 3 ) === 'wp_' ) continue; ?>
	4217	+ <option value="<?php echo $meta_key; ?>"<?php if ( $auth_settings_option === $meta_key ) echo ' selected="selected"'; ?>><?php echo $meta_key; ?></option>
5343	4218	<?php endforeach; ?>
5344	4219	</optgroup>
5345		- </select>
5346		- <?php
	4220	+ </select><?php
5347	4221	}
5348	4222
5349	4223
5350		- /**
5351		- * Settings print callback.
5352		- *
5353		- * @param string $args Args (e.g., multisite admin mode).
5354		- * @return void
5355		- */
5356		- public function print_text_auth_advanced_users_per_page( $args = '' ) {
	4224	+ function print_checkbox_auth_advanced_override_multisite( $args = '' ) {
5357	4225	// Get plugin option.
5358		- $option = 'advanced_users_per_page';
5359		- $auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5360		-
5361		- // Print option elements.
5362		- ?>
5363		- <input type="text" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="<?php echo esc_attr( $auth_settings_option ); ?>" placeholder="" size="4" />
5364		- <?php
5365		- }
5366		-
5367		-
5368		- /**
5369		- * Settings print callback.
5370		- *
5371		- * @param string $args Args (e.g., multisite admin mode).
5372		- * @return void
5373		- */
5374		- public function print_select_auth_advanced_users_sort_by( $args = '' ) {
5375		- // Get plugin option.
5376		- $option = 'advanced_users_sort_by';
5377		- $auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5378		-
5379		- // Print option elements.
5380		- ?>
5381		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]">
5382		- <option value="created" <?php selected( $auth_settings_option, 'created' ); ?>><?php esc_html_e( 'Date approved', 'authorizer' ); ?></option>
5383		- <option value="email" <?php selected( $auth_settings_option, 'email' ); ?>><?php esc_html_e( 'Email', 'authorizer' ); ?></option>
5384		- <option value="role" <?php selected( $auth_settings_option, 'role' ); ?>><?php esc_html_e( 'Role', 'authorizer' ); ?></option>
5385		- <option value="date_added" <?php selected( $auth_settings_option, 'date_added' ); ?>><?php esc_html_e( 'Date registered', 'authorizer' ); ?></option>
5386		- </select>
5387		- <?php
5388		- }
5389		-
5390		-
5391		- /**
5392		- * Settings print callback.
5393		- *
5394		- * @param string $args Args (e.g., multisite admin mode).
5395		- * @return void
5396		- */
5397		- public function print_select_auth_advanced_users_sort_order( $args = '' ) {
5398		- // Get plugin option.
5399		- $option = 'advanced_users_sort_order';
5400		- $auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5401		-
5402		- // Print option elements.
5403		- ?>
5404		- <select id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]">
5405		- <option value="asc" <?php selected( $auth_settings_option, 'asc' ); ?>><?php esc_html_e( 'Ascending', 'authorizer' ); ?></option>
5406		- <option value="desc" <?php selected( $auth_settings_option, 'desc' ); ?>><?php esc_html_e( 'Descending', 'authorizer' ); ?></option>
5407		- </select>
5408		- <?php
5409		- }
5410		-
5411		-
5412		- /**
5413		- * Settings print callback.
5414		- *
5415		- * @param string $args Args (e.g., multisite admin mode).
5416		- * @return void
5417		- */
5418		- public function print_checkbox_auth_advanced_widget_enabled( $args = '' ) {
5419		- // Get plugin option.
5420		- $option = 'advanced_widget_enabled';
5421		- $auth_settings_option = $this->get_plugin_option( $option, $this->get_admin_mode( $args ), 'allow override', 'print overlay' );
5422		-
5423		- // Print option elements.
5424		- ?>
5425		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( 'Show Dashboard Widget', 'authorizer' ); ?></label>
5426		- <p><small><?php esc_html_e( 'Note: Only users with the create_users capability will be able to see the dashboard widget.', 'authorizer' ); ?></small></p>
5427		- <?php
5428		- }
5429		-
5430		-
5431		- /**
5432		- * Settings print callback.
5433		- *
5434		- * @param string $args Args (e.g., multisite admin mode).
5435		- * @return void
5436		- */
5437		- public function print_checkbox_auth_advanced_override_multisite( $args = '' ) {
5438		- // Get plugin option.
5439		- $option = 'advanced_override_multisite';
	4226	+ $option = 'advanced_override_multisite';
5440	4227	$auth_settings_option = $this->get_plugin_option( $option );
5441	4228
5442	4229	// Print option elements.
5443		- ?>
5444		- <input type="checkbox" id="auth_settings_<?php echo esc_attr( $option ); ?>" name="auth_settings[<?php echo esc_attr( $option ); ?>]" value="1"<?php checked( 1 === intval( $auth_settings_option ) ); ?> /><label for="auth_settings_<?php echo esc_attr( $option ); ?>"><?php esc_html_e( "Configure this site independently (don't inherit any multisite settings)", 'authorizer' ); ?></label>
5445		- <?php
	4230	+ ?><input type="checkbox" id="auth_settings_<?php echo $option; ?>" name="auth_settings[<?php echo $option; ?>]" value="1"<?php checked( 1 == $auth_settings_option ); ?> /><label for="auth_settings_<?php echo $option; ?>"><?php _e( "Configure this site independently (don't inherit any multisite settings)", 'authorizer' ); ?></label><?php
5446	4231	}
5447	4232
5448	4233
5449	4234
5450	4235	/**
5451		- * Determines whether we are in single site or multisite admin context.
5452		- *
5453		- * @param string $args Args (e.g., multisite admin mode).
5454		- * @return int Current mode.
5455		- */
5456		- private function get_admin_mode( $args ) {
5457		- if ( is_array( $args ) && array_key_exists( WP_Plugin_Authorizer::NETWORK_CONTEXT, $args ) && true === $args[ WP_Plugin_Authorizer::NETWORK_CONTEXT ] ) {
5458		- return WP_Plugin_Authorizer::NETWORK_CONTEXT;
5459		- } else {
5460		- return WP_Plugin_Authorizer::SINGLE_CONTEXT;
5461		- }
5462		- }
5463		-
5464		-
5465		- /**
5466	4236	* Add help documentation to the options page.
5467		- *
5468		- * Action: load-settings_page_authorizer > admin_head
	4237	+ * Run on action hook chain: load-settings_page_authorizer > admin_head
5469	4238	*/
5470	4239	public function admin_head() {
5471	4240	$screen = get_current_screen();
5472	4241
5473		- // Add help tab for Access Lists Settings.
	4242	+ // Add help tab for Access Lists Settings
5474	4243	$help_auth_settings_access_lists_content = '
5475		- <p>' . __( "<strong>Pending Users</strong>: Pending users are users who have successfully logged in to the site, but who haven't yet been approved (or blocked) by you.", 'authorizer' ) . '</p>
5476		- <p>' . __( '<strong>Approved Users</strong>: Approved users have access to the site once they successfully log in.', 'authorizer' ) . '</p>
5477		- <p>' . __( '<strong>Blocked Users</strong>: Blocked users will receive an error message when they try to visit the site after authenticating.', 'authorizer' ) . '</p>
5478		- <p>' . __( 'Users in the <strong>Pending</strong> list appear automatically after a new user tries to log in from the configured external authentication service. You can add users to the <strong>Approved</strong> or <strong>Blocked</strong> lists by typing them in manually, or by clicking the <em>Approve</em> or <em>Block</em> buttons next to a user in the <strong>Pending</strong> list.', 'authorizer' ) . '</p>
	4244	+ <p>' . __( "<strong>Pending Users</strong>: Pending users are users who have successfully logged in to the site, but who haven't yet been approved (or blocked) by you.", 'authorizer' ) .'</p>
	4245	+ <p>' . __( "<strong>Approved Users</strong>: Approved users have access to the site once they successfully log in.", 'authorizer' ) . '</p>
	4246	+ <p>' . __( "<strong>Blocked Users</strong>: Blocked users will receive an error message when they try to visit the site after authenticating.", 'authorizer' ) . '</p>
	4247	+ <p>' . __( "Users in the <strong>Pending</strong> list appear automatically after a new user tries to log in from the configured external authentication service. You can add users to the <strong>Approved</strong> or <strong>Blocked</strong> lists by typing them in manually, or by clicking the <em>Approve</em> or <em>Block</em> buttons next to a user in the <strong>Pending</strong> list.", 'authorizer' ) . '</p>
5479	4248	';
5480	4249	$screen->add_help_tab(
5481	4250	array(
5482		- 'id' => 'help_auth_settings_access_lists_content',
5483		- 'title' => __( 'Access Lists', 'authorizer' ),
	4251	+ 'id' => 'help_auth_settings_access_lists_content',
	4252	+ 'title' => __( 'Access Lists', 'authorizer' ),
5484	4253	'content' => $help_auth_settings_access_lists_content,
5485	4254	)
5486	4255	);
5487	4256
5488		- // Add help tab for Login Access Settings.
	4257	+ // Add help tab for Login Access Settings
5489	4258	$help_auth_settings_access_login_content = '
5490	4259	<p>' . __( "<strong>Who can log in to the site?</strong>: Choose the level of access restriction you'd like to use on your site here. You can leave the site open to anyone with a WordPress account or an account on an external service like Google, CAS, or LDAP, or restrict it to WordPress users and only the external users that you specify via the <em>Access Lists</em>.", 'authorizer' ) . '</p>
5491	4260	<p>' . __( "<strong>Which role should receive email notifications about pending users?</strong>: If you've restricted access to <strong>approved users</strong>, you can determine which WordPress users will receive a notification email everytime a new external user successfully logs in and is added to the pending list. All users of the specified role will receive an email, and the external user will get a message (specified below) telling them their access is pending approval.", 'authorizer' ) . '</p>
5492	4261	<p>' . __( '<strong>What message should pending users see after attempting to log in?</strong>: Here you can specify the exact message a new external user will see once they try to log in to the site for the first time.', 'authorizer' ) . '</p>
		@@ -5492,84 +4261,84 @@
5492	4261	<p>' . __( '<strong>What message should pending users see after attempting to log in?</strong>: Here you can specify the exact message a new external user will see once they try to log in to the site for the first time.', 'authorizer' ) . '</p>
5493	4262	';
5494	4263	$screen->add_help_tab(
5495	4264	array(
5496		- 'id' => 'help_auth_settings_access_login_content',
5497		- 'title' => __( 'Login Access', 'authorizer' ),
	4265	+ 'id' => 'help_auth_settings_access_login_content',
	4266	+ 'title' => __( 'Login Access', 'authorizer' ),
5498	4267	'content' => $help_auth_settings_access_login_content,
5499	4268	)
5500	4269	);
5501	4270
5502		- // Add help tab for Public Access Settings.
	4271	+ // Add help tab for Public Access Settings
5503	4272	$help_auth_settings_access_public_content = '
5504	4273	<p>' . __( "<strong>Who can view the site?</strong>: You can restrict the site's visibility by only allowing logged in users to see pages. If you do so, you can customize the specifics about the site's privacy using the settings below.", 'authorizer' ) . '</p>
5505	4274	<p>' . __( "<strong>What pages (if any) should be available to everyone?</strong>: If you'd like to declare certain pages on your site as always public (such as the course syllabus, introduction, or calendar), specify those pages here. These pages will always be available no matter what access restrictions exist.", 'authorizer' ) . '</p>
5506		- <p>' . __( '<strong>What happens to people without access when they visit a <em>private</em> page?</strong>: Choose the response anonymous users receive when visiting the site. You can choose between immediately taking them to the <strong>login screen</strong>, or simply showing them a <strong>message</strong>.', 'authorizer' ) . '</p>
5507		- <p>' . __( '<strong>What happens to people without access when they visit a <em>public</em> page?</strong>: Choose the response anonymous users receive when visiting a page on the site marked as public. You can choose between showing them the page without any message, or showing them a the page with a message above the content.', 'authorizer' ) . '</p>
5508		- <p>' . __( '<strong>What message should people without access see?</strong>: If you chose to show new users a <strong>message</strong> above, type that message here.', 'authorizer' ) . '</p>
	4275	+ <p>' . __( "<strong>What happens to people without access when they visit a <em>private</em> page?</strong>: Choose the response anonymous users receive when visiting the site. You can choose between immediately taking them to the <strong>login screen</strong>, or simply showing them a <strong>message</strong>.", 'authorizer' ) . '</p>
	4276	+ <p>' . __( "<strong>What happens to people without access when they visit a <em>public</em> page?</strong>: Choose the response anonymous users receive when visiting a page on the site marked as public. You can choose between showing them the page without any message, or showing them a the page with a message above the content.", 'authorizer' ) . '</p>
	4277	+ <p>' . __( "<strong>What message should people without access see?</strong>: If you chose to show new users a <strong>message</strong> above, type that message here.", 'authorizer' ) . '</p>
5509	4278	';
5510	4279	$screen->add_help_tab(
5511	4280	array(
5512		- 'id' => 'help_auth_settings_access_public_content',
5513		- 'title' => __( 'Public Access', 'authorizer' ),
	4281	+ 'id' => 'help_auth_settings_access_public_content',
	4282	+ 'title' => __( 'Public Access', 'authorizer' ),
5514	4283	'content' => $help_auth_settings_access_public_content,
5515	4284	)
5516	4285	);
5517	4286
5518		- // Add help tab for External Service (CAS, LDAP) Settings.
	4287	+ // Add help tab for External Service (CAS, LDAP) Settings
5519	4288	$help_auth_settings_external_content = '
5520	4289	<p>' . __( "<strong>Type of external service to authenticate against</strong>: Choose which authentication service type you will be using. You'll have to fill out different fields below depending on which service you choose.", 'authorizer' ) . '</p>
5521		- <p>' . __( '<strong>Enable Google Logins</strong>: Choose if you want to allow users to log in with their Google Account credentials. You will need to enter your API Client ID and Secret to enable Google Logins.', 'authorizer' ) . '</p>
5522		- <p>' . __( '<strong>Enable CAS Logins</strong>: Choose if you want to allow users to log in with via CAS (Central Authentication Service). You will need to enter details about your CAS server (host, port, and path) to enable CAS Logins.', 'authorizer' ) . '</p>
5523		- <p>' . __( '<strong>Enable LDAP Logins</strong>: Choose if you want to allow users to log in with their LDAP (Lightweight Directory Access Protocol) credentials. You will need to enter details about your LDAP server (host, port, search base, uid attribute, directory user, directory user password, and whether to use TLS) to enable Google Logins.', 'authorizer' ) . '</p>
5524		- <p>' . __( '<strong>Default role for new CAS users</strong>: Specify which role new external users will get by default. Be sure to choose a role with limited permissions!', 'authorizer' ) . '</p>
5525		- <p><strong><em>' . __( 'If you enable Google logins:', 'authorizer' ) . '</em></strong></p>
	4290	+ <p>' . __( "<strong>Enable Google Logins</strong>: Choose if you want to allow users to log in with their Google Account credentials. You will need to enter your API Client ID and Secret to enable Google Logins.", 'authorizer' ) . '</p>
	4291	+ <p>' . __( "<strong>Enable CAS Logins</strong>: Choose if you want to allow users to log in with via CAS (Central Authentication Service). You will need to enter details about your CAS server (host, port, and path) to enable CAS Logins.", 'authorizer' ) . '</p>
	4292	+ <p>' . __( "<strong>Enable LDAP Logins</strong>: Choose if you want to allow users to log in with their LDAP (Lightweight Directory Access Protocol) credentials. You will need to enter details about your LDAP server (host, port, search base, uid attribute, directory user, directory user password, and whether to use TLS) to enable Google Logins.", 'authorizer' ) . '</p>
	4293	+ <p>' . __( "<strong>Default role for new CAS users</strong>: Specify which role new external users will get by default. Be sure to choose a role with limited permissions!", 'authorizer' ) . '</p>
	4294	+ <p><strong><em>' . __( "If you enable Google logins:", 'authorizer' ) . '</em></strong></p>
5526	4295	<ul>
5527	4296	<li>' . __( "<strong>Google Client ID</strong>: You can generate this ID by creating a new Project in the <a href='https://cloud.google.com/console'>Google Developers Console</a>. A Client ID typically looks something like this: 1234567890123-kdjr85yt6vjr6d8g7dhr8g7d6durjf7g.apps.googleusercontent.com", 'authorizer' ) . '</li>
5528	4297	<li>' . __( "<strong>Google Client Secret</strong>: You can generate this secret by creating a new Project in the <a href='https://cloud.google.com/console'>Google Developers Console</a>. A Client Secret typically looks something like this: sDNgX5_pr_5bly-frKmvp8jT", 'authorizer' ) . '</li>
5529	4298	</ul>
5530		- <p><strong><em>' . __( 'If you enable CAS logins:', 'authorizer' ) . '</em></strong></p>
	4299	+ <p><strong><em>' . __( "If you enable CAS logins:", 'authorizer' ) . '</em></strong></p>
5531	4300	<ul>
5532		- <li>' . __( '<strong>CAS server hostname</strong>: Enter the hostname of the CAS server you authenticate against (e.g., authn.example.edu).', 'authorizer' ) . '</li>
5533		- <li>' . __( '<strong>CAS server port</strong>: Enter the port on the CAS server to connect to (e.g., 443).', 'authorizer' ) . '</li>
5534		- <li>' . __( '<strong>CAS server path/context</strong>: Enter the path to the login endpoint on the CAS server (e.g., /cas).', 'authorizer' ) . '</li>
	4301	+ <li>' . __( "<strong>CAS server hostname</strong>: Enter the hostname of the CAS server you authenticate against (e.g., authn.example.edu).", 'authorizer' ) . '</li>
	4302	+ <li>' . __( "<strong>CAS server port</strong>: Enter the port on the CAS server to connect to (e.g., 443).", 'authorizer' ) . '</li>
	4303	+ <li>' . __( "<strong>CAS server path/context</strong>: Enter the path to the login endpoint on the CAS server (e.g., /cas).", 'authorizer' ) . '</li>
5535	4304	<li>' . __( "<strong>CAS attribute containing first name</strong>: Enter the CAS attribute that has the user's first name. When this user first logs in, their WordPress account will have their first name retrieved from CAS and added to their WordPress profile.", 'authorizer' ) . '</li>
5536	4305	<li>' . __( "<strong>CAS attribute containing last name</strong>: Enter the CAS attribute that has the user's last name. When this user first logs in, their WordPress account will have their last name retrieved from CAS and added to their WordPress profile.", 'authorizer' ) . '</li>
5537		- <li>' . __( '<strong>CAS attribute update</strong>: Select whether the first and last names retrieved from CAS should overwrite any value the user has entered in the first and last name fields in their WordPress profile. If this is not set, this only happens the first time they log in.', 'authorizer' ) . '</li>
	4306	+ <li>' . __( "<strong>CAS attribute update</strong>: Select whether the first and last names retrieved from CAS should overwrite any value the user has entered in the first and last name fields in their WordPress profile. If this is not set, this only happens the first time they log in.", 'authorizer' ) . '</li>
5538	4307	</ul>
5539		- <p><strong><em>' . __( 'If you enable LDAP logins:', 'authorizer' ) . '</em></strong></p>
	4308	+ <p><strong><em>' . __( "If you enable LDAP logins:", 'authorizer' ) . '</em></strong></p>
5540	4309	<ul>
5541		- <li>' . __( '<strong>LDAP Host</strong>: Enter the URL of the LDAP server you authenticate against.', 'authorizer' ) . '</li>
5542		- <li>' . __( '<strong>LDAP Port</strong>: Enter the port number that the LDAP server listens on.', 'authorizer' ) . '</li>
5543		- <li>' . __( '<strong>LDAP Search Base</strong>: Enter the LDAP string that represents the search base, e.g., ou=people,dc=example,dc=edu', 'authorizer' ) . '</li>
5544		- <li>' . __( '<strong>LDAP attribute containing username</strong>: Enter the name of the LDAP attribute that contains the usernames used by those attempting to log in. The plugin will search on this attribute to find the cn to bind against for login attempts.', 'authorizer' ) . '</li>
5545		- <li>' . __( '<strong>LDAP Directory User</strong>: Enter the name of the LDAP user that has permissions to browse the directory.', 'authorizer' ) . '</li>
5546		- <li>' . __( '<strong>LDAP Directory User Password</strong>: Enter the password for the LDAP user that has permission to browse the directory.', 'authorizer' ) . '</li>
5547		- <li>' . __( '<strong>Use TLS</strong>: Select whether all communication with the LDAP server should be performed over a TLS-secured connection.', 'authorizer' ) . '</li>
	4310	+ <li>' . __( "<strong>LDAP Host</strong>: Enter the URL of the LDAP server you authenticate against.", 'authorizer' ) . '</li>
	4311	+ <li>' . __( "<strong>LDAP Port</strong>: Enter the port number that the LDAP server listens on.", 'authorizer' ) . '</li>
	4312	+ <li>' . __( "<strong>LDAP Search Base</strong>: Enter the LDAP string that represents the search base, e.g., ou=people,dc=example,dc=edu", 'authorizer' ) . '</li>
	4313	+ <li>' . __( "<strong>LDAP attribute containing username</strong>: Enter the name of the LDAP attribute that contains the usernames used by those attempting to log in. The plugin will search on this attribute to find the cn to bind against for login attempts.", 'authorizer' ) . '</li>
	4314	+ <li>' . __( "<strong>LDAP Directory User</strong>: Enter the name of the LDAP user that has permissions to browse the directory.", 'authorizer' ) . '</li>
	4315	+ <li>' . __( "<strong>LDAP Directory User Password</strong>: Enter the password for the LDAP user that has permission to browse the directory.", 'authorizer' ) . '</li>
	4316	+ <li>' . __( "<strong>Secure Connection (TLS)</strong>: Select whether all communication with the LDAP server should be performed over a TLS-secured connection.", 'authorizer' ) . '</li>
5548	4317	<li>' . __( "<strong>Custom lost password URL</strong>: The WordPress login page contains a link to recover a lost password. If you have external users who shouldn't change the password on their WordPress account, point them to the appropriate location to change the password on their external authentication service here.", 'authorizer' ) . '</li>
5549	4318	<li>' . __( "<strong>LDAP attribute containing first name</strong>: Enter the LDAP attribute that has the user's first name. When this user first logs in, their WordPress account will have their first name retrieved from LDAP and added to their WordPress profile.", 'authorizer' ) . '</li>
5550	4319	<li>' . __( "<strong>LDAP attribute containing last name</strong>: Enter the LDAP attribute that has the user's last name. When this user first logs in, their WordPress account will have their last name retrieved from LDAP and added to their WordPress profile.", 'authorizer' ) . '</li>
5551		- <li>' . __( '<strong>LDAP attribute update</strong>: Select whether the first and last names retrieved from LDAP should overwrite any value the user has entered in the first and last name fields in their WordPress profile. If this is not set, this only happens the first time they log in.', 'authorizer' ) . '</li>
	4320	+ <li>' . __( "<strong>LDAP attribute update</strong>: Select whether the first and last names retrieved from LDAP should overwrite any value the user has entered in the first and last name fields in their WordPress profile. If this is not set, this only happens the first time they log in.", 'authorizer' ) . '</li>
5552	4321	</ul>
5553	4322	';
5554	4323	$screen->add_help_tab(
5555	4324	array(
5556		- 'id' => 'help_auth_settings_external_content',
5557		- 'title' => __( 'External Service', 'authorizer' ),
	4325	+ 'id' => 'help_auth_settings_external_content',
	4326	+ 'title' => __( 'External Service', 'authorizer' ),
5558	4327	'content' => $help_auth_settings_external_content,
5559	4328	)
5560	4329	);
5561	4330
5562		- // Add help tab for Advanced Settings.
	4331	+ // Add help tab for Advanced Settings
5563	4332	$help_auth_settings_advanced_content = '
5564		- <p>' . __( '<strong>Limit invalid login attempts</strong>: Choose how soon (and for how long) to restrict access to individuals (or bots) making repeated invalid login attempts. You may set a shorter delay first, and then a longer delay after repeated invalid attempts; you may also set how much time must pass before the delays will be reset to normal.', 'authorizer' ) . '</p>
5565		- <p>' . __( '<strong>Hide WordPress Logins</strong>: If you want to hide the WordPress username and password fields and the Log In button on the wp-login screen, enable this option. Note: You can always access the WordPress logins by adding external=wordpress to the wp-login URL, like so:', 'authorizer' ) . ' <a href="' . wp_login_url() . '?external=wordpress" target="_blank">' . wp_login_url() . '?external=wordpress</a>.</p>
	4333	+ <p>' . __( "<strong>Limit invalid login attempts</strong>: Choose how soon (and for how long) to restrict access to individuals (or bots) making repeated invalid login attempts. You may set a shorter delay first, and then a longer delay after repeated invalid attempts; you may also set how much time must pass before the delays will be reset to normal.", 'authorizer' ) . '</p>
	4334	+ <p>' . __( "<strong>Hide WordPress Logins</strong>: If you want to hide the WordPress username and password fields and the Log In button on the wp-login screen, enable this option. Note: You can always access the WordPress logins by adding external=wordpress to the wp-login URL, like so:", 'authorizer' ) . ' <a href="' . wp_login_url() . '?external=wordpress" target="_blank">' . wp_login_url() . '?external=wordpress</a>.</p>
5566	4335	<p>' . __( "<strong>Custom WordPress login branding</strong>: If you'd like to use custom branding on the WordPress login page, select that here. You will need to use the `authorizer_add_branding_option` filter in your theme to add it. You can see an example theme that implements this filter in the plugin directory under sample-theme-add-branding.", 'authorizer' ) . '</p>
5567	4336	';
5568	4337	$screen->add_help_tab(
5569	4338	array(
5570		- 'id' => 'help_auth_settings_advanced_content',
5571		- 'title' => __( 'Advanced', 'authorizer' ),
	4339	+ 'id' => 'help_auth_settings_advanced_content',
	4340	+ 'title' => __( 'Advanced', 'authorizer' ),
5572	4341	'content' => $help_auth_settings_advanced_content,
5573	4342	)
5574	4343	);
5575	4344	}
		@@ -5584,66 +4353,65 @@
5584	4353
5585	4354
5586	4355	/**
5587	4356	* Network Admin menu item
	4357	+ * Hook: network_admin_menu
5588	4358	*
5589		- * Action: network_admin_menu
5590		- *
	4359	+ * @param none
5591	4360	* @return void
5592	4361	*/
5593	4362	public function network_admin_menu() {
5594	4363	// @see http://codex.wordpress.org/Function_Reference/add_menu_page
5595	4364	add_menu_page(
5596		- 'Authorizer',
5597		- 'Authorizer',
5598		- 'manage_network_options',
5599		- 'authorizer',
	4365	+ 'Authorizer', // Page title
	4366	+ 'Authorizer', // Menu title
	4367	+ 'manage_network_options', // Capability
	4368	+ 'authorizer', // Menu slug
5600	4369	array( $this, 'create_network_admin_page' ),
5601		- 'dashicons-groups',
5602		- 89 // Position.
	4370	+ 'dashicons-groups', // Icon URL
	4371	+ 89 // Position
5603	4372	);
5604	4373	}
5605	4374
5606	4375
5607	4376	/**
5608		- * Output the HTML for the options page.
	4377	+ * Output the HTML for the options page
5609	4378	*/
5610	4379	public function create_network_admin_page() {
5611	4380	if ( ! current_user_can( 'manage_network_options' ) ) {
5612		- wp_die( wp_kses( __( 'You do not have sufficient permissions to access this page.', 'authorizer' ), $this->allowed_html ) );
	4381	+ wp_die( __( 'You do not have sufficient permissions to access this page.', 'authorizer' ) );
5613	4382	}
5614		- $auth_settings = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', array() );
5615		- ?>
	4383	+ $auth_settings = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', array() ); ?>
5616	4384	<div class="wrap">
5617	4385	<form method="post" action="" autocomplete="off">
5618		- <h2><?php esc_html_e( 'Authorizer Settings', 'authorizer' ); ?></h2>
5619		- <p><?php echo wp_kses( __( 'Most <strong>Authorizer</strong> settings are set in the individual sites, but you can specify a few options here that apply to <strong>all sites in the network</strong>. These settings will override settings in the individual sites.', 'authorizer' ), $this->allowed_html ); ?></p>
	4386	+ <h2><?php _e( 'Authorizer Settings', 'authorizer' ); ?></h2>
	4387	+ <p><?php _e( 'Most <strong>Authorizer</strong> settings are set in the individual sites, but you can specify a few options here that apply to <strong>all sites in the network</strong>. These settings will override settings in the individual sites.', 'authorizer' ); ?></p>
5620	4388
5621		- <input type="checkbox" id="auth_settings_multisite_override" name="auth_settings[multisite_override]" value="1"<?php checked( 1 === intval( $auth_settings['multisite_override'] ) ); ?> /><label for="auth_settings_multisite_override"><?php esc_html_e( 'Override individual site settings with the settings below', 'authorizer' ); ?></label>
	4389	+ <input type="checkbox" id="auth_settings_multisite_override" name="auth_settings[multisite_override]" value="1"<?php checked( 1 == $auth_settings['multisite_override'] ); ?> /><label for="auth_settings_multisite_override"><?php _e( 'Override individual site settings with the settings below', 'authorizer' ); ?></label>
5622	4390
5623	4391	<div id="auth_multisite_settings_disabled_overlay" style="display: none;"></div>
5624	4392
5625	4393	<div class="wrap" id="auth_multisite_settings">
5626		- <?php $this->print_section_info_tabs( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?>
	4394	+ <?php $this->print_section_info_tabs( array( MULTISITE_ADMIN => true ) ); ?>
5627	4395
5628	4396	<?php wp_nonce_field( 'save_auth_settings', 'nonce_save_auth_settings' ); ?>
5629	4397
5630		- <?php // Custom access lists (for network, we only really want approved list, not pending or blocked). ?>
	4398	+ <?php // Custom access lists (for network, we only really want approved list, not pending or blocked) ?>
5631	4399	<div id="section_info_access_lists" class="section_info">
5632		- <p><?php esc_html_e( 'Manage who has access to all sites in the network.', 'authorizer' ); ?></p>
	4400	+ <p><?php _e( 'Manage who has access to all sites in the network.', 'authorizer' ); ?></p>
5633	4401	</div>
5634	4402	<table class="form-table"><tbody>
5635	4403	<tr>
5636		- <th scope="row"><?php esc_html_e( 'Who can log in to sites in this network?', 'authorizer' ); ?></th>
5637		- <td><?php $this->print_radio_auth_access_who_can_login( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4404	+ <th scope="row"><?php _e( 'Who can log in to sites in this network?', 'authorizer' ); ?></th>
	4405	+ <td><?php $this->print_radio_auth_access_who_can_login( array( MULTISITE_ADMIN => true ) ); ?></td>
5638	4406	</tr>
5639	4407	<tr>
5640		- <th scope="row"><?php esc_html_e( 'Who can view sites in this network?', 'authorizer' ); ?></th>
5641		- <td><?php $this->print_radio_auth_access_who_can_view( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4408	+ <th scope="row"><?php _e( 'Who can view sites in this network?', 'authorizer' ); ?></th>
	4409	+ <td><?php $this->print_radio_auth_access_who_can_view( array( MULTISITE_ADMIN => true ) ); ?></td>
5642	4410	</tr>
5643	4411	<tr>
5644		- <th scope="row"><?php esc_html_e( 'Approved Users (All Sites)', 'authorizer' ); ?><br /><small><em><?php echo wp_kses( __( 'Note: these users will <strong>not</strong> receive welcome emails when approved. Only users approved from individual sites can receive these messages.', 'authorizer' ), $this->allowed_html ); ?></em></small></th>
5645		- <td><?php $this->print_combo_auth_access_users_approved( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4412	+ <th scope="row"><?php _e( 'Approved Users (All Sites)', 'authorizer' ); ?><br /><small><em><?php _e( 'Note: these users will <strong>not</strong> receive welcome emails when approved. Only users approved from individual sites can receive these messages.', 'authorizer' ); ?></em></small></th>
	4413	+ <td><?php $this->print_combo_auth_access_users_approved( array( MULTISITE_ADMIN => true ) ); ?></td>
5646	4414	</tr>
5647	4415	</tbody></table>
5648	4416
5649	4417	<?php $this->print_section_info_external(); ?>
		@@ -5648,122 +4416,122 @@
5648	4416
5649	4417	<?php $this->print_section_info_external(); ?>
5650	4418	<table class="form-table"><tbody>
5651	4419	<tr>
5652		- <th scope="row"><?php esc_html_e( 'Default role for new users', 'authorizer' ); ?></th>
5653		- <td><?php $this->print_select_auth_access_default_role( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4420	+ <th scope="row"><?php _e( 'Default role for new users', 'authorizer' ); ?></th>
	4421	+ <td><?php $this->print_select_auth_access_default_role( array( MULTISITE_ADMIN => true ) ); ?></td>
5654	4422	</tr>
5655	4423	<tr>
5656		- <th scope="row"><?php esc_html_e( 'Google Logins', 'authorizer' ); ?></th>
5657		- <td><?php $this->print_checkbox_auth_external_google( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4424	+ <th scope="row"><?php _e( 'Google Logins', 'authorizer' ); ?></th>
	4425	+ <td><?php $this->print_checkbox_auth_external_google( array( MULTISITE_ADMIN => true ) ); ?></td>
5658	4426	</tr>
5659	4427	<tr>
5660		- <th scope="row"><?php esc_html_e( 'Google Client ID', 'authorizer' ); ?></th>
5661		- <td><?php $this->print_text_google_clientid( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4428	+ <th scope="row"><?php _e( 'Google Client ID', 'authorizer' ); ?></th>
	4429	+ <td><?php $this->print_text_google_clientid( array( MULTISITE_ADMIN => true ) ); ?></td>
5662	4430	</tr>
5663	4431	<tr>
5664		- <th scope="row"><?php esc_html_e( 'Google Client Secret', 'authorizer' ); ?></th>
5665		- <td><?php $this->print_text_google_clientsecret( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4432	+ <th scope="row"><?php _e( 'Google Client Secret', 'authorizer' ); ?></th>
	4433	+ <td><?php $this->print_text_google_clientsecret( array( MULTISITE_ADMIN => true ) ); ?></td>
5666	4434	</tr>
5667	4435	<tr>
5668		- <th scope="row"><?php esc_html_e( 'Google Hosted Domain', 'authorizer' ); ?></th>
5669		- <td><?php $this->print_text_google_hosteddomain( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4436	+ <th scope="row"><?php _e( 'Google Hosted Domain', 'authorizer' ); ?></th>
	4437	+ <td><?php $this->print_text_google_hosteddomain( array( MULTISITE_ADMIN => true ) ); ?></td>
5670	4438	</tr>
5671	4439	<tr>
5672		- <th scope="row"><?php esc_html_e( 'CAS Logins', 'authorizer' ); ?></th>
5673		- <td><?php $this->print_checkbox_auth_external_cas( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4440	+ <th scope="row"><?php _e( 'CAS Logins', 'authorizer' ); ?></th>
	4441	+ <td><?php $this->print_checkbox_auth_external_cas( array( MULTISITE_ADMIN => true ) ); ?></td>
5674	4442	</tr>
5675	4443	<tr>
5676		- <th scope="row"><?php esc_html_e( 'CAS Custom Label', 'authorizer' ); ?></th>
5677		- <td><?php $this->print_text_cas_custom_label( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4444	+ <th scope="row"><?php _e( 'CAS Custom Label', 'authorizer' ); ?></th>
	4445	+ <td><?php $this->print_text_cas_custom_label( array( MULTISITE_ADMIN => true ) ); ?></td>
5678	4446	</tr>
5679	4447	<tr>
5680		- <th scope="row"><?php esc_html_e( 'CAS server hostname', 'authorizer' ); ?></th>
5681		- <td><?php $this->print_text_cas_host( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4448	+ <th scope="row"><?php _e( 'CAS server hostname', 'authorizer' ); ?></th>
	4449	+ <td><?php $this->print_text_cas_host( array( MULTISITE_ADMIN => true ) ); ?></td>
5682	4450	</tr>
5683	4451	<tr>
5684		- <th scope="row"><?php esc_html_e( 'CAS server port', 'authorizer' ); ?></th>
5685		- <td><?php $this->print_text_cas_port( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4452	+ <th scope="row"><?php _e( 'CAS server port', 'authorizer' ); ?></th>
	4453	+ <td><?php $this->print_text_cas_port( array( MULTISITE_ADMIN => true ) ); ?></td>
5686	4454	</tr>
5687	4455	<tr>
5688		- <th scope="row"><?php esc_html_e( 'CAS server path/context', 'authorizer' ); ?></th>
5689		- <td><?php $this->print_text_cas_path( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4456	+ <th scope="row"><?php _e( 'CAS server path/context', 'authorizer' ); ?></th>
	4457	+ <td><?php $this->print_text_cas_path( array( MULTISITE_ADMIN => true ) ); ?></td>
5690	4458	</tr>
5691	4459	<tr>
5692		- <th scope="row"><?php esc_html_e( 'CAS server version', 'authorizer' ); ?></th>
5693		- <td><?php $this->print_select_cas_version( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4460	+ <th scope="row"><?php _e( 'CAS server version', 'authorizer' ); ?></th>
	4461	+ <td><?php $this->print_select_cas_version( array( MULTISITE_ADMIN => true ) ); ?></td>
5694	4462	</tr>
5695	4463	<tr>
5696		- <th scope="row"><?php esc_html_e( 'CAS attribute containing email', 'authorizer' ); ?></th>
5697		- <td><?php $this->print_text_cas_attr_email( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4464	+ <th scope="row"><?php _e( 'CAS attribute containing email', 'authorizer' ); ?></th>
	4465	+ <td><?php $this->print_text_cas_attr_email( array( MULTISITE_ADMIN => true ) ); ?></td>
5698	4466	</tr>
5699	4467	<tr>
5700		- <th scope="row"><?php esc_html_e( 'CAS attribute containing first name', 'authorizer' ); ?></th>
5701		- <td><?php $this->print_text_cas_attr_first_name( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4468	+ <th scope="row"><?php _e( 'CAS attribute containing first name', 'authorizer' ); ?></th>
	4469	+ <td><?php $this->print_text_cas_attr_first_name( array( MULTISITE_ADMIN => true ) ); ?></td>
5702	4470	</tr>
5703	4471	<tr>
5704		- <th scope="row"><?php esc_html_e( 'CAS attribute containing last name', 'authorizer' ); ?></th>
5705		- <td><?php $this->print_text_cas_attr_last_name( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4472	+ <th scope="row"><?php _e( 'CAS attribute containing last name', 'authorizer' ); ?></th>
	4473	+ <td><?php $this->print_text_cas_attr_last_name( array( MULTISITE_ADMIN => true ) ); ?></td>
5706	4474	</tr>
5707	4475	<tr>
5708		- <th scope="row"><?php esc_html_e( 'CAS attribute update', 'authorizer' ); ?></th>
5709		- <td><?php $this->print_checkbox_cas_attr_update_on_login( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4476	+ <th scope="row"><?php _e( 'CAS attribute update', 'authorizer' ); ?></th>
	4477	+ <td><?php $this->print_checkbox_cas_attr_update_on_login( array( MULTISITE_ADMIN => true ) ); ?></td>
5710	4478	</tr>
5711	4479	<tr>
5712		- <th scope="row"><?php esc_html_e( 'CAS automatic login', 'authorizer' ); ?></th>
5713		- <td><?php $this->print_checkbox_cas_auto_login( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4480	+ <th scope="row"><?php _e( 'CAS automatic login', 'authorizer' ); ?></th>
	4481	+ <td><?php $this->print_checkbox_cas_auto_login( array( MULTISITE_ADMIN => true ) ); ?></td>
5714	4482	</tr>
5715	4483	<tr>
5716		- <th scope="row"><?php esc_html_e( 'LDAP Logins', 'authorizer' ); ?></th>
5717		- <td><?php $this->print_checkbox_auth_external_ldap( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4484	+ <th scope="row"><?php _e( 'LDAP Logins', 'authorizer' ); ?></th>
	4485	+ <td><?php $this->print_checkbox_auth_external_ldap( array( MULTISITE_ADMIN => true ) ); ?></td>
5718	4486	</tr>
5719	4487	<tr>
5720		- <th scope="row"><?php esc_html_e( 'LDAP Host', 'authorizer' ); ?></th>
5721		- <td><?php $this->print_text_ldap_host( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4488	+ <th scope="row"><?php _e( 'LDAP Host', 'authorizer' ); ?></th>
	4489	+ <td><?php $this->print_text_ldap_host( array( MULTISITE_ADMIN => true ) ); ?></td>
5722	4490	</tr>
5723	4491	<tr>
5724		- <th scope="row"><?php esc_html_e( 'LDAP Port', 'authorizer' ); ?></th>
5725		- <td><?php $this->print_text_ldap_port( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4492	+ <th scope="row"><?php _e( 'LDAP Port', 'authorizer' ); ?></th>
	4493	+ <td><?php $this->print_text_ldap_port( array( MULTISITE_ADMIN => true ) ); ?></td>
5726	4494	</tr>
5727	4495	<tr>
5728		- <th scope="row"><?php esc_html_e( 'Use TLS', 'authorizer' ); ?></th>
5729		- <td><?php $this->print_checkbox_ldap_tls( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4496	+ <th scope="row"><?php _e( 'Secure Connection (TLS)', 'authorizer' ); ?></th>
	4497	+ <td><?php $this->print_checkbox_ldap_tls( array( MULTISITE_ADMIN => true ) ); ?></td>
5730	4498	</tr>
5731	4499	<tr>
5732		- <th scope="row"><?php esc_html_e( 'LDAP Search Base', 'authorizer' ); ?></th>
5733		- <td><?php $this->print_text_ldap_search_base( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4500	+ <th scope="row"><?php _e( 'LDAP Search Base', 'authorizer' ); ?></th>
	4501	+ <td><?php $this->print_text_ldap_search_base( array( MULTISITE_ADMIN => true ) ); ?></td>
5734	4502	</tr>
5735	4503	<tr>
5736		- <th scope="row"><?php esc_html_e( 'LDAP attribute containing username', 'authorizer' ); ?></th>
5737		- <td><?php $this->print_text_ldap_uid( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4504	+ <th scope="row"><?php _e( 'LDAP attribute containing username', 'authorizer' ); ?></th>
	4505	+ <td><?php $this->print_text_ldap_uid( array( MULTISITE_ADMIN => true ) ); ?></td>
5738	4506	</tr>
5739	4507	<tr>
5740		- <th scope="row"><?php esc_html_e( 'LDAP attribute containing email', 'authorizer' ); ?></th>
5741		- <td><?php $this->print_text_ldap_attr_email( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4508	+ <th scope="row"><?php _e( 'LDAP attribute containing email', 'authorizer' ); ?></th>
	4509	+ <td><?php $this->print_text_ldap_attr_email( array( MULTISITE_ADMIN => true ) ); ?></td>
5742	4510	</tr>
5743	4511	<tr>
5744		- <th scope="row"><?php esc_html_e( 'LDAP Directory User', 'authorizer' ); ?></th>
5745		- <td><?php $this->print_text_ldap_user( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4512	+ <th scope="row"><?php _e( 'LDAP Directory User', 'authorizer' ); ?></th>
	4513	+ <td><?php $this->print_text_ldap_user( array( MULTISITE_ADMIN => true ) ); ?></td>
5746	4514	</tr>
5747	4515	<tr>
5748		- <th scope="row"><?php esc_html_e( 'LDAP Directory User Password', 'authorizer' ); ?></th>
5749		- <td><?php $this->print_password_ldap_password( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4516	+ <th scope="row"><?php _e( 'LDAP Directory User Password', 'authorizer' ); ?></th>
	4517	+ <td><?php $this->print_password_ldap_password( array( MULTISITE_ADMIN => true ) ); ?></td>
5750	4518	</tr>
5751	4519	<tr>
5752		- <th scope="row"><?php esc_html_e( 'Custom lost password URL', 'authorizer' ); ?></th>
5753		- <td><?php $this->print_text_ldap_lostpassword_url( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4520	+ <th scope="row"><?php _e( 'Custom lost password URL', 'authorizer' ); ?></th>
	4521	+ <td><?php $this->print_text_ldap_lostpassword_url( array( MULTISITE_ADMIN => true ) ); ?></td>
5754	4522	</tr>
5755	4523	<tr>
5756		- <th scope="row"><?php esc_html_e( 'LDAP attribute containing first name', 'authorizer' ); ?></th>
5757		- <td><?php $this->print_text_ldap_attr_first_name( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4524	+ <th scope="row"><?php _e( 'LDAP attribute containing first name', 'authorizer' ); ?></th>
	4525	+ <td><?php $this->print_text_ldap_attr_first_name( array( MULTISITE_ADMIN => true ) ); ?></td>
5758	4526	</tr>
5759	4527	<tr>
5760		- <th scope="row"><?php esc_html_e( 'LDAP attribute containing last name', 'authorizer' ); ?></th>
5761		- <td><?php $this->print_text_ldap_attr_last_name( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4528	+ <th scope="row"><?php _e( 'LDAP attribute containing last name', 'authorizer' ); ?></th>
	4529	+ <td><?php $this->print_text_ldap_attr_last_name( array( MULTISITE_ADMIN => true ) ); ?></td>
5762	4530	</tr>
5763	4531	<tr>
5764		- <th scope="row"><?php esc_html_e( 'LDAP attribute update', 'authorizer' ); ?></th>
5765		- <td><?php $this->print_checkbox_ldap_attr_update_on_login( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4532	+ <th scope="row"><?php _e( 'LDAP attribute update', 'authorizer' ); ?></th>
	4533	+ <td><?php $this->print_checkbox_ldap_attr_update_on_login( array( MULTISITE_ADMIN => true ) ); ?></td>
5766	4534	</tr>
5767	4535	</tbody></table>
5768	4536
5769	4537	<?php $this->print_section_info_advanced(); ?>
		@@ -5768,36 +4536,20 @@
5768	4536
5769	4537	<?php $this->print_section_info_advanced(); ?>
5770	4538	<table class="form-table"><tbody>
5771	4539	<tr>
5772		- <th scope="row"><?php esc_html_e( 'Limit invalid login attempts', 'authorizer' ); ?></th>
5773		- <td><?php $this->print_text_auth_advanced_lockouts( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4540	+ <th scope="row"><?php _e( 'Limit invalid login attempts', 'authorizer' ); ?></th>
	4541	+ <td><?php $this->print_text_auth_advanced_lockouts( array( MULTISITE_ADMIN => true ) ); ?></td>
5774	4542	</tr>
5775	4543	<tr>
5776		- <th scope="row"><?php esc_html_e( 'Hide WordPress Logins', 'authorizer' ); ?></th>
5777		- <td><?php $this->print_checkbox_auth_advanced_hide_wp_login( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
	4544	+ <th scope="row"><?php _e( 'Hide WordPress Logins', 'authorizer' ); ?></th>
	4545	+ <td><?php $this->print_checkbox_auth_advanced_hide_wp_login( array( MULTISITE_ADMIN => true ) ); ?></td>
5778	4546	</tr>
5779		- <tr>
5780		- <th scope="row"><?php esc_html_e( 'Number of users per page', 'authorizer' ); ?></th>
5781		- <td><?php $this->print_text_auth_advanced_users_per_page( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
5782		- </tr>
5783		- <tr>
5784		- <th scope="row"><?php esc_html_e( 'Approved users sort method', 'authorizer' ); ?></th>
5785		- <td><?php $this->print_select_auth_advanced_users_sort_by( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
5786		- </tr>
5787		- <tr>
5788		- <th scope="row"><?php esc_html_e( 'Approved users sort order', 'authorizer' ); ?></th>
5789		- <td><?php $this->print_select_auth_advanced_users_sort_order( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
5790		- </tr>
5791		- <tr>
5792		- <th scope="row"><?php esc_html_e( 'Show Dashboard Widget', 'authorizer' ); ?></th>
5793		- <td><?php $this->print_checkbox_auth_advanced_widget_enabled( array( WP_Plugin_Authorizer::NETWORK_CONTEXT => true ) ); ?></td>
5794		- </tr>
5795	4547	</tbody></table>
5796	4548
5797	4549	<br class="clear" />
5798	4550	</div>
5799		- <input type="button" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e( 'Save Changes', 'authorizer' ); ?>" onclick="saveAuthMultisiteSettings(this);" />
	4551	+ <input type="button" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'authorizer' ); ?>" onclick="save_auth_multisite_settings(this);" />
5800	4552	</form>
5801	4553	</div>
5802	4554	<?php
5803	4555	}
		@@ -5804,12 +4556,10 @@
5804	4556
5805	4557
5806	4558	/**
5807	4559	* Save multisite settings (ajax call).
5808		- *
5809		- * Action: wp_ajax_save_auth_multisite_settings
5810	4560	*/
5811		- public function ajax_save_auth_multisite_settings() {
	4561	+ function ajax_save_auth_multisite_settings() {
5812	4562	// Fail silently if current user doesn't have permissions.
5813	4563	if ( ! current_user_can( 'manage_network_options' ) ) {
5814	4564	die( '' );
5815	4565	}
		@@ -5814,14 +4564,14 @@
5814	4564	die( '' );
5815	4565	}
5816	4566
5817	4567	// Make sure nonce exists.
5818		- if ( empty( $_POST['nonce'] ) ) {
	4568	+ if ( empty( $_POST['nonce_save_auth_settings'] ) ) {
5819	4569	die( '' );
5820	4570	}
5821	4571
5822	4572	// Nonce check.
5823		- if ( ! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), 'save_auth_settings' ) ) {
	4573	+ if ( ! wp_verify_nonce( $_POST['nonce_save_auth_settings'], 'save_auth_settings' ) ) {
5824	4574	die( '' );
5825	4575	}
5826	4576
5827	4577	// Assert multisite.
		@@ -5829,15 +4579,15 @@
5829	4579	die( '' );
5830	4580	}
5831	4581
5832	4582	// Get multisite settings.
5833		- $auth_multisite_settings = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', array() );
	4583	+ $auth_multisite_settings = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', array() );
5834	4584
5835		- // Sanitize settings.
	4585	+ // Sanitize settings
5836	4586	$auth_multisite_settings = $this->sanitize_options( $_POST );
5837	4587
5838		- // Filter options to only the allowed values (multisite options are a subset of all options).
5839		- $allowed = array(
	4588	+ // Filter options to only the allowed values (multisite options are a subset of all options)
	4589	+ $allowed = array(
5840	4590	'multisite_override',
5841	4591	'access_who_can_login',
5842	4592	'access_who_can_view',
5843	4593	'access_default_role',
		@@ -5870,17 +4620,13 @@
5870	4620	'ldap_attr_last_name',
5871	4621	'ldap_attr_update_on_login',
5872	4622	'advanced_lockouts',
5873	4623	'advanced_hide_wp_login',
5874		- 'advanced_users_per_page',
5875		- 'advanced_users_sort_by',
5876		- 'advanced_users_sort_order',
5877		- 'advanced_widget_enabled',
5878	4624	);
5879	4625	$auth_multisite_settings = array_intersect_key( $auth_multisite_settings, array_flip( $allowed ) );
5880	4626
5881	4627	// Update multisite settings in database.
5882		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', $auth_multisite_settings );
	4628	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', $auth_multisite_settings );
5883	4629
5884	4630	// Return 'success' value to AJAX call.
5885	4631	die( 'success' );
5886	4632	}
		@@ -5894,67 +4640,42 @@
5894	4640	*/
5895	4641
5896	4642
5897	4643
5898		- /**
5899		- * Load Authorizer dashboard widget if it's enabled.
5900		- *
5901		- * Action: wp_dashboard_setup
5902		- */
5903		- public function add_dashboard_widgets() {
5904		- $widget_enabled = $this->get_plugin_option( 'advanced_widget_enabled', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' ) === '1';
5905		-
5906		- // Load authorizer dashboard widget if it's enabled and user has permission.
5907		- if ( current_user_can( 'create_users' ) && $widget_enabled ) {
5908		- // Add dashboard widget for adding/editing users with access.
	4644	+ function add_dashboard_widgets() {
	4645	+ // Only users who can edit can see the authorizer dashboard widget
	4646	+ if ( current_user_can( 'create_users' ) ) {
	4647	+ // Add dashboard widget for adding/editing users with access
5909	4648	wp_add_dashboard_widget( 'auth_dashboard_widget', __( 'Authorizer Settings', 'authorizer' ), array( $this, 'add_auth_dashboard_widget' ) );
5910	4649	}
5911	4650	}
5912	4651
5913	4652
5914		- /**
5915		- * Render Authorizer dashboard widget (callback).
5916		- */
5917		- public function add_auth_dashboard_widget() {
5918		- ?>
5919		- <form method="post" id="auth_settings_access_form" action="">
	4653	+ function add_auth_dashboard_widget() {
	4654	+ ?><form method="post" id="auth_settings_access_form" action="">
5920	4655	<?php $this->print_section_info_access_login(); ?>
5921	4656	<div>
5922		- <h2><?php esc_html_e( 'Pending Users', 'authorizer' ); ?></h2>
	4657	+ <h2><?php _e( 'Pending Users', 'authorizer' ); ?></h2>
5923	4658	<?php $this->print_combo_auth_access_users_pending(); ?>
5924	4659	</div>
5925	4660	<div>
5926		- <h2><?php esc_html_e( 'Approved Users', 'authorizer' ); ?></h2>
	4661	+ <h2><?php _e( 'Approved Users', 'authorizer' ); ?></h2>
5927	4662	<?php $this->print_combo_auth_access_users_approved(); ?>
5928	4663	</div>
5929	4664	<div>
5930		- <h2><?php esc_html_e( 'Blocked Users', 'authorizer' ); ?></h2>
	4665	+ <h2><?php _e( 'Blocked Users', 'authorizer' ); ?></h2>
5931	4666	<?php $this->print_combo_auth_access_users_blocked(); ?>
5932	4667	</div>
5933	4668	<br class="clear" />
5934		- </form>
5935		- <?php
	4669	+ </form><?php
5936	4670	}
5937	4671
5938	4672
5939		-
5940		- /**
5941		- * ***************************
5942		- * AJAX Actions
5943		- * ***************************
5944		- */
5945		-
5946		-
5947		-
5948		- /**
5949		- * Re-render the Approved User list (usually triggered if pager params have
5950		- * changed, e.g., current page, search term, sort order).
5951		- *
5952		- * Action: wp_ajax_refresh_approved_user_list
5953		- *
5954		- * @return void
5955		- */
5956		- public function ajax_refresh_approved_user_list() {
	4673	+ // Fired on a change event from the optional usermeta field in the
	4674	+ // approved user list. Updates the selected usermeta value, or saves it
	4675	+ // in the user's approved list entry if the user hasn't logged in yet
	4676	+ // and created a WordPress account.
	4677	+ function ajax_update_auth_usermeta() {
5957	4678	// Fail silently if current user doesn't have permissions.
5958	4679	if ( ! current_user_can( 'create_users' ) ) {
5959	4680	die( '' );
5960	4681	}
		@@ -5959,175 +4680,35 @@
5959	4680	die( '' );
5960	4681	}
5961	4682
5962	4683	// Nonce check.
5963		- if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), 'save_auth_settings' ) ) {
	4684	+ if ( empty( $_POST['nonce_save_auth_settings'] ) || ! wp_verify_nonce( $_POST['nonce_save_auth_settings'], 'save_auth_settings' ) ) {
5964	4685	die( '' );
5965	4686	}
5966	4687
5967	4688	// Fail if required post data doesn't exist.
5968		- if ( ! array_key_exists( 'paged', $_REQUEST ) ) {
	4689	+ if ( ! array_key_exists( 'email', $_REQUEST ) || ! array_key_exists( 'usermeta', $_REQUEST ) ) {
5969	4690	die( '' );
5970	4691	}
5971	4692
5972		- // Get defaults.
5973		- $success = true;
5974		- $message = '';
5975		- $is_network_admin = isset( $_REQUEST['is_network_admin'] ) && '1' === $_REQUEST['is_network_admin'];
5976		-
5977		- // Get user list.
5978		- $option = 'access_users_approved';
5979		- $admin_mode = is_multisite() && $is_network_admin ? WP_Plugin_Authorizer::NETWORK_CONTEXT : WP_Plugin_Authorizer::SINGLE_CONTEXT;
5980		- $auth_settings_option = $this->get_plugin_option( $option, $admin_mode, 'no override' );
5981		- $auth_settings_option = is_array( $auth_settings_option ) ? $auth_settings_option : array();
5982		-
5983		- // Get multisite approved users (will be added to top of list, greyed out).
5984		- $auth_override_multisite = $this->get_plugin_option( 'advanced_override_multisite' );
5985		- $auth_multisite_settings = $this->get_plugin_options( WP_Plugin_Authorizer::NETWORK_CONTEXT );
5986		- $auth_settings_option_multisite = array();
5987		- if (
5988		- is_multisite() &&
5989		- ! $is_network_admin &&
5990		- 1 !== intval( $auth_override_multisite ) &&
5991		- array_key_exists( 'multisite_override', $auth_multisite_settings ) &&
5992		- '1' === $auth_multisite_settings['multisite_override']
5993		- ) {
5994		- $auth_settings_option_multisite = $this->get_plugin_option( $option, WP_Plugin_Authorizer::NETWORK_CONTEXT, 'allow override' );
5995		- $auth_settings_option_multisite = is_array( $auth_settings_option_multisite ) ? $auth_settings_option_multisite : array();
5996		- // Add multisite users to the beginning of the main user array.
5997		- foreach ( array_reverse( $auth_settings_option_multisite ) as $approved_user ) {
5998		- $approved_user['multisite_user'] = true;
5999		- array_unshift( $auth_settings_option, $approved_user );
6000		- }
6001		- }
6002		-
6003		- // Get custom usermeta field to show.
6004		- $advanced_usermeta = $this->get_plugin_option( 'advanced_usermeta' );
6005		-
6006		- // Filter user list to search terms.
6007		- if ( ! empty( $_REQUEST['search'] ) ) {
6008		- $search_term = sanitize_text_field( wp_unslash( $_REQUEST['search'] ) );
6009		- $auth_settings_option = array_filter(
6010		- $auth_settings_option, function ( $user ) use ( $search_term ) {
6011		- return stripos( $user['email'], $search_term ) !== false ||
6012		- stripos( $user['role'], $search_term ) !== false ||
6013		- stripos( $user['date_added'], $search_term ) !== false;
6014		- }
6015		- );
6016		- }
6017		-
6018		- // Sort user list.
6019		- $sort_by = $this->get_plugin_option( 'advanced_users_sort_by', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' ); // email, role, date_added (registered), created (date approved).
6020		- $sort_order = $this->get_plugin_option( 'advanced_users_sort_order', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' ); // asc or desc.
6021		- $sort_dimension = array();
6022		- if ( in_array( $sort_by, array( 'email', 'role', 'date_added' ), true ) ) {
6023		- foreach ( $auth_settings_option as $key => $user ) {
6024		- if ( 'date_added' === $sort_by ) {
6025		- $sort_dimension[ $key ] = date( 'Ymd', strtotime( $user[ $sort_by ] ) );
6026		- } else {
6027		- $sort_dimension[ $key ] = strtolower( $user[ $sort_by ] );
6028		- }
6029		- }
6030		- $sort_order = 'asc' === $sort_order ? SORT_ASC : SORT_DESC;
6031		- array_multisort( $sort_dimension, $sort_order, $auth_settings_option );
6032		- } elseif ( 'created' === $sort_by && 'asc' !== $sort_order ) {
6033		- // If default sort method and reverse order, just reverse the array.
6034		- $auth_settings_option = array_reverse( $auth_settings_option );
6035		- }
6036		-
6037		- // Ensure array keys run from 0..max (keys in database will be the original,
6038		- // index, and removing users will not reorder the array keys of other users).
6039		- $auth_settings_option = array_values( $auth_settings_option );
6040		-
6041		- // Get pager params.
6042		- $total_users = count( $auth_settings_option );
6043		- $users_per_page = intval( $this->get_plugin_option( 'advanced_users_per_page', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' ) );
6044		- $current_page = isset( $_REQUEST['paged'] ) ? intval( $_REQUEST['paged'] ) : 1;
6045		- $total_pages = ceil( $total_users / $users_per_page );
6046		- if ( $total_pages < 1 ) {
6047		- $total_pages = 1;
6048		- }
6049		-
6050		- // Make sure current_page is between 1 and max pages.
6051		- if ( $current_page < 1 ) {
6052		- $current_page = 1;
6053		- } elseif ( $current_page > $total_pages ) {
6054		- $current_page = $total_pages;
6055		- }
6056		-
6057		- // Render user list.
6058		- ob_start();
6059		- $offset = ( $current_page - 1 ) * $users_per_page;
6060		- $max = min( $offset + $users_per_page, count( $auth_settings_option ) );
6061		- for ( $key = $offset; $key < $max; $key++ ) :
6062		- $approved_user = $auth_settings_option[ $key ];
6063		- if ( empty( $approved_user ) || count( $approved_user ) < 1 ) :
6064		- continue;
6065		- endif;
6066		- $this->render_user_element( $approved_user, $key, $option, $admin_mode, $advanced_usermeta );
6067		- endfor;
6068		-
6069		- // Send response to client.
6070		- $response = array(
6071		- 'success' => $success,
6072		- 'message' => $message,
6073		- 'html' => ob_get_clean(),
6074		- /* TRANSLATORS: %s: number of users */
6075		- 'total_users_html' => sprintf( _n( '%s user', '%s users', $total_users, 'authorizer' ), number_format_i18n( $total_users ) ),
6076		- 'total_pages_html' => number_format_i18n( $total_pages ),
6077		- 'total_pages' => $total_pages,
6078		- );
6079		- header( 'content-type: application/json' );
6080		- echo wp_json_encode( $response );
6081		- exit;
6082		- }
6083		-
6084		-
6085		- /**
6086		- * Fired on a change event from the optional usermeta field in the approved
6087		- * user list. Updates the selected usermeta value, or saves it in the user's
6088		- * approved list entry if the user hasn't logged in yet and created a
6089		- * WordPress account.
6090		- *
6091		- * Action: wp_ajax_update_auth_usermeta
6092		- *
6093		- * @return void
6094		- */
6095		- public function ajax_update_auth_usermeta() {
6096		- // Fail silently if current user doesn't have permissions.
6097		- if ( ! current_user_can( 'create_users' ) ) {
6098		- die( '' );
6099		- }
6100		-
6101		- // Nonce check.
6102		- if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), 'save_auth_settings' ) ) {
6103		- die( '' );
6104		- }
6105		-
6106		- // Fail if required post data doesn't exist.
6107		- if ( ! isset( $_REQUEST['email'], $_REQUEST['usermeta'] ) ) {
6108		- die( '' );
6109		- }
6110		-
6111	4693	// Get values to update from post data.
6112		- $email = sanitize_email( wp_unslash( $_REQUEST['email'] ) );
6113		- $meta_value = sanitize_meta( 'authorizer-usermeta', wp_unslash( $_REQUEST['usermeta'] ), 'user' );
6114		- $meta_key = $this->get_plugin_option( 'advanced_usermeta' );
	4694	+ $email = $_REQUEST['email'];
	4695	+ $meta_value = $_REQUEST['usermeta'];
	4696	+ $meta_key = $this->get_plugin_option( 'advanced_usermeta' );
6115	4697
6116	4698	// If user doesn't exist, save usermeta selection to authorizer
6117	4699	// list. This value will get saved to usermeta when the user first
6118	4700	// logs in (i.e., when their WordPress account is created).
6119		- $wp_user = get_user_by( 'email', $email );
6120		- if ( ! $wp_user ) {
	4701	+ if ( ! ( $wp_user = get_user_by( 'email', $email ) ) ) {
6121	4702	// Look through multisite approved users and add a usermeta
6122	4703	// reference for the current blog if the user is found.
6123		- $auth_multisite_settings_access_users_approved = is_multisite() ? get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', array() ) : array();
	4704	+ $auth_multisite_settings_access_users_approved = is_multisite() ? get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', array() ) : array();
6124	4705	$should_update_auth_multisite_settings_access_users_approved = false;
6125	4706	foreach ( $auth_multisite_settings_access_users_approved as $index => $approved_user ) {
6126		- if ( 0 === strcasecmp( $email, $approved_user['email'] ) ) {
6127		- if ( ! is_array( $auth_multisite_settings_access_users_approved[ $index ]['usermeta'] ) ) {
	4707	+ if ( $email === $approved_user['email'] ) {
	4708	+ if ( ! is_array( $auth_multisite_settings_access_users_approved[$index]['usermeta'] ) ) {
6128	4709	// Initialize the array of usermeta for each blog this user belongs to.
6129		- $auth_multisite_settings_access_users_approved[ $index ]['usermeta'] = array();
	4710	+ $auth_multisite_settings_access_users_approved[$index]['usermeta'] = array();
6130	4711	} else {
6131	4712	// There is already usermeta associated with this
6132	4713	// preapproved user; iterate through it and make
6133	4714	// sure it's not for old meta_keys (delete it if
		@@ -6133,53 +4714,55 @@
6133	4714	// sure it's not for old meta_keys (delete it if
6134	4715	// so). This can happen if someone changes the
6135	4716	// usermeta key in authorizer options, and we don't
6136	4717	// want to hang on to old data.
6137		- foreach ( $auth_multisite_settings_access_users_approved[ $index ]['usermeta'] as $blog_id => $usermeta ) {
	4718	+ foreach ( $auth_multisite_settings_access_users_approved[$index]['usermeta'] as $blog_id => $usermeta ) {
6138	4719	if ( array_key_exists( 'meta_key', $usermeta ) && $usermeta['meta_key'] === $meta_key ) {
6139	4720	continue;
6140	4721	} else {
6141		- unset( $auth_multisite_settings_access_users_approved[ $index ]['usermeta'][ $blog_id ] );
	4722	+ unset( $auth_multisite_settings_access_users_approved[$index]['usermeta'][$blog_id] );
6142	4723	}
6143	4724	}
6144	4725	}
6145		- $auth_multisite_settings_access_users_approved[ $index ]['usermeta'][ get_current_blog_id() ] = array(
6146		- 'meta_key' => $meta_key,
	4726	+ $auth_multisite_settings_access_users_approved[$index]['usermeta'][get_current_blog_id()] = array(
	4727	+ 'meta_key' => $meta_key,
6147	4728	'meta_value' => $meta_value,
6148	4729	);
6149		- $should_update_auth_multisite_settings_access_users_approved = true;
	4730	+ $should_update_auth_multisite_settings_access_users_approved = true;
6150	4731	}
6151	4732	}
6152	4733	if ( $should_update_auth_multisite_settings_access_users_approved ) {
6153		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	4734	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
6154	4735	}
6155	4736
6156	4737	// Look through the approved users (of the current blog in a
6157	4738	// multisite install, or just of the single site) and add a
6158	4739	// usermeta reference if the user is found.
6159		- $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
	4740	+ $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN );
6160	4741	$should_update_auth_settings_access_users_approved = false;
6161	4742	foreach ( $auth_settings_access_users_approved as $index => $approved_user ) {
6162		- if ( 0 === strcasecmp( $email, $approved_user['email'] ) ) {
6163		- $auth_settings_access_users_approved[ $index ]['usermeta'] = array(
6164		- 'meta_key' => $meta_key,
	4743	+ if ( $email === $approved_user['email'] ) {
	4744	+ $auth_settings_access_users_approved[$index]['usermeta'] = array(
	4745	+ 'meta_key' => $meta_key,
6165	4746	'meta_value' => $meta_value,
6166	4747	);
6167		- $should_update_auth_settings_access_users_approved = true;
	4748	+ $should_update_auth_settings_access_users_approved = true;
6168	4749	}
6169	4750	}
6170	4751	if ( $should_update_auth_settings_access_users_approved ) {
6171	4752	update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
6172	4753	}
	4754	+
6173	4755	} else {
6174	4756	// Update user's usermeta value for usermeta key stored in authorizer options.
6175	4757	if ( strpos( $meta_key, 'acf___' ) === 0 && class_exists( 'acf' ) ) {
6176	4758	// We have an ACF field value, so use the ACF function to update it.
6177		- update_field( str_replace( 'acf___', '', $meta_key ), $meta_value, 'user_' . $wp_user->ID );
	4759	+ update_field( str_replace('acf___', '', $meta_key ), $meta_value, 'user_' . $wp_user->ID );
6178	4760	} else {
6179	4761	// We have a normal usermeta value, so just update it via the WordPress function.
6180	4762	update_user_meta( $wp_user->ID, $meta_key, $meta_value );
6181	4763	}
	4764	+
6182	4765	}
6183	4766
6184	4767	// Return 'success' value to AJAX call.
6185	4768	die( 'success' );
		@@ -6185,17 +4768,9 @@
6185	4768	die( 'success' );
6186	4769	}
6187	4770
6188	4771
6189		- /**
6190		- * Fired on a change event from the user fields in the user lists. Updates
6191		- * the selected user value.
6192		- *
6193		- * Action: wp_ajax_update_auth_user
6194		- *
6195		- * @return void
6196		- */
6197		- public function ajax_update_auth_user() {
	4772	+ function ajax_update_auth_user() {
6198	4773	// Fail silently if current user doesn't have permissions.
6199	4774	if ( ! current_user_can( 'create_users' ) ) {
6200	4775	die( '' );
6201	4776	}
		@@ -6200,83 +4775,76 @@
6200	4775	die( '' );
6201	4776	}
6202	4777
6203	4778	// Nonce check.
6204		- if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), 'save_auth_settings' ) ) {
	4779	+ if ( empty( $_POST['nonce_save_auth_settings'] ) || ! wp_verify_nonce( $_POST['nonce_save_auth_settings'], 'save_auth_settings' ) ) {
6205	4780	die( '' );
6206	4781	}
6207	4782
6208	4783	// Fail if requesting a change to an invalid setting.
6209		- if ( ! isset( $_POST['setting'] ) || ! in_array( wp_unslash( $_POST['setting'] ), array( 'access_users_pending', 'access_users_approved', 'access_users_blocked' ), true ) ) {
	4784	+ if ( ! in_array( $_POST['setting'], array( 'access_users_pending', 'access_users_approved', 'access_users_blocked' ) ) ) {
6210	4785	die( '' );
6211	4786	}
6212	4787
6213		- // Track any emails that couldn't be added (used when adding users).
6214		- $invalid_emails = array();
6215		-
6216	4788	// Editing a pending list entry.
6217		- if ( 'access_users_pending' === $_POST['setting'] ) {
6218		- // Sanitize posted data.
6219		- $access_users_pending = array();
6220		- if ( isset( $_POST['access_users_pending'] ) && is_array( $_POST['access_users_pending'] ) ) {
6221		- $access_users_pending = $this->sanitize_update_auth_users( wp_unslash( $_POST['access_users_pending'] ) );
	4789	+ if ( $_POST['setting'] === 'access_users_pending' ) {
	4790	+ // Initialize posted data if empty.
	4791	+ if ( ! ( array_key_exists( 'access_users_pending', $_POST ) && is_array( $_POST['access_users_pending'] ) ) ) {
	4792	+ $_POST['access_users_pending'] = array();
6222	4793	}
6223	4794
6224	4795	// Deal with each modified user (add or remove).
6225		- foreach ( $access_users_pending as $pending_user ) {
	4796	+ foreach ( $_POST['access_users_pending'] as $pending_user ) {
6226	4797
6227		- if ( 'add' === $pending_user['edit_action'] ) {
	4798	+ if ( $pending_user['edit_action'] === 'add' ) {
6228	4799
6229	4800	// Add new user to pending list and save (skip if it's
6230	4801	// already there--someone else might have just done it).
6231	4802	if ( ! $this->is_email_in_list( $pending_user['email'], 'pending' ) ) {
6232	4803	$auth_settings_access_users_pending = $this->sanitize_user_list(
6233		- $this->get_plugin_option( 'access_users_pending', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	4804	+ $this->get_plugin_option( 'access_users_pending', SINGLE_ADMIN )
6234	4805	);
6235	4806	array_push( $auth_settings_access_users_pending, $pending_user );
6236	4807	update_option( 'auth_settings_access_users_pending', $auth_settings_access_users_pending );
6237	4808	}
6238		- } elseif ( 'remove' === $pending_user['edit_action'] ) {
6239	4809
6240		- // Remove user from pending list and save.
	4810	+ } elseif ( $pending_user['edit_action'] === 'remove' ) {
	4811	+
	4812	+ // Remove user from pending list and save
6241	4813	if ( $this->is_email_in_list( $pending_user['email'], 'pending' ) ) {
6242	4814	$auth_settings_access_users_pending = $this->sanitize_user_list(
6243		- $this->get_plugin_option( 'access_users_pending', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	4815	+ $this->get_plugin_option( 'access_users_pending', SINGLE_ADMIN )
6244	4816	);
6245	4817	foreach ( $auth_settings_access_users_pending as $key => $existing_user ) {
6246		- if ( 0 === strcasecmp( $pending_user['email'], $existing_user['email'] ) ) {
6247		- unset( $auth_settings_access_users_pending[ $key ] );
	4818	+ if ( $pending_user['email'] == $existing_user['email'] ) {
	4819	+ unset( $auth_settings_access_users_pending[$key] );
6248	4820	break;
6249	4821	}
6250	4822	}
6251	4823	update_option( 'auth_settings_access_users_pending', $auth_settings_access_users_pending );
6252	4824	}
	4825	+
6253	4826	}
6254	4827	}
6255	4828	}
6256	4829
6257	4830	// Editing an approved list entry.
6258		- if ( 'access_users_approved' === $_POST['setting'] ) {
6259		- // Sanitize posted data.
6260		- $access_users_approved = array();
6261		- if ( isset( $_POST['access_users_approved'] ) && is_array( $_POST['access_users_approved'] ) ) {
6262		- $access_users_approved = $this->sanitize_update_auth_users( wp_unslash( $_POST['access_users_approved'] ) );
	4831	+ if ( $_POST['setting'] === 'access_users_approved' ) {
	4832	+ // Initialize posted data if empty.
	4833	+ if ( ! ( array_key_exists( 'access_users_approved', $_POST ) && is_array( $_POST['access_users_approved'] ) ) ) {
	4834	+ $_POST['access_users_approved'] = array();
6263	4835	}
6264	4836
6265	4837	// Deal with each modified user (add, remove, or change_role).
6266		- foreach ( $access_users_approved as $approved_user ) {
6267		- // Skip blank entries.
6268		- if ( strlen( $approved_user['email'] ) < 1 ) {
6269		- continue;
6270		- }
	4838	+ foreach ( $_POST['access_users_approved'] as $approved_user ) {
6271	4839
6272	4840	// New user (create user, or add existing user to current site in multisite).
6273		- if ( 'add' === $approved_user['edit_action'] ) {
	4841	+ if ( $approved_user['edit_action'] === 'add' ) {
6274	4842	$new_user = get_user_by( 'email', $approved_user['email'] );
6275		- if ( false !== $new_user ) {
	4843	+ if ( $new_user !== false ) {
6276	4844	// If we're adding an existing multisite user, make sure their
6277	4845	// newly-assigned role is updated on all sites they are already in.
6278		- if ( is_multisite() && 'false' !== $approved_user['multisite_user'] ) {
	4846	+ if ( is_multisite() && $approved_user['multisite_user'] !== 'false' ) {
6279	4847	foreach ( get_blogs_of_user( $new_user->ID ) as $blog ) {
6280	4848	add_user_to_blog( $blog->userblog_id, $new_user->ID, $approved_user['role'] );
6281	4849	}
6282	4850	}
		@@ -6283,9 +4851,9 @@
6283	4851	// If this user already has an account on another site in the network, add them to this site.
6284	4852	if ( is_multisite() ) {
6285	4853	add_user_to_blog( get_current_blog_id(), $new_user->ID, $approved_user['role'] );
6286	4854	}
6287		- } elseif ( $approved_user['local_user'] && 'false' !== $approved_user['local_user'] ) {
	4855	+ } elseif ( $approved_user['local_user'] === 'true' ) {
6288	4856	// Create a WP account for this new *local* user and email the password.
6289	4857	$plaintext_password = wp_generate_password(); // random password
6290	4858	// If there's already a user with this username (e.g.,
6291	4859	// johndoe/johndoe@gmail.com exists, and we're trying to add
		@@ -6293,26 +4861,26 @@
6293	4861	// as the username.
6294	4862	$username = explode( '@', $approved_user['email'] );
6295	4863	$username = $username[0];
6296	4864	if ( get_user_by( 'login', $username ) !== false ) {
6297		- $username = $this->lowercase( $approved_user['email'] );
	4865	+ $username = $approved_user['email'];
6298	4866	}
6299		- if ( 'false' !== $approved_user['multisite_user'] ) {
	4867	+ if ( $approved_user['multisite_user'] !== 'false' ) {
6300	4868	$result = wpmu_create_user(
6301	4869	strtolower( $username ),
6302	4870	$plaintext_password,
6303		- $this->lowercase( $approved_user['email'] )
	4871	+ strtolower( $approved_user['email'] )
6304	4872	);
6305	4873	} else {
6306	4874	$result = wp_insert_user(
6307	4875	array(
6308		- 'user_login' => strtolower( $username ),
6309		- 'user_pass' => $plaintext_password,
6310		- 'first_name' => '',
6311		- 'last_name' => '',
6312		- 'user_email' => $this->lowercase( $approved_user['email'] ),
	4876	+ 'user_login' => strtolower( $username ),
	4877	+ 'user_pass' => $plaintext_password,
	4878	+ 'first_name' => '',
	4879	+ 'last_name' => '',
	4880	+ 'user_email' => strtolower( $approved_user['email'] ),
6313	4881	'user_registered' => date( 'Y-m-d H:i:s' ),
6314		- 'role' => $approved_user['role'],
	4882	+ 'role' => $approved_user['role'],
6315	4883	)
6316	4884	);
6317	4885	}
6318	4886	if ( ! is_wp_error( $result ) ) {
		@@ -6318,8 +4886,9 @@
6318	4886	if ( ! is_wp_error( $result ) ) {
6319	4887	// Email login credentials to new user.
6320	4888	wp_new_user_notification( $result, null, 'both' );
6321	4889	}
	4890	+
6322	4891	}
6323	4892
6324	4893	// Email new user welcome message if plugin option is set.
6325	4894	$this->maybe_email_welcome_message( $approved_user['email'] );
		@@ -6325,46 +4894,41 @@
6325	4894	$this->maybe_email_welcome_message( $approved_user['email'] );
6326	4895
6327	4896	// Add new user to approved list and save (skip if it's
6328	4897	// already there--someone else might have just done it).
6329		- if ( 'false' !== $approved_user['multisite_user'] ) {
	4898	+ if ( $approved_user['multisite_user'] !== 'false' ) {
6330	4899	if ( ! $this->is_email_in_list( $approved_user['email'], 'approved', 'multisite' ) ) {
6331	4900	$auth_multisite_settings_access_users_approved = $this->sanitize_user_list(
6332		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
	4901	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
6333	4902	);
6334		- $approved_user['date_added'] = date( 'M Y' );
	4903	+ $approved_user['date_added'] = date( 'M Y' );
6335	4904	array_push( $auth_multisite_settings_access_users_approved, $approved_user );
6336		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
6337		- } else {
6338		- $invalid_emails[] = $approved_user['email'];
	4905	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
6339	4906	}
6340	4907	} else {
6341	4908	if ( ! $this->is_email_in_list( $approved_user['email'], 'approved' ) ) {
6342	4909	$auth_settings_access_users_approved = $this->sanitize_user_list(
6343		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	4910	+ $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN )
6344	4911	);
6345		- $approved_user['date_added'] = date( 'M Y' );
	4912	+ $approved_user['date_added'] = date( 'M Y' );
6346	4913	array_push( $auth_settings_access_users_approved, $approved_user );
6347	4914	update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
6348		- } else {
6349		- $invalid_emails[] = $approved_user['email'];
6350	4915	}
6351	4916	}
6352	4917
6353	4918	// If we've added a new multisite user, go through all pending/approved/blocked lists
6354	4919	// on individual sites and remove this user from them (to prevent duplicate entries).
6355		- if ( 'false' !== $approved_user['multisite_user'] && is_multisite() ) {
	4920	+ if ( $approved_user['multisite_user'] !== 'false' && is_multisite() ) {
6356	4921	$list_names = array( 'access_users_pending', 'access_users_approved', 'access_users_blocked' );
6357		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
6358	4922	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
6359	4923	foreach ( $sites as $site ) {
6360	4924	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
6361	4925	foreach ( $list_names as $list_name ) {
6362		- $user_list = get_blog_option( $blog_id, 'auth_settings_' . $list_name, array() );
	4926	+ $user_list = get_blog_option( $blog_id, 'auth_settings_' . $list_name, array() );
6363	4927	$list_changed = false;
6364	4928	foreach ( $user_list as $key => $user ) {
6365		- if ( 0 === strcasecmp( $user['email'], $approved_user['email'] ) ) {
6366		- unset( $user_list[ $key ] );
	4929	+ if ( $user['email'] == $approved_user['email'] ) {
	4930	+ unset( $user_list[$key] );
6367	4931	$list_changed = true;
6368	4932	}
6369	4933	}
6370	4934	if ( $list_changed ) {
		@@ -6372,45 +4936,32 @@
6372	4936	}
6373	4937	}
6374	4938	}
6375	4939	}
6376		- } elseif ( 'remove' === $approved_user['edit_action'] ) { // Remove user from approved list and save (also remove their role if they have a WordPress account).
6377		- if ( 'false' !== $approved_user['multisite_user'] ) {
	4940	+
	4941	+ // Remove user from approved list and save
	4942	+ } elseif ( $approved_user['edit_action'] === 'remove' ) {
	4943	+ if ( $approved_user['multisite_user'] !== 'false' ) {
6378	4944	if ( $this->is_email_in_list( $approved_user['email'], 'approved', 'multisite' ) ) {
6379	4945	$auth_multisite_settings_access_users_approved = $this->sanitize_user_list(
6380		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
	4946	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
6381	4947	);
6382	4948	foreach ( $auth_multisite_settings_access_users_approved as $key => $existing_user ) {
6383		- if ( 0 === strcasecmp( $approved_user['email'], $existing_user['email'] ) ) {
6384		- // Remove role of the associated WordPress user from all blogs (but don't delete the user).
6385		- $user = get_user_by( 'email', $approved_user['email'] );
6386		- if ( false !== $user ) {
6387		- // Loop through all of the blogs this user is a member of and remove their capabilities.
6388		- foreach ( get_blogs_of_user( $user->ID ) as $blog ) {
6389		- remove_user_from_blog( $user->ID, $blog->userblog_id, '' );
6390		- }
6391		- }
6392		- // Remove entry from Approved Users list.
6393		- unset( $auth_multisite_settings_access_users_approved[ $key ] );
	4949	+ if ( $approved_user['email'] == $existing_user['email'] ) {
	4950	+ unset( $auth_multisite_settings_access_users_approved[$key] );
6394	4951	break;
6395	4952	}
6396	4953	}
6397		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	4954	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
6398	4955	}
6399	4956	} else {
6400	4957	if ( $this->is_email_in_list( $approved_user['email'], 'approved' ) ) {
6401	4958	$auth_settings_access_users_approved = $this->sanitize_user_list(
6402		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	4959	+ $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN )
6403	4960	);
6404	4961	foreach ( $auth_settings_access_users_approved as $key => $existing_user ) {
6405		- if ( 0 === strcasecmp( $approved_user['email'], $existing_user['email'] ) ) {
6406		- // Remove role of the associated WordPress user (but don't delete the user).
6407		- $user = get_user_by( 'email', $approved_user['email'] );
6408		- if ( false !== $user ) {
6409		- $user->set_role( '' );
6410		- }
6411		- // Remove entry from Approved Users list.
6412		- unset( $auth_settings_access_users_approved[ $key ] );
	4962	+ if ( $approved_user['email'] == $existing_user['email'] ) {
	4963	+ unset( $auth_settings_access_users_approved[$key] );
6413	4964	break;
6414	4965	}
6415	4966	}
6416	4967	update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
		@@ -6415,12 +4966,14 @@
6415	4966	}
6416	4967	update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
6417	4968	}
6418	4969	}
6419		- } elseif ( 'change_role' === $approved_user['edit_action'] ) { // Update user's role in WordPress.
	4970	+
	4971	+ // Update user's role in WordPress
	4972	+ } elseif ( $approved_user['edit_action'] === 'change_role' ) {
6420	4973	$changed_user = get_user_by( 'email', $approved_user['email'] );
6421	4974	if ( $changed_user ) {
6422		- if ( is_multisite() && 'false' !== $approved_user['multisite_user'] ) {
	4975	+ if ( is_multisite() && $approved_user['multisite_user'] !== 'false' ) {
6423	4976	foreach ( get_blogs_of_user( $changed_user->ID ) as $blog ) {
6424	4977	add_user_to_blog( $blog->userblog_id, $changed_user->ID, $approved_user['role'] );
6425	4978	}
6426	4979	} else {
		@@ -6427,30 +4980,30 @@
6427	4980	$changed_user->set_role( $approved_user['role'] );
6428	4981	}
6429	4982	}
6430	4983
6431		- if ( 'false' !== $approved_user['multisite_user'] ) {
	4984	+ if ( $approved_user['multisite_user'] !== 'false' ) {
6432	4985	if ( $this->is_email_in_list( $approved_user['email'], 'approved', 'multisite' ) ) {
6433	4986	$auth_multisite_settings_access_users_approved = $this->sanitize_user_list(
6434		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
	4987	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
6435	4988	);
6436	4989	foreach ( $auth_multisite_settings_access_users_approved as $key => $existing_user ) {
6437		- if ( 0 === strcasecmp( $approved_user['email'], $existing_user['email'] ) ) {
6438		- $auth_multisite_settings_access_users_approved[ $key ]['role'] = $approved_user['role'];
	4990	+ if ( $approved_user['email'] == $existing_user['email'] ) {
	4991	+ $auth_multisite_settings_access_users_approved[$key]['role'] = $approved_user['role'];
6439	4992	break;
6440	4993	}
6441	4994	}
6442		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	4995	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
6443	4996	}
6444	4997	} else {
6445	4998	// Update user's role in approved list and save.
6446	4999	if ( $this->is_email_in_list( $approved_user['email'], 'approved' ) ) {
6447	5000	$auth_settings_access_users_approved = $this->sanitize_user_list(
6448		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	5001	+ $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN )
6449	5002	);
6450	5003	foreach ( $auth_settings_access_users_approved as $key => $existing_user ) {
6451		- if ( 0 === strcasecmp( $approved_user['email'], $existing_user['email'] ) ) {
6452		- $auth_settings_access_users_approved[ $key ]['role'] = $approved_user['role'];
	5004	+ if ( $approved_user['email'] == $existing_user['email'] ) {
	5005	+ $auth_settings_access_users_approved[$key]['role'] = $approved_user['role'];
6453	5006	break;
6454	5007	}
6455	5008	}
6456	5009	update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
		@@ -6455,28 +5008,28 @@
6455	5008	}
6456	5009	update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
6457	5010	}
6458	5011	}
	5012	+
6459	5013	}
6460	5014	}
6461	5015	}
6462	5016
6463	5017	// Editing a blocked list entry.
6464		- if ( 'access_users_blocked' === $_POST['setting'] ) {
6465		- // Sanitize post data.
6466		- $access_users_blocked = array();
6467		- if ( isset( $_POST['access_users_blocked'] ) && is_array( $_POST['access_users_blocked'] ) ) {
6468		- $access_users_blocked = $this->sanitize_update_auth_users( wp_unslash( $_POST['access_users_blocked'] ) );
	5018	+ if ( $_POST['setting'] === 'access_users_blocked' ) {
	5019	+ // Initialize posted data if empty.
	5020	+ if ( ! ( array_key_exists( 'access_users_blocked', $_POST ) && is_array( $_POST['access_users_blocked'] ) ) ) {
	5021	+ $_POST['access_users_blocked'] = array();
6469	5022	}
6470	5023
6471	5024	// Deal with each modified user (add or remove).
6472		- foreach ( $access_users_blocked as $blocked_user ) {
	5025	+ foreach ( $_POST['access_users_blocked'] as $blocked_user ) {
6473	5026
6474		- if ( 'add' === $blocked_user['edit_action'] ) {
	5027	+ if ( $blocked_user['edit_action'] === 'add' ) {
6475	5028
6476	5029	// Add auth_blocked usermeta for the user.
6477	5030	$blocked_wp_user = get_user_by( 'email', $blocked_user['email'] );
6478		- if ( false !== $blocked_wp_user ) {
	5031	+ if ( $blocked_wp_user !== false ) {
6479	5032	update_user_meta( $blocked_wp_user->ID, 'auth_blocked', 'yes' );
6480	5033	}
6481	5034
6482	5035	// Add new user to blocked list and save (skip if it's
		@@ -6482,113 +5035,48 @@
6482	5035	// Add new user to blocked list and save (skip if it's
6483	5036	// already there--someone else might have just done it).
6484	5037	if ( ! $this->is_email_in_list( $blocked_user['email'], 'blocked' ) ) {
6485	5038	$auth_settings_access_users_blocked = $this->sanitize_user_list(
6486		- $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	5039	+ $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN )
6487	5040	);
6488		- $blocked_user['date_added'] = date( 'M Y' );
	5041	+ $blocked_user['date_added'] = date( 'M Y' );
6489	5042	array_push( $auth_settings_access_users_blocked, $blocked_user );
6490	5043	update_option( 'auth_settings_access_users_blocked', $auth_settings_access_users_blocked );
6491		- } else {
6492		- $invalid_emails[] = $blocked_user['email'];
6493	5044	}
6494		- } elseif ( 'remove' === $blocked_user['edit_action'] ) {
6495	5045
	5046	+ } elseif ( $blocked_user['edit_action'] === 'remove' ) {
	5047	+
6496	5048	// Remove auth_blocked usermeta for the user.
6497	5049	$unblocked_user = get_user_by( 'email', $blocked_user['email'] );
6498		- if ( false !== $unblocked_user ) {
	5050	+ if ( $unblocked_user !== false ) {
6499	5051	delete_user_meta( $unblocked_user->ID, 'auth_blocked', 'yes' );
6500	5052	}
6501	5053
6502		- // Remove user from blocked list and save.
	5054	+ // Remove user from blocked list and save
6503	5055	if ( $this->is_email_in_list( $blocked_user['email'], 'blocked' ) ) {
6504	5056	$auth_settings_access_users_blocked = $this->sanitize_user_list(
6505		- $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT )
	5057	+ $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN )
6506	5058	);
6507	5059	foreach ( $auth_settings_access_users_blocked as $key => $existing_user ) {
6508		- if ( 0 === strcasecmp( $blocked_user['email'], $existing_user['email'] ) ) {
6509		- unset( $auth_settings_access_users_blocked[ $key ] );
	5060	+ if ( $blocked_user['email'] == $existing_user['email'] ) {
	5061	+ unset( $auth_settings_access_users_blocked[$key] );
6510	5062	break;
6511	5063	}
6512	5064	}
6513	5065	update_option( 'auth_settings_access_users_blocked', $auth_settings_access_users_blocked );
6514	5066	}
	5067	+
6515	5068	}
6516	5069	}
6517	5070	}
6518	5071
6519		- // Send response to client.
6520		- $response = array(
6521		- 'success' => true,
6522		- 'invalid_emails' => $invalid_emails,
6523		- );
6524		- header( 'content-type: application/json' );
6525		- echo wp_json_encode( $response );
6526		- exit;
	5072	+ // Return 'success' value to AJAX call.
	5073	+ die( 'success' );
6527	5074	}
6528	5075
6529	5076
6530		- /**
6531		- * Sanitizes an array of user update commands coming from the AJAX handler in Authorizer Settings.
6532		- *
6533		- * Example $users array:
6534		- * array(
6535		- * array(
6536		- * edit_action: 'add' or 'remove' or 'change_role',
6537		- * email: 'johndoe@example.com',
6538		- * role: 'subscriber',
6539		- * date_added: 'Jun 2014',
6540		- * local_user: 'true' or 'false',
6541		- * multisite_user: 'true' or 'false',
6542		- * ),
6543		- * ...
6544		- * )
6545		- *
6546		- * @param array $users Users to edit.
6547		- * @return array Sanitized users to edit.
6548		- */
6549		- private function sanitize_update_auth_users( $users = array() ) {
6550		- if ( ! is_array( $users ) ) {
6551		- $users = array();
6552		- }
6553		- $users = array_map( array( $this, 'sanitize_update_auth_user' ), $users );
6554	5077
6555		- return $users;
6556		- }
6557		-
6558		-
6559	5078	/**
6560		- * Callback for array_map in sanitize_update_auth_users().
6561		- *
6562		- * @param array $user User data to sanitize.
6563		- * @return array Sanitized user data.
6564		- */
6565		- private function sanitize_update_auth_user( $user ) {
6566		- if ( array_key_exists( 'edit_action', $user ) ) {
6567		- $user['edit_action'] = sanitize_text_field( $user['edit_action'] );
6568		- }
6569		- if ( isset( $user['email'] ) ) {
6570		- $user['email'] = sanitize_email( $user['email'] );
6571		- }
6572		- if ( isset( $user['role'] ) ) {
6573		- $user['role'] = sanitize_text_field( $user['role'] );
6574		- }
6575		- if ( isset( $user['date_added'] ) ) {
6576		- $user['date_added'] = sanitize_text_field( $user['date_added'] );
6577		- }
6578		- if ( isset( $user['local_user'] ) ) {
6579		- $user['local_user'] = 'true' === $user['local_user'] ? 'true' : 'false';
6580		- }
6581		- if ( isset( $user['multisite_user'] ) ) {
6582		- $user['multisite_user'] = 'true' === $user['multisite_user'] ? 'true' : 'false';
6583		- }
6584		-
6585		- return $user;
6586		- }
6587		-
6588		-
6589		-
6590		- /**
6591	5079	* ***************************
6592	5080	* Helper functions
6593	5081	* ***************************
6594	5082	*/
		@@ -6596,20 +5084,20 @@
6596	5084
6597	5085	/**
6598	5086	* Retrieves a specific plugin option from db. Multisite enabled.
6599	5087	*
6600		- * @param string $option Option name.
6601		- * @param string $admin_mode WP_Plugin_Authorizer::NETWORK_CONTEXT will retrieve the multisite value.
6602		- * @param string $override_mode 'allow override' will retrieve the multisite value if it exists.
6603		- * @param string $print_mode 'print overlay' will output overlay that hides this option on the settings page.
6604		- * @return mixed Option value, or null on failure.
	5088	+ * @param string $option Option name
	5089	+ * @param string $admin_mode MULTISITE_ADMIN will retrieve the multisite value
	5090	+ * @param string $override_mode 'allow override' will retrieve the multisite value if it exists
	5091	+ * @param string $print_mode 'print overlay' will output overlay that hides this option on the settings page
	5092	+ * @return mixed Option value, or null on failure
6605	5093	*/
6606		- private function get_plugin_option( $option, $admin_mode = WP_Plugin_Authorizer::SINGLE_CONTEXT, $override_mode = 'no override', $print_mode = 'no overlay' ) {
	5094	+ private function get_plugin_option( $option, $admin_mode = SINGLE_ADMIN, $override_mode = 'no override', $print_mode = 'no overlay' ) {
6607	5095	// Special case for user lists (they are saved seperately to prevent concurrency issues).
6608		- if ( in_array( $option, array( 'access_users_pending', 'access_users_approved', 'access_users_blocked' ), true ) ) {
6609		- $list = WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode ? array() : get_option( 'auth_settings_' . $option );
6610		- if ( is_multisite() && WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode ) {
6611		- $list = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_' . $option, array() );
	5096	+ if ( in_array( $option, array( 'access_users_pending', 'access_users_approved', 'access_users_blocked' ) ) ) {
	5097	+ $list = $admin_mode === MULTISITE_ADMIN ? array() : get_option( 'auth_settings_' . $option );
	5098	+ if ( is_multisite() && $admin_mode === MULTISITE_ADMIN ) {
	5099	+ $list = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_' . $option, array() );
6612	5100	}
6613	5101	return $list;
6614	5102	}
6615	5103
		@@ -6623,26 +5111,24 @@
6623	5111
6624	5112	// If requested and appropriate, print the overlay hiding the
6625	5113	// single site option that is overridden by a multisite option.
6626	5114	if (
6627		- WP_Plugin_Authorizer::NETWORK_CONTEXT !== $admin_mode &&
6628		- 'allow override' === $override_mode &&
6629		- 'print overlay' === $print_mode &&
	5115	+ $admin_mode !== MULTISITE_ADMIN &&
	5116	+ $override_mode === 'allow override' &&
	5117	+ $print_mode === 'print overlay' &&
6630	5118	array_key_exists( 'multisite_override', $auth_settings ) &&
6631		- '1' === $auth_settings['multisite_override'] &&
6632		- ( ! array_key_exists( 'advanced_override_multisite', $auth_settings ) || 1 !== intval( $auth_settings['advanced_override_multisite'] ) )
	5119	+ $auth_settings['multisite_override'] === '1' &&
	5120	+ ( ! array_key_exists( 'advanced_override_multisite', $auth_settings ) || $auth_settings['advanced_override_multisite'] != '1' )
6633	5121	) {
6634	5122	// Get original plugin options (not overridden value). We'll
6635	5123	// show this old value behind the disabled overlay.
6636		- // $auth_settings = $this->get_plugin_options( $admin_mode, 'no override' );
6637		- // (This feature is disabled).
6638		- //
	5124	+ $auth_settings = $this->get_plugin_options( $admin_mode, 'no override' );
	5125	+
6639	5126	$name = "auth_settings[$option]";
6640		- $id = "auth_settings_$option";
6641		- ?>
6642		- <div id="overlay-hide-auth_settings_<?php echo esc_attr( $option ); ?>" class="auth_multisite_override_overlay">
	5127	+ $id = "auth_settings_$option"; ?>
	5128	+ <div id="overlay-hide-auth_settings_<?php echo $option; ?>" class="auth_multisite_override_overlay">
6643	5129	<span class="overlay-note">
6644		- <?php esc_html_e( 'This setting is overridden by a', 'authorizer' ); ?> <a href="<?php echo esc_attr( network_admin_url( 'admin.php?page=authorizer' ) ); ?>"><?php esc_html_e( 'multisite option', 'authorizer' ); ?></a>.
	5130	+ <?php _e( 'This setting is overridden by a', 'authorizer' ); ?> <a href="<?php echo network_admin_url( 'admin.php?page=authorizer&tab=external' ); ?>"><?php _e( 'multisite option', 'authorizer' ); ?></a>.
6645	5131	</span>
6646	5132	</div>
6647	5133	<?php
6648	5134	}
		@@ -6648,9 +5134,9 @@
6648	5134	}
6649	5135
6650	5136	// If we're getting an option in a site that has overridden the multisite override, make
6651	5137	// sure we are returning the option value from that site (not the multisite value).
6652		- if ( array_key_exists( 'advanced_override_multisite', $auth_settings ) && 1 === intval( $auth_settings['advanced_override_multisite'] ) ) {
	5138	+ if ( array_key_exists( 'advanced_override_multisite', $auth_settings ) && $auth_settings['advanced_override_multisite'] == '1' ) {
6653	5139	$auth_settings = $this->get_plugin_options( $admin_mode, 'no override' );
6654	5140	}
6655	5141
6656	5142	// Set option to null if it wasn't found.
		@@ -6657,115 +5143,98 @@
6657	5143	if ( ! array_key_exists( $option, $auth_settings ) ) {
6658	5144	return null;
6659	5145	}
6660	5146
6661		- return $auth_settings[ $option ];
	5147	+ return $auth_settings[$option];
6662	5148	}
6663	5149
6664	5150	/**
6665	5151	* Retrieves all plugin options from db. Multisite enabled.
6666	5152	*
6667		- * @param string $admin_mode WP_Plugin_Authorizer::NETWORK_CONTEXT will retrieve the multisite value.
6668		- * @param string $override_mode 'allow override' will retrieve the multisite value if it exists.
6669		- * @return mixed Option value, or null on failure.
	5153	+ * @param string $admin_mode MULTISITE_ADMIN will retrieve the multisite value
	5154	+ * @param string $override_mode 'allow override' will retrieve the multisite value if it exists
	5155	+ * @return mixed Option value, or null on failure
6670	5156	*/
6671		- private function get_plugin_options( $admin_mode = WP_Plugin_Authorizer::SINGLE_CONTEXT, $override_mode = 'no override' ) {
6672		- // Grab plugin settings (skip if in WP_Plugin_Authorizer::NETWORK_CONTEXT mode).
6673		- $auth_settings = WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode ? array() : get_option( 'auth_settings' );
	5157	+ private function get_plugin_options( $admin_mode = SINGLE_ADMIN, $override_mode = 'no override' ) {
	5158	+ // Grab plugin settings (skip if in MULTISITE_ADMIN mode).
	5159	+ $auth_settings = $admin_mode === MULTISITE_ADMIN ? array() : get_option( 'auth_settings' );
6674	5160
6675	5161	// Initialize to default values if the plugin option doesn't exist.
6676		- if ( false === $auth_settings ) {
	5162	+ if ( $auth_settings === FALSE ) {
6677	5163	$auth_settings = $this->set_default_options();
6678	5164	}
6679	5165
6680	5166	// Merge multisite options if we're in a network and the current site hasn't overridden multisite settings.
6681		- if ( is_multisite() && ( ! array_key_exists( 'advanced_override_multisite', $auth_settings ) || 1 !== intval( $auth_settings['advanced_override_multisite'] ) ) ) {
	5167	+ if ( is_multisite() && ( ! array_key_exists( 'advanced_override_multisite', $auth_settings ) || $auth_settings['advanced_override_multisite'] != '1' ) ) {
6682	5168	// Get multisite options.
6683		- $auth_multisite_settings = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', array() );
	5169	+ $auth_multisite_settings = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', array() );
6684	5170
6685	5171	// Return the multisite options if we're viewing the network admin options page.
6686	5172	// Otherwise override options with their multisite equivalents.
6687		- if ( WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode ) {
	5173	+ if ( $admin_mode === MULTISITE_ADMIN ) {
6688	5174	$auth_settings = $auth_multisite_settings;
6689	5175	} elseif (
6690		- 'allow override' === $override_mode &&
	5176	+ $override_mode === 'allow override' &&
6691	5177	array_key_exists( 'multisite_override', $auth_multisite_settings ) &&
6692		- '1' === $auth_multisite_settings['multisite_override']
	5178	+ $auth_multisite_settings['multisite_override'] === '1'
6693	5179	) {
6694	5180	// Keep track of the multisite override selection.
6695	5181	$auth_settings['multisite_override'] = $auth_multisite_settings['multisite_override'];
6696	5182
6697		- /**
6698		- * Note: the options below should be the complete list of overridden
6699		- * options. It is *not* the complete list of all options (some options
6700		- * don't have a multisite equivalent).
6701		- */
	5183	+ // Note: the options below should be the complete list of
	5184	+ // overridden options. It is *not* the complete list of all
	5185	+ // options (some options don't have a multisite equivalent)
6702	5186
6703		- /**
6704		- * Note: access_users_approved, access_users_pending, and
6705		- * access_users_blocked do not get overridden. However, since
6706		- * access_users_approved has a multisite equivalent, you must retrieve
6707		- * them both seperately. This is done because the two lists should be
6708		- * treated differently.
6709		- *
6710		- * $approved_users = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
6711		- * $ms_approved_users = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT );
6712		- */
	5187	+ // Note: access_users_approved, access_users_pending, and
	5188	+ // access_users_blocked do not get overridden. However,
	5189	+ // since access_users_approved has a multisite equivalent,
	5190	+ // you must retrieve them both seperately. This is done
	5191	+ // because the two lists should be treated differently.
	5192	+ // $approved_users = $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN );
	5193	+ // $ms_approved_users = $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN );
6713	5194
6714		- // Override external services (google, cas, or ldap) and associated options.
6715		- $auth_settings['google'] = $auth_multisite_settings['google'];
6716		- $auth_settings['google_clientid'] = $auth_multisite_settings['google_clientid'];
6717		- $auth_settings['google_clientsecret'] = $auth_multisite_settings['google_clientsecret'];
6718		- $auth_settings['google_hosteddomain'] = $auth_multisite_settings['google_hosteddomain'];
6719		- $auth_settings['cas'] = $auth_multisite_settings['cas'];
6720		- $auth_settings['cas_custom_label'] = $auth_multisite_settings['cas_custom_label'];
6721		- $auth_settings['cas_host'] = $auth_multisite_settings['cas_host'];
6722		- $auth_settings['cas_port'] = $auth_multisite_settings['cas_port'];
6723		- $auth_settings['cas_path'] = $auth_multisite_settings['cas_path'];
6724		- $auth_settings['cas_version'] = $auth_multisite_settings['cas_version'];
6725		- $auth_settings['cas_attr_email'] = $auth_multisite_settings['cas_attr_email'];
6726		- $auth_settings['cas_attr_first_name'] = $auth_multisite_settings['cas_attr_first_name'];
6727		- $auth_settings['cas_attr_last_name'] = $auth_multisite_settings['cas_attr_last_name'];
6728		- $auth_settings['cas_attr_update_on_login'] = $auth_multisite_settings['cas_attr_update_on_login'];
6729		- $auth_settings['cas_auto_login'] = $auth_multisite_settings['cas_auto_login'];
6730		- $auth_settings['ldap'] = $auth_multisite_settings['ldap'];
6731		- $auth_settings['ldap_host'] = $auth_multisite_settings['ldap_host'];
6732		- $auth_settings['ldap_port'] = $auth_multisite_settings['ldap_port'];
6733		- $auth_settings['ldap_tls'] = $auth_multisite_settings['ldap_tls'];
6734		- $auth_settings['ldap_search_base'] = $auth_multisite_settings['ldap_search_base'];
6735		- $auth_settings['ldap_uid'] = $auth_multisite_settings['ldap_uid'];
6736		- $auth_settings['ldap_attr_email'] = $auth_multisite_settings['ldap_attr_email'];
6737		- $auth_settings['ldap_user'] = $auth_multisite_settings['ldap_user'];
6738		- $auth_settings['ldap_password'] = $auth_multisite_settings['ldap_password'];
6739		- $auth_settings['ldap_lostpassword_url'] = $auth_multisite_settings['ldap_lostpassword_url'];
6740		- $auth_settings['ldap_attr_first_name'] = $auth_multisite_settings['ldap_attr_first_name'];
6741		- $auth_settings['ldap_attr_last_name'] = $auth_multisite_settings['ldap_attr_last_name'];
	5195	+ // Override external services (google, cas, or ldap) and associated options
	5196	+ $auth_settings['google'] = $auth_multisite_settings['google'];
	5197	+ $auth_settings['google_clientid'] = $auth_multisite_settings['google_clientid'];
	5198	+ $auth_settings['google_clientsecret'] = $auth_multisite_settings['google_clientsecret'];
	5199	+ $auth_settings['google_hosteddomain'] = $auth_multisite_settings['google_hosteddomain'];
	5200	+ $auth_settings['cas'] = $auth_multisite_settings['cas'];
	5201	+ $auth_settings['cas_custom_label'] = $auth_multisite_settings['cas_custom_label'];
	5202	+ $auth_settings['cas_host'] = $auth_multisite_settings['cas_host'];
	5203	+ $auth_settings['cas_port'] = $auth_multisite_settings['cas_port'];
	5204	+ $auth_settings['cas_path'] = $auth_multisite_settings['cas_path'];
	5205	+ $auth_settings['cas_version'] = $auth_multisite_settings['cas_version'];
	5206	+ $auth_settings['cas_attr_email'] = $auth_multisite_settings['cas_attr_email'];
	5207	+ $auth_settings['cas_attr_first_name'] = $auth_multisite_settings['cas_attr_first_name'];
	5208	+ $auth_settings['cas_attr_last_name'] = $auth_multisite_settings['cas_attr_last_name'];
	5209	+ $auth_settings['cas_attr_update_on_login'] = $auth_multisite_settings['cas_attr_update_on_login'];
	5210	+ $auth_settings['cas_auto_login'] = $auth_multisite_settings['cas_auto_login'];
	5211	+ $auth_settings['ldap'] = $auth_multisite_settings['ldap'];
	5212	+ $auth_settings['ldap_host'] = $auth_multisite_settings['ldap_host'];
	5213	+ $auth_settings['ldap_port'] = $auth_multisite_settings['ldap_port'];
	5214	+ $auth_settings['ldap_tls'] = $auth_multisite_settings['ldap_tls'];
	5215	+ $auth_settings['ldap_search_base'] = $auth_multisite_settings['ldap_search_base'];
	5216	+ $auth_settings['ldap_uid'] = $auth_multisite_settings['ldap_uid'];
	5217	+ $auth_settings['ldap_attr_email'] = $auth_multisite_settings['ldap_attr_email'];
	5218	+ $auth_settings['ldap_user'] = $auth_multisite_settings['ldap_user'];
	5219	+ $auth_settings['ldap_password'] = $auth_multisite_settings['ldap_password'];
	5220	+ $auth_settings['ldap_lostpassword_url'] = $auth_multisite_settings['ldap_lostpassword_url'];
	5221	+ $auth_settings['ldap_attr_first_name'] = $auth_multisite_settings['ldap_attr_first_name'];
	5222	+ $auth_settings['ldap_attr_last_name'] = $auth_multisite_settings['ldap_attr_last_name'];
6742	5223	$auth_settings['ldap_attr_update_on_login'] = $auth_multisite_settings['ldap_attr_update_on_login'];
6743	5224
6744		- // Override access_who_can_login and access_who_can_view.
	5225	+ // Override access_who_can_login and access_who_can_view
6745	5226	$auth_settings['access_who_can_login'] = $auth_multisite_settings['access_who_can_login'];
6746		- $auth_settings['access_who_can_view'] = $auth_multisite_settings['access_who_can_view'];
	5227	+ $auth_settings['access_who_can_view'] = $auth_multisite_settings['access_who_can_view'];
6747	5228
6748		- // Override access_default_role.
	5229	+ // Override access_default_role
6749	5230	$auth_settings['access_default_role'] = $auth_multisite_settings['access_default_role'];
6750	5231
6751		- // Override lockouts.
	5232	+ // Override lockouts
6752	5233	$auth_settings['advanced_lockouts'] = $auth_multisite_settings['advanced_lockouts'];
6753	5234
6754		- // Override Hide WordPress login.
	5235	+ // Override Hide WordPress login
6755	5236	$auth_settings['advanced_hide_wp_login'] = $auth_multisite_settings['advanced_hide_wp_login'];
6756		-
6757		- // Override Users per page.
6758		- $auth_settings['advanced_users_per_page'] = $auth_multisite_settings['advanced_users_per_page'];
6759		-
6760		- // Override Sort users by.
6761		- $auth_settings['advanced_users_sort_by'] = $auth_multisite_settings['advanced_users_sort_by'];
6762		-
6763		- // Override Sort users order.
6764		- $auth_settings['advanced_users_sort_order'] = $auth_multisite_settings['advanced_users_sort_order'];
6765		-
6766		- // Override Show Dashboard Widget.
6767		- $auth_settings['advanced_widget_enabled'] = $auth_multisite_settings['advanced_widget_enabled'];
6768	5237	}
6769	5238	}
6770	5239	return $auth_settings;
6771	5240	}
		@@ -6772,27 +5241,23 @@
6772	5241
6773	5242
6774	5243	/**
6775	5244	* Remove user from authorizer lists when that user is deleted in WordPress.
6776		- *
6777		- * Action: delete_user
6778		- *
6779		- * @param int $user_id User ID to remove.
6780		- * @return void
	5245	+ * Run on action hook: delete_user
6781	5246	*/
6782		- public function remove_user_from_authorizer_when_deleted( $user_id ) {
6783		- $user = get_user_by( 'id', $user_id );
	5247	+ function remove_user_from_authorizer_when_deleted( $user_id ) {
	5248	+ $user = get_user_by( 'id', $user_id );
6784	5249	$deleted_email = $user->user_email;
6785	5250
6786	5251	// Remove user from pending/approved lists and save.
6787	5252	$list_names = array( 'access_users_pending', 'access_users_approved' );
6788	5253	foreach ( $list_names as $list_name ) {
6789		- $user_list = $this->sanitize_user_list( $this->get_plugin_option( $list_name, WP_Plugin_Authorizer::SINGLE_CONTEXT ) );
	5254	+ $user_list = $this->sanitize_user_list( $this->get_plugin_option( $list_name, SINGLE_ADMIN ) );
6790	5255	$list_changed = false;
6791	5256	foreach ( $user_list as $key => $existing_user ) {
6792		- if ( 0 === strcasecmp( $deleted_email, $existing_user['email'] ) ) {
	5257	+ if ( $deleted_email === $existing_user['email'] ) {
6793	5258	$list_changed = true;
6794		- unset( $user_list[ $key ] );
	5259	+ unset( $user_list[$key] );
6795	5260	}
6796	5261	}
6797	5262	if ( $list_changed ) {
6798	5263	update_option( 'auth_settings_' . $list_name, $user_list );
		@@ -6802,35 +5267,30 @@
6802	5267
6803	5268
6804	5269	/**
6805	5270	* Remove multisite user from authorizer lists when that user is deleted from Network Users.
6806		- *
6807		- * Action: wpmu_delete_user
6808		- *
6809		- * @param int $user_id User ID to remove.
6810		- * @return void
	5271	+ * Run on action hook: wpmu_delete_user
6811	5272	*/
6812		- public function remove_network_user_from_authorizer_when_deleted( $user_id ) {
6813		- $user = get_user_by( 'id', $user_id );
	5273	+ function remove_network_user_from_authorizer_when_deleted( $user_id ) {
	5274	+ $user = get_user_by( 'id', $user_id );
6814	5275	$deleted_email = $user->user_email;
6815	5276
6816	5277	// Go through multisite approved user list and remove this user.
6817	5278	$auth_multisite_settings_access_users_approved = $this->sanitize_user_list(
6818		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
	5279	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
6819	5280	);
6820		- $list_changed = false;
	5281	+ $list_changed = false;
6821	5282	foreach ( $auth_multisite_settings_access_users_approved as $key => $existing_user ) {
6822		- if ( 0 === strcasecmp( $deleted_email, $existing_user['email'] ) ) {
	5283	+ if ( $deleted_email === $existing_user['email'] ) {
6823	5284	$list_changed = true;
6824		- unset( $auth_multisite_settings_access_users_approved[ $key ] );
	5285	+ unset( $auth_multisite_settings_access_users_approved[$key] );
6825	5286	}
6826	5287	}
6827	5288	if ( $list_changed ) {
6828		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	5289	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
6829	5290	}
6830	5291
6831	5292	// Go through all pending/approved lists on individual sites and remove this user from them.
6832		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
6833	5293	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
6834	5294	foreach ( $sites as $site ) {
6835	5295	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
6836	5296	$this->remove_network_user_from_site_when_removed( $user_id, $blog_id );
		@@ -6840,27 +5300,22 @@
6840	5300
6841	5301
6842	5302	/**
6843	5303	* Remove multisite user from a specific site's lists when that user is removed from the site.
6844		- *
6845		- * Action: remove_user_from_blog
6846		- *
6847		- * @param int $user_id User ID to remove.
6848		- * @param int $blog_id Blog ID to remove from.
6849		- * @return void
	5304	+ * Run on action hook: remove_user_from_blog
6850	5305	*/
6851		- public function remove_network_user_from_site_when_removed( $user_id, $blog_id ) {
6852		- $user = get_user_by( 'id', $user_id );
	5306	+ function remove_network_user_from_site_when_removed( $user_id, $blog_id ) {
	5307	+ $user = get_user_by( 'id', $user_id );
6853	5308	$deleted_email = $user->user_email;
6854	5309
6855	5310	$list_names = array( 'access_users_pending', 'access_users_approved' );
6856	5311	foreach ( $list_names as $list_name ) {
6857		- $user_list = get_blog_option( $blog_id, 'auth_settings_' . $list_name, array() );
	5312	+ $user_list = get_blog_option( $blog_id, 'auth_settings_' . $list_name, array() );
6858	5313	$list_changed = false;
6859	5314	foreach ( $user_list as $key => $existing_user ) {
6860		- if ( 0 === strcasecmp( $deleted_email, $existing_user['email'] ) ) {
	5315	+ if ( $deleted_email === $existing_user['email'] ) {
6861	5316	$list_changed = true;
6862		- unset( $user_list[ $key ] );
	5317	+ unset( $user_list[$key] );
6863	5318	}
6864	5319	}
6865	5320	if ( $list_changed ) {
6866	5321	update_blog_option( $blog_id, 'auth_settings_' . $list_name, $user_list );
		@@ -6870,30 +5325,26 @@
6870	5325
6871	5326
6872	5327	/**
6873	5328	* Helper: Add multisite user to a specific site's approved list.
6874		- *
6875		- * @param int $user_id User ID to add.
6876		- * @param int $blog_id Blog ID to add to.
6877		- * @return void
6878	5329	*/
6879		- private function add_network_user_to_site( $user_id, $blog_id ) {
	5330	+ function add_network_user_to_site( $user_id, $blog_id ) {
6880	5331	// Switch to blog.
6881	5332	switch_to_blog( $blog_id );
6882	5333
6883	5334	// Get user details and role.
6884		- $access_default_role = $this->get_plugin_option( 'access_default_role', WP_Plugin_Authorizer::SINGLE_CONTEXT, 'allow override' );
6885		- $user = get_user_by( 'id', $user_id );
6886		- $user_email = $user->user_email;
6887		- $user_role = $user && is_array( $user->roles ) && count( $user->roles ) > 0 ? $user->roles[0] : $access_default_role;
	5335	+ $access_default_role = $this->get_plugin_option( 'access_default_role', SINGLE_ADMIN, 'allow override' );
	5336	+ $user = get_user_by( 'id', $user_id );
	5337	+ $user_email = $user->user_email;
	5338	+ $user_role = $user && is_array( $user->roles ) && count( $user->roles ) > 0 ? $user->roles[0] : $access_default_role;
6888	5339
6889	5340	// Add user to approved list if not already there and not in blocked list.
6890		- $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
6891		- $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT );
	5341	+ $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN );
	5342	+ $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN );
6892	5343	if ( ! $this->in_multi_array( $user_email, $auth_settings_access_users_approved ) && ! $this->in_multi_array( $user_email, $auth_settings_access_users_blocked ) ) {
6893	5344	$approved_user = array(
6894		- 'email' => $this->lowercase( $user_email ),
6895		- 'role' => $user_role,
	5345	+ 'email' => $user_email,
	5346	+ 'role' => $user_role,
6896	5347	'date_added' => date( 'M Y', strtotime( $user->user_registered ) ),
6897	5348	'local_user' => true,
6898	5349	);
6899	5350	array_push( $auth_settings_access_users_approved, $approved_user );
		@@ -6910,17 +5361,17 @@
6910	5361	* When an existing user is invited to the current site (or a new user is created),
6911	5362	* add them to the authorizer approved list. This action fires when the admin
6912	5363	* doesn't select the "Skip Confirmation Email" option.
6913	5364	*
6914		- * Action: invite_user
	5365	+ * @action invite_user
6915	5366	*
6916		- * @param int $user_id The invited user's ID.
6917		- * @param array $role The role of the invited user (or none if a new user creation).
	5367	+ * @param int $user_id The invited user's ID.
	5368	+ * @param array $role The role of the invited user (or none if a new user creation).
6918	5369	* @param string $newuser_key The key of the invitation.
6919	5370	*/
6920		- public function add_existing_user_to_authorizer_when_created( $user_id, $role = array(), $newuser_key = '' ) {
	5371	+ function add_existing_user_to_authorizer_when_created( $user_id, $role = array(), $newuser_key = '' ) {
6921	5372	$user = get_user_by( 'id', $user_id );
6922		- $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->roles, $role );
	5373	+ $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->user_roles, $role );
6923	5374	}
6924	5375
6925	5376
6926	5377	/**
		@@ -6928,16 +5379,16 @@
6928	5379	* When an existing user is invited to the current site (or a new user is created),
6929	5380	* add them to the authorizer approved list. This action fires when the admin
6930	5381	* selects the "Skip Confirmation Email" option.
6931	5382	*
6932		- * Action: added_existing_user
	5383	+ * @action added_existing_user
6933	5384	*
6934		- * @param int $user_id The invited user's ID.
6935		- * @param mixed $result True on success or a WP_Error object if the user doesn't exist.
	5385	+ * @param int $user_id The invited user's ID.
	5386	+ * @param mixed $result True on success or a WP_Error object if the user doesn't exist.
6936	5387	*/
6937		- public function add_existing_user_to_authorizer_when_created_noconfirmation( $user_id, $result ) {
	5388	+ function add_existing_user_to_authorizer_when_created_noconfirmation( $user_id, $result ) {
6938	5389	$user = get_user_by( 'id', $user_id );
6939		- $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->roles );
	5390	+ $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->user_roles );
6940	5391	}
6941	5392
6942	5393
6943	5394	/**
		@@ -6944,18 +5395,17 @@
6944	5395	* Multisite:
6945	5396	* When a new user is invited to the current site (or a new user is created),
6946	5397	* add them to the authorizer approved list.
6947	5398	*
6948		- * Action: after_signup_user
	5399	+ * @action after_signup_user
6949	5400	*
6950		- * @param string $user User's requested login name.
	5401	+ * @param string $user User's requested login name.
6951	5402	* @param string $user_email User's email address.
6952		- * @param string $key User's activation key.
6953		- * @param array $meta Additional signup meta, including initially set roles.
	5403	+ * @param string $key User's activation key.
	5404	+ * @param array $meta Additional signup meta.
6954	5405	*/
6955		- public function add_new_user_to_authorizer_when_created( $user, $user_email, $key, $meta ) {
6956		- $user_roles = isset( $meta['new_role'] ) ? array( $meta['new_role'] ) : array();
6957		- $this->add_user_to_authorizer_when_created( $user_email, time(), $user_roles );
	5406	+ function add_new_user_to_authorizer_when_created( $user, $user_email, $key, $meta ) {
	5407	+ $this->add_user_to_authorizer_when_created( $user_email, time() );
6958	5408	}
6959	5409
6960	5410
6961	5411	/**
		@@ -6962,18 +5412,17 @@
6962	5412	* Single site:
6963	5413	* When a new user is added in single site mode, add them to the authorizer
6964	5414	* approved list.
6965	5415	*
6966		- * Action: edit_user_created_user
	5416	+ * @action edit_user_created_user
6967	5417	*
6968		- * @param int $user_id ID of the newly created user.
6969		- * @param string $notify Type of notification that should happen. See
6970		- * wp_send_new_user_notifications() for more
6971		- * information on possible values.
	5418	+ * @param int $user_id ID of the newly created user.
	5419	+ * @param string $notify Type of notification that should happen. See wp_send_new_user_notifications()
	5420	+ * for more information on possible values.
6972	5421	*/
6973		- public function add_new_user_to_authorizer_when_created_single_site( $user_id, $notify ) {
	5422	+ function add_new_user_to_authorizer_when_created_single_site( $user_id, $notify ) {
6974	5423	$user = get_user_by( 'id', $user_id );
6975		- $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->roles );
	5424	+ $this->add_user_to_authorizer_when_created( $user->user_email, $user->user_registered, $user->user_roles );
6976	5425	}
6977	5426
6978	5427
6979	5428	/**
		@@ -6978,19 +5427,14 @@
6978	5427
6979	5428	/**
6980	5429	* Helper: When a new user is added/invited to the current site (or a new
6981	5430	* user is created), add them to the authorizer approved list.
6982		- *
6983		- * @param string $user_email Email address of user to add.
6984		- * @param string $date_registered Date user registered.
6985		- * @param array $user_roles Role to add for user.
6986		- * @param array $default_role Default role, if no role specified.
6987	5431	*/
6988	5432	private function add_user_to_authorizer_when_created( $user_email, $date_registered, $user_roles = array(), $default_role = array() ) {
6989		- $auth_multisite_settings_access_users_approved = is_multisite() ? get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', array() ) : array();
6990		- $auth_settings_access_users_pending = $this->get_plugin_option( 'access_users_pending', WP_Plugin_Authorizer::SINGLE_CONTEXT );
6991		- $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
6992		- $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT );
	5433	+ $auth_multisite_settings_access_users_approved = is_multisite() ? get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', array() ) : array();
	5434	+ $auth_settings_access_users_pending = $this->get_plugin_option( 'access_users_pending', SINGLE_ADMIN );
	5435	+ $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN );
	5436	+ $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN );
6993	5437
6994	5438	// Get default role if one isn't specified.
6995	5439	if ( count( $default_role ) < 1 ) {
6996	5440	$default_role = '';
		@@ -7005,10 +5449,10 @@
7005	5449	return;
7006	5450	}
7007	5451	// Remove from pending list if there.
7008	5452	foreach ( $auth_settings_access_users_pending as $key => $pending_user ) {
7009		- if ( 0 === strcasecmp( $pending_user['email'], $user_email ) ) {
7010		- unset( $auth_settings_access_users_pending[ $key ] );
	5453	+ if ( $pending_user['email'] == $user_email ) {
	5454	+ unset( $auth_settings_access_users_pending[$key] );
7011	5455	$updated = true;
7012	5456	}
7013	5457	}
7014	5458	// Skip if user is in multisite approved list.
		@@ -7017,10 +5461,10 @@
7017	5461	}
7018	5462	// Add to approved list if not there.
7019	5463	if ( ! $this->in_multi_array( $user_email, $auth_settings_access_users_approved ) ) {
7020	5464	$approved_user = array(
7021		- 'email' => $this->lowercase( $user_email ),
7022		- 'role' => is_array( $user_roles ) && count( $user_roles ) > 0 ? $user_roles[0] : $default_role,
	5465	+ 'email' => $user_email,
	5466	+ 'role' => is_array( $user_roles ) && count( $user_roles ) > 0 ? $user_roles[0] : $default_role,
7023	5467	'date_added' => date( 'M Y', strtotime( $date_registered ) ),
7024	5468	'local_user' => true,
7025	5469	);
7026	5470	array_push( $auth_settings_access_users_approved, $approved_user );
		@@ -7039,33 +5483,32 @@
7039	5483	* When a user is granted super admin status (checkbox on network user edit
7040	5484	* screen), add them to the authorizer network approved list. Also remove
7041	5485	* them from pending/approved list on any individual sites.
7042	5486	*
7043		- * Action: grant_super_admin
	5487	+ * @action grant_super_admin
7044	5488	*
7045	5489	* @param int $user_id The user's ID.
7046	5490	*/
7047		- public function grant_super_admin__add_to_network_approved( $user_id ) {
7048		- $user = get_user_by( 'id', $user_id );
	5491	+ function grant_super_admin__add_to_network_approved( $user_id ) {
	5492	+ $user = get_user_by( 'id', $user_id );
7049	5493	$user_email = $user->user_email;
7050	5494
7051	5495	// Add user to multisite approved user list (if not already there).
7052	5496	$auth_multisite_settings_access_users_approved = $this->sanitize_user_list(
7053		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
	5497	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
7054	5498	);
7055	5499	if ( ! $this->in_multi_array( $user_email, $auth_multisite_settings_access_users_approved ) ) {
7056	5500	$multisite_approved_user = array(
7057		- 'email' => $this->lowercase( $user_email ),
7058		- 'role' => count( $user->roles ) > 0 ? $user->roles[0] : 'administrator',
	5501	+ 'email' => $user_email,
	5502	+ 'role' => count( $user->roles ) > 0 ? $user->roles[0] : 'administrator',
7059	5503	'date_added' => date( 'M Y', strtotime( $user->user_registered ) ),
7060	5504	'local_user' => true,
7061	5505	);
7062	5506	array_push( $auth_multisite_settings_access_users_approved, $multisite_approved_user );
7063		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	5507	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
7064	5508	}
7065	5509
7066	5510	// Go through all pending/approved lists on individual sites and remove this user from them.
7067		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
7068	5511	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7069	5512	foreach ( $sites as $site ) {
7070	5513	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7071	5514	$this->remove_network_user_from_site_when_removed( $user_id, $blog_id );
		@@ -7078,29 +5521,29 @@
7078	5521	* When a user's super admin status is revoked (checkbox on network user edit
7079	5522	* screen), remove them from the authorizer network approved list. Also add
7080	5523	* them to approved list on any individual sites they are already a part of.
7081	5524	*
7082		- * Action: revoke_super_admin
	5525	+ * @action revoke_super_admin
7083	5526	*
7084	5527	* @param int $user_id The user's ID.
7085	5528	*/
7086		- public function revoke_super_admin__remove_from_network_approved( $user_id ) {
7087		- $user = get_user_by( 'id', $user_id );
	5529	+ function revoke_super_admin__remove_from_network_approved( $user_id ) {
	5530	+ $user = get_user_by( 'id', $user_id );
7088	5531	$revoked_email = $user->user_email;
7089	5532
7090	5533	// Go through multisite approved user list and remove this user.
7091	5534	$auth_multisite_settings_access_users_approved = $this->sanitize_user_list(
7092		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
	5535	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
7093	5536	);
7094		- $list_changed = false;
	5537	+ $list_changed = false;
7095	5538	foreach ( $auth_multisite_settings_access_users_approved as $key => $existing_user ) {
7096		- if ( 0 === strcasecmp( $revoked_email, $existing_user['email'] ) ) {
	5539	+ if ( $revoked_email === $existing_user['email'] ) {
7097	5540	$list_changed = true;
7098		- unset( $auth_multisite_settings_access_users_approved[ $key ] );
	5541	+ unset( $auth_multisite_settings_access_users_approved[$key] );
7099	5542	}
7100	5543	}
7101	5544	if ( $list_changed ) {
7102		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
	5545	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
7103	5546	}
7104	5547
7105	5548	// Go through this user's current sites and add them to the approved list
7106	5549	// (since they are no longer on the network approved list).
		@@ -7111,21 +5554,14 @@
7111	5554	}
7112	5555
7113	5556	}
7114	5557
7115		- /**
7116		- * Send a welcome email message to a newly approved user (if the "Should
7117		- * email approved users" setting is enabled).
7118		- *
7119		- * @param string $email Email address to send welcome email to.
7120		- * @return bool Whether the email was sent.
7121		- */
7122	5558	private function maybe_email_welcome_message( $email ) {
7123	5559	// Get option for whether to email welcome messages.
7124	5560	$should_email_new_approved_users = $this->get_plugin_option( 'access_should_email_approved_users' );
7125	5561
7126	5562	// Do not send welcome email if option not enabled.
7127		- if ( '1' !== $should_email_new_approved_users ) {
	5563	+ if ( $should_email_new_approved_users !== '1' ) {
7128	5564	return false;
7129	5565	}
7130	5566
7131	5567	// Make sure we didn't just email this user (can happen with
		@@ -7131,15 +5567,15 @@
7131	5567	// Make sure we didn't just email this user (can happen with
7132	5568	// multiple admins saving at the same time, or by clicking
7133	5569	// Approve button too rapidly).
7134	5570	$recently_sent_emails = get_option( 'auth_settings_recently_sent_emails' );
7135		- if ( false === $recently_sent_emails ) {
	5571	+ if ( $recently_sent_emails === FALSE ) {
7136	5572	$recently_sent_emails = array();
7137	5573	}
7138	5574	foreach ( $recently_sent_emails as $key => $recently_sent_email ) {
7139	5575	if ( $recently_sent_email['time'] < strtotime( 'now -1 minutes' ) ) {
7140	5576	// Remove emails sent more than 1 minute ago.
7141		- unset( $recently_sent_emails[ $key ] );
	5577	+ unset( $recently_sent_emails[$key] );
7142	5578	} elseif ( $recently_sent_email['email'] === $email ) {
7143	5579	// Sent an email to this user within the last 1 minute, so
7144	5580	// quit without sending.
7145	5581	return false;
		@@ -7147,15 +5583,15 @@
7147	5583	}
7148	5584	// Add the email we're about to send to the list.
7149	5585	$recently_sent_emails[] = array(
7150	5586	'email' => $email,
7151		- 'time' => time(),
	5587	+ 'time' => time(),
7152	5588	);
7153	5589	update_option( 'auth_settings_recently_sent_emails', $recently_sent_emails );
7154	5590
7155		- // Get welcome email subject and body text.
	5591	+ // Get welcome email subject and body text
7156	5592	$subject = $this->get_plugin_option( 'access_email_approved_users_subject' );
7157		- $body = apply_filters( 'the_content', $this->get_plugin_option( 'access_email_approved_users_body' ) );
	5593	+ $body = apply_filters( 'the_content', $this->get_plugin_option( 'access_email_approved_users_body' ) );
7158	5594
7159	5595	// Fail if the subject/body options don't exist or are empty.
7160	5596	if ( is_null( $subject ) || is_null( $body ) || strlen( $subject ) === 0 || strlen( $body ) === 0 ) {
7161	5597	return false;
		@@ -7162,14 +5598,14 @@
7162	5598	}
7163	5599
7164	5600	// Replace approved shortcode patterns in subject and body.
7165	5601	$site_name = get_bloginfo( 'name' );
7166		- $site_url = get_site_url();
7167		- $subject = str_replace( '[site_name]', $site_name, $subject );
7168		- $body = str_replace( '[site_name]', $site_name, $body );
7169		- $body = str_replace( '[site_url]', $site_url, $body );
7170		- $body = str_replace( '[user_email]', $email, $body );
7171		- $headers = 'Content-type: text/html' . "\r\n";
	5602	+ $site_url = get_site_url();
	5603	+ $subject = str_replace( '[site_name]', $site_name, $subject );
	5604	+ $body = str_replace( '[site_name]', $site_name, $body );
	5605	+ $body = str_replace( '[site_url]', $site_url, $body );
	5606	+ $body = str_replace( '[user_email]', $email, $body );
	5607	+ $headers = 'Content-type: text/html' . "\r\n";
7172	5608
7173	5609	// Send email.
7174	5610	wp_mail( $email, $subject, $body, $headers );
7175	5611
		@@ -7179,22 +5615,14 @@
7179	5615
7180	5616
7181	5617	/**
7182	5618	* Generate a unique cookie to add to nonces to prevent CSRF.
7183		- *
7184		- * @var string
7185	5619	*/
7186		- private $cookie_value = null;
7187		-
7188		- /**
7189		- * Retrieve the unique login cookie.
7190		- *
7191		- * @return string Login cookie value.
7192		- */
7193		- private function get_cookie_value() {
	5620	+ protected $cookie_value = null;
	5621	+ function get_cookie_value() {
7194	5622	if ( ! $this->cookie_value ) {
7195	5623	if ( isset( $_COOKIE['login_unique'] ) ) {
7196		- $this->cookie_value = sanitize_key( wp_unslash( $_COOKIE['login_unique'] ) );
	5624	+ $this->cookie_value = $_COOKIE['login_unique'];
7197	5625	} else {
7198	5626	$this->cookie_value = md5( rand() );
7199	5627	}
7200	5628	}
		@@ -7202,51 +5630,37 @@
7202	5630	}
7203	5631
7204	5632
7205	5633	/**
7206		- * Encryption key (not secret!).
7207		- *
7208		- * @var string
7209		- */
7210		- private static $key = "8QxnrvjdtweisvCBKEY!+0\0\0";
7211		-
7212		- /**
7213		- * Encryption salt (not secret!).
7214		- *
7215		- * @var string
7216		- */
7217		- private static $iv = 'R_O2D]jPn]1[fhJl!-P1.oe';
7218		-
7219		- /**
7220	5634	* Basic encryption using a public (not secret!) key. Used for general
7221	5635	* database obfuscation of passwords.
7222		- *
7223		- * @param string $text String to encrypt.
7224		- * @param string $library Encryption library to use (openssl).
7225		- * @return string Encrypted string.
	5636	+ * @param $text String to encrypt.
	5637	+ * @param $library Encryption lib to use (openssl).
	5638	+ * @return Encrypted string
7226	5639	*/
7227		- private function encrypt( $text, $library = 'openssl' ) {
	5640	+ private static $key = "8QxnrvjdtweisvCBKEY!+0\0\0";
	5641	+ private static $iv = "R_O2D]jPn]1[fhJl!-P1.oe";
	5642	+ function encrypt( $text, $library = 'openssl' ) {
7228	5643	$result = '';
7229	5644
7230	5645	// Use openssl library (better) if it is enabled.
7231		- if ( function_exists( 'openssl_encrypt' ) && 'openssl' === $library ) {
7232		- $result = base64_encode(
7233		- openssl_encrypt(
7234		- $text,
7235		- 'AES-256-CBC',
7236		- hash( 'sha256', self::$key ),
7237		- 0,
7238		- substr( hash( 'sha256', self::$iv ), 0, 16 )
7239		- )
7240		- );
7241		- } elseif ( function_exists( 'mcrypt_encrypt' ) ) { // Use mcrypt library (deprecated in PHP 7.1) if php5-mcrypt extension is enabled.
	5646	+ if ( function_exists( 'openssl_encrypt' ) && $library === 'openssl' ) {
	5647	+ $result = base64_encode( openssl_encrypt(
	5648	+ $text,
	5649	+ 'AES-256-CBC',
	5650	+ hash( 'sha256', self::$key ),
	5651	+ 0,
	5652	+ substr( hash( 'sha256', self::$iv ), 0, 16 )
	5653	+ ) );
	5654	+ // Use mcrypt library (deprecated in PHP 7.1) if php5-mcrypt extension is enabled.
	5655	+ } else if ( function_exists( 'mcrypt_encrypt' ) ) {
7242	5656	$result = base64_encode( mcrypt_encrypt( MCRYPT_RIJNDAEL_256, self::$key, $text, MCRYPT_MODE_ECB, 'abcdefghijklmnopqrstuvwxyz012345' ) );
7243		- } else { // Fall back to basic obfuscation.
7244		- $length = strlen( $text );
7245		- for ( $i = 0; $i < $length; $i++ ) {
7246		- $char = substr( $text, $i, 1 );
	5657	+ // Fall back to basic obfuscation.
	5658	+ } else {
	5659	+ for ( $i = 0; $i < strlen( $text ); $i++ ) {
	5660	+ $char = substr( $text, $i, 1 );
7247	5661	$keychar = substr( self::$key, ( $i % strlen( self::$key ) ) - 1, 1 );
7248		- $char = chr( ord( $char ) + ord( $keychar ) );
	5662	+ $char = chr( ord( $char ) + ord( $keychar ) );
7249	5663	$result .= $char;
7250	5664	}
7251	5665	$result = base64_encode( $result );
7252	5666	}
		@@ -7257,18 +5671,17 @@
7257	5671
7258	5672	/**
7259	5673	* Basic decryption using a public (not secret!) key. Used for general
7260	5674	* database obfuscation of passwords.
7261		- *
7262		- * @param string $secret String to encrypt.
7263		- * @param string $library Encryption lib to use (openssl).
7264		- * @return string Decrypted string
	5675	+ * @param $text String to encrypt.
	5676	+ * @param $library Encryption lib to use (openssl).
	5677	+ * @return Decrypted string
7265	5678	*/
7266		- private function decrypt( $secret, $library = 'openssl' ) {
	5679	+ function decrypt( $secret, $library = 'openssl' ) {
7267	5680	$result = '';
7268	5681
7269	5682	// Use openssl library (better) if it is enabled.
7270		- if ( function_exists( 'openssl_decrypt' ) && 'openssl' === $library ) {
	5683	+ if ( function_exists( 'openssl_decrypt' ) && $library === 'openssl' ) {
7271	5684	$result = openssl_decrypt(
7272	5685	base64_decode( $secret ),
7273	5686	'AES-256-CBC',
7274	5687	hash( 'sha256', self::$key ),
		@@ -7274,18 +5687,19 @@
7274	5687	hash( 'sha256', self::$key ),
7275	5688	0,
7276	5689	substr( hash( 'sha256', self::$iv ), 0, 16 )
7277	5690	);
7278		- } elseif ( function_exists( 'mcrypt_decrypt' ) ) { // Use mcrypt library (deprecated in PHP 7.1) if php5-mcrypt extension is enabled.
	5691	+ // Use mcrypt library (deprecated in PHP 7.1) if php5-mcrypt extension is enabled.
	5692	+ } else if ( function_exists( 'mcrypt_decrypt' ) ) {
7279	5693	$secret = base64_decode( $secret );
7280	5694	$result = rtrim( mcrypt_decrypt( MCRYPT_RIJNDAEL_256, self::$key, $secret, MCRYPT_MODE_ECB, 'abcdefghijklmnopqrstuvwxyz012345' ), "\0$result" );
7281		- } else { // Fall back to basic obfuscation.
	5695	+ // Fall back to basic obfuscation.
	5696	+ } else {
7282	5697	$secret = base64_decode( $secret );
7283		- $length = strlen( $secret );
7284		- for ( $i = 0; $i < $length; $i++ ) {
7285		- $char = substr( $secret, $i, 1 );
	5698	+ for ( $i = 0; $i < strlen( $secret ); $i++ ) {
	5699	+ $char = substr( $secret, $i, 1 );
7286	5700	$keychar = substr( self::$key, ( $i % strlen( self::$key ) ) - 1, 1 );
7287		- $char = chr( ord( $char ) - ord( $keychar ) );
	5701	+ $char = chr( ord( $char ) - ord( $keychar ) );
7288	5702	$result .= $char;
7289	5703	}
7290	5704	}
7291	5705
		@@ -7296,12 +5710,10 @@
7296	5710	/**
7297	5711	* In a multisite environment, returns true if the current user is logged
7298	5712	* in and a user of the current blog. In single site mode, simply returns
7299	5713	* true if the current user is logged in.
7300		- *
7301		- * @return bool Whether current user is logged in and a user of the current blog.
7302	5714	*/
7303		- protected function is_user_logged_in_and_blog_user() {
	5715	+ function is_user_logged_in_and_blog_user() {
7304	5716	$is_user_logged_in_and_blog_user = false;
7305	5717	if ( is_multisite() ) {
7306	5718	$is_user_logged_in_and_blog_user = is_user_logged_in() && is_user_member_of_blog( get_current_user_id() );
7307	5719	} else {
		@@ -7314,42 +5726,39 @@
7314	5726	/**
7315	5727	* Helper function to determine whether a given email is in one of
7316	5728	* the lists (pending, approved, blocked). Defaults to the list of
7317	5729	* approved users.
7318		- *
7319		- * @param string $email Email to check existent of.
7320		- * @param string $list List to look for email in.
7321		- * @param string $multisite_mode Admin context.
7322		- * @return boolean Whether email was found.
7323	5730	*/
7324		- protected function is_email_in_list( $email = '', $list = 'approved', $multisite_mode = 'single' ) {
7325		- if ( empty( $email ) ) {
	5731	+ function is_email_in_list( $email = '', $list = 'approved', $multisite_mode = 'single' ) {
	5732	+ if ( empty( $email ) )
7326	5733	return false;
7327		- }
7328	5734
7329	5735	switch ( $list ) {
7330		- case 'pending':
7331		- $auth_settings_access_users_pending = $this->get_plugin_option( 'access_users_pending', WP_Plugin_Authorizer::SINGLE_CONTEXT );
7332		- return $this->in_multi_array( $email, $auth_settings_access_users_pending );
7333		- case 'blocked':
7334		- $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT );
7335		- return $this->in_multi_array( $email, $auth_settings_access_users_blocked );
7336		- case 'approved':
7337		- default:
7338		- if ( 'single' !== $multisite_mode ) {
7339		- // Get multisite users only.
7340		- $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT );
7341		- } elseif ( is_multisite() && 1 === intval( $this->get_plugin_option( 'advanced_override_multisite' ) ) ) {
7342		- // This site has overridden any multisite settings, so only get its users.
7343		- $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
7344		- } else {
7345		- // Get all site users and all multisite users.
7346		- $auth_settings_access_users_approved = array_merge(
7347		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT ),
7348		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
7349		- );
7350		- }
7351		- return $this->in_multi_array( $email, $auth_settings_access_users_approved );
	5736	+ case 'pending':
	5737	+ $auth_settings_access_users_pending = $this->get_plugin_option( 'access_users_pending', SINGLE_ADMIN );
	5738	+ return $this->in_multi_array( $email, $auth_settings_access_users_pending );
	5739	+ break;
	5740	+ case 'blocked':
	5741	+ $auth_settings_access_users_blocked = $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN );
	5742	+ return $this->in_multi_array( $email, $auth_settings_access_users_blocked );
	5743	+ break;
	5744	+ case 'approved':
	5745	+ default:
	5746	+ if ( $multisite_mode !== 'single' ) {
	5747	+ // Get multisite users only.
	5748	+ $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN );
	5749	+ } elseif ( is_multisite() && $this->get_plugin_option( 'advanced_override_multisite' ) == '1' ) {
	5750	+ // This site has overridden any multisite settings, so only get its users.
	5751	+ $auth_settings_access_users_approved = $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN );
	5752	+ } else {
	5753	+ // Get all site users and all multisite users.
	5754	+ $auth_settings_access_users_approved = array_merge(
	5755	+ $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN ),
	5756	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
	5757	+ );
	5758	+ }
	5759	+ return $this->in_multi_array( $email, $auth_settings_access_users_approved );
	5760	+ break;
7352	5761	}
7353	5762	}
7354	5763
7355	5764
		@@ -7355,37 +5764,36 @@
7355	5764
7356	5765	/**
7357	5766	* Helper function to get number of users (including multisite users)
7358	5767	* in a given list (pending, approved, or blocked).
7359		- *
7360		- * @param string $list List to get count of.
7361		- * @param string $admin_mode WP_Plugin_Authorizer::SINGLE_CONTEXT or WP_Plugin_Authorizer::NETWORK_CONTEXT determines whether to include multisite users.
7362		- * @return int Number of users in list.
	5768	+ * @param string $list
	5769	+ * @param string $admin_mode SINGLE_ADMIN or MULTISITE_ADMIN determines whether to include multisite users
	5770	+ * @return int number of users in list
7363	5771	*/
7364		- protected function get_user_count_from_list( $list, $admin_mode = WP_Plugin_Authorizer::SINGLE_CONTEXT ) {
	5772	+ function get_user_count_from_list( $list, $admin_mode = SINGLE_ADMIN ) {
7365	5773	$auth_settings_access_users = array();
7366	5774
7367	5775	switch ( $list ) {
7368		- case 'pending':
7369		- $auth_settings_access_users = $this->get_plugin_option( 'access_users_pending', WP_Plugin_Authorizer::SINGLE_CONTEXT );
7370		- break;
7371		- case 'blocked':
7372		- $auth_settings_access_users = $this->get_plugin_option( 'access_users_blocked', WP_Plugin_Authorizer::SINGLE_CONTEXT );
7373		- break;
7374		- case 'approved':
7375		- if ( WP_Plugin_Authorizer::SINGLE_CONTEXT !== $admin_mode ) {
7376		- // Get multisite users only.
7377		- $auth_settings_access_users = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT );
7378		- } elseif ( is_multisite() && 1 === intval( $this->get_plugin_option( 'advanced_override_multisite' ) ) ) {
7379		- // This site has overridden any multisite settings, so only get its users.
7380		- $auth_settings_access_users = $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT );
7381		- } else {
7382		- // Get all site users and all multisite users.
7383		- $auth_settings_access_users = array_merge(
7384		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::SINGLE_CONTEXT ),
7385		- $this->get_plugin_option( 'access_users_approved', WP_Plugin_Authorizer::NETWORK_CONTEXT )
7386		- );
7387		- }
	5776	+ case 'pending':
	5777	+ $auth_settings_access_users = $this->get_plugin_option( 'access_users_pending', SINGLE_ADMIN );
	5778	+ break;
	5779	+ case 'blocked':
	5780	+ $auth_settings_access_users = $this->get_plugin_option( 'access_users_blocked', SINGLE_ADMIN );
	5781	+ break;
	5782	+ case 'approved':
	5783	+ if ( $admin_mode !== SINGLE_ADMIN ) {
	5784	+ // Get multisite users only.
	5785	+ $auth_settings_access_users = $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN );
	5786	+ } elseif ( is_multisite() && $this->get_plugin_option( 'advanced_override_multisite' ) == '1' ) {
	5787	+ // This site has overridden any multisite settings, so only get its users.
	5788	+ $auth_settings_access_users = $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN );
	5789	+ } else {
	5790	+ // Get all site users and all multisite users.
	5791	+ $auth_settings_access_users = array_merge(
	5792	+ $this->get_plugin_option( 'access_users_approved', SINGLE_ADMIN ),
	5793	+ $this->get_plugin_option( 'access_users_approved', MULTISITE_ADMIN )
	5794	+ );
	5795	+ }
7388	5796	}
7389	5797
7390	5798	return count( $auth_settings_access_users );
7391	5799	}
		@@ -7392,27 +5800,21 @@
7392	5800
7393	5801
7394	5802	/**
7395	5803	* Helper function to search a multidimensional array for a value.
7396		- *
7397		- * @param string $needle Value to search for.
7398		- * @param array $haystack Multidimensional array to search.
7399		- * @param string $strict_mode 'strict' if strict comparisons should be used.
7400		- * @param string $case_sensitivity 'case sensitive' if comparisons should respect case.
7401		- * @return bool Whether needle was found.
7402	5804	*/
7403		- protected function in_multi_array( $needle = '', $haystack = array(), $strict_mode = 'not strict', $case_sensitivity = 'case insensitive' ) {
	5805	+ function in_multi_array( $needle = '', $haystack = array(), $strict_mode = 'not strict', $case_sensitivity = 'case insensitive' ) {
7404	5806	if ( ! is_array( $haystack ) ) {
7405	5807	return false;
7406	5808	}
7407		- if ( 'case insensitive' === $case_sensitivity ) {
	5809	+ if ( $case_sensitivity === 'case insensitive' ) {
7408	5810	$needle = strtolower( $needle );
7409	5811	}
7410	5812	foreach ( $haystack as $item ) {
7411		- if ( 'case insensitive' === $case_sensitivity && ! is_array( $item ) ) {
	5813	+ if ( $case_sensitivity === 'case insensitive' && ! is_array( $item ) ) {
7412	5814	$item = strtolower( $item );
7413	5815	}
7414		- if ( ( 'strict' === $strict_mode ? $item === $needle : $item == $needle ) || ( is_array( $item ) && $this->in_multi_array( $needle, $item, $strict_mode, $case_sensitivity ) ) ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
	5816	+ if ( ( $strict_mode === 'strict' ? $item === $needle : $item == $needle ) || ( is_array( $item ) && $this->in_multi_array( $needle, $item, $strict_mode, $case_sensitivity ) ) ) {
7415	5817	return true;
7416	5818	}
7417	5819	}
7418	5820	return false;
		@@ -7421,29 +5823,28 @@
7421	5823
7422	5824	/**
7423	5825	* Helper function to determine if an URL is accessible.
7424	5826	*
7425		- * @param string $url URL that should be publicly reachable.
7426		- * @return boolean Whether the URL is publicly reachable.
	5827	+ * @param string $url URL that should be publicly reachable
	5828	+ * @return boolean Whether the URL is publicly reachable
7427	5829	*/
7428		- protected function url_is_accessible( $url ) {
	5830	+ function url_is_accessible( $url ) {
7429	5831	// Use wp_remote_retrieve_response_code() to retrieve the URL.
7430		- $response = wp_remote_get( $url );
	5832	+ $response = wp_remote_get( $url );
7431	5833	$response_code = wp_remote_retrieve_response_code( $response );
7432	5834
7433		- // Return true if the document has loaded successfully without any redirection or error.
7434		- return $response_code >= 200 && $response_code < 400;
	5835	+ // Return true if the document has loaded successfully without any redirection or error
	5836	+ return $response_code >= 200 && $response_code < 300;
7435	5837	}
7436	5838
7437	5839
7438	5840	/**
7439	5841	* Helper function to reconstruct a URL split using parse_url().
7440		- *
7441		- * @param array $parts Array returned from parse_url().
7442		- * @return string URL.
	5842	+ * @param array $parts Array returned from parse_url().
	5843	+ * @return string URL.
7443	5844	*/
7444		- protected function build_url( $parts = array() ) {
7445		- return (
	5845	+ function build_url( $parts = array() ) {
	5846	+ return
7446	5847	( isset( $parts['scheme'] ) ? "{$parts['scheme']}:" : '' ) .
7447	5848	( ( isset( $parts['user'] ) || isset( $parts['host'] ) ) ? '//' : '' ) .
7448	5849	( isset( $parts['user'] ) ? "{$parts['user']}" : '' ) .
7449	5850	( isset( $parts['pass'] ) ? ":{$parts['pass']}" : '' ) .
		@@ -7451,30 +5852,21 @@
7451	5852	( isset( $parts['host'] ) ? "{$parts['host']}" : '' ) .
7452	5853	( isset( $parts['port'] ) ? ":{$parts['port']}" : '' ) .
7453	5854	( isset( $parts['path'] ) ? "{$parts['path']}" : '' ) .
7454	5855	( isset( $parts['query'] ) ? "?{$parts['query']}" : '' ) .
7455		- ( isset( $parts['fragment'] ) ? "#{$parts['fragment']}" : '' )
7456		- );
	5856	+ ( isset( $parts['fragment'] ) ? "#{$parts['fragment']}" : '' );
7457	5857	}
7458	5858
7459	5859
7460		- /**
7461		- * Helper function that prints option tags for a select element for all
7462		- * roles the current user has permission to assign.
7463		- *
7464		- * @param string $selected_role Which role should be selected in the dropdown.
7465		- * @param string $disable_input 'disabled' if select element should be disabled.
7466		- * @param int $admin_mode WP_Plugin_Authorizer::NETWORK_CONTEXT if we are in that context.
7467		- * @return void
7468		- */
7469		- protected function wp_dropdown_permitted_roles( $selected_role = 'subscriber', $disable_input = 'not disabled', $admin_mode = WP_Plugin_Authorizer::SINGLE_CONTEXT ) {
7470		- $roles = get_editable_roles();
	5860	+ // Helper function that builds option tags for a select element for all
	5861	+ // roles the current user has permission to assign.
	5862	+ function wp_dropdown_permitted_roles( $selected_role = 'subscriber', $disable_input = 'not disabled', $admin_mode = SINGLE_ADMIN ) {
	5863	+ $roles = get_editable_roles();
7471	5864	$current_user = wp_get_current_user();
7472	5865
7473	5866	// If we're in network admin, also show any roles that might exist only on
7474	5867	// specific sites in the network (themes can add their own roles).
7475		- if ( WP_Plugin_Authorizer::NETWORK_CONTEXT === $admin_mode ) {
7476		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
	5868	+ if ( $admin_mode === MULTISITE_ADMIN ) {
7477	5869	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7478	5870	foreach ( $sites as $site ) {
7479	5871	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7480	5872	switch_to_blog( $blog_id );
		@@ -7483,11 +5875,11 @@
7483	5875	}
7484	5876	$unique_role_names = array();
7485	5877	foreach ( $roles as $role_name => $role_info ) {
7486	5878	if ( array_key_exists( $role_name, $unique_role_names ) ) {
7487		- unset( $roles[ $role_name ] );
	5879	+ unset( $roles[$role_name] );
7488	5880	} else {
7489		- $unique_role_names[ $role_name ] = true;
	5881	+ $unique_role_names[$role_name] = true;
7490	5882	}
7491	5883	}
7492	5884	}
7493	5885
		@@ -7499,43 +5891,39 @@
7499	5891	}
7500	5892
7501	5893	// Print an option element for each permitted role.
7502	5894	foreach ( $roles as $name => $role ) {
7503		- $is_selected = $selected_role === $name;
	5895	+ $selected = $selected_role === $name ? ' selected="selected"' : '';
7504	5896
7505		- // Don't let a user change their own role (but network admins always can).
7506		- $is_disabled = $selected_role !== $name && 'disabled' === $disable_input && ! ( is_multisite() && current_user_can( 'manage_network' ) );
7507		- ?>
7508		- <option value="<?php echo esc_attr( $name ); ?>"<?php selected( $is_selected ); ?><?php disabled( $is_disabled ); ?>><?php echo esc_html( $role['name'] ); ?></option>
7509		- <?php
	5897	+ // Don't let a user change their own role
	5898	+ $disabled = $selected_role !== $name && $disable_input === 'disabled' ? ' disabled="disabled"' : '';
	5899	+
	5900	+ // But network admins can always change their role.
	5901	+ if ( is_multisite() && current_user_can( 'manage_network' ) ) {
	5902	+ $disabled = '';
	5903	+ }
	5904	+
	5905	+ ?><option value="<?php echo $name; ?>"<?php echo $selected . $disabled; ?>><?php echo $role['name']; ?></option><?php
7510	5906	}
7511	5907
7512	5908	// Print default role (no role).
7513		- $is_selected = strlen( $selected_role ) === 0 || ! array_key_exists( $selected_role, $roles );
7514		- $is_disabled = strlen( $selected_role ) > 0 && 'disabled' === $disable_input && ! ( is_multisite() && current_user_can( 'manage_network' ) );
7515		- ?>
7516		- <option value=""<?php selected( $is_selected ); ?><?php disabled( $is_disabled ); ?>><?php esc_html_e( '&mdash; No role for this site &mdash;', 'authorizer' ); ?></option>
7517		- <?php
	5909	+ $selected = strlen( $selected_role ) == 0 || ! array_key_exists( $selected_role, $roles ) ? ' selected="selected"' : '';
	5910	+ $disabled = strlen( $selected_role ) > 0 && $disable_input === 'disabled' ? ' disabled="disabled"' : '';
	5911	+ if ( is_multisite() && current_user_can( 'manage_network' ) ) {
	5912	+ $disabled = '';
	5913	+ }
	5914	+ ?><option value=""<?php echo $selected . $disabled; ?>><?php _e( '&mdash; No role for this site &mdash;', 'authorizer' ); ?></option><?php
7518	5915
7519	5916	}
7520	5917
7521	5918
7522		- /**
7523		- * Helper function to get a single user info array from one of the access
7524		- * control lists (pending, approved, or blocked).
7525		- *
7526		- * @param string $email Email address to retrieve info for.
7527		- * @param string $list List to get info from.
7528		- * @return mixed false if not found, otherwise: array(
7529		- * 'email' => '',
7530		- * 'role' => '',
7531		- * 'date_added' => '',
7532		- * ['usermeta' => [''|array()]]
7533		- * );
7534		- */
7535		- protected function get_user_info_from_list( $email, $list ) {
	5919	+ // Helper function to get a single user info array from one of the
	5920	+ // access control lists (pending, approved, or blocked).
	5921	+ // Returns: false if not found; otherwise
	5922	+ // array( 'email' => '', 'role' => '', 'date_added' => '', ['usermeta' => [''|array()]] );
	5923	+ function get_user_info_from_list( $email, $list ) {
7536	5924	foreach ( $list as $user_info ) {
7537		- if ( 0 === strcasecmp( $user_info['email'], $email ) ) {
	5925	+ if ( $user_info['email'] === $email ) {
7538	5926	return $user_info;
7539	5927	}
7540	5928	}
7541	5929	return false;
		@@ -7540,49 +5928,29 @@
7540	5928	}
7541	5929	return false;
7542	5930	}
7543	5931
7544		- /**
7545		- * Helper function to convert a string to lowercase. Prefers to use mb_strtolower,
7546		- * but will fall back to strtolower if the former is not available.
7547		- *
7548		- * @param string $string String to convert to lowercase.
7549		- * @return string Input in lowercase.
7550		- */
7551		- protected function lowercase( $string ) {
7552		- return function_exists( 'mb_strtolower' ) ? mb_strtolower( $string ) : strtolower( $string );
7553		- }
7554	5932
7555		-
7556		- /**
7557		- * Helper function to convert seconds to human readable text.
7558		- *
7559		- * @see: http://csl.name/php-secs-to-human-text/
7560		- *
7561		- * @param int $secs Seconds to display as readable text.
7562		- * @return string Readable version of number of seconds.
7563		- */
7564		- protected function seconds_as_sentence( $secs ) {
	5933	+ // Helper function to convert seconds to human readable text.
	5934	+ // Source: http://csl.name/php-secs-to-human-text/
	5935	+ function seconds_as_sentence( $secs ) {
7565	5936	$units = array(
7566		- 'week' => 3600 * 24 * 7,
7567		- 'day' => 3600 * 24,
7568		- 'hour' => 3600,
7569		- 'minute' => 60,
7570		- 'second' => 1,
	5937	+ "week" => 7 * 24 * 3600,
	5938	+ "day" => 24 * 3600,
	5939	+ "hour" => 3600,
	5940	+ "minute" => 60,
	5941	+ "second" => 1,
7571	5942	);
7572	5943
7573		- // Specifically handle zero.
7574		- if ( 0 === intval( $secs ) ) {
7575		- return '0 seconds';
7576		- }
	5944	+ // specifically handle zero
	5945	+ if ( $secs == 0 ) return "0 seconds";
7577	5946
7578		- $s = '';
	5947	+ $s = "";
7579	5948
7580	5949	foreach ( $units as $name => $divisor ) {
7581		- $quot = intval( $secs / $divisor );
7582		- if ( $quot ) {
7583		- $s .= "$quot $name";
7584		- $s .= ( abs( $quot ) > 1 ? 's' : '' ) . ', ';
	5950	+ if ( $quot = intval( $secs / $divisor ) ) {
	5951	+ $s .= "$quot $name";
	5952	+ $s .= ( abs( $quot ) > 1 ? "s" : "" ) . ", ";
7585	5953	$secs -= $quot * $divisor;
7586	5954	}
7587	5955	}
7588	5956
		@@ -7588,14 +5956,10 @@
7588	5956
7589	5957	return substr( $s, 0, -2 );
7590	5958	}
7591	5959
7592		- /**
7593		- * Helper function to get all available usermeta keys as an array.
7594		- *
7595		- * @return array All usermeta keys for user.
7596		- */
7597		- protected function get_all_usermeta_keys() {
	5960	+ // Helper function to get all available usermeta keys as an array.
	5961	+ function get_all_usermeta_keys() {
7598	5962	global $wpdb;
7599	5963	$usermeta_keys = $wpdb->get_col( "SELECT DISTINCT $wpdb->usermeta.meta_key FROM $wpdb->usermeta" );
7600	5964	return $usermeta_keys;
7601	5965	}
		@@ -7602,12 +5966,10 @@
7602	5966
7603	5967
7604	5968	/**
7605	5969	* Load translated strings from *.mo files in /languages.
7606		- *
7607		- * Action: plugins_loaded
7608	5970	*/
7609		- public function load_textdomain() {
	5971	+ function load_textdomain() {
7610	5972	load_plugin_textdomain(
7611	5973	'authorizer',
7612	5974	false,
7613	5975	plugin_basename( dirname( __FILE__ ) ) . '/languages'
		@@ -7618,17 +5980,14 @@
7618	5980	/**
7619	5981	* Generate CAS authentication URL (wp-login.php URL with reauth=1 removed
7620	5982	* and external=cas added).
7621	5983	*/
7622		- private function modify_current_url_for_cas_login() {
	5984	+ function modify_current_url_for_cas_login() {
7623	5985	// Construct the URL of the current page (wp-login.php).
7624		- $url = '';
7625		- if ( isset( $_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'] ) ) {
7626		- $url = set_url_scheme( esc_url_raw( wp_unslash( $_SERVER['HTTP_HOST'] ) ) . esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
7627		- }
	5986	+ $url = 'http' . ( isset( $_SERVER['HTTPS'] ) ? 's' : '' ) . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
7628	5987
7629	5988	// Parse the URL into its components.
7630		- $parsed_url = wp_parse_url( $url );
	5989	+ $parsed_url = parse_url( $url );
7631	5990
7632	5991	// Fix up the querystring values (remove reauth, make sure external=cas).
7633	5992	$querystring = array();
7634	5993	if ( array_key_exists( 'query', $parsed_url ) ) {
		@@ -7635,9 +5994,9 @@
7635	5994	parse_str( $parsed_url['query'], $querystring );
7636	5995	}
7637	5996	unset( $querystring['reauth'] );
7638	5997	$querystring['external'] = 'cas';
7639		- $parsed_url['query'] = http_build_query( $querystring );
	5998	+ $parsed_url['query'] = http_build_query( $querystring );
7640	5999
7641	6000	// Return the URL as a string.
7642	6001	return $this->unparse_url( $parsed_url );
7643	6002	}
		@@ -7644,21 +6003,20 @@
7644	6003
7645	6004
7646	6005	/**
7647	6006	* Reconstruct a URL after it has been deconstructed with parse_url().
7648		- *
7649		- * @param array $parsed_url Keys from parse_url().
7650		- * @return string URL constructed from the components in $parsed_url.
	6007	+ * @param $parsed_url array() with keys from parse_url().
	6008	+ * @return string URL constructed from the components in $parsed_url.
7651	6009	*/
7652		- protected function unparse_url( $parsed_url = array() ) {
7653		- $scheme = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
7654		- $host = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
7655		- $port = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : '';
7656		- $user = isset( $parsed_url['user'] ) ? $parsed_url['user'] : '';
7657		- $pass = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : '';
7658		- $pass = $user || $pass ? "$pass@" : '';
7659		- $path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '';
7660		- $query = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '';
	6010	+ function unparse_url( $parsed_url = array() ) {
	6011	+ $scheme = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
	6012	+ $host = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
	6013	+ $port = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : '';
	6014	+ $user = isset( $parsed_url['user'] ) ? $parsed_url['user'] : '';
	6015	+ $pass = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : '';
	6016	+ $pass = $user || $pass ? "$pass@" : '';
	6017	+ $path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '';
	6018	+ $query = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '';
7661	6019	$fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : '';
7662	6020	return "$scheme$user$pass$host$port$path$query$fragment";
7663	6021	}
7664	6022
		@@ -7663,30 +6021,15 @@
7663	6021	}
7664	6022
7665	6023
7666	6024	/**
7667		- * Helper function to generate an HTML class name for an option (used in
7668		- * Authorizer Settings in the Approved User list).
7669		- *
7670		- * @param string $suffix Unique part of class name.
7671		- * @param boolean $is_multisite_user Whether the class name should indicate it's a multisite user.
7672		- * @return string Class name, e.g., "auth-email auth-multisite-email".
7673		- */
7674		- private function create_class_name( $suffix = '', $is_multisite_user = false ) {
7675		- return $is_multisite_user ? "auth-$suffix auth-multisite-$suffix" : "auth-$suffix";
7676		- }
7677		-
7678		-
7679		- /**
7680	6025	* Plugin Update Routines.
7681		- *
7682		- * Action: plugins_loaded
7683	6026	*/
7684		- public function auth_update_check() {
	6027	+ function auth_update_check() {
7685	6028	// Get current version.
7686	6029	$needs_updating = false;
7687	6030	if ( is_multisite() ) {
7688		- $auth_version = get_blog_option( $this->current_site_blog_id, 'auth_version' );
	6031	+ $auth_version = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_version' );
7689	6032	} else {
7690	6033	$auth_version = get_option( 'auth_version' );
7691	6034	}
7692	6035
		@@ -7698,9 +6041,9 @@
7698	6041	// log in; approved and blocked lists are changed whenever an admin
7699	6042	// changes them from the multisite panel, the dashboard widget, or
7700	6043	// the plugin options page.
7701	6044	$update_if_older_than = 20140709;
7702		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
	6045	+ if ( $auth_version === false || intval( $auth_version ) < $update_if_older_than ) {
7703	6046	// Copy single site user lists to new options (if they exist).
7704	6047	$auth_settings = get_option( 'auth_settings' );
7705	6048	if ( is_array( $auth_settings ) && array_key_exists( 'access_users_pending', $auth_settings ) ) {
7706	6049	update_option( 'auth_settings_access_users_pending', $auth_settings['access_users_pending'] );
		@@ -7718,27 +6061,27 @@
7718	6061	update_option( 'auth_settings', $auth_settings );
7719	6062	}
7720	6063	// Copy multisite user lists to new options (if they exist).
7721	6064	if ( is_multisite() ) {
7722		- $auth_multisite_settings = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', array() );
	6065	+ $auth_multisite_settings = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', array() );
7723	6066	if ( is_array( $auth_multisite_settings ) && array_key_exists( 'access_users_pending', $auth_multisite_settings ) ) {
7724		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_pending', $auth_multisite_settings['access_users_pending'] );
	6067	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_pending', $auth_multisite_settings['access_users_pending'] );
7725	6068	unset( $auth_multisite_settings['access_users_pending'] );
7726		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', $auth_multisite_settings );
	6069	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', $auth_multisite_settings );
7727	6070	}
7728	6071	if ( is_array( $auth_multisite_settings ) && array_key_exists( 'access_users_approved', $auth_multisite_settings ) ) {
7729		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings['access_users_approved'] );
	6072	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings['access_users_approved'] );
7730	6073	unset( $auth_multisite_settings['access_users_approved'] );
7731		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', $auth_multisite_settings );
	6074	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', $auth_multisite_settings );
7732	6075	}
7733	6076	if ( is_array( $auth_multisite_settings ) && array_key_exists( 'access_users_blocked', $auth_multisite_settings ) ) {
7734		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_blocked', $auth_multisite_settings['access_users_blocked'] );
	6077	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings_access_users_blocked', $auth_multisite_settings['access_users_blocked'] );
7735	6078	unset( $auth_multisite_settings['access_users_blocked'] );
7736		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', $auth_multisite_settings );
	6079	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', $auth_multisite_settings );
7737	6080	}
7738	6081	}
7739	6082	// Update version to reflect this change has been made.
7740		- $auth_version = $update_if_older_than;
	6083	+ $auth_version = $update_if_older_than;
7741	6084	$needs_updating = true;
7742	6085	}
7743	6086
7744	6087	// Update: Set default values for newly added options (forgot to do
		@@ -7744,13 +6087,12 @@
7744	6087	// Update: Set default values for newly added options (forgot to do
7745	6088	// this, so some users are getting debug log notices about undefined
7746	6089	// indexes in $auth_settings).
7747	6090	$update_if_older_than = 20160831;
7748		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
	6091	+ if ( $auth_version === false || intval( $auth_version ) < $update_if_older_than ) {
7749	6092	// Provide default values for any $auth_settings options that don't exist.
7750	6093	if ( is_multisite() ) {
7751		- // Get all blog ids.
7752		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
	6094	+ // Get all blog ids
7753	6095	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7754	6096	foreach ( $sites as $site ) {
7755	6097	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7756	6098	switch_to_blog( $blog_id );
		@@ -7755,9 +6097,9 @@
7755	6097	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7756	6098	switch_to_blog( $blog_id );
7757	6099	// Set meaningful defaults for other sites in the network.
7758	6100	$this->set_default_options();
7759		- // Switch back to original blog.
	6101	+ // Switch back to original blog. See: https://codex.wordpress.org/Function_Reference/restore_current_blog
7760	6102	restore_current_blog();
7761	6103	}
7762	6104	} else {
7763	6105	// Set meaningful defaults for this site.
		@@ -7763,9 +6105,9 @@
7763	6105	// Set meaningful defaults for this site.
7764	6106	$this->set_default_options();
7765	6107	}
7766	6108	// Update version to reflect this change has been made.
7767		- $auth_version = $update_if_older_than;
	6109	+ $auth_version = $update_if_older_than;
7768	6110	$needs_updating = true;
7769	6111	}
7770	6112
7771	6113	// Update: Migrate LDAP passwords encrypted with mcrypt since mcrypt is
		@@ -7770,18 +6112,17 @@
7770	6112
7771	6113	// Update: Migrate LDAP passwords encrypted with mcrypt since mcrypt is
7772	6114	// deprecated as of PHP 7.1. Use openssl library instead.
7773	6115	$update_if_older_than = 20170510;
7774		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
	6116	+ if ( $auth_version === false || intval( $auth_version ) < $update_if_older_than ) {
7775	6117	if ( is_multisite() ) {
7776	6118	// Reencrypt LDAP passwords in each site in the network.
7777		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
7778	6119	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7779	6120	foreach ( $sites as $site ) {
7780		- $blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
	6121	+ $blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7781	6122	$auth_settings = get_blog_option( $blog_id, 'auth_settings', array() );
7782	6123	if ( array_key_exists( 'ldap_password', $auth_settings ) && strlen( $auth_settings['ldap_password'] ) > 0 ) {
7783		- $plaintext_ldap_password = $this->decrypt( $auth_settings['ldap_password'], 'mcrypt' );
	6124	+ $plaintext_ldap_password = $this->decrypt( $auth_settings['ldap_password'], 'mcrypt' );
7784	6125	$auth_settings['ldap_password'] = $this->encrypt( $plaintext_ldap_password );
7785	6126	update_blog_option( $blog_id, 'auth_settings', $auth_settings );
7786	6127	}
7787	6128	}
		@@ -7788,15 +6129,15 @@
7788	6129	} else {
7789	6130	// Reencrypt LDAP password on this single-site install.
7790	6131	$auth_settings = get_option( 'auth_settings', array() );
7791	6132	if ( array_key_exists( 'ldap_password', $auth_settings ) && strlen( $auth_settings['ldap_password'] ) > 0 ) {
7792		- $plaintext_ldap_password = $this->decrypt( $auth_settings['ldap_password'], 'mcrypt' );
	6133	+ $plaintext_ldap_password = $this->decrypt( $auth_settings['ldap_password'], 'mcrypt' );
7793	6134	$auth_settings['ldap_password'] = $this->encrypt( $plaintext_ldap_password );
7794	6135	update_option( 'auth_settings', $auth_settings );
7795	6136	}
7796	6137	}
7797	6138	// Update version to reflect this change has been made.
7798		- $auth_version = $update_if_older_than;
	6139	+ $auth_version = $update_if_older_than;
7799	6140	$needs_updating = true;
7800	6141	}
7801	6142
7802	6143	// Update: Migrate LDAP passwords encrypted with mcrypt since mcrypt is
		@@ -7802,171 +6143,35 @@
7802	6143	// Update: Migrate LDAP passwords encrypted with mcrypt since mcrypt is
7803	6144	// deprecated as of PHP 7.1. Use openssl library instead.
7804	6145	// Note: Forgot to update the auth_multisite_settings ldap password! Do it here.
7805	6146	$update_if_older_than = 20170511;
7806		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
	6147	+ if ( $auth_version === false || intval( $auth_version ) < $update_if_older_than ) {
7807	6148	if ( is_multisite() ) {
7808	6149	// Reencrypt LDAP password in network (multisite) options.
7809		- $auth_multisite_settings = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', array() );
	6150	+ $auth_multisite_settings = get_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', array() );
7810	6151	if ( array_key_exists( 'ldap_password', $auth_multisite_settings ) && strlen( $auth_multisite_settings['ldap_password'] ) > 0 ) {
7811		- $plaintext_ldap_password = $this->decrypt( $auth_multisite_settings['ldap_password'], 'mcrypt' );
	6152	+ $plaintext_ldap_password = $this->decrypt( $auth_multisite_settings['ldap_password'], 'mcrypt' );
7812	6153	$auth_multisite_settings['ldap_password'] = $this->encrypt( $plaintext_ldap_password );
7813		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings', $auth_multisite_settings );
	6154	+ update_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings', $auth_multisite_settings );
7814	6155	}
7815	6156	}
7816	6157	// Update version to reflect this change has been made.
7817		- $auth_version = $update_if_older_than;
	6158	+ $auth_version = $update_if_older_than;
7818	6159	$needs_updating = true;
7819	6160	}
7820	6161
7821		- // Update: Remove duplicates from approved list caused by authorizer_automatically_approve_login
7822		- // filter not respecting users who are already in the approved list
7823		- // (causing them to get re-added each time they logged in).
7824		- $update_if_older_than = 20170711;
7825		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
7826		- // Remove duplicates from approved user lists.
7827		- if ( is_multisite() ) {
7828		- // Remove duplicates from each site in the multisite.
7829		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
7830		- $sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7831		- foreach ( $sites as $site ) {
7832		- $blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7833		- $auth_settings_access_users_approved = get_blog_option( $blog_id, 'auth_settings_access_users_approved', array() );
7834		- if ( is_array( $auth_settings_access_users_approved ) ) {
7835		- $should_update = false;
7836		- $distinct_emails = array();
7837		- foreach ( $auth_settings_access_users_approved as $key => $user ) {
7838		- if ( in_array( $user['email'], $distinct_emails, true ) ) {
7839		- $should_update = true;
7840		- unset( $auth_settings_access_users_approved[ $key ] );
7841		- } else {
7842		- $distinct_emails[] = $user['email'];
7843		- }
7844		- }
7845		- if ( $should_update ) {
7846		- update_blog_option( $blog_id, 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
7847		- }
7848		- }
7849		- }
7850		- // Remove duplicates from multisite approved user list.
7851		- $auth_multisite_settings_access_users_approved = get_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', array() );
7852		- if ( is_array( $auth_multisite_settings_access_users_approved ) ) {
7853		- $should_update = false;
7854		- $distinct_emails = array();
7855		- foreach ( $auth_multisite_settings_access_users_approved as $key => $user ) {
7856		- if ( in_array( $user['email'], $distinct_emails, true ) ) {
7857		- $should_update = true;
7858		- unset( $auth_multisite_settings_access_users_approved[ $key ] );
7859		- } else {
7860		- $distinct_emails[] = $user['email'];
7861		- }
7862		- }
7863		- if ( $should_update ) {
7864		- update_blog_option( $this->current_site_blog_id, 'auth_multisite_settings_access_users_approved', $auth_multisite_settings_access_users_approved );
7865		- }
7866		- }
7867		- } else {
7868		- // Remove duplicates from single site approved user list.
7869		- $auth_settings_access_users_approved = get_option( 'auth_settings_access_users_approved' );
7870		- if ( is_array( $auth_settings_access_users_approved ) ) {
7871		- $should_update = false;
7872		- $distinct_emails = array();
7873		- foreach ( $auth_settings_access_users_approved as $key => $user ) {
7874		- if ( in_array( $user['email'], $distinct_emails, true ) ) {
7875		- $should_update = true;
7876		- unset( $auth_settings_access_users_approved[ $key ] );
7877		- } else {
7878		- $distinct_emails[] = $user['email'];
7879		- }
7880		- }
7881		- if ( $should_update ) {
7882		- update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved );
7883		- }
7884		- }
7885		- }
7886		- // Update version to reflect this change has been made.
7887		- $auth_version = $update_if_older_than;
7888		- $needs_updating = true;
7889		- }
	6162	+ // // Update: TEMPLATE
	6163	+ // $update_if_older_than = YYYYMMDD;
	6164	+ // if ( $auth_version === false || intval( $auth_version ) < $update_if_older_than ) {
	6165	+ // UPDATE CODE HERE
	6166	+ // // Update version to reflect this change has been made.
	6167	+ // $auth_version = $update_if_older_than;
	6168	+ // $needs_updating = true;
	6169	+ // }
7890	6170
7891		- // Update: Set default value for newly added option advanced_widget_enabled.
7892		- $update_if_older_than = 20171023;
7893		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
7894		- // Provide default values for any $auth_settings options that don't exist.
7895		- if ( is_multisite() ) {
7896		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
7897		- $sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7898		- foreach ( $sites as $site ) {
7899		- $blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7900		- switch_to_blog( $blog_id );
7901		- $this->set_default_options();
7902		- restore_current_blog();
7903		- }
7904		- } else {
7905		- $this->set_default_options();
7906		- }
7907		- // Update version to reflect this change has been made.
7908		- $auth_version = $update_if_older_than;
7909		- $needs_updating = true;
7910		- }
7911		-
7912		- // Update: Set default value for newly added option advanced_users_per_page.
7913		- $update_if_older_than = 20171215;
7914		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
7915		- // Provide default values for any $auth_settings options that don't exist.
7916		- if ( is_multisite() ) {
7917		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
7918		- $sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7919		- foreach ( $sites as $site ) {
7920		- $blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7921		- switch_to_blog( $blog_id );
7922		- $this->set_default_options();
7923		- restore_current_blog();
7924		- }
7925		- } else {
7926		- $this->set_default_options();
7927		- }
7928		- // Update version to reflect this change has been made.
7929		- $auth_version = $update_if_older_than;
7930		- $needs_updating = true;
7931		- }
7932		-
7933		- // Update: Set default value for newly added options advanced_users_sort_by and advanced_users_sort_order.
7934		- $update_if_older_than = 20171219;
7935		- if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) {
7936		- // Provide default values for any $auth_settings options that don't exist.
7937		- if ( is_multisite() ) {
7938		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
7939		- $sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7940		- foreach ( $sites as $site ) {
7941		- $blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7942		- switch_to_blog( $blog_id );
7943		- $this->set_default_options();
7944		- restore_current_blog();
7945		- }
7946		- } else {
7947		- $this->set_default_options();
7948		- }
7949		- // Update version to reflect this change has been made.
7950		- $auth_version = $update_if_older_than;
7951		- $needs_updating = true;
7952		- }
7953		-
7954		- /*
7955		- // Update: TEMPLATE
7956		- $update_if_older_than = YYYYMMDD;
7957		- if ( $auth_version === false || intval( $auth_version ) < $update_if_older_than ) {
7958		- UPDATE CODE HERE
7959		- // Update version to reflect this change has been made.
7960		- $auth_version = $update_if_older_than;
7961		- $needs_updating = true;
7962		- }
7963		- */
7964		-
7965	6171	// Save new version number if we performed any updates.
7966	6172	if ( $needs_updating ) {
7967	6173	if ( is_multisite() ) {
7968		- // phpcs:ignore WordPress.WP.DeprecatedFunctions.wp_get_sitesFound
7969	6174	$sites = function_exists( 'get_sites' ) ? get_sites() : wp_get_sites( array( 'limit' => PHP_INT_MAX ) );
7970	6175	foreach ( $sites as $site ) {
7971	6176	$blog_id = function_exists( 'get_sites' ) ? $site->blog_id : $site['blog_id'];
7972	6177	update_blog_option( $blog_id, 'auth_version', $auth_version );