summaryrefslogtreecommitdiff
authoralwin <alwin>2003-12-22 02:37:35 (UTC)
committer alwin <alwin>2003-12-22 02:37:35 (UTC)
commit9e7aafdb7c76d29fee742d53131a73dd60aded2b (patch) (unidiff)
treee98f9fe1233455f458738acbfd29bac78dd03342
parent7c016e1a75970cb7c28d70398ad20c708cdb452b (diff)
downloadopie-9e7aafdb7c76d29fee742d53131a73dd60aded2b.zip
opie-9e7aafdb7c76d29fee742d53131a73dd60aded2b.tar.gz
opie-9e7aafdb7c76d29fee742d53131a73dd60aded2b.tar.bz2
- storing mails send in outgoing (if queued) or sent (if sent) folder
TODO: flush queue, cleanup SMTP code, select smtp-account if more than one when flush the outgoing queue
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/composemail.cpp3
-rw-r--r--noncore/net/mail/libmailwrapper/mboxwrapper.cpp26
-rw-r--r--noncore/net/mail/libmailwrapper/mboxwrapper.h2
-rw-r--r--noncore/net/mail/libmailwrapper/smtpwrapper.cpp61
-rw-r--r--noncore/net/mail/libmailwrapper/smtpwrapper.h6
-rw-r--r--noncore/net/mail/mboxwrapper.cpp26
-rw-r--r--noncore/net/mail/mboxwrapper.h2
-rw-r--r--noncore/net/mail/smtpwrapper.cpp61
-rw-r--r--noncore/net/mail/smtpwrapper.h6
9 files changed, 162 insertions, 31 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index f680f5c..f532815 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -123,92 +123,93 @@ void ComposeMail::fillValues( int current )
123 replyLine->setText( smtp->getReply() ); 123 replyLine->setText( smtp->getReply() );
124 } 124 }
125 125
126 sigMultiLine->setText( smtp->getSignature() ); 126 sigMultiLine->setText( smtp->getSignature() );
127} 127}
128 128
129void ComposeMail::slotAdjustColumns() 129void ComposeMail::slotAdjustColumns()
130{ 130{
131 int currPage = tabWidget->currentPageIndex(); 131 int currPage = tabWidget->currentPageIndex();
132 132
133 tabWidget->showPage( attachTab ); 133 tabWidget->showPage( attachTab );
134 attList->setColumnWidth( 0, attList->visibleWidth() - 80 ); 134 attList->setColumnWidth( 0, attList->visibleWidth() - 80 );
135 attList->setColumnWidth( 1, 80 ); 135 attList->setColumnWidth( 1, 80 );
136 136
137 tabWidget->setCurrentPage( currPage ); 137 tabWidget->setCurrentPage( currPage );
138} 138}
139 139
140void ComposeMail::addAttachment() 140void ComposeMail::addAttachment()
141{ 141{
142 DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" ); 142 DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
143 if ( !lnk.name().isEmpty() ) { 143 if ( !lnk.name().isEmpty() ) {
144 Attachment *att = new Attachment( lnk ); 144 Attachment *att = new Attachment( lnk );
145 (void) new AttachViewItem( attList, att ); 145 (void) new AttachViewItem( attList, att );
146 } 146 }
147} 147}
148 148
149void ComposeMail::removeAttachment() 149void ComposeMail::removeAttachment()
150{ 150{
151 if ( !attList->currentItem() ) { 151 if ( !attList->currentItem() ) {
152 QMessageBox::information( this, tr( "Error" ), 152 QMessageBox::information( this, tr( "Error" ),
153 tr( "<p>Please select a File.</p>" ), 153 tr( "<p>Please select a File.</p>" ),
154 tr( "Ok" ) ); 154 tr( "Ok" ) );
155 } else { 155 } else {
156 attList->takeItem( attList->currentItem() ); 156 attList->takeItem( attList->currentItem() );
157 } 157 }
158} 158}
159 159
160void ComposeMail::accept() 160void ComposeMail::accept()
161{ 161{
162 if ( checkBoxLater->isChecked() ) { 162 if ( checkBoxLater->isChecked() ) {
163 qDebug( "Send later" ); 163 qDebug( "Send later" );
164 } 164 }
165 165
166 166
167 qDebug( "Sending Mail with " + 167 qDebug( "Sending Mail with " +
168 smtpAccounts.at( fromBox->currentItem() )->getAccountName() ); 168 smtpAccounts.at( fromBox->currentItem() )->getAccountName() );
169 Mail *mail = new Mail(); 169 Mail *mail = new Mail();
170 SMTPaccount *smtp = smtpAccounts.at( fromBox->currentItem() ); 170 SMTPaccount *smtp = smtpAccounts.at( fromBox->currentItem() );
171
171 mail->setMail( smtp->getMail() ); 172 mail->setMail( smtp->getMail() );
172 mail->setName( smtp->getName() ); 173 mail->setName( smtp->getName() );
173 174
174 if ( !toLine->text().isEmpty() ) { 175 if ( !toLine->text().isEmpty() ) {
175 mail->setTo( toLine->text() ); 176 mail->setTo( toLine->text() );
176 } else { 177 } else {
177 qDebug( "No Reciever spezified -> returning" ); 178 qDebug( "No Reciever spezified -> returning" );
178 return; 179 return;
179 } 180 }
180 181
181 mail->setCC( ccLine->text() ); 182 mail->setCC( ccLine->text() );
182 mail->setBCC( bccLine->text() ); 183 mail->setBCC( bccLine->text() );
183 mail->setReply( replyLine->text() ); 184 mail->setReply( replyLine->text() );
184 mail->setSubject( subjectLine->text() ); 185 mail->setSubject( subjectLine->text() );
185 QString txt = message->text(); 186 QString txt = message->text();
186 if ( !sigMultiLine->text().isEmpty() ) { 187 if ( !sigMultiLine->text().isEmpty() ) {
187 txt.append( "\n--\n" ); 188 txt.append( "\n--\n" );
188 txt.append( sigMultiLine->text() ); 189 txt.append( sigMultiLine->text() );
189 } 190 }
190 mail->setMessage( txt ); 191 mail->setMessage( txt );
191 AttachViewItem *it = (AttachViewItem *) attList->firstChild(); 192 AttachViewItem *it = (AttachViewItem *) attList->firstChild();
192 while ( it != NULL ) { 193 while ( it != NULL ) {
193 mail->addAttachment( it->getAttachment() ); 194 mail->addAttachment( it->getAttachment() );
194 it = (AttachViewItem *) it->itemBelow(); 195 it = (AttachViewItem *) it->itemBelow();
195 } 196 }
196 197
197 SMTPwrapper wrapper( settings ); 198 SMTPwrapper wrapper( settings );
198 wrapper.sendMail( *mail ); 199 wrapper.sendMail( *mail,checkBoxLater->isChecked() );
199 200
200 QDialog::accept(); 201 QDialog::accept();
201} 202}
202 203
203AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) 204AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
204 : QListViewItem( parent ) 205 : QListViewItem( parent )
205{ 206{
206 attachment = att; 207 attachment = att;
207 qDebug( att->getMimeType() ); 208 qDebug( att->getMimeType() );
208 setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? 209 setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
209 Resource::loadPixmap( "UnknownDocument-14" ) : 210 Resource::loadPixmap( "UnknownDocument-14" ) :
210 attachment->getDocLnk().pixmap() ); 211 attachment->getDocLnk().pixmap() );
211 setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); 212 setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
212 setText( 1, QString::number( att->getSize() ) ); 213 setText( 1, QString::number( att->getSize() ) );
213} 214}
214 215
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index 7581715..8117cef 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -1,118 +1,117 @@
1#include "mboxwrapper.h" 1#include "mboxwrapper.h"
2#include "mailtypes.h" 2#include "mailtypes.h"
3#include "mailwrapper.h" 3#include "mailwrapper.h"
4#include "libetpan/libetpan.h" 4#include <libetpan/libetpan.h>
5#include "libetpan/mailstorage.h" 5#include <libetpan/mailstorage.h>
6#include <qdir.h> 6#include <qdir.h>
7 7
8MBOXwrapper::MBOXwrapper(const QString & mbox_dir) 8MBOXwrapper::MBOXwrapper(const QString & mbox_dir)
9 : Genericwrapper(),MBOXPath(mbox_dir) 9 : Genericwrapper(),MBOXPath(mbox_dir)
10{ 10{
11 QDir dir(MBOXPath); 11 QDir dir(MBOXPath);
12 if (!dir.exists()) { 12 if (!dir.exists()) {
13 dir.mkdir(MBOXPath); 13 dir.mkdir(MBOXPath);
14 } 14 }
15} 15}
16 16
17MBOXwrapper::~MBOXwrapper() 17MBOXwrapper::~MBOXwrapper()
18{ 18{
19} 19}
20 20
21void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target ) 21void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
22{ 22{
23 mailstorage*storage = mailstorage_new(NULL); 23 mailstorage*storage = mailstorage_new(NULL);
24 QString p = MBOXPath+"/"; 24 QString p = MBOXPath+"/";
25 p+=mailbox; 25 p+=mailbox;
26 26
27 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0); 27 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
28 mailfolder*folder; 28 mailfolder*folder;
29 folder = mailfolder_new( storage,strdup(p.latin1()),NULL); 29 folder = mailfolder_new( storage,strdup(p.latin1()),NULL);
30 r = mailfolder_connect(folder); 30 r = mailfolder_connect(folder);
31 if (r != MAIL_NO_ERROR) { 31 if (r != MAIL_NO_ERROR) {
32 qDebug("Error initializing mbox"); 32 qDebug("Error initializing mbox");
33 mailfolder_free(folder); 33 mailfolder_free(folder);
34 mailstorage_free(storage); 34 mailstorage_free(storage);
35 return; 35 return;
36 } 36 }
37 mailmessage_list * env_list = 0; 37 mailmessage_list * env_list = 0;
38 r = mailsession_get_messages_list(folder->fld_session,&env_list); 38 r = mailsession_get_messages_list(folder->fld_session,&env_list);
39 if (r != MAIL_NO_ERROR) { 39 if (r != MAIL_NO_ERROR) {
40 qDebug("Error message list"); 40 qDebug("Error message list");
41 mailfolder_free(folder); 41 mailfolder_free(folder);
42 mailstorage_free(storage); 42 mailstorage_free(storage);
43 return; 43 return;
44 } 44 }
45 r = mailsession_get_envelopes_list(folder->fld_session, env_list); 45 r = mailsession_get_envelopes_list(folder->fld_session, env_list);
46 if (r != MAIL_NO_ERROR) { 46 if (r != MAIL_NO_ERROR) {
47 qDebug("Error filling message list"); 47 qDebug("Error filling message list");
48 if (env_list) { 48 if (env_list) {
49 mailmessage_list_free(env_list); 49 mailmessage_list_free(env_list);
50 } 50 }
51 mailfolder_free(folder); 51 mailfolder_free(folder);
52 mailstorage_free(storage); 52 mailstorage_free(storage);
53 return; 53 return;
54 } 54 }
55 mailimf_references * refs; 55 mailimf_references * refs;
56 56
57 for(int i = 0 ; i < carray_count(env_list->msg_tab) ; ++i) { 57 for(int i = 0 ; i < carray_count(env_list->msg_tab) ; ++i) {
58 mailmessage * msg; 58 mailmessage * msg;
59 QBitArray mFlags(7); 59 QBitArray mFlags(7);
60 msg = (mailmessage*)carray_get(env_list->msg_tab, i); 60 msg = (mailmessage*)carray_get(env_list->msg_tab, i);
61 if (msg->msg_fields == NULL) { 61 if (msg->msg_fields == NULL) {
62 qDebug("could not fetch envelope of message %i", i); 62 qDebug("could not fetch envelope of message %i", i);
63 continue; 63 continue;
64 } 64 }
65 RecMail * mail = new RecMail(); 65 RecMail * mail = new RecMail();
66 mail->setWrapper(this); 66 mail->setWrapper(this);
67 mail_flags * flag_result = 0; 67 mail_flags * flag_result = 0;
68 r = mailmessage_get_flags(msg,&flag_result); 68 r = mailmessage_get_flags(msg,&flag_result);
69 if (r == MAIL_ERROR_NOT_IMPLEMENTED) { 69 if (r == MAIL_ERROR_NOT_IMPLEMENTED) {
70 qDebug("flag fetching not implemented");
71 mFlags.setBit(FLAG_SEEN); 70 mFlags.setBit(FLAG_SEEN);
72 } 71 }
73 mailimf_single_fields single_fields; 72 mailimf_single_fields single_fields;
74 mailimf_single_fields_init(&single_fields, msg->msg_fields); 73 mailimf_single_fields_init(&single_fields, msg->msg_fields);
75 mail->setMsgsize(msg->msg_size); 74 mail->setMsgsize(msg->msg_size);
76 mail->setFlags(mFlags); 75 mail->setFlags(mFlags);
77 mail->setMbox(mailbox); 76 mail->setMbox(mailbox);
78 mail->setNumber(i+1); 77 mail->setNumber(i+1);
79 if (single_fields.fld_subject) 78 if (single_fields.fld_subject)
80 mail->setSubject( convert_String(single_fields.fld_subject->sbj_value)); 79 mail->setSubject( convert_String(single_fields.fld_subject->sbj_value));
81 if (single_fields.fld_from) 80 if (single_fields.fld_from)
82 mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list)); 81 mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list));
83 if (single_fields.fld_to) 82 if (single_fields.fld_to)
84 mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) ); 83 mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) );
85 if (single_fields.fld_cc) 84 if (single_fields.fld_cc)
86 mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); 85 mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) );
87 if (single_fields.fld_bcc) 86 if (single_fields.fld_bcc)
88 mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); 87 mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) );
89 if (single_fields.fld_orig_date) 88 if (single_fields.fld_orig_date)
90 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); 89 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) );
91 if (single_fields.fld_message_id->mid_value) 90 if (single_fields.fld_message_id->mid_value)
92 mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); 91 mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
93 refs = single_fields.fld_references; 92 refs = single_fields.fld_references;
94 if (refs && refs->mid_list && clist_count(refs->mid_list)) { 93 if (refs && refs->mid_list && clist_count(refs->mid_list)) {
95 char * text = (char*)refs->mid_list->first->data; 94 char * text = (char*)refs->mid_list->first->data;
96 mail->setReplyto(QString(text)); 95 mail->setReplyto(QString(text));
97 } 96 }
98 97
99 target.append(mail); 98 target.append(mail);
100 } 99 }
101 if (env_list) { 100 if (env_list) {
102 mailmessage_list_free(env_list); 101 mailmessage_list_free(env_list);
103 } 102 }
104 mailfolder_disconnect(folder); 103 mailfolder_disconnect(folder);
105 mailfolder_free(folder); 104 mailfolder_free(folder);
106 mailstorage_free(storage); 105 mailstorage_free(storage);
107} 106}
108 107
109QList<Folder>* MBOXwrapper::listFolders() 108QList<Folder>* MBOXwrapper::listFolders()
110{ 109{
111 QList<Folder> * folders = new QList<Folder>(); 110 QList<Folder> * folders = new QList<Folder>();
112 folders->setAutoDelete( false ); 111 folders->setAutoDelete( false );
113 QDir dir(MBOXPath); 112 QDir dir(MBOXPath);
114 if (!dir.exists()) return folders; 113 if (!dir.exists()) return folders;
115 dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable); 114 dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable);
116 QStringList entries = dir.entryList(); 115 QStringList entries = dir.entryList();
117 QStringList::ConstIterator it = entries.begin(); 116 QStringList::ConstIterator it = entries.begin();
118 for (;it!=entries.end();++it) { 117 for (;it!=entries.end();++it) {
@@ -152,48 +151,69 @@ void MBOXwrapper::answeredMail(const RecMail&)
152 151
153RecBody MBOXwrapper::fetchBody( const RecMail &mail ) 152RecBody MBOXwrapper::fetchBody( const RecMail &mail )
154{ 153{
155 RecBody body; 154 RecBody body;
156 mailstorage*storage = mailstorage_new(NULL); 155 mailstorage*storage = mailstorage_new(NULL);
157 QString p = MBOXPath+"/"; 156 QString p = MBOXPath+"/";
158 p+=mail.getMbox(); 157 p+=mail.getMbox();
159 mailmessage * msg; 158 mailmessage * msg;
160 char*data=0; 159 char*data=0;
161 size_t size; 160 size_t size;
162 161
163 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0); 162 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
164 mailfolder*folder; 163 mailfolder*folder;
165 folder = mailfolder_new( storage,strdup(p.latin1()),NULL); 164 folder = mailfolder_new( storage,strdup(p.latin1()),NULL);
166 r = mailfolder_connect(folder); 165 r = mailfolder_connect(folder);
167 if (r != MAIL_NO_ERROR) { 166 if (r != MAIL_NO_ERROR) {
168 qDebug("Error initializing mbox"); 167 qDebug("Error initializing mbox");
169 mailfolder_free(folder); 168 mailfolder_free(folder);
170 mailstorage_free(storage); 169 mailstorage_free(storage);
171 return body; 170 return body;
172 } 171 }
173 r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg); 172 r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg);
174 if (r != MAIL_NO_ERROR) { 173 if (r != MAIL_NO_ERROR) {
175 qDebug("Error fetching mail %i",mail.getNumber()); 174 qDebug("Error fetching mail %i",mail.getNumber());
176 mailfolder_free(folder); 175 mailfolder_free(folder);
177 mailstorage_free(storage); 176 mailstorage_free(storage);
178 return body; 177 return body;
179 } 178 }
180 r = mailmessage_fetch(msg,&data,&size); 179 r = mailmessage_fetch(msg,&data,&size);
181 if (r != MAIL_NO_ERROR) { 180 if (r != MAIL_NO_ERROR) {
182 qDebug("Error fetching mail %i",mail.getNumber()); 181 qDebug("Error fetching mail %i",mail.getNumber());
183 mailfolder_free(folder); 182 mailfolder_free(folder);
184 mailstorage_free(storage); 183 mailstorage_free(storage);
185 mailmessage_free(msg); 184 mailmessage_free(msg);
186 return body; 185 return body;
187 } 186 }
188 body = parseMail(msg); 187 body = parseMail(msg);
189 mailmessage_fetch_result_free(msg,data); 188 mailmessage_fetch_result_free(msg,data);
190 mailfolder_free(folder); 189 mailfolder_free(folder);
191 mailstorage_free(storage); 190 mailstorage_free(storage);
192 191
193 return body; 192 return body;
194} 193}
195 194
196void MBOXwrapper::mbox_progress( size_t current, size_t maximum ) 195void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
197{ 196{
198 qDebug("MBOX %i von %i",current,maximum); 197 qDebug("MBOX %i von %i",current,maximum);
199} 198}
199
200void MBOXwrapper::createFolder(const QString&)
201{
202}
203
204void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folder)
205{
206 QString p = MBOXPath+"/";
207 p+=folder;
208 mailmbox_folder*f = 0;
209 int r = mailmbox_init(p.latin1(),0,1,0,&f);
210 if (r != MAIL_NO_ERROR) {
211 qDebug("Error init folder");
212 return;
213 }
214 r = mailmbox_append_message(f,msg,length);
215 if (r != MAIL_NO_ERROR) {
216 qDebug("Error writing message folder");
217 }
218 mailmbox_done(f);
219}
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.h b/noncore/net/mail/libmailwrapper/mboxwrapper.h
index 779dbc8..1bbaf79 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.h
@@ -1,30 +1,32 @@
1#ifndef __MBOX_WRAPPER_H 1#ifndef __MBOX_WRAPPER_H
2#define __MBOX_WRAPPER_H 2#define __MBOX_WRAPPER_H
3 3
4#include "genericwrapper.h" 4#include "genericwrapper.h"
5#include <qstring.h> 5#include <qstring.h>
6 6
7class RecMail; 7class RecMail;
8class RecBody; 8class RecBody;
9 9
10class MBOXwrapper : public Genericwrapper 10class MBOXwrapper : public Genericwrapper
11{ 11{
12 Q_OBJECT 12 Q_OBJECT
13public: 13public:
14 MBOXwrapper(const QString & dir); 14 MBOXwrapper(const QString & dir);
15 virtual ~MBOXwrapper(); 15 virtual ~MBOXwrapper();
16 16
17 virtual void listMessages(const QString & mailbox, QList<RecMail> &target ); 17 virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
18 virtual QList<Folder>* listFolders(); 18 virtual QList<Folder>* listFolders();
19 19
20 virtual void deleteMail(const RecMail&mail); 20 virtual void deleteMail(const RecMail&mail);
21 virtual void answeredMail(const RecMail&mail); 21 virtual void answeredMail(const RecMail&mail);
22 virtual void createFolder(const QString&aFolder);
23 virtual void storeMessage(const char*msg,size_t length, const QString&folder);
22 24
23 virtual RecBody fetchBody( const RecMail &mail ); 25 virtual RecBody fetchBody( const RecMail &mail );
24 static void mbox_progress( size_t current, size_t maximum ); 26 static void mbox_progress( size_t current, size_t maximum );
25 27
26protected: 28protected:
27 QString MBOXPath; 29 QString MBOXPath;
28}; 30};
29 31
30#endif 32#endif
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 162b1b9..a6a46ba 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,64 +1,67 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <sys/stat.h> 2#include <sys/stat.h>
3#include <sys/types.h> 3#include <sys/types.h>
4#include <unistd.h> 4#include <unistd.h>
5#include <fcntl.h> 5#include <fcntl.h>
6#include <string.h> 6#include <string.h>
7#include <qdir.h> 7#include <qdir.h>
8 8
9#include <libetpan/mailmime.h> 9#include <libetpan/libetpan.h>
10#if 0
10#include <libetpan/mailimf.h> 11#include <libetpan/mailimf.h>
11#include <libetpan/mailsmtp.h> 12#include <libetpan/mailsmtp.h>
12#include <libetpan/mailstorage.h> 13#include <libetpan/mailstorage.h>
13#include <libetpan/maildriver.h> 14#include <libetpan/maildriver.h>
15#endif
14 16
15#include "smtpwrapper.h" 17#include "smtpwrapper.h"
16#include "mailwrapper.h" 18#include "mailwrapper.h"
19#include "mboxwrapper.h"
17#include "logindialog.h" 20#include "logindialog.h"
18#include "defines.h" 21#include "defines.h"
19 22
20SMTPwrapper::SMTPwrapper( Settings *s ) 23SMTPwrapper::SMTPwrapper( Settings *s )
21 : QObject() 24 : QObject()
22{ 25{
23 settings = s; 26 settings = s;
24} 27}
25 28
26QString SMTPwrapper::mailsmtpError( int errnum ) 29QString SMTPwrapper::mailsmtpError( int errnum )
27{ 30{
28 switch ( errnum ) { 31 switch ( errnum ) {
29 case MAILSMTP_NO_ERROR: 32 case MAILSMTP_NO_ERROR:
30 return tr( "No error" ); 33 return tr( "No error" );
31 case MAILSMTP_ERROR_UNEXPECTED_CODE: 34 case MAILSMTP_ERROR_UNEXPECTED_CODE:
32 return tr( "Unexpected error code" ); 35 return tr( "Unexpected error code" );
33 case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE: 36 case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
34 return tr( "Service not available" ); 37 return tr( "Service not available" );
35 case MAILSMTP_ERROR_STREAM: 38 case MAILSMTP_ERROR_STREAM:
36 return tr( "Stream error" ); 39 return tr( "Stream error" );
37 case MAILSMTP_ERROR_HOSTNAME: 40 case MAILSMTP_ERROR_HOSTNAME:
38 return tr( "gethostname() failed" ); 41 return tr( "gethostname() failed" );
39 case MAILSMTP_ERROR_NOT_IMPLEMENTED: 42 case MAILSMTP_ERROR_NOT_IMPLEMENTED:
40 return tr( "Not implemented" ); 43 return tr( "Not implemented" );
41 case MAILSMTP_ERROR_ACTION_NOT_TAKEN: 44 case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
42 return tr( "Error, action not taken" ); 45 return tr( "Error, action not taken" );
43 case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION: 46 case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
44 return tr( "Data exceeds storage allocation" ); 47 return tr( "Data exceeds storage allocation" );
45 case MAILSMTP_ERROR_IN_PROCESSING: 48 case MAILSMTP_ERROR_IN_PROCESSING:
46 return tr( "Error in processing" ); 49 return tr( "Error in processing" );
47 // case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE: 50 // case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
48 // return tr( "Insufficient system storage" ); 51 // return tr( "Insufficient system storage" );
49 case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE: 52 case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
50 return tr( "Mailbox unavailable" ); 53 return tr( "Mailbox unavailable" );
51 case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED: 54 case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
52 return tr( "Mailbox name not allowed" ); 55 return tr( "Mailbox name not allowed" );
53 case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND: 56 case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
54 return tr( "Bad command sequence" ); 57 return tr( "Bad command sequence" );
55 case MAILSMTP_ERROR_USER_NOT_LOCAL: 58 case MAILSMTP_ERROR_USER_NOT_LOCAL:
56 return tr( "User not local" ); 59 return tr( "User not local" );
57 case MAILSMTP_ERROR_TRANSACTION_FAILED: 60 case MAILSMTP_ERROR_TRANSACTION_FAILED:
58 return tr( "Transaction failed" ); 61 return tr( "Transaction failed" );
59 case MAILSMTP_ERROR_MEMORY: 62 case MAILSMTP_ERROR_MEMORY:
60 return tr( "Memory error" ); 63 return tr( "Memory error" );
61 case MAILSMTP_ERROR_CONNECTION_REFUSED: 64 case MAILSMTP_ERROR_CONNECTION_REFUSED:
62 return tr( "Connection refused" ); 65 return tr( "Connection refused" );
63 default: 66 default:
64 return tr( "Unknown error code" ); 67 return tr( "Unknown error code" );
@@ -420,185 +423,223 @@ SMTPaccount *SMTPwrapper::getAccount(const QString&from )
420 qDebug( "SMTPaccount found for" ); 423 qDebug( "SMTPaccount found for" );
421 qDebug( from ); 424 qDebug( from );
422 return smtp; 425 return smtp;
423 } 426 }
424 } 427 }
425 } 428 }
426 429
427 return NULL; 430 return NULL;
428} 431}
429 432
430QString SMTPwrapper::getTmpFile() { 433QString SMTPwrapper::getTmpFile() {
431 int num = 0; 434 int num = 0;
432 QString unique; 435 QString unique;
433 436
434 QDir dir( "/tmp" ); 437 QDir dir( "/tmp" );
435 QStringList::Iterator it; 438 QStringList::Iterator it;
436 439
437 QStringList list = dir.entryList( "opiemail-tmp-*" ); 440 QStringList list = dir.entryList( "opiemail-tmp-*" );
438 do { 441 do {
439 unique.setNum( num++ ); 442 unique.setNum( num++ );
440 } while ( list.contains( "opiemail-tmp-" + unique ) > 0 ); 443 } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
441 444
442 return "/tmp/opiemail-tmp-" + unique; 445 return "/tmp/opiemail-tmp-" + unique;
443} 446}
444 447
445void SMTPwrapper::writeToFile(const QString&file, mailmime *mail ) 448void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
446{ 449{
447 FILE *f; 450 FILE *f;
448 int err, col = 0; 451 int err, col = 0;
449 452
450 f = fopen( file.latin1(), "w" ); 453 f = fopen( file.latin1(), "w" );
451 if ( f == NULL ) { 454 if ( f == NULL ) {
452 qDebug( "writeToFile: error opening file" ); 455 qDebug( "writeToFile: error opening file" );
453 return; 456 return;
454 } 457 }
455 458
456 err = mailmime_write( f, &col, mail ); 459 err = mailmime_write( f, &col, mail );
457 if ( err != MAILIMF_NO_ERROR ) { 460 if ( err != MAILIMF_NO_ERROR ) {
458 fclose( f ); 461 fclose( f );
459 qDebug( "writeToFile: error writing mailmime" ); 462 qDebug( "writeToFile: error writing mailmime" );
460 return; 463 return;
461 } 464 }
462 465
463 fclose( f ); 466 fclose( f );
464} 467}
465 468
466void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size ) 469void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
467{ 470{
471
472 QFile msg_cache(file);
473 QString msg = "";
474 msg_cache.open(IO_ReadOnly);
475 char*message = new char[4096];
476 memset(message,0,4096);
477 while (msg_cache.readBlock(message,4095)>0) {
478 msg+=message;
479 memset(message,0,4096);
480 }
481 delete message;
482 *data = (char*)malloc(msg.length()+1*sizeof(char));
483 memset(*data,0,msg.length()+1);
484 memcpy(*data,msg.ascii(),msg.length());
485 *size=msg.length();
486
487#if 0
468 char *buf; 488 char *buf;
469 struct stat st; 489 struct stat st;
470 int fd, count = 0, total = 0; 490 int fd, count = 0, total = 0;
471 491
472 fd = open( file.latin1(), O_RDONLY, 0 ); 492 fd = open( file.latin1(), O_RDONLY, 0 );
473 if ( fd == -1 ) return; 493 if ( fd == -1 ) return;
474 494
475 if ( fstat( fd, &st ) != 0 ) goto err_close; 495 if ( fstat( fd, &st ) != 0 ) goto err_close;
476 if ( !st.st_size ) goto err_close; 496 if ( !st.st_size ) goto err_close;
477 497
478 buf = (char *) malloc( st.st_size ); 498 buf = (char *) malloc( st.st_size );
479 if ( !buf ) goto err_close; 499 if ( !buf ) goto err_close;
480 500
481 while ( ( total < st.st_size ) && ( count >= 0 ) ) { 501 while ( ( total < st.st_size ) && ( count >= 0 ) ) {
482 count = read( fd, buf + total, st.st_size - total ); 502 count = read( fd, buf + total, st.st_size - total );
483 total += count; 503 total += count;
484 } 504 }
485 if ( count < 0 ) goto err_free; 505 if ( count < 0 ) goto err_free;
486 506
487 *data = buf; 507 *data = buf;
488 *size = st.st_size; 508 *size = st.st_size;
489 509
490 close( fd ); 510 close( fd );
491 511
492 return; // Success :) 512 return; // Success :)
493 513
494err_free: 514err_free:
495 free( buf ); 515 free( buf );
496err_close: 516err_close:
497 close( fd ); 517 close( fd );
518#endif
498} 519}
499 520
500void SMTPwrapper::progress( size_t current, size_t maximum ) 521void SMTPwrapper::progress( size_t current, size_t maximum )
501{ 522{
502 qDebug( "Current: %i of %i", current, maximum ); 523 qDebug( "Current: %i of %i", current, maximum );
503} 524}
504 525
505void SMTPwrapper::smtpSend( mailmime *mail ) 526void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
527{
528 if (!mail) return;
529 QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
530 MBOXwrapper*wrap = new MBOXwrapper(localfolders);
531 wrap->storeMessage(mail,length,box);
532 delete wrap;
533}
534
535void SMTPwrapper::smtpSend( mailmime *mail,bool later )
506{ 536{
507 mailsmtp *session; 537 mailsmtp *session;
508 clist *rcpts; 538 clist *rcpts;
509 char *from, *data, *server, *user = NULL, *pass = NULL; 539 char *from, *data, *server, *user = NULL, *pass = NULL;
510 size_t size; 540 size_t size;
511 int err; 541 int err;
512 bool ssl; 542 bool ssl;
513 uint16_t port; 543 uint16_t port;
514 544
515 545
516 from = getFrom( mail ); 546 from = getFrom( mail );
517 SMTPaccount *smtp = getAccount( from ); 547 SMTPaccount *smtp = getAccount( from );
518 if ( smtp == NULL ) { 548 if ( smtp == NULL ) {
519 free(from); 549 free(from);
520 return; 550 return;
521 } 551 }
522 server = strdup( smtp->getServer().latin1() );
523 ssl = smtp->getSSL();
524 port = smtp->getPort().toUInt();
525 rcpts = createRcptList( mail->mm_data.mm_message.mm_fields ); 552 rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
526 553
527 QString file = getTmpFile(); 554 QString file = getTmpFile();
528 writeToFile( file, mail ); 555 writeToFile( file, mail );
556
529 readFromFile( file, &data, &size ); 557 readFromFile( file, &data, &size );
530 QFile f( file ); 558 QFile f( file );
531 f.remove(); 559 f.remove();
560
561 storeMail(data,size,(later?"Outgoing":"Sent"));
532 562
563 if (later) {
564 smtp_address_list_free( rcpts );
565 if (data) free( data );
566 if (from) free(from);
567 return;
568 }
569 server = strdup( smtp->getServer().latin1() );
570 ssl = smtp->getSSL();
571 port = smtp->getPort().toUInt();
572
533 session = mailsmtp_new( 20, &progress ); 573 session = mailsmtp_new( 20, &progress );
534 if ( session == NULL ) goto free_mem; 574 if ( session == NULL ) goto free_mem;
535 575
536 qDebug( "Servername %s at port %i", server, port ); 576 qDebug( "Servername %s at port %i", server, port );
537 if ( ssl ) { 577 if ( ssl ) {
538 qDebug( "SSL session" ); 578 qDebug( "SSL session" );
539 err = mailsmtp_ssl_connect( session, server, port ); 579 err = mailsmtp_ssl_connect( session, server, port );
540 } else { 580 } else {
541 qDebug( "No SSL session" ); 581 qDebug( "No SSL session" );
542 err = mailsmtp_socket_connect( session, server, port ); 582 err = mailsmtp_socket_connect( session, server, port );
543 } 583 }
544 if ( err != MAILSMTP_NO_ERROR ) goto free_mem_session; 584 if ( err != MAILSMTP_NO_ERROR ) goto free_mem_session;
545 585
546 err = mailsmtp_init( session ); 586 err = mailsmtp_init( session );
547 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session; 587 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
548 588
549 qDebug( "INIT OK" ); 589 qDebug( "INIT OK" );
550 590
551 if ( smtp->getLogin() ) { 591 if ( smtp->getLogin() ) {
552 if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) { 592 if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
553 // get'em 593 // get'em
554 LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true ); 594 LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
555 login.show(); 595 login.show();
556 if ( QDialog::Accepted == login.exec() ) { 596 if ( QDialog::Accepted == login.exec() ) {
557 // ok 597 // ok
558 user = strdup( login.getUser().latin1() ); 598 user = strdup( login.getUser().latin1() );
559 pass = strdup( login.getPassword().latin1() ); 599 pass = strdup( login.getPassword().latin1() );
560 } else { 600 } else {
561 goto free_con_session; 601 goto free_con_session;
562 } 602 }
563 } else { 603 } else {
564 user = strdup( smtp->getUser().latin1() ); 604 user = strdup( smtp->getUser().latin1() );
565 pass = strdup( smtp->getPassword().latin1() ); 605 pass = strdup( smtp->getPassword().latin1() );
566 } 606 }
567 qDebug( "session->auth: %i", session->auth); 607 qDebug( "session->auth: %i", session->auth);
568 err = mailsmtp_auth( session, user, pass ); 608 err = mailsmtp_auth( session, user, pass );
569 if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok"); 609 if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
570 qDebug( "Done auth!" ); 610 qDebug( "Done auth!" );
571 } 611 }
572 612
573 err = mailsmtp_send( session, from, rcpts, data, size ); 613 err = mailsmtp_send( session, from, rcpts, data, size );
574 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session; 614 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
575 615
576 qDebug( "Mail sent." ); 616 qDebug( "Mail sent." );
577 617
578free_con_session: 618free_con_session:
579 mailsmtp_quit( session ); 619 mailsmtp_quit( session );
580free_mem_session: 620free_mem_session:
581 mailsmtp_free( session ); 621 mailsmtp_free( session );
582free_mem: 622free_mem:
583 smtp_address_list_free( rcpts ); 623 smtp_address_list_free( rcpts );
584 free( data ); 624 if (data) free( data );
585 free( server ); 625 if (from) free(from);
626 if (server) free( server );
586 if ( smtp->getLogin() ) { 627 if ( smtp->getLogin() ) {
587 free( user ); 628 free( user );
588 free( pass ); 629 free( pass );
589 } 630 }
590 free( from ); 631 free( from );
591} 632}
592 633
593void SMTPwrapper::sendMail(const Mail&mail ) 634void SMTPwrapper::sendMail(const Mail&mail,bool later )
594{ 635{
595 mailmime *mimeMail; 636 mailmime * mimeMail;
596 637
597 mimeMail = createMimeMail(mail ); 638 mimeMail = createMimeMail(mail );
598 if ( mimeMail == NULL ) { 639 if ( mimeMail == NULL ) {
599 qDebug( "sendMail: error creating mime mail" ); 640 qDebug( "sendMail: error creating mime mail" );
600 } else { 641 } else {
601 smtpSend( mimeMail ); 642 smtpSend( mimeMail,later );
602 mailmime_free( mimeMail ); 643 mailmime_free( mimeMail );
603 } 644 }
604} 645}
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 8fdb07d..41e9a8c 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -1,53 +1,55 @@
1#ifndef SMTPwrapper_H 1#ifndef SMTPwrapper_H
2#define SMTPwrapper_H 2#define SMTPwrapper_H
3 3
4#include <qpe/applnk.h> 4#include <qpe/applnk.h>
5 5
6#include <qbitarray.h> 6#include <qbitarray.h>
7#include <qdatetime.h> 7#include <qdatetime.h>
8#include <libetpan/clist.h> 8#include <libetpan/clist.h>
9 9
10#include "settings.h" 10#include "settings.h"
11 11
12class Mail; 12class Mail;
13class Attachment; 13class Attachment;
14struct mailimf_fields; 14struct mailimf_fields;
15struct mailimf_field; 15struct mailimf_field;
16struct mailimf_mailbox; 16struct mailimf_mailbox;
17struct mailmime; 17struct mailmime;
18struct mailimf_address_list; 18struct mailimf_address_list;
19 19
20class SMTPwrapper : public QObject 20class SMTPwrapper : public QObject
21{ 21{
22 Q_OBJECT 22 Q_OBJECT
23 23
24public: 24public:
25 SMTPwrapper( Settings *s ); 25 SMTPwrapper( Settings *s );
26 virtual ~SMTPwrapper(){} 26 virtual ~SMTPwrapper(){}
27 void sendMail(const Mail& mail ); 27 void sendMail(const Mail& mail,bool later=false );
28 28
29protected: 29protected:
30 mailimf_mailbox *newMailbox(const QString&name,const QString&mail ); 30 mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
31 mailimf_fields *createImfFields(const Mail &mail ); 31 mailimf_fields *createImfFields(const Mail &mail );
32 mailmime *createMimeMail(const Mail&mail ); 32 mailmime *createMimeMail(const Mail&mail );
33 33
34 mailimf_address_list *parseAddresses(const QString&addr ); 34 mailimf_address_list *parseAddresses(const QString&addr );
35 void addFileParts( mailmime *message,const QList<Attachment>&files ); 35 void addFileParts( mailmime *message,const QList<Attachment>&files );
36 mailmime *buildTxtPart(const QString&str ); 36 mailmime *buildTxtPart(const QString&str );
37 mailmime *buildFilePart(const QString&filename,const QString&mimetype ); 37 mailmime *buildFilePart(const QString&filename,const QString&mimetype );
38 void smtpSend( mailmime *mail ); 38 void smtpSend( mailmime *mail,bool later );
39 mailimf_field *getField( mailimf_fields *fields, int type ); 39 mailimf_field *getField( mailimf_fields *fields, int type );
40 clist *createRcptList( mailimf_fields *fields ); 40 clist *createRcptList( mailimf_fields *fields );
41 char *getFrom( mailmime *mail ); 41 char *getFrom( mailmime *mail );
42 SMTPaccount *getAccount(const QString&from ); 42 SMTPaccount *getAccount(const QString&from );
43 void writeToFile(const QString&file, mailmime *mail ); 43 void writeToFile(const QString&file, mailmime *mail );
44 void readFromFile(const QString&file, char **data, size_t *size ); 44 void readFromFile(const QString&file, char **data, size_t *size );
45 void storeMail(char*mail, size_t length, const QString&box);
45 46
46 static QString mailsmtpError( int err ); 47 static QString mailsmtpError( int err );
47 static QString getTmpFile(); 48 static QString getTmpFile();
48 static void progress( size_t current, size_t maximum ); 49 static void progress( size_t current, size_t maximum );
49 static void addRcpts( clist *list, mailimf_address_list *addr_list ); 50 static void addRcpts( clist *list, mailimf_address_list *addr_list );
51 void storeMail(mailmime*mail, const QString&box);
50 Settings *settings; 52 Settings *settings;
51}; 53};
52 54
53#endif 55#endif
diff --git a/noncore/net/mail/mboxwrapper.cpp b/noncore/net/mail/mboxwrapper.cpp
index 7581715..8117cef 100644
--- a/noncore/net/mail/mboxwrapper.cpp
+++ b/noncore/net/mail/mboxwrapper.cpp
@@ -1,118 +1,117 @@
1#include "mboxwrapper.h" 1#include "mboxwrapper.h"
2#include "mailtypes.h" 2#include "mailtypes.h"
3#include "mailwrapper.h" 3#include "mailwrapper.h"
4#include "libetpan/libetpan.h" 4#include <libetpan/libetpan.h>
5#include "libetpan/mailstorage.h" 5#include <libetpan/mailstorage.h>
6#include <qdir.h> 6#include <qdir.h>
7 7
8MBOXwrapper::MBOXwrapper(const QString & mbox_dir) 8MBOXwrapper::MBOXwrapper(const QString & mbox_dir)
9 : Genericwrapper(),MBOXPath(mbox_dir) 9 : Genericwrapper(),MBOXPath(mbox_dir)
10{ 10{
11 QDir dir(MBOXPath); 11 QDir dir(MBOXPath);
12 if (!dir.exists()) { 12 if (!dir.exists()) {
13 dir.mkdir(MBOXPath); 13 dir.mkdir(MBOXPath);
14 } 14 }
15} 15}
16 16
17MBOXwrapper::~MBOXwrapper() 17MBOXwrapper::~MBOXwrapper()
18{ 18{
19} 19}
20 20
21void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target ) 21void MBOXwrapper::listMessages(const QString & mailbox, QList<RecMail> &target )
22{ 22{
23 mailstorage*storage = mailstorage_new(NULL); 23 mailstorage*storage = mailstorage_new(NULL);
24 QString p = MBOXPath+"/"; 24 QString p = MBOXPath+"/";
25 p+=mailbox; 25 p+=mailbox;
26 26
27 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0); 27 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
28 mailfolder*folder; 28 mailfolder*folder;
29 folder = mailfolder_new( storage,strdup(p.latin1()),NULL); 29 folder = mailfolder_new( storage,strdup(p.latin1()),NULL);
30 r = mailfolder_connect(folder); 30 r = mailfolder_connect(folder);
31 if (r != MAIL_NO_ERROR) { 31 if (r != MAIL_NO_ERROR) {
32 qDebug("Error initializing mbox"); 32 qDebug("Error initializing mbox");
33 mailfolder_free(folder); 33 mailfolder_free(folder);
34 mailstorage_free(storage); 34 mailstorage_free(storage);
35 return; 35 return;
36 } 36 }
37 mailmessage_list * env_list = 0; 37 mailmessage_list * env_list = 0;
38 r = mailsession_get_messages_list(folder->fld_session,&env_list); 38 r = mailsession_get_messages_list(folder->fld_session,&env_list);
39 if (r != MAIL_NO_ERROR) { 39 if (r != MAIL_NO_ERROR) {
40 qDebug("Error message list"); 40 qDebug("Error message list");
41 mailfolder_free(folder); 41 mailfolder_free(folder);
42 mailstorage_free(storage); 42 mailstorage_free(storage);
43 return; 43 return;
44 } 44 }
45 r = mailsession_get_envelopes_list(folder->fld_session, env_list); 45 r = mailsession_get_envelopes_list(folder->fld_session, env_list);
46 if (r != MAIL_NO_ERROR) { 46 if (r != MAIL_NO_ERROR) {
47 qDebug("Error filling message list"); 47 qDebug("Error filling message list");
48 if (env_list) { 48 if (env_list) {
49 mailmessage_list_free(env_list); 49 mailmessage_list_free(env_list);
50 } 50 }
51 mailfolder_free(folder); 51 mailfolder_free(folder);
52 mailstorage_free(storage); 52 mailstorage_free(storage);
53 return; 53 return;
54 } 54 }
55 mailimf_references * refs; 55 mailimf_references * refs;
56 56
57 for(int i = 0 ; i < carray_count(env_list->msg_tab) ; ++i) { 57 for(int i = 0 ; i < carray_count(env_list->msg_tab) ; ++i) {
58 mailmessage * msg; 58 mailmessage * msg;
59 QBitArray mFlags(7); 59 QBitArray mFlags(7);
60 msg = (mailmessage*)carray_get(env_list->msg_tab, i); 60 msg = (mailmessage*)carray_get(env_list->msg_tab, i);
61 if (msg->msg_fields == NULL) { 61 if (msg->msg_fields == NULL) {
62 qDebug("could not fetch envelope of message %i", i); 62 qDebug("could not fetch envelope of message %i", i);
63 continue; 63 continue;
64 } 64 }
65 RecMail * mail = new RecMail(); 65 RecMail * mail = new RecMail();
66 mail->setWrapper(this); 66 mail->setWrapper(this);
67 mail_flags * flag_result = 0; 67 mail_flags * flag_result = 0;
68 r = mailmessage_get_flags(msg,&flag_result); 68 r = mailmessage_get_flags(msg,&flag_result);
69 if (r == MAIL_ERROR_NOT_IMPLEMENTED) { 69 if (r == MAIL_ERROR_NOT_IMPLEMENTED) {
70 qDebug("flag fetching not implemented");
71 mFlags.setBit(FLAG_SEEN); 70 mFlags.setBit(FLAG_SEEN);
72 } 71 }
73 mailimf_single_fields single_fields; 72 mailimf_single_fields single_fields;
74 mailimf_single_fields_init(&single_fields, msg->msg_fields); 73 mailimf_single_fields_init(&single_fields, msg->msg_fields);
75 mail->setMsgsize(msg->msg_size); 74 mail->setMsgsize(msg->msg_size);
76 mail->setFlags(mFlags); 75 mail->setFlags(mFlags);
77 mail->setMbox(mailbox); 76 mail->setMbox(mailbox);
78 mail->setNumber(i+1); 77 mail->setNumber(i+1);
79 if (single_fields.fld_subject) 78 if (single_fields.fld_subject)
80 mail->setSubject( convert_String(single_fields.fld_subject->sbj_value)); 79 mail->setSubject( convert_String(single_fields.fld_subject->sbj_value));
81 if (single_fields.fld_from) 80 if (single_fields.fld_from)
82 mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list)); 81 mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list));
83 if (single_fields.fld_to) 82 if (single_fields.fld_to)
84 mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) ); 83 mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) );
85 if (single_fields.fld_cc) 84 if (single_fields.fld_cc)
86 mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); 85 mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) );
87 if (single_fields.fld_bcc) 86 if (single_fields.fld_bcc)
88 mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); 87 mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) );
89 if (single_fields.fld_orig_date) 88 if (single_fields.fld_orig_date)
90 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); 89 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) );
91 if (single_fields.fld_message_id->mid_value) 90 if (single_fields.fld_message_id->mid_value)
92 mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); 91 mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
93 refs = single_fields.fld_references; 92 refs = single_fields.fld_references;
94 if (refs && refs->mid_list && clist_count(refs->mid_list)) { 93 if (refs && refs->mid_list && clist_count(refs->mid_list)) {
95 char * text = (char*)refs->mid_list->first->data; 94 char * text = (char*)refs->mid_list->first->data;
96 mail->setReplyto(QString(text)); 95 mail->setReplyto(QString(text));
97 } 96 }
98 97
99 target.append(mail); 98 target.append(mail);
100 } 99 }
101 if (env_list) { 100 if (env_list) {
102 mailmessage_list_free(env_list); 101 mailmessage_list_free(env_list);
103 } 102 }
104 mailfolder_disconnect(folder); 103 mailfolder_disconnect(folder);
105 mailfolder_free(folder); 104 mailfolder_free(folder);
106 mailstorage_free(storage); 105 mailstorage_free(storage);
107} 106}
108 107
109QList<Folder>* MBOXwrapper::listFolders() 108QList<Folder>* MBOXwrapper::listFolders()
110{ 109{
111 QList<Folder> * folders = new QList<Folder>(); 110 QList<Folder> * folders = new QList<Folder>();
112 folders->setAutoDelete( false ); 111 folders->setAutoDelete( false );
113 QDir dir(MBOXPath); 112 QDir dir(MBOXPath);
114 if (!dir.exists()) return folders; 113 if (!dir.exists()) return folders;
115 dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable); 114 dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable);
116 QStringList entries = dir.entryList(); 115 QStringList entries = dir.entryList();
117 QStringList::ConstIterator it = entries.begin(); 116 QStringList::ConstIterator it = entries.begin();
118 for (;it!=entries.end();++it) { 117 for (;it!=entries.end();++it) {
@@ -152,48 +151,69 @@ void MBOXwrapper::answeredMail(const RecMail&)
152 151
153RecBody MBOXwrapper::fetchBody( const RecMail &mail ) 152RecBody MBOXwrapper::fetchBody( const RecMail &mail )
154{ 153{
155 RecBody body; 154 RecBody body;
156 mailstorage*storage = mailstorage_new(NULL); 155 mailstorage*storage = mailstorage_new(NULL);
157 QString p = MBOXPath+"/"; 156 QString p = MBOXPath+"/";
158 p+=mail.getMbox(); 157 p+=mail.getMbox();
159 mailmessage * msg; 158 mailmessage * msg;
160 char*data=0; 159 char*data=0;
161 size_t size; 160 size_t size;
162 161
163 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0); 162 int r = mbox_mailstorage_init(storage,strdup(p.latin1()),0,0,0);
164 mailfolder*folder; 163 mailfolder*folder;
165 folder = mailfolder_new( storage,strdup(p.latin1()),NULL); 164 folder = mailfolder_new( storage,strdup(p.latin1()),NULL);
166 r = mailfolder_connect(folder); 165 r = mailfolder_connect(folder);
167 if (r != MAIL_NO_ERROR) { 166 if (r != MAIL_NO_ERROR) {
168 qDebug("Error initializing mbox"); 167 qDebug("Error initializing mbox");
169 mailfolder_free(folder); 168 mailfolder_free(folder);
170 mailstorage_free(storage); 169 mailstorage_free(storage);
171 return body; 170 return body;
172 } 171 }
173 r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg); 172 r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg);
174 if (r != MAIL_NO_ERROR) { 173 if (r != MAIL_NO_ERROR) {
175 qDebug("Error fetching mail %i",mail.getNumber()); 174 qDebug("Error fetching mail %i",mail.getNumber());
176 mailfolder_free(folder); 175 mailfolder_free(folder);
177 mailstorage_free(storage); 176 mailstorage_free(storage);
178 return body; 177 return body;
179 } 178 }
180 r = mailmessage_fetch(msg,&data,&size); 179 r = mailmessage_fetch(msg,&data,&size);
181 if (r != MAIL_NO_ERROR) { 180 if (r != MAIL_NO_ERROR) {
182 qDebug("Error fetching mail %i",mail.getNumber()); 181 qDebug("Error fetching mail %i",mail.getNumber());
183 mailfolder_free(folder); 182 mailfolder_free(folder);
184 mailstorage_free(storage); 183 mailstorage_free(storage);
185 mailmessage_free(msg); 184 mailmessage_free(msg);
186 return body; 185 return body;
187 } 186 }
188 body = parseMail(msg); 187 body = parseMail(msg);
189 mailmessage_fetch_result_free(msg,data); 188 mailmessage_fetch_result_free(msg,data);
190 mailfolder_free(folder); 189 mailfolder_free(folder);
191 mailstorage_free(storage); 190 mailstorage_free(storage);
192 191
193 return body; 192 return body;
194} 193}
195 194
196void MBOXwrapper::mbox_progress( size_t current, size_t maximum ) 195void MBOXwrapper::mbox_progress( size_t current, size_t maximum )
197{ 196{
198 qDebug("MBOX %i von %i",current,maximum); 197 qDebug("MBOX %i von %i",current,maximum);
199} 198}
199
200void MBOXwrapper::createFolder(const QString&)
201{
202}
203
204void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folder)
205{
206 QString p = MBOXPath+"/";
207 p+=folder;
208 mailmbox_folder*f = 0;
209 int r = mailmbox_init(p.latin1(),0,1,0,&f);
210 if (r != MAIL_NO_ERROR) {
211 qDebug("Error init folder");
212 return;
213 }
214 r = mailmbox_append_message(f,msg,length);
215 if (r != MAIL_NO_ERROR) {
216 qDebug("Error writing message folder");
217 }
218 mailmbox_done(f);
219}
diff --git a/noncore/net/mail/mboxwrapper.h b/noncore/net/mail/mboxwrapper.h
index 779dbc8..1bbaf79 100644
--- a/noncore/net/mail/mboxwrapper.h
+++ b/noncore/net/mail/mboxwrapper.h
@@ -1,30 +1,32 @@
1#ifndef __MBOX_WRAPPER_H 1#ifndef __MBOX_WRAPPER_H
2#define __MBOX_WRAPPER_H 2#define __MBOX_WRAPPER_H
3 3
4#include "genericwrapper.h" 4#include "genericwrapper.h"
5#include <qstring.h> 5#include <qstring.h>
6 6
7class RecMail; 7class RecMail;
8class RecBody; 8class RecBody;
9 9
10class MBOXwrapper : public Genericwrapper 10class MBOXwrapper : public Genericwrapper
11{ 11{
12 Q_OBJECT 12 Q_OBJECT
13public: 13public:
14 MBOXwrapper(const QString & dir); 14 MBOXwrapper(const QString & dir);
15 virtual ~MBOXwrapper(); 15 virtual ~MBOXwrapper();
16 16
17 virtual void listMessages(const QString & mailbox, QList<RecMail> &target ); 17 virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
18 virtual QList<Folder>* listFolders(); 18 virtual QList<Folder>* listFolders();
19 19
20 virtual void deleteMail(const RecMail&mail); 20 virtual void deleteMail(const RecMail&mail);
21 virtual void answeredMail(const RecMail&mail); 21 virtual void answeredMail(const RecMail&mail);
22 virtual void createFolder(const QString&aFolder);
23 virtual void storeMessage(const char*msg,size_t length, const QString&folder);
22 24
23 virtual RecBody fetchBody( const RecMail &mail ); 25 virtual RecBody fetchBody( const RecMail &mail );
24 static void mbox_progress( size_t current, size_t maximum ); 26 static void mbox_progress( size_t current, size_t maximum );
25 27
26protected: 28protected:
27 QString MBOXPath; 29 QString MBOXPath;
28}; 30};
29 31
30#endif 32#endif
diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp
index 162b1b9..a6a46ba 100644
--- a/noncore/net/mail/smtpwrapper.cpp
+++ b/noncore/net/mail/smtpwrapper.cpp
@@ -1,64 +1,67 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <sys/stat.h> 2#include <sys/stat.h>
3#include <sys/types.h> 3#include <sys/types.h>
4#include <unistd.h> 4#include <unistd.h>
5#include <fcntl.h> 5#include <fcntl.h>
6#include <string.h> 6#include <string.h>
7#include <qdir.h> 7#include <qdir.h>
8 8
9#include <libetpan/mailmime.h> 9#include <libetpan/libetpan.h>
10#if 0
10#include <libetpan/mailimf.h> 11#include <libetpan/mailimf.h>
11#include <libetpan/mailsmtp.h> 12#include <libetpan/mailsmtp.h>
12#include <libetpan/mailstorage.h> 13#include <libetpan/mailstorage.h>
13#include <libetpan/maildriver.h> 14#include <libetpan/maildriver.h>
15#endif
14 16
15#include "smtpwrapper.h" 17#include "smtpwrapper.h"
16#include "mailwrapper.h" 18#include "mailwrapper.h"
19#include "mboxwrapper.h"
17#include "logindialog.h" 20#include "logindialog.h"
18#include "defines.h" 21#include "defines.h"
19 22
20SMTPwrapper::SMTPwrapper( Settings *s ) 23SMTPwrapper::SMTPwrapper( Settings *s )
21 : QObject() 24 : QObject()
22{ 25{
23 settings = s; 26 settings = s;
24} 27}
25 28
26QString SMTPwrapper::mailsmtpError( int errnum ) 29QString SMTPwrapper::mailsmtpError( int errnum )
27{ 30{
28 switch ( errnum ) { 31 switch ( errnum ) {
29 case MAILSMTP_NO_ERROR: 32 case MAILSMTP_NO_ERROR:
30 return tr( "No error" ); 33 return tr( "No error" );
31 case MAILSMTP_ERROR_UNEXPECTED_CODE: 34 case MAILSMTP_ERROR_UNEXPECTED_CODE:
32 return tr( "Unexpected error code" ); 35 return tr( "Unexpected error code" );
33 case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE: 36 case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
34 return tr( "Service not available" ); 37 return tr( "Service not available" );
35 case MAILSMTP_ERROR_STREAM: 38 case MAILSMTP_ERROR_STREAM:
36 return tr( "Stream error" ); 39 return tr( "Stream error" );
37 case MAILSMTP_ERROR_HOSTNAME: 40 case MAILSMTP_ERROR_HOSTNAME:
38 return tr( "gethostname() failed" ); 41 return tr( "gethostname() failed" );
39 case MAILSMTP_ERROR_NOT_IMPLEMENTED: 42 case MAILSMTP_ERROR_NOT_IMPLEMENTED:
40 return tr( "Not implemented" ); 43 return tr( "Not implemented" );
41 case MAILSMTP_ERROR_ACTION_NOT_TAKEN: 44 case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
42 return tr( "Error, action not taken" ); 45 return tr( "Error, action not taken" );
43 case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION: 46 case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
44 return tr( "Data exceeds storage allocation" ); 47 return tr( "Data exceeds storage allocation" );
45 case MAILSMTP_ERROR_IN_PROCESSING: 48 case MAILSMTP_ERROR_IN_PROCESSING:
46 return tr( "Error in processing" ); 49 return tr( "Error in processing" );
47 // case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE: 50 // case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
48 // return tr( "Insufficient system storage" ); 51 // return tr( "Insufficient system storage" );
49 case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE: 52 case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
50 return tr( "Mailbox unavailable" ); 53 return tr( "Mailbox unavailable" );
51 case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED: 54 case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
52 return tr( "Mailbox name not allowed" ); 55 return tr( "Mailbox name not allowed" );
53 case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND: 56 case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
54 return tr( "Bad command sequence" ); 57 return tr( "Bad command sequence" );
55 case MAILSMTP_ERROR_USER_NOT_LOCAL: 58 case MAILSMTP_ERROR_USER_NOT_LOCAL:
56 return tr( "User not local" ); 59 return tr( "User not local" );
57 case MAILSMTP_ERROR_TRANSACTION_FAILED: 60 case MAILSMTP_ERROR_TRANSACTION_FAILED:
58 return tr( "Transaction failed" ); 61 return tr( "Transaction failed" );
59 case MAILSMTP_ERROR_MEMORY: 62 case MAILSMTP_ERROR_MEMORY:
60 return tr( "Memory error" ); 63 return tr( "Memory error" );
61 case MAILSMTP_ERROR_CONNECTION_REFUSED: 64 case MAILSMTP_ERROR_CONNECTION_REFUSED:
62 return tr( "Connection refused" ); 65 return tr( "Connection refused" );
63 default: 66 default:
64 return tr( "Unknown error code" ); 67 return tr( "Unknown error code" );
@@ -420,185 +423,223 @@ SMTPaccount *SMTPwrapper::getAccount(const QString&from )
420 qDebug( "SMTPaccount found for" ); 423 qDebug( "SMTPaccount found for" );
421 qDebug( from ); 424 qDebug( from );
422 return smtp; 425 return smtp;
423 } 426 }
424 } 427 }
425 } 428 }
426 429
427 return NULL; 430 return NULL;
428} 431}
429 432
430QString SMTPwrapper::getTmpFile() { 433QString SMTPwrapper::getTmpFile() {
431 int num = 0; 434 int num = 0;
432 QString unique; 435 QString unique;
433 436
434 QDir dir( "/tmp" ); 437 QDir dir( "/tmp" );
435 QStringList::Iterator it; 438 QStringList::Iterator it;
436 439
437 QStringList list = dir.entryList( "opiemail-tmp-*" ); 440 QStringList list = dir.entryList( "opiemail-tmp-*" );
438 do { 441 do {
439 unique.setNum( num++ ); 442 unique.setNum( num++ );
440 } while ( list.contains( "opiemail-tmp-" + unique ) > 0 ); 443 } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
441 444
442 return "/tmp/opiemail-tmp-" + unique; 445 return "/tmp/opiemail-tmp-" + unique;
443} 446}
444 447
445void SMTPwrapper::writeToFile(const QString&file, mailmime *mail ) 448void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
446{ 449{
447 FILE *f; 450 FILE *f;
448 int err, col = 0; 451 int err, col = 0;
449 452
450 f = fopen( file.latin1(), "w" ); 453 f = fopen( file.latin1(), "w" );
451 if ( f == NULL ) { 454 if ( f == NULL ) {
452 qDebug( "writeToFile: error opening file" ); 455 qDebug( "writeToFile: error opening file" );
453 return; 456 return;
454 } 457 }
455 458
456 err = mailmime_write( f, &col, mail ); 459 err = mailmime_write( f, &col, mail );
457 if ( err != MAILIMF_NO_ERROR ) { 460 if ( err != MAILIMF_NO_ERROR ) {
458 fclose( f ); 461 fclose( f );
459 qDebug( "writeToFile: error writing mailmime" ); 462 qDebug( "writeToFile: error writing mailmime" );
460 return; 463 return;
461 } 464 }
462 465
463 fclose( f ); 466 fclose( f );
464} 467}
465 468
466void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size ) 469void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
467{ 470{
471
472 QFile msg_cache(file);
473 QString msg = "";
474 msg_cache.open(IO_ReadOnly);
475 char*message = new char[4096];
476 memset(message,0,4096);
477 while (msg_cache.readBlock(message,4095)>0) {
478 msg+=message;
479 memset(message,0,4096);
480 }
481 delete message;
482 *data = (char*)malloc(msg.length()+1*sizeof(char));
483 memset(*data,0,msg.length()+1);
484 memcpy(*data,msg.ascii(),msg.length());
485 *size=msg.length();
486
487#if 0
468 char *buf; 488 char *buf;
469 struct stat st; 489 struct stat st;
470 int fd, count = 0, total = 0; 490 int fd, count = 0, total = 0;
471 491
472 fd = open( file.latin1(), O_RDONLY, 0 ); 492 fd = open( file.latin1(), O_RDONLY, 0 );
473 if ( fd == -1 ) return; 493 if ( fd == -1 ) return;
474 494
475 if ( fstat( fd, &st ) != 0 ) goto err_close; 495 if ( fstat( fd, &st ) != 0 ) goto err_close;
476 if ( !st.st_size ) goto err_close; 496 if ( !st.st_size ) goto err_close;
477 497
478 buf = (char *) malloc( st.st_size ); 498 buf = (char *) malloc( st.st_size );
479 if ( !buf ) goto err_close; 499 if ( !buf ) goto err_close;
480 500
481 while ( ( total < st.st_size ) && ( count >= 0 ) ) { 501 while ( ( total < st.st_size ) && ( count >= 0 ) ) {
482 count = read( fd, buf + total, st.st_size - total ); 502 count = read( fd, buf + total, st.st_size - total );
483 total += count; 503 total += count;
484 } 504 }
485 if ( count < 0 ) goto err_free; 505 if ( count < 0 ) goto err_free;
486 506
487 *data = buf; 507 *data = buf;
488 *size = st.st_size; 508 *size = st.st_size;
489 509
490 close( fd ); 510 close( fd );
491 511
492 return; // Success :) 512 return; // Success :)
493 513
494err_free: 514err_free:
495 free( buf ); 515 free( buf );
496err_close: 516err_close:
497 close( fd ); 517 close( fd );
518#endif
498} 519}
499 520
500void SMTPwrapper::progress( size_t current, size_t maximum ) 521void SMTPwrapper::progress( size_t current, size_t maximum )
501{ 522{
502 qDebug( "Current: %i of %i", current, maximum ); 523 qDebug( "Current: %i of %i", current, maximum );
503} 524}
504 525
505void SMTPwrapper::smtpSend( mailmime *mail ) 526void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
527{
528 if (!mail) return;
529 QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
530 MBOXwrapper*wrap = new MBOXwrapper(localfolders);
531 wrap->storeMessage(mail,length,box);
532 delete wrap;
533}
534
535void SMTPwrapper::smtpSend( mailmime *mail,bool later )
506{ 536{
507 mailsmtp *session; 537 mailsmtp *session;
508 clist *rcpts; 538 clist *rcpts;
509 char *from, *data, *server, *user = NULL, *pass = NULL; 539 char *from, *data, *server, *user = NULL, *pass = NULL;
510 size_t size; 540 size_t size;
511 int err; 541 int err;
512 bool ssl; 542 bool ssl;
513 uint16_t port; 543 uint16_t port;
514 544
515 545
516 from = getFrom( mail ); 546 from = getFrom( mail );
517 SMTPaccount *smtp = getAccount( from ); 547 SMTPaccount *smtp = getAccount( from );
518 if ( smtp == NULL ) { 548 if ( smtp == NULL ) {
519 free(from); 549 free(from);
520 return; 550 return;
521 } 551 }
522 server = strdup( smtp->getServer().latin1() );
523 ssl = smtp->getSSL();
524 port = smtp->getPort().toUInt();
525 rcpts = createRcptList( mail->mm_data.mm_message.mm_fields ); 552 rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
526 553
527 QString file = getTmpFile(); 554 QString file = getTmpFile();
528 writeToFile( file, mail ); 555 writeToFile( file, mail );
556
529 readFromFile( file, &data, &size ); 557 readFromFile( file, &data, &size );
530 QFile f( file ); 558 QFile f( file );
531 f.remove(); 559 f.remove();
560
561 storeMail(data,size,(later?"Outgoing":"Sent"));
532 562
563 if (later) {
564 smtp_address_list_free( rcpts );
565 if (data) free( data );
566 if (from) free(from);
567 return;
568 }
569 server = strdup( smtp->getServer().latin1() );
570 ssl = smtp->getSSL();
571 port = smtp->getPort().toUInt();
572
533 session = mailsmtp_new( 20, &progress ); 573 session = mailsmtp_new( 20, &progress );
534 if ( session == NULL ) goto free_mem; 574 if ( session == NULL ) goto free_mem;
535 575
536 qDebug( "Servername %s at port %i", server, port ); 576 qDebug( "Servername %s at port %i", server, port );
537 if ( ssl ) { 577 if ( ssl ) {
538 qDebug( "SSL session" ); 578 qDebug( "SSL session" );
539 err = mailsmtp_ssl_connect( session, server, port ); 579 err = mailsmtp_ssl_connect( session, server, port );
540 } else { 580 } else {
541 qDebug( "No SSL session" ); 581 qDebug( "No SSL session" );
542 err = mailsmtp_socket_connect( session, server, port ); 582 err = mailsmtp_socket_connect( session, server, port );
543 } 583 }
544 if ( err != MAILSMTP_NO_ERROR ) goto free_mem_session; 584 if ( err != MAILSMTP_NO_ERROR ) goto free_mem_session;
545 585
546 err = mailsmtp_init( session ); 586 err = mailsmtp_init( session );
547 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session; 587 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
548 588
549 qDebug( "INIT OK" ); 589 qDebug( "INIT OK" );
550 590
551 if ( smtp->getLogin() ) { 591 if ( smtp->getLogin() ) {
552 if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) { 592 if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
553 // get'em 593 // get'em
554 LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true ); 594 LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
555 login.show(); 595 login.show();
556 if ( QDialog::Accepted == login.exec() ) { 596 if ( QDialog::Accepted == login.exec() ) {
557 // ok 597 // ok
558 user = strdup( login.getUser().latin1() ); 598 user = strdup( login.getUser().latin1() );
559 pass = strdup( login.getPassword().latin1() ); 599 pass = strdup( login.getPassword().latin1() );
560 } else { 600 } else {
561 goto free_con_session; 601 goto free_con_session;
562 } 602 }
563 } else { 603 } else {
564 user = strdup( smtp->getUser().latin1() ); 604 user = strdup( smtp->getUser().latin1() );
565 pass = strdup( smtp->getPassword().latin1() ); 605 pass = strdup( smtp->getPassword().latin1() );
566 } 606 }
567 qDebug( "session->auth: %i", session->auth); 607 qDebug( "session->auth: %i", session->auth);
568 err = mailsmtp_auth( session, user, pass ); 608 err = mailsmtp_auth( session, user, pass );
569 if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok"); 609 if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
570 qDebug( "Done auth!" ); 610 qDebug( "Done auth!" );
571 } 611 }
572 612
573 err = mailsmtp_send( session, from, rcpts, data, size ); 613 err = mailsmtp_send( session, from, rcpts, data, size );
574 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session; 614 if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
575 615
576 qDebug( "Mail sent." ); 616 qDebug( "Mail sent." );
577 617
578free_con_session: 618free_con_session:
579 mailsmtp_quit( session ); 619 mailsmtp_quit( session );
580free_mem_session: 620free_mem_session:
581 mailsmtp_free( session ); 621 mailsmtp_free( session );
582free_mem: 622free_mem:
583 smtp_address_list_free( rcpts ); 623 smtp_address_list_free( rcpts );
584 free( data ); 624 if (data) free( data );
585 free( server ); 625 if (from) free(from);
626 if (server) free( server );
586 if ( smtp->getLogin() ) { 627 if ( smtp->getLogin() ) {
587 free( user ); 628 free( user );
588 free( pass ); 629 free( pass );
589 } 630 }
590 free( from ); 631 free( from );
591} 632}
592 633
593void SMTPwrapper::sendMail(const Mail&mail ) 634void SMTPwrapper::sendMail(const Mail&mail,bool later )
594{ 635{
595 mailmime *mimeMail; 636 mailmime * mimeMail;
596 637
597 mimeMail = createMimeMail(mail ); 638 mimeMail = createMimeMail(mail );
598 if ( mimeMail == NULL ) { 639 if ( mimeMail == NULL ) {
599 qDebug( "sendMail: error creating mime mail" ); 640 qDebug( "sendMail: error creating mime mail" );
600 } else { 641 } else {
601 smtpSend( mimeMail ); 642 smtpSend( mimeMail,later );
602 mailmime_free( mimeMail ); 643 mailmime_free( mimeMail );
603 } 644 }
604} 645}
diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h
index 8fdb07d..41e9a8c 100644
--- a/noncore/net/mail/smtpwrapper.h
+++ b/noncore/net/mail/smtpwrapper.h
@@ -1,53 +1,55 @@
1#ifndef SMTPwrapper_H 1#ifndef SMTPwrapper_H
2#define SMTPwrapper_H 2#define SMTPwrapper_H
3 3
4#include <qpe/applnk.h> 4#include <qpe/applnk.h>
5 5
6#include <qbitarray.h> 6#include <qbitarray.h>
7#include <qdatetime.h> 7#include <qdatetime.h>
8#include <libetpan/clist.h> 8#include <libetpan/clist.h>
9 9
10#include "settings.h" 10#include "settings.h"
11 11
12class Mail; 12class Mail;
13class Attachment; 13class Attachment;
14struct mailimf_fields; 14struct mailimf_fields;
15struct mailimf_field; 15struct mailimf_field;
16struct mailimf_mailbox; 16struct mailimf_mailbox;
17struct mailmime; 17struct mailmime;
18struct mailimf_address_list; 18struct mailimf_address_list;
19 19
20class SMTPwrapper : public QObject 20class SMTPwrapper : public QObject
21{ 21{
22 Q_OBJECT 22 Q_OBJECT
23 23
24public: 24public:
25 SMTPwrapper( Settings *s ); 25 SMTPwrapper( Settings *s );
26 virtual ~SMTPwrapper(){} 26 virtual ~SMTPwrapper(){}
27 void sendMail(const Mail& mail ); 27 void sendMail(const Mail& mail,bool later=false );
28 28
29protected: 29protected:
30 mailimf_mailbox *newMailbox(const QString&name,const QString&mail ); 30 mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
31 mailimf_fields *createImfFields(const Mail &mail ); 31 mailimf_fields *createImfFields(const Mail &mail );
32 mailmime *createMimeMail(const Mail&mail ); 32 mailmime *createMimeMail(const Mail&mail );
33 33
34 mailimf_address_list *parseAddresses(const QString&addr ); 34 mailimf_address_list *parseAddresses(const QString&addr );
35 void addFileParts( mailmime *message,const QList<Attachment>&files ); 35 void addFileParts( mailmime *message,const QList<Attachment>&files );
36 mailmime *buildTxtPart(const QString&str ); 36 mailmime *buildTxtPart(const QString&str );
37 mailmime *buildFilePart(const QString&filename,const QString&mimetype ); 37 mailmime *buildFilePart(const QString&filename,const QString&mimetype );
38 void smtpSend( mailmime *mail ); 38 void smtpSend( mailmime *mail,bool later );
39 mailimf_field *getField( mailimf_fields *fields, int type ); 39 mailimf_field *getField( mailimf_fields *fields, int type );
40 clist *createRcptList( mailimf_fields *fields ); 40 clist *createRcptList( mailimf_fields *fields );
41 char *getFrom( mailmime *mail ); 41 char *getFrom( mailmime *mail );
42 SMTPaccount *getAccount(const QString&from ); 42 SMTPaccount *getAccount(const QString&from );
43 void writeToFile(const QString&file, mailmime *mail ); 43 void writeToFile(const QString&file, mailmime *mail );
44 void readFromFile(const QString&file, char **data, size_t *size ); 44 void readFromFile(const QString&file, char **data, size_t *size );
45 void storeMail(char*mail, size_t length, const QString&box);
45 46
46 static QString mailsmtpError( int err ); 47 static QString mailsmtpError( int err );
47 static QString getTmpFile(); 48 static QString getTmpFile();
48 static void progress( size_t current, size_t maximum ); 49 static void progress( size_t current, size_t maximum );
49 static void addRcpts( clist *list, mailimf_address_list *addr_list ); 50 static void addRcpts( clist *list, mailimf_address_list *addr_list );
51 void storeMail(mailmime*mail, const QString&box);
50 Settings *settings; 52 Settings *settings;
51}; 53};
52 54
53#endif 55#endif