From: Tomas K. <to...@us...> - 2005-03-30 11:03:57
|
Update of /cvsroot/squirrelmail/squirrelmail/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31912 Modified Files: delete_message.php Log Message: making script work correctly when draft is resumed. Tagging some parts that might need fixes. Index: delete_message.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/src/delete_message.php,v retrieving revision 1.54 retrieving revision 1.55 diff -u -w -r1.54 -r1.55 --- delete_message.php 13 Mar 2005 01:54:30 -0000 1.54 +++ delete_message.php 30 Mar 2005 11:03:29 -0000 1.55 @@ -20,7 +20,7 @@ /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/display_messages.php'); +include_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'functions/imap.php'); /* get globals */ @@ -33,20 +33,39 @@ sqgetGlobalVar('bypass_trash', $bypass_trash, SQ_FORM); +global $data_dir; /* end globals */ +/* get $compose_new_win */ +$compose_new_win=getPref($data_dir,$username,'compose_new_win',0); + +/** + * Script is used when draft is saved again or sent. + * browser should be redirected to compose.php (compose_new_win=1) + * or right_main.php + * Problem: drafts folder listing is not refreshed when + * compose_new_win=1. + */ if (sqGetGlobalVar('saved_draft', $tmp, SQ_GET)) { $saved_draft = urlencode($tmp); } if (sqGetGlobalVar('mail_sent', $tmp, SQ_GET)) { $mail_sent = urlencode($tmp); } +/** + * Script is used in search page. + * browser should be redirected to search.php + * Is it really used in search page? + */ if (sqGetGlobalVar('where', $tmp, SQ_FORM)) { $where = urlencode($tmp); } if (sqGetGlobalVar('what', $tmp, SQ_FORM)) { $what = urlencode($tmp); } +/** + * FIXME: which part of code uses it? + */ if (sqGetGlobalVar('sort', $tmp, SQ_FORM)) { $sort = (int) $tmp; } @@ -56,30 +75,48 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +// FIXME: unchecked use of variables. sqimap_mailbox_select($imapConnection, $mailbox); +// FIXME: unchecked use of variables. sqimap_messages_delete($imapConnection, $message, $message, $mailbox,$bypass_trash); if ($auto_expunge) { sqimap_mailbox_expunge($imapConnection, $mailbox, true); } -if (!isset($saved_draft)) { - $saved_draft = ''; -} - -if (!isset($mail_sent)) { - $mail_sent = ''; -} $location = get_location(); -if (isset($where) && isset($what)) { +/** + * FIXME: rg=on problems with $saved_drafts, $sent_mail, $where and $what + * FIXME: current version of squirrelmail contains only two + * delete_message.php calls. with saved_draft=yes (compose.php + * around line 360) and with mail_sent=yes (compose.php around line 434) + */ +if (isset($saved_draft)) { + // process resumed and again saved draft + if ($compose_new_win == '1') { + header("Location: $location/compose.php?saved_draft=yes"); + } else { + $draft_message = _("Draft Saved"); + header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . + "&startMessage=1¬e=".urlencode($draft_message)); + } +} elseif (isset($mail_sent)) { + // process resumed and then sent draft + if ($compose_new_win == '1') { + header("Location: $location/compose.php?mail_sent=yes"); + } else { + $draft_message = _("Your Message has been sent."); + header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . + "&startMessage=1¬e=".urlencode($draft_message)); + } +} elseif (isset($where) && isset($what)) { + // FIXME: I suspect that part of code is obsolete header("Location: $location/search.php?where=" . $where . '&what=' . $what . '&mailbox=' . urlencode($mailbox)); -} - -header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" . +} else { + header("Location: $location/right_main.php?startMessage=$startMessage&mailbox=" . urlencode($mailbox)); - +} sqimap_logout($imapConnection); - ?> |