From: <rd...@us...> - 2007-09-21 10:24:45
|
Revision: 437 http://digir.svn.sourceforge.net/digir/?rev=437&view=rev Author: rdg Date: 2007-09-21 03:24:43 -0700 (Fri, 21 Sep 2007) Log Message: ----------- Bugfix: When different configuration interfaces from different TapirLink installations were being accessed through the same browser, session caching was not making any distinction between them. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt tapirlink/trunk/classes/TpConfigManager.php tapirlink/trunk/classes/TpResources.php tapirlink/trunk/classes/TpUtils.php Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2007-09-10 01:27:49 UTC (rev 436) +++ tapirlink/trunk/ChangeLog.txt 2007-09-21 10:24:43 UTC (rev 437) @@ -1,3 +1,11 @@ +Release 0.5.1 (?) +----------------- +(revision ?) + + * Bugfix: When different configuration interfaces from different + TapirLink installations were being accessed through the same browser, + session caching was not making any distinction between them. + Release 0.5 (2007-09-09) ------------------------ (revision 434) Modified: tapirlink/trunk/classes/TpConfigManager.php =================================================================== --- tapirlink/trunk/classes/TpConfigManager.php 2007-09-10 01:27:49 UTC (rev 436) +++ tapirlink/trunk/classes/TpConfigManager.php 2007-09-21 10:24:43 UTC (rev 437) @@ -40,9 +40,14 @@ // class definitions session_start(); + // The same browser can be used with different TapirLink installations, + // so session data should distinguish between these + $instance_id = TpUtils::GetServiceId(); + // Do nothing if environment was already checked and if // "force_reload" is not present - if ( isset( $_SESSION['envOk'] ) and ! isset( $_REQUEST['force_reload'] ) ) + if ( isset( $_SESSION[$instance_id.'|envOk'] ) and + ! isset( $_REQUEST['force_reload'] ) ) { return true; } @@ -214,7 +219,9 @@ // Summing up if ( ! TpDiagnostics::Count() ) { - $_SESSION['envOk'] = 1; + // The same browser can be used with different TapirLink installations, + // so session data should distinguish between these + $_SESSION[$instance_id.'|envOk'] = 1; return true; } Modified: tapirlink/trunk/classes/TpResources.php =================================================================== --- tapirlink/trunk/classes/TpResources.php 2007-09-10 01:27:49 UTC (rev 436) +++ tapirlink/trunk/classes/TpResources.php 2007-09-21 10:24:43 UTC (rev 437) @@ -39,10 +39,14 @@ if ( ! isset( $instance ) ) { - if ( isset ( $_SESSION['resources'] ) and + // The same browser can be used with different TapirLink installations, + // so session data should distinguish between these + $instance_id = TpUtils::GetServiceId(); + + if ( isset ( $_SESSION[$instance_id.'|resources'] ) and ! isset( $_REQUEST['force_reload'] ) ) { - $instance =& $_SESSION['resources']; + $instance =& $_SESSION[$instance_id.'|resources']; } else { Modified: tapirlink/trunk/classes/TpUtils.php =================================================================== --- tapirlink/trunk/classes/TpUtils.php 2007-09-10 01:27:49 UTC (rev 436) +++ tapirlink/trunk/classes/TpUtils.php 2007-09-21 10:24:43 UTC (rev 437) @@ -280,7 +280,7 @@ { $sn = isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:'localhost'; $sp = isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:'80'; - $ss = isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:'/DiGIR.php'; + $ss = isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:'/tapir.php'; $s = 'http://'.$sn.':'.$sp.$ss; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |