Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 15:17:42 +02:00
Code Issues Projects Releases Wiki Activity

HTML updates, ezSQL changes.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2003-06-01 05:16:53 +00:00
parent 6f8954d8c6
commit 8a674e517e
2 changed files with 75 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
b2login.php
View File

@ -40,30 +40,26 @@ for ($i = 0; $i < count($b2varstoreset); $i = $i + 1) {
} }
} }
/* connecting the db */
$connexion = @mysql_connect($server,$loginsql,$passsql) or die("Can't connect to the database<br>".mysql_error());
mysql_select_db("$base");
switch($action) { switch($action) {
case "logout": case 'logout':
setcookie("wordpressuser"); setcookie('wordpressuser');
setcookie("wordpresspass"); setcookie('wordpresspass');
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header("Cache-Control: no-cache, must-revalidate"); // for HTTP/1.1 header('Cache-Control: no-cache, must-revalidate');
header("Pragma: no-cache"); header('Pragma: no-cache');
if ($is_IIS) { if ($is_IIS) {
header("Refresh: 0;url=b2login.php"); header('Refresh: 0;url=b2login.php');
} else { } else {
header("Location: b2login.php"); header('Location: b2login.php');
} }
exit(); exit();
break; break;
case "login": case 'login':
if(!empty($HTTP_POST_VARS)) { if(!empty($HTTP_POST_VARS)) {
$log = $HTTP_POST_VARS["log"]; $log = $HTTP_POST_VARS["log"];
@ -72,88 +68,86 @@ case "login":
} }
function login() { function login() {
global $server,$loginsql,$passsql,$base,$log,$pwd,$error,$user_ID; global $wpdb, $log, $pwd, $error, $user_ID;
global $tableusers, $pass_is_md5; global $tableusers, $pass_is_md5;
$user_login=$log; $user_login = &$log;
$password=$pwd; $password = &$pwd;
if (!$user_login) { if (!$user_login) {
$error="<b>ERROR</b>: the login field is empty"; $error="<strong>ERROR</strong>: the login field is empty";
return false; return false;
} }
if (!$password) { if (!$password) {
$error="<b>ERROR</b>: the password field is empty"; $error="<strong>ERROR</strong>: the password field is empty";
return false; return false;
} }
if (substr($password,0,4)=="md5:") { if ('md5:' == substr($password, 0, 4)) {
$pass_is_md5 = 1; $pass_is_md5 = 1;
$password = substr($password,4,strlen($password)); $password = substr($password, 4, strlen($password));
$query = " SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND MD5(user_pass) = '$password' "; $query = "SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND MD5(user_pass) = '$password'";
} else { } else {
$pass_is_md5 = 0; $pass_is_md5 = 0;
$query = " SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND user_pass = '$password' "; $query = "SELECT ID, user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' AND user_pass = '$password'";
} }
$result = mysql_query($query) or die("Incorrect Login/Password request: ".mysql_error()); $login = $wpdb->get_row($query);
$lines = mysql_num_rows($result); if (!$login) {
if ($lines<1) { $error = '<b>ERROR</b>: wrong login or password';
$error="<b>ERROR</b>: wrong login or password"; $pwd = '';
$pwd="";
return false; return false;
} else { } else {
$res=mysql_fetch_row($result); $user_ID = $login->ID;
$user_ID=$res[0]; if (($pass_is_md5 == 0 && $login->user_login == $user_login && $login->user_pass == $password) || ($pass_is_md5 == 1 && $login->user_login == $user_login && md5($login->user_pass) == $password)) {
if (($pass_is_md5==0 && $res[1]==$user_login && $res[2]==$password) || ($pass_is_md5==1 && $res[1]==$user_login && md5($res[2])==$password)) {
return true; return true;
} else { } else {
$error="<b>ERROR</b>: wrong login or password"; $error = '<b>ERROR</b>: wrong login or password';
$pwd=""; $pwd = '';
return false; return false;
} }
} }
} }
if (!login()) { if (!login()) {
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header("Cache-Control: no-cache, must-revalidate"); header('Cache-Control: no-cache, must-revalidate');
header("Pragma: no-cache"); header('Pragma: no-cache');
if ($is_IIS) { if ($is_IIS) {
header("Refresh: 0;url=b2login.php"); header('Refresh: 0;url=b2login.php');
} else { } else {
header("Location: b2login.php"); header('Location: b2login.php');
} }
exit(); exit();
} else { } else {
$user_login=$log; $user_login = $log;
$user_pass=$pwd; $user_pass = $pwd;
setcookie("wordpressuser",$user_login,time()+31536000); setcookie('wordpressuser', $user_login, time()+31536000);
if ($pass_is_md5) { if ($pass_is_md5) {
setcookie("wordpresspass",$user_pass,time()+31536000); setcookie('wordpresspass', $user_pass, time()+31536000);
} else { } else {
setcookie("wordpresspass",md5($user_pass),time()+31536000); setcookie('wordpresspass', md5($user_pass), time()+31536000);
} }
if (empty($HTTP_COOKIE_VARS["wordpressblogid"])) { if (empty($HTTP_COOKIE_VARS['wordpressblogid'])) {
setcookie("wordpressblogid","1",time()+31536000); setcookie('wordpressblogid', 1,time()+31536000);
} }
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header("Cache-Control: no-cache, must-revalidate"); header('Cache-Control: no-cache, must-revalidate');
header("Pragma: no-cache"); header('Pragma: no-cache');
switch($mode) { switch($mode) {
case "bookmarklet": case 'bookmarklet':
$location="wp-admin/b2bookmarklet.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle"; $location = "wp-admin/b2bookmarklet.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle";
break; break;
case "sidebar": case 'sidebar':
$location="wp-admin/sidebar.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle"; $location = "wp-admin/sidebar.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle";
break; break;
case "profile": case 'profile':
$location="wp-admin/profile.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle"; $location = "wp-admin/profile.php?text=$text&popupurl=$popupurl&popuptitle=$popuptitle";
break; break;
default: default:
$location="$redirect_to"; $location = "$redirect_to";
break; break;
} }
@ -167,7 +161,7 @@ case "login":
break; break;
case "lostpassword": case 'lostpassword':
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@ -176,29 +170,9 @@ case "lostpassword":
<title>WordPress > Lost password ?</title> <title>WordPress > Lost password ?</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css" /> <link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css" />
<style type="text/css">
<!--
<?php
if (!preg_match("/Nav/",$HTTP_USER_AGENT)) {
?>
textarea, input, select {
background-color: #f0f0f0;
border-width: 1px;
border-color: #cccccc;
border-style: solid;
padding: 2px;
margin: 1px;
}
<?php
}
?>
-->
</style>
</head> </head>
<body> <body>
<table width="100%" height="100%">
<td align="center" valign="middle">
<div id="login"> <div id="login">
<p>Type your login here and click OK. You will receive an email with your password.</p> <p>Type your login here and click OK. You will receive an email with your password.</p>
@ -214,9 +188,7 @@ if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0
</form> </form>
</div> </div>
</td>
</tr>
</table>
</body> </body>
</html> </html>
@ -225,7 +197,7 @@ if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0
break; break;
case "retrievepassword": case 'retrievepassword':
$user_login = $HTTP_POST_VARS["user_login"]; $user_login = $HTTP_POST_VARS["user_login"];
$user_data = get_userdatabylogin($user_login); $user_data = get_userdatabylogin($user_login);
@ -235,15 +207,15 @@ case "retrievepassword":
$message = "Login: $user_login\r\n"; $message = "Login: $user_login\r\n";
$message .= "Password: $user_pass\r\n"; $message .= "Password: $user_pass\r\n";
$m = mail($user_email, "your weblog's login/password", $message); $m = mail($user_email, "Your weblog's login/password", $message);
if ($m == false) { if ($m == false) {
echo "<p>The email could not be sent.<br />\n"; echo "<p>The email could not be sent.<br />\n";
echo "Possible reason: your host may have disabled the mail() function...</p>"; echo "Possible reason: your host may have disabled the mail() function...</p>";
die(); die();
} else { } else {
echo "<p>The email was sent successfully to $user_login's email address.<br />\n"; echo "<p>The email was sent successfully to $user_login's email address.<br />
echo "<a href=\"b2login.php\">Click here to login !</a></p>"; <a href='b2login.php' title='Check your email first, of course'>Click here to login!</a></p>";
die(); die();
} }
@ -258,8 +230,7 @@ default:
} }
function checklogin() { function checklogin() {
global $server,$loginsql,$passsql,$base; global $user_login, $user_pass_md5, $user_ID;
global $user_login,$user_pass_md5,$user_ID;
$userdata = get_userdatabylogin($user_login); $userdata = get_userdatabylogin($user_login);
@ -275,7 +246,7 @@ default:
$error="Error: wrong login/password"; //, or your session has expired."; $error="Error: wrong login/password"; //, or your session has expired.";
} }
} else { } else {
header("Expires: Wed, 5 Jun 1979 23:41:00 GMT"); /* private joke: this is my birthdate - though officially it's on the 6th, since I'm GMT+1 :) */ 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("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("Cache-Control: no-cache, must-revalidate"); /* to cope with HTTP/1.1 */
header("Pragma: no-cache"); header("Pragma: no-cache");
@ -286,31 +257,12 @@ default:
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>WordPress > Login form</title> <title>WordPress > Login form</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css"> <link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css" />
<style type="text/css">
<!--
<?php
if (!preg_match("/Nav/",$HTTP_USER_AGENT)) {
?>
textarea, input, select {
background-color: #f0f0f0;
border-width: 1px;
border-color: #cccccc;
border-style: solid;
padding: 2px;
margin: 1px;
}
<?php
}
?>
-->
</style>
</head> </head>
<body> <body>
<table width="100%" height="100%">
<td align="center" valign="middle">
<div id="login"> <div id="login">
<p><a href="<?php echo $siteurl?>">Back to blog?</a><br /> <p><a href="<?php echo $siteurl?>">Back to blog?</a><br />
@ -339,9 +291,6 @@ if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0
</form> </form>
</div> </div>
</td>
</tr>
</table>
</body> </body>
</html> </html>

27
wp-admin/b2verifauth.php
View File

@ -2,14 +2,10 @@
require_once('../b2config.php'); require_once('../b2config.php');
/* connecting the db */
$connexion = @mysql_connect($server,$loginsql,$passsql) or die("Can't connect to the database<br>".mysql_error());
mysql_select_db("$base");
/* checking login & pass in the database */ /* checking login & pass in the database */
function veriflog() { function veriflog() {
global $HTTP_COOKIE_VARS; global $HTTP_COOKIE_VARS;
global $tableusers,$tablesettings,$tablecategories,$tableposts,$tablecomments; global $tableusers, $wpdb;
if (!empty($HTTP_COOKIE_VARS["wordpressuser"])) { if (!empty($HTTP_COOKIE_VARS["wordpressuser"])) {
$user_login = $HTTP_COOKIE_VARS["wordpressuser"]; $user_login = $HTTP_COOKIE_VARS["wordpressuser"];
@ -18,20 +14,17 @@ function veriflog() {
return false; return false;
} }
if (!($user_login != "")) if (!($user_login != ''))
return false; return false;
if (!$user_pass_md5) if (!$user_pass_md5)
return false; return false;
$query = " SELECT user_login, user_pass FROM $tableusers WHERE user_login = '$user_login' "; $login = $wpdb->get_row("SELECT user_login, user_pass FROM $tableusers WHERE user_login = '$user_login'");
$result = @mysql_query($query) or die("Query: $query<br /><br />Error: ".mysql_error());
$lines = mysql_num_rows($result); if (!$login) {
if ($lines<1) {
return false; return false;
} else { } else {
$res=mysql_fetch_row($result); if ($login->user_login == $user_login && md5($login->user_pass) == $user_pass_md5) {
if ($res[0] == $user_login && md5($res[1]) == $user_pass_md5) {
return true; return true;
} else { } else {
return false; return false;
@ -41,12 +34,12 @@ function veriflog() {
//if ( $user_login!="" && $user_pass!="" && $id_session!="" && $adresse_ip==$REMOTE_ADDR) { //if ( $user_login!="" && $user_pass!="" && $id_session!="" && $adresse_ip==$REMOTE_ADDR) {
// if ( !(veriflog()) AND !(verifcookielog()) ) { // if ( !(veriflog()) AND !(verifcookielog()) ) {
if (!(veriflog())) { if (!(veriflog())) {
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header("Cache-Control: no-cache, must-revalidate"); header('Cache-Control: no-cache, must-revalidate');
header("Pragma: no-cache"); header('Pragma: no-cache');
if (!empty($HTTP_COOKIE_VARS["wordpressuser"])) { if (!empty($HTTP_COOKIE_VARS["wordpressuser"])) {
$error="<b>Error</b>: wrong login or password"; $error="<strong>Error</strong>: wrong login or password";
} }
header("Location: $path/b2login.php"); header("Location: $path/b2login.php");
exit(); exit();