use same width as other tables on src/addressbook.php

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index 5ce2ba2f04354ab19250b5447007f0f24088ee55..a25c460e73418e1f10b50c1b4ec565395a3251db 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * right_main.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This is where the mailboxes are listed. This controls most of what
@@ -176,20 +177,15 @@ if (isset($aMailbox['FORWARD_SESSION'])) {
         session_write_close();
         sqsession_is_active();
         $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-                    '&session='.$aMailbox['FORWARD_SESSION'];
+                    '&amp;session='.$aMailbox['FORWARD_SESSION'];
         displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
     } else {
         // save mailboxstate
         sqsession_register($aMailbox,'aLastSelectedMailbox');
         session_write_close();
         // we have to redirect to the compose page
-        global $PHP_SELF;
-        if (!strpos($PHP_SELF,'?')) {
-            $location = $PHP_SELF.'?mailbox=INBOX&amp;startMessage=1';
-        } else {
-            $location = $PHP_SELF;
-        }
-        $location = set_url_var($location, 'session',$aMailbox['FORWARD_SESSION'], false);
+        $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+                    '&amp;session='.$aMailbox['FORWARD_SESSION'];
         header("Location: $location");
         exit;
     }