holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed not found user sessions while working with notifications and assured that all_no_sort param gets handed over to handler class

Browse Source
This commit is contained in:
Christian Binder 2009-10-23 13:07:11 +00:00
parent 9f5467ebac
commit 08efec194f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
notifications/inc/class.notifications_popup.inc.php
View File

@ -104,7 +104,7 @@ class notifications_popup implements notifications_iface {
* @param array $_attachments * @param array $_attachments
*/ */
public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) { 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(); $user_sessions = array();
foreach ($sessions as $session) { foreach ($sessions as $session) {
if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) { if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {

2
notifications/inc/class.notifications_winpopup.inc.php
View File

@ -102,7 +102,7 @@ class notifications_winpopup implements notifications_iface {
*/ */
public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) { public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) {
$user_sessions = array(); $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 ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
if($this->valid_ip($session['session_ip'])) { if($this->valid_ip($session['session_ip'])) {
$user_sessions[] = $session['session_ip']; $user_sessions[] = $session['session_ip'];

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

@ -1464,13 +1464,14 @@ class egw_session
* @param int $start * @param int $start
* @param string $sort='session_dla' session_lid, session_id, session_started, session_logintime, session_action, or (default) session_dla * @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 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 * @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')) 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(); return array();
} }

3
phpgwapi/inc/class.egw_session_files.inc.php
View File

@ -34,9 +34,10 @@ class egw_session_files
* @param int $start * @param int $start
* @param string $sort='session_dla' session_lid, session_id, session_started, session_logintime, session_action, or (default) session_dla * @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 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 * @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') if (session_module_name() != 'files')
{ {