[wp-cvs]
wordpress wp-comments-post.php, 1.11, 1.11.4.1 wp-login.php,
1.22.4.2, 1.22.4.3
Mike Little
mikelittle at users.sourceforge.net
Wed Oct 6 00:01:47 UTC 2004
- Previous message: [wp-cvs] wordpress/wp-includes functions-formatting.php, 1.30.4.1,
1.30.4.2 functions.php, 1.101.4.2, 1.101.4.3 links.php,
1.12.4.1, 1.12.4.2 version.php, 1.15.4.1, 1.15.4.2
- Next message: [wp-cvs] wordpress/wp-includes version.php,1.15.4.2,1.15.4.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22547
Modified Files:
Tag: WordPress-Ver-1_2-Branch
wp-comments-post.php wp-login.php
Log Message:
Copied over Matts 1.2.1 changes
Index: wp-comments-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-comments-post.php,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C2 -d -r1.11 -r1.11.4.1
*** wp-comments-post.php 7 May 2004 23:21:26 -0000 1.11
--- wp-comments-post.php 6 Oct 2004 00:01:43 -0000 1.11.4.1
***************
*** 1,104 ****
! <?php
! require( dirname(__FILE__) . '/wp-config.php' );
!
! function add_magic_quotes($array) {
! foreach ($array as $k => $v) {
! if (is_array($v)) {
! $array[$k] = add_magic_quotes($v);
! } else {
! $array[$k] = addslashes($v);
! }
! }
! return $array;
! }
!
! if (!get_magic_quotes_gpc()) {
! $_POST = add_magic_quotes($_POST);
! $_COOKIE = add_magic_quotes($_COOKIE);
! }
!
! $author = trim(strip_tags($_POST['author']));
!
! $email = trim(strip_tags($_POST['email']));
! if (strlen($email) < 6)
! $email = '';
!
! $url = trim(strip_tags($_POST['url']));
! $url = ((!stristr($url, '://')) && ($url != '')) ? 'http://'.$url : $url;
! if (strlen($url) < 7)
! $url = '';
!
! $comment = trim($_POST['comment']);
! $comment_post_ID = intval($_POST['comment_post_ID']);
! $user_ip = $_SERVER['REMOTE_ADDR'];
!
! if ( 'closed' == $wpdb->get_var("SELECT comment_status FROM $tableposts WHERE ID = '$comment_post_ID'") )
! die( __('Sorry, comments are closed for this item.') );
!
! if ( get_settings('require_name_email') && ('' == $email || '' == $author) )
! die( __('Error: please fill the required fields (name, email).') );
!
! if ( '' == $comment )
! die( __('Error: please type a comment.') );
!
!
! $now = current_time('mysql');
! $now_gmt = current_time('mysql', 1);
!
!
! $comment = balanceTags($comment, 1);
! $comment = format_to_post($comment);
! $comment = apply_filters('post_comment_text', $comment);
!
! // Simple flood-protection
! $lasttime = $wpdb->get_var("SELECT comment_date FROM $tablecomments WHERE comment_author_IP = '$user_ip' ORDER BY comment_date DESC LIMIT 1");
! if (!empty($lasttime)) {
! $time_lastcomment= mysql2date('U', $lasttime);
! $time_newcomment= mysql2date('U', $now);
! if (($time_newcomment - $time_lastcomment) < 10)
! die( __('Sorry, you can only post a new comment once every 10 seconds. Slow down cowboy.') );
! }
!
!
! // If we've made it this far, let's post.
!
! if(check_comment($author, $email, $url, $comment, $user_ip)) {
! $approved = 1;
! } else {
! $approved = 0;
! }
!
! $wpdb->query("INSERT INTO $tablecomments
! (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved)
! VALUES
! ('$comment_post_ID', '$author', '$email', '$url', '$user_ip', '$now', '$now_gmt', '$comment', '$approved')
! ");
!
! $comment_ID = $wpdb->get_var('SELECT last_insert_id()');
!
! if (!$approved) {
! wp_notify_moderator($comment_ID);
! }
!
! if ((get_settings('comments_notify')) && ($approved)) {
! wp_notify_postauthor($comment_ID, 'comment');
! }
!
! do_action('comment_post', $comment_ID);
!
! setcookie('comment_author_' . $cookiehash, $author, time() + 30000000, COOKIEPATH);
! setcookie('comment_author_email_' . $cookiehash, $email, time() + 30000000, COOKIEPATH);
! setcookie('comment_author_url_' . $cookiehash, $url, time() + 30000000, COOKIEPATH);
!
! header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
! $location = (empty($_POST['redirect_to'])) ? $_SERVER["HTTP_REFERER"] : $_POST['redirect_to'];
! if ($is_IIS) {
! header("Refresh: 0;url=$location");
! } else {
! header("Location: $location");
! }
!
?>
\ No newline at end of file
--- 1,104 ----
! <?php
! require( dirname(__FILE__) . '/wp-config.php' );
!
! function add_magic_quotes($array) {
! foreach ($array as $k => $v) {
! if (is_array($v)) {
! $array[$k] = add_magic_quotes($v);
! } else {
! $array[$k] = addslashes($v);
! }
! }
! return $array;
! }
!
! if (!get_magic_quotes_gpc()) {
! $_POST = add_magic_quotes($_POST);
! $_COOKIE = add_magic_quotes($_COOKIE);
! }
!
! $author = trim(strip_tags($_POST['author']));
!
! $email = trim(strip_tags($_POST['email']));
! if (strlen($email) < 6)
! $email = '';
!
! $url = trim(strip_tags($_POST['url']));
! $url = ((!stristr($url, '://')) && ($url != '')) ? 'http://'.$url : $url;
! if (strlen($url) < 7)
! $url = '';
!
! $comment = trim($_POST['comment']);
! $comment_post_ID = intval($_POST['comment_post_ID']);
! $user_ip = $_SERVER['REMOTE_ADDR'];
!
! if ( 'closed' == $wpdb->get_var("SELECT comment_status FROM $tableposts WHERE ID = '$comment_post_ID'") )
! die( __('Sorry, comments are closed for this item.') );
!
! if ( get_settings('require_name_email') && ('' == $email || '' == $author) )
! die( __('Error: please fill the required fields (name, email).') );
!
! if ( '' == $comment )
! die( __('Error: please type a comment.') );
!
!
! $now = current_time('mysql');
! $now_gmt = current_time('mysql', 1);
!
!
! $comment = balanceTags($comment, 1);
! $comment = format_to_post($comment);
! $comment = apply_filters('post_comment_text', $comment);
!
! // Simple flood-protection
! $lasttime = $wpdb->get_var("SELECT comment_date FROM $tablecomments WHERE comment_author_IP = '$user_ip' ORDER BY comment_date DESC LIMIT 1");
! if (!empty($lasttime)) {
! $time_lastcomment= mysql2date('U', $lasttime);
! $time_newcomment= mysql2date('U', $now);
! if (($time_newcomment - $time_lastcomment) < 10)
! die( __('Sorry, you can only post a new comment once every 10 seconds. Slow down cowboy.') );
! }
!
!
! // If we've made it this far, let's post.
!
! if(check_comment($author, $email, $url, $comment, $user_ip)) {
! $approved = 1;
! } else {
! $approved = 0;
! }
!
! $wpdb->query("INSERT INTO $tablecomments
! (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved)
! VALUES
! ('$comment_post_ID', '$author', '$email', '$url', '$user_ip', '$now', '$now_gmt', '$comment', '$approved')
! ");
!
! $comment_ID = $wpdb->get_var('SELECT last_insert_id()');
!
! if (!$approved) {
! wp_notify_moderator($comment_ID);
! }
!
! if ((get_settings('comments_notify')) && ($approved)) {
! wp_notify_postauthor($comment_ID, 'comment');
! }
!
! do_action('comment_post', $comment_ID);
!
! setcookie('comment_author_' . $cookiehash, $author, time() + 30000000, COOKIEPATH);
! setcookie('comment_author_email_' . $cookiehash, $email, time() + 30000000, COOKIEPATH);
! setcookie('comment_author_url_' . $cookiehash, $url, time() + 30000000, COOKIEPATH);
!
! header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
! $location = get_permalink($comment_ID);
! if ($is_IIS) {
! header("Refresh: 0;url=$location");
! } else {
! header("Location: $location");
! }
!
?>
\ No newline at end of file
Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.22.4.2
retrieving revision 1.22.4.3
diff -C2 -d -r1.22.4.2 -r1.22.4.3
*** wp-login.php 5 Oct 2004 22:39:06 -0000 1.22.4.2
--- wp-login.php 6 Oct 2004 00:01:44 -0000 1.22.4.3
***************
*** 1,320 ****
! <?php
! require(dirname(__FILE__) . '/wp-config.php');
!
! if (!function_exists('add_magic_quotes')) {
! function add_magic_quotes($array) {
! foreach ($array as $k => $v) {
! if (is_array($v)) {
! $array[$k] = add_magic_quotes($v);
! } else {
! $array[$k] = addslashes($v);
! }
! }
! return $array;
! }
! }
!
! if (!get_magic_quotes_gpc()) {
! $_GET = add_magic_quotes($_GET);
! $_POST = add_magic_quotes($_POST);
! $_COOKIE = add_magic_quotes($_COOKIE);
! }
!
! $wpvarstoreset = array('action','mode','error','text','popupurl','popuptitle');
!
! for ($i = 0; $i < count($wpvarstoreset); $i = $i + 1) {
! $wpvar = $wpvarstoreset[$i];
! if (!isset($$wpvar)) {
! if (empty($_POST["$wpvar"])) {
! if (empty($_GET["$wpvar"])) {
! $$wpvar = '';
! } else {
! $$wpvar = $_GET["$wpvar"];
! }
! } else {
! $$wpvar = $_POST["$wpvar"];
! }
! }
! }
!
! switch($action) {
!
! case 'logout':
!
! setcookie('wordpressuser_'.$cookiehash, " ", time() - 31536000, COOKIEPATH);
! setcookie('wordpresspass_'.$cookiehash, " ", time() - 31536000, COOKIEPATH);
! header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
! if ($is_IIS) {
! header('Refresh: 0;url=wp-login.php');
! } else {
! header('Location: wp-login.php');
! }
! exit();
!
! break;
!
! case 'login':
!
! if(!empty($_POST)) {
! $log = $_POST['log'];
! $pwd = $_POST['pwd'];
! $redirect_to = $_POST['redirect_to'];
! }
!
! $user = get_userdatabylogin($log);
!
! if (0 == $user->user_level) {
! $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
! }
!
! function login() {
! global $wpdb, $log, $pwd, $error, $user_ID;
! global $tableusers, $pass_is_md5;
! $user_login = &$log;
! $pwd = md5($pwd);
! $password = &$pwd;
! if (!$user_login) {
! $error = __('<strong>Error</strong>: the login field is empty.');
! return false;
! }
!
! if (!$password) {
! $error = __('<strong>Error</strong>: the password field is empty.');
! return false;
! }
!
! $query = "SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND user_pass = '$password'";
!
! $login = $wpdb->get_row($query);
!
! if (!$login) {
! $error = __('<strong>Error</strong>: wrong login or password.');
! $pwd = '';
! return false;
! } else {
! $user_ID = $login->ID;
! if (($pass_is_md5 == 0 && $login->user_login == $user_login && $login->user_pass == $password) || ($pass_is_md5 == 1 && $login->user_login == $user_login && $login->user_pass == md5($password))) {
! return true;
! } else {
! $error = __('<strong>Error</strong>: wrong login or password.');
! $pwd = '';
! return false;
! }
! }
! }
!
! if (!login()) {
! header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
! if ($is_IIS) {
! header('Refresh: 0;url=wp-login.php');
! } else {
! header('Location: wp-login.php');
! }
! exit();
! } else {
! $user_login = $log;
! $user_pass = $pwd;
! setcookie('wordpressuser_'.$cookiehash, $user_login, time() + 31536000, COOKIEPATH);
! setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time() + 31536000, COOKIEPATH);
!
! header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
!
! switch($mode) {
! case 'bookmarklet':
! $location = "wp-admin/bookmarklet.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle";
! break;
! case 'sidebar':
! $location = "wp-admin/sidebar.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle";
! break;
! case 'profile':
! $location = "wp-admin/profile.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle";
! break;
! default:
! $location = "$redirect_to";
! break;
! }
!
! if ($is_IIS) {
! header("Refresh: 0;url=$location");
! } else {
! header("Location: $location");
! }
! }
!
! break;
!
!
! case 'lostpassword':
!
! ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml">
! <head>
! <title><?php _e('WordPress » Lost password ?') ?></title>
! <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
! <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
! <script type="text/javascript">
! function focusit() {
! // focus on first input field
! document.lostpass.user_login.focus();
! }
! window.onload = focusit;
! </script>
! </head>
! <body>
!
!
! <div id="login">
! <p><?php _e('Please enter your information here. We will send you a new password.') ?> </p>
! <?php
! if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0000\">$error</font><br /> </div>";
! ?>
!
! <form name="" action="wp-login.php" method="post" id="lostpass">
! <input type="hidden" name="action" value="retrievepassword" />
! <label><?php _e('Login:') ?> <input type="text" name="user_login" id="user_login" value="" size="12" /></label><br />
! <label><?php _e('Email:') ?> <input type="text" name="email" id="email" value="" size="12" /></label><br />
! <input type="submit" name="Submit2" value="OK" class="search">
!
! </form>
! </div>
!
!
!
! </body>
! </html>
! <?php
!
! break;
!
! case 'retrievepassword':
!
! $user_login = $_POST["user_login"];
! $user_data = get_userdatabylogin($user_login);
! // redefining user_login ensures we return the right case in the email
! $user_login = $user_data['user_login'];
! $user_email = $user_data->user_email;
!
! if (!$user_email || $user_email != $_POST['email']) die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or email address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
! // Generate something random for a password... md5'ing current time with a rand salt
! $user_pass = substr((MD5("time" . rand(1,16000))), 0, 6);
! // now insert the new pass md5'd into the db
! $wpdb->query("UPDATE $tableusers SET user_pass = MD5('$user_pass') WHERE user_login = '$user_login'");
! $message = "Login: $user_login\r\n";
! $message .= "Password: $user_pass\r\n";
! $message .= 'Login at: ' . get_settings('siteurl') . '/wp-login.php';
!
! $m = mail($user_email, '[' . get_settings('blogname') . "] Your weblog's login/password", $message);
!
! if ($m == false) {
! echo "<p>The email could not be sent.<br />\n";
! echo "Possible reason: your host may have disabled the mail() function...</p>";
! die();
! } else {
! echo "<p>The email was sent successfully to $user_login's email address.<br />
! <a href='wp-login.php' title='Check your email first, of course'>Click here to login!</a></p>";
! // send a copy of password change notification to the admin
! mail(get_settings('admin_email'), '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login");
! die();
! }
!
! break;
!
!
! default:
!
! if((!empty($_COOKIE['wordpressuser_'.$cookiehash])) && (!empty($_COOKIE['wordpresspass_'.$cookiehash]))) {
! $user_login = $_COOKIE['wordpressuser_'.$cookiehash];
! $user_pass_md5 = $_COOKIE['wordpresspass_'.$cookiehash];
! }
!
! function checklogin() {
! global $user_login, $user_pass_md5, $user_ID;
!
! $userdata = get_userdatabylogin($user_login);
!
! if ($user_pass_md5 != md5($userdata->user_pass)) {
! return false;
! } else {
! return true;
! }
! }
!
! if ( !(checklogin()) ) {
! if (!empty($_COOKIE['wordpressuser_'.$cookiehash])) {
! $error="Error: wrong login/password"; //, or your session has expired.";
! }
! } else {
! header("Expires: Wed, 5 Jun 1979 23:41:00 GMT"); /* private joke: this is Michel's birthdate - though officially it's on the 6th, since he's GMT+1 :) */
! header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); /* different all the time */
! header("Cache-Control: no-cache, must-revalidate"); /* to cope with HTTP/1.1 */
! header("Pragma: no-cache");
! header("Location: wp-admin/");
! exit();
! }
! ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml">
! <head>
! <title><?php printf(__('WordPress > %s > Login form'), get_settings('blogname')) ?></title>
! <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
! <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
! <script type="text/javascript">
! function focusit() {
! // focus on first input field
! document.loginform.log.focus();
! }
! window.onload = focusit;
! </script>
! </head>
! <body>
!
! <div id="login">
! <p>
! <a href="<?php echo get_settings('home'); ?>" title="<?php _e('Are you lost?') ?>"><?php _e('Back to blog?') ?></a><br />
! <?php if (get_settings('users_can_register')) { ?>
! <a href="<?php echo get_settings('siteurl'); ?>/wp-register.php" title="<?php _e('Register to be an author') ?>"><?php _e('Register?') ?></a><br />
! <?php } ?>
! <a href="<?php echo get_settings('siteurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
! </p>
!
! <?php
! if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0000\">$error</font><br /> </div>";
! ?>
!
! <form name="login" id="loginform" action="wp-login.php" method="post">
! <?php if ($mode=="bookmarklet") { ?>
! <input type="hidden" name="mode" value="<?php echo $mode ?>" />
! <input type="hidden" name="text" value="<?php echo $text ?>" />
! <input type="hidden" name="popupurl" value="<?php echo $popupurl ?>" />
! <input type="hidden" name="popuptitle" value="<?php echo $popuptitle ?>" />
! <?php } ?>
! <?php if (isset($_GET["redirect_to"])) { ?>
! <input type="hidden" name="redirect_to" value="<?php echo $_GET["redirect_to"] ?>" />
! <?php } else { ?>
! <input type="hidden" name="redirect_to" value="wp-admin/" />
! <?php } ?>
! <input type="hidden" name="action" value="login" />
! <label><?php _e('Login:') ?> <input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label><br />
! <label><?php _e('Password:') ?> <input type="password" name="pwd" value="" size="20" tabindex="2" /></label><br />
! <input type="submit" name="Submit2" value="OK" class="search" tabindex="3" />
! </form>
!
! </div>
!
! </body>
! </html>
! <?php
!
! break;
! } // end action switch
! ?>
--- 1,270 ----
! <?php
! require('./wp-config.php');
!
! function login($username, $password, $already_md5 = false) {
! global $wpdb, $error, $tableusers;
! if ( !$already_md5 )
! $pwd = md5($password);
!
! if ( !$username )
! return false;
!
! if ( !$password ) {
! $error = __('<strong>Error</strong>: The password field is empty.');
! return false;
! }
!
! $login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$username'");
!
! if (!$login) {
! $error = __('<strong>Error</strong>: Wrong login.');
! $pwd = '';
! return false;
! } else {
!
! if ( $login->user_login == $username && $login->user_pass == $pwd ) {
! return true;
! } else {
! $error = __('<strong>Error</strong>: Incorrect password.');
! $pwd = '';
! return false;
! }
! }
! }
!
! if (!function_exists('add_magic_quotes')) {
! function add_magic_quotes($array) {
! foreach ($array as $k => $v) {
! if (is_array($v)) {
! $array[$k] = add_magic_quotes($v);
! } else {
! $array[$k] = addslashes($v);
! }
! }
! return $array;
! }
! }
!
! if (!get_magic_quotes_gpc()) {
! $_GET = add_magic_quotes($_GET);
! $_POST = add_magic_quotes($_POST);
! $_COOKIE = add_magic_quotes($_COOKIE);
! }
!
! $wpvarstoreset = array('action');
!
! for ($i = 0; $i < count($wpvarstoreset); $i = $i + 1) {
! $wpvar = $wpvarstoreset[$i];
! if (!isset($$wpvar)) {
! if (empty($_POST["$wpvar"])) {
! if (empty($_GET["$wpvar"])) {
! $$wpvar = '';
! } else {
! $$wpvar = $_GET["$wpvar"];
! }
! } else {
! $$wpvar = $_POST["$wpvar"];
! }
! }
! }
! $error = '';
! // If someone has moved WordPress let's try to detect it
! if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']) != get_settings('siteurl') )
! update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']) );
!
! switch($action) {
!
! case 'logout':
!
! setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
! setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
! header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
! if ($is_IIS)
! header('Refresh: 0;url=wp-login.php');
! else
! header('Location: wp-login.php');
! exit();
!
! break;
!
! case 'lostpassword':
!
! ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml">
! <head>
! <title>WordPress » <?php _e('Lost Password') ?></title>
! <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
! <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
! <script type="text/javascript">
! function focusit() {
! // focus on first input field
! document.getElementById('user_login').focus();
! }
! window.onload = focusit;
! </script>
! </head>
! <body>
! <div id="login">
! <h1><a href="http://wordpress.org/">WordPress</a></h1>
! <p><?php _e('Please enter your information here. We will send you a new password.') ?></p>
! <?php
! if ($error)
! echo "<div id='loginerror'>$error</div>";
! ?>
!
! <form name="lostpass" action="wp-login.php" method="post" id="lostpass">
! <p>
! <input type="hidden" name="action" value="retrievepassword" />
! <label><?php _e('Login') ?>: <input type="text" name="user_login" id="user_login" value="" size="12" tabindex="1" /></label><br />
! <label><?php _e('E-mail') ?>: <input type="text" name="email" id="email" value="" size="12" tabindex="2" /></label><br />
! </p>
! <p class="submit"><input type="submit" name="submit" value="<?php _e('Retrieve Password'); ?> »" tabindex="3" /></p>
! </form>
! </div>
! </body>
! </html>
! <?php
! break;
!
! case 'retrievepassword':
!
! $user_data = get_userdatabylogin($_POST['user_login']);
! // redefining user_login ensures we return the right case in the email
! $user_login = $user_data->user_login;
! $user_email = $user_data->user_email;
!
! if (!$user_email || $user_email != $_POST['email'])
! die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
!
! // Generate something random for a password... md5'ing current time with a rand salt
! $user_pass = substr( MD5('time' . rand(1, 16000) ), 0, 6);
! // now insert the new pass md5'd into the db
! $wpdb->query("UPDATE $tableusers SET user_pass = MD5('$user_pass') WHERE user_login = '$user_login'");
! $message = __('Login') . ": $user_login\r\n";
! $message .= __('Password') . ": $user_pass\r\n";
! $message .= get_settings('siteurl') . '/wp-login.php';
!
! $m = wp_mail($user_email, sprintf(__("[%s] Your login and password"), get_settings('blogname')), $message);
!
! if ($m == false) {
! echo '<p>' . __('The e-mail could not be sent.') . "<br />\n";
! echo __('Possible reason: your host may have disabled the mail() function...') . "</p>";
! die();
! } else {
! echo '<p>' . sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '<br />';
! echo "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
! // send a copy of password change notification to the admin
! wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login));
! die();
! }
!
! break;
!
! case 'login' :
! default:
!
! if( !empty($_POST) ) {
! $log = $_POST['log'];
! $pwd = $_POST['pwd'];
! $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
! }
!
! $user = get_userdatabylogin($log);
!
! if (0 == $user->user_level) {
! $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
! }
!
! if ( !login($log, $pwd) ) {
! header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
! } else {
! $user_login = $log;
! $user_pass = md5($pwd);
! setcookie('wordpressuser_'.$cookiehash, $user_login, time() + 31536000, COOKIEPATH);
! setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time() + 31536000, COOKIEPATH);
!
! header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
! header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
! header('Cache-Control: no-cache, must-revalidate');
! header('Pragma: no-cache');
!
! if ($is_IIS)
! header("Refresh: 0;url=$redirect_to");
! else
! header("Location: $redirect_to");
! }
!
! if( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) && !empty($_COOKIE['wordpresspass_' . COOKIEHASH]) ) {
! $user_login = $_COOKIE['wordpressuser_' . COOKIEHASH];
! $user_pass_md5 = $_COOKIE['wordpresspass_' . COOKIEHASH];
! }
!
! if ( !login($user_login, $user_pass_md5, true) ) {
! if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) )
! $error = 'Your session has expired.';
! } else {
! 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: wp-admin/');
! exit();
! }
! ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml">
! <head>
! <title>WordPress › <?php _e('Login') ?></title>
! <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
! <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
! <script type="text/javascript">
! function focusit() {
! // focus on first input field
! document.getElementById('log').focus();
! }
! window.onload = focusit;
! </script>
! </head>
! <body>
!
! <div id="login">
! <h1><a href="http://wordpress.org/">WordPress</a></h1>
! <?php
! if ($error)
! echo "<div id='login_error'>$error</div>";
! ?>
!
! <form name="loginform" id="loginform" action="wp-login.php?action=login" method="post">
! <p><label><?php _e('Login') ?>: <input type="text" name="log" id="log" value="" size="20" tabindex="1" /></label></p>
! <p><label><?php _e('Password') ?>: <input type="password" name="pwd" value="" size="20" tabindex="2" /></label></p>
! <p class="submit"><input type="submit" name="submit" value="<?php _e('Login'); ?> »" tabindex="3" />
! <?php if (isset($_GET["redirect_to"])) { ?>
! <input type="hidden" name="redirect_to" value="<?php echo $_GET["redirect_to"] ?>" />
! <?php } else { ?>
! <input type="hidden" name="redirect_to" value="wp-admin/" />
! <?php } ?>
! </p>
! </form>
! <ul>
! <li><a href="<?php echo get_settings('home'); ?>" title="<?php _e('Are you lost?') ?>">« <?php _e('Back to blog') ?></a></li>
! <?php if (get_settings('users_can_register')) : ?>
! <li><a href="<?php echo get_settings('siteurl'); ?>/wp-register.php"><?php _e('Register') ?></a></li>
! <?php endif; ?>
! <li><a href="<?php echo get_settings('siteurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
! </ul>
! </div>
!
! </body>
! </html>
! <?php
!
! break;
! } // end action switch
! ?>
\ No newline at end of file
- Previous message: [wp-cvs] wordpress/wp-includes functions-formatting.php, 1.30.4.1,
1.30.4.2 functions.php, 1.101.4.2, 1.101.4.3 links.php,
1.12.4.1, 1.12.4.2 version.php, 1.15.4.1, 1.15.4.2
- Next message: [wp-cvs] wordpress/wp-includes version.php,1.15.4.2,1.15.4.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list