summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/imapwrapper.cpp3
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 11bf3b8..48e476b 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -1,128 +1,129 @@
1 1
2#include <stdlib.h> 2#include <stdlib.h>
3 3
4#include "imapwrapper.h" 4#include "imapwrapper.h"
5#include "mailtypes.h" 5#include "mailtypes.h"
6#include <libetpan/mailimap.h> 6#include <libetpan/mailimap.h>
7 7
8IMAPwrapper::IMAPwrapper( IMAPaccount *a ) 8IMAPwrapper::IMAPwrapper( IMAPaccount *a )
9{ 9{
10 account = a; 10 account = a;
11 m_imap = 0; 11 m_imap = 0;
12} 12}
13 13
14IMAPwrapper::~IMAPwrapper() 14IMAPwrapper::~IMAPwrapper()
15{ 15{
16 logout(); 16 logout();
17} 17}
18 18
19void IMAPwrapper::imap_progress( size_t current, size_t maximum ) 19void IMAPwrapper::imap_progress( size_t current, size_t maximum )
20{ 20{
21 qDebug( "IMAP: %i of %i", current, maximum ); 21 qDebug( "IMAP: %i of %i", current, maximum );
22} 22}
23 23
24void IMAPwrapper::login() 24void IMAPwrapper::login()
25{ 25{
26 const char *server, *user, *pass; 26 const char *server, *user, *pass;
27 uint16_t port; 27 uint16_t port;
28 int err = MAILIMAP_NO_ERROR; 28 int err = MAILIMAP_NO_ERROR;
29 29
30 /* we are connected this moment */ 30 /* we are connected this moment */
31 /* TODO: setup a timer holding the line or if connection closed - delete the value */ 31 /* TODO: setup a timer holding the line or if connection closed - delete the value */
32 if (m_imap) { 32 if (m_imap) {
33 mailstream_flush(m_imap->imap_stream);
33 return; 34 return;
34 } 35 }
35 server = account->getServer().latin1(); 36 server = account->getServer().latin1();
36 port = account->getPort().toUInt(); 37 port = account->getPort().toUInt();
37 user = account->getUser().latin1(); 38 user = account->getUser().latin1();
38 pass = account->getPassword().latin1(); 39 pass = account->getPassword().latin1();
39 40
40 m_imap = mailimap_new( 20, &imap_progress ); 41 m_imap = mailimap_new( 20, &imap_progress );
41 /* connect */ 42 /* connect */
42 if (account->getSSL()) { 43 if (account->getSSL()) {
43 err = mailimap_ssl_connect( m_imap, (char*)server, port ); 44 err = mailimap_ssl_connect( m_imap, (char*)server, port );
44 } else { 45 } else {
45 err = mailimap_socket_connect( m_imap, (char*)server, port ); 46 err = mailimap_socket_connect( m_imap, (char*)server, port );
46 } 47 }
47 48
48 if ( err != MAILIMAP_NO_ERROR && 49 if ( err != MAILIMAP_NO_ERROR &&
49 err != MAILIMAP_NO_ERROR_AUTHENTICATED && 50 err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
50 err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { 51 err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
51 qDebug("error connecting server: %s",m_imap->imap_response); 52 qDebug("error connecting server: %s",m_imap->imap_response);
52 mailimap_free( m_imap ); 53 mailimap_free( m_imap );
53 m_imap = 0; 54 m_imap = 0;
54 return; 55 return;
55 } 56 }
56 57
57 /* login */ 58 /* login */
58 err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); 59 err = mailimap_login_simple( m_imap, (char*)user, (char*)pass );
59 if ( err != MAILIMAP_NO_ERROR ) { 60 if ( err != MAILIMAP_NO_ERROR ) {
60 qDebug("error logging in imap: %s",m_imap->imap_response); 61 qDebug("error logging in imap: %s",m_imap->imap_response);
61 err = mailimap_close( m_imap ); 62 err = mailimap_close( m_imap );
62 mailimap_free( m_imap ); 63 mailimap_free( m_imap );
63 m_imap = 0; 64 m_imap = 0;
64 } 65 }
65} 66}
66 67
67void IMAPwrapper::logout() 68void IMAPwrapper::logout()
68{ 69{
69 int err = MAILIMAP_NO_ERROR; 70 int err = MAILIMAP_NO_ERROR;
70 if (!m_imap) return; 71 if (!m_imap) return;
71 err = mailimap_logout( m_imap ); 72 err = mailimap_logout( m_imap );
72 err = mailimap_close( m_imap ); 73 err = mailimap_close( m_imap );
73 mailimap_free( m_imap ); 74 mailimap_free( m_imap );
74 m_imap = 0; 75 m_imap = 0;
75} 76}
76 77
77void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target ) 78void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
78{ 79{
79 const char *mb; 80 const char *mb;
80 int err = MAILIMAP_NO_ERROR; 81 int err = MAILIMAP_NO_ERROR;
81 clist *result; 82 clist *result;
82 clistcell *current; 83 clistcell *current;
83// mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate,*fetchAttSize; 84// mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate,*fetchAttSize;
84 mailimap_fetch_type *fetchType; 85 mailimap_fetch_type *fetchType;
85 mailimap_set *set; 86 mailimap_set *set;
86 87
87 mb = mailbox.latin1(); 88 mb = mailbox.latin1();
88 login(); 89 login();
89 if (!m_imap) { 90 if (!m_imap) {
90 return; 91 return;
91 } 92 }
92 /* select mailbox READONLY for operations */ 93 /* select mailbox READONLY for operations */
93 err = mailimap_examine( m_imap, (char*)mb); 94 err = mailimap_examine( m_imap, (char*)mb);
94 if ( err != MAILIMAP_NO_ERROR ) { 95 if ( err != MAILIMAP_NO_ERROR ) {
95 qDebug("error selecting mailbox: %s",m_imap->imap_response); 96 qDebug("error selecting mailbox: %s",m_imap->imap_response);
96 return; 97 return;
97 } 98 }
98 99
99 int last = m_imap->imap_selection_info->sel_exists; 100 int last = m_imap->imap_selection_info->sel_exists;
100 101
101 if (last == 0) { 102 if (last == 0) {
102 qDebug("mailbox has no mails"); 103 qDebug("mailbox has no mails");
103 return; 104 return;
104 } 105 }
105 106
106 result = clist_new(); 107 result = clist_new();
107 /* the range has to start at 1!!! not with 0!!!! */ 108 /* the range has to start at 1!!! not with 0!!!! */
108 set = mailimap_set_new_interval( 1, last ); 109 set = mailimap_set_new_interval( 1, last );
109 fetchType = mailimap_fetch_type_new_fetch_att_list_empty(); 110 fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
110 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope()); 111 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
111 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags()); 112 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
112 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate()); 113 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
113 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size()); 114 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
114 115
115 err = mailimap_fetch( m_imap, set, fetchType, &result ); 116 err = mailimap_fetch( m_imap, set, fetchType, &result );
116 mailimap_set_free( set ); 117 mailimap_set_free( set );
117 mailimap_fetch_type_free( fetchType ); 118 mailimap_fetch_type_free( fetchType );
118 119
119 QString date,subject,from; 120 QString date,subject,from;
120 121
121 if ( err == MAILIMAP_NO_ERROR ) { 122 if ( err == MAILIMAP_NO_ERROR ) {
122 123
123 mailimap_msg_att * msg_att; 124 mailimap_msg_att * msg_att;
124 int i = 0; 125 int i = 0;
125 for (current = clist_begin(result); current != 0; current=clist_next(current)) { 126 for (current = clist_begin(result); current != 0; current=clist_next(current)) {
126 ++i; 127 ++i;
127 msg_att = (mailimap_msg_att*)current->data; 128 msg_att = (mailimap_msg_att*)current->data;
128 RecMail*m = parse_list_result(msg_att); 129 RecMail*m = parse_list_result(msg_att);
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 11bf3b8..48e476b 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -1,128 +1,129 @@
1 1
2#include <stdlib.h> 2#include <stdlib.h>
3 3
4#include "imapwrapper.h" 4#include "imapwrapper.h"
5#include "mailtypes.h" 5#include "mailtypes.h"
6#include <libetpan/mailimap.h> 6#include <libetpan/mailimap.h>
7 7
8IMAPwrapper::IMAPwrapper( IMAPaccount *a ) 8IMAPwrapper::IMAPwrapper( IMAPaccount *a )
9{ 9{
10 account = a; 10 account = a;
11 m_imap = 0; 11 m_imap = 0;
12} 12}
13 13
14IMAPwrapper::~IMAPwrapper() 14IMAPwrapper::~IMAPwrapper()
15{ 15{
16 logout(); 16 logout();
17} 17}
18 18
19void IMAPwrapper::imap_progress( size_t current, size_t maximum ) 19void IMAPwrapper::imap_progress( size_t current, size_t maximum )
20{ 20{
21 qDebug( "IMAP: %i of %i", current, maximum ); 21 qDebug( "IMAP: %i of %i", current, maximum );
22} 22}
23 23
24void IMAPwrapper::login() 24void IMAPwrapper::login()
25{ 25{
26 const char *server, *user, *pass; 26 const char *server, *user, *pass;
27 uint16_t port; 27 uint16_t port;
28 int err = MAILIMAP_NO_ERROR; 28 int err = MAILIMAP_NO_ERROR;
29 29
30 /* we are connected this moment */ 30 /* we are connected this moment */
31 /* TODO: setup a timer holding the line or if connection closed - delete the value */ 31 /* TODO: setup a timer holding the line or if connection closed - delete the value */
32 if (m_imap) { 32 if (m_imap) {
33 mailstream_flush(m_imap->imap_stream);
33 return; 34 return;
34 } 35 }
35 server = account->getServer().latin1(); 36 server = account->getServer().latin1();
36 port = account->getPort().toUInt(); 37 port = account->getPort().toUInt();
37 user = account->getUser().latin1(); 38 user = account->getUser().latin1();
38 pass = account->getPassword().latin1(); 39 pass = account->getPassword().latin1();
39 40
40 m_imap = mailimap_new( 20, &imap_progress ); 41 m_imap = mailimap_new( 20, &imap_progress );
41 /* connect */ 42 /* connect */
42 if (account->getSSL()) { 43 if (account->getSSL()) {
43 err = mailimap_ssl_connect( m_imap, (char*)server, port ); 44 err = mailimap_ssl_connect( m_imap, (char*)server, port );
44 } else { 45 } else {
45 err = mailimap_socket_connect( m_imap, (char*)server, port ); 46 err = mailimap_socket_connect( m_imap, (char*)server, port );
46 } 47 }
47 48
48 if ( err != MAILIMAP_NO_ERROR && 49 if ( err != MAILIMAP_NO_ERROR &&
49 err != MAILIMAP_NO_ERROR_AUTHENTICATED && 50 err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
50 err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { 51 err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
51 qDebug("error connecting server: %s",m_imap->imap_response); 52 qDebug("error connecting server: %s",m_imap->imap_response);
52 mailimap_free( m_imap ); 53 mailimap_free( m_imap );
53 m_imap = 0; 54 m_imap = 0;
54 return; 55 return;
55 } 56 }
56 57
57 /* login */ 58 /* login */
58 err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); 59 err = mailimap_login_simple( m_imap, (char*)user, (char*)pass );
59 if ( err != MAILIMAP_NO_ERROR ) { 60 if ( err != MAILIMAP_NO_ERROR ) {
60 qDebug("error logging in imap: %s",m_imap->imap_response); 61 qDebug("error logging in imap: %s",m_imap->imap_response);
61 err = mailimap_close( m_imap ); 62 err = mailimap_close( m_imap );
62 mailimap_free( m_imap ); 63 mailimap_free( m_imap );
63 m_imap = 0; 64 m_imap = 0;
64 } 65 }
65} 66}
66 67
67void IMAPwrapper::logout() 68void IMAPwrapper::logout()
68{ 69{
69 int err = MAILIMAP_NO_ERROR; 70 int err = MAILIMAP_NO_ERROR;
70 if (!m_imap) return; 71 if (!m_imap) return;
71 err = mailimap_logout( m_imap ); 72 err = mailimap_logout( m_imap );
72 err = mailimap_close( m_imap ); 73 err = mailimap_close( m_imap );
73 mailimap_free( m_imap ); 74 mailimap_free( m_imap );
74 m_imap = 0; 75 m_imap = 0;
75} 76}
76 77
77void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target ) 78void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
78{ 79{
79 const char *mb; 80 const char *mb;
80 int err = MAILIMAP_NO_ERROR; 81 int err = MAILIMAP_NO_ERROR;
81 clist *result; 82 clist *result;
82 clistcell *current; 83 clistcell *current;
83// mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate,*fetchAttSize; 84// mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate,*fetchAttSize;
84 mailimap_fetch_type *fetchType; 85 mailimap_fetch_type *fetchType;
85 mailimap_set *set; 86 mailimap_set *set;
86 87
87 mb = mailbox.latin1(); 88 mb = mailbox.latin1();
88 login(); 89 login();
89 if (!m_imap) { 90 if (!m_imap) {
90 return; 91 return;
91 } 92 }
92 /* select mailbox READONLY for operations */ 93 /* select mailbox READONLY for operations */
93 err = mailimap_examine( m_imap, (char*)mb); 94 err = mailimap_examine( m_imap, (char*)mb);
94 if ( err != MAILIMAP_NO_ERROR ) { 95 if ( err != MAILIMAP_NO_ERROR ) {
95 qDebug("error selecting mailbox: %s",m_imap->imap_response); 96 qDebug("error selecting mailbox: %s",m_imap->imap_response);
96 return; 97 return;
97 } 98 }
98 99
99 int last = m_imap->imap_selection_info->sel_exists; 100 int last = m_imap->imap_selection_info->sel_exists;
100 101
101 if (last == 0) { 102 if (last == 0) {
102 qDebug("mailbox has no mails"); 103 qDebug("mailbox has no mails");
103 return; 104 return;
104 } 105 }
105 106
106 result = clist_new(); 107 result = clist_new();
107 /* the range has to start at 1!!! not with 0!!!! */ 108 /* the range has to start at 1!!! not with 0!!!! */
108 set = mailimap_set_new_interval( 1, last ); 109 set = mailimap_set_new_interval( 1, last );
109 fetchType = mailimap_fetch_type_new_fetch_att_list_empty(); 110 fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
110 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope()); 111 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
111 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags()); 112 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
112 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate()); 113 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
113 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size()); 114 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
114 115
115 err = mailimap_fetch( m_imap, set, fetchType, &result ); 116 err = mailimap_fetch( m_imap, set, fetchType, &result );
116 mailimap_set_free( set ); 117 mailimap_set_free( set );
117 mailimap_fetch_type_free( fetchType ); 118 mailimap_fetch_type_free( fetchType );
118 119
119 QString date,subject,from; 120 QString date,subject,from;
120 121
121 if ( err == MAILIMAP_NO_ERROR ) { 122 if ( err == MAILIMAP_NO_ERROR ) {
122 123
123 mailimap_msg_att * msg_att; 124 mailimap_msg_att * msg_att;
124 int i = 0; 125 int i = 0;
125 for (current = clist_begin(result); current != 0; current=clist_next(current)) { 126 for (current = clist_begin(result); current != 0; current=clist_next(current)) {
126 ++i; 127 ++i;
127 msg_att = (mailimap_msg_att*)current->data; 128 msg_att = (mailimap_msg_att*)current->data;
128 RecMail*m = parse_list_result(msg_att); 129 RecMail*m = parse_list_result(msg_att);