Changeset 1144

Timestamp:

11/14/07 18:04:31 (1 year ago)

Author:

donncha

Message:

Allow login via a secure login form

Files:

• trunk/wp-admin/menu.php (modified) (4 diffs)
• trunk/wp-admin/wpmu-blogs.php (modified) (2 diffs)
• trunk/wp-login.php (modified) (2 diffs)

trunk/wp-admin/menu.php

@@ -5 +5 @@
-// The minimum level the user needs to access the item: between 0 and 10
-// The URL of the item's file
+
+$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+
-$menu[0] = array(__('Dashboard'), 'read', 'index.php');
-
@@ -161 +164 @@
-                        if ( empty($blogs) || $blogs == false ) { // If user haven't any blog
-                                update_usermeta( $user_ID, 'wp_1_capabilities', array('subscriber' => true)); // Add subscriber permission for first blog.
-'http://'.
+$schema . 
-                                exit();
-                        }
@@ -167 +170 @@
-                        foreach ( (array) $blogs as $blog ) {
-                                if ( $blog->userblog_id == $newblog->blog_id ) {
-'http://'.
+$schema . 
-                                        exit();
-                                }
@@ -173 +176 @@
-                        
-                        $blog = $blogs[0]; // Take the first blog...
-'http://'.
+$schema . 
-                        exit();
-                }

trunk/wp-admin/wpmu-blogs.php

@@ -6 +6 @@
-wp_enqueue_script( 'listman' );
-require_once('admin-header.php');
-
-if( is_site_admin() == false ) {
-    wp_die( __('<p>You do not have permission to access this page.</p>') );
@@ -520 +519 @@
-                                                        ?>
-                                                                <td valign="top">
-http://"
+". $schema
-                                                                </td>
-                                                        <?php

trunk/wp-login.php

@@ -12 +12 @@
-header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
-
+$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-if ( defined('RELOCATE') ) { // Move flag is set
-        if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
-                $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
-
-        $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-        if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
-                update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
@@ -271 +271 @@
-?>
-
-http://<?php echo
+<?php echo $schema .
-<?php if ( !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
-        <p>