Changeset 8058 for trunk/wp-includes/pluggable.php

Timestamp:

06/06/2008 07:39:11 AM (18 years ago)

Author:

ryan

Message:

More use of site_url(), admin_url(), and site_url(). Force login and admin links to be https if FORCE_SSL_LOGIN. see #7001

File:

• trunk/wp-includes/pluggable.php (modified) (7 diffs)

trunk/wp-includes/pluggable.php

@@ -644 +644 @@
     nocache_headers();
 
-    $login_url = get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']);
-
-    //  Redirect to https if connection is secure
-    if ( $secure )
-        $login_url = str_replace('http://', 'https://', $login_url);
+    $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']), 'forceable' );
+
     wp_redirect($login_url);
     exit();
@@ -665 +662 @@
  */
 function check_admin_referer($action = -1, $query_arg = '_wpnonce') {
-    $adminurl = strtolower(get_option('siteurl')).'/wp-admin';
+    $adminurl = strtolower(admin_url());
     $referer = strtolower(wp_get_referer());
     $result = wp_verify_nonce($_REQUEST[$query_arg], $action);
@@ -795 +792 @@
 
     if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
-        $location = get_option('siteurl') . '/wp-admin/';
+        $location = admin_url();
 
     wp_redirect($location, $status);
@@ -849 +846 @@
     }
     $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-    $notify_message .= sprintf( __('Delete it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&c=$comment_id" ) . "\r\n";
-    $notify_message .= sprintf( __('Spam it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n";
+    $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
+    $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n";
 
     $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
@@ -929 +926 @@
     }
 
-    $notify_message .= sprintf( __('Approve it: %s'),  get_option('siteurl')."/wp-admin/comment.php?action=mac&c=$comment_id" ) . "\r\n";
-    $notify_message .= sprintf( __('Delete it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&c=$comment_id" ) . "\r\n";
-    $notify_message .= sprintf( __('Spam it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n";
+    $notify_message .= sprintf( __('Approve it: %s'),  admin_url("comment.php?action=mac&c=$comment_id") ) . "\r\n";
+    $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n";
+    $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n";
 
     $notify_message .= sprintf( __ngettext('Currently %s comment is waiting for approval. Please visit the moderation panel:', 
         'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
-    $notify_message .= get_option('siteurl') . "/wp-admin/edit-comments.php?comment_status=moderated\r\n";
+    $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
 
     $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title );
@@ -975 +972 @@
     $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
     $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
-    $message .= get_option('siteurl') . "/wp-login.php\r\n";
+    $message .= site_url("wp-login.php", 'forceable') . "\r\n";
 
     wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message);
@@ -1295 +1292 @@
         $default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
     elseif ( 'blank' == $default )
-        $default = get_option('siteurl') . '/wp-includes/images/blank.gif';
+        $default = includes_url('images/blank.gif');
     elseif ( !empty($email) && 'gravatar_default' == $default )
         $default = '';