golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move all auth stuff into functions. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@1947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-12-14 03:00:55 +00:00
parent 5cb036d571
commit 340804aa79
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/admin.php
View File

@ -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) {

15
wp-admin/auth.php
View File

@ -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();
}
?>

2
wp-admin/index.php
View File

@ -1,7 +1,7 @@
<?php
require('../wp-config.php');
require_once('auth.php');
auth_redirect();
get_currentuserinfo();

2
wp-admin/profile.php
View File

@ -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':

19
wp-includes/functions.php
View File

@ -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;