Diffstat (limited to 'noncore/net/mail/libmailwrapper/imapwrapper.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 126 |
1 files changed, 51 insertions, 75 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 406c57c..f7e93aa 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -60,6 +60,7 @@ void IMAPwrapper::login() | |||
60 | } | 60 | } |
61 | 61 | ||
62 | m_imap = mailimap_new( 20, &imap_progress ); | 62 | m_imap = mailimap_new( 20, &imap_progress ); |
63 | |||
63 | /* connect */ | 64 | /* connect */ |
64 | if (account->getSSL()) { | 65 | if (account->getSSL()) { |
65 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); | 66 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); |
@@ -70,7 +71,13 @@ void IMAPwrapper::login() | |||
70 | if ( err != MAILIMAP_NO_ERROR && | 71 | if ( err != MAILIMAP_NO_ERROR && |
71 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && | 72 | err != MAILIMAP_NO_ERROR_AUTHENTICATED && |
72 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { | 73 | err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { |
73 | Global::statusMessage(tr("error connecting imap server: %1").arg(m_imap->imap_response)); | 74 | QString failure = ""; |
75 | if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) { | ||
76 | failure="Connection refused"; | ||
77 | } else { | ||
78 | failure="Unknown failure"; | ||
79 | } | ||
80 | Global::statusMessage(tr("error connecting imap server: %1").arg(failure)); | ||
74 | mailimap_free( m_imap ); | 81 | mailimap_free( m_imap ); |
75 | m_imap = 0; | 82 | m_imap = 0; |
76 | return; | 83 | return; |
@@ -400,13 +407,9 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
400 | mailimap_msg_att * msg_att; | 407 | mailimap_msg_att * msg_att; |
401 | msg_att = (mailimap_msg_att*)current->data; | 408 | msg_att = (mailimap_msg_att*)current->data; |
402 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; | 409 | mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data; |
410 | QValueList<int> path; | ||
403 | body_desc = item->att_data.att_static->att_data.att_body; | 411 | body_desc = item->att_data.att_static->att_data.att_body; |
404 | if (body_desc->bd_type==MAILIMAP_BODY_1PART) { | 412 | traverseBody(mail,body_desc,body,0,path); |
405 | searchBodyText(mail,body_desc->bd_data.bd_body_1part,body); | ||
406 | } else if (body_desc->bd_type==MAILIMAP_BODY_MPART) { | ||
407 | qDebug("Mulitpart mail"); | ||
408 | searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body); | ||
409 | } | ||
410 | } else { | 413 | } else { |
411 | qDebug("error fetching body: %s",m_imap->imap_response); | 414 | qDebug("error fetching body: %s",m_imap->imap_response); |
412 | } | 415 | } |
@@ -414,44 +417,6 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
414 | return body; | 417 | return body; |
415 | } | 418 | } |
416 | 419 | ||
417 | /* this routine is just called when the mail has only ONE part. | ||
418 | for filling the parts of a multi-part-message there are other | ||
419 | routines 'cause we can not simply fetch the whole body. */ | ||
420 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body) | ||
421 | { | ||
422 | if (!mailDescription) { | ||
423 | return; | ||
424 | } | ||
425 | QString sub,body_text; | ||
426 | RecPart singlePart; | ||
427 | QValueList<int> path; | ||
428 | fillSinglePart(singlePart,mailDescription); | ||
429 | switch (mailDescription->bd_type) { | ||
430 | case MAILIMAP_BODY_TYPE_1PART_MSG: | ||
431 | path.append(1); | ||
432 | body_text = fetchTextPart(mail,path,true,singlePart.Encoding()); | ||
433 | target_body.setBodytext(body_text); | ||
434 | target_body.setDescription(singlePart); | ||
435 | break; | ||
436 | case MAILIMAP_BODY_TYPE_1PART_TEXT: | ||
437 | qDebug("Mediatype single: %s",mailDescription->bd_data.bd_type_text->bd_media_text); | ||
438 | path.append(1); | ||
439 | body_text = fetchTextPart(mail,path,true,singlePart.Encoding()); | ||
440 | target_body.setBodytext(body_text); | ||
441 | target_body.setDescription(singlePart); | ||
442 | break; | ||
443 | case MAILIMAP_BODY_TYPE_1PART_BASIC: | ||
444 | qDebug("Single attachment"); | ||
445 | target_body.setBodytext(""); | ||
446 | target_body.addPart(singlePart); | ||
447 | break; | ||
448 | default: | ||
449 | break; | ||
450 | } | ||
451 | |||
452 | return; | ||
453 | } | ||
454 | |||
455 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | 420 | QStringList IMAPwrapper::address_list_to_stringlist(clist*list) |
456 | { | 421 | { |
457 | QStringList l; | 422 | QStringList l; |
@@ -469,7 +434,6 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list) | |||
469 | current_address=(mailimap_address*)current->data; | 434 | current_address=(mailimap_address*)current->data; |
470 | if (current_address->ad_personal_name){ | 435 | if (current_address->ad_personal_name){ |
471 | from+=convert_String((const char*)current_address->ad_personal_name); | 436 | from+=convert_String((const char*)current_address->ad_personal_name); |
472 | //from+=QString(current_address->ad_personal_name); | ||
473 | from+=" "; | 437 | from+=" "; |
474 | named_from = true; | 438 | named_from = true; |
475 | } | 439 | } |
@@ -557,45 +521,60 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
557 | return res; | 521 | return res; |
558 | } | 522 | } |
559 | 523 | ||
560 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList) | 524 | /* current_recursion is for recursive calls. |
525 | current_count means the position inside the internal loop! */ | ||
526 | void IMAPwrapper::traverseBody(const RecMail&mail,mailimap_body*body,RecBody&target_body, | ||
527 | int current_recursion,QValueList<int>recList,int current_count) | ||
561 | { | 528 | { |
562 | /* current_recursion is for avoiding ugly mails which has a to deep body-structure */ | 529 | if (!body || current_recursion>=10) { |
563 | if (!mailDescription||current_recursion==10) { | ||
564 | return; | 530 | return; |
565 | } | 531 | } |
566 | clistcell*current; | 532 | ++current_count; |
567 | mailimap_body*current_body; | 533 | switch (body->bd_type) { |
568 | unsigned int count = 0; | 534 | case MAILIMAP_BODY_1PART: |
569 | for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) { | 535 | { |
570 | /* the point in the message */ | ||
571 | ++count; | ||
572 | current_body = (mailimap_body*)current->data; | ||
573 | if (current_body->bd_type==MAILIMAP_BODY_MPART) { | ||
574 | QValueList<int>countlist = recList; | 536 | QValueList<int>countlist = recList; |
575 | countlist.append(count); | 537 | countlist.append(current_count); |
576 | searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,countlist); | ||
577 | } else if (current_body->bd_type==MAILIMAP_BODY_1PART){ | ||
578 | RecPart currentPart; | 538 | RecPart currentPart; |
579 | fillSinglePart(currentPart,current_body->bd_data.bd_body_1part); | 539 | mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part; |
580 | QValueList<int>countlist = recList; | ||
581 | countlist.append(count); | ||
582 | /* important: Check for is NULL 'cause a body can be empty! */ | ||
583 | if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) { | ||
584 | QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); | ||
585 | target_body.setDescription(currentPart); | ||
586 | target_body.setBodytext(body_text); | ||
587 | } else { | ||
588 | QString id(""); | 540 | QString id(""); |
541 | currentPart.setPositionlist(countlist); | ||
589 | for (unsigned int j = 0; j < countlist.count();++j) { | 542 | for (unsigned int j = 0; j < countlist.count();++j) { |
590 | id+=(j>0?" ":""); | 543 | id+=(j>0?" ":""); |
591 | id+=QString("%1").arg(countlist[j]); | 544 | id+=QString("%1").arg(countlist[j]); |
592 | } | 545 | } |
593 | qDebug("ID= %s",id.latin1()); | 546 | qDebug("ID= %s",id.latin1()); |
594 | currentPart.setIdentifier(id); | 547 | currentPart.setIdentifier(id); |
595 | currentPart.setPositionlist(countlist); | 548 | fillSinglePart(currentPart,part1); |
549 | /* important: Check for is NULL 'cause a body can be empty! | ||
550 | And we put it only into the mail if it is the FIRST part */ | ||
551 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body.Bodytext().isNull() && countlist[0]==1) { | ||
552 | QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding()); | ||
553 | target_body.setDescription(currentPart); | ||
554 | target_body.setBodytext(body_text); | ||
555 | } else { | ||
596 | target_body.addPart(currentPart); | 556 | target_body.addPart(currentPart); |
597 | } | 557 | } |
558 | if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_MSG) { | ||
559 | traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist); | ||
560 | } | ||
598 | } | 561 | } |
562 | break; | ||
563 | case MAILIMAP_BODY_MPART: | ||
564 | { | ||
565 | clistcell*current=0; | ||
566 | mailimap_body*current_body=0; | ||
567 | unsigned int ccount = current_count-1; | ||
568 | mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart; | ||
569 | for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) { | ||
570 | current_body = (mailimap_body*)current->data; | ||
571 | traverseBody(mail,current_body,target_body,current_recursion+1,recList,ccount); | ||
572 | ++ccount; | ||
573 | } | ||
574 | } | ||
575 | break; | ||
576 | default: | ||
577 | break; | ||
599 | } | 578 | } |
600 | } | 579 | } |
601 | 580 | ||
@@ -613,6 +592,7 @@ void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*De | |||
613 | fillSingleBasicPart(target_part,Description->bd_data.bd_type_basic); | 592 | fillSingleBasicPart(target_part,Description->bd_data.bd_type_basic); |
614 | break; | 593 | break; |
615 | case MAILIMAP_BODY_TYPE_1PART_MSG: | 594 | case MAILIMAP_BODY_TYPE_1PART_MSG: |
595 | target_part.setType("message"); | ||
616 | fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg); | 596 | fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg); |
617 | break; | 597 | break; |
618 | default: | 598 | default: |
@@ -637,13 +617,9 @@ void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*w | |||
637 | if (!which) { | 617 | if (!which) { |
638 | return; | 618 | return; |
639 | } | 619 | } |
640 | // QString sub; | 620 | target_part.setSubtype("rfc822"); |
641 | // sub = which->bd_media_text; | ||
642 | // target_part.setSubtype(sub.lower()); | ||
643 | qDebug("Message part"); | 621 | qDebug("Message part"); |
644 | /* we set this type to text/plain */ | 622 | /* we set this type to text/plain */ |
645 | target_part.setType("text"); | ||
646 | target_part.setSubtype("plain"); | ||
647 | target_part.setLines(which->bd_lines); | 623 | target_part.setLines(which->bd_lines); |
648 | fillBodyFields(target_part,which->bd_fields); | 624 | fillBodyFields(target_part,which->bd_fields); |
649 | } | 625 | } |