Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 298 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.h | 14 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailwrapper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailwrapper.h | 17 |
4 files changed, 211 insertions, 120 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 7b78499..1acc036 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -2,80 +2,99 @@ | |||
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | 3 | ||
4 | #include "imapwrapper.h" | 4 | #include "imapwrapper.h" |
5 | 5 | #include <libetpan/mailimap.h> | |
6 | 6 | ||
7 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) | 7 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) |
8 | { | 8 | { |
9 | account = a; | 9 | account = a; |
10 | m_imap = 0; | ||
10 | } | 11 | } |
11 | 12 | ||
12 | void imap_progress( size_t current, size_t maximum ) | 13 | IMAPwrapper::~IMAPwrapper() |
14 | { | ||
15 | logout(); | ||
16 | } | ||
17 | |||
18 | void IMAPwrapper::imap_progress( size_t current, size_t maximum ) | ||
13 | { | 19 | { |
14 | qDebug( "IMAP: %i of %i", current, maximum ); | 20 | qDebug( "IMAP: %i of %i", current, maximum ); |
15 | } | 21 | } |
16 | 22 | ||
17 | void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) | 23 | void IMAPwrapper::login() |
18 | { | 24 | { |
19 | const char *server, *user, *pass, *mb; | 25 | logout(); |
26 | const char *server, *user, *pass; | ||
20 | uint16_t port; | 27 | uint16_t port; |
21 | int err = MAILIMAP_NO_ERROR; | 28 | int err = MAILIMAP_NO_ERROR; |
22 | clist *result; | ||
23 | clistcell *current; | ||
24 | mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate; | ||
25 | mailimap_fetch_type *fetchType; | ||
26 | mailimap_set *set; | ||
27 | 29 | ||
28 | mb = mailbox.latin1(); | ||
29 | server = account->getServer().latin1(); | 30 | server = account->getServer().latin1(); |
30 | port = account->getPort().toUInt(); | 31 | port = account->getPort().toUInt(); |
31 | user = account->getUser().latin1(); | 32 | user = account->getUser().latin1(); |
32 | pass = account->getPassword().latin1(); | 33 | pass = account->getPassword().latin1(); |
33 | 34 | ||
34 | mailimap *imap = mailimap_new( 20, &imap_progress ); | 35 | m_imap = mailimap_new( 20, &imap_progress ); |
35 | if ( imap == NULL ) { | ||
36 | qDebug("IMAP Memory error"); | ||
37 | return; | ||
38 | } | ||
39 | |||
40 | /* connect */ | 36 | /* connect */ |
41 | err = mailimap_socket_connect( imap, (char*)server, port ); | 37 | err = mailimap_socket_connect( m_imap, (char*)server, port ); |
42 | if ( err != MAILIMAP_NO_ERROR && | 38 | if ( err != MAILIMAP_NO_ERROR && |
43 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && | 39 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && |
44 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { | 40 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { |
45 | qDebug("error connecting server: %s",imap->response); | 41 | qDebug("error connecting server: %s",m_imap->response); |
46 | mailimap_free( imap ); | 42 | mailimap_free( m_imap ); |
43 | m_imap = 0; | ||
47 | return; | 44 | return; |
48 | } | 45 | } |
49 | 46 | ||
50 | /* login */ | 47 | /* login */ |
51 | err = mailimap_login_simple( imap, (char*)user, (char*)pass ); | 48 | err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); |
52 | if ( err != MAILIMAP_NO_ERROR ) { | 49 | if ( err != MAILIMAP_NO_ERROR ) { |
53 | qDebug("error logging in imap: %s",imap->response); | 50 | qDebug("error logging in imap: %s",m_imap->response); |
54 | err = mailimap_close( imap ); | 51 | err = mailimap_close( m_imap ); |
55 | mailimap_free( imap ); | 52 | mailimap_free( m_imap ); |
56 | return; | 53 | m_imap = 0; |
54 | } | ||
57 | } | 55 | } |
58 | 56 | ||
57 | void IMAPwrapper::logout() | ||
58 | { | ||
59 | int err = MAILIMAP_NO_ERROR; | ||
60 | if (!m_imap) return; | ||
61 | err = mailimap_logout( m_imap ); | ||
62 | err = mailimap_close( m_imap ); | ||
63 | mailimap_free( m_imap ); | ||
64 | m_imap = 0; | ||
65 | } | ||
66 | |||
67 | void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) | ||
68 | { | ||
69 | const char *mb; | ||
70 | int err = MAILIMAP_NO_ERROR; | ||
71 | clist *result; | ||
72 | clistcell *current; | ||
73 | mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate; | ||
74 | mailimap_fetch_type *fetchType; | ||
75 | mailimap_set *set; | ||
76 | |||
77 | mb = mailbox.latin1(); | ||
78 | login(); | ||
79 | if (!m_imap) { | ||
80 | return; | ||
81 | } | ||
59 | /* select mailbox READONLY for operations */ | 82 | /* select mailbox READONLY for operations */ |
60 | err = mailimap_examine( imap, (char*)mb); | 83 | err = mailimap_examine( m_imap, (char*)mb); |
61 | if ( err != MAILIMAP_NO_ERROR ) { | 84 | if ( err != MAILIMAP_NO_ERROR ) { |
62 | qDebug("error selecting mailbox: %s",imap->response); | 85 | qDebug("error selecting mailbox: %s",m_imap->response); |
63 | err = mailimap_logout( imap ); | 86 | logout(); |
64 | err = mailimap_close( imap ); | ||
65 | mailimap_free( imap ); | ||
66 | return; | 87 | return; |
67 | } | 88 | } |
68 | 89 | ||
69 | int last = imap->selection_info->exists; | 90 | int last = m_imap->selection_info->exists; |
91 | |||
70 | if (last == 0) { | 92 | if (last == 0) { |
71 | qDebug("mailbox has no mails"); | 93 | qDebug("mailbox has no mails"); |
72 | err = mailimap_logout( imap ); | 94 | logout(); |
73 | err = mailimap_close( imap ); | ||
74 | mailimap_free( imap ); | ||
75 | return; | 95 | return; |
76 | } | 96 | } |
77 | 97 | ||
78 | |||
79 | result = clist_new(); | 98 | result = clist_new(); |
80 | /* the range has to start at 1!!! not with 0!!!! */ | 99 | /* the range has to start at 1!!! not with 0!!!! */ |
81 | set = mailimap_set_new_interval( 1, last ); | 100 | set = mailimap_set_new_interval( 1, last ); |
@@ -89,7 +108,7 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) | |||
89 | mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags); | 108 | mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttFlags); |
90 | mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate); | 109 | mailimap_fetch_type_new_fetch_att_list_add(fetchType,fetchAttDate); |
91 | 110 | ||
92 | err = mailimap_fetch( imap, set, fetchType, &result ); | 111 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
93 | mailimap_set_free( set ); | 112 | mailimap_set_free( set ); |
94 | /* cleans up the fetch_att's too! */ | 113 | /* cleans up the fetch_att's too! */ |
95 | mailimap_fetch_type_free( fetchType ); | 114 | mailimap_fetch_type_free( fetchType ); |
@@ -106,58 +125,32 @@ void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target ) | |||
106 | RecMail*m = parse_list_result(msg_att); | 125 | RecMail*m = parse_list_result(msg_att); |
107 | if (m) { | 126 | if (m) { |
108 | m->setNumber(i); | 127 | m->setNumber(i); |
128 | m->setMbox(mailbox); | ||
109 | target.append(m); | 129 | target.append(m); |
110 | } | 130 | } |
111 | current = current->next; | 131 | current = current->next; |
112 | } | 132 | } |
113 | } else { | 133 | } else { |
114 | qDebug("Error fetching headers: %s",imap->response); | 134 | qDebug("Error fetching headers: %s",m_imap->response); |
115 | } | 135 | } |
116 | 136 | logout(); | |
117 | err = mailimap_logout( imap ); | ||
118 | err = mailimap_close( imap ); | ||
119 | clist_free(result); | 137 | clist_free(result); |
120 | mailimap_free( imap ); | ||
121 | } | 138 | } |
122 | 139 | ||
123 | QList<IMAPFolder>* IMAPwrapper::listFolders() | 140 | QList<IMAPFolder>* IMAPwrapper::listFolders() |
124 | { | 141 | { |
125 | const char *server, *user, *pass, *path, *mask; | 142 | const char *path, *mask; |
126 | uint16_t port; | ||
127 | int err = MAILIMAP_NO_ERROR; | 143 | int err = MAILIMAP_NO_ERROR; |
128 | clist *result; | 144 | clist *result; |
129 | clistcell *current; | 145 | clistcell *current; |
130 | 146 | ||
131 | QList<IMAPFolder> * folders = new QList<IMAPFolder>(); | 147 | QList<IMAPFolder> * folders = new QList<IMAPFolder>(); |
132 | folders->setAutoDelete( true ); | 148 | folders->setAutoDelete( true ); |
133 | 149 | login(); | |
134 | server = account->getServer().latin1(); | 150 | if (!m_imap) { |
135 | port = account->getPort().toUInt(); | ||
136 | user = account->getUser().latin1(); | ||
137 | pass = account->getPassword().latin1(); | ||
138 | path = account->getPrefix().latin1(); | ||
139 | |||
140 | mailimap *imap = mailimap_new( 20, &imap_progress ); | ||
141 | if ( imap == NULL ) { | ||
142 | qDebug("error mailimap_new"); | ||
143 | return folders; | ||
144 | } | ||
145 | |||
146 | err = mailimap_socket_connect( imap, (char*)server, port ); | ||
147 | if ( err != MAILIMAP_NO_ERROR && | ||
148 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && | ||
149 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { | ||
150 | mailimap_free(imap); | ||
151 | qDebug("error imap_socket_connect: %s",imap->response); | ||
152 | return folders; | 151 | return folders; |
153 | } | 152 | } |
154 | 153 | ||
155 | err = mailimap_login_simple( imap, (char*)user, (char*)pass ); | ||
156 | if ( err != MAILIMAP_NO_ERROR ) { | ||
157 | mailimap_free(imap); | ||
158 | qDebug("error logging in: %s",imap->response); | ||
159 | return folders; | ||
160 | } | ||
161 | /* | 154 | /* |
162 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 155 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
163 | * We must not forget to filter them out in next loop! | 156 | * We must not forget to filter them out in next loop! |
@@ -167,7 +160,7 @@ QList<IMAPFolder>* IMAPwrapper::listFolders() | |||
167 | mask = "INBOX" ; | 160 | mask = "INBOX" ; |
168 | result = clist_new(); | 161 | result = clist_new(); |
169 | mailimap_mailbox_list *list; | 162 | mailimap_mailbox_list *list; |
170 | err = mailimap_list( imap, (char*)"", (char*)mask, &result ); | 163 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); |
171 | if ( err == MAILIMAP_NO_ERROR ) { | 164 | if ( err == MAILIMAP_NO_ERROR ) { |
172 | current = result->first; | 165 | current = result->first; |
173 | for ( int i = result->count; i > 0; i-- ) { | 166 | for ( int i = result->count; i > 0; i-- ) { |
@@ -179,7 +172,7 @@ QList<IMAPFolder>* IMAPwrapper::listFolders() | |||
179 | current = current->next; | 172 | current = current->next; |
180 | } | 173 | } |
181 | } else { | 174 | } else { |
182 | qDebug("error fetching folders: %s",imap->response); | 175 | qDebug("error fetching folders: %s",m_imap->response); |
183 | } | 176 | } |
184 | mailimap_list_result_free( result ); | 177 | mailimap_list_result_free( result ); |
185 | 178 | ||
@@ -187,8 +180,10 @@ QList<IMAPFolder>* IMAPwrapper::listFolders() | |||
187 | * second stage - get the other then inbox folders | 180 | * second stage - get the other then inbox folders |
188 | */ | 181 | */ |
189 | mask = "*" ; | 182 | mask = "*" ; |
183 | path = account->getPrefix().latin1(); | ||
190 | result = clist_new(); | 184 | result = clist_new(); |
191 | err = mailimap_list( imap, (char*)path, (char*)mask, &result ); | 185 | qDebug(path); |
186 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | ||
192 | if ( err == MAILIMAP_NO_ERROR ) { | 187 | if ( err == MAILIMAP_NO_ERROR ) { |
193 | current = result->first; | 188 | current = result->first; |
194 | for ( int i = result->count; i > 0; i-- ) { | 189 | for ( int i = result->count; i > 0; i-- ) { |
@@ -203,12 +198,9 @@ QList<IMAPFolder>* IMAPwrapper::listFolders() | |||
203 | 198 | ||
204 | } | 199 | } |
205 | } else { | 200 | } else { |
206 | qDebug("error fetching folders"); | 201 | qDebug("error fetching folders %s",m_imap->response); |
207 | } | 202 | } |
208 | mailimap_list_result_free( result ); | 203 | mailimap_list_result_free( result ); |
209 | err = mailimap_logout( imap ); | ||
210 | err = mailimap_close( imap ); | ||
211 | mailimap_free( imap ); | ||
212 | return folders; | 204 | return folders; |
213 | } | 205 | } |
214 | 206 | ||
@@ -273,7 +265,6 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
273 | } else if (cflag->type==MAILIMAP_FLAG_FETCH_RECENT) { | 265 | } else if (cflag->type==MAILIMAP_FLAG_FETCH_RECENT) { |
274 | mFlags.setBit(FLAG_RECENT); | 266 | mFlags.setBit(FLAG_RECENT); |
275 | } | 267 | } |
276 | |||
277 | cf = cf->next; | 268 | cf = cf->next; |
278 | } | 269 | } |
279 | continue; | 270 | continue; |
@@ -337,11 +328,11 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
337 | return m; | 328 | return m; |
338 | } | 329 | } |
339 | 330 | ||
340 | QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail) | 331 | #if 1 |
332 | QString IMAPwrapper::fetchBody(const RecMail&mail) | ||
341 | { | 333 | { |
342 | QString body = ""; | 334 | QString body = ""; |
343 | const char *server, *user, *pass, *mb; | 335 | const char *mb; |
344 | uint16_t port; | ||
345 | int err = MAILIMAP_NO_ERROR; | 336 | int err = MAILIMAP_NO_ERROR; |
346 | clist *result; | 337 | clist *result; |
347 | clistcell *current; | 338 | clistcell *current; |
@@ -349,52 +340,77 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail) | |||
349 | mailimap_fetch_type *fetchType; | 340 | mailimap_fetch_type *fetchType; |
350 | mailimap_set *set; | 341 | mailimap_set *set; |
351 | 342 | ||
352 | mb = mailbox.latin1(); | 343 | mb = mail.getMbox().latin1(); |
353 | server = account->getServer().latin1(); | ||
354 | port = account->getPort().toUInt(); | ||
355 | user = account->getUser().latin1(); | ||
356 | pass = account->getPassword().latin1(); | ||
357 | 344 | ||
358 | mailimap *imap = mailimap_new( 20, &imap_progress ); | 345 | login(); |
359 | if ( imap == NULL ) { | 346 | if (!m_imap) { |
360 | qDebug("IMAP Memory error"); | ||
361 | return body; | 347 | return body; |
362 | } | 348 | } |
363 | 349 | /* select mailbox READONLY for operations */ | |
364 | /* connect */ | 350 | err = mailimap_examine( m_imap, (char*)mb); |
365 | err = mailimap_socket_connect( imap, (char*)server, port ); | 351 | if ( err != MAILIMAP_NO_ERROR ) { |
366 | if ( err != MAILIMAP_NO_ERROR && | 352 | qDebug("error selecting mailbox: %s",m_imap->response); |
367 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && | 353 | logout(); |
368 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { | ||
369 | qDebug("error connecting server: %s",imap->response); | ||
370 | mailimap_free( imap ); | ||
371 | return body; | 354 | return body; |
372 | } | 355 | } |
356 | result = clist_new(); | ||
357 | /* the range has to start at 1!!! not with 0!!!! */ | ||
358 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | ||
359 | fetchAtt = mailimap_fetch_att_new_rfc822_text(); | ||
360 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | ||
361 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | ||
362 | mailimap_set_free( set ); | ||
363 | mailimap_fetch_type_free( fetchType ); | ||
364 | |||
365 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | ||
366 | mailimap_msg_att * msg_att; | ||
367 | msg_att = (mailimap_msg_att*)current->data; | ||
368 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data; | ||
369 | |||
370 | if (item->msg_att_static && item->msg_att_static->rfc822_text) { | ||
371 | body = item->msg_att_static->rfc822_text; | ||
372 | } | ||
373 | } else { | ||
374 | qDebug("error fetching text: %s",m_imap->response); | ||
375 | } | ||
373 | 376 | ||
374 | /* login */ | 377 | clist_free(result); |
375 | err = mailimap_login_simple( imap, (char*)user, (char*)pass ); | 378 | logout(); |
376 | if ( err != MAILIMAP_NO_ERROR ) { | ||
377 | qDebug("error logging in imap: %s",imap->response); | ||
378 | err = mailimap_close( imap ); | ||
379 | mailimap_free( imap ); | ||
380 | return body; | 379 | return body; |
381 | } | 380 | } |
382 | 381 | ||
382 | #else | ||
383 | QString IMAPwrapper::fetchBody(const RecMail&mail) | ||
384 | { | ||
385 | QString body = ""; | ||
386 | const char *mb; | ||
387 | int err = MAILIMAP_NO_ERROR; | ||
388 | clist *result; | ||
389 | clistcell *current; | ||
390 | mailimap_fetch_att *fetchAtt; | ||
391 | mailimap_fetch_type *fetchType; | ||
392 | mailimap_set *set; | ||
393 | mailimap_body*body_desc; | ||
394 | |||
395 | mb = mail.getMbox().latin1(); | ||
396 | |||
397 | login(); | ||
398 | if (!m_imap) { | ||
399 | return body; | ||
400 | } | ||
383 | /* select mailbox READONLY for operations */ | 401 | /* select mailbox READONLY for operations */ |
384 | err = mailimap_examine( imap, (char*)mb); | 402 | err = mailimap_examine( m_imap, (char*)mb); |
385 | if ( err != MAILIMAP_NO_ERROR ) { | 403 | if ( err != MAILIMAP_NO_ERROR ) { |
386 | qDebug("error selecting mailbox: %s",imap->response); | 404 | qDebug("error selecting mailbox: %s",m_imap->response); |
387 | err = mailimap_logout( imap ); | 405 | logout(); |
388 | err = mailimap_close( imap ); | ||
389 | mailimap_free( imap ); | ||
390 | return body; | 406 | return body; |
391 | } | 407 | } |
392 | result = clist_new(); | 408 | result = clist_new(); |
393 | /* the range has to start at 1!!! not with 0!!!! */ | 409 | /* the range has to start at 1!!! not with 0!!!! */ |
394 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | 410 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); |
395 | fetchAtt = mailimap_fetch_att_new_rfc822_text(); | 411 | fetchAtt = mailimap_fetch_att_new_body(); |
396 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | 412 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); |
397 | err = mailimap_fetch( imap, set, fetchType, &result ); | 413 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
398 | mailimap_set_free( set ); | 414 | mailimap_set_free( set ); |
399 | mailimap_fetch_type_free( fetchType ); | 415 | mailimap_fetch_type_free( fetchType ); |
400 | 416 | ||
@@ -402,19 +418,73 @@ QString IMAPwrapper::fetchBody(const QString & mailbox,const RecMail&mail) | |||
402 | mailimap_msg_att * msg_att; | 418 | mailimap_msg_att * msg_att; |
403 | msg_att = (mailimap_msg_att*)current->data; | 419 | msg_att = (mailimap_msg_att*)current->data; |
404 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data; | 420 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data; |
405 | 421 | body_desc = item->msg_att_static->body; | |
406 | if (item->msg_att_static && item->msg_att_static->rfc822_text) { | 422 | if (body_desc->type==MAILIMAP_BODY_1PART) { |
407 | body = item->msg_att_static->rfc822_text; | 423 | body = searchBodyText(mail,body_desc->body_1part); |
424 | } else { | ||
408 | } | 425 | } |
426 | |||
409 | } else { | 427 | } else { |
410 | qDebug("error fetching text: %s",imap->response); | 428 | qDebug("error fetching body: %s",m_imap->response); |
411 | } | 429 | } |
412 | 430 | ||
413 | err = mailimap_logout( imap ); | ||
414 | err = mailimap_close( imap ); | ||
415 | mailimap_free( imap ); | ||
416 | clist_free(result); | 431 | clist_free(result); |
432 | logout(); | ||
433 | return body; | ||
434 | } | ||
435 | #endif | ||
417 | 436 | ||
437 | QString IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription) | ||
438 | { | ||
439 | QString Body=""; | ||
440 | if (!mailDescription) { | ||
441 | return Body; | ||
442 | } | ||
443 | switch (mailDescription->type) { | ||
444 | case MAILIMAP_BODY_TYPE_1PART_TEXT: | ||
445 | return getPlainBody(mail); | ||
446 | break; | ||
447 | default: | ||
448 | break; | ||
449 | } | ||
450 | return Body; | ||
451 | } | ||
452 | |||
453 | QString IMAPwrapper::getPlainBody(const RecMail&mail) | ||
454 | { | ||
455 | QString body = ""; | ||
456 | const char *mb; | ||
457 | int err = MAILIMAP_NO_ERROR; | ||
458 | clist *result; | ||
459 | clistcell *current; | ||
460 | mailimap_fetch_att *fetchAtt; | ||
461 | mailimap_fetch_type *fetchType; | ||
462 | mailimap_set *set; | ||
463 | |||
464 | mb = mail.getMbox().latin1(); | ||
465 | |||
466 | if (!m_imap) { | ||
418 | return body; | 467 | return body; |
419 | } | 468 | } |
469 | result = clist_new(); | ||
470 | /* the range has to start at 1!!! not with 0!!!! */ | ||
471 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | ||
472 | fetchAtt = mailimap_fetch_att_new_rfc822_text(); | ||
473 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | ||
474 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | ||
475 | mailimap_set_free( set ); | ||
476 | mailimap_fetch_type_free( fetchType ); | ||
420 | 477 | ||
478 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | ||
479 | mailimap_msg_att * msg_att; | ||
480 | msg_att = (mailimap_msg_att*)current->data; | ||
481 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data; | ||
482 | if (item->msg_att_static && item->msg_att_static->rfc822_text) { | ||
483 | body = item->msg_att_static->rfc822_text; | ||
484 | } | ||
485 | } else { | ||
486 | qDebug("error fetching text: %s",m_imap->response); | ||
487 | } | ||
488 | clist_free(result); | ||
489 | return body; | ||
490 | } | ||
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h index 65c36e0..b02d26d 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.h +++ b/noncore/net/mail/libmailwrapper/imapwrapper.h | |||
@@ -2,7 +2,9 @@ | |||
2 | #define __IMAPWRAPPER | 2 | #define __IMAPWRAPPER |
3 | 3 | ||
4 | #include "mailwrapper.h" | 4 | #include "mailwrapper.h" |
5 | #include <libetpan/mailimap.h> | 5 | |
6 | struct mailimap; | ||
7 | struct mailimap_body_type_1part; | ||
6 | 8 | ||
7 | class IMAPwrapper : public QObject | 9 | class IMAPwrapper : public QObject |
8 | { | 10 | { |
@@ -10,16 +12,22 @@ class IMAPwrapper : public QObject | |||
10 | 12 | ||
11 | public: | 13 | public: |
12 | IMAPwrapper( IMAPaccount *a ); | 14 | IMAPwrapper( IMAPaccount *a ); |
15 | virtual ~IMAPwrapper(); | ||
13 | QList<IMAPFolder>* listFolders(); | 16 | QList<IMAPFolder>* listFolders(); |
14 | void listMessages(const QString & mailbox,Maillist&target ); | 17 | void listMessages(const QString & mailbox,Maillist&target ); |
15 | QString fetchBody(const QString & mailbox,const RecMail&mail); | 18 | QString fetchBody(const RecMail&mail); |
19 | static void imap_progress( size_t current, size_t maximum ); | ||
16 | 20 | ||
17 | protected: | 21 | protected: |
18 | RecMail*parse_list_result(mailimap_msg_att*); | 22 | RecMail*parse_list_result(mailimap_msg_att*); |
23 | void login(); | ||
24 | void logout(); | ||
25 | QString searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription); | ||
26 | QString getPlainBody(const RecMail&mail); | ||
19 | 27 | ||
20 | private: | 28 | private: |
21 | IMAPaccount *account; | 29 | IMAPaccount *account; |
22 | 30 | mailimap *m_imap; | |
23 | }; | 31 | }; |
24 | 32 | ||
25 | #endif | 33 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp index ea9e7b2..7f67cd8 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp | |||
@@ -629,7 +629,7 @@ Mail::Mail() | |||
629 | } | 629 | } |
630 | 630 | ||
631 | RecMail::RecMail() | 631 | RecMail::RecMail() |
632 | :subject(""),date(""),msg_number(0),msg_flags(7) | 632 | :subject(""),date(""),mbox(""),msg_number(0),msg_flags(7) |
633 | { | 633 | { |
634 | } | 634 | } |
635 | 635 | ||
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h index 955a8e2..332034f 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.h +++ b/noncore/net/mail/libmailwrapper/mailwrapper.h | |||
@@ -39,6 +39,17 @@ protected: | |||
39 | #define FLAG_RECENT 5 | 39 | #define FLAG_RECENT 5 |
40 | 40 | ||
41 | /* a class to describe mails in a mailbox */ | 41 | /* a class to describe mails in a mailbox */ |
42 | /* Attention! | ||
43 | From programmers point of view it would make sense to | ||
44 | store the mail body into this class, too. | ||
45 | But: not from the point of view of the device. | ||
46 | Mailbodies can be real large. So we request them when | ||
47 | needed from the mail-wrapper class direct from the server itself | ||
48 | (imap) or from a file-based cache (pop3?) | ||
49 | So there is no interface "const QString&body()" but you should | ||
50 | make a request to the mailwrapper with this class as parameter to | ||
51 | get the body. Same words for the attachments. | ||
52 | */ | ||
42 | class RecMail | 53 | class RecMail |
43 | { | 54 | { |
44 | public: | 55 | public: |
@@ -53,8 +64,10 @@ public: | |||
53 | void setFrom( const QString&a ) { from = a; } | 64 | void setFrom( const QString&a ) { from = a; } |
54 | const QString&getSubject()const { return subject; } | 65 | const QString&getSubject()const { return subject; } |
55 | void setSubject( const QString&s ) { subject = s; } | 66 | void setSubject( const QString&s ) { subject = s; } |
56 | void setFlags(const QBitArray&flags){msg_flags = flags;} | 67 | const QString&getMbox()const{return mbox;} |
68 | void setMbox(const QString&box){mbox = box;} | ||
57 | const QBitArray&getFlags()const{return msg_flags;} | 69 | const QBitArray&getFlags()const{return msg_flags;} |
70 | void setFlags(const QBitArray&flags){msg_flags = flags;} | ||
58 | 71 | ||
59 | #if 0 | 72 | #if 0 |
60 | void setDate(const QString&dstring); | 73 | void setDate(const QString&dstring); |
@@ -62,7 +75,7 @@ public: | |||
62 | QString getDate()const{return mDate.toString();} | 75 | QString getDate()const{return mDate.toString();} |
63 | #endif | 76 | #endif |
64 | protected: | 77 | protected: |
65 | QString subject,date,from; | 78 | QString subject,date,from,mbox; |
66 | int msg_number; | 79 | int msg_number; |
67 | QBitArray msg_flags; | 80 | QBitArray msg_flags; |
68 | #if 0 | 81 | #if 0 |