[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: admin/inc class.boaccess_history.inc.php,1.3,1.4
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: admin/inc class.boaccess_history.inc.php,1.3,1.4 class.bocurrentsessions.inc.php,1.8,1.9 class.soaccess_history.inc.php,1.3,1.4 class.uiaccess_history.inc.php,1.8,1.9 class.uicurrentsessions.inc.php,1.6,1.7class.uilog.inc.php,1.9,1.10 |
|
Date: |
Sun, 18 May 2003 15:18:41 -0400 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv32191/inc
Modified Files:
class.boaccess_history.inc.php class.bocurrentsessions.inc.php
class.soaccess_history.inc.php class.uiaccess_history.inc.php
class.uicurrentsessions.inc.php class.uilog.inc.php
Log Message:
merged sesson-functions for .16, incl. the brute-force stuffe and cacheing the
data from other session in the appsession
fixed multidomain logins for register_globals off
Index: class.boaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccess_history.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.boaccess_history.inc.php 1 Sep 2001 23:40:28 -0000 1.3
--- class.boaccess_history.inc.php 18 May 2003 19:18:39 -0000 1.4
***************
*** 46,53 ****
}
! if ($record['lo'] != '')
{
$record['lo'] =
$GLOBALS['phpgw']->common->show_date($record['lo']);
}
if (ereg('@',$record['loginid']))
--- 46,57 ----
}
! if ($record['lo'])
{
$record['lo'] =
$GLOBALS['phpgw']->common->show_date($record['lo']);
}
+ else
+ {
+ $record['lo'] = ''; // dont
show a 0 for not loged out
+ }
if (ereg('@',$record['loginid']))
***************
*** 63,77 ****
'lo' => $record['lo'],
'account_id' => $record['account_id'],
'total' => $total
);
}
return $_records;
- }
-
- function grab_fullname($account_id)
- {
- $acct = createobject('phpgwapi.accounts',$account_id);
- $acct->read_repository();
- return
$GLOBALS['phpgw']->common->display_fullname($acct->data['account_lid'],$acct->data['firstname'],$acct->data['lastname']);
}
--- 67,75 ----
'lo' => $record['lo'],
'account_id' => $record['account_id'],
+ 'sessionid' => $record['sessionid'],
'total' => $total
);
}
return $_records;
}
Index: class.bocurrentsessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocurrentsessions.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.bocurrentsessions.inc.php 21 Mar 2003 00:47:18 -0000 1.8
--- class.bocurrentsessions.inc.php 18 May 2003 19:18:39 -0000 1.9
***************
*** 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.soaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.soaccess_history.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.soaccess_history.inc.php 2 Sep 2001 07:30:46 -0000 1.3
--- class.soaccess_history.inc.php 18 May 2003 19:18:39 -0000 1.4
***************
*** 33,37 ****
$where = $this->test_account_id($account_id);
! $this->db->limit_query("select
loginid,ip,li,lo,account_id from phpgw_access_log $where order by li
desc",$start,__LINE__,__FILE__);
while ($this->db->next_record())
{
--- 33,37 ----
$where = $this->test_account_id($account_id);
! $this->db->limit_query("select
loginid,ip,li,lo,account_id,sessionid from phpgw_access_log $where order by li
desc",$start,__LINE__,__FILE__);
while ($this->db->next_record())
{
***************
*** 41,45 ****
'li' => $this->db->f('li'),
'lo' => $this->db->f('lo'),
! 'account_id' =>
$this->db->f('account_id')
);
}
--- 41,46 ----
'li' => $this->db->f('li'),
'lo' => $this->db->f('lo'),
! 'account_id' =>
$this->db->f('account_id'),
! 'sessionid' =>
$this->db->f('sessionid')
);
}
Index: class.uiaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccess_history.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uiaccess_history.inc.php 29 Apr 2003 21:58:12 -0000 1.8
--- class.uiaccess_history.inc.php 18 May 2003 19:18:39 -0000 1.9
***************
*** 41,44 ****
--- 41,45 ----
$order =
($GLOBALS['HTTP_POST_VARS']['order']?$GLOBALS['HTTP_POST_VARS']['order']:0);
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Admin').' - '.lang('View access log');
$GLOBALS['phpgw']->common->phpgw_header();
***************
*** 65,69 ****
)
) . '">' . lang('Return to view account') .
'</a>';
! $var['lang_last_x_logins'] = lang('Last %1
logins for %2',$total_records,$this->bo->grab_fullname($account_id));
}
else
--- 66,70 ----
)
) . '">' . lang('Return to view account') .
'</a>';
! $var['lang_last_x_logins'] = lang('Last %1
logins for
%2',$total_records,$GLOBALS['phpgw']->common->grab_owner_name($account_id));
}
else
***************
*** 83,87 ****
'row_ip' => $record['ip'],
'row_li' => $record['li'],
! 'row_lo' => $record['lo'],
'row_total' =>
($record['lo']?$record['total']:' ')
);
--- 84,88 ----
'row_ip' => $record['ip'],
'row_li' => $record['li'],
! 'row_lo' => $record['account_id']
? $record['lo'] : '<b>'.lang($record['sessionid']).'</b>',
'row_total' =>
($record['lo']?$record['total']:' ')
);
Index: class.uicurrentsessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicurrentsessions.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uicurrentsessions.inc.php 24 May 2002 10:38:02 -0000 1.6
--- class.uicurrentsessions.inc.php 18 May 2003 19:18:39 -0000 1.7
***************
*** 72,75 ****
--- 72,76 ----
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Admin').' - '.lang('List of current users');
$this->header();
***************
*** 90,94 ****
$total = $this->bo->total();
-
$this->template->set_var('lang_current_users',lang('List of current users'));
$this->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
$this->template->set_var('left_next_matchs',$this->nextmatchs->left('/admin/currentusers.php',$info['start'],$total));
--- 91,94 ----
***************
*** 165,175 ****
}
$this->header();
$this->template->set_file('form','kill_session.tpl');
- $this->template->set_var('lang_title',lang('Kill
session'));
$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');
--- 165,175 ----
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Admin').' - '.lang('Kill session');
$this->header();
$this->template->set_file('form','kill_session.tpl');
$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');
Index: class.uilog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uilog.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uilog.inc.php 24 May 2002 10:38:02 -0000 1.9
--- class.uilog.inc.php 18 May 2003 19:18:39 -0000 1.10
***************
*** 256,259 ****
--- 256,260 ----
$this->t->set_var('event_list',$table);
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Admin').' - '.($this->editmode?lang('Edit Table format') : lang('View
error log'));
$GLOBALS['phpgw']->common->phpgw_header();
$this->t->pfp('out','log_list_t');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: admin/inc class.boaccess_history.inc.php,1.3,1.4 class.bocurrentsessions.inc.php,1.8,1.9 class.soaccess_history.inc.php,1.3,1.4 class.uiaccess_history.inc.php,1.8,1.9 class.uicurrentsessions.inc.php,1.6,1.7class.uilog.inc.php,1.9,1.10,
Ralf Becker <address@hidden> <=