From: <pdo...@us...> - 2008-10-15 20:18:05
|
Revision: 13306 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13306&view=rev Author: pdontthink Date: 2008-10-15 20:18:01 +0000 (Wed, 15 Oct 2008) Log Message: ----------- Fix alternate identities matching on reply Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2008-10-15 19:26:59 UTC (rev 13305) +++ trunk/squirrelmail/src/compose.php 2008-10-15 20:18:01 UTC (rev 13306) @@ -845,7 +845,8 @@ $enc_from_name = '"'.$data['full_name'].'" <'. $data['email_address'].'>'; if(strtolower($enc_from_name) == strtolower($orig_from)) { $identity = $nr; - break; + // don't stop! need to build $identities array for idents match below + //break; } $identities[] = $enc_from_name; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2008-10-29 23:25:56
|
Revision: 13313 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13313&view=rev Author: pdontthink Date: 2008-10-29 23:25:51 +0000 (Wed, 29 Oct 2008) Log Message: ----------- Properly construct Return-Receipt-To header Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2008-10-29 23:06:25 UTC (rev 13312) +++ trunk/squirrelmail/src/compose.php 2008-10-29 23:25:51 UTC (rev 13313) @@ -1523,7 +1523,7 @@ /* Receipt: On Delivery */ if (!empty($request_dr)) { //FIXME: it would be better to fiddle with headers inside of the message object or possibly when delivering the message to its destination; is this possible? - $rfc822_header->more_headers['Return-Receipt-To'] = $from->mailbox.'@'.$from->domain; + $rfc822_header->more_headers['Return-Receipt-To'] = $from_addr; } elseif (isset($rfc822_header->more_headers['Return-Receipt-To'])) { unset($rfc822_header->more_headers['Return-Receipt-To']); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2008-12-18 01:11:08
|
Revision: 13369 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13369&view=rev Author: pdontthink Date: 2008-12-18 01:10:59 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Add notes about issue reported where unset() breaks when removing attachments Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2008-12-18 01:10:42 UTC (rev 13368) +++ trunk/squirrelmail/src/compose.php 2008-12-18 01:10:59 UTC (rev 13369) @@ -659,6 +659,8 @@ foreach($delete as $index) { if (!empty($composeMessage->entities) && isset($composeMessage->entities[$index])) { $composeMessage->entities[$index]->purgeAttachments(); + // FIXME: one person reported that unset() didn't do anything at all here, so this is a work-around... but it triggers PHP notices if the unset() doesn't work, which should be fixed... but bigger question is if unset() doesn't work here, what about everywhere else? Anyway, uncomment this if you think you need it + //$composeMessage->entities[$index] = NULL; unset ($composeMessage->entities[$index]); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2009-03-26 04:05:51
|
Revision: 13445 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13445&view=rev Author: pdontthink Date: 2009-03-26 04:05:50 +0000 (Thu, 26 Mar 2009) Log Message: ----------- Add accesskey to the From drop-down too Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2009-03-26 04:04:12 UTC (rev 13444) +++ trunk/squirrelmail/src/compose.php 2009-03-26 04:05:50 UTC (rev 13445) @@ -1219,7 +1219,9 @@ // access keys... // global $accesskey_compose_to, $accesskey_compose_cc, - $accesskey_compose_bcc, $accesskey_compose_subject; + $accesskey_compose_identity, $accesskey_compose_bcc, + $accesskey_compose_subject; + $oTemplate->assign('accesskey_compose_identity', $accesskey_compose_identity); $oTemplate->assign('accesskey_compose_to', $accesskey_compose_to); $oTemplate->assign('accesskey_compose_cc', $accesskey_compose_cc); $oTemplate->assign('accesskey_compose_bcc', $accesskey_compose_bcc); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2009-05-14 17:03:25
|
Revision: 13701 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13701&view=rev Author: pdontthink Date: 2009-05-14 17:03:10 +0000 (Thu, 14 May 2009) Log Message: ----------- Add documentation and default case to catch unknown suffixes to getByteSize() Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2009-05-14 10:31:37 UTC (rev 13700) +++ trunk/squirrelmail/src/compose.php 2009-05-14 17:03:10 UTC (rev 13701) @@ -1484,7 +1484,21 @@ $composeMessage->initAttachment($type, $name, $localfilename); } -/* parse values like 8M and 2k into bytes */ +/** + * Parse strings such as "8M" and "2k" into their corresponding size in bytes + * + * NOTE: This function only recognizes the suffixes "K", "M" and "G" + * and will probably break very easily if the given size is in + * some completely different format. + * + * @param string $ini_size The input string to be converted + * + * @return mixed Boolean FALSE if something went wrong (the value passed in + * was empty?, the suffix was not recognized?), otherwise, the + * converted size in bytes (just the number (as an integer), + * no unit identifier included) + * + */ function getByteSize($ini_size) { if(!$ini_size) { @@ -1506,6 +1520,8 @@ case 'K': $bytesize = 1024; break; + default: + return FALSE; } return ($bytesize * (int)substr($ini_size, 0, -1)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2010-02-16 20:13:27
|
Revision: 13913 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13913&view=rev Author: pdontthink Date: 2010-02-16 20:13:21 +0000 (Tue, 16 Feb 2010) Log Message: ----------- RFC 3676 says there can't be more in the signature delimiter line than this Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2010-02-16 19:48:38 UTC (rev 13912) +++ trunk/squirrelmail/src/compose.php 2010-02-16 20:13:21 UTC (rev 13913) @@ -980,7 +980,7 @@ $body = ''; $strip_sigs = getPref($data_dir, $username, 'strip_sigs'); foreach ($rewrap_body as $line) { - if ($strip_sigs && substr($line,0,3) == '-- ') { + if ($strip_sigs && rtrim($line, "\r\n") == '-- ') { break; } if (preg_match("/^(>+)/", $line, $matches)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2010-03-19 08:29:50
|
Revision: 13929 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13929&view=rev Author: pdontthink Date: 2010-03-19 08:29:44 +0000 (Fri, 19 Mar 2010) Log Message: ----------- Don't push out onsubmit handler unless necessary Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2010-03-19 08:19:19 UTC (rev 13928) +++ trunk/squirrelmail/src/compose.php 2010-03-19 08:29:44 UTC (rev 13929) @@ -1173,21 +1173,24 @@ // Onsubmit text is enclosed inside of double quotes, so plugins // need to quote accordingly. if (checkForJavascript()) { - $onsubmit_text = ' onsubmit="'; if (empty($compose_onsubmit)) $compose_onsubmit = array(); else if (!is_array($compose_onsubmit)) $compose_onsubmit = array($compose_onsubmit); + $onsubmit_text = ''; foreach ($compose_onsubmit as $text) { $text = trim($text); - if (substr($text, -1) != ';' && substr($text, -1) != '}') - $text .= '; '; - $onsubmit_text .= $text; + if (!empty($text)) { + if (substr($text, -1) != ';' && substr($text, -1) != '}') + $text .= '; '; + $onsubmit_text .= $text; + } } + if (!empty($onsubmit_text)) //FIXME: DON'T ECHO HTML FROM CORE! - echo $onsubmit_text . ' return true;"'; + echo ' onsubmit="' . $onsubmit_text . ' return true;"'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2011-12-15 23:20:53
|
Revision: 14232 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14232&view=rev Author: pdontthink Date: 2011-12-15 23:20:47 +0000 (Thu, 15 Dec 2011) Log Message: ----------- Add plugin compatiblility info Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2011-12-15 23:19:42 UTC (rev 14231) +++ trunk/squirrelmail/src/compose.php 2011-12-15 23:20:47 UTC (rev 14232) @@ -1185,6 +1185,12 @@ // to do; SquirrelMail itself will add the final "return true". // Onsubmit text is enclosed inside of double quotes, so plugins // need to quote accordingly. + // + // Also, plugin authors should try to retain compatibility with + // the Compose Extras plugin by resetting its compose submit + // counter when preventing form submit. Use this code: + // if (your-code-here) { submit_count = 0; return false; } + // if (checkForJavascript()) { if (empty($compose_onsubmit)) $compose_onsubmit = array(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2012-01-09 20:41:08
|
Revision: 14265 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14265&view=rev Author: pdontthink Date: 2012-01-09 20:41:02 +0000 (Mon, 09 Jan 2012) Log Message: ----------- Account for case when no reply-to is set in user prefs Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2012-01-04 21:05:17 UTC (rev 14264) +++ trunk/squirrelmail/src/compose.php 2012-01-09 20:41:02 UTC (rev 14265) @@ -1633,7 +1633,7 @@ $reply_to = ''; $reply_to = $idents[$identity]['reply_to']; - if (strpos($reply_to, '@') === FALSE) + if ($reply_to && strpos($reply_to, '@') === FALSE) $reply_to .= '@' . $domain; $from_addr = build_from_header($identity); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2012-04-01 20:35:53
|
Revision: 14306 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14306&view=rev Author: pdontthink Date: 2012-04-01 20:35:47 +0000 (Sun, 01 Apr 2012) Log Message: ----------- Fix PHP notices Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2012-04-01 20:35:32 UTC (rev 14305) +++ trunk/squirrelmail/src/compose.php 2012-04-01 20:35:47 UTC (rev 14306) @@ -1751,14 +1751,16 @@ } if (!$success) { // $deliver->dlv_server_msg is not always server's reply - $msg = _("Message not sent.") . "<br />\n" . - $deliver->dlv_msg; + $msg = _("Message not sent.") + . "<br />\n" + . (isset($deliver->dlv_msg) ? $deliver->dlv_msg : ''); if (!empty($deliver->dlv_server_msg)) { // add 'server replied' part only when it is not empty. // Delivery error can be generated by delivery class itself - $msg.='<br />' . - _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . - nl2br(htmlspecialchars($deliver->dlv_server_msg)); + $msg .= '<br />' + . _("Server replied:") . ' ' + . (isset($deliver->dlv_ret_nr) ? $deliver->dlv_ret_nr . ' ' : '') + . nl2br(htmlspecialchars($deliver->dlv_server_msg)); } plain_error_message($msg); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2013-06-17 18:39:22
|
Revision: 14373 http://sourceforge.net/p/squirrelmail/code/14373 Author: pdontthink Date: 2013-06-17 18:39:19 +0000 (Mon, 17 Jun 2013) Log Message: ----------- findAddress() can return FALSE as well as zero Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2013-06-17 18:39:02 UTC (rev 14372) +++ trunk/squirrelmail/src/compose.php 2013-06-17 18:39:19 UTC (rev 14373) @@ -893,7 +893,7 @@ } $identity_match = $orig_header->findAddress($identities); - if ($identity_match) { + if ($identity_match !== FALSE) { $identity = $identity_match; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2013-06-17 18:43:36
|
Revision: 14374 http://sourceforge.net/p/squirrelmail/code/14374 Author: pdontthink Date: 2013-06-17 18:43:34 +0000 (Mon, 17 Jun 2013) Log Message: ----------- Remove ancient code that tried to set the default identity to match the FROM header of the message being replied to. This makes no sense and is superceded by the identities match that occurs immediately below. Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2013-06-17 18:39:19 UTC (rev 14373) +++ trunk/squirrelmail/src/compose.php 2013-06-17 18:43:34 UTC (rev 14374) @@ -884,11 +884,6 @@ if (count($idents) > 1) { foreach($idents as $nr=>$data) { $enc_from_name = '"'.$data['full_name'].'" <'. $data['email_address'].'>'; - if(strtolower($enc_from_name) == strtolower($orig_from)) { - $identity = $nr; - // don't stop! need to build $identities array for idents match below - //break; - } $identities[] = $enc_from_name; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2013-06-17 20:20:02
|
Revision: 14376 http://sourceforge.net/p/squirrelmail/code/14376 Author: pdontthink Date: 2013-06-17 20:19:59 +0000 (Mon, 17 Jun 2013) Log Message: ----------- Reply to original recipient functionality should be consistent, even if original recipient also happens to be one of our identities Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2013-06-17 18:43:49 UTC (rev 14375) +++ trunk/squirrelmail/src/compose.php 2013-06-17 20:19:59 UTC (rev 14376) @@ -1023,25 +1023,11 @@ } // if the reply was addressed back to ourselves, - // we will send it to the TO of the previous message, - // first making sure that that address wasn't also - // one of our identities + // we will send it to the TO of the previous message // if (!empty($orig_to)) { - foreach($idents as $id) { - if (!empty($id['email_address']) - && strpos($orig_to, $id['email_address']) !== FALSE) { - $orig_to = ''; - break; - } - } - - // if $orig_to still not empty, we can use it - // - if (!empty($orig_to)) { - $send_to = $orig_to; - } + $send_to = $orig_to; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2013-06-17 20:27:25
|
Revision: 14379 http://sourceforge.net/p/squirrelmail/code/14379 Author: pdontthink Date: 2013-06-17 20:27:22 +0000 (Mon, 17 Jun 2013) Log Message: ----------- When using reply-all to reply to single-recipient message, make sure we still use the original recipient Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2013-06-17 20:27:15 UTC (rev 14378) +++ trunk/squirrelmail/src/compose.php 2013-06-17 20:27:22 UTC (rev 14379) @@ -1002,8 +1002,8 @@ // the recipient (TO field) (as long as the CC field // isn't empty that is) and we're done // - if ($action == 'reply_all') { - if (!empty($send_to_cc)) $send_to = ''; + if ($action == 'reply_all' && !empty($send_to_cc)) { + $send_to = ''; break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2013-06-17 20:31:10
|
Revision: 14381 http://sourceforge.net/p/squirrelmail/code/14381 Author: pdontthink Date: 2013-06-17 20:31:07 +0000 (Mon, 17 Jun 2013) Log Message: ----------- When replying to original recipient, also reset the identity used to send the mail from Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2013-06-17 20:31:05 UTC (rev 14380) +++ trunk/squirrelmail/src/compose.php 2013-06-17 20:31:07 UTC (rev 14381) @@ -1028,6 +1028,22 @@ if (!empty($orig_to)) { $send_to = $orig_to; + + // in this case, we also want to reset the FROM + // identity as well (it should match the original + // *FROM* header instead of TO or CC) + // + if (count($idents) > 1) { + $identity = ''; + foreach($idents as $i => $id) { + if (!empty($id['email_address']) + && strpos($orig_from, $id['email_address']) !== FALSE) { + $identity = $i; + break; + } + } + } + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2013-09-16 18:06:59
|
Revision: 14391 http://sourceforge.net/p/squirrelmail/code/14391 Author: pdontthink Date: 2013-09-16 18:06:58 +0000 (Mon, 16 Sep 2013) Log Message: ----------- Don't allow TO field to be blank; adjust auto-detection of FROM for reply-all actions as well Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2013-09-16 18:04:31 UTC (rev 14390) +++ trunk/squirrelmail/src/compose.php 2013-09-16 18:06:58 UTC (rev 14391) @@ -1000,10 +1000,12 @@ // if this is a reply-all, the original recipient // is already in the CC field, so we can just blank // the recipient (TO field) (as long as the CC field - // isn't empty that is) and we're done + // isn't empty that is)... but then move the CC into + // the TO, so TO isn't empty // if ($action == 'reply_all' && !empty($send_to_cc)) { - $send_to = ''; + $orig_to = $send_to_cc; + $send_to_cc = ''; break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2016-05-30 08:15:28
|
Revision: 14556 http://sourceforge.net/p/squirrelmail/code/14556 Author: pdontthink Date: 2016-05-30 08:15:26 +0000 (Mon, 30 May 2016) Log Message: ----------- Allow priority and identity selections to be given by callers. Looks to have been intended to work this way, but never tested. Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2016-05-30 08:14:48 UTC (rev 14555) +++ trunk/squirrelmail/src/compose.php 2016-05-30 08:15:26 UTC (rev 14556) @@ -73,6 +73,7 @@ } sqgetGlobalVar('session',$session, $SQ_GLOBAL); sqgetGlobalVar('mailbox',$mailbox, $SQ_GLOBAL); +sqgetGlobalVar('identity',$orig_identity, $SQ_GLOBAL); if(!sqgetGlobalVar('identity',$identity, $SQ_GLOBAL)) { $identity=0; } @@ -753,6 +754,12 @@ if (isset($subject)) { $values['subject'] = $subject; } + if (isset($mailprio)) { + $values['mailprio'] = $mailprio; + } + if (isset($orig_identity)) { + $values['identity'] = $orig_identity; + } showInputForm($session, $values); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-01-28 04:11:33
|
Revision: 14648 http://sourceforge.net/p/squirrelmail/code/14648 Author: pdontthink Date: 2017-01-28 04:11:30 +0000 (Sat, 28 Jan 2017) Log Message: ----------- Note future change Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2017-01-27 20:53:57 UTC (rev 14647) +++ trunk/squirrelmail/src/compose.php 2017-01-28 04:11:30 UTC (rev 14648) @@ -1781,6 +1781,9 @@ it over to deliver; plugin authors note that $composeMessage is sent and modified by reference since 1.5.2 */ do_hook('compose_send', $composeMessage); +//TODO: need to migrate to the following, but it neessitates changes in existing plugins, since the args are now an array + //$temp = array(&$composeMessage, &$draft); + //do_hook('compose_send', $temp); if (!$useSendmail && !$draft) { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-11-18 22:09:02
|
Revision: 14732 http://sourceforge.net/p/squirrelmail/code/14732 Author: pdontthink Date: 2017-11-18 22:09:00 +0000 (Sat, 18 Nov 2017) Log Message: ----------- Make drafts send with in-reply-to headers (fix regression from long ago) Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2017-11-18 22:00:02 UTC (rev 14731) +++ trunk/squirrelmail/src/compose.php 2017-11-18 22:09:00 UTC (rev 14732) @@ -926,6 +926,9 @@ // rewrap the body to clean up quotations and line lengths sqBodyWrap($body, $editor_size); $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); +//TODO: completely unclear if should be using $compose_session instead of $session below + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages,'compose_messages'); break; case ('edit_as_new'): $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2017-11-22 22:56:21
|
Revision: 14745 http://sourceforge.net/p/squirrelmail/code/14745 Author: pdontthink Date: 2017-11-22 22:56:18 +0000 (Wed, 22 Nov 2017) Log Message: ----------- Make return-to-message work for forwards Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2017-11-22 22:36:09 UTC (rev 14744) +++ trunk/squirrelmail/src/compose.php 2017-11-22 22:56:18 UTC (rev 14745) @@ -574,7 +574,8 @@ } else { if ( !isset($pageheader_sent) || !$pageheader_sent ) { global $return_to_message_after_reply; - if (($action === 'reply' || $action === 'reply_all') && $return_to_message_after_reply) + if (($action === 'reply' || $action === 'reply_all' || $action === 'forward' || $action === 'forward_as_attachment') + && $return_to_message_after_reply && $passed_id) header("Location: $location/read_body.php?passed_id=$passed_id&mailbox=$urlMailbox". "&startMessage=$startMessage&mail_sent=$mail_sent"); else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2018-11-25 20:25:45
|
Revision: 14799 http://sourceforge.net/p/squirrelmail/code/14799 Author: pdontthink Date: 2018-11-25 20:25:43 +0000 (Sun, 25 Nov 2018) Log Message: ----------- Allow unsent compose sessions to stay around, but remove them after successful send Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2018-11-25 20:23:42 UTC (rev 14798) +++ trunk/squirrelmail/src/compose.php 2018-11-25 20:25:43 UTC (rev 14799) @@ -55,7 +55,8 @@ // compose_messages only useful in SESSION when a forward-as-attachment // has been preconstructed for us and passed in via that mechanism; once // we have it, we can clear it from the SESSION -sqsession_unregister('compose_messages'); +// -- No, this is useful in other scenarios, too -- removing: +// sqsession_unregister('compose_messages'); // Turn on delayed error handling in case we wind up redirecting below $oErrorHandler->setDelayedErrors(true); @@ -246,6 +247,7 @@ $full_reply_citation = sprintf(_("%s wrote:"),$sOrig_from); break; case 'quote_who': + // TODO: the words "quote" and "who" are translated in 1.4.x so why not here? This isn't a real HTML tag... $start = '<quote who="'; $end = '">'; $full_reply_citation = $start . $sOrig_from . $end; @@ -807,7 +809,7 @@ $key, $imapServerAddress, $imapPort, $imap_stream_options, $composeMessage, $body_quote, $request_mdn, $request_dr, $mdn_user_support, $languages, $squirrelmail_language, - $default_charset, $do_not_reply_to_self; + $default_charset, $do_not_reply_to_self, $compose_messages; /* * Set $default_charset to correspond with the user's selection @@ -1713,7 +1715,7 @@ */ function deliverMessage(&$composeMessage, $draft=false) { global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body, - $username, $identity, $idents, $data_dir, + $username, $identity, $idents, $data_dir, $compose_messages, $session, $request_mdn, $request_dr, $default_charset, $useSendmail, $domain, $action, $default_move_to_sent, $move_to_sent, $imapServerAddress, $imapPort, $imap_stream_options, $sent_folder, $key; @@ -1864,6 +1866,9 @@ sqimap_logout($imap_stream); unset ($imap_deliver); $composeMessage->purgeAttachments(); +//TODO: completely unclear if should be using $compose_session instead of $session below + unset($compose_messages[$session]); + sqsession_register($compose_messages,'compose_messages'); return $success; } else { $msg = '<br />'.sprintf(_("Error: Draft folder %s does not exist."), sm_encode_html_special_chars($draft_folder)); @@ -2001,6 +2006,9 @@ // final cleanup // $composeMessage->purgeAttachments(); +//TODO: completely unclear if should be using $compose_session instead of $session below + unset($compose_messages[$session]); + sqsession_register($compose_messages,'compose_messages'); sqimap_logout($imap_stream); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2019-02-23 07:13:57
|
Revision: 14803 http://sourceforge.net/p/squirrelmail/code/14803 Author: pdontthink Date: 2019-02-23 07:13:52 +0000 (Sat, 23 Feb 2019) Log Message: ----------- When message being replied to has no Reply-To header, we use the From header to fill in the reply To address, so we have to account for that situation when building the Cc header Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2019-02-23 07:09:00 UTC (rev 14802) +++ trunk/squirrelmail/src/compose.php 2019-02-23 07:13:52 UTC (rev 14803) @@ -175,8 +175,12 @@ /** * 1) Remove the addresses we'll be sending the message 'to' */ - if (isset($header->reply_to)) { + if (isset($header->reply_to) && is_array($header->reply_to) && count($header->reply_to)) { $excl_ar = $header->getAddr_a('reply_to'); + } else if (is_object($header->reply_to)) { /* unneccesarry, just for failsafe purpose */ + $excl_ar = $header->getAddr_a('reply_to'); + } else { + $excl_ar = $header->getAddr_a('from'); } /** * 2) Remove our identities from the CC list (they still can be in the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2021-05-12 05:33:01
|
Revision: 14922 http://sourceforge.net/p/squirrelmail/code/14922 Author: pdontthink Date: 2021-05-12 05:33:01 +0000 (Wed, 12 May 2021) Log Message: ----------- Make sure drafts are sent with the current date and not that of its previous 'Save Draft' action Modified Paths: -------------- trunk/squirrelmail/src/compose.php Modified: trunk/squirrelmail/src/compose.php =================================================================== --- trunk/squirrelmail/src/compose.php 2021-05-12 05:12:06 UTC (rev 14921) +++ trunk/squirrelmail/src/compose.php 2021-05-12 05:33:01 UTC (rev 14922) @@ -1729,6 +1729,11 @@ $rfc822_header = $composeMessage->rfc822_header; + // clear Date header so drafts don't end up with a stale date + // (does this cause issues with some other scenario where a + // message with an existing date header should be preserved??) + unset($rfc822_header->date); + $abook = addressbook_init(false, true); $rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain, array(&$abook,'lookup')); $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain, array(&$abook,'lookup')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |