[vscweb-commit] r441 - in branches/vsc-2.0/Main/People/Session: I2A2 include

[<wi...@bi...>]

Author: wirges
Date: 2006-04-11 10:29:02 -0400 (Tue, 11 Apr 2006)
New Revision: 441

Modified:
   branches/vsc-2.0/Main/People/Session/I2A2/login_proc.php
   branches/vsc-2.0/Main/People/Session/include/libsession.inc
Log:
Fixed a bug that prevented query string data from being persisted as a us=
er was rerouted through the login process if their session had timed out.



Modified: branches/vsc-2.0/Main/People/Session/I2A2/login_proc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/vsc-2.0/Main/People/Session/I2A2/login_proc.php	2006-03-23 0=
1:41:09 UTC (rev 440)
+++ branches/vsc-2.0/Main/People/Session/I2A2/login_proc.php	2006-04-11 1=
4:29:02 UTC (rev 441)
@@ -85,7 +85,7 @@
    error_reporting(E_ALL);
 } else {
    if (isset($_REQUEST['target'])) {
-      login_box("Invalid session or session timed out!");
+      login_box("Your session timed out!  Please login to proceed.");
    } else {
       login_box("Error authenticating: bad login name or password.");
    }
@@ -116,7 +116,7 @@
=20
 function login_box($message) {
    global $INC_PATH, $IMAGE_PATH,$_CONFIG;  =20
-   UI_Header("Login Error");
+   UI_Header("VSC Login");
    echo "<h2>$message</h2>";
    echo "<div style=3D'font-style: italic;'>".$_CONFIG['login_banner']."=
</div>";
    echo "<form action=3D'{$_SERVER['PHP_SELF']}' method=3D'POST'>";

Modified: branches/vsc-2.0/Main/People/Session/include/libsession.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/vsc-2.0/Main/People/Session/include/libsession.inc	2006-03-2=
3 01:41:09 UTC (rev 440)
+++ branches/vsc-2.0/Main/People/Session/include/libsession.inc	2006-04-1=
1 14:29:02 UTC (rev 441)
@@ -67,6 +67,7 @@
       if (isset($_SERVER['PHP_SELF'])) {
          list($void, $path) =3D explode($_SERVER['HTTP_HOST'], $IMAGE_PA=
TH);
          $r_path =3D str_replace($path, "", $_SERVER['PHP_SELF']);
+         $r_path =3D $r_path . "?".$_SERVER['QUERY_STRING'];
          $return =3D base64_encode($r_path);
          $auth_url =3D str_replace("AUTH_", "",$_CONFIG['use_auth']);
          if ($auth_url =3D=3D "STD") $auth_url =3D 'SUPA';