[Phpgroupware-cvs] admin inc/class.bocurrentsessions.inc.php inc/c...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    admin
Changes by:     Sigurd Nes <sigurdne>   06/10/27 18:43:27

Modified files:
        inc            : class.bocurrentsessions.inc.php 
                         class.uicurrentsessions.inc.php 
        templates/base : currentusers.tpl 

Log message:
        notice and a minor fix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.bocurrentsessions.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uicurrentsessions.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/admin/templates/base/currentusers.tpl?cvsroot=phpgroupware&r1=1.4&r2=1.5

Patches:
Index: inc/class.bocurrentsessions.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.bocurrentsessions.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- inc/class.bocurrentsessions.inc.php 14 Feb 2006 08:48:21 -0000      1.12
+++ inc/class.bocurrentsessions.inc.php 27 Oct 2006 18:43:27 -0000      1.13
@@ -10,7 +10,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: class.bocurrentsessions.inc.php,v 1.12 2006/02/14 08:48:21 
skwashd Exp $ */
+       /* $Id: class.bocurrentsessions.inc.php,v 1.13 2006/10/27 18:43:27 
sigurdne Exp $ */
 
        class bocurrentsessions
        {
@@ -56,7 +56,7 @@
 
                function kill()
                {
-                       if ($_GET['ksession'] &&
+                       if ((isset($_GET['ksession']) && $_GET['ksession']) &&
                                ($GLOBALS['sessionid'] != $_GET['ksession']) &&
                                ! 
$GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin'))
                        {

Index: inc/class.uicurrentsessions.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.uicurrentsessions.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- inc/class.uicurrentsessions.inc.php 14 Feb 2006 08:48:21 -0000      1.12
+++ inc/class.uicurrentsessions.inc.php 27 Oct 2006 18:43:27 -0000      1.13
@@ -10,7 +10,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: class.uicurrentsessions.inc.php,v 1.12 2006/02/14 08:48:21 
skwashd Exp $ */
+       /* $Id: class.uicurrentsessions.inc.php,v 1.13 2006/10/27 18:43:27 
sigurdne Exp $ */
 
        class uicurrentsessions
        {
@@ -30,7 +30,7 @@
 
                function header()
                {
-                       $GLOBALS['phpgw']->common->phpgw_header();
+                       $GLOBALS['phpgw']->common->phpgw_header(true);
                }
 
                function store_location($info)
@@ -51,7 +51,7 @@
                                $this->store_location($info);
                        }
 
-                       if ($GLOBALS['start'] || $GLOBALS['sort'] || 
$GLOBALS['order'])
+                       if ((isset($GLOBALS['start']) && $GLOBALS['start']) || 
( isset($GLOBALS['sort']) && $GLOBALS['sort']) || ( isset($GLOBALS['order']) && 
$GLOBALS['order']))
                        {
                                if ($GLOBALS['start'] == 0 || $GLOBALS['start'] 
&& $GLOBALS['start'] != $info['start'])
                                {
@@ -90,10 +90,10 @@
 
                        $total = $this->bo->total();
 
-                       
$this->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
+                       
$this->template->set_var('bg_color',(isset($GLOBALS['phpgw_info']['theme']['bg_color'])?$GLOBALS['phpgw_info']['theme']['bg_color']:''));
                        
$this->template->set_var('left_next_matchs',$this->nextmatchs->left('/admin/currentusers.php',$info['start'],$total));
                        
$this->template->set_var('right_next_matchs',$this->nextmatchs->right('/admin/currentusers.php',$info['start'],$total));
-                       
$this->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+                       
$this->template->set_var('th_bg',(isset($GLOBALS['phpgw_info']['theme']['th_bg'])?$GLOBALS['phpgw_info']['theme']['th_bg']:''));
 
                        
$this->template->set_var('sort_loginid',$this->nextmatchs->show_sort_order($info['sort'],'session_lid',$info['order'],
                                '/admin/currentusers.php',lang('LoginID')));
@@ -111,7 +111,7 @@
 
                        while (list(,$value) = @each($values))
                        {
-                               
$this->nextmatchs->template_alternate_row_color(&$this->template);
+                               
$this->nextmatchs->template_alternate_row_class($this->template);
 
                                
$this->template->set_var('row_loginid',$value['session_lid']);
 
@@ -142,8 +142,8 @@
 
                                if ($value['session_id'] != 
$GLOBALS['phpgw_info']['user']['sessionid'] && ! 
$GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin'))
                                {
-                                       $this->template->set_var('row_kill','<a 
href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.kill&ksession='
-                                               . $value['session_id'] . 
'&kill=true') . '">' . lang('Kill').'</a>');
+                                       $this->template->set_var('row_kill','<a 
href="' . 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uicurrentsessions.kill',
+                                               'ksession'=> 
$value['session_id'], 'kill'=>'true')) . '">' . lang('Kill').'</a>');
                                }
                                else
                                {
@@ -169,8 +169,8 @@
                        $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->set_var('link_no','<a href="' . 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uicurrentsessions.list_sessions'))
 . '">' . lang('No') . '</a>');
+                       $this->template->set_var('link_yes','<a href="' . 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.bocurrentsessions.kill',
 'ksession'=> $_GET['ksession'])) . '">' . lang('Yes') . '</a>');
 
                        $this->template->pfp('out','form');
                }

Index: templates/base/currentusers.tpl
===================================================================
RCS file: /sources/phpgroupware/admin/templates/base/currentusers.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- templates/base/currentusers.tpl     14 Feb 2006 08:48:21 -0000      1.4
+++ templates/base/currentusers.tpl     27 Oct 2006 18:43:27 -0000      1.5
@@ -24,7 +24,7 @@
 <!-- END list -->
 
 <!-- BEGIN row -->
- <tr class="{tr_color}">
+ <tr class="{tr_class}">
   <td>{row_loginid}</td>
   <td>{row_ip}</td>
   <td>{row_logintime}</td>