[Phpgroupware-cvs] CVS: admin/inc class.bocurrentsessions.inc.php,1.6.2.2,1.6.2.2.2.1 class.uiaccess_history.inc.php,1.6.2.2.2.1,1.6.2.2.2.2 class.uicurrentsessions.inc.php,1.5,1.5.4.1

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv31848

Modified Files:
      Tag: Version-0_9_16-branch
        class.bocurrentsessions.inc.php class.uiaccess_history.inc.php 
        class.uicurrentsessions.inc.php 
Log Message:
some get_var $_GET changes and changed the session-list to use server-time not 
gmt

Index: class.bocurrentsessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocurrentsessions.inc.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.2.2.1
diff -C2 -r1.6.2.2 -r1.6.2.2.2.1
*** class.bocurrentsessions.inc.php     20 Mar 2003 23:55:54 -0000      1.6.2.2
--- class.bocurrentsessions.inc.php     18 May 2003 09:54:13 -0000      
1.6.2.2.2.1
***************
*** 49,53 ****
                                        'session_action'    => 
$value['session_action'],
                                        'session_dla'       => 
$value['session_dla'],
!                                       'session_idle'      => 
gmdate('G:i:s',($GLOBALS['phpgw']->datetime->gmtnow - $value['session_dla']))
                                );
                        }
--- 49,53 ----
                                        'session_action'    => 
$value['session_action'],
                                        'session_dla'       => 
$value['session_dla'],
!                                       'session_idle'      => 
gmdate('G:i:s',(time() - $value['session_dla']))
                                );
                        }
***************
*** 57,65 ****
                function kill()
                {
!                       if ($GLOBALS['HTTP_GET_VARS']['ksession'] &&
!                               ($GLOBALS['sessionid'] != 
$GLOBALS['HTTP_GET_VARS']['ksession']) &&
                                ! 
$GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin'))
                        {
!                               
$GLOBALS['phpgw']->session->destroy($GLOBALS['HTTP_GET_VARS']['ksession'],0);
                        }
                        $this->ui = createobject('admin.uicurrentsessions');
--- 57,65 ----
                function kill()
                {
!                       if ($_GET['ksession'] &&
!                               ($GLOBALS['sessionid'] != $_GET['ksession']) &&
                                ! 
$GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin'))
                        {
!                               
$GLOBALS['phpgw']->session->destroy($_GET['ksession'],0);
                        }
                        $this->ui = createobject('admin.uicurrentsessions');

Index: class.uiaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccess_history.inc.php,v
retrieving revision 1.6.2.2.2.1
retrieving revision 1.6.2.2.2.2
diff -C2 -r1.6.2.2.2.1 -r1.6.2.2.2.2
*** class.uiaccess_history.inc.php      17 May 2003 20:45:41 -0000      
1.6.2.2.2.1
--- class.uiaccess_history.inc.php      18 May 2003 09:54:14 -0000      
1.6.2.2.2.2
***************
*** 36,43 ****
                function list_history()
                {
!                       $account_id = 
($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:$GLOBALS['HTTP_POST_VARS']['account_id']);
!                       $start = 
($GLOBALS['HTTP_POST_VARS']['start']?$GLOBALS['HTTP_POST_VARS']['start']:0);
!                       $sort = 
($GLOBALS['HTTP_POST_VARS']['sort']?$GLOBALS['HTTP_POST_VARS']['sort']:0);
!                       $order = 
($GLOBALS['HTTP_POST_VARS']['order']?$GLOBALS['HTTP_POST_VARS']['order']:0);
                        
                        $GLOBALS['phpgw']->common->phpgw_header();
--- 36,43 ----
                function list_history()
                {
!                       $account_id = get_var('account_id',array('GET','POST'));
!                       $start = get_var('start',array('POST'),0);
!                       $sort = get_var('sort',array('POST'),0);
!                       $order = get_var('order',array('POST'),0);
                        
                        $GLOBALS['phpgw']->common->phpgw_header();

Index: class.uicurrentsessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicurrentsessions.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -r1.5 -r1.5.4.1
*** class.uicurrentsessions.inc.php     4 Jan 2002 00:39:00 -0000       1.5
--- class.uicurrentsessions.inc.php     18 May 2003 09:54:14 -0000      1.5.4.1
***************
*** 172,176 ****
                        $this->template->set_var('lang_message',lang('Are you 
sure you want to kill this session ?'));
                        $this->template->set_var('link_no','<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
 . '">' . lang('No') . '</a>');
!                       $this->template->set_var('link_yes','<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.bocurrentsessions.kill&ksession='
 . $GLOBALS['HTTP_GET_VARS']['ksession']) . '">' . lang('Yes') . '</a>');
  
                        $this->template->pfp('out','form');
--- 172,176 ----
                        $this->template->set_var('lang_message',lang('Are you 
sure you want to kill this session ?'));
                        $this->template->set_var('link_no','<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
 . '">' . lang('No') . '</a>');
!                       $this->template->set_var('link_yes','<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.bocurrentsessions.kill&ksession='
 . $_GET['ksession']) . '">' . lang('Yes') . '</a>');
  
                        $this->template->pfp('out','form');