com web/master: Make these variables greppable.. And in the way fix a bug where the username was never hinted in the login form: include/login.inc

Commit: c659097ec0d0a08327b80c1b32ac0797f35ba5dd Author: Hannes Magnusson <bjori@mongodb.com> Tue, 10 Dec 2013 19:30:13 -0800 Parents: 524d0a518c4594fcbbdde79d4e9fb17e84def355 Branches: master Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=c659097ec0d0a08327b80c1b32ac0797f35ba5dd Log: Make these variables greppable... And in the way fix a bug where the username was never hinted in the login form Changed paths: M include/login.inc Diff: diff --git a/include/login.inc b/include/login.inc index 06fa512..ef5a487 100644 --- a/include/login.inc +++ b/include/login.inc @@ -6,16 +6,16 @@ require 'cvs-auth.inc'; require 'functions.inc'; // User not logged in -$user = $pw = FALSE; +$cuser = $cpw = FALSE; if (isset($_POST["user"], $_POST["pw"])) { - list($user, $pw) = array($_POST['user'], $_POST['pw']); + list($cuser, $cpw) = array($_POST['user'], $_POST['pw']); } elseif (isset($_SESSION["credentials"]) && count($_SESSION["credentials"]) == 2) { - list($user, $pw) = $_SESSION["credentials"]; + list($cuser, $cpw) = $_SESSION["credentials"]; } // Login form, if the user is not yet logged in -if (!$user || !$pw || !verify_password($user,$pw)) { +if (!$cuser || !$cpw || !verify_password($cuser,$cpw)) { $_SESSION["credentials"] = array(); session_destroy(); @@ -30,12 +30,12 @@ if (!$user || !$pw || !verify_password($user,$pw)) { } // IS_DEV was 1 or 0 until 22 Feb 2012. It's now a @php.net username hint. - $username = ''; + $cuser = ''; if (isset($_COOKIE['IS_DEV']) && !is_numeric($_COOKIE['IS_DEV'])) { - $username = clean($_COOKIE['IS_DEV']); + $cuser = clean($_COOKIE['IS_DEV']); } else { if (!empty($_POST['user'])) { - $username = clean($_POST['user']); + $cuser = clean($_POST['user']); } } ?> @@ -51,11 +51,11 @@ if (!$user || !$pw || !verify_password($user,$pw)) { <table> <tr> <th align="right">Username:</th> - <td><input type="text" name="user" value="<?php echo $username;?>" />@php.net + <td><input type="text" name="user" value="<?php echo $cuser;?>" />@php.net </tr> <tr> <th align="right">Password:</th> - <td><input type="password" name="pw" value="<?php echo clean($pw);?>" /> + <td><input type="password" name="pw" value="<?php echo clean($cpw);?>" /> </tr> <tr> <td align="center" colspan="2"><input type="submit" value="Login" /></td> @@ -70,11 +70,13 @@ if (!$user || !$pw || !verify_password($user,$pw)) { // At this point, we have logged in successfully if (!isset($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != "on") { + /* echo '<meta http-equiv="refresh" content="2;https://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'].'">'.PHP_EOL; exit('Bad puppy. Use <a href="https://'.$_SERVER['HTTP_HOST'].'/'.$_SERVER['PHP_SELF'].'">HTTPS</a>.'); + */ } -$_SESSION["credentials"] = array($user, $pw); +$_SESSION["credentials"] = array($cuser, $cpw); // Killing magic cookie setcookie("MAGIC_COOKIE","",$ts-3600,'/','.php.net'); @@ -82,7 +84,7 @@ setcookie("MAGIC_COOKIE","",$ts-3600,'/'); // Set a cookie to tell various .php.net services that the user is probably logged in // The username is saved here so we can automagically fill it in during login prompts -setcookie("IS_DEV", $user, $ts+3600*24*12, '/', '.php.net', false, true); +setcookie("IS_DEV", $cuser, $ts+3600*24*12, '/', '.php.net', false, true);