[Phpgroupware-cvs] admin/inc class.soaccess_history.inc.php, 1.4, 1.5 class.uiaccess_history.inc.php, 1.9, 1.10

[Dave Hall <address@hidden>]

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

Modified Files:
        class.soaccess_history.inc.php class.uiaccess_history.inc.php 
Log Message:
merging fixes for bugs #5700 & #5759

Index: class.uiaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccess_history.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** class.uiaccess_history.inc.php      18 May 2003 19:18:39 -0000      1.9
--- class.uiaccess_history.inc.php      8 Oct 2003 07:48:25 -0000       1.10
***************
*** 21,24 ****
--- 21,29 ----
                function uiaccess_history()
                {
+                       if 
($GLOBALS['phpgw']->acl->check('access_log_access',1,'admin'))
+                       {
+                               $GLOBALS['phpgw']->redirect_link('/index.php');
+                       }
+                       
                        $this->bo         = 
createobject('admin.boaccess_history');
                        $this->nextmatchs = createobject('phpgwapi.nextmatchs');
***************
*** 36,46 ****
                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_info']['flags']['app_header'] = 
lang('Admin').' - '.lang('View access log');
                        $GLOBALS['phpgw']->common->phpgw_header();
  
                        $total_records = $this->bo->total($account_id);
--- 41,52 ----
                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_info']['flags']['app_header'] = 
lang('Admin').' - '.lang('View access log');
                        $GLOBALS['phpgw']->common->phpgw_header();
+                       echo parse_navbar();
  
                        $total_records = $this->bo->total($account_id);
***************
*** 102,106 ****
                        if ($total_records)
                        {
!                               $percent = round((10000 * ($loggedout / 
$total_records)) / 100);
                        }
                        else
--- 108,112 ----
                        if ($total_records)
                        {
!                               $percent = round(($loggedout / $total_records) 
* 100);
                        }
                        else

Index: class.soaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.soaccess_history.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.soaccess_history.inc.php      18 May 2003 19:18:39 -0000      1.4
--- class.soaccess_history.inc.php      8 Oct 2003 07:48:25 -0000       1.5
***************
*** 25,29 ****
                        if ($account_id)
                        {
!                               return " where account_id='$account_id'";
                        }
                }
--- 25,29 ----
                        if ($account_id)
                        {
!                               return ' WHERE account_id=' . 
intval($account_id);
                        }
                }
***************
*** 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())
                        {
--- 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())
                        {
***************
*** 52,56 ****
                        $where = $this->test_account_id($account_id);
  
!                       $this->db->query("select count(*) from phpgw_access_log 
$where");
                        $this->db->next_record();
  
--- 52,56 ----
                        $where = $this->test_account_id($account_id);
  
!                       $this->db->query("SELECT COUNT(*) from phpgw_access_log 
$where", __LINE__, __FILE__);
                        $this->db->next_record();
  
***************
*** 62,69 ****
                        if ($account_id)
                        {
!                               $where = "and account_id='$account_id'";
                        }
  
!                       $this->db->query("select count(*) from phpgw_access_log 
where lo!='' $where");
                        $this->db->next_record();
  
--- 62,69 ----
                        if ($account_id)
                        {
!                               $where  = 'WHERE account_id=' . 
intval($account_id) . ' AND lo !=0';
                        }
  
!                       $this->db->query("SELECT COUNT(*) FROM phpgw_access_log 
$where", __LINE__, __FILE__);
                        $this->db->next_record();