| @@ -19,9 +19,9 @@ | ||
| 19 | 19 | function refreshApprovedUserList( currentPage, searchTerm ) { |
| 20 | 20 | var $list = $( '#list_auth_settings_access_users_approved' ); |
| 21 | 21 | var $spinner = $( '<span class="spinner is-active"></span>' ).css({ |
| 22 | 22 | position: 'relative', |
| 23 | - top: '45%', | |
| 23 | + top: '40%', | |
| 24 | 24 | left: '-240px', |
| 25 | 25 | }); |
| 26 | 26 | var $overlay = $( '<div id="list_auth_settings_access_users_approved_overlay"></div>' ).css({ |
| 27 | 27 | 'background-color': '#f1f1f1', |
| @@ -27,9 +27,9 @@ | ||
| 27 | 27 | 'background-color': '#f1f1f1', |
| 28 | 28 | 'z-index': 1, |
| 29 | 29 | opacity: 0.8, |
| 30 | 30 | position: 'absolute', |
| 31 | - top: $list.position().top, | |
| 31 | + top: $list.position().top + parseInt( $list.css( 'margin-top' ) ), | |
| 32 | 32 | left: $list.position().left, |
| 33 | 33 | width: $list.width(), |
| 34 | 34 | height: $list.height(), |
| 35 | 35 | }); |
| @@ -102,35 +102,35 @@ | ||
| 102 | 102 | |
| 103 | 103 | // Update first page button. |
| 104 | 104 | var $first = $( '.first-page' ); |
| 105 | 105 | if ( $first.is( 'a' ) && currentPage <= 1 ) { |
| 106 | - $first.replaceWith( '<span class="first-page tablenav-pages-navspan" aria-hidden="true">«</span>' ); | |
| 106 | + $first.replaceWith( '<span class="button disabled first-page tablenav-pages-navspan" aria-hidden="true">«</span>' ); | |
| 107 | 107 | } else if ( $first.is( 'span' ) && currentPage > 1 ) { |
| 108 | - $first.replaceWith( '<a class="first-page" href="' + updateQueryStringParameter( window.location.href, 'paged', '1' ) + '"><span class="screen-reader-text">' + authL10n.first_page + '</span><span aria-hidden="true">«</span></a>' ); | |
| 108 | + $first.replaceWith( '<a class="button first-page" href="' + updateQueryStringParameter( window.location.href, 'paged', '1' ) + '"><span class="screen-reader-text">' + authL10n.first_page + '</span><span aria-hidden="true">«</span></a>' ); | |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | // Update prev page button. |
| 112 | 112 | var $prev = $( '.prev-page' ); |
| 113 | 113 | if ( $prev.is( 'a' ) && currentPage <= 1 ) { |
| 114 | - $prev.replaceWith( '<span class="prev-page tablenav-pages-navspan" aria-hidden="true">‹</span>' ); | |
| 114 | + $prev.replaceWith( '<span class="button disabled prev-page tablenav-pages-navspan" aria-hidden="true">‹</span>' ); | |
| 115 | 115 | } else if ( currentPage > 1 ) { |
| 116 | - $prev.replaceWith( '<a class="prev-page" href="' + updateQueryStringParameter( window.location.href, 'paged', currentPage - 1 ) + '"><span class="screen-reader-text">' + authL10n.prev_page + '</span><span aria-hidden="true">‹</span></a>' ); | |
| 116 | + $prev.replaceWith( '<a class="button prev-page" href="' + updateQueryStringParameter( window.location.href, 'paged', currentPage - 1 ) + '"><span class="screen-reader-text">' + authL10n.prev_page + '</span><span aria-hidden="true">‹</span></a>' ); | |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | // Update next button. |
| 120 | 120 | var $next = $( '.next-page' ); |
| 121 | 121 | if ( $next.is( 'a' ) && currentPage >= totalPages ) { |
| 122 | - $next.replaceWith( '<span class="next-page tablenav-pages-navspan" aria-hidden="true">›</span>' ); | |
| 122 | + $next.replaceWith( '<span class="button disabled next-page tablenav-pages-navspan" aria-hidden="true">›</span>' ); | |
| 123 | 123 | } else if ( currentPage < totalPages ) { |
| 124 | - $next.replaceWith( '<a class="next-page" href="' + updateQueryStringParameter( window.location.href, 'paged', currentPage + 1 ) + '"><span class="screen-reader-text">' + authL10n.next_page + '</span><span aria-hidden="true">›</span></a>' ); | |
| 124 | + $next.replaceWith( '<a class="button next-page" href="' + updateQueryStringParameter( window.location.href, 'paged', currentPage + 1 ) + '"><span class="screen-reader-text">' + authL10n.next_page + '</span><span aria-hidden="true">›</span></a>' ); | |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | // Update last button. |
| 128 | 128 | var $last = $( '.last-page' ); |
| 129 | 129 | if ( $last.is( 'a' ) && currentPage >= totalPages ) { |
| 130 | - $last.replaceWith( '<span class="last-page tablenav-pages-navspan" aria-hidden="true">»</span>' ); | |
| 130 | + $last.replaceWith( '<span class="button disabled last-page tablenav-pages-navspan" aria-hidden="true">»</span>' ); | |
| 131 | 131 | } else if ( $last.is( 'span' ) && currentPage < totalPages ) { |
| 132 | - $last.replaceWith( '<a class="last-page" href="' + updateQueryStringParameter( window.location.href, 'paged', totalPages ) + '"><span class="screen-reader-text">' + authL10n.next_page + '</span><span aria-hidden="true">»</span></a>' ); | |
| 132 | + $last.replaceWith( '<a class="button last-page" href="' + updateQueryStringParameter( window.location.href, 'paged', totalPages ) + '"><span class="screen-reader-text">' + authL10n.next_page + '</span><span aria-hidden="true">»</span></a>' ); | |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | // Make changes to one of the user lists (pending, approved, blocked) via ajax. |
| @@ -198,9 +198,9 @@ | ||
| 198 | 198 | nonce: nonce, |
| 199 | 199 | }, function( response ) { |
| 200 | 200 | // Server responded, but if success isn't true it failed to save. |
| 201 | 201 | var succeeded = response.success; |
| 202 | - var spinnerText = succeeded ? authL10n.saved + '.' : '<span style="color: red;">' + authL10n.failed + '.</span>'; | |
| 202 | + var spinnerText = succeeded ? authL10n.saved + '.' : '<span class="attention">' + authL10n.failed + '.</span>'; | |
| 203 | 203 | var spinnerWait = succeeded ? 500 : 2000; |
| 204 | 204 | |
| 205 | 205 | // Remove any new user entries that were rejected by the server. |
| 206 | 206 | if ( response.invalid_emails.length > 0 ) { |
| @@ -206,9 +206,9 @@ | ||
| 206 | 206 | if ( response.invalid_emails.length > 0 ) { |
| 207 | 207 | for ( var i = 0; i < response.invalid_emails.length; i++ ) { |
| 208 | 208 | var duplicateEmail = response.invalid_emails[i]; |
| 209 | 209 | $( 'li.new-user .auth-email[value="' + duplicateEmail + '"]' ) |
| 210 | - .siblings( '.spinner' ).addClass( 'duplicate' ).append( '<span class="spinner-text" style="color: red;">' + authL10n.duplicate + '.</span>' ) | |
| 210 | + .siblings( '.spinner' ).addClass( 'duplicate' ).append( '<span class="spinner-text"><span class="attention">' + authL10n.duplicate + '.</span></span>' ) | |
| 211 | 211 | .parent().fadeOut( spinnerWait, function() { $( this ).remove(); }); // jshint ignore:line |
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | 214 | |
| @@ -222,9 +222,9 @@ | ||
| 222 | 222 | $( 'html' ).removeClass( 'busy' ); |
| 223 | 223 | }).fail( function() { |
| 224 | 224 | // Fail fires if the server doesn't respond or responds with 500 codes |
| 225 | 225 | var succeeded = false; |
| 226 | - var spinnerText = succeeded ? authL10n.saved + '.' : '<span style="color: red;">' + authL10n.failed + '.</span>'; | |
| 226 | + var spinnerText = succeeded ? authL10n.saved + '.' : '<span class="attention">' + authL10n.failed + '.</span>'; | |
| 227 | 227 | var spinnerWait = succeeded ? 500 : 2000; |
| 228 | 228 | $( 'form .spinner:not(:has(.spinner-text))' ).append( '<span class="spinner-text">' + spinnerText + '</span>' ).delay( spinnerWait ).hide( animationSpeed, function() { |
| 229 | 229 | $( this ).remove(); |
| 230 | 230 | }); |
| @@ -253,12 +253,11 @@ | ||
| 253 | 253 | 'z-index': 1, |
| 254 | 254 | opacity: 0.8, |
| 255 | 255 | position: 'absolute', |
| 256 | 256 | top: settings.position().top, |
| 257 | - left: settings.position().left - 20, | |
| 258 | - width: '100%', | |
| 259 | - height: settings.height(), | |
| 260 | - 'padding-left': 20, | |
| 257 | + left: settings.position().left, | |
| 258 | + width: settings.width(), | |
| 259 | + height: settings.height() + 50, | |
| 261 | 260 | }); |
| 262 | 261 | overlay.show(); |
| 263 | 262 | } |
| 264 | 263 | } |
| @@ -273,17 +272,16 @@ | ||
| 273 | 272 | |
| 274 | 273 | // Helper function to hide/show wordpress option |
| 275 | 274 | function animateOption( action, option ) { |
| 276 | 275 | if ( action === 'show' ) { |
| 277 | - $( 'div.animated_wrapper', option ).slideDown( animationSpeed ); | |
| 278 | - $( 'th', option ).animate({ padding: '20px 10px 20px 0' }, { duration: animationSpeed }); | |
| 279 | - $( 'td', option ).animate({ padding: '15px 10px' }, { duration: animationSpeed }); | |
| 276 | + option.fadeIn( animationSpeed ); | |
| 277 | + $( 'th, td', option ).removeClass( 'hide-animate hide-no-animate' ); | |
| 280 | 278 | } else if ( action === 'hide' ) { |
| 281 | - $( 'div.animated_wrapper', option ).slideUp( animationSpeed ); | |
| 282 | - $( 'td, th', option ).animate({ padding: '0px' }, { duration: animationSpeed }); | |
| 279 | + option.fadeOut( animationSpeed ); | |
| 280 | + $( 'td, th', option ).addClass( 'hide-animate' ); | |
| 283 | 281 | } else if ( action === 'hide_immediately' ) { |
| 284 | - $( 'div.animated_wrapper', option ).hide(); | |
| 285 | - $( 'td, th', option ).css({ padding: '0px' }); | |
| 282 | + option.hide(); | |
| 283 | + $( 'td, th', option ).addClass( 'hide-no-animate' ); | |
| 286 | 284 | } |
| 287 | 285 | } |
| 288 | 286 | |
| 289 | 287 | // Helper function to grab a querystring param value by name |
| @@ -329,12 +327,14 @@ | ||
| 329 | 327 | } |
| 330 | 328 | return matchingValues; |
| 331 | 329 | } |
| 332 | 330 | |
| 333 | - // Helper function to check if an email address is valid. | |
| 334 | - function validEmail( email ) { | |
| 331 | + // Helper function to check if an email address is valid. If allowWildcardEmail | |
| 332 | + // is true, then any string starting with an @ is valid. | |
| 333 | + function validEmail( email, allowWildcardEmail ) { | |
| 334 | + allowWildcardEmail = typeof allowWildcardEmail !== 'undefined' ? allowWildcardEmail : false; | |
| 335 | 335 | var re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; |
| 336 | - return email.length > 0 && re.test( email ); | |
| 336 | + return email.length > 0 && ( re.test( email ) || email.startsWith( '@' ) ); | |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | // Helper function to set or update a querystring value. |
| 340 | 340 | function updateQueryStringParameter( uri, key, value ) { |
| @@ -382,24 +382,37 @@ | ||
| 382 | 382 | var auth_settings_access_public_pages = $( '#auth_settings_access_public_pages' ).closest( 'tr' ); |
| 383 | 383 | var auth_settings_access_redirect_to_login = $( '#radio_auth_settings_access_redirect_to_login' ).closest( 'tr' ); |
| 384 | 384 | var auth_settings_access_public_warning = $( '#radio_auth_settings_access_public_warning' ).closest( 'tr' ); |
| 385 | 385 | var auth_settings_access_redirect_to_message = $( '#wp-auth_settings_access_redirect_to_message-wrap' ).closest( 'tr' ); |
| 386 | + var auth_settings_external_oauth2_provider = $( '#auth_settings_oauth2_provider' ).closest( 'tr' ); | |
| 387 | + var auth_settings_external_oauth2_custom_label = $( '#auth_settings_oauth2_custom_label' ).closest( 'tr' ); | |
| 388 | + var auth_settings_external_oauth2_clientid = $( '#auth_settings_oauth2_clientid' ).closest( 'tr' ); | |
| 389 | + var auth_settings_external_oauth2_clientsecret = $( '#auth_settings_oauth2_clientsecret' ).closest( 'tr' ); | |
| 390 | + var auth_settings_external_oauth2_hosteddomain = $( '#auth_settings_oauth2_hosteddomain' ).closest( 'tr' ); | |
| 391 | + var auth_settings_external_oauth2_tenant_id = $( '#auth_settings_oauth2_tenant_id' ).closest( 'tr' ); | |
| 392 | + var auth_settings_external_oauth2_url_authorize = $( '#auth_settings_oauth2_url_authorize' ).closest( 'tr' ); | |
| 393 | + var auth_settings_external_oauth2_url_token = $( '#auth_settings_oauth2_url_token' ).closest( 'tr' ); | |
| 394 | + var auth_settings_external_oauth2_url_resource = $( '#auth_settings_oauth2_url_resource' ).closest( 'tr' ); | |
| 395 | + var auth_settings_external_oauth2_auto_login = $( '#auth_settings_oauth2_auto_login' ).closest( 'tr' ); | |
| 386 | 396 | var auth_settings_external_google_clientid = $( '#auth_settings_google_clientid' ).closest( 'tr' ); |
| 387 | 397 | var auth_settings_external_google_clientsecret = $( '#auth_settings_google_clientsecret' ).closest( 'tr' ); |
| 388 | 398 | var auth_settings_external_google_hosteddomain = $( '#auth_settings_google_hosteddomain' ).closest( 'tr' ); |
| 399 | + var auth_settings_external_cas_auto_login = $( '#auth_settings_cas_auto_login' ).closest( 'tr' ); | |
| 389 | 400 | var auth_settings_external_cas_custom_label = $( '#auth_settings_cas_custom_label' ).closest( 'tr' ); |
| 390 | 401 | var auth_settings_external_cas_host = $( '#auth_settings_cas_host' ).closest( 'tr' ); |
| 391 | 402 | var auth_settings_external_cas_port = $( '#auth_settings_cas_port' ).closest( 'tr' ); |
| 392 | 403 | var auth_settings_external_cas_path = $( '#auth_settings_cas_path' ).closest( 'tr' ); |
| 404 | + var auth_settings_external_cas_method = $( '#auth_settings_cas_method' ).closest( 'tr' ); | |
| 393 | 405 | var auth_settings_external_cas_version = $( '#auth_settings_cas_version' ).closest( 'tr' ); |
| 394 | 406 | var auth_settings_external_cas_attr_email = $( '#auth_settings_cas_attr_email' ).closest( 'tr' ); |
| 395 | 407 | var auth_settings_external_cas_attr_first_name = $( '#auth_settings_cas_attr_first_name' ).closest( 'tr' ); |
| 396 | 408 | var auth_settings_external_cas_attr_last_name = $( '#auth_settings_cas_attr_last_name' ).closest( 'tr' ); |
| 397 | 409 | var auth_settings_external_cas_attr_update_on_login = $( '#auth_settings_cas_attr_update_on_login' ).closest( 'tr' ); |
| 398 | - var auth_settings_external_cas_auto_login = $( '#auth_settings_cas_auto_login' ).closest( 'tr' ); | |
| 410 | + var auth_settings_external_cas_link_on_username = $( '#auth_settings_cas_link_on_username' ).closest( 'tr' ); | |
| 399 | 411 | var auth_settings_external_ldap_host = $( '#auth_settings_ldap_host' ).closest( 'tr' ); |
| 400 | 412 | var auth_settings_external_ldap_port = $( '#auth_settings_ldap_port' ).closest( 'tr' ); |
| 401 | 413 | var auth_settings_external_ldap_search_base = $( '#auth_settings_ldap_search_base' ).closest( 'tr' ); |
| 414 | + var auth_settings_external_ldap_search_filter = $( '#auth_settings_ldap_search_filter' ).closest( 'tr' ); | |
| 402 | 415 | var auth_settings_external_ldap_uid = $( '#auth_settings_ldap_uid' ).closest( 'tr' ); |
| 403 | 416 | var auth_settings_external_ldap_attr_email = $( '#auth_settings_ldap_attr_email' ).closest( 'tr' ); |
| 404 | 417 | var auth_settings_external_ldap_user = $( '#auth_settings_ldap_user' ).closest( 'tr' ); |
| 405 | 418 | var auth_settings_external_ldap_password = $( '#auth_settings_ldap_password' ).closest( 'tr' ); |
| @@ -407,54 +420,11 @@ | ||
| 407 | 420 | var auth_settings_external_ldap_lostpassword_url = $( '#auth_settings_ldap_lostpassword_url' ).closest( 'tr' ); |
| 408 | 421 | var auth_settings_external_ldap_attr_first_name = $( '#auth_settings_ldap_attr_first_name' ).closest( 'tr' ); |
| 409 | 422 | var auth_settings_external_ldap_attr_last_name = $( '#auth_settings_ldap_attr_last_name' ).closest( 'tr' ); |
| 410 | 423 | var auth_settings_external_ldap_attr_update_on_login = $( '#auth_settings_ldap_attr_update_on_login' ).closest( 'tr' ); |
| 424 | + var auth_settings_external_ldap_test_user = $( '#auth_settings_ldap_test_user' ).closest( 'tr' ); | |
| 411 | 425 | /* eslint-enable */ |
| 412 | 426 | |
| 413 | - // Wrap the th and td in the rows above so we can animate their heights (can't animate tr heights with jquery) | |
| 414 | - $( 'th, td', auth_settings_access_role_receive_pending_emails ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 415 | - $( 'th, td', auth_settings_access_pending_redirect_to_message ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 416 | - $( 'th, td', auth_settings_access_blocked_redirect_to_message ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 417 | - $( 'th, td', auth_settings_access_should_email_approved_users ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 418 | - $( 'th, td', auth_settings_access_email_approved_users_subject ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 419 | - $( 'th, td', auth_settings_access_email_approved_users_body ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 420 | - $( 'th, td', auth_settings_access_public_pages ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 421 | - $( 'th, td', auth_settings_access_redirect_to_login ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 422 | - $( 'th, td', auth_settings_access_public_warning ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 423 | - $( 'th, td', auth_settings_access_redirect_to_message ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 424 | - $( 'th, td', auth_settings_external_google_clientid ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 425 | - $( 'th, td', auth_settings_external_google_clientsecret ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 426 | - $( 'th, td', auth_settings_external_google_hosteddomain ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 427 | - $( 'th, td', auth_settings_external_cas_custom_label ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 428 | - $( 'th, td', auth_settings_external_cas_host ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 429 | - $( 'th, td', auth_settings_external_cas_port ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 430 | - $( 'th, td', auth_settings_external_cas_path ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 431 | - $( 'th, td', auth_settings_external_cas_version ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 432 | - $( 'th, td', auth_settings_external_cas_attr_email ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 433 | - $( 'th, td', auth_settings_external_cas_attr_first_name ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 434 | - $( 'th, td', auth_settings_external_cas_attr_last_name ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 435 | - $( 'th, td', auth_settings_external_cas_attr_update_on_login ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 436 | - $( 'th, td', auth_settings_external_cas_auto_login ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 437 | - $( 'th, td', auth_settings_external_ldap_host ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 438 | - $( 'th, td', auth_settings_external_ldap_port ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 439 | - $( 'th, td', auth_settings_external_ldap_search_base ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 440 | - $( 'th, td', auth_settings_external_ldap_uid ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 441 | - $( 'th, td', auth_settings_external_ldap_attr_email ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 442 | - $( 'th, td', auth_settings_external_ldap_user ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 443 | - $( 'th, td', auth_settings_external_ldap_password ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 444 | - $( 'th, td', auth_settings_external_ldap_tls ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 445 | - $( 'th, td', auth_settings_external_ldap_lostpassword_url ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 446 | - $( 'th, td', auth_settings_external_ldap_attr_first_name ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 447 | - $( 'th, td', auth_settings_external_ldap_attr_last_name ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 448 | - $( 'th, td', auth_settings_external_ldap_attr_update_on_login ).wrapInner( '<div class="animated_wrapper" />' ); | |
| 449 | - | |
| 450 | - // If we're viewing the dashboard widget, reset a couple of the relevant | |
| 451 | - // option variables (since they aren't nested in table rows). | |
| 452 | - if ( $( '#auth_dashboard_widget' ).length ) { | |
| 453 | - // Remove the helper link, since there are no tabs on the dashboard widget | |
| 454 | - $( '#dashboard_link_approved_users' ).contents().unwrap(); | |
| 455 | - } | |
| 456 | - | |
| 457 | 427 | // Hide settings unless "Only approved users" is checked |
| 458 | 428 | if ( ! $( '#radio_auth_settings_access_who_can_login_approved_users' ).is( ':checked' ) ) { |
| 459 | 429 | animateOption( 'hide_immediately', auth_settings_access_role_receive_pending_emails ); |
| 460 | 430 | animateOption( 'hide_immediately', auth_settings_access_pending_redirect_to_message ); |
| @@ -475,8 +445,30 @@ | ||
| 475 | 445 | animateOption( 'hide_immediately', auth_settings_access_public_warning ); |
| 476 | 446 | animateOption( 'hide_immediately', auth_settings_access_redirect_to_message ); |
| 477 | 447 | } |
| 478 | 448 | |
| 449 | + // Hide OAuth2 options if unchecked. | |
| 450 | + if ( ! $( '#auth_settings_oauth2' ).is( ':checked' ) ) { | |
| 451 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_provider ); | |
| 452 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_custom_label ); | |
| 453 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_clientid ); | |
| 454 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_clientsecret ); | |
| 455 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_hosteddomain ); | |
| 456 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_auto_login ); | |
| 457 | + } | |
| 458 | + | |
| 459 | + // Hide OAuth2 generic options if generic isn't chosen. | |
| 460 | + if ( ! $( '#auth_settings_oauth2' ).is( ':checked' ) || 'generic' !== $( '#auth_settings_oauth2_provider' ).val() ) { | |
| 461 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_url_authorize ); | |
| 462 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_url_token ); | |
| 463 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_url_resource ); | |
| 464 | + } | |
| 465 | + | |
| 466 | + // Hide OAuth2 Tenant ID if azure isn't chosen. | |
| 467 | + if ( ! $( '#auth_settings_oauth2' ).is( ':checked' ) || 'azure' !== $( '#auth_settings_oauth2_provider' ).val() ) { | |
| 468 | + animateOption( 'hide_immediately', auth_settings_external_oauth2_tenant_id ); | |
| 469 | + } | |
| 470 | + | |
| 479 | 471 | // Hide Google options if unchecked |
| 480 | 472 | if ( ! $( '#auth_settings_google' ).is( ':checked' ) ) { |
| 481 | 473 | animateOption( 'hide_immediately', auth_settings_external_google_clientid ); |
| 482 | 474 | animateOption( 'hide_immediately', auth_settings_external_google_clientsecret ); |
| @@ -484,18 +476,20 @@ | ||
| 484 | 476 | } |
| 485 | 477 | |
| 486 | 478 | // Hide CAS options if unchecked |
| 487 | 479 | if ( ! $( '#auth_settings_cas' ).is( ':checked' ) ) { |
| 480 | + animateOption( 'hide_immediately', auth_settings_external_cas_auto_login ); | |
| 488 | 481 | animateOption( 'hide_immediately', auth_settings_external_cas_custom_label ); |
| 489 | 482 | animateOption( 'hide_immediately', auth_settings_external_cas_host ); |
| 490 | 483 | animateOption( 'hide_immediately', auth_settings_external_cas_port ); |
| 491 | 484 | animateOption( 'hide_immediately', auth_settings_external_cas_path ); |
| 485 | + animateOption( 'hide_immediately', auth_settings_external_cas_method ); | |
| 492 | 486 | animateOption( 'hide_immediately', auth_settings_external_cas_version ); |
| 493 | 487 | animateOption( 'hide_immediately', auth_settings_external_cas_attr_email ); |
| 494 | 488 | animateOption( 'hide_immediately', auth_settings_external_cas_attr_first_name ); |
| 495 | 489 | animateOption( 'hide_immediately', auth_settings_external_cas_attr_last_name ); |
| 496 | 490 | animateOption( 'hide_immediately', auth_settings_external_cas_attr_update_on_login ); |
| 497 | - animateOption( 'hide_immediately', auth_settings_external_cas_auto_login ); | |
| 491 | + animateOption( 'hide_immediately', auth_settings_external_cas_link_on_username ); | |
| 498 | 492 | } |
| 499 | 493 | |
| 500 | 494 | // Hide LDAP options if unchecked |
| 501 | 495 | if ( ! $( '#auth_settings_ldap' ).is( ':checked' ) ) { |
| @@ -501,8 +495,9 @@ | ||
| 501 | 495 | if ( ! $( '#auth_settings_ldap' ).is( ':checked' ) ) { |
| 502 | 496 | animateOption( 'hide_immediately', auth_settings_external_ldap_host ); |
| 503 | 497 | animateOption( 'hide_immediately', auth_settings_external_ldap_port ); |
| 504 | 498 | animateOption( 'hide_immediately', auth_settings_external_ldap_search_base ); |
| 499 | + animateOption( 'hide_immediately', auth_settings_external_ldap_search_filter ); | |
| 505 | 500 | animateOption( 'hide_immediately', auth_settings_external_ldap_uid ); |
| 506 | 501 | animateOption( 'hide_immediately', auth_settings_external_ldap_attr_email ); |
| 507 | 502 | animateOption( 'hide_immediately', auth_settings_external_ldap_user ); |
| 508 | 503 | animateOption( 'hide_immediately', auth_settings_external_ldap_password ); |
| @@ -510,12 +505,13 @@ | ||
| 510 | 505 | animateOption( 'hide_immediately', auth_settings_external_ldap_lostpassword_url ); |
| 511 | 506 | animateOption( 'hide_immediately', auth_settings_external_ldap_attr_first_name ); |
| 512 | 507 | animateOption( 'hide_immediately', auth_settings_external_ldap_attr_last_name ); |
| 513 | 508 | animateOption( 'hide_immediately', auth_settings_external_ldap_attr_update_on_login ); |
| 509 | + animateOption( 'hide_immediately', auth_settings_external_ldap_test_user ); | |
| 514 | 510 | } |
| 515 | 511 | |
| 516 | 512 | // Event handler: Hide "Handle unauthorized visitors" option if access is granted to "Everyone" |
| 517 | - $( 'input[name="auth_settings[access_who_can_login]"]' ).change( function() { | |
| 513 | + $( 'input[name="auth_settings[access_who_can_login]"]' ).on( 'change', function() { | |
| 518 | 514 | // Hide settings unless "Only approved users" is checked |
| 519 | 515 | var action = $( '#radio_auth_settings_access_who_can_login_approved_users' ).is( ':checked' ) ? 'show' : 'hide'; |
| 520 | 516 | animateOption( action, auth_settings_access_role_receive_pending_emails ); |
| 521 | 517 | animateOption( action, auth_settings_access_pending_redirect_to_message ); |
| @@ -526,9 +522,9 @@ | ||
| 526 | 522 | animateOption( action, auth_settings_access_email_approved_users_body ); |
| 527 | 523 | }); |
| 528 | 524 | |
| 529 | 525 | // Event handler: Hide Welcome email body/subject options if "Send welcome email" is off. |
| 530 | - $( 'input[name="auth_settings[access_should_email_approved_users]"]' ).change( function() { | |
| 526 | + $( 'input[name="auth_settings[access_should_email_approved_users]"]' ).on( 'change', function() { | |
| 531 | 527 | var action = $( this ).is( ':checked' ) ? 'show' : 'hide'; |
| 532 | 528 | animateOption( action, auth_settings_access_email_approved_users_subject ); |
| 533 | 529 | animateOption( action, auth_settings_access_email_approved_users_body ); |
| 534 | 530 | }); |
| @@ -533,9 +529,9 @@ | ||
| 533 | 529 | animateOption( action, auth_settings_access_email_approved_users_body ); |
| 534 | 530 | }); |
| 535 | 531 | |
| 536 | 532 | // Event handler: Hide "Handle unauthorized visitors" option if access is granted to "Everyone" |
| 537 | - $( 'input[name="auth_settings[access_who_can_view]"]' ).change( function() { | |
| 533 | + $( 'input[name="auth_settings[access_who_can_view]"]' ).on( 'change', function() { | |
| 538 | 534 | var action = $( '#radio_auth_settings_access_who_can_view_everyone' ).is( ':checked' ) ? 'hide' : 'show'; |
| 539 | 535 | animateOption( action, auth_settings_access_redirect_to_login ); |
| 540 | 536 | animateOption( action, auth_settings_access_redirect_to_message ); |
| 541 | 537 | animateOption( action, auth_settings_access_public_pages ); |
| @@ -541,10 +537,31 @@ | ||
| 541 | 537 | animateOption( action, auth_settings_access_public_pages ); |
| 542 | 538 | animateOption( action, auth_settings_access_public_warning ); |
| 543 | 539 | }); |
| 544 | 540 | |
| 541 | + // Event handler: Show/hide OAuth2 options based on checkbox. | |
| 542 | + $( 'input[name="auth_settings[oauth2]"]' ).on( 'change', function() { | |
| 543 | + var action = $( this ).is( ':checked' ) ? 'show' : 'hide'; | |
| 544 | + animateOption( action, auth_settings_external_oauth2_provider ); | |
| 545 | + animateOption( action, auth_settings_external_oauth2_custom_label ); | |
| 546 | + animateOption( action, auth_settings_external_oauth2_clientid ); | |
| 547 | + animateOption( action, auth_settings_external_oauth2_clientsecret ); | |
| 548 | + animateOption( action, auth_settings_external_oauth2_hosteddomain ); | |
| 549 | + animateOption( action, auth_settings_external_oauth2_auto_login ); | |
| 550 | + }); | |
| 551 | + | |
| 552 | + // Event handler: Show/hide OAuth2 generic options based on provider. | |
| 553 | + $( 'select[name="auth_settings[oauth2_provider]"]' ).on( 'change', function() { | |
| 554 | + var action = 'generic' === $( this ).val() ? 'show' : 'hide'; | |
| 555 | + animateOption( action, auth_settings_external_oauth2_url_authorize ); | |
| 556 | + animateOption( action, auth_settings_external_oauth2_url_token ); | |
| 557 | + animateOption( action, auth_settings_external_oauth2_url_resource ); | |
| 558 | + action = 'azure' === $( this ).val() ? 'show' : 'hide'; | |
| 559 | + animateOption( action, auth_settings_external_oauth2_tenant_id ); | |
| 560 | + }); | |
| 561 | + | |
| 545 | 562 | // Event handler: Show/hide Google options based on checkbox |
| 546 | - $( 'input[name="auth_settings[google]"]' ).change( function() { | |
| 563 | + $( 'input[name="auth_settings[google]"]' ).on( 'change', function() { | |
| 547 | 564 | var action = $( this ).is( ':checked' ) ? 'show' : 'hide'; |
| 548 | 565 | animateOption( action, auth_settings_external_google_clientid ); |
| 549 | 566 | animateOption( action, auth_settings_external_google_clientsecret ); |
| 550 | 567 | animateOption( action, auth_settings_external_google_hosteddomain ); |
| @@ -550,28 +567,31 @@ | ||
| 550 | 567 | animateOption( action, auth_settings_external_google_hosteddomain ); |
| 551 | 568 | }); |
| 552 | 569 | |
| 553 | 570 | // Event handler: Show/hide CAS options based on checkbox |
| 554 | - $( 'input[name="auth_settings[cas]"]' ).change( function() { | |
| 571 | + $( 'input[name="auth_settings[cas]"]' ).on( 'change', function() { | |
| 555 | 572 | var action = $( this ).is( ':checked' ) ? 'show' : 'hide'; |
| 573 | + animateOption( action, auth_settings_external_cas_auto_login ); | |
| 556 | 574 | animateOption( action, auth_settings_external_cas_custom_label ); |
| 557 | 575 | animateOption( action, auth_settings_external_cas_host ); |
| 558 | 576 | animateOption( action, auth_settings_external_cas_port ); |
| 559 | 577 | animateOption( action, auth_settings_external_cas_path ); |
| 578 | + animateOption( action, auth_settings_external_cas_method ); | |
| 560 | 579 | animateOption( action, auth_settings_external_cas_version ); |
| 561 | 580 | animateOption( action, auth_settings_external_cas_attr_email ); |
| 562 | 581 | animateOption( action, auth_settings_external_cas_attr_first_name ); |
| 563 | 582 | animateOption( action, auth_settings_external_cas_attr_last_name ); |
| 564 | 583 | animateOption( action, auth_settings_external_cas_attr_update_on_login ); |
| 565 | - animateOption( action, auth_settings_external_cas_auto_login ); | |
| 584 | + animateOption( action, auth_settings_external_cas_link_on_username ); | |
| 566 | 585 | }); |
| 567 | 586 | |
| 568 | 587 | // Event handler: Show/hide LDAP options based on checkbox |
| 569 | - $( 'input[name="auth_settings[ldap]"]' ).change( function() { | |
| 588 | + $( 'input[name="auth_settings[ldap]"]' ).on( 'change', function() { | |
| 570 | 589 | var action = $( this ).is( ':checked' ) ? 'show' : 'hide'; |
| 571 | 590 | animateOption( action, auth_settings_external_ldap_host ); |
| 572 | 591 | animateOption( action, auth_settings_external_ldap_port ); |
| 573 | 592 | animateOption( action, auth_settings_external_ldap_search_base ); |
| 593 | + animateOption( action, auth_settings_external_ldap_search_filter ); | |
| 574 | 594 | animateOption( action, auth_settings_external_ldap_uid ); |
| 575 | 595 | animateOption( action, auth_settings_external_ldap_attr_email ); |
| 576 | 596 | animateOption( action, auth_settings_external_ldap_user ); |
| 577 | 597 | animateOption( action, auth_settings_external_ldap_password ); |
| @@ -579,10 +599,30 @@ | ||
| 579 | 599 | animateOption( action, auth_settings_external_ldap_lostpassword_url ); |
| 580 | 600 | animateOption( action, auth_settings_external_ldap_attr_first_name ); |
| 581 | 601 | animateOption( action, auth_settings_external_ldap_attr_last_name ); |
| 582 | 602 | animateOption( action, auth_settings_external_ldap_attr_update_on_login ); |
| 603 | + animateOption( action, auth_settings_external_ldap_test_user ); | |
| 583 | 604 | }); |
| 584 | 605 | |
| 606 | + // Event handler: Test LDAP settings. | |
| 607 | + $( '#ldap_test_user_submit' ).on( 'click', function( event ) { | |
| 608 | + event.preventDefault(); | |
| 609 | + $( 'html' ).addClass( 'busy' ); | |
| 610 | + $( '#ldap_test_user_spinner' ).addClass( 'is-active' ); | |
| 611 | + | |
| 612 | + $.post( ajaxurl, { | |
| 613 | + action: 'auth_settings_ldap_test_user', | |
| 614 | + username: $( 'input[name="auth_settings[ldap_test_user]"]' ).val(), | |
| 615 | + password: $( 'input#auth_settings_ldap_test_pass' ).val(), | |
| 616 | + nonce: $( '#nonce_save_auth_settings' ).val(), | |
| 617 | + }).done( function ( data ) { | |
| 618 | + $( '#ldap_test_user_result' ).show().val( data.message ); | |
| 619 | + }).always( function () { | |
| 620 | + $( 'html' ).removeClass( 'busy' ); | |
| 621 | + $( '#ldap_test_user_spinner' ).removeClass( 'is-active' ); | |
| 622 | + }); | |
| 623 | + } ); | |
| 624 | + | |
| 585 | 625 | // Show save button if usermeta field is modified. |
| 586 | 626 | $( 'form input.auth-usermeta' ).on( 'keyup', function( event ) { |
| 587 | 627 | // Don't do anything if tab or arrow keys were pressed. |
| 588 | 628 | if ( event.which === 9 || event.which === 37 || event.which === 38 || event.which === 39 || event.which === 40 ) { |
| @@ -621,22 +661,26 @@ | ||
| 621 | 661 | selectableHeader: '<div class="custom-header">' + authL10n.private_pages + '</div>', |
| 622 | 662 | selectionHeader: '<div class="custom-header">' + authL10n.public_pages + '</div>', |
| 623 | 663 | }); |
| 624 | 664 | |
| 625 | - // Switch to the first tab (or the tab indicated in sessionStorage, or the querystring). | |
| 626 | - var tab = ''; | |
| 627 | - if ( getQuerystringValuesByKey( 'tab' ).length > 0 ) { | |
| 628 | - tab = getQuerystringValuesByKey( 'tab' )[0]; | |
| 629 | - } else if ( sessionStorage.getItem( 'tab' ) ) { | |
| 630 | - tab = sessionStorage.getItem( 'tab' ); | |
| 665 | + // Switch to the first tab (or the tab indicated in sessionStorage, or the | |
| 666 | + // querystring). Note: only do this on the settings page, not the dashboard | |
| 667 | + // widget. | |
| 668 | + if ( ! $( '#auth_dashboard_widget' ).length ) { | |
| 669 | + var tab = ''; | |
| 670 | + if ( getQuerystringValuesByKey( 'tab' ).length > 0 ) { | |
| 671 | + tab = getQuerystringValuesByKey( 'tab' )[0]; | |
| 672 | + } else if ( sessionStorage.getItem( 'tab' ) ) { | |
| 673 | + tab = sessionStorage.getItem( 'tab' ); | |
| 674 | + } | |
| 675 | + if ( $.inArray( tab, [ 'access_lists', 'access_login', 'access_public', 'external', 'advanced' ] ) < 0 ) { | |
| 676 | + tab = 'access_lists'; | |
| 677 | + } | |
| 678 | + window.chooseTab( tab, animationSpeed ); | |
| 631 | 679 | } |
| 632 | - if ( $.inArray( tab, [ 'access_lists', 'access_login', 'access_public', 'external', 'advanced' ] ) < 0 ) { | |
| 633 | - tab = 'access_lists'; | |
| 634 | - } | |
| 635 | - window.chooseTab( tab, animationSpeed ); | |
| 636 | 680 | |
| 637 | 681 | // Hide/show multisite settings based on override checkbox. |
| 638 | - $( 'input[name="auth_settings[multisite_override]"]' ).change( function() { | |
| 682 | + $( 'input[name="auth_settings[multisite_override]"]' ).on( 'change', function() { | |
| 639 | 683 | hideMultisiteSettingsIfDisabled(); |
| 640 | 684 | }); |
| 641 | 685 | hideMultisiteSettingsIfDisabled(); |
| 642 | 686 | |
| @@ -686,9 +730,12 @@ | ||
| 686 | 730 | // Enable growable textarea for new user field. |
| 687 | 731 | $( 'textarea#new_approved_user_email' ).autogrow(); |
| 688 | 732 | |
| 689 | 733 | // Enable growable textarea for config fields. |
| 734 | + $( 'textarea#auth_settings_ldap_host' ).autogrow(); | |
| 690 | 735 | $( 'textarea#auth_settings_ldap_search_base' ).autogrow(); |
| 736 | + $( 'textarea#auth_settings_ldap_search_filter' ).autogrow(); | |
| 737 | + $( 'textarea#auth_settings_oauth2_hosteddomain' ).autogrow(); | |
| 691 | 738 | $( 'textarea#auth_settings_google_hosteddomain' ).autogrow(); |
| 692 | 739 | |
| 693 | 740 | }); |
| 694 | 741 | |
| @@ -723,8 +770,11 @@ | ||
| 723 | 770 | |
| 724 | 771 | // Save user's active tab to sessionStorage (so we can restore it on reload). |
| 725 | 772 | // Note: session storage persists until the browser tab is closed. |
| 726 | 773 | sessionStorage.setItem( 'tab', listName ); |
| 774 | + | |
| 775 | + // Check whether to fade logo. | |
| 776 | + fadeLogo(); | |
| 727 | 777 | }; |
| 728 | 778 | |
| 729 | 779 | // Hide (with overlay) site options if overridden by a multisite option. |
| 730 | 780 | window.hideMultisiteOverriddenOptions = function() { |
| @@ -736,10 +786,8 @@ | ||
| 736 | 786 | 'background-color': '#f1f1f1', |
| 737 | 787 | 'z-index': 1, |
| 738 | 788 | opacity: 0.8, |
| 739 | 789 | position: 'absolute', |
| 740 | - top: optionContainerToHide.position().top, | |
| 741 | - left: optionContainerToHide.position().left, | |
| 742 | 790 | width: '100%', |
| 743 | 791 | height: optionContainerToHide.height(), |
| 744 | 792 | }); |
| 745 | 793 | $( this ).show(); |
| @@ -780,15 +828,14 @@ | ||
| 780 | 828 | usermeta: usermeta, |
| 781 | 829 | nonce: nonce, |
| 782 | 830 | }, function( response ) { |
| 783 | 831 | var succeeded = response === 'success'; |
| 784 | - var spinnerText = succeeded ? authL10n.saved + '.' : '<span style="color: red;">' + authL10n.failed + '.</span>'; | |
| 832 | + var spinnerText = succeeded ? authL10n.saved + '.' : '<span class="attention">' + authL10n.failed + '.</span>'; | |
| 785 | 833 | var spinnerWait = succeeded ? 500 : 2000; |
| 786 | 834 | |
| 787 | 835 | // Enable inputs, remove spinner. |
| 788 | 836 | $caller.removeAttr( 'disabled' ); |
| 789 | 837 | $usermeta.removeAttr( 'disabled' ); |
| 790 | - $caller.css( 'display', 'none' ); | |
| 791 | 838 | $( 'form .spinner:not(:has(.spinner-text))' ).animate( { width: '60px' }, 'fast' ).append( '<span class="spinner-text">' + spinnerText + '</span>' ).delay( spinnerWait ).hide( animationSpeed, function() { |
| 792 | 839 | $( this ).remove(); |
| 793 | 840 | }); |
| 794 | 841 | $( 'html' ).removeClass( 'busy' ); |
| @@ -794,15 +841,14 @@ | ||
| 794 | 841 | $( 'html' ).removeClass( 'busy' ); |
| 795 | 842 | |
| 796 | 843 | }).fail( function() { |
| 797 | 844 | var succeeded = false; |
| 798 | - var spinnerText = succeeded ? authL10n.saved + '.' : '<span style="color: red;">' + authL10n.failed + '.</span>'; | |
| 845 | + var spinnerText = succeeded ? authL10n.saved + '.' : '<span class="attention">' + authL10n.failed + '.</span>'; | |
| 799 | 846 | var spinnerWait = succeeded ? 500 : 2000; |
| 800 | 847 | |
| 801 | 848 | // Enable inputs, remove spinner. |
| 802 | 849 | $caller.removeAttr( 'disabled' ); |
| 803 | 850 | $usermeta.removeAttr( 'disabled' ); |
| 804 | - $caller.css( 'display', 'none' ); | |
| 805 | 851 | $( 'form .spinner:not(:has(.spinner-text))' ).animate( { width: '60px' }, 'fast' ).append( '<span class="spinner-text">' + spinnerText + '</span>' ).delay( spinnerWait ).hide( animationSpeed, function() { |
| 806 | 852 | $( this ).remove(); |
| 807 | 853 | }); |
| 808 | 854 | $( 'html' ).removeClass( 'busy' ); |
| @@ -844,9 +890,10 @@ | ||
| 844 | 890 | // Skip email address validation if adding from pending list (not user-editable). |
| 845 | 891 | var skipValidation = $( caller ).parent().parent().attr( 'id' ) === 'list_auth_settings_access_users_pending'; |
| 846 | 892 | |
| 847 | 893 | // Skip email address validation if we're banning an existing user (since they're already in a list). |
| 848 | - skipValidation = skipValidation || $( caller ).attr( 'id' ).indexOf( 'block_user' ) > -1; | |
| 894 | + var blockingNewUser = $( caller ).attr( 'id' ).indexOf( 'block_user_new' ) > -1; | |
| 895 | + skipValidation = skipValidation || ( $( caller ).attr( 'id' ).indexOf( 'block_user' ) > -1 && ! blockingNewUser ); | |
| 849 | 896 | |
| 850 | 897 | // Set default for multisite flag (run different save routine if multisite) |
| 851 | 898 | isMultisite = 'undefined' !== typeof isMultisite ? isMultisite : false; |
| 852 | 899 | |
| @@ -878,9 +925,9 @@ | ||
| 878 | 925 | // Remove any invalid email addresses. |
| 879 | 926 | if ( ! skipValidation ) { |
| 880 | 927 | // Check if the email(s) being added is well-formed. |
| 881 | 928 | emails = emails.filter( function( emailToValidate ) { |
| 882 | - return validEmail( emailToValidate ); | |
| 929 | + return validEmail( emailToValidate, blockingNewUser ); | |
| 883 | 930 | }); |
| 884 | 931 | // Remove any duplicates in the list of emails to add. |
| 885 | 932 | emails = removeDuplicatesFromArrayOfStrings( emails ); |
| 886 | 933 | } |
| @@ -914,11 +961,12 @@ | ||
| 914 | 961 | }) |
| 915 | 962 | ); |
| 916 | 963 | |
| 917 | 964 | // Add the new item. |
| 918 | - var authJsPrefix = isMultisite ? 'authMultisite' : 'auth'; | |
| 919 | - var localIcon = shouldCreateLocalAccount ? ' <a title="' + authL10n.local_wordpress_user + '" class="auth-local-user"><span class="glyphicon glyphicon-user"></span></a>' : ''; | |
| 920 | - var banButton = list === 'approved' && ! isMultisite ? '<a class="button" id="block_user_' + nextId + '" onclick="' + authJsPrefix + 'AddUser( this, \'blocked\', false ); ' + authJsPrefix + 'IgnoreUser( this, \'approved\' );" title="' + authL10n.block_ban_user + '"><span class="glyphicon glyphicon-ban-circle"></span></a>' : ''; | |
| 965 | + var authJsPrefix = isMultisite ? 'authMultisite' : 'auth'; | |
| 966 | + var multisiteIcon = isMultisite ? '<a title="WordPress Multisite user" class="button disabled auth-multisite-user dashicons-before dashicons-admin-site"></a>' : ''; | |
| 967 | + var banButton = isMultisite || 'approved' !== list ? '' : '<a class="button button-primary dashicons-before dashicons-remove" id="block_user_' + nextId + '" onclick="' + authJsPrefix + 'AddUser( this, \'blocked\', false ); ' + authJsPrefix + 'IgnoreUser( this, \'approved\' );" title="' + authL10n.block_ban_user + '"></a>'; | |
| 968 | + var ignoreButton = '<a class="button dashicons-before dashicons-no" id="ignore_user_' + nextId + '" onclick="' + authJsPrefix + 'IgnoreUser( this, \'' + list + '\' );" title="' + authL10n.remove_user + '"></a>'; | |
| 921 | 969 | $( ' \ |
| 922 | 970 | <li id="new_user_' + nextId + '" class="new-user" style="display: none;"> \ |
| 923 | 971 | <input type="text" id="auth_settings_access_users_' + list + '_' + nextId + '" name="auth_settings[access_users_' + list + '][' + nextId + '][email]" value="' + user.email + '" readonly="true" class="auth-email" /> \ |
| 924 | 972 | <select name="auth_settings[access_users_' + list + '][' + nextId + '][role]" class="auth-role" onchange="' + authJsPrefix + 'ChangeRole( this );"> \ |
| @@ -923,11 +971,9 @@ | ||
| 923 | 971 | <input type="text" id="auth_settings_access_users_' + list + '_' + nextId + '" name="auth_settings[access_users_' + list + '][' + nextId + '][email]" value="' + user.email + '" readonly="true" class="auth-email" /> \ |
| 924 | 972 | <select name="auth_settings[access_users_' + list + '][' + nextId + '][role]" class="auth-role" onchange="' + authJsPrefix + 'ChangeRole( this );"> \ |
| 925 | 973 | </select> \ |
| 926 | 974 | <input type="text" name="auth_settings[access_users_' + list + '][' + nextId + '][date_added]" value="' + getShortDate() + '" readonly="true" class="auth-date-added" /> \ |
| 927 | - ' + banButton + ' \ | |
| 928 | - <a class="button" id="ignore_user_' + nextId + '" onclick="' + authJsPrefix + 'IgnoreUser( this, \'' + list + '\' );" title="' + authL10n.remove_user + '"><span class="glyphicon glyphicon-remove"></span></a> \ | |
| 929 | - ' + localIcon + ' \ | |
| 975 | + ' + multisiteIcon + banButton + ignoreButton + ' \ | |
| 930 | 976 | <span class="spinner is-active"></span> \ |
| 931 | 977 | </li> \ |
| 932 | 978 | ' ).appendTo( '#list_auth_settings_access_users_' + list ).slideDown( 250 ); |
| 933 | 979 | |
| @@ -1031,18 +1077,23 @@ | ||
| 1031 | 1077 | left: $( caller ).position().left + $( caller ).width() + 20, |
| 1032 | 1078 | }); |
| 1033 | 1079 | $( caller ).after( $spinner ); |
| 1034 | 1080 | |
| 1035 | - // Get form elements to save | |
| 1036 | - var nonce_save_auth_settings = $( '#nonce_save_auth_settings' ).val(); | |
| 1081 | + // Get form elements to save. | |
| 1082 | + var params = { | |
| 1083 | + action: 'save_auth_multisite_settings', | |
| 1084 | + nonce: $( '#nonce_save_auth_settings' ).val(), | |
| 1085 | + }; | |
| 1037 | 1086 | |
| 1038 | - var multisite_override = $( '#auth_settings_multisite_override' ).is( ':checked' ) ? '1' : ''; | |
| 1087 | + params.multisite_override = $( '#auth_settings_multisite_override' ).is( ':checked' ) ? '1' : ''; | |
| 1039 | 1088 | |
| 1040 | - var access_who_can_login = $( 'form input[name="auth_settings[access_who_can_login]"]:checked' ).val(); | |
| 1089 | + params.prevent_override_multisite = $( '#auth_settings_prevent_override_multisite' ).is( ':checked' ) ? '1' : ''; | |
| 1041 | 1090 | |
| 1042 | - var access_who_can_view = $( 'form input[name="auth_settings[access_who_can_view]"]:checked' ).val(); | |
| 1091 | + params.access_who_can_login = $( 'form input[name="auth_settings[access_who_can_login]"]:checked' ).val(); | |
| 1043 | 1092 | |
| 1044 | - var access_users_approved = {}; | |
| 1093 | + params.access_who_can_view = $( 'form input[name="auth_settings[access_who_can_view]"]:checked' ).val(); | |
| 1094 | + | |
| 1095 | + params.access_users_approved = {}; | |
| 1045 | 1096 | $( '#list_auth_settings_access_users_approved li' ).each( function( index ) { |
| 1046 | 1097 | var user = {}; |
| 1047 | 1098 | user.email = $( '.auth-email', this ).val(); |
| 1048 | 1099 | user.role = $( '.auth-role', this ).val(); |
| @@ -1047,45 +1098,61 @@ | ||
| 1047 | 1098 | user.email = $( '.auth-email', this ).val(); |
| 1048 | 1099 | user.role = $( '.auth-role', this ).val(); |
| 1049 | 1100 | user.date_added = $( '.auth-date-added', this ).val(); |
| 1050 | 1101 | user.local_user = $( '.auth-local-user', this ).length !== 0; |
| 1051 | - access_users_approved[index] = user; | |
| 1102 | + params.access_users_approved[index] = user; | |
| 1052 | 1103 | }); |
| 1053 | 1104 | |
| 1054 | - var access_default_role = $( '#auth_settings_access_default_role' ).val(); | |
| 1105 | + params.access_default_role = $( '#auth_settings_access_default_role' ).val(); | |
| 1055 | 1106 | |
| 1056 | - var google = $( '#auth_settings_google' ).is( ':checked' ) ? '1' : ''; | |
| 1057 | - var google_clientid = $( '#auth_settings_google_clientid' ).val(); | |
| 1058 | - var google_clientsecret = $( '#auth_settings_google_clientsecret' ).val(); | |
| 1059 | - var google_hosteddomain = $( '#auth_settings_google_hosteddomain' ).val(); | |
| 1107 | + params.oauth2 = $( '#auth_settings_oauth2' ).is( ':checked' ) ? '1' : ''; | |
| 1108 | + params.oauth2_provider = $( '#auth_settings_oauth2_provider' ).val(); | |
| 1109 | + params.oauth2_custom_label = $( '#auth_settings_oauth2_custom_label' ).val(); | |
| 1110 | + params.oauth2_clientid = $( '#auth_settings_oauth2_clientid' ).val(); | |
| 1111 | + params.oauth2_clientsecret = $( '#auth_settings_oauth2_clientsecret' ).val(); | |
| 1112 | + params.oauth2_hosteddomain = $( '#auth_settings_oauth2_hosteddomain' ).val(); | |
| 1113 | + params.oauth2_tenant_id = $( '#auth_settings_oauth2_tenant_id' ).val(); | |
| 1114 | + params.oauth2_url_authorize = $( '#auth_settings_oauth2_url_authorize' ).val(); | |
| 1115 | + params.oauth2_url_token = $( '#auth_settings_oauth2_url_token' ).val(); | |
| 1116 | + params.oauth2_url_resource = $( '#auth_settings_oauth2_url_resource' ).val(); | |
| 1117 | + params.oauth2_auto_login = $( '#auth_settings_oauth2_auto_login' ).is( ':checked' ) ? '1' : ''; | |
| 1060 | 1118 | |
| 1061 | - var cas = $( '#auth_settings_cas' ).is( ':checked' ) ? '1' : ''; | |
| 1062 | - var cas_custom_label = $( '#auth_settings_cas_custom_label' ).val(); | |
| 1063 | - var cas_host = $( '#auth_settings_cas_host' ).val(); | |
| 1064 | - var cas_port = $( '#auth_settings_cas_port' ).val(); | |
| 1065 | - var cas_path = $( '#auth_settings_cas_path' ).val(); | |
| 1066 | - var cas_version = $( '#auth_settings_cas_version' ).val(); | |
| 1067 | - var cas_attr_email = $( '#auth_settings_cas_attr_email' ).val(); | |
| 1068 | - var cas_attr_first_name = $( '#auth_settings_cas_attr_first_name' ).val(); | |
| 1069 | - var cas_attr_last_name = $( '#auth_settings_cas_attr_last_name' ).val(); | |
| 1070 | - var cas_attr_update_on_login = $( '#auth_settings_cas_attr_update_on_login' ).is( ':checked' ) ? '1' : ''; | |
| 1071 | - var cas_auto_login = $( '#auth_settings_cas_auto_login' ).is( ':checked' ) ? '1' : ''; | |
| 1119 | + params.google = $( '#auth_settings_google' ).is( ':checked' ) ? '1' : ''; | |
| 1120 | + params.google_clientid = $( '#auth_settings_google_clientid' ).val(); | |
| 1121 | + params.google_clientsecret = $( '#auth_settings_google_clientsecret' ).val(); | |
| 1122 | + params.google_hosteddomain = $( '#auth_settings_google_hosteddomain' ).val(); | |
| 1072 | 1123 | |
| 1073 | - var ldap = $( '#auth_settings_ldap' ).is( ':checked' ) ? '1' : ''; | |
| 1074 | - var ldap_host = $( '#auth_settings_ldap_host' ).val(); | |
| 1075 | - var ldap_port = $( '#auth_settings_ldap_port' ).val(); | |
| 1076 | - var ldap_search_base = $( '#auth_settings_ldap_search_base' ).val(); | |
| 1077 | - var ldap_uid = $( '#auth_settings_ldap_uid' ).val(); | |
| 1078 | - var ldap_attr_email = $( '#auth_settings_ldap_attr_email' ).val(); | |
| 1079 | - var ldap_user = $( '#auth_settings_ldap_user' ).val(); | |
| 1080 | - var ldap_password = $( '#auth_settings_ldap_password' ).val(); | |
| 1081 | - var ldap_tls = $( '#auth_settings_ldap_tls' ).is( ':checked' ) ? '1' : ''; | |
| 1082 | - var ldap_lostpassword_url = $( '#auth_settings_ldap_lostpassword_url' ).val(); | |
| 1083 | - var ldap_attr_first_name = $( '#auth_settings_ldap_attr_first_name' ).val(); | |
| 1084 | - var ldap_attr_last_name = $( '#auth_settings_ldap_attr_last_name' ).val(); | |
| 1085 | - var ldap_attr_update_on_login = $( '#auth_settings_ldap_attr_update_on_login' ).is( ':checked' ) ? '1' : ''; | |
| 1124 | + params.cas = $( '#auth_settings_cas' ).is( ':checked' ) ? '1' : ''; | |
| 1125 | + params.cas_auto_login = $( '#auth_settings_cas_auto_login' ).is( ':checked' ) ? '1' : ''; | |
| 1126 | + params.cas_custom_label = $( '#auth_settings_cas_custom_label' ).val(); | |
| 1127 | + params.cas_host = $( '#auth_settings_cas_host' ).val(); | |
| 1128 | + params.cas_port = $( '#auth_settings_cas_port' ).val(); | |
| 1129 | + params.cas_path = $( '#auth_settings_cas_path' ).val(); | |
| 1130 | + params.cas_method = $( '#auth_settings_cas_method' ).val(); | |
| 1131 | + params.cas_version = $( '#auth_settings_cas_version' ).val(); | |
| 1132 | + params.cas_attr_email = $( '#auth_settings_cas_attr_email' ).val(); | |
| 1133 | + params.cas_attr_first_name = $( '#auth_settings_cas_attr_first_name' ).val(); | |
| 1134 | + params.cas_attr_last_name = $( '#auth_settings_cas_attr_last_name' ).val(); | |
| 1135 | + params.cas_attr_update_on_login = $( '#auth_settings_cas_attr_update_on_login' ).val(); | |
| 1136 | + params.cas_link_on_username = $( '#auth_settings_cas_link_on_username' ).is( ':checked' ) ? '1' : ''; | |
| 1086 | 1137 | |
| 1087 | - var advanced_lockouts = { | |
| 1138 | + params.ldap = $( '#auth_settings_ldap' ).is( ':checked' ) ? '1' : ''; | |
| 1139 | + params.ldap_host = $( '#auth_settings_ldap_host' ).val(); | |
| 1140 | + params.ldap_port = $( '#auth_settings_ldap_port' ).val(); | |
| 1141 | + params.ldap_search_base = $( '#auth_settings_ldap_search_base' ).val(); | |
| 1142 | + params.ldap_search_filter = $( '#auth_settings_ldap_search_filter' ).val(); | |
| 1143 | + params.ldap_uid = $( '#auth_settings_ldap_uid' ).val(); | |
| 1144 | + params.ldap_attr_email = $( '#auth_settings_ldap_attr_email' ).val(); | |
| 1145 | + params.ldap_user = $( '#auth_settings_ldap_user' ).val(); | |
| 1146 | + params.ldap_password = $( '#auth_settings_ldap_password' ).val(); | |
| 1147 | + params.ldap_tls = $( '#auth_settings_ldap_tls' ).is( ':checked' ) ? '1' : ''; | |
| 1148 | + params.ldap_lostpassword_url = $( '#auth_settings_ldap_lostpassword_url' ).val(); | |
| 1149 | + params.ldap_attr_first_name = $( '#auth_settings_ldap_attr_first_name' ).val(); | |
| 1150 | + params.ldap_attr_last_name = $( '#auth_settings_ldap_attr_last_name' ).val(); | |
| 1151 | + params.ldap_attr_update_on_login = $( '#auth_settings_ldap_attr_update_on_login' ).val(); | |
| 1152 | + params.ldap_test_user = $( '#auth_settings_ldap_test_user' ).val(); | |
| 1153 | + | |
| 1154 | + params.advanced_lockouts = { | |
| 1088 | 1155 | attempts_1: $( '#auth_settings_advanced_lockouts_attempts_1' ).val(), |
| 1089 | 1156 | duration_1: $( '#auth_settings_advanced_lockouts_duration_1' ).val(), |
| 1090 | 1157 | attempts_2: $( '#auth_settings_advanced_lockouts_attempts_2' ).val(), |
| 1091 | 1158 | duration_2: $( '#auth_settings_advanced_lockouts_duration_2' ).val(), |
| @@ -1090,59 +1157,18 @@ | ||
| 1090 | 1157 | attempts_2: $( '#auth_settings_advanced_lockouts_attempts_2' ).val(), |
| 1091 | 1158 | duration_2: $( '#auth_settings_advanced_lockouts_duration_2' ).val(), |
| 1092 | 1159 | reset_duration: $( '#auth_settings_advanced_lockouts_reset_duration' ).val(), |
| 1093 | 1160 | }; |
| 1094 | - var advanced_hide_wp_login = $( '#auth_settings_advanced_hide_wp_login' ).is( ':checked' ) ? '1' : ''; | |
| 1095 | - var advanced_widget_enabled = $( '#auth_settings_advanced_widget_enabled' ).is( ':checked' ) ? '1' : ''; | |
| 1096 | - var advanced_users_per_page = $( '#auth_settings_advanced_users_per_page' ).val(); | |
| 1097 | - var advanced_users_sort_by = $( '#auth_settings_advanced_users_sort_by' ).val(); | |
| 1098 | - var advanced_users_sort_order = $( '#auth_settings_advanced_users_sort_order' ).val(); | |
| 1161 | + params.advanced_hide_wp_login = $( '#auth_settings_advanced_hide_wp_login' ).is( ':checked' ) ? '1' : ''; | |
| 1162 | + params.advanced_disable_wp_login = $( '#auth_settings_advanced_disable_wp_login' ).is( ':checked' ) ? '1' : ''; | |
| 1163 | + params.advanced_widget_enabled = $( '#auth_settings_advanced_widget_enabled' ).is( ':checked' ) ? '1' : ''; | |
| 1164 | + params.advanced_users_per_page = $( '#auth_settings_advanced_users_per_page' ).val(); | |
| 1165 | + params.advanced_users_sort_by = $( '#auth_settings_advanced_users_sort_by' ).val(); | |
| 1166 | + params.advanced_users_sort_order = $( '#auth_settings_advanced_users_sort_order' ).val(); | |
| 1099 | 1167 | |
| 1100 | - $.post( ajaxurl, { | |
| 1101 | - action: 'save_auth_multisite_settings', | |
| 1102 | - nonce: nonce_save_auth_settings, | |
| 1103 | - multisite_override: multisite_override, | |
| 1104 | - access_who_can_login: access_who_can_login, | |
| 1105 | - access_who_can_view: access_who_can_view, | |
| 1106 | - access_users_approved: access_users_approved, | |
| 1107 | - access_default_role: access_default_role, | |
| 1108 | - google: google, | |
| 1109 | - google_clientid: google_clientid, | |
| 1110 | - google_clientsecret: google_clientsecret, | |
| 1111 | - google_hosteddomain: google_hosteddomain, | |
| 1112 | - cas: cas, | |
| 1113 | - cas_custom_label: cas_custom_label, | |
| 1114 | - cas_host: cas_host, | |
| 1115 | - cas_port: cas_port, | |
| 1116 | - cas_path: cas_path, | |
| 1117 | - cas_version: cas_version, | |
| 1118 | - cas_attr_email: cas_attr_email, | |
| 1119 | - cas_attr_first_name: cas_attr_first_name, | |
| 1120 | - cas_attr_last_name: cas_attr_last_name, | |
| 1121 | - cas_attr_update_on_login: cas_attr_update_on_login, | |
| 1122 | - cas_auto_login: cas_auto_login, | |
| 1123 | - ldap: ldap, | |
| 1124 | - ldap_host: ldap_host, | |
| 1125 | - ldap_port: ldap_port, | |
| 1126 | - ldap_search_base: ldap_search_base, | |
| 1127 | - ldap_uid: ldap_uid, | |
| 1128 | - ldap_attr_email: ldap_attr_email, | |
| 1129 | - ldap_user: ldap_user, | |
| 1130 | - ldap_password: ldap_password, | |
| 1131 | - ldap_tls: ldap_tls, | |
| 1132 | - ldap_lostpassword_url: ldap_lostpassword_url, | |
| 1133 | - ldap_attr_first_name: ldap_attr_first_name, | |
| 1134 | - ldap_attr_last_name: ldap_attr_last_name, | |
| 1135 | - ldap_attr_update_on_login: ldap_attr_update_on_login, | |
| 1136 | - advanced_lockouts: advanced_lockouts, | |
| 1137 | - advanced_hide_wp_login: advanced_hide_wp_login, | |
| 1138 | - advanced_users_per_page: advanced_users_per_page, | |
| 1139 | - advanced_users_sort_by: advanced_users_sort_by, | |
| 1140 | - advanced_users_sort_order: advanced_users_sort_order, | |
| 1141 | - advanced_widget_enabled: advanced_widget_enabled, | |
| 1142 | - }, function( response ) { | |
| 1168 | + $.post( ajaxurl, params, function( response ) { | |
| 1143 | 1169 | var succeeded = response === 'success'; |
| 1144 | - var spinnerText = succeeded ? authL10n.saved + '.' : '<span style="color: red;">' + authL10n.failed + '.</span>'; | |
| 1170 | + var spinnerText = succeeded ? authL10n.saved + '.' : '<span class="attention">' + authL10n.failed + '.</span>'; | |
| 1145 | 1171 | var spinnerWait = succeeded ? 500 : 2000; |
| 1146 | 1172 | $( 'form .spinner:not(:has(.spinner-text))' ).append( '<span class="spinner-text">' + spinnerText + '</span>' ).delay( spinnerWait ).hide( animationSpeed, function() { |
| 1147 | 1173 | $( this ).remove(); |
| 1148 | 1174 | }); |
| @@ -1152,9 +1178,9 @@ | ||
| 1152 | 1178 | $( 'html' ).removeClass( 'busy' ); |
| 1153 | 1179 | }).fail( function() { |
| 1154 | 1180 | // Fail fires if the server doesn't respond |
| 1155 | 1181 | var succeeded = false; |
| 1156 | - var spinnerText = succeeded ? authL10n.saved + '.' : '<span style="color: red;">' + authL10n.failed + '.</span>'; | |
| 1182 | + var spinnerText = succeeded ? authL10n.saved + '.' : '<span class="attention">' + authL10n.failed + '.</span>'; | |
| 1157 | 1183 | var spinnerWait = succeeded ? 500 : 2000; |
| 1158 | 1184 | $( 'form .spinner:not(:has(.spinner-text))' ).append( '<span class="spinner-text">' + spinnerText + '</span>' ).delay( spinnerWait ).hide( animationSpeed, function() { |
| 1159 | 1185 | $( this ).remove(); |
| 1160 | 1186 | }); |
| @@ -1164,8 +1190,29 @@ | ||
| 1164 | 1190 | $( 'html' ).removeClass( 'busy' ); |
| 1165 | 1191 | }); |
| 1166 | 1192 | }; |
| 1167 | 1193 | /* eslint-enable camelcase */ |
| 1194 | + | |
| 1195 | + // Fade in/out Authorizer logo in bottom right on Settings. | |
| 1196 | + $(document).on( 'scroll', function () { | |
| 1197 | + fadeLogo(); | |
| 1198 | + }); | |
| 1199 | + | |
| 1200 | + function fadeLogo() { | |
| 1201 | + if ( getScrollPercent() < 90 ) { | |
| 1202 | + $( '#wpwrap' ).removeClass( 'not-faded' ); | |
| 1203 | + } else { | |
| 1204 | + $( '#wpwrap' ).addClass( 'not-faded' ); | |
| 1205 | + } | |
| 1206 | + } | |
| 1207 | + | |
| 1208 | + function getScrollPercent() { | |
| 1209 | + var h = document.documentElement, | |
| 1210 | + b = document.body, | |
| 1211 | + st = 'scrollTop', | |
| 1212 | + sh = 'scrollHeight'; | |
| 1213 | + return ( h[st] || b[st] ) / ( ( h[sh] || b[sh] ) - h.clientHeight ) * 100; | |
| 1214 | + } | |
| 1168 | 1215 | |
| 1169 | 1216 | /* ======================================================================== |
| 1170 | 1217 | * Portions below from Bootstrap. |
| 1171 | 1218 | * ======================================================================== |
