extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow to specify a custom filter for egw_session::session_(list|count)()

Browse Source
This commit is contained in:
Ralf Becker 2012-05-19 18:19:43 +00:00
parent e2cb9b44e7
commit d9142cca30
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
phpgwapi/inc/class.egw_session.inc.php
View File

@ -1570,20 +1570,21 @@ class egw_session
* @param string $sort='DESC' ASC or DESC * @param string $sort='DESC' ASC or DESC
* @param string $order='session_dla' session_lid, session_id, session_started, session_logintime, session_action, or (default) session_dla * @param string $order='session_dla' session_lid, session_id, session_started, session_logintime, session_action, or (default) session_dla
* @param boolean $all_no_sort=False skip sorting and limiting to maxmatchs if set to true * @param boolean $all_no_sort=False skip sorting and limiting to maxmatchs if set to true
* @param array $filter=array() extra filter for sessions
* @return array with sessions (values for keys as in $sort) * @return array with sessions (values for keys as in $sort)
*/ */
public static function session_list($start,$sort='DESC',$order='session_dla',$all_no_sort=False) public static function session_list($start,$sort='DESC',$order='session_dla',$all_no_sort=False,array $filter=array())
{ {
$sessions = array(); $sessions = array();
if (!preg_match('/^[a-z0-9_ ,]+$/i',$order_by=$order.' '.$sort)) if (!preg_match('/^[a-z0-9_ ,]+$/i',$order_by=$order.' '.$sort) || $order_by == ' ')
{ {
$order_by = 'session_dla DESC'; $order_by = 'session_dla DESC';
} }
foreach($GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, '*', array( $filter['lo'] = null;
'lo' => null, $filter[] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']), $filter[] = '(notification_heartbeat IS NULL OR notification_heartbeat > '.self::heartbeat_limit().')';
'(notification_heartbeat IS NULL OR notification_heartbeat > '.self::heartbeat_limit().')', foreach($GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, '*', $filter, __LINE__, __FILE__,
), __LINE__, __FILE__, $all_no_sort ? false : $start, 'ORDER BY '.$order_by) as $row) $all_no_sort ? false : $start, 'ORDER BY '.$order_by) as $row)
{ {
$sessions[$row['sessionid']] = $row; $sessions[$row['sessionid']] = $row;
} }
@ -1593,15 +1594,15 @@ class egw_session
/** /**
* Query number of sessions (not more then once every N secs) * Query number of sessions (not more then once every N secs)
* *
* @param array $filter=array() extra filter for sessions
* @return int number of active sessions * @return int number of active sessions
*/ */
public static function session_count() public static function session_count(array $filter=array())
{ {
return $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, 'COUNT(*)', array( $filter['lo'] = null;
'lo' => null, $filter[] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']), $filter[] = '(notification_heartbeat IS NULL OR notification_heartbeat > '.self::heartbeat_limit().')';
'(notification_heartbeat IS NULL OR notification_heartbeat > '.self::heartbeat_limit().')', return $GLOBALS['egw']->db->select(self::ACCESS_LOG_TABLE, 'COUNT(*)', $filter, __LINE__, __FILE__)->fetchColumn();
), __LINE__, __FILE__)->fetchColumn();
} }
/** /**