Diffstat (limited to 'noncore/net/mail/libmailwrapper/pop3wrapper.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 43 |
1 files changed, 38 insertions, 5 deletions
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,13 +1,17 @@ #include <stdlib.h> #include "pop3wrapper.h" #include "mailtypes.h" #include <libetpan/mailpop3.h> #include <libetpan/mailmime.h> +#include <libetpan/data_message_driver.h> #include <qfile.h> +/* we don't fetch messages larger than 5 MB */ +#define HARD_MSG_SIZE_LIMIT 5242880 + POP3wrapper::POP3wrapper( POP3account *a ) { account = a; m_pop3 = NULL; msgTempName = a->getFileName()+"_msg_cache"; last_msg_id = 0; @@ -34,16 +38,21 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) size_t length = 0; login(); if ( !m_pop3 ) { return RecBody(); } + RecBody body; QFile msg_cache(msgTempName); + if (mail.Msgsize()>HARD_MSG_SIZE_LIMIT) { + qDebug("Message to large: %i",mail.Msgsize()); + return body; + } if (mail.getNumber()!=last_msg_id) { if (msg_cache.exists()) { msg_cache.remove(); } msg_cache.open(IO_ReadWrite|IO_Truncate); last_msg_id = mail.getNumber(); @@ -76,25 +85,49 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) RecBody POP3wrapper::parseMail( char *message ) { int err = MAILIMF_NO_ERROR; /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ size_t curTok = 0; mailimf_message *result = 0; + mailmessage * msg=0; + struct mailmime * mime=0; + struct mailmime_single_fields fields; + RecBody body; err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); if ( err != MAILIMF_NO_ERROR ) { if (result) mailimf_message_free(result); return body; } - struct mailimf_body * b = 0; - struct mailimf_fields * f = 0; +#if 0 + char*body_msg = message; + if ( result && result->msg_body && result->msg_body->bd_text ) { + body_msg = (char*)result->msg_body->bd_text; + result->msg_body->bd_text = 0; + } + + msg = mailmessage_new(); + mailmessage_init(msg, NULL, data_message_driver, 0, strlen(body_msg)); + generic_message_t * msg_data; + msg_data = (generic_message_t *)msg->msg_data; + msg_data->msg_fetched = 1; + msg_data->msg_message = body_msg; + msg_data->msg_length = strlen(body_msg); + memset(&fields, 0, sizeof(struct mailmime_single_fields)); + err = mailmessage_get_bodystructure(msg,&mime); + if (mime->mm_mime_fields != NULL) { + mailmime_single_fields_init(&fields, mime->mm_mime_fields, + mime->mm_content_type); + } +#endif +#if 1 if ( result && result->msg_body && result->msg_body->bd_text ) { qDebug( "POP3: bodytext found" ); // when curTok isn't set to 0 this line will fault! 'cause upper line faults! body.setBodytext( QString( result->msg_body->bd_text ) ); #if 0 curTok = 0; @@ -105,12 +138,13 @@ RecBody POP3wrapper::parseMail( char *message ) if (mresult) { mailmime_content_free(mresult); } #endif mailimf_message_free(result); } +#endif return body; } void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) { int err = MAILPOP3_NO_ERROR; @@ -169,13 +203,13 @@ RecMail *POP3wrapper::parseHeader( const char *header ) mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); break; case MAILIMF_FIELD_BCC: mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); break; case MAILIMF_FIELD_SUBJECT: - mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) ); + mail->setSubject(convert_String( field->fld_data.fld_subject->sbj_value ) ); break; case MAILIMF_FIELD_ORIG_DATE: mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); break; case MAILIMF_FIELD_MESSAGE_ID: mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); @@ -200,13 +234,12 @@ RecMail *POP3wrapper::parseHeader( const char *header ) if (value.lower()=="ro") { mFlags.setBit(FLAG_SEEN); } } else if (status.lower()=="x-status") { qDebug("X-Status: %s",value.latin1()); if (value.lower()=="a") { - mFlags.setBit(FLAG_ANSWERED); } } else { // qDebug("Optionales feld: %s -> %s)",field->fld_data.fld_optional_field->fld_name, // field->fld_data.fld_optional_field->fld_value); } @@ -281,13 +314,13 @@ QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) { QString result( "" ); if ( box->mb_display_name == NULL ) { result.append( box->mb_addr_spec ); } else { - result.append( box->mb_display_name ); + result.append( convert_String(box->mb_display_name).latin1() ); result.append( " <" ); result.append( box->mb_addr_spec ); result.append( ">" ); } return result; |