[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions.inc.php,1.104,1.105 class.sessions_db.inc.php,1.16,1.17class.sessions_php4.inc.php,1.19,1.20

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv26851

Modified Files:
        class.sessions.inc.php class.sessions_db.inc.php 
        class.sessions_php4.inc.php 
Log Message:
merged sesson-functions for .16, incl. cacheing the data from other session in 
the appsession
fixed multidomain logins for register_globals off

Index: class.sessions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions.inc.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** class.sessions.inc.php      5 Jan 2002 02:24:10 -0000       1.104
--- class.sessions.inc.php      18 May 2003 19:16:58 -0000      1.105
***************
*** 1,7 ****
  <?php 
        if (empty($GLOBALS['phpgw_info']['server']['sessions_type']))
        {
                $GLOBALS['phpgw_info']['server']['sessions_type'] = 'db';
        }
!       
include(PHPGW_API_INC.'/class.sessions_'.$GLOBALS['phpgw_info']['server']['sessions_type'].'.inc.php');
! ?>
--- 1,995 ----
  <?php 
+   /**************************************************************************\
[...973 lines suppressed...]
!                       /* if we end up with any extravars then we generate the 
url friendly string */
!                       /* and return the result */
!                       if (is_array($extravars))
!                       {
!                               $new_extravars = '';
!                               reset($extravars);
!                               while(list($key,$value) = each($extravars))
!                               {
!                                       if (!empty($new_extravars))
!                                       {
!                                               $new_extravars .= '&';
!                                       }
!                                       $new_extravars .= 
$key.'='.htmlentities(urlencode($value));
!                               }
!                               return $url .= '?' . $new_extravars;
!                       }
!                       /* if no extravars then we return the cleaned up 
url/scriptname */
!                       return $url;
!               }
!       }

Index: class.sessions_db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_db.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.sessions_db.inc.php   21 Mar 2003 00:46:55 -0000      1.16
--- class.sessions_db.inc.php   18 May 2003 19:16:58 -0000      1.17
***************
*** 24,294 ****
        /* $Id$ */
  
!       /*
!       ** Reserved session_flags
!       ** A - anonymous session
!       ** N - None, normal session
!       */
! 
!       class sessions
        {
[...984 lines suppressed...]
-                                       if (!empty($new_extravars))
-                                       {
-                                               $new_extravars .= '&';
-                                       }
-                                       $new_extravars .= 
$key.'='.htmlentities(urlencode($value));
-                               }
-                               /* This needs to be explictly reset to a string 
variable type for PHP3 */
- /*
-                               settype($extravars,'string');
-                               $extravars = $new_extravars;
-                               unset($new_extravars);
-                               return $url .= '?' . $extravars;
- */
-                               return $url .= '?' . $new_extravars;
-                       }
-                       /* if no extravars then we return the cleaned up 
url/scriptname */
-                       return $url;
                }
  
--- 189,192 ----

Index: class.sessions_php4.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.sessions_php4.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.sessions_php4.inc.php 21 Mar 2003 00:46:55 -0000      1.19
--- class.sessions_php4.inc.php 18 May 2003 19:16:58 -0000      1.20
***************
*** 4,7 ****
--- 4,8 ----
    * This file written by Dan Kuykendall <address@hidden>            *
    * and Joseph Engo <address@hidden>                                 *
+   * and Ralf Becker <address@hidden>                         *
    * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
    * -------------------------------------------------------------------------*
***************
*** 24,280 ****
        /* $Id$ */
  
[...1102 lines suppressed...]
!                                       $session = 
unserialize(substr($session,14));
!                                       unset($session['phpgw_app_sessions']);  
// not needed, saves memory
!                                       $session_cache[$file] = $session;
                                }
!                               if ($session['session_flags'] == 'A' || 
!$session['session_id'] ||
!                                   $session['session_install_id'] != 
$GLOBALS['phpgw_info']['server']['install_id'])
                                {
!                                       continue;       // no anonymous 
sessions or other domains or installations
                                }
                                //echo "file='$file'=<pre>"; print_r($session); 
echo "</pre>"; 
                                
***************
*** 1079,1082 ****
--- 251,256 ----
                                reset($values);
                        }
+                       
$this->appsession('php4_session_cache','phpgwapi',$session_cache);
+ 
                        return $values;
                }