svn: /web/php-master/trunk/ include/login.inc manage/users.php
| From: | Hannes Magnusson | Date: | Wed, 23 Mar 2011 12:37:55 +0000 |
| Subject: | svn: /web/php-master/trunk/ include/login.inc manage/users.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-10709@lists.php.net to get a copy of this message | ||
bjori Wed, 23 Mar 2011 12:37:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309595
Log:
Cleanup the previous credentials when changing passwords
Changed paths:
U web/php-master/trunk/include/login.inc
U web/php-master/trunk/manage/users.php
Modified: web/php-master/trunk/include/login.inc
===================================================================
--- web/php-master/trunk/include/login.inc 2011-03-23 12:35:19 UTC (rev 309594)
+++ web/php-master/trunk/include/login.inc 2011-03-23 12:37:55 UTC (rev 309595)
@@ -10,7 +10,7 @@
if (isset($_POST["user"], $_POST["pw"])) {
list($user, $pw) = array($_POST['user'], $_POST['pw']);
-} elseif (isset($_SESSION["credentials"])) {
+} elseif (isset($_SESSION["credentials"]) &&
count($_SESSION["credentials"]) == 2) {
list($user, $pw) = $_SESSION["credentials"];
} elseif (isset($_COOKIE['MAGIC_COOKIE'])) {
list($user, $pw) = explode(":", base64_decode($_COOKIE['MAGIC_COOKIE']),
2);
Modified: web/php-master/trunk/manage/users.php
===================================================================
--- web/php-master/trunk/manage/users.php 2011-03-23 12:35:19 UTC (rev 309594)
+++ web/php-master/trunk/manage/users.php 2011-03-23 12:37:55 UTC (rev 309595)
@@ -149,6 +149,10 @@
. ($in[passwd] ? ",pchanged='" . time() : "")
. " WHERE userid=$id";
db_query($query);
+ if ($in[passwd]) {
+ // Kill the session data after updates :)
+ $_SERVER["credentials"] = array();
+ }
if(strlen($in['purpose'])) {
$purpose = addslashes($in['purpose']);
$query = "INSERT INTO users_note (userid, note, entered) VALUES ($id,
'$purpose', NOW())";