Diffstat (limited to 'noncore/net/mail/libmailwrapper/imapwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 4b633ea..1c22c26 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -77,14 +77,24 @@ void IMAPwrapper::login() | |||
77 | user = account->getUser().latin1(); | 77 | user = account->getUser().latin1(); |
78 | pass = account->getPassword().latin1(); | 78 | pass = account->getPassword().latin1(); |
79 | } | 79 | } |
80 | 80 | ||
81 | m_imap = mailimap_new( 20, &imap_progress ); | 81 | m_imap = mailimap_new( 20, &imap_progress ); |
82 | 82 | ||
83 | |||
84 | |||
83 | /* connect */ | 85 | /* connect */ |
84 | if (account->getSSL()) { | 86 | |
87 | bool ssl = false; | ||
88 | |||
89 | if ( account->ConnectionType() == 2 ) { | ||
90 | ssl = true; | ||
91 | } | ||
92 | |||
93 | if ( ssl ) { | ||
94 | qDebug( "using ssl" ); | ||
85 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); | 95 | err = mailimap_ssl_connect( m_imap, (char*)server, port ); |
86 | } else { | 96 | } else { |
87 | err = mailimap_socket_connect( m_imap, (char*)server, port ); | 97 | err = mailimap_socket_connect( m_imap, (char*)server, port ); |
88 | } | 98 | } |
89 | 99 | ||
90 | if ( err != MAILIMAP_NO_ERROR && | 100 | if ( err != MAILIMAP_NO_ERROR && |
@@ -366,13 +376,13 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
366 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { | 376 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) { |
367 | #if 0 | 377 | #if 0 |
368 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; | 378 | mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date; |
369 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); | 379 | QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); |
370 | qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec); | 380 | qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec); |
371 | qDebug(da.toString()); | 381 | qDebug(da.toString()); |
372 | #endif | 382 | #endif |
373 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { | 383 | } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { |
374 | size = item->att_data.att_static->att_data.att_rfc822_size; | 384 | size = item->att_data.att_static->att_data.att_rfc822_size; |
375 | } | 385 | } |
376 | } | 386 | } |
377 | /* msg is already deleted */ | 387 | /* msg is already deleted */ |
378 | if (mFlags.testBit(FLAG_DELETED) && m) { | 388 | if (mFlags.testBit(FLAG_DELETED) && m) { |
@@ -405,13 +415,13 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
405 | return body; | 415 | return body; |
406 | } | 416 | } |
407 | err = selectMbox(mail.getMbox()); | 417 | err = selectMbox(mail.getMbox()); |
408 | if ( err != MAILIMAP_NO_ERROR ) { | 418 | if ( err != MAILIMAP_NO_ERROR ) { |
409 | return body; | 419 | return body; |
410 | } | 420 | } |
411 | 421 | ||
412 | /* the range has to start at 1!!! not with 0!!!! */ | 422 | /* the range has to start at 1!!! not with 0!!!! */ |
413 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | 423 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); |
414 | fetchAtt = mailimap_fetch_att_new_bodystructure(); | 424 | fetchAtt = mailimap_fetch_att_new_bodystructure(); |
415 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | 425 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); |
416 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 426 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
417 | mailimap_set_free( set ); | 427 | mailimap_set_free( set ); |
@@ -492,38 +502,38 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
492 | err = selectMbox(mail.getMbox()); | 502 | err = selectMbox(mail.getMbox()); |
493 | if ( err != MAILIMAP_NO_ERROR ) { | 503 | if ( err != MAILIMAP_NO_ERROR ) { |
494 | return res; | 504 | return res; |
495 | } | 505 | } |
496 | } | 506 | } |
497 | set = mailimap_set_new_single(mail.getNumber()); | 507 | set = mailimap_set_new_single(mail.getNumber()); |
498 | 508 | ||
499 | clist*id_list = 0; | 509 | clist*id_list = 0; |
500 | 510 | ||
501 | /* if path == empty then its a request for the whole rfc822 mail and generates | 511 | /* if path == empty then its a request for the whole rfc822 mail and generates |
502 | a "fetch <id> (body[])" statement on imap server */ | 512 | a "fetch <id> (body[])" statement on imap server */ |
503 | if (path.count()>0 ) { | 513 | if (path.count()>0 ) { |
504 | id_list = clist_new(); | 514 | id_list = clist_new(); |
505 | for (unsigned j=0; j < path.count();++j) { | 515 | for (unsigned j=0; j < path.count();++j) { |
506 | uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id)); | 516 | uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id)); |
507 | *p_id = path[j]; | 517 | *p_id = path[j]; |
508 | clist_append(id_list,p_id); | 518 | clist_append(id_list,p_id); |
509 | } | 519 | } |
510 | section_part = mailimap_section_part_new(id_list); | 520 | section_part = mailimap_section_part_new(id_list); |
511 | section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL); | 521 | section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL); |
512 | } | 522 | } |
513 | 523 | ||
514 | section = mailimap_section_new(section_spec); | 524 | section = mailimap_section_new(section_spec); |
515 | fetch_att = mailimap_fetch_att_new_body_section(section); | 525 | fetch_att = mailimap_fetch_att_new_body_section(section); |
516 | fetchType = mailimap_fetch_type_new_fetch_att(fetch_att); | 526 | fetchType = mailimap_fetch_type_new_fetch_att(fetch_att); |
517 | 527 | ||
518 | clist*result = 0; | 528 | clist*result = 0; |
519 | 529 | ||
520 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 530 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
521 | mailimap_set_free( set ); | 531 | mailimap_set_free( set ); |
522 | mailimap_fetch_type_free( fetchType ); | 532 | mailimap_fetch_type_free( fetchType ); |
523 | 533 | ||
524 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | 534 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { |
525 | mailimap_msg_att * msg_att; | 535 | mailimap_msg_att * msg_att; |
526 | msg_att = (mailimap_msg_att*)current->data; | 536 | msg_att = (mailimap_msg_att*)current->data; |
527 | mailimap_msg_att_item*msg_att_item; | 537 | mailimap_msg_att_item*msg_att_item; |
528 | for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) { | 538 | for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) { |
529 | msg_att_item = (mailimap_msg_att_item*)clist_content(cur); | 539 | msg_att_item = (mailimap_msg_att_item*)clist_content(cur); |
@@ -532,13 +542,13 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
532 | char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part; | 542 | char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part; |
533 | /* detach - we take over the content */ | 543 | /* detach - we take over the content */ |
534 | msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L; | 544 | msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L; |
535 | res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length); | 545 | res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length); |
536 | } | 546 | } |
537 | } | 547 | } |
538 | } | 548 | } |
539 | } else { | 549 | } else { |
540 | qDebug("error fetching text: %s",m_imap->imap_response); | 550 | qDebug("error fetching text: %s",m_imap->imap_response); |
541 | } | 551 | } |
542 | if (result) mailimap_fetch_list_free(result); | 552 | if (result) mailimap_fetch_list_free(result); |
543 | return res; | 553 | return res; |
544 | } | 554 | } |
@@ -661,29 +671,29 @@ void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*w | |||
661 | return; | 671 | return; |
662 | } | 672 | } |
663 | target_part.setSubtype("rfc822"); | 673 | target_part.setSubtype("rfc822"); |
664 | qDebug("Message part"); | 674 | qDebug("Message part"); |
665 | /* we set this type to text/plain */ | 675 | /* we set this type to text/plain */ |
666 | target_part.setLines(which->bd_lines); | 676 | target_part.setLines(which->bd_lines); |
667 | fillBodyFields(target_part,which->bd_fields); | 677 | fillBodyFields(target_part,which->bd_fields); |
668 | } | 678 | } |
669 | 679 | ||
670 | void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which) | 680 | void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which) |
671 | { | 681 | { |
672 | if (!which) return; | 682 | if (!which) return; |
673 | QString sub = which->bd_media_subtype; | 683 | QString sub = which->bd_media_subtype; |
674 | target_part.setSubtype(sub.lower()); | 684 | target_part.setSubtype(sub.lower()); |
675 | if (which->bd_ext_mpart && which->bd_ext_mpart->bd_parameter && which->bd_ext_mpart->bd_parameter->pa_list) { | 685 | if (which->bd_ext_mpart && which->bd_ext_mpart->bd_parameter && which->bd_ext_mpart->bd_parameter->pa_list) { |
676 | clistcell*cur = 0; | 686 | clistcell*cur = 0; |
677 | mailimap_single_body_fld_param*param=0; | 687 | mailimap_single_body_fld_param*param=0; |
678 | for (cur = clist_begin(which->bd_ext_mpart->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) { | 688 | for (cur = clist_begin(which->bd_ext_mpart->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) { |
679 | param = (mailimap_single_body_fld_param*)cur->data; | 689 | param = (mailimap_single_body_fld_param*)cur->data; |
680 | if (param) { | 690 | if (param) { |
681 | target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value)); | 691 | target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value)); |
682 | } | 692 | } |
683 | } | 693 | } |
684 | } | 694 | } |
685 | } | 695 | } |
686 | 696 | ||
687 | void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which) | 697 | void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which) |
688 | { | 698 | { |
689 | if (!which) { | 699 | if (!which) { |