Changeset 1375073
- Timestamp:
- 03/20/2016 03:54:22 PM (10 years ago)
- Location:
- shibboleth
- Files:
-
- 6 edited
- 1 copied
-
tags/1.7 (copied) (copied from shibboleth/trunk)
-
tags/1.7/options-admin.php (modified) (2 diffs)
-
tags/1.7/readme.txt (modified) (4 diffs)
-
tags/1.7/shibboleth.php (modified) (4 diffs)
-
trunk/options-admin.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (4 diffs)
-
trunk/shibboleth.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
shibboleth/tags/1.7/options-admin.php
r889047 r1375073 2 2 // functions for managing Shibboleth options through the WordPress administration panel 3 3 4 if ( current_user_can('manage_options') ) 4 if ( is_multisite() ) { 5 add_action('network_admin_menu', 'shibboleth_network_admin_panels'); 6 } else { 5 7 add_action('admin_menu', 'shibboleth_admin_panels'); 8 } 6 9 7 10 /** … … 11 14 **/ 12 15 function shibboleth_admin_panels() { 13 // global options page 14 if ( function_exists('is_site_admin') ) { 15 $hookname = add_submenu_page('wpmu-admin.php', __('Shibboleth Options', 'shibboleth'), 16 __('Shibboleth', 'shibboleth'), 8, 'shibboleth-options', 'shibboleth_options_page' ); 17 } else { 18 $hookname = add_options_page(__('Shibboleth options', 'shibboleth'), 19 __('Shibboleth', 'shibboleth'), 8, 'shibboleth-options', 'shibboleth_options_page' ); 20 } 21 16 $hookname = add_options_page(__('Shibboleth options', 'shibboleth'), 17 __('Shibboleth', 'shibboleth'), 'manage_options', 'shibboleth-options', 'shibboleth_options_page' ); 18 add_contextual_help($hookname, shibboleth_help_text()); 19 } 20 21 /** 22 * Setup multisite admin menus for Shibboleth options. 23 * 24 * @action: network_admin_menu 25 **/ 26 function shibboleth_network_admin_panels() { 27 $hookname = add_submenu_page('settings.php', __('Shibboleth options', 'shibboleth'), 28 __('Shibboleth', 'shibboleth'), 'manage_network_options', 'shibboleth-options', 'shibboleth_options_page' ); 22 29 add_contextual_help($hookname, shibboleth_help_text()); 23 30 } -
shibboleth/tags/1.7/readme.txt
r889085 r1375073 3 3 Tags: shibboleth, authentication, login, saml 4 4 Requires at least: 3.3 5 Tested up to: 3.96 Stable tag: 1. 65 Tested up to: 4.5 6 Stable tag: 1.7 7 7 8 8 Allows WordPress to externalize user authentication and account creation to a … … 49 49 If it is unable to do so, you can add this manually: 50 50 51 AuthType Shibboleth52 Require Shibboleth51 AuthType shibboleth 52 Require shibboleth 53 53 54 54 The option to automatically login the users into WordPress also works when not … … 63 63 automatic login feature 64 64 65 AuthType Shibboleth66 ShibRequ ireSession on65 AuthType shibboleth 66 ShibRequestSetting requireSession 1 67 67 Require valid-user 68 68 69 69 OR 70 70 71 Authtype Shibboleth72 ShibRequ ireSession on71 Authtype shibboleth 72 ShibRequestSetting requireSession 1 73 73 Require isMemberOf group1 group2 74 74 Require sAMAccountName user1 user 2 … … 145 145 == Changelog == 146 146 147 = version 1.7 (2016-03-20) = 148 - fixed a security vulnerability reported by WordPress security team 149 - load multisite options correctly; [thanks to jdelsemme for reporting](https://github.com/mitcho/shibboleth/issues/8) 150 - updated htaccess setting strings; [props dericcrago](https://github.com/mitcho/shibboleth/pull/6) 151 - fix reauth loop; [props jrchamp](https://github.com/mitcho/shibboleth/pull/5) 152 - set l10n text domain; [props jrchamp](https://github.com/mitcho/shibboleth/pull/5) 153 147 154 = version 1.6 (2014-04-07) = 148 155 - tested for compatibility with recent WordPress versions; now requires WordPress 3.3 -
shibboleth/tags/1.7/shibboleth.php
r889085 r1375073 5 5 Description: Easily externalize user authentication to a <a href="http://shibboleth.internet2.edu">Shibboleth</a> Service Provider 6 6 Author: Will Norris, mitcho (Michael 芳貴 Erlewine) 7 Version: 1. 67 Version: 1.7 8 8 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.html) 9 9 */ … … 460 460 function shibboleth_login_form() { 461 461 $login_url = add_query_arg('action', 'shibboleth');