#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#include "intl.h"
#include "main.h"
#include "utils.h"
#include "procmsg.h"
#include "news.h"
#include "hooks.h"
#include "msgcache.h"
+#include "partial_download.h"
GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
{
}
}
-void procmsg_empty_trash(void)
+void procmsg_empty_trash(FolderItem *trash)
+{
+ if (trash && trash->total_msgs > 0) {
+ GSList *mlist = folder_item_get_msg_list(trash);
+ GSList *cur;
+ for (cur = mlist ; cur != NULL ; cur = cur->next) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+ partial_mark_for_delete(msginfo);
+ procmsg_msginfo_free(msginfo);
+ }
+
+ folder_item_remove_all_msg(trash);
+ }
+}
+
+void procmsg_empty_all_trash(void)
{
FolderItem *trash;
GList *cur;
for (cur = folder_get_list(); cur != NULL; cur = cur->next) {
trash = FOLDER(cur->data)->trash;
- if (trash && trash->total_msgs > 0)
- folder_item_remove_all_msg(trash);
+ procmsg_empty_trash(trash);
}
}
*/
gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
{
- gint ret = 1, count = 0;
+ gint sent = 0, err = 0;
GSList *list, *elem;
if (!queue)
if (procmsg_send_message_queue(file) < 0) {
g_warning("Sending queued message %d failed.\n",
msginfo->msgnum);
- ret = -1;
+ err++;
} else {
/* CLAWS:
* We save in procmsg_send_message_queue because
(queue->folder->outbox,
file, TRUE);
*/
- count++;
+ sent++;
folder_item_remove_msg(queue, msginfo->msgnum);
}
g_free(file);
procmsg_msginfo_free(msginfo);
}
- return ret * count;
+ return (err != 0 ? -err : sent);
}
gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
gchar tmp[MAXPATHLEN + 1];
g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.out.%08x",
- get_rc_dir(), G_DIR_SEPARATOR, (guint)random());
+ get_rc_dir(), G_DIR_SEPARATOR, (guint) rand());
if (procmsg_remove_special_headers(file, tmp) !=0)
return -1;
MEMBCOPY(size);
MEMBCOPY(mtime);
MEMBCOPY(date_t);
+
MEMBCOPY(flags);
MEMBDUP(fromname);
MEMBCOPY(score);
MEMBCOPY(threadscore);
+ MEMBDUP(plaintext_file);
return newmsginfo;
}
if (msginfo == NULL) return NULL;
- file = procmsg_get_message_file(msginfo);
- if (!file) {
+ file = procmsg_get_message_file_path(msginfo);
+ if (!file || !is_file_exist(file)) {
+ g_free(file);
+ file = procmsg_get_message_file(msginfo);
+ }
+ if (!file || !is_file_exist(file)) {
g_warning("procmsg_msginfo_get_full_info(): can't get message file.\n");
return NULL;
}
if (!msginfo->returnreceiptto)
msginfo->returnreceiptto = g_strdup
(full_msginfo->returnreceiptto);
+ if (!msginfo->partial_recv && full_msginfo->partial_recv)
+ msginfo->partial_recv = g_strdup
+ (full_msginfo->partial_recv);
+ msginfo->total_size = full_msginfo->total_size;
+ if (!msginfo->account_server && full_msginfo->account_server)
+ msginfo->account_server = g_strdup
+ (full_msginfo->account_server);
+ if (!msginfo->account_login && full_msginfo->account_login)
+ msginfo->account_login = g_strdup
+ (full_msginfo->account_login);
+ msginfo->planned_download = full_msginfo->planned_download;
procmsg_msginfo_free(full_msginfo);
return procmsg_msginfo_new_ref(msginfo);
g_free(msginfo->inreplyto);
g_free(msginfo->xref);
+ g_free(msginfo->partial_recv);
+ g_free(msginfo->account_server);
+ g_free(msginfo->account_login);
+
+ g_free(msginfo->plaintext_file);
+
g_free(msginfo);
}
Q_NEWS_ACCOUNT_ID = 5,
Q_SAVE_COPY_FOLDER = 6,
Q_REPLY_MESSAGE_ID = 7,
- Q_FWD_MESSAGE_ID = 8
+ Q_FWD_MESSAGE_ID = 8,
+ Q_PRIVACY_SYSTEM = 9,
+ Q_ENCRYPT = 10,
+ Q_ENCRYPT_DATA = 11,
};
gint procmsg_send_message_queue(const gchar *file)
{"SCF:", NULL, FALSE},
{"RMID:", NULL, FALSE},
{"FMID:", NULL, FALSE},
+ {"X-Sylpheed-Privacy-System:", NULL, FALSE},
+ {"X-Sylpheed-Encrypt:", NULL, FALSE},
+ {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
{NULL, NULL, FALSE}};
FILE *fp;
gint filepos;
gchar *savecopyfolder = NULL;
gchar *replymessageid = NULL;
gchar *fwdmessageid = NULL;
+ gchar *privacy_system = NULL;
+ gboolean encrypt = FALSE;
+ gchar *encrypt_data = NULL;
gchar buf[BUFFSIZE];
gint hnum;
PrefsAccount *mailac = NULL, *newsac = NULL;
+ gboolean save_clear_text = TRUE;
+ gchar *tmp_enc_file = NULL;
+
int local = 0;
g_return_val_if_fail(file != NULL, -1);
switch (hnum) {
case Q_SENDER:
- if (!from) from = g_strdup(p);
+ if (from == NULL)
+ from = g_strdup(p);
break;
case Q_SMTPSERVER:
- if (!smtpserver) smtpserver = g_strdup(p);
+ if (smtpserver == NULL)
+ smtpserver = g_strdup(p);
break;
case Q_RECIPIENTS:
to_list = address_list_append(to_list, p);
newsac = account_find_from_id(atoi(p));
break;
case Q_SAVE_COPY_FOLDER:
- if (!savecopyfolder) savecopyfolder = g_strdup(p);
+ if (savecopyfolder == NULL)
+ savecopyfolder = g_strdup(p);
break;
case Q_REPLY_MESSAGE_ID:
- if (!replymessageid) replymessageid = g_strdup(p);
+ if (replymessageid == NULL)
+ replymessageid = g_strdup(p);
break;
case Q_FWD_MESSAGE_ID:
- if (!fwdmessageid) fwdmessageid = g_strdup(p);
+ if (fwdmessageid == NULL)
+ fwdmessageid = g_strdup(p);
+ break;
+ case Q_PRIVACY_SYSTEM:
+ if (privacy_system == NULL)
+ privacy_system = g_strdup(p);
+ break;
+ case Q_ENCRYPT:
+ if (p[0] == '1')
+ encrypt = TRUE;
+ break;
+ case Q_ENCRYPT_DATA:
+ if (encrypt_data == NULL)
+ encrypt_data = g_strdup(p);
break;
}
}
filepos = ftell(fp);
+ if (encrypt) {
+ MimeInfo *mimeinfo;
+
+ save_clear_text = (mailac != NULL && mailac->save_encrypted_as_clear_text);
+
+ fclose(fp);
+ fp = NULL;
+
+ mimeinfo = procmime_scan_queue_file(file);
+ if (!privacy_encrypt(privacy_system, mimeinfo, encrypt_data)
+ || (fp = my_tmpfile()) == NULL
+ || procmime_write_mimeinfo(mimeinfo, fp) < 0) {
+ if (fp)
+ fclose(fp);
+ procmime_mimeinfo_free_all(mimeinfo);
+ g_free(from);
+ g_free(smtpserver);
+ slist_free_strings(to_list);
+ g_slist_free(to_list);
+ slist_free_strings(newsgroup_list);
+ g_slist_free(newsgroup_list);
+ g_free(savecopyfolder);
+ g_free(replymessageid);
+ g_free(fwdmessageid);
+ g_free(privacy_system);
+ g_free(encrypt_data);
+ return -1;
+ }
+
+ rewind(fp);
+ if (!save_clear_text) {
+ gchar *content = NULL;
+ FILE *tmpfp = get_tmpfile_in_dir(get_mime_tmp_dir(), &tmp_enc_file);
+ if (tmpfp) {
+ fclose(tmpfp);
+
+ content = file_read_stream_to_str(fp);
+ rewind(fp);
+
+ str_write_to_file(content, tmp_enc_file);
+ g_free(content);
+ } else {
+ g_warning("couldn't get tempfile\n");
+ }
+ }
+
+ procmime_mimeinfo_free_all(mimeinfo);
+
+ filepos = 0;
+ }
+
if (to_list) {
debug_print("Sending message by mail\n");
if (!from) {
}
fseek(fp, filepos, SEEK_SET);
- if (newsgroup_list && (newsval == 0)) {
+ if (newsgroup_list && (mailval == 0)) {
Folder *folder;
gchar *tmp = NULL;
FILE *tmpfp;
g_free(tmp);
}
- slist_free_strings(to_list);
- g_slist_free(to_list);
- slist_free_strings(newsgroup_list);
- g_slist_free(newsgroup_list);
- g_free(from);
- g_free(smtpserver);
fclose(fp);
/* save message to outbox */
outbox = folder_find_item_from_identifier(savecopyfolder);
if (!outbox)
outbox = folder_get_default_outbox();
+
+ if (save_clear_text || tmp_enc_file == NULL) {
+ procmsg_save_to_outbox(outbox, file, TRUE);
+ } else {
+ procmsg_save_to_outbox(outbox, tmp_enc_file, FALSE);
+ }
+ }
- procmsg_save_to_outbox(outbox, file, TRUE);
+ if (tmp_enc_file != NULL) {
+ unlink(tmp_enc_file);
+ free(tmp_enc_file);
+ tmp_enc_file = NULL;
}
if (replymessageid != NULL || fwdmessageid != NULL) {
if (replymessageid != NULL) {
procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
- }
- else {
+ } else {
procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
}
g_strfreev(tokens);
}
+ g_free(from);
+ g_free(smtpserver);
+ slist_free_strings(to_list);
+ g_slist_free(to_list);
+ slist_free_strings(newsgroup_list);
+ g_slist_free(newsgroup_list);
g_free(savecopyfolder);
g_free(replymessageid);
g_free(fwdmessageid);
-
+ g_free(privacy_system);
+ g_free(encrypt_data);
+
return (newsval != 0 ? newsval : mailval);
}
FolderItem *item;
MsgInfoUpdate msginfo_update;
MsgPermFlags perm_flags_new, perm_flags_old;
+ MsgTmpFlags tmp_flags_old;
g_return_if_fail(msginfo != NULL);
item = msginfo->folder;
update_folder_msg_counts(item, msginfo, perm_flags_old);
+ }
+
+ /* Tmp flags handling */
+ tmp_flags_old = msginfo->flags.tmp_flags;
+ msginfo->flags.tmp_flags |= tmp_flags;
+
+ /* update notification */
+ if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) {
msginfo_update.msginfo = msginfo;
msginfo_update.flags = MSGINFO_UPDATE_FLAGS;
hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
}
-
- /* Tmp flags hanlding */
- msginfo->flags.tmp_flags |= tmp_flags;
}
void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
FolderItem *item;
MsgInfoUpdate msginfo_update;
MsgPermFlags perm_flags_new, perm_flags_old;
+ MsgTmpFlags tmp_flags_old;
g_return_if_fail(msginfo != NULL);
item = msginfo->folder;
}
/* Tmp flags hanlding */
+ tmp_flags_old = msginfo->flags.tmp_flags;
msginfo->flags.tmp_flags &= ~tmp_flags;
+
+ /* update notification */
+ if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) {
+ msginfo_update.msginfo = msginfo;
+ msginfo_update.flags = MSGINFO_UPDATE_FLAGS;
+ hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
+ folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
+ }
}
/*!
return FALSE;
}
+
+MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimeinfo)
+{
+ MsgInfo *tmp_msginfo = NULL;
+ MsgFlags flags = {0, 0};
+
+
+ if (!mimeinfo || mimeinfo->type != MIMETYPE_MESSAGE ||
+ g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
+ g_warning("procmsg_msginfo_new_from_mimeinfo(): unsuitable mimeinfo");
+ return NULL;
+ }
+
+ if (mimeinfo->content == MIMECONTENT_MEM) {
+ gchar *tmpfile = get_tmp_file();
+ str_write_to_file(mimeinfo->data.mem, tmpfile);
+ g_free(mimeinfo->data.mem);
+ mimeinfo->content == MIMECONTENT_FILE;
+ mimeinfo->data.filename = g_strdup(tmpfile);
+ g_free(tmpfile);
+ }
+
+ tmp_msginfo = procheader_parse_file(mimeinfo->data.filename,
+ flags, TRUE, FALSE);
+
+ if (tmp_msginfo != NULL) {
+ tmp_msginfo->folder = src_msginfo->folder;
+ tmp_msginfo->plaintext_file = g_strdup(mimeinfo->data.filename);
+ } else {
+ g_warning("procmsg_msginfo_new_from_mimeinfo(): Can't generate new msginfo");
+ }
+
+ return tmp_msginfo;
+}
projects / claws.git / blobdiff