author | alwin <alwin> | 2003-12-18 01:52:02 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-18 01:52:02 (UTC) |
commit | 77e353da0c33bbfabf1b919e25008d62581bf164 (patch) (unidiff) | |
tree | ed9d2ccc255de8159598a647a39f31399568cbb9 /noncore | |
parent | e996a7b13e2860280a63d089716958c7886cdc8d (diff) | |
download | opie-77e353da0c33bbfabf1b919e25008d62581bf164.zip opie-77e353da0c33bbfabf1b919e25008d62581bf164.tar.gz opie-77e353da0c33bbfabf1b919e25008d62581bf164.tar.bz2 |
nothing much.
just only check in my tries to finish the pop3 stuff
and found another bug inside libetpan.
when decoding text with fun "mailmime_encoded_phrase_parse" it
works fine on i386 machines but not on arm (segmentation fault inside
this fun) - it has to be resolved.
-rw-r--r-- | noncore/net/mail/abstractmail.cpp | 23 | ||||
-rw-r--r-- | noncore/net/mail/abstractmail.h | 1 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.cpp | 23 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.h | 1 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 43 | ||||
-rw-r--r-- | noncore/net/mail/pop3wrapper.cpp | 43 |
6 files changed, 124 insertions, 10 deletions
diff --git a/noncore/net/mail/abstractmail.cpp b/noncore/net/mail/abstractmail.cpp index 92a46f1..b7e5eaa 100644 --- a/noncore/net/mail/abstractmail.cpp +++ b/noncore/net/mail/abstractmail.cpp | |||
@@ -37,12 +37,35 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin | |||
37 | } | 37 | } |
38 | 38 | ||
39 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, | 39 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, |
40 | &result_text,&target_length); | 40 | &result_text,&target_length); |
41 | 41 | ||
42 | encodedString* result = new encodedString(); | 42 | encodedString* result = new encodedString(); |
43 | if (err == MAILIMF_NO_ERROR) { | 43 | if (err == MAILIMF_NO_ERROR) { |
44 | result->setContent(result_text,target_length); | 44 | result->setContent(result_text,target_length); |
45 | } | 45 | } |
46 | qDebug("Decode string finished"); | 46 | qDebug("Decode string finished"); |
47 | return result; | 47 | return result; |
48 | } | 48 | } |
49 | |||
50 | QString AbstractMail::convert_String(const char*text) | ||
51 | { | ||
52 | #if 0 | ||
53 | size_t index = 0; | ||
54 | char*res = 0; | ||
55 | |||
56 | qDebug("encode start %s",text); | ||
57 | /* attention - doesn't work with arm systems! */ | ||
58 | int err = mailmime_encoded_phrase_parse("iso-8859-1", | ||
59 | text, strlen(text),&index, "iso-8859-1",&res); | ||
60 | qDebug("encode end"); | ||
61 | if (err != MAILIMF_NO_ERROR) { | ||
62 | if (res) free(res); | ||
63 | return QString(text); | ||
64 | } | ||
65 | QString result(res); | ||
66 | free(res); | ||
67 | return result; | ||
68 | #else | ||
69 | return QString(text); | ||
70 | #endif | ||
71 | } | ||
diff --git a/noncore/net/mail/abstractmail.h b/noncore/net/mail/abstractmail.h index f1a8468..c16e9c0 100644 --- a/noncore/net/mail/abstractmail.h +++ b/noncore/net/mail/abstractmail.h | |||
@@ -22,14 +22,15 @@ public: | |||
22 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0; | 22 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0; |
23 | virtual RecBody fetchBody(const RecMail&mail)=0; | 23 | virtual RecBody fetchBody(const RecMail&mail)=0; |
24 | virtual QString fetchTextPart(const RecMail&mail,const RecPart&part)=0; | 24 | virtual QString fetchTextPart(const RecMail&mail,const RecPart&part)=0; |
25 | virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part)=0; | 25 | virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part)=0; |
26 | virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part)=0; | 26 | virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part)=0; |
27 | 27 | ||
28 | virtual void deleteMail(const RecMail&mail)=0; | 28 | virtual void deleteMail(const RecMail&mail)=0; |
29 | virtual void answeredMail(const RecMail&mail)=0; | 29 | virtual void answeredMail(const RecMail&mail)=0; |
30 | 30 | ||
31 | static AbstractMail* getWrapper(IMAPaccount *a); | 31 | static AbstractMail* getWrapper(IMAPaccount *a); |
32 | static AbstractMail* getWrapper(POP3account *a); | 32 | static AbstractMail* getWrapper(POP3account *a); |
33 | static encodedString*decode_String(const encodedString*text,const QString&enc); | 33 | static encodedString*decode_String(const encodedString*text,const QString&enc); |
34 | static QString convert_String(const char*text); | ||
34 | }; | 35 | }; |
35 | #endif | 36 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index 92a46f1..b7e5eaa 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp | |||
@@ -37,12 +37,35 @@ encodedString* AbstractMail::decode_String(const encodedString*text,const QStrin | |||
37 | } | 37 | } |
38 | 38 | ||
39 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, | 39 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, |
40 | &result_text,&target_length); | 40 | &result_text,&target_length); |
41 | 41 | ||
42 | encodedString* result = new encodedString(); | 42 | encodedString* result = new encodedString(); |
43 | if (err == MAILIMF_NO_ERROR) { | 43 | if (err == MAILIMF_NO_ERROR) { |
44 | result->setContent(result_text,target_length); | 44 | result->setContent(result_text,target_length); |
45 | } | 45 | } |
46 | qDebug("Decode string finished"); | 46 | qDebug("Decode string finished"); |
47 | return result; | 47 | return result; |
48 | } | 48 | } |
49 | |||
50 | QString AbstractMail::convert_String(const char*text) | ||
51 | { | ||
52 | #if 0 | ||
53 | size_t index = 0; | ||
54 | char*res = 0; | ||
55 | |||
56 | qDebug("encode start %s",text); | ||
57 | /* attention - doesn't work with arm systems! */ | ||
58 | int err = mailmime_encoded_phrase_parse("iso-8859-1", | ||
59 | text, strlen(text),&index, "iso-8859-1",&res); | ||
60 | qDebug("encode end"); | ||
61 | if (err != MAILIMF_NO_ERROR) { | ||
62 | if (res) free(res); | ||
63 | return QString(text); | ||
64 | } | ||
65 | QString result(res); | ||
66 | free(res); | ||
67 | return result; | ||
68 | #else | ||
69 | return QString(text); | ||
70 | #endif | ||
71 | } | ||
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h index f1a8468..c16e9c0 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.h +++ b/noncore/net/mail/libmailwrapper/abstractmail.h | |||
@@ -22,14 +22,15 @@ public: | |||
22 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0; | 22 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0; |
23 | virtual RecBody fetchBody(const RecMail&mail)=0; | 23 | virtual RecBody fetchBody(const RecMail&mail)=0; |
24 | virtual QString fetchTextPart(const RecMail&mail,const RecPart&part)=0; | 24 | virtual QString fetchTextPart(const RecMail&mail,const RecPart&part)=0; |
25 | virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part)=0; | 25 | virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part)=0; |
26 | virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part)=0; | 26 | virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part)=0; |
27 | 27 | ||
28 | virtual void deleteMail(const RecMail&mail)=0; | 28 | virtual void deleteMail(const RecMail&mail)=0; |
29 | virtual void answeredMail(const RecMail&mail)=0; | 29 | virtual void answeredMail(const RecMail&mail)=0; |
30 | 30 | ||
31 | static AbstractMail* getWrapper(IMAPaccount *a); | 31 | static AbstractMail* getWrapper(IMAPaccount *a); |
32 | static AbstractMail* getWrapper(POP3account *a); | 32 | static AbstractMail* getWrapper(POP3account *a); |
33 | static encodedString*decode_String(const encodedString*text,const QString&enc); | 33 | static encodedString*decode_String(const encodedString*text,const QString&enc); |
34 | static QString convert_String(const char*text); | ||
34 | }; | 35 | }; |
35 | #endif | 36 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 30f80ff..22a4c70 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -1,19 +1,23 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include <libetpan/mailpop3.h> | 4 | #include <libetpan/mailpop3.h> |
5 | #include <libetpan/mailmime.h> | 5 | #include <libetpan/mailmime.h> |
6 | #include <libetpan/data_message_driver.h> | ||
6 | #include <qfile.h> | 7 | #include <qfile.h> |
7 | 8 | ||
9 | /* we don't fetch messages larger than 5 MB */ | ||
10 | #define HARD_MSG_SIZE_LIMIT 5242880 | ||
11 | |||
8 | POP3wrapper::POP3wrapper( POP3account *a ) | 12 | POP3wrapper::POP3wrapper( POP3account *a ) |
9 | { | 13 | { |
10 | account = a; | 14 | account = a; |
11 | m_pop3 = NULL; | 15 | m_pop3 = NULL; |
12 | msgTempName = a->getFileName()+"_msg_cache"; | 16 | msgTempName = a->getFileName()+"_msg_cache"; |
13 | last_msg_id = 0; | 17 | last_msg_id = 0; |
14 | } | 18 | } |
15 | 19 | ||
16 | POP3wrapper::~POP3wrapper() | 20 | POP3wrapper::~POP3wrapper() |
17 | { | 21 | { |
18 | logout(); | 22 | logout(); |
19 | QFile msg_cache(msgTempName); | 23 | QFile msg_cache(msgTempName); |
@@ -28,28 +32,33 @@ void POP3wrapper::pop3_progress( size_t current, size_t maximum ) | |||
28 | } | 32 | } |
29 | 33 | ||
30 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) | 34 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) |
31 | { | 35 | { |
32 | int err = MAILPOP3_NO_ERROR; | 36 | int err = MAILPOP3_NO_ERROR; |
33 | char *message; | 37 | char *message; |
34 | size_t length = 0; | 38 | size_t length = 0; |
35 | 39 | ||
36 | login(); | 40 | login(); |
37 | if ( !m_pop3 ) { | 41 | if ( !m_pop3 ) { |
38 | return RecBody(); | 42 | return RecBody(); |
39 | } | 43 | } |
44 | |||
40 | RecBody body; | 45 | RecBody body; |
41 | 46 | ||
42 | QFile msg_cache(msgTempName); | 47 | QFile msg_cache(msgTempName); |
43 | 48 | ||
49 | if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) { | ||
50 | qDebug("Message to large: %i",mail.Msgsize()); | ||
51 | return body; | ||
52 | } | ||
44 | if (mail.getNumber()!=last_msg_id) { | 53 | if (mail.getNumber()!=last_msg_id) { |
45 | if (msg_cache.exists()) { | 54 | if (msg_cache.exists()) { |
46 | msg_cache.remove(); | 55 | msg_cache.remove(); |
47 | } | 56 | } |
48 | msg_cache.open(IO_ReadWrite|IO_Truncate); | 57 | msg_cache.open(IO_ReadWrite|IO_Truncate); |
49 | last_msg_id = mail.getNumber(); | 58 | last_msg_id = mail.getNumber(); |
50 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); | 59 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); |
51 | if ( err != MAILPOP3_NO_ERROR ) { | 60 | if ( err != MAILPOP3_NO_ERROR ) { |
52 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); | 61 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); |
53 | last_msg_id = 0; | 62 | last_msg_id = 0; |
54 | return RecBody(); | 63 | return RecBody(); |
55 | } | 64 | } |
@@ -70,53 +79,78 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) | |||
70 | } | 79 | } |
71 | body = parseMail(message); | 80 | body = parseMail(message); |
72 | free(message); | 81 | free(message); |
73 | return body; | 82 | return body; |
74 | } | 83 | } |
75 | 84 | ||
76 | RecBody POP3wrapper::parseMail( char *message ) | 85 | RecBody POP3wrapper::parseMail( char *message ) |
77 | { | 86 | { |
78 | int err = MAILIMF_NO_ERROR; | 87 | int err = MAILIMF_NO_ERROR; |
79 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ | 88 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
80 | size_t curTok = 0; | 89 | size_t curTok = 0; |
81 | mailimf_message *result = 0; | 90 | mailimf_message *result = 0; |
91 | mailmessage * msg=0; | ||
92 | struct mailmime * mime=0; | ||
93 | struct mailmime_single_fields fields; | ||
94 | |||
82 | RecBody body; | 95 | RecBody body; |
83 | 96 | ||
84 | 97 | ||
85 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); | 98 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); |
86 | if ( err != MAILIMF_NO_ERROR ) { | 99 | if ( err != MAILIMF_NO_ERROR ) { |
87 | if (result) mailimf_message_free(result); | 100 | if (result) mailimf_message_free(result); |
88 | return body; | 101 | return body; |
89 | } | 102 | } |
90 | 103 | ||
91 | struct mailimf_body * b = 0; | 104 | #if 0 |
92 | struct mailimf_fields * f = 0; | 105 | char*body_msg = message; |
106 | if ( result && result->msg_body && result->msg_body->bd_text ) { | ||
107 | body_msg = (char*)result->msg_body->bd_text; | ||
108 | result->msg_body->bd_text = 0; | ||
109 | } | ||
110 | |||
111 | msg = mailmessage_new(); | ||
112 | mailmessage_init(msg, NULL, data_message_driver, 0, strlen(body_msg)); | ||
113 | generic_message_t * msg_data; | ||
114 | msg_data = (generic_message_t *)msg->msg_data; | ||
115 | msg_data->msg_fetched = 1; | ||
116 | msg_data->msg_message = body_msg; | ||
117 | msg_data->msg_length = strlen(body_msg); | ||
118 | memset(&fields, 0, sizeof(struct mailmime_single_fields)); | ||
119 | err = mailmessage_get_bodystructure(msg,&mime); | ||
93 | 120 | ||
121 | if (mime->mm_mime_fields != NULL) { | ||
122 | mailmime_single_fields_init(&fields, mime->mm_mime_fields, | ||
123 | mime->mm_content_type); | ||
124 | } | ||
125 | #endif | ||
94 | 126 | ||
127 | #if 1 | ||
95 | if ( result && result->msg_body && result->msg_body->bd_text ) { | 128 | if ( result && result->msg_body && result->msg_body->bd_text ) { |
96 | qDebug( "POP3: bodytext found" ); | 129 | qDebug( "POP3: bodytext found" ); |
97 | // when curTok isn't set to 0 this line will fault! 'cause upper line faults! | 130 | // when curTok isn't set to 0 this line will fault! 'cause upper line faults! |
98 | body.setBodytext( QString( result->msg_body->bd_text ) ); | 131 | body.setBodytext( QString( result->msg_body->bd_text ) ); |
99 | #if 0 | 132 | #if 0 |
100 | curTok = 0; | 133 | curTok = 0; |
101 | mailmime_content*mresult = 0; | 134 | mailmime_content*mresult = 0; |
102 | size_t index = 0; | 135 | size_t index = 0; |
103 | mailmime_content_parse(result->msg_body->bd_text, | 136 | mailmime_content_parse(result->msg_body->bd_text, |
104 | strlen(result->msg_body->bd_text),&index,&mresult); | 137 | strlen(result->msg_body->bd_text),&index,&mresult); |
105 | if (mresult) { | 138 | if (mresult) { |
106 | mailmime_content_free(mresult); | 139 | mailmime_content_free(mresult); |
107 | } | 140 | } |
108 | #endif | 141 | #endif |
109 | mailimf_message_free(result); | 142 | mailimf_message_free(result); |
110 | } | 143 | } |
144 | #endif | ||
111 | return body; | 145 | return body; |
112 | } | 146 | } |
113 | 147 | ||
114 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | 148 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) |
115 | { | 149 | { |
116 | int err = MAILPOP3_NO_ERROR; | 150 | int err = MAILPOP3_NO_ERROR; |
117 | char * header = 0; | 151 | char * header = 0; |
118 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ | 152 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
119 | size_t length = 0; | 153 | size_t length = 0; |
120 | carray * messages = 0; | 154 | carray * messages = 0; |
121 | 155 | ||
122 | login(); | 156 | login(); |
@@ -163,25 +197,25 @@ RecMail *POP3wrapper::parseHeader( const char *header ) | |||
163 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); | 197 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); |
164 | break; | 198 | break; |
165 | case MAILIMF_FIELD_TO: | 199 | case MAILIMF_FIELD_TO: |
166 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); | 200 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); |
167 | break; | 201 | break; |
168 | case MAILIMF_FIELD_CC: | 202 | case MAILIMF_FIELD_CC: |
169 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); | 203 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); |
170 | break; | 204 | break; |
171 | case MAILIMF_FIELD_BCC: | 205 | case MAILIMF_FIELD_BCC: |
172 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); | 206 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); |
173 | break; | 207 | break; |
174 | case MAILIMF_FIELD_SUBJECT: | 208 | case MAILIMF_FIELD_SUBJECT: |
175 | mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) ); | 209 | mail->setSubject(convert_String( field->fld_data.fld_subject->sbj_value ) ); |
176 | break; | 210 | break; |
177 | case MAILIMF_FIELD_ORIG_DATE: | 211 | case MAILIMF_FIELD_ORIG_DATE: |
178 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); | 212 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); |
179 | break; | 213 | break; |
180 | case MAILIMF_FIELD_MESSAGE_ID: | 214 | case MAILIMF_FIELD_MESSAGE_ID: |
181 | mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); | 215 | mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); |
182 | break; | 216 | break; |
183 | case MAILIMF_FIELD_REFERENCES: | 217 | case MAILIMF_FIELD_REFERENCES: |
184 | refs = field->fld_data.fld_references; | 218 | refs = field->fld_data.fld_references; |
185 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { | 219 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { |
186 | char * text = (char*)refs->mid_list->first->data; | 220 | char * text = (char*)refs->mid_list->first->data; |
187 | mail->setReplyto(QString(text)); | 221 | mail->setReplyto(QString(text)); |
@@ -194,25 +228,24 @@ RecMail *POP3wrapper::parseHeader( const char *header ) | |||
194 | } | 228 | } |
195 | break; | 229 | break; |
196 | case MAILIMF_FIELD_OPTIONAL_FIELD: | 230 | case MAILIMF_FIELD_OPTIONAL_FIELD: |
197 | status = field->fld_data.fld_optional_field->fld_name; | 231 | status = field->fld_data.fld_optional_field->fld_name; |
198 | value = field->fld_data.fld_optional_field->fld_value; | 232 | value = field->fld_data.fld_optional_field->fld_value; |
199 | if (status.lower()=="status") { | 233 | if (status.lower()=="status") { |
200 | if (value.lower()=="ro") { | 234 | if (value.lower()=="ro") { |
201 | mFlags.setBit(FLAG_SEEN); | 235 | mFlags.setBit(FLAG_SEEN); |
202 | } | 236 | } |
203 | } else if (status.lower()=="x-status") { | 237 | } else if (status.lower()=="x-status") { |
204 | qDebug("X-Status: %s",value.latin1()); | 238 | qDebug("X-Status: %s",value.latin1()); |
205 | if (value.lower()=="a") { | 239 | if (value.lower()=="a") { |
206 | |||
207 | mFlags.setBit(FLAG_ANSWERED); | 240 | mFlags.setBit(FLAG_ANSWERED); |
208 | } | 241 | } |
209 | } else { | 242 | } else { |
210 | // qDebug("Optionales feld: %s -> %s)",field->fld_data.fld_optional_field->fld_name, | 243 | // qDebug("Optionales feld: %s -> %s)",field->fld_data.fld_optional_field->fld_name, |
211 | // field->fld_data.fld_optional_field->fld_value); | 244 | // field->fld_data.fld_optional_field->fld_value); |
212 | } | 245 | } |
213 | break; | 246 | break; |
214 | default: | 247 | default: |
215 | qDebug("Non parsed field"); | 248 | qDebug("Non parsed field"); |
216 | break; | 249 | break; |
217 | } | 250 | } |
218 | } | 251 | } |
@@ -275,25 +308,25 @@ QString POP3wrapper::parseGroup( mailimf_group *group ) | |||
275 | result.append( ";" ); | 308 | result.append( ";" ); |
276 | 309 | ||
277 | return result; | 310 | return result; |
278 | } | 311 | } |
279 | 312 | ||
280 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) | 313 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) |
281 | { | 314 | { |
282 | QString result( "" ); | 315 | QString result( "" ); |
283 | 316 | ||
284 | if ( box->mb_display_name == NULL ) { | 317 | if ( box->mb_display_name == NULL ) { |
285 | result.append( box->mb_addr_spec ); | 318 | result.append( box->mb_addr_spec ); |
286 | } else { | 319 | } else { |
287 | result.append( box->mb_display_name ); | 320 | result.append( convert_String(box->mb_display_name).latin1() ); |
288 | result.append( " <" ); | 321 | result.append( " <" ); |
289 | result.append( box->mb_addr_spec ); | 322 | result.append( box->mb_addr_spec ); |
290 | result.append( ">" ); | 323 | result.append( ">" ); |
291 | } | 324 | } |
292 | 325 | ||
293 | return result; | 326 | return result; |
294 | } | 327 | } |
295 | 328 | ||
296 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) | 329 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) |
297 | { | 330 | { |
298 | QString result( "" ); | 331 | QString result( "" ); |
299 | 332 | ||
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp index 30f80ff..22a4c70 100644 --- a/noncore/net/mail/pop3wrapper.cpp +++ b/noncore/net/mail/pop3wrapper.cpp | |||
@@ -1,19 +1,23 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include <libetpan/mailpop3.h> | 4 | #include <libetpan/mailpop3.h> |
5 | #include <libetpan/mailmime.h> | 5 | #include <libetpan/mailmime.h> |
6 | #include <libetpan/data_message_driver.h> | ||
6 | #include <qfile.h> | 7 | #include <qfile.h> |
7 | 8 | ||
9 | /* we don't fetch messages larger than 5 MB */ | ||
10 | #define HARD_MSG_SIZE_LIMIT 5242880 | ||
11 | |||
8 | POP3wrapper::POP3wrapper( POP3account *a ) | 12 | POP3wrapper::POP3wrapper( POP3account *a ) |
9 | { | 13 | { |
10 | account = a; | 14 | account = a; |
11 | m_pop3 = NULL; | 15 | m_pop3 = NULL; |
12 | msgTempName = a->getFileName()+"_msg_cache"; | 16 | msgTempName = a->getFileName()+"_msg_cache"; |
13 | last_msg_id = 0; | 17 | last_msg_id = 0; |
14 | } | 18 | } |
15 | 19 | ||
16 | POP3wrapper::~POP3wrapper() | 20 | POP3wrapper::~POP3wrapper() |
17 | { | 21 | { |
18 | logout(); | 22 | logout(); |
19 | QFile msg_cache(msgTempName); | 23 | QFile msg_cache(msgTempName); |
@@ -28,28 +32,33 @@ void POP3wrapper::pop3_progress( size_t current, size_t maximum ) | |||
28 | } | 32 | } |
29 | 33 | ||
30 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) | 34 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) |
31 | { | 35 | { |
32 | int err = MAILPOP3_NO_ERROR; | 36 | int err = MAILPOP3_NO_ERROR; |
33 | char *message; | 37 | char *message; |
34 | size_t length = 0; | 38 | size_t length = 0; |
35 | 39 | ||
36 | login(); | 40 | login(); |
37 | if ( !m_pop3 ) { | 41 | if ( !m_pop3 ) { |
38 | return RecBody(); | 42 | return RecBody(); |
39 | } | 43 | } |
44 | |||
40 | RecBody body; | 45 | RecBody body; |
41 | 46 | ||
42 | QFile msg_cache(msgTempName); | 47 | QFile msg_cache(msgTempName); |
43 | 48 | ||
49 | if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) { | ||
50 | qDebug("Message to large: %i",mail.Msgsize()); | ||
51 | return body; | ||
52 | } | ||
44 | if (mail.getNumber()!=last_msg_id) { | 53 | if (mail.getNumber()!=last_msg_id) { |
45 | if (msg_cache.exists()) { | 54 | if (msg_cache.exists()) { |
46 | msg_cache.remove(); | 55 | msg_cache.remove(); |
47 | } | 56 | } |
48 | msg_cache.open(IO_ReadWrite|IO_Truncate); | 57 | msg_cache.open(IO_ReadWrite|IO_Truncate); |
49 | last_msg_id = mail.getNumber(); | 58 | last_msg_id = mail.getNumber(); |
50 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); | 59 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); |
51 | if ( err != MAILPOP3_NO_ERROR ) { | 60 | if ( err != MAILPOP3_NO_ERROR ) { |
52 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); | 61 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); |
53 | last_msg_id = 0; | 62 | last_msg_id = 0; |
54 | return RecBody(); | 63 | return RecBody(); |
55 | } | 64 | } |
@@ -70,53 +79,78 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) | |||
70 | } | 79 | } |
71 | body = parseMail(message); | 80 | body = parseMail(message); |
72 | free(message); | 81 | free(message); |
73 | return body; | 82 | return body; |
74 | } | 83 | } |
75 | 84 | ||
76 | RecBody POP3wrapper::parseMail( char *message ) | 85 | RecBody POP3wrapper::parseMail( char *message ) |
77 | { | 86 | { |
78 | int err = MAILIMF_NO_ERROR; | 87 | int err = MAILIMF_NO_ERROR; |
79 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ | 88 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
80 | size_t curTok = 0; | 89 | size_t curTok = 0; |
81 | mailimf_message *result = 0; | 90 | mailimf_message *result = 0; |
91 | mailmessage * msg=0; | ||
92 | struct mailmime * mime=0; | ||
93 | struct mailmime_single_fields fields; | ||
94 | |||
82 | RecBody body; | 95 | RecBody body; |
83 | 96 | ||
84 | 97 | ||
85 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); | 98 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); |
86 | if ( err != MAILIMF_NO_ERROR ) { | 99 | if ( err != MAILIMF_NO_ERROR ) { |
87 | if (result) mailimf_message_free(result); | 100 | if (result) mailimf_message_free(result); |
88 | return body; | 101 | return body; |
89 | } | 102 | } |
90 | 103 | ||
91 | struct mailimf_body * b = 0; | 104 | #if 0 |
92 | struct mailimf_fields * f = 0; | 105 | char*body_msg = message; |
106 | if ( result && result->msg_body && result->msg_body->bd_text ) { | ||
107 | body_msg = (char*)result->msg_body->bd_text; | ||
108 | result->msg_body->bd_text = 0; | ||
109 | } | ||
110 | |||
111 | msg = mailmessage_new(); | ||
112 | mailmessage_init(msg, NULL, data_message_driver, 0, strlen(body_msg)); | ||
113 | generic_message_t * msg_data; | ||
114 | msg_data = (generic_message_t *)msg->msg_data; | ||
115 | msg_data->msg_fetched = 1; | ||
116 | msg_data->msg_message = body_msg; | ||
117 | msg_data->msg_length = strlen(body_msg); | ||
118 | memset(&fields, 0, sizeof(struct mailmime_single_fields)); | ||
119 | err = mailmessage_get_bodystructure(msg,&mime); | ||
93 | 120 | ||
121 | if (mime->mm_mime_fields != NULL) { | ||
122 | mailmime_single_fields_init(&fields, mime->mm_mime_fields, | ||
123 | mime->mm_content_type); | ||
124 | } | ||
125 | #endif | ||
94 | 126 | ||
127 | #if 1 | ||
95 | if ( result && result->msg_body && result->msg_body->bd_text ) { | 128 | if ( result && result->msg_body && result->msg_body->bd_text ) { |
96 | qDebug( "POP3: bodytext found" ); | 129 | qDebug( "POP3: bodytext found" ); |
97 | // when curTok isn't set to 0 this line will fault! 'cause upper line faults! | 130 | // when curTok isn't set to 0 this line will fault! 'cause upper line faults! |
98 | body.setBodytext( QString( result->msg_body->bd_text ) ); | 131 | body.setBodytext( QString( result->msg_body->bd_text ) ); |
99 | #if 0 | 132 | #if 0 |
100 | curTok = 0; | 133 | curTok = 0; |
101 | mailmime_content*mresult = 0; | 134 | mailmime_content*mresult = 0; |
102 | size_t index = 0; | 135 | size_t index = 0; |
103 | mailmime_content_parse(result->msg_body->bd_text, | 136 | mailmime_content_parse(result->msg_body->bd_text, |
104 | strlen(result->msg_body->bd_text),&index,&mresult); | 137 | strlen(result->msg_body->bd_text),&index,&mresult); |
105 | if (mresult) { | 138 | if (mresult) { |
106 | mailmime_content_free(mresult); | 139 | mailmime_content_free(mresult); |
107 | } | 140 | } |
108 | #endif | 141 | #endif |
109 | mailimf_message_free(result); | 142 | mailimf_message_free(result); |
110 | } | 143 | } |
144 | #endif | ||
111 | return body; | 145 | return body; |
112 | } | 146 | } |
113 | 147 | ||
114 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | 148 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) |
115 | { | 149 | { |
116 | int err = MAILPOP3_NO_ERROR; | 150 | int err = MAILPOP3_NO_ERROR; |
117 | char * header = 0; | 151 | char * header = 0; |
118 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ | 152 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
119 | size_t length = 0; | 153 | size_t length = 0; |
120 | carray * messages = 0; | 154 | carray * messages = 0; |
121 | 155 | ||
122 | login(); | 156 | login(); |
@@ -163,25 +197,25 @@ RecMail *POP3wrapper::parseHeader( const char *header ) | |||
163 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); | 197 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); |
164 | break; | 198 | break; |
165 | case MAILIMF_FIELD_TO: | 199 | case MAILIMF_FIELD_TO: |
166 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); | 200 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); |
167 | break; | 201 | break; |
168 | case MAILIMF_FIELD_CC: | 202 | case MAILIMF_FIELD_CC: |
169 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); | 203 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); |
170 | break; | 204 | break; |
171 | case MAILIMF_FIELD_BCC: | 205 | case MAILIMF_FIELD_BCC: |
172 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); | 206 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); |
173 | break; | 207 | break; |
174 | case MAILIMF_FIELD_SUBJECT: | 208 | case MAILIMF_FIELD_SUBJECT: |
175 | mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) ); | 209 | mail->setSubject(convert_String( field->fld_data.fld_subject->sbj_value ) ); |
176 | break; | 210 | break; |
177 | case MAILIMF_FIELD_ORIG_DATE: | 211 | case MAILIMF_FIELD_ORIG_DATE: |
178 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); | 212 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); |
179 | break; | 213 | break; |
180 | case MAILIMF_FIELD_MESSAGE_ID: | 214 | case MAILIMF_FIELD_MESSAGE_ID: |
181 | mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); | 215 | mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); |
182 | break; | 216 | break; |
183 | case MAILIMF_FIELD_REFERENCES: | 217 | case MAILIMF_FIELD_REFERENCES: |
184 | refs = field->fld_data.fld_references; | 218 | refs = field->fld_data.fld_references; |
185 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { | 219 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { |
186 | char * text = (char*)refs->mid_list->first->data; | 220 | char * text = (char*)refs->mid_list->first->data; |
187 | mail->setReplyto(QString(text)); | 221 | mail->setReplyto(QString(text)); |
@@ -194,25 +228,24 @@ RecMail *POP3wrapper::parseHeader( const char *header ) | |||
194 | } | 228 | } |
195 | break; | 229 | break; |
196 | case MAILIMF_FIELD_OPTIONAL_FIELD: | 230 | case MAILIMF_FIELD_OPTIONAL_FIELD: |
197 | status = field->fld_data.fld_optional_field->fld_name; | 231 | status = field->fld_data.fld_optional_field->fld_name; |
198 | value = field->fld_data.fld_optional_field->fld_value; | 232 | value = field->fld_data.fld_optional_field->fld_value; |
199 | if (status.lower()=="status") { | 233 | if (status.lower()=="status") { |
200 | if (value.lower()=="ro") { | 234 | if (value.lower()=="ro") { |
201 | mFlags.setBit(FLAG_SEEN); | 235 | mFlags.setBit(FLAG_SEEN); |
202 | } | 236 | } |
203 | } else if (status.lower()=="x-status") { | 237 | } else if (status.lower()=="x-status") { |
204 | qDebug("X-Status: %s",value.latin1()); | 238 | qDebug("X-Status: %s",value.latin1()); |
205 | if (value.lower()=="a") { | 239 | if (value.lower()=="a") { |
206 | |||
207 | mFlags.setBit(FLAG_ANSWERED); | 240 | mFlags.setBit(FLAG_ANSWERED); |
208 | } | 241 | } |
209 | } else { | 242 | } else { |
210 | // qDebug("Optionales feld: %s -> %s)",field->fld_data.fld_optional_field->fld_name, | 243 | // qDebug("Optionales feld: %s -> %s)",field->fld_data.fld_optional_field->fld_name, |
211 | // field->fld_data.fld_optional_field->fld_value); | 244 | // field->fld_data.fld_optional_field->fld_value); |
212 | } | 245 | } |
213 | break; | 246 | break; |
214 | default: | 247 | default: |
215 | qDebug("Non parsed field"); | 248 | qDebug("Non parsed field"); |
216 | break; | 249 | break; |
217 | } | 250 | } |
218 | } | 251 | } |
@@ -275,25 +308,25 @@ QString POP3wrapper::parseGroup( mailimf_group *group ) | |||
275 | result.append( ";" ); | 308 | result.append( ";" ); |
276 | 309 | ||
277 | return result; | 310 | return result; |
278 | } | 311 | } |
279 | 312 | ||
280 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) | 313 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) |
281 | { | 314 | { |
282 | QString result( "" ); | 315 | QString result( "" ); |
283 | 316 | ||
284 | if ( box->mb_display_name == NULL ) { | 317 | if ( box->mb_display_name == NULL ) { |
285 | result.append( box->mb_addr_spec ); | 318 | result.append( box->mb_addr_spec ); |
286 | } else { | 319 | } else { |
287 | result.append( box->mb_display_name ); | 320 | result.append( convert_String(box->mb_display_name).latin1() ); |
288 | result.append( " <" ); | 321 | result.append( " <" ); |
289 | result.append( box->mb_addr_spec ); | 322 | result.append( box->mb_addr_spec ); |
290 | result.append( ">" ); | 323 | result.append( ">" ); |
291 | } | 324 | } |
292 | 325 | ||
293 | return result; | 326 | return result; |
294 | } | 327 | } |
295 | 328 | ||
296 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) | 329 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) |
297 | { | 330 | { |
298 | QString result( "" ); | 331 | QString result( "" ); |
299 | 332 | ||