svn: /web/php-bugs/trunk/ include/functions.php www/login.php www/logout.php
| From: | Ferenc Kovacs | Date: | Sun, 15 Jan 2012 22:35:23 +0000 |
| Subject: | svn: /web/php-bugs/trunk/ include/functions.php www/login.php www/logout.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-12816@lists.php.net to get a copy of this message | ||
tyrael Sun, 15 Jan 2012 22:35:23 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=322341
Log:
remove the password of the logged in developer from the session
Changed paths:
U web/php-bugs/trunk/include/functions.php
U web/php-bugs/trunk/www/login.php
U web/php-bugs/trunk/www/logout.php
Modified: web/php-bugs/trunk/include/functions.php
===================================================================
--- web/php-bugs/trunk/include/functions.php 2012-01-15 22:17:49 UTC (rev 322340)
+++ web/php-bugs/trunk/include/functions.php 2012-01-15 22:35:23 UTC (rev 322341)
@@ -96,7 +96,7 @@
return false;
}
- $_SESSION["credentials"] = array($user, $pass);
+ $_SESSION["user"] = $user;
return true;
}
@@ -146,31 +146,26 @@
}
$user = strtolower($user);
$pw = $_POST['pw'];
-
- // FIXME: Remember password / user next time
- //if (isset($_POST['save'])) { # non-developers don't have $user set
- /*if (DEVBOX) {
- $domain = null;
- } else {
- $domain = '.php.net';
- }*/
- $_SESSION["credentials"] = array('', $pw);
- //}
} elseif (isset($auth_user) && is_object($auth_user) && $auth_user->handle) {
$user = $auth_user->handle;
$pw = $auth_user->password;
- } elseif (isset($_SESSION["credentials"]) &&
count($_SESSION["credentials"]) == 2) {
- list($user, $pw) = $_SESSION["credentials"];
- }
+ }
// Authentication and user level check
// User levels are: reader (0), commenter/patcher/etc. (edit = 3), submitter (edit = 2), developer
(edit = 1)
- if ($user != '' && $pw != '' && verify_password($user, $pw)) {
+ if (!empty($_SESSION["user"])) {
+ $user = $_SESSION["user"];
$user_flags = BUGS_DEV_USER;
$logged_in = 'developer';
$auth_user->handle = $user;
$auth_user->email = "{$user}@php.net";
$auth_user->name = $user;
+ } elseif ($user != '' && $pw != '' && verify_password($user,
$pw)) {
+ $user_flags = BUGS_DEV_USER;
+ $logged_in = 'developer';
+ $auth_user->handle = $user;
+ $auth_user->email = "{$user}@php.net";
+ $auth_user->name = $user;
} else {
$auth_user->email = isset($_POST['in']['email']) ?
$_POST['in']['email'] : '';
$auth_user->handle = '';
@@ -1664,8 +1659,8 @@
if ($logged_in === 'developer') {
$is_logged = true;
- } else if (isset($_SESSION['credentials']) &&
count($_SESSION['credentials']) == 2) {
- $is_logged = empty($_SESSION['credentials'][0]) ? false : true;
+ } else if (!empty($_SESSION['user'])) {
+ $is_logged = true;
}
$_header_done = true;
Modified: web/php-bugs/trunk/www/login.php
===================================================================
--- web/php-bugs/trunk/www/login.php 2012-01-15 22:17:49 UTC (rev 322340)
+++ web/php-bugs/trunk/www/login.php 2012-01-15 22:35:23 UTC (rev 322341)
@@ -4,13 +4,9 @@
require_once '../include/prepend.php';
-if (isset($_SESSION['credentials']) && count($_SESSION['credentials'])
== 2) {
- if (!empty($_SESSION['credentials'][0])) {
+if (!empty($_SESSION['user'])) {
header('location: index.php');
exit;
- } else {
- $_SESSION['credentials'] = NULL;
- }
}
response_header('Login');
Modified: web/php-bugs/trunk/www/logout.php
===================================================================
--- web/php-bugs/trunk/www/logout.php 2012-01-15 22:17:49 UTC (rev 322340)
+++ web/php-bugs/trunk/www/logout.php 2012-01-15 22:35:23 UTC (rev 322341)
@@ -4,7 +4,7 @@
require_once '../include/prepend.php';
-$_SESSION["credentials"] = array();
+unset($_SESSION['user']);
session_destroy();
response_header('Logout');