rpms/squirrelmail/F-8 squirrelmail-1.4.11-attach.patch, NONE, 1.1 squirrelmail.spec, 1.55, 1.56
Martin Bacovsky (mbacovsk)
fedora-extras-commits at redhat.com
Mon Nov 12 12:51:03 UTC 2007
- Previous message (by thread): rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 sugar-presence-service.spec, 1.29, 1.30
- Next message (by thread): rpms/kernel-xen-2.6/F-7/scripts bumpspecfile.py, 1.1, 1.2 configcommon.pl, 1.1, 1.2 configdiff.pl, 1.1, 1.2 cross-amd64.sh, 1.1, 1.2 cross-i586.sh, 1.1, 1.2 cross-i686.sh, 1.1, 1.2 cross-ia64.sh, 1.1, 1.2 cross-iseries.sh, 1.1, 1.2 cross-ppc.sh, 1.1, 1.2 cross-ppc64.sh, 1.1, 1.2 cross-ppc8260.sh, 1.1, 1.2 cross-ppc8560.sh, 1.1, 1.2 cross-pseries.sh, 1.1, 1.2 cross-s390.sh, 1.1, 1.2 cross-s390x.sh, 1.1, 1.2 newpatch.sh, 1.1, 1.2 pull-upstreams.sh, 1.1, 1.2 rebase-xen-hv.sh, 1.1, 1.2 rebase-xen-kernel.sh, 1.1, 1.2 rebase.sh, 1.1, 1.2 reconfig.sh, 1.1, 1.2 rediffall.pl, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbacovsk
Update of /cvs/pkgs/rpms/squirrelmail/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20121
Modified Files:
squirrelmail.spec
Added Files:
squirrelmail-1.4.11-attach.patch
Log Message:
* Mon Nov 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.11-2
- resolves: #377141: squirrelmail-1.4.11 has troubles with sending attachments
squirrelmail-1.4.11-attach.patch:
--- NEW FILE squirrelmail-1.4.11-attach.patch ---
diff -up squirrelmail-1.4.11/src/addrbook_search_html.php.attach squirrelmail-1.4.11/src/addrbook_search_html.php
--- squirrelmail-1.4.11/src/addrbook_search_html.php.attach 2007-11-12 11:02:44.000000000 +0100
+++ squirrelmail-1.4.11/src/addrbook_search_html.php 2007-11-12 11:03:41.000000000 +0100
@@ -9,7 +9,7 @@
*
* @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version $Id: addrbook_search_html.php 12705 2007-09-29 05:24:14Z pdontthink $
+ * @version $Id: addrbook_search_html.php 12726 2007-10-07 03:01:49Z jangliss $
* @package squirrelmail
* @subpackage addressbook
*/
@@ -48,7 +48,7 @@ sqgetGlobalVar('backend', $backend,
*/
function addr_insert_hidden() {
global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
- $mailprio, $request_mdn, $request_dr, $identity, $session;
+ $mailprio, $request_mdn, $request_dr, $identity, $session, $composeMessage;
if (substr($body, 0, 1) == "\r") {
echo addHidden('body', "\n".$body);
@@ -56,6 +56,9 @@ function addr_insert_hidden() {
echo addHidden('body', $body);
}
+ if (is_object($composeMessage) && $composeMessage->entities)
+ echo addHidden('attachments', serialize($composeMessage->entities));
+
echo addHidden('session', $session).
addHidden('subject', $subject).
addHidden('send_to', $send_to).
@@ -198,11 +201,11 @@ html_tag( 'table',
/* Search form */
-echo '<center>' .
+echo addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
+ '<center>' .
html_tag( 'table', '', 'center', '', 'border="0"' ) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
- addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
"\n<center>\n" .
' <nobr><strong>' . _("Search for") . "</strong>\n";
addr_insert_hidden();
@@ -232,9 +235,8 @@ if (isset($session)) {
echo '<input type="submit" value="' . _("Search") . '" />' .
' | <input type="submit" value="' . _("List all") .
'" name="listall" />' . "\n" .
- '</form></center></td></tr></table>' . "\n";
-addr_insert_hidden();
-echo '</center>';
+ '</center></td></tr></table>' . "\n";
+echo '</center></form>';
do_hook('addrbook_html_search_below');
/* End search form */
@@ -270,6 +272,7 @@ if ($addrquery == '' && empty($listall))
usort($res,'alistcmp');
addr_display_result($res, true);
}
+ echo '</body></html>';
exit;
}
else {
diff -up squirrelmail-1.4.11/src/compose.php.attach squirrelmail-1.4.11/src/compose.php
--- squirrelmail-1.4.11/src/compose.php.attach 2007-11-12 10:59:31.000000000 +0100
+++ squirrelmail-1.4.11/src/compose.php 2007-11-12 11:03:18.000000000 +0100
@@ -13,7 +13,7 @@
*
* @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
- * @version $Id: compose.php 12656 2007-08-31 23:20:21Z pdontthink $
+ * @version $Id: compose.php 12749 2007-10-31 03:38:19Z jangliss $
* @package squirrelmail
*/
@@ -319,9 +319,6 @@ if (sqsession_is_registered('session_exp
if (!empty($attachments))
$attachments = unserialize($attachments);
- // Not used any more, but left for posterity
- //$compose_messages = unserialize($restoremessages);
- //sqsession_register($compose_messages,'compose_messages');
sqsession_register($composesession,'composesession');
if (isset($send)) {
@@ -357,20 +354,13 @@ if (!isset($session) || (isset($newmessa
$composesession = $session;
sqsession_register($composesession,'composesession');
}
-if (!isset($compose_messages)) {
- $compose_messages = array();
-}
-if (empty($compose_messages[$session])) {
+if (!empty($compose_messages[$session])) {
+ $composeMessage = $compose_messages[$session];
+} else {
$composeMessage = new Message();
$rfc822_header = new Rfc822Header();
$composeMessage->rfc822_header = $rfc822_header;
$composeMessage->reply_rfc822_header = '';
- $compose_messages[$session] = $composeMessage;
-
- // Not used any more, but left for posterity
- //sqsession_register($compose_messages,'compose_messages');
-} else {
- $composeMessage=$compose_messages[$session];
}
// re-add attachments that were already in this message
@@ -392,14 +382,10 @@ if ($draft) {
* of language interface.
*/
set_my_charset();
- $composeMessage = $compose_messages[$session];
if (! deliverMessage($composeMessage, true)) {
showInputForm($session);
exit();
} else {
- // Not used any more, but left for posterity
- //unset($compose_messages[$session]);
- //sqsession_register($compose_messages,'compose_messages');
$draft_message = _("Draft Email Saved");
/* If this is a resumed draft, then delete the original */
if(isset($delete_draft)) {
@@ -490,17 +476,12 @@ if ($send) {
}
$body = $newBody;
- $composeMessage=$compose_messages[$session];
-
$Result = deliverMessage($composeMessage);
do_hook('compose_send_after', $Result, $composeMessage);
if (! $Result) {
showInputForm($session);
exit();
}
- // Not used any more, but left for posterity
- //unset($compose_messages[$session]);
- //sqsession_register($compose_messages,'compose_messages');
/* if it is resumed draft, delete draft message */
if ( isset($delete_draft)) {
@@ -604,7 +585,6 @@ elseif (isset($sigappend)) {
}
if (isset($delete) && is_array($delete)) {
- $composeMessage = $compose_messages[$session];
foreach($delete as $index) {
if (!empty($composeMessage->entities) && isset($composeMessage->entities[$index])) {
$composeMessage->entities[$index]->purgeAttachments();
@@ -616,9 +596,6 @@ elseif (isset($sigappend)) {
$new_entities[] = $entity;
}
$composeMessage->entities = $new_entities;
- $compose_messages[$session] = $composeMessage;
- // Not used any more, but left for posterity
- //sqsession_register($compose_messages, 'compose_messages');
}
showInputForm($session);
} else {
@@ -675,7 +652,7 @@ exit();
function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
global $editor_size, $default_use_priority, $body, $idents,
$use_signature, $composesession, $data_dir, $username,
- $username, $key, $imapServerAddress, $imapPort, $compose_messages,
+ $username, $key, $imapServerAddress, $imapPort,
$composeMessage, $body_quote;
global $languages, $squirrelmail_language, $default_charset;
@@ -896,9 +873,6 @@ function newMail ($mailbox='', $passed_i
default:
break;
}
- $compose_messages[$session] = $composeMessage;
- // Not used any more, but left for posterity
- //sqsession_register($compose_messages, 'compose_messages');
session_write_close();
sqimap_logout($imapConnection);
}
@@ -1016,7 +990,7 @@ function showInputForm ($session, $value
$username, $data_dir, $identity, $idents, $draft_id, $delete_draft,
$mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
$saved_draft, $mail_sent, $sig_first, $edit_as_new, $action,
- $username, $compose_messages, $composesession, $default_charset,
+ $username, $composesession, $default_charset, $composeMessage,
$javascript_on;
if ($javascript_on)
@@ -1024,7 +998,6 @@ function showInputForm ($session, $value
else
$onfocus = '';
- $composeMessage = $compose_messages[$session];
if ($values) {
$send_to = $values['send_to'];
$send_to_cc = $values['send_to_cc'];
@@ -1294,8 +1267,6 @@ function showInputForm ($session, $value
store the complete ComposeMessages array in a hidden input value
so we can restore them in case of a session timeout.
*/
- // Not used any more, but left for posterity
- //echo addHidden('restoremessages', serialize($compose_messages)).
echo addHidden('composesession', $composesession).
addHidden('querystring', $queryString).
(!empty($attach_array) ?
@@ -1397,7 +1368,7 @@ function checkInput ($show) {
/* True if FAILURE */
function saveAttachedFiles($session) {
global $_FILES, $attachment_dir, $username,
- $data_dir, $compose_messages;
+ $data_dir, $composeMessage;
/* get out of here if no file was attached at all */
if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) {
@@ -1419,13 +1390,9 @@ function saveAttachedFiles($session) {
return true;
}
}
- $message = $compose_messages[$session];
$type = strtolower($_FILES['attachfile']['type']);
$name = $_FILES['attachfile']['name'];
- $message->initAttachment($type, $name, $localfilename);
- $compose_messages[$session] = $message;
- // Not used any more, but left for posterity
- //sqsession_register($compose_messages , 'compose_messages');
+ $composeMessage->initAttachment($type, $name, $localfilename);
}
/* parse values like 8M and 2k into bytes */
@@ -1564,6 +1531,14 @@ function deliverMessage($composeMessage,
$rfc822_header->content_type = $content_type;
$composeMessage->rfc822_header = $rfc822_header;
+ if ($action == 'reply' || $action == 'reply_all') {
+ global $passed_id, $passed_ent_id;
+ $reply_id = $passed_id;
+ $reply_ent_id = $passed_ent_id;
+ } else {
+ $reply_id = '';
+ $reply_ent_id = '';
+ }
/* Here you can modify the message structure just before we hand
it over to deliver */
@@ -1608,9 +1583,9 @@ function deliverMessage($composeMessage,
if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
- $length = $imap_deliver->mail($composeMessage);
+ $length = $imap_deliver->mail($composeMessage, 0, $reply_id, $reply_ent_id);
sqimap_append ($imap_stream, $draft_folder, $length);
- $imap_deliver->mail($composeMessage, $imap_stream);
+ $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id);
sqimap_append_done ($imap_stream, $draft_folder);
sqimap_logout($imap_stream);
unset ($imap_deliver);
@@ -1625,7 +1600,7 @@ function deliverMessage($composeMessage,
}
$succes = false;
if ($stream) {
- $length = $deliver->mail($composeMessage, $stream);
+ $length = $deliver->mail($composeMessage, $stream, $reply_id, $reply_ent_id);
$succes = $deliver->finalizeStream($stream);
}
if (!$succes) {
@@ -1663,7 +1638,7 @@ function deliverMessage($composeMessage,
sqimap_append ($imap_stream, $sent_folder, $length);
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
- $imap_deliver->mail($composeMessage, $imap_stream);
+ $imap_deliver->mail($composeMessage, $imap_stream, $reply_id, $reply_ent_id);
sqimap_append_done ($imap_stream, $sent_folder);
unset ($imap_deliver);
}
Index: squirrelmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squirrelmail/F-8/squirrelmail.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- squirrelmail.spec 10 Oct 2007 18:36:51 -0000 1.55
+++ squirrelmail.spec 12 Nov 2007 12:50:30 -0000 1.56
@@ -6,7 +6,7 @@
Summary: SquirrelMail webmail client
Name: squirrelmail
Version: 1.4.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
URL: http://www.squirrelmail.org/
Group: Applications/Internet
@@ -22,6 +22,7 @@
Patch4: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
#Patch5: squirrelmail-1.4.7-ja-translate.patch
Patch6: squirrelmail-1.4.9a-id_plural.patch
+Patch7: squirrelmail-1.4.11-attach.patch
# CVE-2006-6142
#Patch100: squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch
#Patch101: squirrelmail-1.4.8-CVE-2006-6142-mailto.patch
@@ -48,6 +49,7 @@
#%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch7 -p1 -b .attach
# CVE-2006-6142
#%patch100 -p0
@@ -59,6 +61,7 @@
tar xfj %SOURCE4
%patch6 -p2
+
%build
rm -f plugins/make_archive.pl
@@ -258,6 +261,9 @@
%{_sysconfdir}/cron.daily/squirrelmail.cron
%changelog
+* Mon Nov 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.11-2
+- resolves: #377141: squirrelmail-1.4.11 has troubles with sending attachments
+
* Wed Oct 10 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.11-1
- upgrade to new upstream 1.4.11
- Previous message (by thread): rpms/sugar-presence-service/OLPC-2 .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 sugar-presence-service.spec, 1.29, 1.30
- Next message (by thread): rpms/kernel-xen-2.6/F-7/scripts bumpspecfile.py, 1.1, 1.2 configcommon.pl, 1.1, 1.2 configdiff.pl, 1.1, 1.2 cross-amd64.sh, 1.1, 1.2 cross-i586.sh, 1.1, 1.2 cross-i686.sh, 1.1, 1.2 cross-ia64.sh, 1.1, 1.2 cross-iseries.sh, 1.1, 1.2 cross-ppc.sh, 1.1, 1.2 cross-ppc64.sh, 1.1, 1.2 cross-ppc8260.sh, 1.1, 1.2 cross-ppc8560.sh, 1.1, 1.2 cross-pseries.sh, 1.1, 1.2 cross-s390.sh, 1.1, 1.2 cross-s390x.sh, 1.1, 1.2 newpatch.sh, 1.1, 1.2 pull-upstreams.sh, 1.1, 1.2 rebase-xen-hv.sh, 1.1, 1.2 rebase-xen-kernel.sh, 1.1, 1.2 rebase.sh, 1.1, 1.2 reconfig.sh, 1.1, 1.2 rediffall.pl, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list