diff options
Diffstat (limited to 'plugins/openid/admin_panels.php')
| -rw-r--r-- | plugins/openid/admin_panels.php | 779 |
1 files changed, 449 insertions, 330 deletions
diff --git a/plugins/openid/admin_panels.php b/plugins/openid/admin_panels.php index d40bb8e8..193a4aef 100644 --- a/plugins/openid/admin_panels.php +++ b/plugins/openid/admin_panels.php @@ -23,16 +23,22 @@ function openid_admin_panels() { // global options page $hookname = add_options_page( __( 'OpenID options', 'openid' ), __( 'OpenID', 'openid' ), 'manage_options', 'openid', 'openid_options_page' ); - add_action( "load-$hookname", function() { - add_thickbox(); - } ); + add_action( + "load-$hookname", + function() { + add_thickbox(); + } + ); add_action( "load-$hookname", 'openid_style' ); // all users can setup external OpenIDs $hookname = add_users_page( __( 'Your OpenIDs', 'openid' ), __( 'Your OpenIDs', 'openid' ), 'read', 'your_openids', 'openid_profile_panel' ); - add_action( "load-$hookname", function() { - wp_enqueue_script( 'admin-forms' ); - } ); + add_action( + "load-$hookname", + function() { + wp_enqueue_script( 'admin-forms' ); + } + ); add_action( "load-$hookname", 'openid_profile_management' ); add_action( "load-$hookname", 'openid_style' ); @@ -45,12 +51,21 @@ function openid_admin_panels() { add_action( 'load-profile.php', 'openid_style' ); if ( ! get_user_meta( $user->ID, 'openid_delegate', true ) ) { - $hookname = add_submenu_page( 'profile.php', __( 'Your Trusted Sites', 'openid' ), - __( 'Your Trusted Sites', 'openid' ), 'read', 'openid_trusted_sites', 'openid_manage_trusted_sites' ); + $hookname = add_submenu_page( + 'profile.php', + __( 'Your Trusted Sites', 'openid' ), + __( 'Your Trusted Sites', 'openid' ), + 'read', + 'openid_trusted_sites', + 'openid_manage_trusted_sites' + ); add_action( "load-$hookname", 'openid_style' ); - add_action( "load-$hookname", function() { - wp_enqueue_script( 'admin-forms' ); - } ); + add_action( + "load-$hookname", + function() { + wp_enqueue_script( 'admin-forms' ); + } + ); } } @@ -63,8 +78,13 @@ function openid_admin_panels() { // 'users_can_register' option, so only add the OpenID Settings if that is set. If additional OpenID settings // are added to the General Settings page, this check may no longer be necessary if ( get_option( 'users_can_register' ) ) { - add_settings_field( 'openid_general_settings', __( 'OpenID Settings', 'openid' ), 'openid_general_settings', - 'general', 'default'); + add_settings_field( + 'openid_general_settings', + __( 'OpenID Settings', 'openid' ), + 'openid_general_settings', + 'general', + 'default' + ); } } @@ -163,18 +183,32 @@ function openid_options_page() { <h2><?php _e( 'OpenID Settings', 'openid' ); ?></h2> - <div class="updated fade"><p><?php _e( 'Please note that all OpenID Consumer options have been moved to their respective sections of the ' - . '<a href="options-general.php">General Settings</a> and <a href="options-discussion.php">Discussion Settings</a> pages.', 'openid' ); ?></p></div> + <div class="updated fade"><p> + <?php + _e( + 'Please note that all OpenID Consumer options have been moved to their respective sections of the ' + . '<a href="options-general.php">General Settings</a> and <a href="options-discussion.php">Discussion Settings</a> pages.', + 'openid' + ); + ?> + </p></div> <?php - $current_user = wp_get_current_user(); + $current_user = wp_get_current_user(); $current_user_url = get_author_posts_url( $current_user->ID ); ?> - <p><?php _e( 'The OpenID Provider allows authorized ' - . 'users to use their author URL as an OpenID, either using their ' - . 'local WordPress username and password, or by delegating to another OpenID Provider.', 'openid' ); ?></p> + <p> + <?php + _e( + 'The OpenID Provider allows authorized ' + . 'users to use their author URL as an OpenID, either using their ' + . 'local WordPress username and password, or by delegating to another OpenID Provider.', + 'openid' + ); + ?> + </p> <table class="form-table optiontable editform"> <tr valign="top"> @@ -186,9 +220,9 @@ function openid_options_page() { <p> <?php foreach ( $wp_roles->role_names as $key => $name ) { - $name = _x( $name, null ); - $role = $wp_roles->get_role( $key ); - $checked = $role->has_cap( 'use_openid_provider' ) ? ' checked="checked"' : ''; + $name = _x( $name, null ); + $role = $wp_roles->get_role( $key ); + $checked = $role->has_cap( 'use_openid_provider' ) ? ' checked="checked"' : ''; $option_name = 'openid_cap[' . htmlentities( $key ) . ']'; echo '<input type="checkbox" id="' . $option_name . '" name="' . $option_name . '"' . $checked . ' /><label for="' . $option_name . '"> ' . $name . '</label><br />' . PHP_EOL; } @@ -199,49 +233,63 @@ function openid_options_page() { <?php $users = get_users(); - $users = array_filter( $users, function( $u ) { - $u = new WP_User( $u->ID ); - return $u->has_cap( 'use_openid_provider' ); - } ); + $users = array_filter( + $users, + function( $u ) { + $u = new WP_User( $u->ID ); + return $u->has_cap( 'use_openid_provider' ); + } + ); - if ( ! empty( $users ) ): + if ( ! empty( $users ) ) : ?> <tr valign="top"> - <th scope="row"><?php _e('Blog Owner', 'openid') ?></th> + <th scope="row"><?php _e( 'Blog Owner', 'openid' ); ?></th> <td> - <p><?php printf( __( 'Authorized accounts on this blog can use their author URL (i.e. <em>%1$s</em>) as an OpenID. ' - . 'The Blog Owner will be able to use the blog address (%2$s) as their OpenID. If this is a ' - . 'single-user blog, you should set this to your account.', 'openid'), - sprintf( '<a href="%1$s">%1$s</a>', $current_user_url ), sprintf('<a href="%1$s">%1$s</a>', trailingslashit( get_option( 'home') ) ) - ); ?></p> + <p> + <?php + printf( + __( + 'Authorized accounts on this blog can use their author URL (i.e. <em>%1$s</em>) as an OpenID. ' + . 'The Blog Owner will be able to use the blog address (%2$s) as their OpenID. If this is a ' + . 'single-user blog, you should set this to your account.', + 'openid' + ), + sprintf( '<a href="%1$s">%1$s</a>', $current_user_url ), + sprintf( '<a href="%1$s">%1$s</a>', trailingslashit( get_option( 'home' ) ) ) + ); + ?> + </p> - <?php + <?php if ( defined( 'OPENID_DISALLOW_OWNER' ) && OPENID_DISALLOW_OWNER ) { echo ' - <p class="error">' . __( 'A Blog Owner cannot be set for this blog. To set a Blog Owner, ' - . 'first remove the following line from your <code>wp-config.php</code>:', 'openid') + <p class="error">' . __( + 'A Blog Owner cannot be set for this blog. To set a Blog Owner, ' + . 'first remove the following line from your <code>wp-config.php</code>:', + 'openid' + ) . '<br /><code style="margin:1em;">define("OPENID_DISALLOW_OWNER", 1);</code> </p>'; } else { $blog_owner = get_option( 'openid_blog_owner' ); - if ( empty( $blog_owner ) || $blog_owner == $current_user->user_login) { - echo '<select id="openid_blog_owner" name="openid_blog_owner"><option value="">' . __('(none)', 'openid') . '</option>'; - + if ( empty( $blog_owner ) || $blog_owner == $current_user->user_login ) { + echo '<select id="openid_blog_owner" name="openid_blog_owner"><option value="">' . __( '(none)', 'openid' ) . '</option>'; - foreach ($users as $user) { - $selected = (get_option('openid_blog_owner') == $user->user_login) ? ' selected="selected"' : ''; - echo '<option value="'.$user->user_login.'"'.$selected.'>'.$user->user_login.'</option>'; + foreach ( $users as $user ) { + $selected = ( get_option( 'openid_blog_owner' ) == $user->user_login ) ? ' selected="selected"' : ''; + echo '<option value="' . $user->user_login . '"' . $selected . '>' . $user->user_login . '</option>'; } echo '</select>'; } else { - echo '<p class="error">' . sprintf(__('Only the current Blog Owner (%s) can change this setting.', 'openid'), $blog_owner) . '</p>'; + echo '<p class="error">' . sprintf( __( 'Only the current Blog Owner (%s) can change this setting.', 'openid' ), $blog_owner ) . '</p>'; } } - ?> + ?> </td> </tr> <?php endif; //!empty($users) ?> @@ -249,18 +297,25 @@ function openid_options_page() { <table class="form-table optiontable editform"> <tr valign="top"> - <th scope="row"><?php _e('Troubleshooting', 'openid') ?></th> + <th scope="row"><?php _e( 'Troubleshooting', 'openid' ); ?></th> <td> <?php openid_printSystemStatus(); ?> - <p><?php printf(__('If users are experiencing problems logging in with OpenID, it may help to %1$srefresh the cache%2$s.', 'openid'), - '<a href="' . wp_nonce_url(add_query_arg('action', 'rebuild_tables'), 'rebuild_tables') . '">', '</a>'); ?></p> + <p> + <?php + printf( + __( 'If users are experiencing problems logging in with OpenID, it may help to %1$srefresh the cache%2$s.', 'openid' ), + '<a href="' . wp_nonce_url( add_query_arg( 'action', 'rebuild_tables' ), 'rebuild_tables' ) . '">', + '</a>' + ); + ?> + </p> </td> </tr> </table> - <?php settings_fields('openid'); ?> - <p class="submit"><input type="submit" class="button-primary" name="info_update" value="<?php _e('Save Changes') ?>" /></p> + <?php settings_fields( 'openid' ); ?> + <p class="submit"><input type="submit" class="button-primary" name="info_update" value="<?php _e( 'Save Changes' ); ?>" /></p> </form> </div> <?php @@ -275,45 +330,52 @@ function openid_options_page() { function openid_profile_panel() { global $error; - if( !current_user_can('read') ) return; + if ( ! current_user_can( 'read' ) ) { + return; + } $user = wp_get_current_user(); $status = openid_status(); - if( 'success' == $status ) { - echo '<div class="updated"><p><strong>'.__('Success:', 'openid').'</strong> '.openid_message().'</p></div>'; - } - elseif( 'warning' == $status ) { - echo '<div class="error"><p><strong>'.__('Warning:', 'openid').'</strong> '.openid_message().'</p></div>'; - } - elseif( 'error' == $status ) { - echo '<div class="error"><p><strong>'.__('Error:', 'openid').'</strong> '.openid_message().'</p></div>'; + if ( 'success' == $status ) { + echo '<div class="updated"><p><strong>' . __( 'Success:', 'openid' ) . '</strong> ' . openid_message() . '</p></div>'; + } elseif ( 'warning' == $status ) { + echo '<div class="error"><p><strong>' . __( 'Warning:', 'openid' ) . '</strong> ' . openid_message() . '</p></div>'; + } elseif ( 'error' == $status ) { + echo '<div class="error"><p><strong>' . __( 'Error:', 'openid' ) . '</strong> ' . openid_message() . '</p></div>'; } - if (!empty($error)) { - echo '<div class="error"><p><strong>'.__('Error:', 'openid').'</strong> '.$error.'</p></div>'; - unset($error); + if ( ! empty( $error ) ) { + echo '<div class="error"><p><strong>' . __( 'Error:', 'openid' ) . '</strong> ' . $error . '</p></div>'; + unset( $error ); } ?> <style type="text/css"> - #icon-openid { background-image: url("<?php echo plugin_dir_url(__FILE__) . 'f/icon.png'; ?>"); } + #icon-openid { background-image: url("<?php echo plugin_dir_url( __FILE__ ) . 'f/icon.png'; ?>"); } </style> <div class="wrap"> - <form action="<?php printf('%s?page=%s', $_SERVER['PHP_SELF'], $_REQUEST['page']); ?>" method="post"> - <h2><?php _e('Your Verified OpenIDs', 'openid') ?></h2> + <form action="<?php printf( '%s?page=%s', $_SERVER['PHP_SELF'], $_REQUEST['page'] ); ?>" method="post"> + <h2><?php _e( 'Your Verified OpenIDs', 'openid' ); ?></h2> - <p><?php _e('You may associate one or more OpenIDs with your account. This will ' - . 'allow you to login to WordPress with your OpenID instead of a username and password. ' - . '<a href="http://openid.net/what/" target="_blank">Learn more...</a>', 'openid')?></p> + <p> + <?php + _e( + 'You may associate one or more OpenIDs with your account. This will ' + . 'allow you to login to WordPress with your OpenID instead of a username and password. ' + . '<a href="http://openid.net/what/" target="_blank">Learn more...</a>', + 'openid' + ) + ?> + </p> <div class="tablenav"> <div class="alignleft actions"> <select name="action"> - <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> - <option value="delete"><?php _e('Delete'); ?></option> + <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option> + <option value="delete"><?php _e( 'Delete' ); ?></option> </select> - <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> - <?php wp_nonce_field('openid-delete_openids'); ?> + <input type="submit" value="<?php _e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" /> + <?php wp_nonce_field( 'openid-delete_openids' ); ?> </div> <div class="clear"></div> </div> @@ -324,25 +386,25 @@ function openid_profile_panel() { <thead> <tr> <td class="check-column"><input type="checkbox" /></td> - <th scope="col"><?php _e('Account', 'openid'); ?></th> + <th scope="col"><?php _e( 'Account', 'openid' ); ?></th> </tr> </thead> <tbody> <?php - $urls = get_user_openids($user->ID); + $urls = get_user_openids( $user->ID ); - if (empty($urls)) { - echo '<tr><td colspan="2">'.__('No Verified Accounts.', 'openid').'</td></tr>'; - } else { - foreach ($urls as $url) { - echo ' + if ( empty( $urls ) ) { + echo '<tr><td colspan="2">' . __( 'No Verified Accounts.', 'openid' ) . '</td></tr>'; + } else { + foreach ( $urls as $url ) { + echo ' <tr> - <th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="'.md5($url).'" /></th> - <td>'.openid_display_identity($url).'</td> + <th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="' . md5( $url ) . '" /></th> + <td>' . openid_display_identity( $url ) . '</td> </tr>'; - } } + } ?> </tbody> @@ -352,101 +414,116 @@ function openid_profile_panel() { <form method="post"> <table class="form-table"> <tr> - <th scope="row"><label for="openid_identifier"><?php _e('Add OpenID', 'openid') ?></label></th> + <th scope="row"><label for="openid_identifier"><?php _e( 'Add OpenID', 'openid' ); ?></label></th> <td><input id="openid_identifier" class="regular-text code" name="openid_identifier" /></td> </tr> </table> - <?php wp_nonce_field('openid-add_openid'); ?> + <?php wp_nonce_field( 'openid-add_openid' ); ?> <p class="submit"> - <input type="submit" class="button-primary" value="<?php _e('Add OpenID', 'openid') ?>" /> + <input type="submit" class="button-primary" value="<?php _e( 'Add OpenID', 'openid' ); ?>" /> <input type="hidden" name="action" value="add" > </p> </form> </div> -<?php + <?php } function openid_manage_trusted_sites() { $user = wp_get_current_user(); - switch (@$_REQUEST['action']) { - case 'add': - check_admin_referer('openid-add_trusted_sites'); + switch ( @$_REQUEST['action'] ) { + case 'add': + check_admin_referer( 'openid-add_trusted_sites' ); - $trusted_sites = get_user_meta($user->ID, 'openid_trusted_sites', true); - if (!is_array($trusted_sites)) $trusted_sites = array(); - $sites = explode(PHP_EOL, $_REQUEST['sites']); + $trusted_sites = get_user_meta( $user->ID, 'openid_trusted_sites', true ); + if ( ! is_array( $trusted_sites ) ) { + $trusted_sites = array(); + } + $sites = explode( PHP_EOL, $_REQUEST['sites'] ); - $count = 0; - foreach ($sites as $site) { - $site = trim($site); - if (empty($site)) continue; + $count = 0; + foreach ( $sites as $site ) { + $site = trim( $site ); + if ( empty( $site ) ) { + continue; + } - if (strpos($site, 'http') === false || strpos($site, 'http') != 0) { - $site = 'http://' . $site; - } + if ( strpos( $site, 'http' ) === false || strpos( $site, 'http' ) != 0 ) { + $site = 'http://' . $site; + } - $site = esc_url($site); - $site_hash = md5($site); + $site = esc_url( $site ); + $site_hash = md5( $site ); - if (array_key_exists($site_hash, $trusted_sites)) continue; + if ( array_key_exists( $site_hash, $trusted_sites ) ) { + continue; + } - $count++; - $trusted_sites[$site_hash] = array('url' => $site); - } + $count++; + $trusted_sites[ $site_hash ] = array( 'url' => $site ); + } - if ($count) { - update_user_meta($user->ID, 'openid_trusted_sites', $trusted_sites); - echo '<div class="updated"><p>'; - printf( _n('Added %d trusted site.', 'Added %d trusted sites.', $count, 'openid'), $count); - echo '</p></div>'; - } - break; + if ( $count ) { + update_user_meta( $user->ID, 'openid_trusted_sites', $trusted_sites ); + echo '<div class="updated"><p>'; + printf( _n( 'Added %d trusted site.', 'Added %d trusted sites.', $count, 'openid' ), $count ); + echo '</p></div>'; + } + break; - case 'delete': - if (empty($_REQUEST['delete'])) break; + case 'delete': + if ( empty( $_REQUEST['delete'] ) ) { + break; + } - check_admin_referer('openid-delete_trusted_sites'); + check_admin_referer( 'openid-delete_trusted_sites' ); - $trusted_sites = get_user_meta($user->ID, 'openid_trusted_sites', true); - $count = 0; - foreach ($_REQUEST['delete'] as $site_hash) { - if (array_key_exists($site_hash, $trusted_sites)) { - $trusted_sites[$site_hash] = null; - $count++; + $trusted_sites = get_user_meta( $user->ID, 'openid_trusted_sites', true ); + $count = 0; + foreach ( $_REQUEST['delete'] as $site_hash ) { + if ( array_key_exists( $site_hash, $trusted_sites ) ) { + $trusted_sites[ $site_hash ] = null; + $count++; + } } - } - update_user_meta($user->ID, 'openid_trusted_sites', array_filter($trusted_sites)); + update_user_meta( $user->ID, 'openid_trusted_sites', array_filter( $trusted_sites ) ); - if ($count) { - echo '<div class="updated"><p>'; - printf( _n('Deleted %d trusted site.', 'Deleted %d trusted sites.', $count, 'openid'), $count); - echo '</p></div>'; - } - break; + if ( $count ) { + echo '<div class="updated"><p>'; + printf( _n( 'Deleted %d trusted site.', 'Deleted %d trusted sites.', $count, 'openid' ), $count ); + echo '</p></div>'; + } + break; } ?> <style type="text/css"> - #icon-openid { background-image: url("<?php echo plugin_dir_url(__FILE__) . 'f/icon.png'; ?>"); } + #icon-openid { background-image: url("<?php echo plugin_dir_url( __FILE__ ) . 'f/icon.png'; ?>"); } </style> <div class="wrap"> - <h2><?php _e('Your Trusted Sites', 'openid'); ?></h2> + <h2><?php _e( 'Your Trusted Sites', 'openid' ); ?></h2> - <p><?php _e('This is a list of sites that you can automatically login to using your OpenID account. ' - . 'You will not be asked to approve OpenID login requests for your trusted sites.' , 'openid'); ?></p> + <p> + <?php + _e( + 'This is a list of sites that you can automatically login to using your OpenID account. ' + . 'You will not be asked to approve OpenID login requests for your trusted sites.', + 'openid' + ); + ?> + </p> <form method="post"> <div class="tablenav"> <div class="alignleft actions"> <select name="action"> - <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> - <option value="delete"><?php _e('Delete'); ?></option> + <option value="-1" selected="selected"><?php _e( 'Bulk Actions' ); ?></option> + <option value="delete"><?php _e( 'Delete' ); ?></option> </select> - <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> - <?php wp_nonce_field('openid-delete_trusted_sites'); ?> + <input type="submit" value="<?php _e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" /> + <?php wp_nonce_field( 'openid-delete_trusted_sites' ); ?> </div> <div class="clear"></div> </div> @@ -457,32 +534,32 @@ function openid_manage_trusted_sites() { <thead> <tr> <td class="check-column"><input type="checkbox" /></td> - <th scope="col"><?php _e('URL'); ?></th> - <th scope="col"><?php _e('Last Login', 'openid'); ?></th> + <th scope="col"><?php _e( 'URL' ); ?></th> + <th scope="col"><?php _e( 'Last Login', 'openid' ); ?></th> </tr> </thead> <tbody> <?php - $trusted_sites = get_user_meta($user->ID, 'openid_trusted_sites', true); - if(empty($trusted_sites)) { - echo '<tr><td colspan="3">'.__('No Trusted Sites.', 'openid').'</td></tr>'; - } else { - foreach( $trusted_sites as $site_hash => $site ) { - if (array_key_exists('last_login', $site) && $site['last_login']) { - $last_login = date(get_option('date_format') . ' - ' . get_option('time_format'), $site['last_login']); - } else { - $last_login = '-'; - } + $trusted_sites = get_user_meta( $user->ID, 'openid_trusted_sites', true ); + if ( empty( $trusted_sites ) ) { + echo '<tr><td colspan="3">' . __( 'No Trusted Sites.', 'openid' ) . '</td></tr>'; + } else { + foreach ( $trusted_sites as $site_hash => $site ) { + if ( array_key_exists( 'last_login', $site ) && $site['last_login'] ) { + $last_login = date( get_option( 'date_format' ) . ' - ' . get_option( 'time_format' ), $site['last_login'] ); + } else { + $last_login = '-'; + } - echo ' + echo ' <tr> - <th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="'.$site_hash.'" /></th> - <td>'.$site['url'].'</td> - <td>'.$last_login.'</td> + <th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="' . $site_hash . '" /></th> + <td>' . $site['url'] . '</td> + <td>' . $last_login . '</td> </tr>'; - } } + } ?> </tbody> @@ -497,29 +574,29 @@ function openid_manage_trusted_sites() { <form method="post"> - <h3><?php _e('Import Trusted Sites', 'openid'); ?></h3> + <h3><?php _e( 'Import Trusted Sites', 'openid' ); ?></h3> - <p><?php _e('Enter a list of URLs to be added to your Trusted Sites.', 'openid'); ?></p> + <p><?php _e( 'Enter a list of URLs to be added to your Trusted Sites.', 'openid' ); ?></p> <table class="form-table" style="margin-top: 0"> <tr> - <th scope="row"><label for="sites"><?php _e('Add Sites', 'openid') ?></label></th> + <th scope="row"><label for="sites"><?php _e( 'Add Sites', 'openid' ); ?></label></th> <td> - <textarea id="sites" name="sites" cols="60" rows="5"></textarea><br /><?php _e('(One URL per line)', 'openid'); ?> + <textarea id="sites" name="sites" cols="60" rows="5"></textarea><br /><?php _e( '(One URL per line)', 'openid' ); ?> </td> </tr> </table> - <?php wp_nonce_field('openid-add_trusted_sites'); ?> + <?php wp_nonce_field( 'openid-add_trusted_sites' ); ?> <p class="submit"> - <input type="submit" class="button-primary" value="<?php _e('Add Sites', 'openid') ?>" /> + <input type="submit" class="button-primary" value="<?php _e( 'Add Sites', 'openid' ); ?>" /> <input type="hidden" name="action" value="add" > </p> </form> </div> -<?php + <?php } @@ -529,95 +606,101 @@ function openid_manage_trusted_sites() { function openid_printSystemStatus() { global $wp_version, $wpdb; - $paths = explode(PATH_SEPARATOR, get_include_path()); - for($i=0; $i<sizeof($paths); $i++ ) { - $paths[$i] = @realpath($paths[$i]); - if (empty($paths[$i])) unset($paths[$i]); + $paths = explode( PATH_SEPARATOR, get_include_path() ); + for ( $i = 0; $i < sizeof( $paths ); $i++ ) { + $paths[ $i ] = @realpath( $paths[ $i ] ); + if ( empty( $paths[ $i ] ) ) { + unset( $paths[ $i ] ); + } } - $status = array(); + $status = array(); $status[] = array( 'PHP version', 'info', phpversion() ); - $status[] = array( 'PHP memory limit', 'info', ini_get('memory_limit') ); + $status[] = array( 'PHP memory limit', 'info', ini_get( 'memory_limit' ) ); $status[] = array( 'Include Path', 'info', $paths ); $status[] = array( 'WordPress version', 'info', $wp_version ); $status[] = array( 'PHP OpenID Library Version', 'info', Auth_OpenID_VERSION ); - $status[] = array( 'MySQL version', 'info', function_exists('mysql_get_client_info') ? mysql_get_client_info() : 'Mysql client information not available. Very strange, as WordPress requires MySQL.' ); - - $status[] = array('WordPress\' table prefix', 'info', isset($wpdb->base_prefix) ? $wpdb->base_prefix : $wpdb->prefix ); + $status[] = array( 'MySQL version', 'info', function_exists( 'mysql_get_client_info' ) ? mysql_get_client_info() : 'Mysql client information not available. Very strange, as WordPress requires MySQL.' ); + $status[] = array( 'WordPress\' table prefix', 'info', isset( $wpdb->base_prefix ) ? $wpdb->base_prefix : $wpdb->prefix ); - if ( extension_loaded('suhosin') ) { + if ( extension_loaded( 'suhosin' ) ) { $status[] = array( 'Curl', false, 'Hardened php (suhosin) extension active -- curl version checking skipped.' ); } else { $curl_message = ''; - if( function_exists('curl_version') ) { + if ( function_exists( 'curl_version' ) ) { $curl_version = curl_version(); - if(isset($curl_version['version'])) + if ( isset( $curl_version['version'] ) ) { $curl_message .= 'Version ' . $curl_version['version'] . '. '; - if(isset($curl_version['ssl_version'])) + } + if ( isset( $curl_version['ssl_version'] ) ) { $curl_message .= 'SSL: ' . $curl_version['ssl_version'] . '. '; - if(isset($curl_message['libz_version'])) + } + if ( isset( $curl_message['libz_version'] ) ) { $curl_message .= 'zlib: ' . $curl_version['libz_version'] . '. '; - if(isset($curl_version['protocols'])) { - if (is_array($curl_version['protocols'])) { - $curl_message .= 'Supports: ' . implode(', ',$curl_version['protocols']) . '. '; + } + if ( isset( $curl_version['protocols'] ) ) { + if ( is_array( $curl_version['protocols'] ) ) { + $curl_message .= 'Supports: ' . implode( ', ', $curl_version['protocols'] ) . '. '; } else { $curl_message .= 'Supports: ' . $curl_version['protocols'] . '. '; } } } else { - $curl_message = 'This PHP installation does not have support for libcurl. Some functionality, such as ' + $curl_message = 'This PHP installation does not have support for libcurl. Some functionality, such as ' . 'fetching https:// URLs, will be missing and performance will slightly impared. See ' . '<a href="http://www.php.net/manual/en/ref.curl.php">php.net/manual/en/ref.curl.php</a> about ' . 'enabling libcurl support for PHP.'; } - $status[] = array( 'Curl Support', isset($curl_version), $curl_message ); + $status[] = array( 'Curl Support', isset( $curl_version ), $curl_message ); } - if (extension_loaded('gmp') and @gmp_add(1,1)==2) { + if ( extension_loaded( 'gmp' ) and @gmp_add( 1, 1 ) == 2 ) { $status[] = array( 'Big Integer support', true, 'GMP is installed.' ); - } elseif (extension_loaded('bcmath') and @bcadd(1,1)==2) { + } elseif ( extension_loaded( 'bcmath' ) and @bcadd( 1, 1 ) == 2 ) { $status[] = array( 'Big Integer support', true, 'BCMath is installed (though <a href="http://www.php.net/gmp">GMP</a> is preferred).' ); - } elseif (defined('Auth_OpenID_NO_MATH_SUPPORT')) { + } elseif ( defined( 'Auth_OpenID_NO_MATH_SUPPORT' ) ) { $status[] = array( 'Big Integer support', false, 'The OpenID Library is operating in Dumb Mode. Recommend installing <a href="http://www.php.net/gmp">GMP</a> support.' ); } + $status[] = array( 'Plugin Revision', 'info', OPENID_PLUGIN_REVISION ); + $status[] = array( 'Plugin Database Revision', 'info', get_option( 'openid_db_revision' ) ); - $status[] = array( 'Plugin Revision', 'info', OPENID_PLUGIN_REVISION); - $status[] = array( 'Plugin Database Revision', 'info', get_option('openid_db_revision')); - - if (function_exists('xrds_meta')) { - $status[] = array( 'XRDS-Simple', 'info', 'XRDS-Simple plugin is installed.'); + if ( function_exists( 'xrds_meta' ) ) { + $status[] = array( 'XRDS-Simple', 'info', 'XRDS-Simple plugin is installed.' ); } else { - $status[] = array( 'XRDS-Simple', false, '<a href="http://wordpress.org/extend/plugins/xrds-simple/">XRDS-Simple</a> plugin is not installed. Some features may not work properly (including providing OpenIDs).'); + $status[] = array( 'XRDS-Simple', false, '<a href="http://wordpress.org/extend/plugins/xrds-simple/">XRDS-Simple</a> plugin is not installed. Some features may not work properly (including providing OpenIDs).' ); } $openid_enabled = openid_enabled(); - $status[] = array( '<strong>Overall Plugin Status</strong>', ($openid_enabled), - ($openid_enabled ? '' : 'There are problems above that must be dealt with before the plugin can be used.') ); - - if( $openid_enabled ) { // Display status information - echo'<p><strong>' . __('Status information:', 'openid') . '</strong> ' . __('All Systems Nominal', 'openid') - . '<small> (<a href="#TB_inline?height=600&width=800&inlineId=openid_system_status" id="openid_status_link" class="thickbox" title="' . __('System Status', 'openid') . '">' . __('Toggle More/Less', 'openid') . '</a>)</small> </p>'; + $status[] = array( + '<strong>Overall Plugin Status</strong>', + ( $openid_enabled ), + ( $openid_enabled ? '' : 'There are problems above that must be dealt with before the plugin can be used.' ), + ); + + if ( $openid_enabled ) { // Display status information + echo'<p><strong>' . __( 'Status information:', 'openid' ) . '</strong> ' . __( 'All Systems Nominal', 'openid' ) + . '<small> (<a href="#TB_inline?height=600&width=800&inlineId=openid_system_status" id="openid_status_link" class="thickbox" title="' . __( 'System Status', 'openid' ) . '">' . __( 'Toggle More/Less', 'openid' ) . '</a>)</small> </p>'; } else { - echo '<p><strong>' . __('Plugin is currently disabled. Fix the problem, then Deactivate/Reactivate the plugin.', 'openid') + echo '<p><strong>' . __( 'Plugin is currently disabled. Fix the problem, then Deactivate/Reactivate the plugin.', 'openid' ) . '</strong></p>'; } echo '<div id="openid_system_status" class="updated">'; - foreach( $status as $s ) { + foreach ( $status as $s ) { list ($name, $state, $message) = $s; echo '<div><strong>'; - if( $state === false ) { - echo "<span style='color:red;'>[".__('FAIL', 'openid')."]</span> $name"; - } elseif( $state === true ) { - echo "<span style='color:green;'>[".__('OK', 'openid')."]</span> $name"; + if ( $state === false ) { + echo "<span style='color:red;'>[" . __( 'FAIL', 'openid' ) . "]</span> $name"; + } elseif ( $state === true ) { + echo "<span style='color:green;'>[" . __( 'OK', 'openid' ) . "]</span> $name"; } else { - echo "<span style='color:grey;'>[".__('INFO', 'openid')."]</span> $name"; + echo "<span style='color:grey;'>[" . __( 'INFO', 'openid' ) . "]</span> $name"; } - echo ($message ? ': ' : '') . '</strong>'; - echo (is_array($message) ? '<ul><li>' . implode('</li><li>', $message) . '</li></ul>' : $message); + echo ( $message ? ': ' : '' ) . '</strong>'; + echo ( is_array( $message ) ? '<ul><li>' . implode( '</li><li>', $message ) . '</li></ul>' : $message ); echo '</div>'; } echo '</div> @@ -633,63 +716,63 @@ function openid_printSystemStatus() { function openid_profile_management() { global $action; - wp_reset_vars( array('action') ); + wp_reset_vars( array( 'action' ) ); - switch( $action ) { + switch ( $action ) { case 'add': - check_admin_referer('openid-add_openid'); + check_admin_referer( 'openid-add_openid' ); $user = wp_get_current_user(); - $auth_request = openid_begin_consumer($_POST['openid_identifier']); + $auth_request = openid_begin_consumer( $_POST['openid_identifier'] ); - $userid = get_user_by_openid($auth_request->endpoint->claimed_id); + $userid = get_user_by_openid( $auth_request->endpoint->claimed_id ); - if ($userid) { + if ( $userid ) { global $error; - if ($user->ID == $userid) { - $error = __('You already have this OpenID!', 'openid'); + if ( $user->ID == $userid ) { + $error = __( 'You already have this OpenID!', 'openid' ); } else { - $error = __('This OpenID is already associated with another user.', 'openid'); + $error = __( 'This OpenID is already associated with another user.', 'openid' ); } return; } - $finish_url = admin_url(current_user_can('edit_users') ? 'users.php' : 'profile.php'); - $finish_url = add_query_arg('page', $_REQUEST['page'], $finish_url); + $finish_url = admin_url( current_user_can( 'edit_users' ) ? 'users.php' : 'profile.php' ); + $finish_url = add_query_arg( 'page', $_REQUEST['page'], $finish_url ); - openid_start_login($_POST['openid_identifier'], 'verify', $finish_url); + openid_start_login( $_POST['openid_identifier'], 'verify', $finish_url ); break; case 'delete': - openid_profile_delete_openids($_REQUEST['delete']); + openid_profile_delete_openids( $_REQUEST['delete'] ); break; default: - if ( array_key_exists('message', $_REQUEST) ) { + if ( array_key_exists( 'message', $_REQUEST ) ) { $message = $_REQUEST['message']; $messages = array( '', - __('Unable to authenticate OpenID.', 'openid'), - __('OpenID assertion successful, but this URL is already associated with another user on this blog.', 'openid'), - __('Added association with OpenID.', 'openid') + __( 'Unable to authenticate OpenID.', 'openid' ), + __( 'OpenID assertion successful, but this URL is already associated with another user on this blog.', 'openid' ), + __( 'Added association with OpenID.', 'openid' ), ); - if (is_numeric($message)) { - $message = $messages[$message]; + if ( is_numeric( $message ) ) { + $message = $messages[ $message ]; } else { $message = htmlentities2( $message ); } - $message = __($message, 'openid'); + $message = __( $message, 'openid' ); - if (array_key_exists('update_url', $_REQUEST) && $_REQUEST['update_url']) { - $message .= '<br />' . __('<strong>Note:</strong> For security reasons, your profile URL has been updated to match your OpenID.', 'openid'); + if ( array_key_exists( 'update_url', $_REQUEST ) && $_REQUEST['update_url'] ) { + $message .= '<br />' . __( '<strong>Note:</strong> For security reasons, your profile URL has been updated to match your OpenID.', 'openid' ); } - openid_message($message); - openid_status($_REQUEST['status']); + openid_message( $message ); + openid_status( $_REQUEST['status'] ); } break; } @@ -701,67 +784,72 @@ function openid_profile_management() { * * @param int $id id of identity URL to remove */ -function openid_profile_delete_openids($delete) { +function openid_profile_delete_openids( $delete ) { - if (empty($delete) || array_key_exists('cancel', $_REQUEST)) return; - check_admin_referer('openid-delete_openids'); + if ( empty( $delete ) || array_key_exists( 'cancel', $_REQUEST ) ) { + return; + } + check_admin_referer( 'openid-delete_openids' ); $user = wp_get_current_user(); - $urls = get_user_openids($user->ID); + $urls = get_user_openids( $user->ID ); - if (sizeof($urls) == sizeof($delete) && !@$_REQUEST['confirm']) { + if ( sizeof( $urls ) == sizeof( $delete ) && ! @$_REQUEST['confirm'] ) { $html = ' - <h1>'.__('OpenID Warning', 'openid').'</h1> - <form action='.sprintf('%s?page=%s', $_SERVER['PHP_SELF'], $_REQUEST['page']).' method="post"> - <p>'.__('Are you sure you want to delete all of your OpenID associations? Doing so may prevent you from logging in.', 'openid').'</p> + <h1>' . __( 'OpenID Warning', 'openid' ) . '</h1> + <form action=' . sprintf( '%s?page=%s', $_SERVER['PHP_SELF'], $_REQUEST['page'] ) . ' method="post"> + <p>' . __( 'Are you sure you want to delete all of your OpenID associations? Doing so may prevent you from logging in.', 'openid' ) . '</p> <div class="submit"> - <input type="submit" name="confirm" value="'.__("Yes I'm sure. Delete.", 'openid').'" /> - <input type="submit" name="cancel" value="'.__("No, don't delete.", 'openid').'" /> + <input type="submit" name="confirm" value="' . __( "Yes I'm sure. Delete.", 'openid' ) . '" /> + <input type="submit" name="cancel" value="' . __( "No, don't delete.", 'openid' ) . '" /> </div>'; - foreach ($delete as $d) { - $html .= '<input type="hidden" name="delete[]" value="'.$d.'" />'; + foreach ( $delete as $d ) { + $html .= '<input type="hidden" name="delete[]" value="' . $d . '" />'; } - - $html .= wp_nonce_field('openid-delete_openids', '_wpnonce', true, false) . ' + $html .= wp_nonce_field( 'openid-delete_openids', '_wpnonce', true, false ) . ' <input type="hidden" name="action" value="delete" /> </form>'; - openid_page($html, __('OpenID Warning', 'openid')); + openid_page( $html, __( 'OpenID Warning', 'openid' ) ); return; } - $count = 0; - foreach ($urls as $url) { - if (in_array(md5($url), $_REQUEST['delete'])) { - if (openid_drop_identity($user->ID, $url)) { + foreach ( $urls as $url ) { + if ( in_array( md5( $url ), $_REQUEST['delete'] ) ) { + if ( openid_drop_identity( $user->ID, $url ) ) { $count++; } } } - if ($count) { - openid_message( sprintf(_n('Deleted %d OpenID association.', 'Deleted %d OpenID associations.', $count, 'openid'), $count) ); - openid_status('success'); + if ( $count ) { + openid_message( sprintf( _n( 'Deleted %d OpenID association.', 'Deleted %d OpenID associations.', $count, 'openid' ), $count ) ); + openid_status( 'success' ); // ensure that profile URL is still a verified OpenID require_once 'Auth/OpenID.php'; - @include_once(ABSPATH . WPINC . '/registration.php'); // WP < 2.3 - @include_once(ABSPATH . 'wp-admin/includes/admin.php'); // WP >= 2.3 - - if (!openid_ensure_url_match($user)) { - $identities = get_user_openids($user->ID); - wp_update_user( array('ID' => $user->ID, 'user_url' => $identities[0]) ); - openid_message(openid_message() . '<br />'.__('<strong>Note:</strong> For security reasons, your profile URL has been updated to match your OpenID.', 'openid')); + @include_once( ABSPATH . WPINC . '/registration.php' ); // WP < 2.3 + @include_once( ABSPATH . 'wp-admin/includes/admin.php' ); // WP >= 2.3 + + if ( ! openid_ensure_url_match( $user ) ) { + $identities = get_user_openids( $user->ID ); + wp_update_user( + array( + 'ID' => $user->ID, + 'user_url' => $identities[0], + ) + ); + openid_message( openid_message() . '<br />' . __( '<strong>Note:</strong> For security reasons, your profile URL has been updated to match your OpenID.', 'openid' ) ); } return; } - openid_message(__('OpenID association delete failed: Unknown reason.', 'openid')); - openid_status('error'); + openid_message( __( 'OpenID association delete failed: Unknown reason.', 'openid' ) ); + openid_status( 'error' ); } @@ -771,39 +859,48 @@ function openid_profile_delete_openids($delete) { * * @param string $identity_url verified OpenID URL */ -function openid_finish_verify($identity_url, $action) { - if ($action != 'verify') return; +function openid_finish_verify( $identity_url, $action ) { + if ( $action != 'verify' ) { + return; + } $message; $user = wp_get_current_user(); - if (empty($identity_url)) { + if ( empty( $identity_url ) ) { $message = openid_message(); - if (empty($message)) $message = 1; + if ( empty( $message ) ) { + $message = 1; + } } else { - if( !openid_add_identity($user->ID, $identity_url) ) { + if ( ! openid_add_identity( $user->ID, $identity_url ) ) { $message = 2; } else { $message = 3; // ensure that profile URL is a verified OpenID require_once 'Auth/OpenID.php'; - require_once(ABSPATH . 'wp-admin/includes/admin.php'); - - if (!openid_ensure_url_match($user)) { - wp_update_user( array('ID' => $user->ID, 'user_url' => $identity_url) ); + require_once( ABSPATH . 'wp-admin/includes/admin.php' ); + + if ( ! openid_ensure_url_match( $user ) ) { + wp_update_user( + array( + 'ID' => $user->ID, + 'user_url' => $identity_url, + ) + ); $update_url = 1; } } } $finish_url = $_SESSION['openid_finish_url']; - $finish_url = add_query_arg('status', openid_status(), $finish_url); - $finish_url = add_query_arg('message', $message, $finish_url); - if ( isset($update_url) && $update_url ) { - $finish_url = add_query_arg('update_url', $update_url, $finish_url); + $finish_url = add_query_arg( 'status', openid_status(), $finish_url ); + $finish_url = add_query_arg( 'message', $message, $finish_url ); + if ( isset( $update_url ) && $update_url ) { + $finish_url = add_query_arg( 'update_url', $update_url, $finish_url ); } - wp_safe_redirect($finish_url); + wp_safe_redirect( $finish_url ); exit; } @@ -814,9 +911,13 @@ function openid_finish_verify($identity_url, $action) { function openid_personal_options_update() { $user = wp_get_current_user(); - if (!openid_ensure_url_match($user, $_POST['url'])) { - wp_die(sprintf(__('For security reasons, your profile URL must be one of your claimed OpenIDs: %s', 'openid'), - '<ul><li>' . join('</li><li>', get_user_openids($user->ID)) . '</li></ul>')); + if ( ! openid_ensure_url_match( $user, $_POST['url'] ) ) { + wp_die( + sprintf( + __( 'For security reasons, your profile URL must be one of your claimed OpenIDs: %s', 'openid' ), + '<ul><li>' . join( '</li><li>', get_user_openids( $user->ID ) ) . '</li></ul>' + ) + ); } } @@ -824,18 +925,24 @@ function openid_personal_options_update() { /** * Ensure that the user's profile URL matches one of their OpenIDs */ -function openid_ensure_url_match($user, $url = null) { - $identities = get_user_openids($user->ID); - if (empty($identities)) return true; +function openid_ensure_url_match( $user, $url = null ) { + $identities = get_user_openids( $user->ID ); + if ( empty( $identities ) ) { + return true; + } require_once 'Auth/OpenID.php'; - if ($url == null) $url = $user->user_url; - $url = Auth_OpenID::normalizeUrl($url); + if ( $url == null ) { + $url = $user->user_url; + } + $url = Auth_OpenID::normalizeUrl( $url ); - foreach ($identities as $id) { - $id = Auth_OpenID::normalizeUrl($id); - if ($id == $url) return true; + foreach ( $identities as $id ) { + $id = Auth_OpenID::normalizeUrl( $id ); + if ( $id == $url ) { + return true; + } } return false; @@ -851,12 +958,12 @@ function openid_extend_profile() { echo ' <table class="form-table"> <tr> - <th><label for="openid_delegate">'.__('OpenID Delegation', 'openid').'</label></th> + <th><label for="openid_delegate">' . __( 'OpenID Delegation', 'openid' ) . '</label></th> <td> - <p style="margin-top:0;">'.__('OpenID Delegation allows you to use an external OpenID provider of your choice.', 'openid').'</p> + <p style="margin-top:0;">' . __( 'OpenID Delegation allows you to use an external OpenID provider of your choice.', 'openid' ) . '</p> <p> - <input type="text" id="openid_delegate" name="openid_delegate" class="regular-text code openid_link" value="'.get_user_meta($user->ID, 'openid_delegate', true).'" /> ' - . __('To delegate, enter a valid OpenID. Otherwise leave this blank.', 'openid') + <input type="text" id="openid_delegate" name="openid_delegate" class="regular-text code openid_link" value="' . get_user_meta( $user->ID, 'openid_delegate', true ) . '" /> ' + . __( 'To delegate, enter a valid OpenID. Otherwise leave this blank.', 'openid' ) . '</p> </td> </tr> @@ -868,15 +975,15 @@ function openid_extend_profile() { /** * Update OpenID options set from the WordPress user profile page. */ -function openid_profile_update($user_id) { +function openid_profile_update( $user_id ) { global $openid_user_delegation_info; - if ( empty($_POST['openid_delegate']) ) { - delete_user_meta($user_id, 'openid_delegate'); - delete_user_meta($user_id, 'openid_delegate_services'); + if ( empty( $_POST['openid_delegate'] ) ) { + delete_user_meta( $user_id, 'openid_delegate' ); + delete_user_meta( $user_id, 'openid_delegate_services' ); } else { - update_user_meta($user_id, 'openid_delegate', $openid_user_delegation_info['url']); - update_user_meta($user_id, 'openid_delegate_services', $openid_user_delegation_info['services']); + update_user_meta( $user_id, 'openid_delegate', $openid_user_delegation_info['url'] ); + update_user_meta( $user_id, 'openid_delegate_services', $openid_user_delegation_info['services'] ); } } @@ -884,26 +991,28 @@ function openid_profile_update($user_id) { /** * Report any OpenID errors during user profile updating. */ -function openid_profile_update_errors($errors, $update, $user) { +function openid_profile_update_errors( $errors, $update, $user ) { global $openid_user_delegation_info; - $delegate = Auth_OpenID::normalizeUrl($_POST['openid_delegate']); - if ( empty($delegate) ) return $errors; + $delegate = Auth_OpenID::normalizeUrl( $_POST['openid_delegate'] ); + if ( empty( $delegate ) ) { + return $errors; + } - $openid_user_delegation_info = openid_server_get_delegation_info($user->ID, $delegate); + $openid_user_delegation_info = openid_server_get_delegation_info( $user->ID, $delegate ); - if (!$openid_user_delegation_info) { - $errors->add('openid_delegate', sprintf(__('Unable to find any OpenID information for delegate URL %s', 'openid'), '<strong>'.$delegate.'</strong>')); + if ( ! $openid_user_delegation_info ) { + $errors->add( 'openid_delegate', sprintf( __( 'Unable to find any OpenID information for delegate URL %s', 'openid' ), '<strong>' . $delegate . '</strong>' ) ); } else { $id_select_count = 0; - foreach ($openid_user_delegation_info['services'] as $service) { - if ( array_key_exists('LocalID', $service) && $service['LocalID'] == Auth_OpenID_IDENTIFIER_SELECT ) { + foreach ( $openid_user_delegation_info['services'] as $service ) { + if ( array_key_exists( 'LocalID', $service ) && $service['LocalID'] == Auth_OpenID_IDENTIFIER_SELECT ) { $id_select_count++; } } - if ( count($openid_user_delegation_info['services']) <= $id_select_count ) { - $errors->add('openid_delegate', sprintf(__('You cannot delegate to an OpenID provider which uses Identifier Select.', 'openid'))); + if ( count( $openid_user_delegation_info['services'] ) <= $id_select_count ) { + $errors->add( 'openid_delegate', sprintf( __( 'You cannot delegate to an OpenID provider which uses Identifier Select.', 'openid' ) ) ); } } @@ -914,17 +1023,17 @@ function openid_profile_update_errors($errors, $update, $user) { * Add OpenID options to the WordPress MU site options page. */ function openid_wpmu_options() { - $registration = get_site_option('registration'); - if ( $registration == 'all' || $registration == 'user' ): -?> + $registration = get_site_option( 'registration' ); + if ( $registration == 'all' || $registration == 'user' ) : + ?> <table id="openid_options" class="wp-list-table widefat fixed striped"> <tr valign="top"> <th scope="row"></th> <td> <label for="openid_required_for_registration"> <input type="checkbox" name="openid_required_for_registration" id="openid_required_for_registration" value="1" - <?php checked(true, get_site_option('openid_required_for_registration')) ?> /> - <?php _e('New accounts can only be created with verified OpenIDs.', 'openid') ?> + <?php checked( true, get_site_option( 'openid_required_for_registration' ) ); ?> /> + <?php _e( 'New accounts can only be created with verified OpenIDs.', 'openid' ); ?> </label> </td> </tr> @@ -937,7 +1046,7 @@ function openid_wpmu_options() { jQuery('#openid_required_for_registration').parent().insertBefore(lastp).wrap('<p></p>'); }); </script> -<?php + <?php endif; } @@ -946,11 +1055,11 @@ function openid_wpmu_options() { * Update the OpenID options set from the WordPress MU site options page. */ function openid_update_wpmu_options() { - $openid_required = array_key_exists('openid_required_for_registration', $_POST); - if ($openid_required) { - update_site_option('openid_required_for_registration', '1'); + $openid_required = array_key_exists( 'openid_required_for_registration', $_POST ); + if ( $openid_required ) { + update_site_option( 'openid_required_for_registration', '1' ); } else { - update_site_option('openid_required_for_registration', '0'); + update_site_option( 'openid_required_for_registration', '0' ); } } @@ -959,11 +1068,12 @@ function openid_update_wpmu_options() { * Add OpenID options to the WordPress general settings page. */ function openid_general_settings() { - if ( get_option('users_can_register') ): ?> + if ( get_option( 'users_can_register' ) ) : + ?> <label for="openid_required_for_registration"> <input type="checkbox" name="openid_required_for_registration" id="openid_required_for_registration" value="1" - <?php checked(true, get_option('openid_required_for_registration')) ?> /> - <?php _e('New accounts can only be created with verified OpenIDs.', 'openid') ?> + <?php checked( true, get_option( 'openid_required_for_registration' ) ); ?> /> + <?php _e( 'New accounts can only be created with verified OpenIDs.', 'openid' ); ?> </label> <?php endif; ?> @@ -974,7 +1084,7 @@ function openid_general_settings() { .parent().prepend('<br />').insertAfter('label:has(#users_can_register)'); }); </script> -<?php + <?php } @@ -982,34 +1092,43 @@ function openid_general_settings() { * Add OpenID options to the WordPress discussion settings page. */ function openid_discussion_settings() { -?> + ?> <fieldset> <label for="openid_enable_commentform"> - <input type="checkbox" name="openid_enable_commentform" id="openid_enable_commentform" value="1" <?php - echo checked(true, get_option('openid_enable_commentform')); ?> /> - <?php _e('Enable OpenID for comments', 'openid') ?> + <input type="checkbox" name="openid_enable_commentform" id="openid_enable_commentform" value="1" + <?php + echo checked( true, get_option( 'openid_enable_commentform' ) ); + ?> + /> + <?php _e( 'Enable OpenID for comments', 'openid' ); ?> </label> <br /> - <?php if ( get_option('openid_enable_commentform') ): ?> + <?php if ( get_option( 'openid_enable_commentform' ) ) : ?> - <?php if ( get_option('require_name_email') ): ?> + <?php if ( get_option( 'require_name_email' ) ) : ?> <label for="openid_no_require_name"> - <input type="checkbox" name="openid_no_require_name" id="openid_no_require_name" value="1" <?php - echo checked(true, get_option('openid_no_require_name')) ; ?> /> - <?php _e('Do not require name and e-mail for comments left with a verified OpenID', 'openid') ?> + <input type="checkbox" name="openid_no_require_name" id="openid_no_require_name" value="1" + <?php + echo checked( true, get_option( 'openid_no_require_name' ) ); + ?> + /> + <?php _e( 'Do not require name and e-mail for comments left with a verified OpenID', 'openid' ); ?> </label> <br /> <?php endif; ?> <label for="openid_enable_approval"> - <input type="checkbox" name="openid_enable_approval" id="openid_enable_approval" value="1" <?php - echo checked(true, get_option('openid_enable_approval')); ?> /> - <?php _e('Always approve comments left with a verified OpenID', 'openid'); ?> + <input type="checkbox" name="openid_enable_approval" id="openid_enable_approval" value="1" + <?php + echo checked( true, get_option( 'openid_enable_approval' ) ); + ?> + /> + <?php _e( 'Always approve comments left with a verified OpenID', 'openid' ); ?> </label> <br /> <?php endif; ?> </fieldset> -<?php + <?php } |