Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update some WordPress API calls and some PHP 7 support #21

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update some WordPress API calls and some PHP 7 support #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions options-user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
function shibboleth_profile_personal_options() {
$user = wp_get_current_user();
if (get_usermeta($user->ID, 'shibboleth_account')) {
if (get_user_meta($user->ID, 'shibboleth_account')) {
add_filter('show_password_fields', create_function('$v', 'return false;'));

add_action('admin_footer-profile.php', 'shibboleth_admin_footer_profile');
Expand Down Expand Up @@ -48,7 +48,7 @@ function shibboleth_admin_footer_profile() {
function shibboleth_admin_footer_edit_user() {
global $user_id;

if (get_usermeta($user_id, 'shibboleth_account')) {
if (get_user_meta($user_id, 'shibboleth_account')) {
$shibboleth_fields = array();

$shibboleth_fields = array_merge($shibboleth_fields, shibboleth_get_managed_user_fields());
Expand Down Expand Up @@ -84,7 +84,7 @@ function shibboleth_admin_footer_edit_user() {
function shibboleth_show_user_profile() {
$user = wp_get_current_user();
$password_change_url = shibboleth_get_option('shibboleth_password_change_url');
if (get_usermeta($user->ID, 'shibboleth_account') && !empty($password_change_url) ) {
if (get_user_meta($user->ID, 'shibboleth_account') && !empty($password_change_url) ) {
?>
<table class="form-table">
<tr>
Expand All @@ -105,7 +105,7 @@ function shibboleth_show_user_profile() {
function shibboleth_personal_options_update() {
$user = wp_get_current_user();

if ( get_usermeta($user->ID, 'shibboleth_account') ) {
if ( get_user_meta($user->ID, 'shibboleth_account') ) {
$managed = shibboleth_get_managed_user_fields();

if ( in_array('first_name', $managed) ) {
Expand Down
47 changes: 30 additions & 17 deletions shibboleth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ function shibboleth_authenticate($user, $username, $password) {
if ( shibboleth_session_active() ) {
return shibboleth_authenticate_user();
} else {
$initiator_url = shibboleth_session_initiator_url( $_REQUEST['redirect_to'] );
if (isset( $_REQUEST['redirect_to'] )) {
$initiator_url = shibboleth_session_initiator_url( $_REQUEST['redirect_to'] );
} else {
$initiator_url = shibboleth_session_initiator_url();
}
wp_redirect($initiator_url);
exit;
}
Expand All @@ -197,7 +201,7 @@ function shibboleth_retrieve_password( $user_login ) {

if ( !empty($password_reset_url) ) {
$user = get_userdatabylogin($user_login);
if ( $user && get_usermeta($user->ID, 'shibboleth_account') ) {
if ( $user && get_user_meta($user->ID, 'shibboleth_account') ) {
wp_redirect($password_reset_url);
exit;
}
Expand Down Expand Up @@ -246,7 +250,11 @@ function shibboleth_session_initiator_url($redirect = null) {

// first build the target URL. This is the WordPress URL the user will be returned to after Shibboleth
// is done, and will handle actually logging the user into WordPress using the data provdied by Shibboleth
if ( function_exists('switch_to_blog') ) switch_to_blog($GLOBALS['current_site']->blog_id);
if ( function_exists('switch_to_blog') ) {
if ( is_multisite() ) switch_to_blog($GLOBALS['current_blog']->blog_id);
else switch_to_blog($GLOBALS['current_site']->blog_id);
}

$target = site_url('wp-login.php');
if ( function_exists('restore_current_blog') ) restore_current_blog();

Expand Down Expand Up @@ -290,21 +298,22 @@ function shibboleth_authenticate_user() {
}

$username = $_SERVER[$shib_headers['username']['name']];
$user = new WP_User($username);
//$user = new WP_User($username);
$user = get_user_by('login', $username);

if ( $user->ID ) {
if ( !get_usermeta($user->ID, 'shibboleth_account') ) {
if ( $user ) {
if ( !get_user_meta($user->ID, 'shibboleth_account') ) {
// TODO: what happens if non-shibboleth account by this name already exists?
//return new WP_Error('invalid_username', __('Account already exists by this name.'));
}
}

// create account if new user
if ( !$user->ID ) {
if ( !$user ) {
$user = shibboleth_create_new_user($username);
}

if ( !$user->ID ) {
if ( !$user ) {
$error_message = 'Unable to create account based on data provided.';
if (defined('WP_DEBUG') && WP_DEBUG) {
$error_message .= '<!-- ' . print_r($_SERVER, true) . ' -->';
Expand All @@ -313,7 +322,7 @@ function shibboleth_authenticate_user() {
}

// update user data
update_usermeta($user->ID, 'shibboleth_account', true);
update_user_meta($user->ID, 'shibboleth_account', true);
shibboleth_update_user_data($user->ID);
if ( shibboleth_get_option('shibboleth_update_roles') ) {
$user->set_role($user_role);
Expand All @@ -334,10 +343,9 @@ function shibboleth_create_new_user($user_login) {
if ( empty($user_login) ) return null;

// create account and flag as a shibboleth acount
require_once( ABSPATH . WPINC . '/registration.php' );
$user_id = wp_insert_user(array('user_login'=>$user_login));
$user_id = wp_insert_user(array('user_login'=>$user_login, 'user_pass' => NULL));
$user = new WP_User($user_id);
update_usermeta($user->ID, 'shibboleth_account', true);
update_user_meta($user->ID, 'shibboleth_account', true);

// always update user data and role on account creation
shibboleth_update_user_data($user->ID, true);
Expand Down Expand Up @@ -371,7 +379,7 @@ function shibboleth_get_user_role() {

if ( empty($role_header) || empty($role_value) ) continue;

$values = split(';', $_SERVER[$role_header]);
$values = explode(';', $_SERVER[$role_header]);
if ( in_array($role_value, $values) ) {
$user_role = $key;
break;
Expand All @@ -394,8 +402,10 @@ function shibboleth_get_managed_user_fields() {
$managed = array();

foreach ($headers as $name => $value) {
if ( $value['managed'] ) {
$managed[] = $name;
if (isset($value['managed'])) {
if ( $value['managed'] ) {
$managed[] = $name;
}
}
}

Expand All @@ -415,7 +425,6 @@ function shibboleth_get_managed_user_fields() {
* nickname, display_name, email
*/
function shibboleth_update_user_data($user_id, $force_update = false) {
require_once( ABSPATH . WPINC . '/registration.php' );

$shib_headers = shibboleth_get_option('shibboleth_headers');

Expand All @@ -434,7 +443,11 @@ function shibboleth_update_user_data($user_id, $force_update = false) {
);

foreach ($user_fields as $field => $header) {
if ( $force_update || $shib_headers[$header]['managed'] ) {
$managed = false;
if (isset($shib_headers[$header]['managed'])) {
$managed = $shib_headers[$header]['managed'];
}
if ( $force_update || $managed ) {
$filter = 'shibboleth_' . ( strpos($field, 'user_') === 0 ? '' : 'user_' ) . $field;
$user_data[$field] = apply_filters($filter, $_SERVER[$shib_headers[$header]['name']]);
}
Expand Down