From 340804aa793d5e1986d86557a79f496531733090 Mon Sep 17 00:00:00 2001
From: saxmatt <saxmatt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 14 Dec 2004 03:00:55 +0000
Subject: [PATCH] Move all auth stuff into functions.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin.php        |  4 ++--
 wp-admin/auth.php         | 15 ---------------
 wp-admin/index.php        |  2 +-
 wp-admin/profile.php      |  2 +-
 wp-includes/functions.php | 19 +++++++++++++++++++
 5 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 wp-admin/auth.php

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 4286deb27..34f217c23 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,9 +1,9 @@
 <?php
 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");
 foreach ($dogs as $catt) {
diff --git a/wp-admin/auth.php b/wp-admin/auth.php
deleted file mode 100644
index 4a1599883..000000000
--- a/wp-admin/auth.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-require_once(ABSPATH . '/wp-config.php');
-
-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();
-}
-
-?>
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 85011a3cb..fc4dbe50a 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -1,7 +1,7 @@
 <?php
 
 require('../wp-config.php');
-require_once('auth.php');
+auth_redirect();
 
 get_currentuserinfo();
 
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 1ba946e90..f75e35f87 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -21,7 +21,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 }
 
 require_once('../wp-config.php');
-require_once('auth.php');
+auth_redirect();
 switch($action) {
 
 case 'update':
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index d2f130de6..b1e83b90b 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1954,6 +1954,7 @@ function wp_mail($to, $subject, $message, $headers = '', $more = '') {
 		return mail($to, $subject, $message, $headers, $more);
 }
 
+if ( !function_exists('wp_login') ) :
 function wp_login($username, $password, $already_md5 = false) {
 	global $wpdb, $error;
 
@@ -1982,6 +1983,24 @@ function wp_login($username, $password, $already_md5 = false) {
 		}
 	}
 }
+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() {
 	global $plugin_page;