rg=0 fix for vroken forward as attachment

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3851 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/right_main.php b/src/right_main.php
index 5dcaf7a3b17f5c13f40c7a9faf0992a6791b2638..f007b888704bee6adc9427e43485a651bd5ee38c 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -70,6 +70,12 @@ if (isset($_GET['PG_SHOWALL'])) {
 if (isset($_GET['newsort'])) {
     $newsort = $_GET['newsort'];
 }
+if (isset($_GET['composenew'])) {
+    $composenew = $_GET['composenew'];
+} else {
+    $composenew = false;
+}
+
 if (isset($_GET['checkall'])) {
     $checkall = $_GET['checkall'];
 }
@@ -80,6 +86,11 @@ if (isset($_SESSION['lastTargetMailbox'])) {
     $lastTargetMailbox =$_SESSION['lastTargetMailbox'];
 }
 
+if (isset($_GET['session'])) {
+    $session = $_GET['session'];
+}
+
+
 /* end of get globals */
 
 
@@ -150,9 +161,9 @@ do_hook ('generic_header');
 
 sqimap_mailbox_select($imapConnection, $mailbox);
 
-if (isset($composenew) && $composenew) {
-    $comp_uri = '../src/compose.php?mailbox='. urlencode($mailbox).
-               "&session=$composesession";
+if ($composenew) {
+    $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+               "&session=$session";
     displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);