diff options
Diffstat (limited to 'plugins/openid/server.php')
| -rw-r--r-- | plugins/openid/server.php | 414 |
1 files changed, 218 insertions, 196 deletions
diff --git a/plugins/openid/server.php b/plugins/openid/server.php index 15e64d39..2804fcd1 100644 --- a/plugins/openid/server.php +++ b/plugins/openid/server.php @@ -14,7 +14,7 @@ add_action( 'wp_head', 'openid_provider_link_tags' ); * @see openid_service_url */ function openid_server_url() { - return openid_service_url('server', 'login_post'); + return openid_service_url( 'server', 'login_post' ); } @@ -24,88 +24,93 @@ function openid_server_url() { * * @uses apply_filters() Calls 'openid_server_xrds_types' before returning XRDS Types for OpenID authentication services. */ -function openid_provider_xrds_simple($xrds) { +function openid_provider_xrds_simple( $xrds ) { global $wp_roles; - if (!$wp_roles) $wp_roles = new WP_Roles(); + if ( ! $wp_roles ) { + $wp_roles = new WP_Roles(); + } $provider_enabled = false; - foreach ($wp_roles->role_names as $key => $name) { - $role = $wp_roles->get_role($key); - if ($role->has_cap('use_openid_provider')) { + foreach ( $wp_roles->role_names as $key => $name ) { + $role = $wp_roles->get_role( $key ); + if ( $role->has_cap( 'use_openid_provider' ) ) { $provider_enabled = true; break; } } - if (!$provider_enabled) return $xrds; + if ( ! $provider_enabled ) { + return $xrds; + } $user = openid_server_requested_user(); - if (!$user && get_option('openid_blog_owner')) { - $url_parts = parse_url(get_option('home')); - $path = array_key_exists('path', $url_parts) ? $url_parts['path'] : ''; - $path = trailingslashit($path); + if ( ! $user && get_option( 'openid_blog_owner' ) ) { + $url_parts = parse_url( get_option( 'home' ) ); + $path = array_key_exists( 'path', $url_parts ) ? $url_parts['path'] : ''; + $path = trailingslashit( $path ); - $script = preg_replace('/index.php$/', '', $_SERVER['SCRIPT_NAME']); - $script = trailingslashit($script); + $script = preg_replace( '/index.php$/', '', $_SERVER['SCRIPT_NAME'] ); + $script = trailingslashit( $script ); - if ($path != $script && !is_admin()) { + if ( $path != $script && ! is_admin() ) { return $xrds; } - if (!defined('OPENID_DISALLOW_OWNER') || !OPENID_DISALLOW_OWNER) { - $user = get_user_by('login', get_option('openid_blog_owner')); + if ( ! defined( 'OPENID_DISALLOW_OWNER' ) || ! OPENID_DISALLOW_OWNER ) { + $user = get_user_by( 'login', get_option( 'openid_blog_owner' ) ); } } - if ($user) { + if ( $user ) { // if user doesn't have capability, bail - $user_object = new WP_User($user->ID); - if (!$user_object->has_cap('use_openid_provider')) return $xrds; + $user_object = new WP_User( $user->ID ); + if ( ! $user_object->has_cap( 'use_openid_provider' ) ) { + return $xrds; + } - if (get_user_meta($user->ID, 'openid_delegate', true)) { - $services = get_user_meta($user->ID, 'openid_delegate_services', true); + if ( get_user_meta( $user->ID, 'openid_delegate', true ) ) { + $services = get_user_meta( $user->ID, 'openid_delegate_services', true ); } else { $services = array(); - $tmp_types = apply_filters('openid_server_xrds_types', array('http://specs.openid.net/auth/2.0/signon')); + $tmp_types = apply_filters( 'openid_server_xrds_types', array( 'http://specs.openid.net/auth/2.0/signon' ) ); $types = array(); - foreach ($tmp_types as $t) { - $types[] = array('content' => $t); + foreach ( $tmp_types as $t ) { + $types[] = array( 'content' => $t ); } $services[] = array( - 'Type' => $types, - 'URI' => openid_server_url(), - 'LocalID' => get_author_posts_url($user->ID), - ); + 'Type' => $types, + 'URI' => openid_server_url(), + 'LocalID' => get_author_posts_url( $user->ID ), + ); - $tmp_types = apply_filters('openid_server_xrds_types', array('http://openid.net/signon/1.1')); + $tmp_types = apply_filters( 'openid_server_xrds_types', array( 'http://openid.net/signon/1.1' ) ); $types = array(); - foreach ($tmp_types as $t) { - $types[] = array('content' => $t); + foreach ( $tmp_types as $t ) { + $types[] = array( 'content' => $t ); } $services[] = array( - 'Type' => $types, - 'URI' => openid_server_url(), - 'openid:Delegate' => get_author_posts_url($user->ID), - ); + 'Type' => $types, + 'URI' => openid_server_url(), + 'openid:Delegate' => get_author_posts_url( $user->ID ), + ); } } else { $services = array( array( - 'Type' => array(array('content' => 'http://specs.openid.net/auth/2.0/server')), + 'Type' => array( array( 'content' => 'http://specs.openid.net/auth/2.0/server' ) ), 'URI' => openid_server_url(), 'LocalID' => 'http://specs.openid.net/auth/2.0/identifier_select', - ) + ), ); } - - if (!empty($services)) { - foreach ($services as $index => $service) { + if ( ! empty( $services ) ) { + foreach ( $services as $index => $service ) { $name = 'OpenID Provider Service (' . $index . ')'; - $xrds = xrds_add_service($xrds, 'main', $name, $service, $index); + $xrds = xrds_add_service( $xrds, 'main', $name, $service, $index ); } } @@ -135,7 +140,7 @@ function openid_provider_webfinger( $webfinger, $resource, $user ) { ); } else { // check if WebFinger user is "blog-owner" - if ( get_option( 'openid_blog_owner' ) && $user->user_login == get_option( 'openid_blog_owner' ) ) { + if ( get_option( 'openid_blog_owner' ) && get_option( 'openid_blog_owner' ) == $user->user_login ) { $webfinger['links'][] = array( 'href' => site_url( '/' ), 'rel' => 'http://specs.openid.net/auth/2.0/provider', @@ -160,18 +165,18 @@ function openid_provider_webfinger( $webfinger, $resource, $user ) { function openid_server_requested_user() { global $wp_rewrite; - if (array_key_exists('author', $_REQUEST) && $_REQUEST['author']) { - if (is_numeric($_REQUEST['author'])) { - return get_user_by('id', $_REQUEST['author']); + if ( array_key_exists( 'author', $_REQUEST ) && $_REQUEST['author'] ) { + if ( is_numeric( $_REQUEST['author'] ) ) { + return get_user_by( 'id', $_REQUEST['author'] ); } else { - return get_user_by('login', $_REQUEST['author']); + return get_user_by( 'login', $_REQUEST['author'] ); } } else { - $regex = preg_replace('/%author%/', '(.+)', $wp_rewrite->get_author_permastruct()); - preg_match('|'.$regex.'|', $_SERVER['REQUEST_URI'], $matches); - if ($matches) { - $username = sanitize_user($matches[1], true); - return get_user_by('login', $username); + $regex = preg_replace( '/%author%/', '(.+)', $wp_rewrite->get_author_permastruct() ); + preg_match( '|' . $regex . '|', $_SERVER['REQUEST_URI'], $matches ); + if ( $matches ) { + $username = sanitize_user( $matches[1], true ); + return get_user_by( 'login', $username ); } } } @@ -187,35 +192,35 @@ function openid_server_request() { // get OpenID request, either from session or HTTP request $request = $server->decodeRequest(); - if (!$request || Auth_OpenID_isError($request)) { + if ( ! $request || Auth_OpenID_isError( $request ) ) { @session_start(); - if (isset($_SESSION['openid_server_request']) && $_SESSION['openid_server_request']) { + if ( isset( $_SESSION['openid_server_request'] ) && $_SESSION['openid_server_request'] ) { $request = $_SESSION['openid_server_request']; - unset($_SESSION['openid_server_request']); + unset( $_SESSION['openid_server_request'] ); } } - if (!$request || Auth_OpenID_isError($request)) { + if ( ! $request || Auth_OpenID_isError( $request ) ) { $html = '<h1>This is an OpenID Server.</h1>'; - if (Auth_OpenID_isError($request)) { + if ( Auth_OpenID_isError( $request ) ) { $html .= '<p><strong>Request Error:</strong> ' . $request->toString() . '</p>'; } else { $html .= '<p>Nothing to see here… move along.</p>'; } - wp_die($html); + wp_die( $html ); } // process request - if (in_array($request->mode, array('checkid_immediate', 'checkid_setup'))) { - $response = openid_server_auth_request($request); - $response = apply_filters('openid_server_auth_response', $response); + if ( in_array( $request->mode, array( 'checkid_immediate', 'checkid_setup' ) ) ) { + $response = openid_server_auth_request( $request ); + $response = apply_filters( 'openid_server_auth_response', $response ); } else { - $response = $server->handleRequest($request); + $response = $server->handleRequest( $request ); } - openid_server_process_response($response); + openid_server_process_response( $response ); } @@ -225,14 +230,14 @@ function openid_server_request() { * @uses do_action() Calls the 'openid_server_pre_auth' hook action before checking if the user is logged in. * @uses do_action() Calls the 'openid_server_post_auth' hook action after ensuring that the user is logged in. */ -function openid_server_auth_request($request) { +function openid_server_auth_request( $request ) { - do_action('openid_server_pre_auth', $request); + do_action( 'openid_server_pre_auth', $request ); // user must be logged in - if (!is_user_logged_in()) { - if ($request->mode == 'checkid_immediate') { - return $request->answer(false); + if ( ! is_user_logged_in() ) { + if ( 'checkid_immediate' == $request->mode ) { + return $request->answer( false ); } else { @session_start(); $_SESSION['openid_server_request'] = $request; @@ -240,32 +245,34 @@ function openid_server_auth_request($request) { } } - do_action('openid_server_post_auth', $request); + do_action( 'openid_server_post_auth', $request ); // get some user data $user = wp_get_current_user(); - $author_url = get_author_posts_url($user->ID); + $author_url = get_author_posts_url( $user->ID ); $id_select = $request->idSelect(); // bail if user does not have access to OpenID provider - if (!$user->has_cap('use_openid_provider')) return $request->answer(false); + if ( ! $user->has_cap( 'use_openid_provider' ) ) { + return $request->answer( false ); + } // if using id select but user is delegating, display error to user (unless checkid_immediate) - if ($id_select && get_user_meta($user->ID, 'openid_delegate', true)) { - if ($request->mode != 'checkid_immediate') { - if ($_REQUEST['action'] == 'cancel') { - check_admin_referer('openid-server_cancel'); - return $request->answer(false); + if ( $id_select && get_user_meta( $user->ID, 'openid_delegate', true ) ) { + if ( 'checkid_immediate' != $request->mode ) { + if ( 'cancel' == $_REQUEST['action'] ) { + check_admin_referer( 'openid-server_cancel' ); + return $request->answer( false ); } else { @session_start(); $_SESSION['openid_server_request'] = $request; ob_start(); - echo '<h1>'.__('OpenID Login Error', 'openid').'</h1>'; + echo '<h1>' . __( 'OpenID Login Error', 'openid' ) . '</h1>'; echo '<p>'; - printf(__('Because you have delegated your OpenID, you cannot login with the URL <strong>%s</strong>. Instead, you must use your full OpenID when logging in.', 'openid'), trailingslashit(get_option('home'))); + printf( __( 'Because you have delegated your OpenID, you cannot login with the URL <strong>%s</strong>. Instead, you must use your full OpenID when logging in.', 'openid'), trailingslashit( get_option( 'home' ) ) ); echo'</p>'; - echo '<p>' . sprintf(__('Your full OpenID is: %s', 'openid'), '<strong>'.$author_url.'</strong>') . '</p>'; + echo '<p>' . sprintf( __( 'Your full OpenID is: %s', 'openid'), '<strong>' . $author_url . '</strong>' ) . '</p>'; echo ' <form method="post"> @@ -274,44 +281,44 @@ function openid_server_auth_request($request) { <input type="hidden" name="action" value="cancel" /> <input type="hidden" name="openid_server" value="1" /> </p>' - . wp_nonce_field('openid-server_cancel', '_wpnonce', true, false) - .'</form>'; + . wp_nonce_field( 'openid-server_cancel', '_wpnonce', true, false ) + . '</form>'; $html = ob_get_contents(); ob_end_clean(); - wp_die($html, 'OpenID Login Error'); + wp_die( $html, 'OpenID Login Error' ); } } } // if user trusts site, we're done - $trusted_sites = get_user_meta($user->ID, 'openid_trusted_sites', true); - $site_hash = md5($request->trust_root); - if (is_array($trusted_sites) && array_key_exists($site_hash, $trusted_sites)) { - $trusted_sites[$site_hash]['last_login'] = time(); - update_user_meta($user->ID, 'openid_trusted_sites', $trusted_sites); - - if ($id_select) { - return $request->answer(true, null, $author_url); + $trusted_sites = get_user_meta( $user->ID, 'openid_trusted_sites', true ); + $site_hash = md5( $request->trust_root ); + if ( is_array( $trusted_sites ) && array_key_exists( $site_hash, $trusted_sites ) ) { + $trusted_sites[ $site_hash ]['last_login'] = time(); + update_user_meta( $user->ID, 'openid_trusted_sites', $trusted_sites ); + + if ( $id_select ) { + return $request->answer( true, null, $author_url ); } else { - return $request->answer(true); + return $request->answer( true ); } } // that's all we can do without interacting with the user... bail if using immediate - if ($request->mode == 'checkid_immediate') { - return $request->answer(false); + if ( 'checkid_immediate' == $request->mode ) { + return $request->answer( false ); } // finally, prompt the user to trust this site - if (openid_server_user_trust($request)) { - if ($id_select) { - return $request->answer(true, null, $author_url); + if ( openid_server_user_trust( $request ) ) { + if ( $id_select ) { + return $request->answer( true, null, $author_url ); } else { - return $request->answer(true); + return $request->answer( true ); } } else { - return $request->answer(false); + return $request->answer( false ); } } @@ -323,12 +330,14 @@ function openid_server_auth_request($request) { * @param string $claimed claimed url * @return bool whether the current user matches the claimed URL */ -function openid_server_check_user_login($claimed) { +function openid_server_check_user_login( $claimed ) { $user = wp_get_current_user(); - if (!$user) return false; + if ( ! $user ) { + return false; + } - $identifier = get_author_posts_url($user->ID); - return ($claimed == $identifier); + $identifier = get_author_posts_url( $user->ID ); + return ( $claimed == $identifier ); } @@ -337,16 +346,16 @@ function openid_server_check_user_login($claimed) { * * @param object $response response object */ -function openid_server_process_response($response) { +function openid_server_process_response( $response ) { $server = openid_server(); - $web_response = $server->encodeResponse($response); + $web_response = $server->encodeResponse( $response ); - if ($web_response->code != AUTH_OPENID_HTTP_OK) { - header(sprintf('HTTP/1.1 %d', $web_response->code), true, $web_response->code); + if ( AUTH_OPENID_HTTP_OK != $web_response->code ) { + header( sprintf( 'HTTP/1.1 %d', $web_response->code ), true, $web_response->code ); } - foreach ($web_response->headers as $k => $v) { - header("$k: $v"); + foreach ( $web_response->headers as $k => $v ) { + header( "$k: $v" ); } print $web_response->body; @@ -362,8 +371,8 @@ function openid_server_process_response($response) { function openid_server() { static $server; - if (!$server || !is_a($server, 'Auth_OpenID_Server')) { - $server = new Auth_OpenID_Server(openid_getStore(), openid_server_url()); + if ( ! $server || ! is_a( $server, 'Auth_OpenID_Server' ) ) { + $server = new Auth_OpenID_Server( openid_getStore(), openid_server_url() ); } return $server; @@ -375,57 +384,57 @@ function openid_server() { */ function openid_provider_link_tags() { - if (is_front_page()) { - if (!defined('OPENID_DISALLOW_OWNER') || !OPENID_DISALLOW_OWNER) { - $user = get_user_by('login', get_option('openid_blog_owner')); + if ( is_front_page() ) { + if ( ! defined( 'OPENID_DISALLOW_OWNER' ) || ! OPENID_DISALLOW_OWNER ) { + $user = get_user_by( 'login', get_option( 'openid_blog_owner' ) ); } - } else if (is_author()) { + } elseif ( is_author() ) { global $wp_query; $user = $wp_query->get_queried_object(); } - if ( isset($user) && $user) { + if ( isset( $user ) && $user ) { // if user doesn't have capability, bail - $user_object = new WP_User($user->ID); - if (!$user_object->has_cap('use_openid_provider')) return; + $user_object = new WP_User( $user->ID ); + if ( ! $user_object->has_cap( 'use_openid_provider' ) ) { + return; + } - if (get_user_meta($user->ID, 'openid_delegate', true)) { - $services = get_user_meta($user->ID, 'openid_delegate_services', true); + if ( get_user_meta( $user->ID, 'openid_delegate', true ) ) { + $services = get_user_meta( $user->ID, 'openid_delegate_services', true ); $openid_1 = false; $openid_2 = false; - foreach($services as $service) { - if (!$openid_1 && $service['openid:Delegate']) { + foreach ( $services as $service ) { + if ( ! $openid_1 && $service['openid:Delegate'] ) { echo ' - <link rel="openid.server" href="'.$service['URI'].'" /> - <link rel="openid.delegate" href="'.$service['openid:Delegate'].'" />'; + <link rel="openid.server" href="' . $service['URI'] . '" /> + <link rel="openid.delegate" href="' . $service['openid:Delegate'] . '" />'; $openid_1 = true; } - if (!$openid_2 && $service['LocalID']) { + if ( ! $openid_2 && $service['LocalID'] ) { echo ' - <link rel="openid2.provider" href="'.$service['URI'].'" /> - <link rel="openid2.local_id" href="'.$service['LocalID'].'" />'; + <link rel="openid2.provider" href="' . $service['URI'] . '" /> + <link rel="openid2.local_id" href="' . $service['LocalID'] . '" />'; $openid_2 = true; } } - } else { + } else { $server = openid_server_url(); - $identifier = get_author_posts_url($user->ID); + $identifier = get_author_posts_url( $user->ID ); echo ' - <link rel="openid2.provider" href="'.$server.'" /> - <link rel="openid2.local_id" href="'.$identifier.'" /> - <link rel="openid.server" href="'.$server.'" /> - <link rel="openid.delegate" href="'.$identifier.'" />'; + <link rel="openid2.provider" href="' . $server . '" /> + <link rel="openid2.local_id" href="' . $identifier . '" /> + <link rel="openid.server" href="' . $server . '" /> + <link rel="openid.delegate" href="' . $identifier . '" />'; } - } - } -function openid_server_add_trust_site($user_id, $site_url, $site_name = null, $release_attributes) { +function openid_server_add_trust_site( $user_id, $site_url, $site_name = null, $release_attributes ) { } function openid_server_remove_trust_site() { @@ -438,32 +447,35 @@ function openid_server_remove_trust_site() { * @uses do_action() Calls the 'openid_server_trust_submit' hook action when processing the submitted trust form. * @uses apply_filters() Calls 'openid_server_store_trusted_site' before storing trusted site data. */ -function openid_server_user_trust($request) { +function openid_server_user_trust( $request ) { $user = wp_get_current_user(); - if (isset($_REQUEST['openid_trust']) && $_REQUEST['openid_trust']) { + if ( isset( $_REQUEST['openid_trust'] ) && $_REQUEST['openid_trust'] ) { $trust = null; - if ($_REQUEST['openid_trust'] == 'cancel') { + if ( 'cancel' == $_REQUEST['openid_trust'] ) { $trust = false; } else { - check_admin_referer('openid-server_trust'); + check_admin_referer( 'openid-server_trust' ); $trust = true; } - do_action('openid_server_trust_submit', $trust, $request); + do_action( 'openid_server_trust_submit', $trust, $request ); - if ($trust) { + if ( $trust ) { // store trusted site (unless hidden constant is set) - if (!defined('OPENID_NO_AUTO_TRUST') || !OPENID_NO_AUTO_TRUST) { - $site = array( 'url' => $request->trust_root, 'last_login' => time()); - $site = apply_filters('openid_server_store_trusted_site', $site); - - $trusted_sites = get_user_meta($user->ID, 'openid_trusted_sites', true); - $site_hash = md5($request->trust_root); - $trusted_sites[$site_hash] = $site; - - update_user_meta($user->ID, 'openid_trusted_sites', $trusted_sites); + if ( ! defined( 'OPENID_NO_AUTO_TRUST' ) || ! OPENID_NO_AUTO_TRUST ) { + $site = array( + 'url' => $request->trust_root, + 'last_login' => time(), + ); + $site = apply_filters( 'openid_server_store_trusted_site', $site ); + + $trusted_sites = get_user_meta( $user->ID, 'openid_trusted_sites', true ); + $site_hash = md5( $request->trust_root ); + $trusted_sites[ $site_hash ] = $site; + + update_user_meta( $user->ID, 'openid_trusted_sites', $trusted_sites ); } } @@ -487,46 +499,46 @@ function openid_server_user_trust($request) { </style> <div id="banner"> - <div id="site">'.get_option('blogname').'</div>'; + <div id="site">' . get_option( 'blogname' ) . '</div>'; - if (is_user_logged_in()) { + if ( is_user_logged_in() ) { $user = wp_get_current_user(); - $logout_url = site_url('wp-login.php?action=logout&redirect_to=' . urlencode(openid_server_url()), 'login'); + $logout_url = site_url( 'wp-login.php?action=logout&redirect_to=' . urlencode( openid_server_url() ), 'login' ); echo ' - <div id="loggedin">' . sprintf(__('Logged in as %1$s (%2$s). <a href="%3$s">Use a different account?</a>', 'openid'), $user->display_name, $user->user_login, $logout_url ) . '</div>'; + <div id="loggedin">' . sprintf( __( 'Logged in as %1$s (%2$s). <a href="%3$s">Use a different account?</a>', 'openid' ), $user->display_name, $user->user_login, $logout_url ) . '</div>'; } echo ' </div> <form action="' . openid_server_url() . '" method="post"> - <h1>'.__('Verify Your Identity', 'openid').'</h1> + <h1>' . __( 'Verify Your Identity', 'openid' ) . '</h1> <p style="margin: 1.5em 0 1em 0;">' - . sprintf(__('%s has asked to verify your identity.', 'openid'), '<strong>'.$request->trust_root.'</strong>') + . sprintf( __( '%s has asked to verify your identity.', 'openid' ), '<strong>' . $request->trust_root . '</strong>' ) . '</p> <p style="margin: 1em 0;">' - . __('Click <strong>Continue</strong> to verify your identity and login without creating a new password.', 'openid') + . __( 'Click <strong>Continue</strong> to verify your identity and login without creating a new password.', 'openid' ) . '</p>'; - do_action('openid_server_trust_form'); + do_action( 'openid_server_trust_form' ); echo ' <p class="submit" style="text-align: center; margin-top: 2.4em;"> - <a href="' . add_query_arg('openid_trust', 'cancel', openid_server_url()) . '">'.__('Cancel and go back', 'openid').'</a> - <input type="submit" id="submit" name="openid_trust" value="'.__('Continue', 'openid').'" /> + <a href="' . add_query_arg( 'openid_trust', 'cancel', openid_server_url() ) . '">' . __( 'Cancel and go back', 'openid' ) . '</a> + <input type="submit" id="submit" name="openid_trust" value="' . __( 'Continue', 'openid' ) . '" /> </p> <p style="margin: 3em 0 1em 0; font-size: 0.8em;">' - . sprintf(__('Manage or remove access on the <a href="%s" target="_blank">Trusted Sites</a> page.', 'openid'), - admin_url((current_user_can('edit_users') ? 'users.php' : 'profile.php') . '?page=openid_trusted_sites')) + . sprintf( __( 'Manage or remove access on the <a href="%s" target="_blank">Trusted Sites</a> page.', 'openid' ), + admin_url( ( current_user_can( 'edit_users' ) ? 'users.php' : 'profile.php' ) . '?page=openid_trusted_sites' ) ) . '</p> <p style="margin: 1em 0; font-size: 0.8em;">' - . sprintf(__('<a href="%s" target="_blank">Edit your profile</a> to change the information that gets shared with Trusted Sites.', 'openid'), admin_url('profile.php')) + . sprintf( __( '<a href="%s" target="_blank">Edit your profile</a> to change the information that gets shared with Trusted Sites.', 'openid' ), admin_url( 'profile.php' ) ) . '</p> '; - wp_nonce_field('openid-server_trust', '_wpnonce', true); + wp_nonce_field( 'openid-server_trust', '_wpnonce', true ); echo ' </form>'; @@ -534,7 +546,7 @@ function openid_server_user_trust($request) { $html = ob_get_contents(); ob_end_clean(); - openid_page($html, __('Verify Your Identity', 'openid')); + openid_page( $html, __( 'Verify Your Identity', 'openid' ) ); } } @@ -546,30 +558,34 @@ function openid_server_user_trust($request) { * @url string URL to discover. If not provided, user's current delegate will be used * @return bool true if successful */ -function openid_server_get_delegation_info($userid, $url = null) { - if (empty($url)) $url = get_user_meta($userid, 'openid_delegate', true); - if (empty($url)) return false; +function openid_server_get_delegation_info( $userid, $url = null ) { + if ( empty( $url ) ) { + $url = get_user_meta( $userid, 'openid_delegate', true ); + } + if ( empty( $url ) ) { + return false; + } - $fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); - $discoveryResult = Auth_Yadis_Yadis::discover($url, $fetcher); - $endpoints = Auth_OpenID_ServiceEndpoint::fromDiscoveryResult($discoveryResult); - $services = array(); + $fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); + $discovery_result = Auth_Yadis_Yadis::discover( $url, $fetcher ); + $endpoints = Auth_OpenID_ServiceEndpoint::fromDiscoveryResult( $discovery_result ); + $services = array(); - if (!empty($endpoints)) { - foreach ($endpoints as $endpoint) { + if ( ! empty( $endpoints ) ) { + foreach ( $endpoints as $endpoint ) { $service = array( 'Type' => array(), - 'URI' => $endpoint->server_url, + 'URI' => $endpoint->server_url, ); - foreach ($endpoint->type_uris as $type) { - $service['Type'][] = array('content' => $type); + foreach ( $endpoint->type_uris as $type ) { + $service['Type'][] = array( 'content' => $type ); - if ($type == Auth_OpenID_TYPE_2_0_IDP) { + if ( Auth_OpenID_TYPE_2_0_IDP == $type ) { $service['LocalID'] = Auth_OpenID_IDENTIFIER_SELECT; - } else if ($type == Auth_OpenID_TYPE_2_0) { + } elseif ( Auth_OpenID_TYPE_2_0 == $type ) { $service['LocalID'] = $endpoint->local_id; - } else if (in_array($type, array(Auth_OpenID_TYPE_1_0, Auth_OpenID_TYPE_1_1, Auth_OpenID_TYPE_1_2))) { + } elseif ( in_array( $type, array( Auth_OpenID_TYPE_1_0, Auth_OpenID_TYPE_1_1, Auth_OpenID_TYPE_1_2 ) ) ) { $service['openid:Delegate'] = $endpoint->local_id; } } @@ -578,9 +594,9 @@ function openid_server_get_delegation_info($userid, $url = null) { } } - if (empty($services)) { + if ( empty( $services ) ) { // resort to checking for HTML links - $response = $fetcher->get($url); + $response = $fetcher->get( $url ); if ( ! $response ) { return false; @@ -588,37 +604,43 @@ function openid_server_get_delegation_info($userid, $url = null) { $html_content = $response->body; $p = new Auth_OpenID_Parse(); - $link_attrs = $p->parseLinkAttrs($html_content); + $link_attrs = $p->parseLinkAttrs( $html_content ); // check HTML for OpenID2 - $server_url = $p->findFirstHref($link_attrs, 'openid2.provider'); - if ($server_url !== null) { - $openid_url = $p->findFirstHref($link_attrs, 'openid2.local_id'); - if ($openid_url == null) $openid_url = $url; + $server_url = $p->findFirstHref( $link_attrs, 'openid2.provider' ); + if ( null !== $server_url ) { + $openid_url = $p->findFirstHref( $link_attrs, 'openid2.local_id' ); + if ( null == $openid_url ) { + $openid_url = $url; + } $services[] = array( - 'Type' => array(array('content' => Auth_OpenID_Type_1_1)), + 'Type' => array( array( 'content' => Auth_OpenID_Type_1_1 ) ), 'URI' => $server_url, 'LocalID' => $openid_url, ); } // check HTML for OpenID1 - $server_url = $p->findFirstHref($link_attrs, 'openid.server'); - if ($server_url !== null) { - $openid_url = $p->findFirstHref($link_attrs, 'openid.delegate'); - if ($openid_url == null) $openid_url = $url; + $server_url = $p->findFirstHref( $link_attrs, 'openid.server' ); + if ( null !== $server_url ) { + $openid_url = $p->findFirstHref( $link_attrs, 'openid.delegate' ); + if ( null == $openid_url ) { + $openid_url = $url; + } $services[] = array( - 'Type' => array(array('content' => Auth_OpenID_Type_2_0)), - 'URI' => $server_url, + 'Type' => array( array( 'content' => Auth_OpenID_Type_2_0 ) ), + 'URI' => $server_url, 'openid:Delegate' => $openid_url, ); } } - if (empty($services)) return false; + if ( empty( $services ) ) { + return false; + } return array( - 'url' => $url, - 'services' => $services + 'url' => $url, + 'services' => $services, ); } |