diff --git a/notifications/inc/class.notifications_popup.inc.php b/notifications/inc/class.notifications_popup.inc.php index 7002d8725a..2291c2a902 100644 --- a/notifications/inc/class.notifications_popup.inc.php +++ b/notifications/inc/class.notifications_popup.inc.php @@ -104,7 +104,7 @@ class notifications_popup implements notifications_iface { * @param array $_attachments */ public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) { - $sessions = egw_session::session_list(0, 'asc', 'session_dla'); + $sessions = egw_session::session_list(0, 'asc', 'session_dla', true); $user_sessions = array(); foreach ($sessions as $session) { if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) { diff --git a/notifications/inc/class.notifications_winpopup.inc.php b/notifications/inc/class.notifications_winpopup.inc.php index 7836228e1a..45b83145ca 100644 --- a/notifications/inc/class.notifications_winpopup.inc.php +++ b/notifications/inc/class.notifications_winpopup.inc.php @@ -102,7 +102,7 @@ class notifications_winpopup implements notifications_iface { */ public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) { $user_sessions = array(); - foreach (egw_session::session_list(0) as $session) { + foreach (egw_session::session_list(0, 'asc', 'session_dla', true) as $session) { if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) { if($this->valid_ip($session['session_ip'])) { $user_sessions[] = $session['session_ip']; diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php index 283f1893b1..60e2a6c6ef 100644 --- a/phpgwapi/inc/class.egw_session.inc.php +++ b/phpgwapi/inc/class.egw_session.inc.php @@ -1464,13 +1464,14 @@ class egw_session * @param int $start * @param string $sort='session_dla' session_lid, session_id, session_started, session_logintime, session_action, or (default) session_dla * @param string $order='DESC' ASC or DESC + * @param boolean $all_no_sort=False skip sorting and limiting to maxmatchs if set to true * @return array with sessions (values for keys as in $sort) or array() if not supported by session-handler */ - public static function session_list($start,$sort='DESC',$order='session_dla') + public static function session_list($start,$sort='DESC',$order='session_dla',$all_no_sort=False) { if (method_exists(self::$session_handler,'session_list')) { - return call_user_func(array(self::$session_handler,'session_list'),$start,$sort,$order); + return call_user_func(array(self::$session_handler,'session_list'),$start,$sort,$order,$all_no_sort); } return array(); } diff --git a/phpgwapi/inc/class.egw_session_files.inc.php b/phpgwapi/inc/class.egw_session_files.inc.php index 5c54176e9e..232a150c64 100644 --- a/phpgwapi/inc/class.egw_session_files.inc.php +++ b/phpgwapi/inc/class.egw_session_files.inc.php @@ -34,9 +34,10 @@ class egw_session_files * @param int $start * @param string $sort='session_dla' session_lid, session_id, session_started, session_logintime, session_action, or (default) session_dla * @param string $order='DESC' ASC or DESC + * @param boolean $all_no_sort=False skip sorting and limiting to maxmatchs if set to true * @return array with sessions (values for keys as in $sort) or array() if not supported by session-handler */ - 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) { if (session_module_name() != 'files') {