X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=ac2bac75bfdb7bbd1b254aa600707496bc9c9391;hp=2ca66d47358b4dc95feb78c68eb968240dc7be98;hb=b268e66b4b96c4e2b8b44eae8161e7557b6eaf7c;hpb=fdc9d9b593d6588e23877751d42ee6ca29e0ba6a

diff --git a/src/webmail.php b/src/webmail.php
index 2ca66d47..ac2bac75 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -33,21 +33,18 @@ $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');
 }
+if(!sqgetGlobalVar('mailto', $mailto)) {
+    $mailto = '';
+}
 
 is_logged_in();
 
@@ -126,6 +123,8 @@ if ($right_frame == 'right_main.php') {
     $right_frame_url = 'options.php';
 } elseif ($right_frame == 'folders.php') {
     $right_frame_url = 'folders.php';
+} elseif ($right_frame == 'compose.php') {
+    $right_frame_url = 'compose.php?' . $mailto;
 } else if ($right_frame == '') {
     $right_frame_url = 'right_main.php';
 } else {