fixed some of our sessions problems:

- [ 1015846 ] Registering session MySQL query error
- handlich of timed out sessions for php4 sessions was wrong
==> I can't reproduce any more sessions probs, either with db nor php4 sessions
This commit is contained in:
Ralf Becker 2004-08-27 13:13:37 +00:00
parent cf49fb8384
commit ab18d7f251
3 changed files with 299 additions and 2 deletions

View File

@ -278,7 +278,7 @@
*/
if ($session['session_dla'] <= (time() - $GLOBALS['phpgw_info']['server']['sessions_timeout']))
{
$this->clean_sessions();
$this->destroy($sessionid,$kp3);
return False;
}

View File

@ -59,7 +59,7 @@
function register_session($login,$user_ip,$now,$session_flags)
{
$GLOBALS['phpgw']->db->query("DELETE FROM phpgw_sessions WHERE session_id='$this->sessionsid'",__LINE__,__FILE__);
$GLOBALS['phpgw']->db->query("DELETE FROM phpgw_sessions WHERE session_id='$this->sessionid'",__LINE__,__FILE__);
$GLOBALS['phpgw']->db->query("INSERT INTO phpgw_sessions VALUES ('" . $this->sessionid
. "','".$login."','" . $user_ip . "','"

View File

@ -0,0 +1,297 @@
<?php
/**************************************************************************\
* eGroupWare API - Session management *
* This file written by Dan Kuykendall <seek3r@phpgroupware.org> *
* and Joseph Engo <jengo@phpgroupware.org> *
* and Ralf Becker <ralfbecker@outdoor-training.de> *
* Copyright (C) 2000, 2001 Dan Kuykendall *
* -------------------------------------------------------------------------*
* This library is part of the phpGroupWare API *
* http://www.egroupware.org/api *
* ------------------------------------------------------------------------ *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by *
* the Free Software Foundation; either version 2.1 of the License, *
* or any later version. *
* This library is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU Lesser General Public License for more details. *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
\**************************************************************************/
/* $Id$ */
class sessions extends sessions_
{
function sessions()
{
$this->sessions_();
//controls the time out for php4 sessions - skwashd 18-May-2003
ini_set('session.gc_maxlifetime', $GLOBALS['phpgw_info']['server']['sessions_timeout']);
session_name('sessionid');
}
function read_session()
{
if (!$this->sessionid)
{
return False;
}
session_id($this->sessionid);
session_start();
return $GLOBALS['phpgw_session'] = $_SESSION['phpgw_session'];
}
function set_cookie_params($domain)
{
session_set_cookie_params(0,'/',$domain);
}
function new_session_id()
{
session_start();
return session_id();
}
function register_session($login,$user_ip,$now,$session_flags)
{
// session_start() is now called in new_session_id() !!!
$GLOBALS['phpgw_session']['session_id'] = $this->sessionid;
$GLOBALS['phpgw_session']['session_lid'] = $login;
$GLOBALS['phpgw_session']['session_ip'] = $user_ip;
$GLOBALS['phpgw_session']['session_logintime'] = $now;
$GLOBALS['phpgw_session']['session_dla'] = $now;
$GLOBALS['phpgw_session']['session_action'] = $_SERVER['PHP_SELF'];
$GLOBALS['phpgw_session']['session_flags'] = $session_flags;
// we need the install-id to differ between serveral installs shareing one tmp-dir
$GLOBALS['phpgw_session']['session_install_id'] = $GLOBALS['phpgw_info']['server']['install_id'];
session_register('phpgw_session');
$_SESSION['phpgw_session'] = $GLOBALS['phpgw_session'];
}
// This will update the DateLastActive column, so the login does not expire
function update_dla()
{
if (@isset($_GET['menuaction']))
{
$action = $_GET['menuaction'];
}
else
{
$action = $_SERVER['PHP_SELF'];
}
// This way XML-RPC users aren't always listed as
// xmlrpc.php
if ($this->xmlrpc_method_called)
{
$action = $this->xmlrpc_method_called;
}
$GLOBALS['phpgw_session']['session_dla'] = time();
$GLOBALS['phpgw_session']['session_action'] = $action;
session_register('phpgw_session');
$_SESSION['phpgw_session'] = $GLOBALS['phpgw_session'];
return True;
}
function destroy($sessionid, $kp3)
{
if (!$sessionid && $kp3)
{
return False;
}
$this->log_access($this->sessionid); // log logout-time
// Only do the following, if where working with the current user
if ($sessionid == $GLOBALS['phpgw_info']['user']['sessionid'])
{
session_unset();
//echo "<p>sessions_php4::destroy: session_destroy() returned ".(session_destroy() ? 'True' : 'False')."</p>\n";
session_destroy();
if ($GLOBALS['phpgw_info']['server']['usecookies'])
{
$this->phpgw_setcookie(session_name());
}
}
else
{
$sessions = $this->list_sessions(0,'','',True);
if (isset($sessions[$sessionid]))
{
//echo "<p>session_php4::destroy($session_id): unlink('".$sessions[$sessionid]['php_session_file'].")</p>\n";
@unlink($sessions[$sessionid]['php_session_file']);
}
}
return True;
}
/*************************************************************************\
* Functions for appsession data and session cache *
\*************************************************************************/
function delete_cache($accountid='')
{
$account_id = get_account_id($accountid,$this->account_id);
$GLOBALS['phpgw_session']['phpgw_app_sessions']['phpgwapi']['phpgw_info_cache'] = '';
session_register('phpgw_session');
$_SESSION['phpgw_session'] = $GLOBALS['phpgw_session'];
}
function appsession($location = 'default', $appname = '', $data = '##NOTHING##')
{
if (! $appname)
{
$appname = $GLOBALS['phpgw_info']['flags']['currentapp'];
}
/* This allows the user to put '' as the value. */
if ($data == '##NOTHING##')
{
// I added these into seperate steps for easier debugging
$data = $GLOBALS['phpgw_session']['phpgw_app_sessions'][$appname][$location]['content'];
/* do not decrypt and return if no data (decrypt returning garbage) */
if($data)
{
$data = $GLOBALS['phpgw']->crypto->decrypt($data);
//echo "appsession returning: location='$location',app='$appname',data=$data"; _debug_array($data);
return $data;
}
}
else
{
$encrypteddata = $GLOBALS['phpgw']->crypto->encrypt($data);
$GLOBALS['phpgw_session']['phpgw_app_sessions'][$appname][$location]['content'] = $encrypteddata;
session_register('phpgw_session');
$_SESSION['phpgw_session'] = $GLOBALS['phpgw_session'];
return $data;
}
}
function session_sort($a,$b)
{
$sign = strcasecmp($GLOBALS['phpgw']->session->sort_order,'ASC') ? 1 : -1;
return strcasecmp(
$a[$GLOBALS['phpgw']->session->sort_by],
$b[$GLOBALS['phpgw']->session->sort_by]
) * $sign;
}
/*!
@function list_sessions
@abstract get list of normal / non-anonymous sessions
@note The data form the session-files get cached in the app_session phpgwapi/php4_session_cache
@author ralfbecker
*/
function list_sessions($start,$order,$sort,$all_no_sort = False)
{
//echo "<p>session_php4::list_sessions($start,'$order','$sort',$all)</p>\n";
$session_cache = $this->appsession('php4_session_cache','phpgwapi');
$values = array();
$maxmatchs = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
$dir = @opendir($path = ini_get('session.save_path'));
if (!$dir) // eg. openbasedir restrictions
{
return $values;
}
while ($file = readdir($dir))
{
if (substr($file,0,5) != 'sess_')
{
continue;
}
if (isset($session_cache[$file])) // use copy from cache
{
$session = $session_cache[$file];
if ($session['session_flags'] == 'A' || !$session['session_id'] ||
$session['session_install_id'] != $GLOBALS['phpgw_info']['server']['install_id'])
{
continue; // no anonymous sessions or other domains or installations
}
if (!$all_no_sort) // we need the up-to-date data --> unset and reread it
{
unset($session_cache[$file]);
}
}
if (!isset($session_cache[$file])) // not in cache, read and cache it
{
if (!is_readable($path. '/' . $file))
{
continue; // happens if webserver runs multiple user-ids
}
$session = '';
if (($fd = fopen ($path . '/' . $file,'r')))
{
$session = ($size = filesize ($path . '/' . $file)) ? fread ($fd, $size) : 0;
fclose ($fd);
}
if (substr($session,0,14) != 'phpgw_session|')
{
continue;
}
$session = unserialize(substr($session,14));
unset($session['phpgw_app_sessions']); // not needed, saves memory
$session_cache[$file] = $session;
}
if($session['session_flags'] == 'A' || !$session['session_id'] ||
$session['session_install_id'] != $GLOBALS['phpgw_info']['server']['install_id'])
{
continue; // no anonymous sessions or other domains or installations
}
//echo "file='$file'=<pre>"; print_r($session); echo "</pre>";
$session['php_session_file'] = $path . '/' . $file;
$values[$session['session_id']] = $session;
}
closedir($dir);
if(!$all_no_sort)
{
$GLOBALS['phpgw']->session->sort_by = $sort;
$GLOBALS['phpgw']->session->sort_order = $order;
uasort($values,array('sessions','session_sort'));
$i = 0;
$start = (int)$start;
foreach($values as $id => $data)
{
if($i < $start || $i > $start+$maxmatchs)
{
unset($values[$id]);
}
++$i;
}
reset($values);
}
$this->appsession('php4_session_cache','phpgwapi',$session_cache);
return $values;
}
/*!
@function total
@abstract get number of normal / non-anonymous sessions
@author ralfbecker
*/
function total()
{
return count($this->list_sessions(0,'','',True));
}
}