author | alwin <alwin> | 2003-12-10 01:19:51 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-10 01:19:51 (UTC) |
commit | c244afea4a03d7ae948152b5abac2f059fb1e789 (patch) (side-by-side diff) | |
tree | 74e9a6117c3c3854dd8f34cd5599dfb7fb185c86 /noncore/net | |
parent | 9a7db10da12232625be270feae5df761cfe11afa (diff) | |
download | opie-c244afea4a03d7ae948152b5abac2f059fb1e789.zip opie-c244afea4a03d7ae948152b5abac2f059fb1e789.tar.gz opie-c244afea4a03d7ae948152b5abac2f059fb1e789.tar.bz2 |
forgot the reply-to entry
-rw-r--r-- | noncore/net/mail/ProgrammersDoc/ReceivingMails.dia | bin | 3086 -> 3158 bytes | |||
-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 29 | ||||
-rw-r--r-- | noncore/net/mail/imapwrapper.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 29 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.h | 5 | ||||
-rw-r--r-- | noncore/net/mail/mailtypes.h | 5 |
7 files changed, 42 insertions, 30 deletions
diff --git a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia Binary files differindex 08c6434..2e3033e 100644 --- a/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia +++ b/noncore/net/mail/ProgrammersDoc/ReceivingMails.dia diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 5ce140e..eae85a7 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp @@ -200,29 +200,25 @@ QList<IMAPFolder>* IMAPwrapper::listFolders() } } else { qDebug("error fetching folders %s",m_imap->response); } mailimap_list_result_free( result ); return folders; } RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) { RecMail * m = 0; mailimap_msg_att_item *item=0; - bool named_from = false; - QString from,date,subject; - date = from = subject = ""; - clistcell *current,*c,*cf, *current_from = NULL; - mailimap_address * current_address = NULL; + clistcell *current,*c,*cf; mailimap_msg_att_dynamic*flist; mailimap_flag_fetch*cflag; QBitArray mFlags(7); QStringList addresslist; if (!m_att) { return m; } c = clist_begin(m_att->list); while ( c ) { current = c; @@ -262,52 +258,55 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } } else if (cflag->type==MAILIMAP_FLAG_FETCH_RECENT) { mFlags.setBit(FLAG_RECENT); } cf = cf->next; } continue; } if ( item->msg_att_static->type == MAILIMAP_MSG_ATT_RFC822_HEADER ) { qDebug( "header: \n%s", item->msg_att_static->rfc822_header ); } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) { mailimap_envelope * head = item->msg_att_static->env; - date = head->date; - subject = head->subject; m = new RecMail(); + m->setDate(head->date); + m->setSubject(head->subject); if (head->from!=NULL) { addresslist = address_list_to_stringlist(head->from->list); if (addresslist.count()) { - from = addresslist.first(); + m->setFrom(addresslist.first()); } } if (head->to!=NULL) { addresslist = address_list_to_stringlist(head->to->list); m->setTo(addresslist); } if (head->cc!=NULL) { addresslist = address_list_to_stringlist(head->cc->list); m->setCC(addresslist); } if (head->bcc!=NULL) { addresslist = address_list_to_stringlist(head->bcc->list); m->setBcc(addresslist); } - m->setSubject(subject); - m->setFrom(from); - m->setDate(date); + if (head->reply_to!=NULL) { + addresslist = address_list_to_stringlist(head->bcc->list); + if (addresslist.count()) { + m->setReplyto(addresslist.first()); + } + } m->setMsgid(QString(head->message_id)); qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s", - from.latin1(), - subject.latin1(),date.latin1(),m->Msgid().latin1()); + m->getFrom().latin1(), + m->getSubject().latin1(),m->getDate().latin1(),m->Msgid().latin1()); } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { mailimap_date_time*d = item->msg_att_static->internal_date; QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec)); qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec); qDebug(da.toString()); } else { qDebug("Another type"); } } /* msg is already deleted */ if (mFlags.testBit(FLAG_DELETED) && m) { delete m; @@ -430,39 +429,43 @@ void IMAPwrapper::fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap QStringList IMAPwrapper::address_list_to_stringlist(clist*list) { QStringList l; QString from; bool named_from; clistcell *current = NULL; mailimap_address * current_address=NULL; if (!list) { return l; } current = clist_begin(list); + unsigned int count = 0; while (current!= NULL) { from = ""; named_from = false; current_address=(mailimap_address*)current->data; current = current->next; if (current_address->personal_name){ from+=QString(current_address->personal_name); from+=" "; named_from = true; } if (named_from && (current_address->mailbox_name || current_address->host_name)) { from+="<"; } if (current_address->mailbox_name) { from+=QString(current_address->mailbox_name); from+="@"; } if (current_address->host_name) { from+=QString(current_address->host_name); } if (named_from && (current_address->mailbox_name || current_address->host_name)) { from+=">"; } l.append(QString(from)); + if (++count > 99) { + break; + } } return l; } diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h index 6565896..faab43c 100644 --- a/noncore/net/mail/imapwrapper.h +++ b/noncore/net/mail/imapwrapper.h @@ -19,20 +19,20 @@ public: virtual ~IMAPwrapper(); QList<IMAPFolder>* listFolders(); void listMessages(const QString & mailbox,QList<RecMail>&target ); RecBody fetchBody(const RecMail&mail); static void imap_progress( size_t current, size_t maximum ); protected: RecMail*parse_list_result(mailimap_msg_att*); void login(); void logout(); void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body); - QStringList address_list_to_stringlist(clist*list); + static QStringList address_list_to_stringlist(clist*list); private: IMAPaccount *account; mailimap *m_imap; }; #endif diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 5ce140e..eae85a7 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -200,29 +200,25 @@ QList<IMAPFolder>* IMAPwrapper::listFolders() } } else { qDebug("error fetching folders %s",m_imap->response); } mailimap_list_result_free( result ); return folders; } RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) { RecMail * m = 0; mailimap_msg_att_item *item=0; - bool named_from = false; - QString from,date,subject; - date = from = subject = ""; - clistcell *current,*c,*cf, *current_from = NULL; - mailimap_address * current_address = NULL; + clistcell *current,*c,*cf; mailimap_msg_att_dynamic*flist; mailimap_flag_fetch*cflag; QBitArray mFlags(7); QStringList addresslist; if (!m_att) { return m; } c = clist_begin(m_att->list); while ( c ) { current = c; @@ -262,52 +258,55 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } } else if (cflag->type==MAILIMAP_FLAG_FETCH_RECENT) { mFlags.setBit(FLAG_RECENT); } cf = cf->next; } continue; } if ( item->msg_att_static->type == MAILIMAP_MSG_ATT_RFC822_HEADER ) { qDebug( "header: \n%s", item->msg_att_static->rfc822_header ); } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_ENVELOPE) { mailimap_envelope * head = item->msg_att_static->env; - date = head->date; - subject = head->subject; m = new RecMail(); + m->setDate(head->date); + m->setSubject(head->subject); if (head->from!=NULL) { addresslist = address_list_to_stringlist(head->from->list); if (addresslist.count()) { - from = addresslist.first(); + m->setFrom(addresslist.first()); } } if (head->to!=NULL) { addresslist = address_list_to_stringlist(head->to->list); m->setTo(addresslist); } if (head->cc!=NULL) { addresslist = address_list_to_stringlist(head->cc->list); m->setCC(addresslist); } if (head->bcc!=NULL) { addresslist = address_list_to_stringlist(head->bcc->list); m->setBcc(addresslist); } - m->setSubject(subject); - m->setFrom(from); - m->setDate(date); + if (head->reply_to!=NULL) { + addresslist = address_list_to_stringlist(head->bcc->list); + if (addresslist.count()) { + m->setReplyto(addresslist.first()); + } + } m->setMsgid(QString(head->message_id)); qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s", - from.latin1(), - subject.latin1(),date.latin1(),m->Msgid().latin1()); + m->getFrom().latin1(), + m->getSubject().latin1(),m->getDate().latin1(),m->Msgid().latin1()); } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { mailimap_date_time*d = item->msg_att_static->internal_date; QDateTime da(QDate(d->year,d->month,d->day),QTime(d->hour,d->min,d->sec)); qDebug("%i %i %i - %i %i %i",d->year,d->month,d->day,d->hour,d->min,d->sec); qDebug(da.toString()); } else { qDebug("Another type"); } } /* msg is already deleted */ if (mFlags.testBit(FLAG_DELETED) && m) { delete m; @@ -430,39 +429,43 @@ void IMAPwrapper::fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap QStringList IMAPwrapper::address_list_to_stringlist(clist*list) { QStringList l; QString from; bool named_from; clistcell *current = NULL; mailimap_address * current_address=NULL; if (!list) { return l; } current = clist_begin(list); + unsigned int count = 0; while (current!= NULL) { from = ""; named_from = false; current_address=(mailimap_address*)current->data; current = current->next; if (current_address->personal_name){ from+=QString(current_address->personal_name); from+=" "; named_from = true; } if (named_from && (current_address->mailbox_name || current_address->host_name)) { from+="<"; } if (current_address->mailbox_name) { from+=QString(current_address->mailbox_name); from+="@"; } if (current_address->host_name) { from+=QString(current_address->host_name); } if (named_from && (current_address->mailbox_name || current_address->host_name)) { from+=">"; } l.append(QString(from)); + if (++count > 99) { + break; + } } return l; } diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h index 6565896..faab43c 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.h +++ b/noncore/net/mail/libmailwrapper/imapwrapper.h @@ -19,20 +19,20 @@ public: virtual ~IMAPwrapper(); QList<IMAPFolder>* listFolders(); void listMessages(const QString & mailbox,QList<RecMail>&target ); RecBody fetchBody(const RecMail&mail); static void imap_progress( size_t current, size_t maximum ); protected: RecMail*parse_list_result(mailimap_msg_att*); void login(); void logout(); void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body); - QStringList address_list_to_stringlist(clist*list); + static QStringList address_list_to_stringlist(clist*list); private: IMAPaccount *account; mailimap *m_imap; }; #endif diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h index c8d533a..6d6b080 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.h +++ b/noncore/net/mail/libmailwrapper/mailtypes.h @@ -35,36 +35,39 @@ public: const int getNumber()const{return msg_number;} void setNumber(int number){msg_number=number;} const QString&getDate()const{ return date; } void setDate( const QString&a ) { date = a; } const QString&getFrom()const{ return from; } void setFrom( const QString&a ) { from = a; } const QString&getSubject()const { return subject; } void setSubject( const QString&s ) { subject = s; } const QString&getMbox()const{return mbox;} void setMbox(const QString&box){mbox = box;} void setMsgid(const QString&id){msg_id=id;} const QString&Msgid()const{return msg_id;} + void setReplyto(const QString&reply){replyto=reply;} + const QString&Replyto()const{return replyto;} + void setTo(const QStringList&list); const QStringList&To()const; void setCC(const QStringList&list); const QStringList&CC()const; void setBcc(const QStringList&list); const QStringList&Bcc()const; const QBitArray&getFlags()const{return msg_flags;} void setFlags(const QBitArray&flags){msg_flags = flags;} protected: - QString subject,date,from,mbox,msg_id; + QString subject,date,from,mbox,msg_id,replyto; int msg_number; QBitArray msg_flags; QStringList to,cc,bcc; void init(); void copy_old(const RecMail&old); }; class RecPart { protected: QString m_type,m_subtype,m_identifier,m_encoding; public: diff --git a/noncore/net/mail/mailtypes.h b/noncore/net/mail/mailtypes.h index c8d533a..6d6b080 100644 --- a/noncore/net/mail/mailtypes.h +++ b/noncore/net/mail/mailtypes.h @@ -35,36 +35,39 @@ public: const int getNumber()const{return msg_number;} void setNumber(int number){msg_number=number;} const QString&getDate()const{ return date; } void setDate( const QString&a ) { date = a; } const QString&getFrom()const{ return from; } void setFrom( const QString&a ) { from = a; } const QString&getSubject()const { return subject; } void setSubject( const QString&s ) { subject = s; } const QString&getMbox()const{return mbox;} void setMbox(const QString&box){mbox = box;} void setMsgid(const QString&id){msg_id=id;} const QString&Msgid()const{return msg_id;} + void setReplyto(const QString&reply){replyto=reply;} + const QString&Replyto()const{return replyto;} + void setTo(const QStringList&list); const QStringList&To()const; void setCC(const QStringList&list); const QStringList&CC()const; void setBcc(const QStringList&list); const QStringList&Bcc()const; const QBitArray&getFlags()const{return msg_flags;} void setFlags(const QBitArray&flags){msg_flags = flags;} protected: - QString subject,date,from,mbox,msg_id; + QString subject,date,from,mbox,msg_id,replyto; int msg_number; QBitArray msg_flags; QStringList to,cc,bcc; void init(); void copy_old(const RecMail&old); }; class RecPart { protected: QString m_type,m_subtype,m_identifier,m_encoding; public: |