Changeset 1947

Timestamp:

12/14/2004 03:00:55 AM (20 years ago)

Author:

saxmatt

Message:

Move all auth stuff into functions.

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/auth.php (deleted)
• wp-admin/index.php (modified) (1 diff)
• wp-admin/profile.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/admin.php

@@ -2 +2 @@
 require_once('../wp-config.php');
 require_once(ABSPATH . 'wp-includes/wp-l10n.php');
+require_once(ABSPATH . 'wp-admin/admin-functions.php');
+auth_redirect();
 
-require_once(ABSPATH . 'wp-admin/auth.php');
-require(ABSPATH . 'wp-admin/admin-functions.php');
 
 $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");

trunk/wp-admin/index.php

@@ -2 +2 @@
 
 require('../wp-config.php');
-require_once('auth.php');
+auth_redirect();
 
 get_currentuserinfo();

trunk/wp-admin/profile.php

@@ -22 +22 @@
 
 require_once('../wp-config.php');
-require_once('auth.php');
+auth_redirect();
 switch($action) {
 

trunk/wp-includes/functions.php

@@ -1955 +1955 @@
 }
 
+if ( !function_exists('wp_login') ) :
 function wp_login($username, $password, $already_md5 = false) {
     global $wpdb, $error;
@@ -1983 +1984 @@
     }
 }
+endif;
+
+if ( !function_exists('auth_redirect') ) :
+function auth_redirect() {
+    // Checks if a user is logged in, if not redirects them to the login page
+    if ( (!empty($_COOKIE['wordpressuser_' . COOKIEHASH]) && 
+    !wp_login($_COOKIE['wordpressuser_' . COOKIEHASH], $_COOKIE['wordpresspass_' . COOKIEHASH], true)) ||
+     (empty($_COOKIE['wordpressuser_' . COOKIEHASH])) ) {
+        header('Expires: Wed, 5 Jun 1979 23:41:00 GMT'); // Michel's birthday
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Cache-Control: no-cache, must-revalidate');
+        header('Pragma: no-cache');
+    
+        header('Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
+        exit();
+    }
+}
+endif;
 
 function is_plugin_page() {