r2l by Yoav

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index 01d7634c428b410543a59abc12eaf0e5b3e0f7e3..a4db4efe1d68339cf39c0004ec9b156f1f9e0e89 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -39,7 +39,19 @@ $bob = getHashedFile($username, $data_dir, "username.pref");
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-if( isset( $PG_SHOWNUM ) ) {
+global $PG_SHOWNUM;
+if (isset($PG_SHOWALL)) {
+    if ($PG_SHOWALL) {
+       $PG_SHOWNUM=999999;
+       $show_num=$PG_SHOWNUM;
+       session_register('PG_SHOWNUM');
+    }
+    else {
+       session_unregister('PG_SHOWNUM');
+       unset($PG_SHOWNUM);
+    }
+}
+else if( isset( $PG_SHOWNUM ) ) {
     $show_num = $PG_SHOWNUM;
 }
 
@@ -95,18 +107,11 @@ if( isset($do_hook) && $do_hook ) {
 
 sqimap_mailbox_select($imapConnection, $mailbox);
 
-if (isset($composenew)) {
-    $width= getPref($username, $data_dir, 'editor_size', 76);
-    if ($width < 65) {
-        $pix_width = 560;
-    } else {
-        $width = (.9*$width);
-        $pix_width = intval($width).'0';
-    }
-    $features = "toolbar=no, width=$pix_width, height=650, scrollbars=yes, resizable=yes target=_blank";
-    $location = 'compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
-    $onload= "window.open(\"$location\",\"compose_window_$session\", \"$features\");";
-    displayPageHeader($color, $mailbox, $onload);
+if (isset($composenew) && $composenew) {
+    $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
+               "&amp;session=$composesession&amp;attachedmessages=true&amp";
+
+    displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);
 }
@@ -193,4 +198,4 @@ sqimap_logout ($imapConnection);
 
 echo '</BODY></HTML>';
 
-?>
+?>
\ No newline at end of file