replace the hook for the subject line that Mr. Groot Koerkamp dropped.

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index 85676fd5cdc2b65a020633acce113157c4a4a927..0df533a317f591d477be83330de8f97984da868d 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -33,17 +33,14 @@ $base_uri = sqm_baseuri();
 
 session_start();
 
-if (isset($_SESSION['username'])) {
-    $username = $_SESSION['username'];
-}
-if (isset($_SESSION['delimiter'])) {
-    $delimiter = $_SESSION['delimiter'];
-}
-if (isset($_SESSION['onetimepad'])) {
-    $onetimepad = $_SESSION['onetimepad'];
-}
-if (isset($_GET['right_frame'])) {
-    $right_frame = $_GET['right_frame'];
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+
+sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
+
+if ( isset($_SESSION['session_expired_post']) ) {
+    sqsession_unregister('session_expired_post');
 }
 
 is_logged_in();
@@ -126,7 +123,7 @@ if ($right_frame == 'right_main.php') {
 } else if ($right_frame == '') {
     $right_frame_url = 'right_main.php';
 } else {
-    $right_frame_url =  urldecode($right_frame);
+    $right_frame_url =  $right_frame;
 }
 
 if ($location_of_bar == 'right') {