Some indentation.

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index 31f2ac143eab61cd80fa5afc1cfec0f8b5dd189d..fb68c39281d7740ca234857a4125f17583916049 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -34,8 +34,6 @@ require_once('../functions/html.php');
  *    $key              pass                               *
  ***********************************************************/
 
-$bob = getHashedFile($username, $data_dir, "username.pref");
-
 /* Open a connection on the imap port (143) */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -102,22 +100,18 @@ else {
 } 
 
 global $color;
-/* if( isset($do_hook) && $do_hook ) {
-    do_hook ("generic_header");
-}*/
+
+do_hook ("generic_header");
 
 sqimap_mailbox_select($imapConnection, $mailbox);
 
 if (isset($composenew) && $composenew) {
     $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
-               "&session=$composesession&attachedmessages=true&amp";
-
-    displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
+               "&session=$composesession";
+    displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);
 }
-echo "<br>\n";
-
 do_hook('right_main_after_header');
 if (isset($note)) {
     echo html_tag( 'div', '<b>' . $note .'</b>', 'center' ) . "<br>\n";
@@ -202,4 +196,4 @@ sqimap_logout ($imapConnection);
 
 echo '</body></html>';
 
-?>
\ No newline at end of file
+?>