[Phpgroupware-cvs] CVS: admin/inc class.boaccess_history.inc.php,1.3,1.3.4.1 class.soaccess_history.inc.php,1.3,1.3.4.1 class.uiaccess_history.inc.php,1.6.2.2,1.6.2.2.2.1

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.boaccess_history.inc.php class.soaccess_history.inc.php 
        class.uiaccess_history.inc.php 
Log Message:
added blocking after a certain number of unsuccessfull login-attemps and loging 
of them in the accesslog

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.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** class.boaccess_history.inc.php      1 Sep 2001 23:40:28 -0000       1.3
--- class.boaccess_history.inc.php      17 May 2003 20:45:41 -0000      1.3.4.1
***************
*** 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.soaccess_history.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.soaccess_history.inc.php,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** class.soaccess_history.inc.php      2 Sep 2001 07:30:46 -0000       1.3
--- class.soaccess_history.inc.php      17 May 2003 20:45:41 -0000      1.3.4.1
***************
*** 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.6.2.2
retrieving revision 1.6.2.2.2.1
diff -C2 -r1.6.2.2 -r1.6.2.2.2.1
*** class.uiaccess_history.inc.php      27 Feb 2003 21:30:35 -0000      1.6.2.2
--- class.uiaccess_history.inc.php      17 May 2003 20:45:41 -0000      
1.6.2.2.2.1
***************
*** 66,70 ****
                                        )
                                ) . '">' . 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
***************
*** 84,88 ****
                                        'row_ip'      => $record['ip'],
                                        'row_li'      => $record['li'],
!                                       'row_lo'      => $record['lo'],
                                        'row_total'   => 
($record['lo']?$record['total']:'&nbsp;')
                                );
--- 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']:'&nbsp;')
                                );