[Phpgroupware-cvs] api class.admin.php,1.1.2.14,1.1.2.15

[Joseph Engo <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv21269/api

Modified Files:
      Tag: proposal-branch
        class.admin.php 
Log Message:
Sessions was craping out at times when there was sessions with useless data


Index: class.admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.admin.php,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -d -r1.1.2.14 -r1.1.2.15
*** class.admin.php     19 Nov 2003 20:44:27 -0000      1.1.2.14
--- class.admin.php     19 Nov 2003 21:10:02 -0000      1.1.2.15
***************
*** 141,150 ****
                                list($app,$class,$method)   = 
explode('.',$sessions[$i]['action']);
  
!                               if (! $app && ! $class && ! $method)
!                               {
!                                       return False;
!                               }
! 
!                               if (! file_exists(PHPGW_ROOT . SEP . $app . SEP 
. 'class.' . $class . '.php'))
                                {
                                        // Not sure if errors should be spit 
out here, its possiable a user was tring to access
--- 141,145 ----
                                list($app,$class,$method)   = 
explode('.',$sessions[$i]['action']);
  
!                               if ($app && $class && $method)
                                {
                                        // Not sure if errors should be spit 
out here, its possiable a user was tring to access
***************
*** 152,163 ****
                                        // the session is updating or deleted.  
So, for now, just ignore times like this.
                                        // Maybe in the future, add it to the 
debug log (jengo)
-                                       return False;
-                               }
  
!                               require_once(PHPGW_ROOT . SEP . $app . SEP . 
'class.' . $class . '.php');
  
!                               if 
(isset($GLOBALS['docs'][$app]['classes'][$app . '_' . 
$class]['functions'][$method]['title']))
                                {
!                                       $sessions[$i]['action'] = 
lang($GLOBALS['docs'][$app]['classes'][$app . '_' . 
$class]['functions'][$method]['title']);
                                }
                        }
--- 147,162 ----
                                        // the session is updating or deleted.  
So, for now, just ignore times like this.
                                        // Maybe in the future, add it to the 
debug log (jengo)
  
!                                       require_once(PHPGW_ROOT . SEP . $app . 
SEP . 'class.' . $class . '.php');
  
!                                       if 
(isset($GLOBALS['docs'][$app]['classes'][$app . '_' . 
$class]['functions'][$method]['title']))
!                                       {
!                                               $sessions[$i]['action'] = 
lang($GLOBALS['docs'][$app]['classes'][$app . '_' . 
$class]['functions'][$method]['title']);
!                                       }
!                               }
!                               else
                                {
!                                       // Don't return the session if it has 
useless data
!                                       unset($sessions[$i]);
                                }
                        }
***************
*** 165,169 ****
                        return array
                        (
!                               'current_users' => $sessions,
                                'action_type'   => 'current_users'
                        );
--- 164,169 ----
                        return array
                        (
!                               // The array_merge() is to reset all the keys 
to there proper order due to unset()
!                               'current_users' => 
array_merge($sessions,array()),
                                'action_type'   => 'current_users'
                        );