summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-31 21:01:18 (UTC)
committer zautrix <zautrix>2004-08-31 21:01:18 (UTC)
commit3f5c51234c8068f3d4826a2a0066648ace21a19f (patch) (unidiff)
tree91b76c1c7ddec6628c573e409070070747d99feb
parent95f8d4f1de557bd25ae38807d970208399cec5d1 (diff)
downloadkdepimpi-3f5c51234c8068f3d4826a2a0066648ace21a19f.zip
kdepimpi-3f5c51234c8068f3d4826a2a0066648ace21a19f.tar.gz
kdepimpi-3f5c51234c8068f3d4826a2a0066648ace21a19f.tar.bz2
Enhancements of kopiemail
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/accountview.cpp8
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp29
-rw-r--r--kmicromail/libmailwrapper/abstractmail.h8
-rw-r--r--kmicromail/libmailwrapper/genericwrapper.cpp6
-rw-r--r--kmicromail/libmailwrapper/genericwrapper.h3
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.cpp68
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.h6
-rw-r--r--kmicromail/libmailwrapper/mhwrapper.cpp5
-rw-r--r--kmicromail/libmailwrapper/mhwrapper.h3
-rw-r--r--kmicromail/libmailwrapper/nntpwrapper.cpp5
-rw-r--r--kmicromail/libmailwrapper/nntpwrapper.h3
-rw-r--r--kmicromail/libmailwrapper/pop3wrapper.cpp21
-rw-r--r--kmicromail/libmailwrapper/pop3wrapper.h4
-rw-r--r--kmicromail/opiemail.cpp44
-rw-r--r--kmicromail/opiemail.h2
-rw-r--r--kmicromail/selectstoreui.ui88
16 files changed, 244 insertions, 59 deletions
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index 0893733..4ead545 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -1,170 +1,176 @@
1 1
2#include "accountview.h" 2#include "accountview.h"
3#include "accountitem.h" 3#include "accountitem.h"
4#include "selectstore.h" 4#include "selectstore.h"
5 5
6#include <libmailwrapper/settings.h> 6#include <libmailwrapper/settings.h>
7#include <libmailwrapper/mailwrapper.h> 7#include <libmailwrapper/mailwrapper.h>
8#include <libmailwrapper/mailtypes.h> 8#include <libmailwrapper/mailtypes.h>
9#include <libmailwrapper/abstractmail.h> 9#include <libmailwrapper/abstractmail.h>
10 10
11/* OPIE */ 11/* OPIE */
12#include <qpe/qpeapplication.h> 12#include <qpe/qpeapplication.h>
13 13
14/* QT */ 14/* QT */
15#include <qmessagebox.h> 15#include <qmessagebox.h>
16#include <qpopupmenu.h> 16#include <qpopupmenu.h>
17#include <qcheckbox.h>
18#include <qspinbox.h>
17 19
18using namespace Opie::Core; 20using namespace Opie::Core;
19AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) 21AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
20 : QListView( parent, name, flags ) 22 : QListView( parent, name, flags )
21{ 23{
22 connect( this, SIGNAL( selectionChanged(QListViewItem*) ), 24 connect( this, SIGNAL( selectionChanged(QListViewItem*) ),
23 SLOT( refresh(QListViewItem*) ) ); 25 SLOT( refresh(QListViewItem*) ) );
24 connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, 26 connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
25 SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) ); 27 SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) );
26 setSorting(0); 28 setSorting(0);
27} 29}
28 30
29AccountView::~AccountView() 31AccountView::~AccountView()
30{ 32{
31 imapAccounts.clear(); 33 imapAccounts.clear();
32 mhAccounts.clear(); 34 mhAccounts.clear();
33} 35}
34 36
35void AccountView::slotContextMenu(int id) 37void AccountView::slotContextMenu(int id)
36{ 38{
37 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); 39 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
38 if (!view) return; 40 if (!view) return;
39 view->contextMenuSelected(id); 41 view->contextMenuSelected(id);
40} 42}
41 43
42void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int) 44void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int)
43{ 45{
44 if (button==1) {return;} 46 if (button==1) {return;}
45 if (!item) return; 47 if (!item) return;
46 AccountViewItem *view = static_cast<AccountViewItem *>(item); 48 AccountViewItem *view = static_cast<AccountViewItem *>(item);
47 QPopupMenu*m = view->getContextMenu(); 49 QPopupMenu*m = view->getContextMenu();
48 if (!m) return; 50 if (!m) return;
49 connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int))); 51 connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int)));
50 m->setFocus(); 52 m->setFocus();
51 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); 53 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
52 delete m; 54 delete m;
53} 55}
54 56
55void AccountView::populate( QList<Account> list ) 57void AccountView::populate( QList<Account> list )
56{ 58{
57 clear(); 59 clear();
58 60
59 imapAccounts.clear(); 61 imapAccounts.clear();
60 mhAccounts.clear(); 62 mhAccounts.clear();
61 63
62 mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this)); 64 mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this));
63 65
64 Account *it; 66 Account *it;
65 for ( it = list.first(); it; it = list.next() ) 67 for ( it = list.first(); it; it = list.next() )
66 { 68 {
67 if ( it->getType() == MAILLIB::A_IMAP ) 69 if ( it->getType() == MAILLIB::A_IMAP )
68 { 70 {
69 IMAPaccount *imap = static_cast<IMAPaccount *>(it); 71 IMAPaccount *imap = static_cast<IMAPaccount *>(it);
70 imapAccounts.append(new IMAPviewItem( imap, this )); 72 imapAccounts.append(new IMAPviewItem( imap, this ));
71 } 73 }
72 else if ( it->getType() == MAILLIB::A_POP3 ) 74 else if ( it->getType() == MAILLIB::A_POP3 )
73 { 75 {
74 POP3account *pop3 = static_cast<POP3account *>(it); 76 POP3account *pop3 = static_cast<POP3account *>(it);
75 /* must not be hold 'cause it isn't required */ 77 /* must not be hold 'cause it isn't required */
76 (void) new POP3viewItem( pop3, this ); 78 (void) new POP3viewItem( pop3, this );
77 } 79 }
78 else if ( it->getType() == MAILLIB::A_NNTP ) 80 else if ( it->getType() == MAILLIB::A_NNTP )
79 { 81 {
80 NNTPaccount *nntp = static_cast<NNTPaccount *>(it); 82 NNTPaccount *nntp = static_cast<NNTPaccount *>(it);
81 /* must not be hold 'cause it isn't required */ 83 /* must not be hold 'cause it isn't required */
82 (void) new NNTPviewItem( nntp, this ); 84 (void) new NNTPviewItem( nntp, this );
83 } 85 }
84 } 86 }
85} 87}
86 88
87void AccountView::refresh(QListViewItem *item) 89void AccountView::refresh(QListViewItem *item)
88{ 90{
89 if ( item ) 91 if ( item )
90 { 92 {
91 m_currentItem = item; 93 m_currentItem = item;
92 QValueList<RecMailP> headerlist; 94 QValueList<RecMailP> headerlist;
93 AccountViewItem *view = static_cast<AccountViewItem *>(item); 95 AccountViewItem *view = static_cast<AccountViewItem *>(item);
94 view->refresh(headerlist); 96 view->refresh(headerlist);
95 emit refreshMailview(headerlist); 97 emit refreshMailview(headerlist);
96 } 98 }
97} 99}
98 100
99void AccountView::refreshCurrent() 101void AccountView::refreshCurrent()
100{ 102{
101 m_currentItem = currentItem(); 103 m_currentItem = currentItem();
102 if ( !m_currentItem ) return; 104 if ( !m_currentItem ) return;
103 QValueList<RecMailP> headerlist; 105 QValueList<RecMailP> headerlist;
104 AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem); 106 AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
105 view->refresh(headerlist); 107 view->refresh(headerlist);
106 emit refreshMailview(headerlist); 108 emit refreshMailview(headerlist);
107} 109}
108 110
109void AccountView::refreshAll() 111void AccountView::refreshAll()
110{ 112{
111} 113}
112 114
113RecBodyP AccountView::fetchBody(const RecMailP&aMail) 115RecBodyP AccountView::fetchBody(const RecMailP&aMail)
114{ 116{
115 QListViewItem*item = selectedItem (); 117 QListViewItem*item = selectedItem ();
116 if (!item) return new RecBody(); 118 if (!item) return new RecBody();
117 AccountViewItem *view = static_cast<AccountViewItem *>(item); 119 AccountViewItem *view = static_cast<AccountViewItem *>(item);
118 return view->fetchBody(aMail); 120 return view->fetchBody(aMail);
119} 121}
120 122
121void AccountView::setupFolderselect(Selectstore*sels) 123void AccountView::setupFolderselect(Selectstore*sels)
122{ 124{
123 sels->showMaximized(); 125 sels->showMaximized();
124 QStringList sFolders; 126 QStringList sFolders;
125 unsigned int i = 0; 127 unsigned int i = 0;
126 for (i=0; i < mhAccounts.count();++i) 128 for (i=0; i < mhAccounts.count();++i)
127 { 129 {
128 mhAccounts[i]->refresh(false); 130 mhAccounts[i]->refresh(false);
129 sFolders = mhAccounts[i]->subFolders(); 131 sFolders = mhAccounts[i]->subFolders();
130 sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders); 132 sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders);
131 } 133 }
132 for (i=0; i < imapAccounts.count();++i) 134 for (i=0; i < imapAccounts.count();++i)
133 { 135 {
134 if (imapAccounts[i]->offline()) 136 if (imapAccounts[i]->offline())
135 continue; 137 continue;
136 imapAccounts[i]->refreshFolders(false); 138 imapAccounts[i]->refreshFolders(false);
137 sels->addAccounts(imapAccounts[i]->getWrapper(),imapAccounts[i]->subFolders()); 139 sels->addAccounts(imapAccounts[i]->getWrapper(),imapAccounts[i]->subFolders());
138 } 140 }
139} 141}
140 142
141void AccountView::downloadMails(const FolderP&fromFolder,AbstractMail*fromWrapper) 143void AccountView::downloadMails(const FolderP&fromFolder,AbstractMail*fromWrapper)
142{ 144{
143 AbstractMail*targetMail = 0; 145 AbstractMail*targetMail = 0;
144 QString targetFolder = ""; 146 QString targetFolder = "";
145 Selectstore sels; 147 Selectstore sels;
146 setupFolderselect(&sels); 148 setupFolderselect(&sels);
147 if (!sels.exec()) return; 149 if (!sels.exec()) return;
148 targetMail = sels.currentMail(); 150 targetMail = sels.currentMail();
149 targetFolder = sels.currentFolder(); 151 targetFolder = sels.currentFolder();
150 if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) || 152 if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
151 targetFolder.isEmpty()) 153 targetFolder.isEmpty())
152 { 154 {
153 return; 155 return;
154 } 156 }
155 if (sels.newFolder() && !targetMail->createMbox(targetFolder)) 157 if (sels.newFolder() && !targetMail->createMbox(targetFolder))
156 { 158 {
157 QMessageBox::critical(0,tr("Error creating new Folder"), 159 QMessageBox::critical(0,tr("Error creating new Folder"),
158 tr("<center>Error while creating<br>new folder - breaking.</center>")); 160 tr("<center>Error while creating<br>new folder - breaking.</center>"));
159 return; 161 return;
160 } 162 }
161 fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails()); 163 int maxsize = 0;
164 if ( sels.useSize->isChecked())
165 maxsize = sels.sizeSpinBox->value();
166
167 fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails(), maxsize);
162 refreshCurrent(); 168 refreshCurrent();
163} 169}
164 170
165bool AccountView::currentisDraft() 171bool AccountView::currentisDraft()
166{ 172{
167 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); 173 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
168 if (!view) return false; 174 if (!view) return false;
169 return view->isDraftfolder(); 175 return view->isDraftfolder();
170} 176}
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 128a7c0..3998abd 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -1,172 +1,187 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#include "abstractmail.h" 2#include "abstractmail.h"
2#include "imapwrapper.h" 3#include "imapwrapper.h"
3#include "pop3wrapper.h" 4#include "pop3wrapper.h"
4#include "nntpwrapper.h" 5#include "nntpwrapper.h"
5#include "mhwrapper.h" 6#include "mhwrapper.h"
6#include "mailtypes.h" 7#include "mailtypes.h"
7 8
8 9
9 10
10#include <kdecore/kstandarddirs.h> 11#include <kdecore/kstandarddirs.h>
11#include <qfile.h> 12#include <qfile.h>
12#include <qtextstream.h> 13#include <qtextstream.h>
13#include <stdlib.h> 14#include <stdlib.h>
14#include <libetpan/mailmime_content.h> 15#include <libetpan/mailmime_content.h>
15#include <libetpan/mailmime.h> 16#include <libetpan/mailmime.h>
16 17
17using namespace Opie::Core; 18using namespace Opie::Core;
18AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) 19AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
19{ 20{
20 return new IMAPwrapper(a); 21 return new IMAPwrapper(a);
21} 22}
22 23
23AbstractMail* AbstractMail::getWrapper(POP3account *a) 24AbstractMail* AbstractMail::getWrapper(POP3account *a)
24{ 25{
25 return new POP3wrapper(a); 26 return new POP3wrapper(a);
26} 27}
27 28
28AbstractMail* AbstractMail::getWrapper(NNTPaccount *a) 29AbstractMail* AbstractMail::getWrapper(NNTPaccount *a)
29{ 30{
30 return new NNTPwrapper(a); 31 return new NNTPwrapper(a);
31} 32}
32 33
33AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name) 34AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name)
34{ 35{
35 return new MHwrapper(a,name); 36 return new MHwrapper(a,name);
36} 37}
37 38
38AbstractMail* AbstractMail::getWrapper(Account*a) 39AbstractMail* AbstractMail::getWrapper(Account*a)
39{ 40{
40 if (!a) return 0; 41 if (!a) return 0;
41 switch (a->getType()) { 42 switch (a->getType()) {
42 case MAILLIB::A_IMAP: 43 case MAILLIB::A_IMAP:
43 return new IMAPwrapper((IMAPaccount*)a); 44 return new IMAPwrapper((IMAPaccount*)a);
44 break; 45 break;
45 case MAILLIB::A_POP3: 46 case MAILLIB::A_POP3:
46 return new POP3wrapper((POP3account*)a); 47 return new POP3wrapper((POP3account*)a);
47 break; 48 break;
48 case MAILLIB::A_NNTP: 49 case MAILLIB::A_NNTP:
49 return new NNTPwrapper((NNTPaccount*)a); 50 return new NNTPwrapper((NNTPaccount*)a);
50 break; 51 break;
51 default: 52 default:
52 return 0; 53 return 0;
53 } 54 }
54} 55}
55 56
56encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) 57encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc)
57{ 58{
58 // odebug << "Decode string start" << oendl; 59 // odebug << "Decode string start" << oendl;
59 char*result_text; 60 char*result_text;
60 size_t index = 0; 61 size_t index = 0;
61 /* reset for recursive use! */ 62 /* reset for recursive use! */
62 size_t target_length = 0; 63 size_t target_length = 0;
63 result_text = 0; 64 result_text = 0;
64 int mimetype = MAILMIME_MECHANISM_7BIT; 65 int mimetype = MAILMIME_MECHANISM_7BIT;
65 if (enc.lower()=="quoted-printable") { 66 if (enc.lower()=="quoted-printable") {
66 mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; 67 mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
67 } else if (enc.lower()=="base64") { 68 } else if (enc.lower()=="base64") {
68 mimetype = MAILMIME_MECHANISM_BASE64; 69 mimetype = MAILMIME_MECHANISM_BASE64;
69 } else if (enc.lower()=="8bit") { 70 } else if (enc.lower()=="8bit") {
70 mimetype = MAILMIME_MECHANISM_8BIT; 71 mimetype = MAILMIME_MECHANISM_8BIT;
71 } else if (enc.lower()=="binary") { 72 } else if (enc.lower()=="binary") {
72 mimetype = MAILMIME_MECHANISM_BINARY; 73 mimetype = MAILMIME_MECHANISM_BINARY;
73 } 74 }
74 75
75 int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, 76 int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype,
76 &result_text,&target_length); 77 &result_text,&target_length);
77 78
78 encodedString* result = new encodedString(); 79 encodedString* result = new encodedString();
79 if (err == MAILIMF_NO_ERROR) { 80 if (err == MAILIMF_NO_ERROR) {
80 result->setContent(result_text,target_length); 81 result->setContent(result_text,target_length);
81 } 82 }
82 //odebug << "Decode string finished" << oendl; 83 //odebug << "Decode string finished" << oendl;
83 return result; 84 return result;
84} 85}
85 86
86QString AbstractMail::convert_String(const char*text) 87QString AbstractMail::convert_String(const char*text)
87{ 88{
88 //size_t index = 0; 89 //size_t index = 0;
89 char*res = 0; 90 char*res = 0;
90 int err = MAILIMF_NO_ERROR; 91 int err = MAILIMF_NO_ERROR;
91 92
92 QString result(text); 93 QString result(text);
93 94
94 /* due a bug in libetpan it isn't usable this moment */ 95 /* due a bug in libetpan it isn't usable this moment */
95/* int err = mailmime_encoded_phrase_parse("iso-8859-1", 96/* int err = mailmime_encoded_phrase_parse("iso-8859-1",
96 text, strlen(text),&index, "iso-8859-1",&res);*/ 97 text, strlen(text),&index, "iso-8859-1",&res);*/
97 //odebug << "Input: " << text << "" << oendl; 98 //odebug << "Input: " << text << "" << oendl;
98 if (err == MAILIMF_NO_ERROR && res && strlen(res)) { 99 if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
99// result = QString(res); 100// result = QString(res);
100// odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; 101// odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl;
101 } 102 }
102 if (res) free(res); 103 if (res) free(res);
103 return result; 104 return result;
104} 105}
105 106
106/* cp & paste from launcher */ 107/* cp & paste from launcher */
107QString AbstractMail::gen_attachment_id() 108QString AbstractMail::gen_attachment_id()
108{ 109{
109 QFile file( "/proc/sys/kernel/random/uuid" ); 110 QFile file( "/proc/sys/kernel/random/uuid" );
110 if (!file.open(IO_ReadOnly ) ) 111 if (!file.open(IO_ReadOnly ) )
111 return QString::null; 112 return QString::null;
112 113
113 QTextStream stream(&file); 114 QTextStream stream(&file);
114 115
115 return "{" + stream.read().stripWhiteSpace() + "}"; 116 return "{" + stream.read().stripWhiteSpace() + "}";
116} 117}
117 118
118int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) 119int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
119{ 120{
120 return 0; 121 return 0;
121} 122}
122 123
123QString AbstractMail::defaultLocalfolder() 124QString AbstractMail::defaultLocalfolder()
124{ 125{
125 // QString f = getenv( "HOME" ); 126 // QString f = getenv( "HOME" );
126 QString f = locateLocal( "data", "kmicromail/localmail"); 127 QString f = locateLocal( "data", "kmicromail/localmail");
127 // f += "/Applications/opiemail/localmail"; 128 // f += "/Applications/opiemail/localmail";
128 return f; 129 return f;
129} 130}
130 131
131QString AbstractMail::draftFolder() 132QString AbstractMail::draftFolder()
132{ 133{
133 return QString("Drafts"); 134 return QString("Drafts");
134} 135}
135 136
136/* temporary - will be removed when implemented in all classes */ 137/* temporary - will be removed when implemented in all classes */
137void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &) 138void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
138{ 139{
139} 140}
141void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
142{
143 qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
140 144
145}
141void AbstractMail::mvcpAllMails(const FolderP&fromFolder, 146void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
142 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) 147 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
148{
149 QValueList<RecMailP> t;
150 listMessages(fromFolder->getName(),t, maxSizeInKb);
151 mvcpMailList( t,targetFolder,targetWrapper,moveit);
152
153}
154void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
155 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
143{ 156{
144 QValueList<RecMailP> t; 157
145 listMessages(fromFolder->getName(),t);
146 encodedString*st = 0; 158 encodedString*st = 0;
147 while (t.count()>0) { 159 int iii = 0;
148 RecMailP r = (*t.begin()); 160 int count = t.count();
161 while (iii < count ) {
162 RecMailP r = (*t.at( iii ));
149 st = fetchRawBody(r); 163 st = fetchRawBody(r);
150 if (st) { 164 if (st) {
151 targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); 165 targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder);
152 delete st; 166 delete st;
153 } 167 }
154 t.remove(t.begin()); 168 ++iii;
155 } 169 }
156 if (moveit) { 170 if (moveit) {
157 deleteAllMail(fromFolder); 171 deleteMailList( t );
172 //deleteAllMail(fromFolder);
158 } 173 }
159} 174}
160 175
161void AbstractMail::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) 176void AbstractMail::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
162{ 177{
163 encodedString*st = 0; 178 encodedString*st = 0;
164 st = fetchRawBody(mail); 179 st = fetchRawBody(mail);
165 if (st) { 180 if (st) {
166 targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); 181 targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder);
167 delete st; 182 delete st;
168 } 183 }
169 if (moveit) { 184 if (moveit) {
170 deleteMail(mail); 185 deleteMail(mail);
171 } 186 }
172} 187}
diff --git a/kmicromail/libmailwrapper/abstractmail.h b/kmicromail/libmailwrapper/abstractmail.h
index e5d64a6..cae83f4 100644
--- a/kmicromail/libmailwrapper/abstractmail.h
+++ b/kmicromail/libmailwrapper/abstractmail.h
@@ -1,72 +1,76 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#ifndef __abstract_mail_ 2#ifndef __abstract_mail_
2#define __abstract_mail_ 3#define __abstract_mail_
3 4
4#include "maildefines.h" 5#include "maildefines.h"
5 6
6#include "settings.h" 7#include "settings.h"
7 8
8#include <qobject.h> 9#include <qobject.h>
9#include <opie2/osmartpointer.h> 10#include <opie2/osmartpointer.h>
10#include "mailtypes.h" 11#include "mailtypes.h"
11 12
12class IMAPwrapper; 13class IMAPwrapper;
13class POP3wrapper; 14class POP3wrapper;
14class Folder; 15class Folder;
15class encodedString; 16class encodedString;
16struct folderStat; 17struct folderStat;
17 18
18class AbstractMail:public QObject 19class AbstractMail:public QObject
19{ 20{
20 Q_OBJECT 21 Q_OBJECT
21public: 22public:
22 AbstractMail(){}; 23 AbstractMail(){};
23 virtual ~AbstractMail(){} 24 virtual ~AbstractMail(){}
24 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0; 25 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
25 virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target )=0; 26 virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target, int sizeInKb = 0 )=0;
26 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0; 27 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0;
27 virtual RecBodyP fetchBody(const RecMailP&mail)=0; 28 virtual RecBodyP fetchBody(const RecMailP&mail)=0;
28 virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part)=0; 29 virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part)=0;
29 virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part)=0; 30 virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part)=0;
30 virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part)=0; 31 virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part)=0;
31 virtual encodedString* fetchRawBody(const RecMailP&mail)=0; 32 virtual encodedString* fetchRawBody(const RecMailP&mail)=0;
32 33
33 virtual void deleteMail(const RecMailP&mail)=0; 34 virtual void deleteMail(const RecMailP&mail)=0;
35 virtual void deleteMailList(const QValueList<RecMailP>&target);
34 virtual void answeredMail(const RecMailP&mail)=0; 36 virtual void answeredMail(const RecMailP&mail)=0;
35 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&)=0; 37 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&)=0;
36 virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> >&target); 38 virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> >&target);
37 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&)=0; 39 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&)=0;
38 virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0; 40 virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
39 41
40 virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder, 42 virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
41 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); 43 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int sizeInKb = 0);
44 virtual void mvcpMailList(const QValueList<RecMailP>& t,
45 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
42 virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); 46 virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
43 47
44 virtual void cleanMimeCache(){}; 48 virtual void cleanMimeCache(){};
45 /* mail box methods */ 49 /* mail box methods */
46 /* parameter is the box to create. 50 /* parameter is the box to create.
47 * if the implementing subclass has prefixes, 51 * if the implementing subclass has prefixes,
48 * them has to be appended automatic. 52 * them has to be appended automatic.
49 */ 53 */
50 virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0, 54 virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0,
51 const QString& delemiter="/",bool getsubfolder=false); 55 const QString& delemiter="/",bool getsubfolder=false);
52 virtual void logout()=0; 56 virtual void logout()=0;
53 57
54 static AbstractMail* getWrapper(IMAPaccount *a); 58 static AbstractMail* getWrapper(IMAPaccount *a);
55 static AbstractMail* getWrapper(POP3account *a); 59 static AbstractMail* getWrapper(POP3account *a);
56 static AbstractMail* getWrapper(NNTPaccount *a); 60 static AbstractMail* getWrapper(NNTPaccount *a);
57 /* mbox only! */ 61 /* mbox only! */
58 static AbstractMail* getWrapper(const QString&a,const QString&name="Local Folders"); 62 static AbstractMail* getWrapper(const QString&a,const QString&name="Local Folders");
59 static AbstractMail* getWrapper(Account*a); 63 static AbstractMail* getWrapper(Account*a);
60 64
61 static QString defaultLocalfolder(); 65 static QString defaultLocalfolder();
62 static QString draftFolder(); 66 static QString draftFolder();
63 67
64 virtual MAILLIB::ATYPE getType()const=0; 68 virtual MAILLIB::ATYPE getType()const=0;
65 virtual const QString&getName()const=0; 69 virtual const QString&getName()const=0;
66 70
67protected: 71protected:
68 static encodedString*decode_String(const encodedString*text,const QString&enc); 72 static encodedString*decode_String(const encodedString*text,const QString&enc);
69 static QString convert_String(const char*text); 73 static QString convert_String(const char*text);
70 static QString gen_attachment_id(); 74 static QString gen_attachment_id();
71}; 75};
72#endif 76#endif
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index f804e44..1fd4bb1 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -1,96 +1,97 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#include "genericwrapper.h" 2#include "genericwrapper.h"
2#include <libetpan/libetpan.h> 3#include <libetpan/libetpan.h>
3#include "mailtypes.h" 4#include "mailtypes.h"
4 5
5 6
6 7
7using namespace Opie::Core; 8using namespace Opie::Core;
8Genericwrapper::Genericwrapper() 9Genericwrapper::Genericwrapper()
9 : AbstractMail() 10 : AbstractMail()
10{ 11{
11 bodyCache.clear(); 12 bodyCache.clear();
12 m_storage = 0; 13 m_storage = 0;
13 m_folder = 0; 14 m_folder = 0;
14} 15}
15 16
16Genericwrapper::~Genericwrapper() 17Genericwrapper::~Genericwrapper()
17{ 18{
18 if (m_folder) { 19 if (m_folder) {
19 mailfolder_free(m_folder); 20 mailfolder_free(m_folder);
20 } 21 }
21 if (m_storage) { 22 if (m_storage) {
22 mailstorage_free(m_storage); 23 mailstorage_free(m_storage);
23 } 24 }
24 cleanMimeCache(); 25 cleanMimeCache();
25} 26}
26 27
27void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime) 28void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime)
28{ 29{
29 if (!mime) { 30 if (!mime) {
30 return; 31 return;
31 } 32 }
32 mailmime_field*field = 0; 33 mailmime_field*field = 0;
33 mailmime_single_fields fields; 34 mailmime_single_fields fields;
34 memset(&fields, 0, sizeof(struct mailmime_single_fields)); 35 memset(&fields, 0, sizeof(struct mailmime_single_fields));
35 if (mime->mm_mime_fields != NULL) { 36 if (mime->mm_mime_fields != NULL) {
36 mailmime_single_fields_init(&fields, mime->mm_mime_fields, 37 mailmime_single_fields_init(&fields, mime->mm_mime_fields,
37 mime->mm_content_type); 38 mime->mm_content_type);
38 } 39 }
39 40
40 mailmime_content*type = fields.fld_content; 41 mailmime_content*type = fields.fld_content;
41 clistcell*current; 42 clistcell*current;
42 if (!type) { 43 if (!type) {
43 target->setType("text"); 44 target->setType("text");
44 target->setSubtype("plain"); 45 target->setSubtype("plain");
45 } else { 46 } else {
46 target->setSubtype(type->ct_subtype); 47 target->setSubtype(type->ct_subtype);
47 switch(type->ct_type->tp_data.tp_discrete_type->dt_type) { 48 switch(type->ct_type->tp_data.tp_discrete_type->dt_type) {
48 case MAILMIME_DISCRETE_TYPE_TEXT: 49 case MAILMIME_DISCRETE_TYPE_TEXT:
49 target->setType("text"); 50 target->setType("text");
50 break; 51 break;
51 case MAILMIME_DISCRETE_TYPE_IMAGE: 52 case MAILMIME_DISCRETE_TYPE_IMAGE:
52 target->setType("image"); 53 target->setType("image");
53 break; 54 break;
54 case MAILMIME_DISCRETE_TYPE_AUDIO: 55 case MAILMIME_DISCRETE_TYPE_AUDIO:
55 target->setType("audio"); 56 target->setType("audio");
56 break; 57 break;
57 case MAILMIME_DISCRETE_TYPE_VIDEO: 58 case MAILMIME_DISCRETE_TYPE_VIDEO:
58 target->setType("video"); 59 target->setType("video");
59 break; 60 break;
60 case MAILMIME_DISCRETE_TYPE_APPLICATION: 61 case MAILMIME_DISCRETE_TYPE_APPLICATION:
61 target->setType("application"); 62 target->setType("application");
62 break; 63 break;
63 case MAILMIME_DISCRETE_TYPE_EXTENSION: 64 case MAILMIME_DISCRETE_TYPE_EXTENSION:
64 default: 65 default:
65 if (type->ct_type->tp_data.tp_discrete_type->dt_extension) { 66 if (type->ct_type->tp_data.tp_discrete_type->dt_extension) {
66 target->setType(type->ct_type->tp_data.tp_discrete_type->dt_extension); 67 target->setType(type->ct_type->tp_data.tp_discrete_type->dt_extension);
67 } 68 }
68 break; 69 break;
69 } 70 }
70 if (type->ct_parameters) { 71 if (type->ct_parameters) {
71 fillParameters(target,type->ct_parameters); 72 fillParameters(target,type->ct_parameters);
72 } 73 }
73 } 74 }
74 if (mime->mm_mime_fields && mime->mm_mime_fields->fld_list) { 75 if (mime->mm_mime_fields && mime->mm_mime_fields->fld_list) {
75 for (current=clist_begin(mime->mm_mime_fields->fld_list);current!=0;current=clist_next(current)) { 76 for (current=clist_begin(mime->mm_mime_fields->fld_list);current!=0;current=clist_next(current)) {
76 field = (mailmime_field*)current->data; 77 field = (mailmime_field*)current->data;
77 switch(field->fld_type) { 78 switch(field->fld_type) {
78 case MAILMIME_FIELD_TRANSFER_ENCODING: 79 case MAILMIME_FIELD_TRANSFER_ENCODING:
79 target->setEncoding(getencoding(field->fld_data.fld_encoding)); 80 target->setEncoding(getencoding(field->fld_data.fld_encoding));
80 break; 81 break;
81 case MAILMIME_FIELD_ID: 82 case MAILMIME_FIELD_ID:
82 target->setIdentifier(field->fld_data.fld_id); 83 target->setIdentifier(field->fld_data.fld_id);
83 break; 84 break;
84 case MAILMIME_FIELD_DESCRIPTION: 85 case MAILMIME_FIELD_DESCRIPTION:
85 target->setDescription(field->fld_data.fld_description); 86 target->setDescription(field->fld_data.fld_description);
86 break; 87 break;
87 default: 88 default:
88 break; 89 break;
89 } 90 }
90 } 91 }
91 } 92 }
92} 93}
93 94
94void Genericwrapper::fillParameters(RecPartP&target,clist*parameters) 95void Genericwrapper::fillParameters(RecPartP&target,clist*parameters)
95{ 96{
96 if (!parameters) {return;} 97 if (!parameters) {return;}
@@ -299,182 +300,183 @@ QString Genericwrapper::parseGroup( mailimf_group *group )
299 300
300 return result; 301 return result;
301} 302}
302 303
303QString Genericwrapper::parseMailbox( mailimf_mailbox *box ) 304QString Genericwrapper::parseMailbox( mailimf_mailbox *box )
304{ 305{
305 QString result( "" ); 306 QString result( "" );
306 307
307 if ( box->mb_display_name == NULL ) { 308 if ( box->mb_display_name == NULL ) {
308 result.append( box->mb_addr_spec ); 309 result.append( box->mb_addr_spec );
309 } else { 310 } else {
310 result.append( convert_String(box->mb_display_name).latin1() ); 311 result.append( convert_String(box->mb_display_name).latin1() );
311 result.append( " <" ); 312 result.append( " <" );
312 result.append( box->mb_addr_spec ); 313 result.append( box->mb_addr_spec );
313 result.append( ">" ); 314 result.append( ">" );
314 } 315 }
315 316
316 return result; 317 return result;
317} 318}
318 319
319QString Genericwrapper::parseMailboxList( mailimf_mailbox_list *list ) 320QString Genericwrapper::parseMailboxList( mailimf_mailbox_list *list )
320{ 321{
321 QString result( "" ); 322 QString result( "" );
322 323
323 bool first = true; 324 bool first = true;
324 for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) { 325 for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) {
325 mailimf_mailbox *box = (mailimf_mailbox *) current->data; 326 mailimf_mailbox *box = (mailimf_mailbox *) current->data;
326 327
327 if ( !first ) { 328 if ( !first ) {
328 result.append( "," ); 329 result.append( "," );
329 } else { 330 } else {
330 first = false; 331 first = false;
331 } 332 }
332 333
333 result.append( parseMailbox( box ) ); 334 result.append( parseMailbox( box ) );
334 } 335 }
335 336
336 return result; 337 return result;
337} 338}
338 339
339encodedString* Genericwrapper::fetchDecodedPart(const RecMailP&,const RecPartP&part) 340encodedString* Genericwrapper::fetchDecodedPart(const RecMailP&,const RecPartP&part)
340{ 341{
341 QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier()); 342 QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
342 if (it==bodyCache.end()) return new encodedString(); 343 if (it==bodyCache.end()) return new encodedString();
343 encodedString*t = decode_String(it.data(),part->Encoding()); 344 encodedString*t = decode_String(it.data(),part->Encoding());
344 return t; 345 return t;
345} 346}
346 347
347encodedString* Genericwrapper::fetchRawPart(const RecMailP&,const RecPartP&part) 348encodedString* Genericwrapper::fetchRawPart(const RecMailP&,const RecPartP&part)
348{ 349{
349 QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier()); 350 QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
350 if (it==bodyCache.end()) return new encodedString(); 351 if (it==bodyCache.end()) return new encodedString();
351 encodedString*t = it.data(); 352 encodedString*t = it.data();
352 return t; 353 return t;
353} 354}
354 355
355QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part) 356QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part)
356{ 357{
357 encodedString*t = fetchDecodedPart(mail,part); 358 encodedString*t = fetchDecodedPart(mail,part);
358 QString text=t->Content(); 359 QString text=t->Content();
359 delete t; 360 delete t;
360 return text; 361 return text;
361} 362}
362 363
363void Genericwrapper::cleanMimeCache() 364void Genericwrapper::cleanMimeCache()
364{ 365{
365 QMap<QString,encodedString*>::Iterator it = bodyCache.begin(); 366 QMap<QString,encodedString*>::Iterator it = bodyCache.begin();
366 for (;it!=bodyCache.end();++it) { 367 for (;it!=bodyCache.end();++it) {
367 encodedString*t = it.data(); 368 encodedString*t = it.data();
368 //it.setValue(0); 369 //it.setValue(0);
369 if (t) delete t; 370 if (t) delete t;
370 } 371 }
371 bodyCache.clear(); 372 bodyCache.clear();
372 ; // odebug << "Genericwrapper: cache cleaned" << oendl; 373 ; // odebug << "Genericwrapper: cache cleaned" << oendl;
373} 374}
374 375
375QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) 376QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
376{ 377{
377 QStringList res; 378 QStringList res;
378 if (!in_replies || !in_replies->mid_list) return res; 379 if (!in_replies || !in_replies->mid_list) return res;
379 clistiter * current = 0; 380 clistiter * current = 0;
380 for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) { 381 for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) {
381 QString h((char*)current->data); 382 QString h((char*)current->data);
382 while (h.length()>0 && h[0]=='<') { 383 while (h.length()>0 && h[0]=='<') {
383 h.remove(0,1); 384 h.remove(0,1);
384 } 385 }
385 while (h.length()>0 && h[h.length()-1]=='>') { 386 while (h.length()>0 && h[h.length()-1]=='>') {
386 h.remove(h.length()-1,1); 387 h.remove(h.length()-1,1);
387 } 388 }
388 if (h.length()>0) { 389 if (h.length()>0) {
389 res.append(h); 390 res.append(h);
390 } 391 }
391 } 392 }
392 return res; 393 return res;
393} 394}
394 395
395void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to) 396void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to, int maxSizeInKb)
396{ 397{
397 int r; 398 int r;
398 mailmessage_list * env_list = 0; 399 mailmessage_list * env_list = 0;
399 r = mailsession_get_messages_list(session,&env_list); 400 r = mailsession_get_messages_list(session,&env_list);
400 if (r != MAIL_NO_ERROR) { 401 if (r != MAIL_NO_ERROR) {
401 ; // odebug << "Error message list" << oendl; 402 ; // odebug << "Error message list" << oendl;
402 return; 403 return;
403 } 404 }
404 r = mailsession_get_envelopes_list(session, env_list); 405 r = mailsession_get_envelopes_list(session, env_list);
405 if (r != MAIL_NO_ERROR) { 406 if (r != MAIL_NO_ERROR) {
406 ; // odebug << "Error filling message list" << oendl; 407 ; // odebug << "Error filling message list" << oendl;
407 if (env_list) { 408 if (env_list) {
408 mailmessage_list_free(env_list); 409 mailmessage_list_free(env_list);
409 } 410 }
410 return; 411 return;
411 } 412 }
412 mailimf_references * refs = 0; 413 mailimf_references * refs = 0;
413 mailimf_in_reply_to * in_replies = 0; 414 mailimf_in_reply_to * in_replies = 0;
414 uint32_t i = 0; 415 uint32_t i = 0;
415 for(; i < carray_count(env_list->msg_tab) ; ++i) { 416 for(; i < carray_count(env_list->msg_tab) ; ++i) {
416 mailmessage * msg; 417 mailmessage * msg;
417 QBitArray mFlags(7); 418 QBitArray mFlags(7);
418 msg = (mailmessage*)carray_get(env_list->msg_tab, i); 419 msg = (mailmessage*)carray_get(env_list->msg_tab, i);
419 if (msg->msg_fields == NULL) { 420 if (msg->msg_fields == NULL) {
420 //; // odebug << "could not fetch envelope of message " << i << "" << oendl; 421 //; // odebug << "could not fetch envelope of message " << i << "" << oendl;
421 continue; 422 continue;
422 } 423 }
423 RecMailP mail = new RecMail(); 424 RecMailP mail = new RecMail();
424 mail->setWrapper(this); 425 mail->setWrapper(this);
425 mail_flags * flag_result = 0; 426 mail_flags * flag_result = 0;
426 r = mailmessage_get_flags(msg,&flag_result); 427 r = mailmessage_get_flags(msg,&flag_result);
427 if (r == MAIL_ERROR_NOT_IMPLEMENTED) { 428 if (r == MAIL_ERROR_NOT_IMPLEMENTED) {
428 mFlags.setBit(FLAG_SEEN); 429 mFlags.setBit(FLAG_SEEN);
429 } 430 }
430 mailimf_single_fields single_fields; 431 mailimf_single_fields single_fields;
431 mailimf_single_fields_init(&single_fields, msg->msg_fields); 432 mailimf_single_fields_init(&single_fields, msg->msg_fields);
432 mail->setMsgsize(msg->msg_size); 433 mail->setMsgsize(msg->msg_size);
433 mail->setFlags(mFlags); 434 mail->setFlags(mFlags);
434 mail->setMbox(mailbox); 435 mail->setMbox(mailbox);
435 mail->setNumber(msg->msg_index); 436 mail->setNumber(msg->msg_index);
436 if (single_fields.fld_subject) 437 if (single_fields.fld_subject)
437 mail->setSubject( convert_String(single_fields.fld_subject->sbj_value)); 438 mail->setSubject( convert_String(single_fields.fld_subject->sbj_value));
438 if (single_fields.fld_from) 439 if (single_fields.fld_from)
439 mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list)); 440 mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list));
440 if (!mbox_as_to) { 441 if (!mbox_as_to) {
441 if (single_fields.fld_to) 442 if (single_fields.fld_to)
442 mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) ); 443 mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) );
443 } else { 444 } else {
444 mail->setTo(mailbox); 445 mail->setTo(mailbox);
445 } 446 }
446 if (single_fields.fld_cc) 447 if (single_fields.fld_cc)
447 mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) ); 448 mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) );
448 if (single_fields.fld_bcc) 449 if (single_fields.fld_bcc)
449 mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) ); 450 mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) );
450 if (single_fields.fld_orig_date) 451 if (single_fields.fld_orig_date)
451 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) ); 452 mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) );
452 // crashes when accessing pop3 account? 453 // crashes when accessing pop3 account?
453 if (single_fields.fld_message_id->mid_value) { 454 if (single_fields.fld_message_id->mid_value) {
454 mail->setMsgid(QString(single_fields.fld_message_id->mid_value)); 455 mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
455 ; // odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl; 456 ; // odebug << "Msgid == " << mail->Msgid().latin1() << "" << oendl;
456 } 457 }
457 458
458 if (single_fields.fld_reply_to) { 459 if (single_fields.fld_reply_to) {
459 QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list); 460 QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list);
460 if (t.count()>0) { 461 if (t.count()>0) {
461 mail->setReplyto(t[0]); 462 mail->setReplyto(t[0]);
462 } 463 }
463 } 464 }
464#if 0 465#if 0
465 refs = single_fields.fld_references; 466 refs = single_fields.fld_references;
466 if (refs && refs->mid_list && clist_count(refs->mid_list)) { 467 if (refs && refs->mid_list && clist_count(refs->mid_list)) {
467 char * text = (char*)refs->mid_list->first->data; 468 char * text = (char*)refs->mid_list->first->data;
468 mail->setReplyto(QString(text)); 469 mail->setReplyto(QString(text));
469 } 470 }
470#endif 471#endif
471 if (single_fields.fld_in_reply_to && single_fields.fld_in_reply_to->mid_list && 472 if (single_fields.fld_in_reply_to && single_fields.fld_in_reply_to->mid_list &&
472 clist_count(single_fields.fld_in_reply_to->mid_list)) { 473 clist_count(single_fields.fld_in_reply_to->mid_list)) {
473 mail->setInreply(parseInreplies(single_fields.fld_in_reply_to)); 474 mail->setInreply(parseInreplies(single_fields.fld_in_reply_to));
474 } 475 }
475 target.append(mail); 476 if ( maxSizeInKb == 0 || mail->Msgsize()<=maxSizeInKb*1024 )
477 target.append(mail);
476 } 478 }
477 if (env_list) { 479 if (env_list) {
478 mailmessage_list_free(env_list); 480 mailmessage_list_free(env_list);
479 } 481 }
480} 482}
diff --git a/kmicromail/libmailwrapper/genericwrapper.h b/kmicromail/libmailwrapper/genericwrapper.h
index 8be9212..235e116 100644
--- a/kmicromail/libmailwrapper/genericwrapper.h
+++ b/kmicromail/libmailwrapper/genericwrapper.h
@@ -1,67 +1,68 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#ifndef __GENERIC_WRAPPER_H 2#ifndef __GENERIC_WRAPPER_H
2#define __GENERIC_WRAPPER_H 3#define __GENERIC_WRAPPER_H
3 4
4#include "abstractmail.h" 5#include "abstractmail.h"
5#include <qmap.h> 6#include <qmap.h>
6#include <qstring.h> 7#include <qstring.h>
7#include <libetpan/clist.h> 8#include <libetpan/clist.h>
8 9
9class RecMail; 10class RecMail;
10class RecBody; 11class RecBody;
11class encodedString; 12class encodedString;
12struct mailpop3; 13struct mailpop3;
13struct mailmessage; 14struct mailmessage;
14struct mailmime; 15struct mailmime;
15struct mailmime_mechanism; 16struct mailmime_mechanism;
16struct mailimf_mailbox_list; 17struct mailimf_mailbox_list;
17struct mailimf_mailbox; 18struct mailimf_mailbox;
18struct mailimf_date_time; 19struct mailimf_date_time;
19struct mailimf_group; 20struct mailimf_group;
20struct mailimf_address_list; 21struct mailimf_address_list;
21struct mailsession; 22struct mailsession;
22struct mailstorage; 23struct mailstorage;
23struct mailfolder; 24struct mailfolder;
24struct mailimf_in_reply_to; 25struct mailimf_in_reply_to;
25 26
26/* this class hold just the funs shared between 27/* this class hold just the funs shared between
27 * mbox and pop3 (later mh, too) mail access. 28 * mbox and pop3 (later mh, too) mail access.
28 * it is not desigend to make a instance of it! 29 * it is not desigend to make a instance of it!
29 */ 30 */
30class Genericwrapper : public AbstractMail 31class Genericwrapper : public AbstractMail
31{ 32{
32 Q_OBJECT 33 Q_OBJECT
33public: 34public:
34 Genericwrapper(); 35 Genericwrapper();
35 virtual ~Genericwrapper(); 36 virtual ~Genericwrapper();
36 37
37 virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part); 38 virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part);
38 virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part); 39 virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part);
39 virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part); 40 virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part);
40 virtual void cleanMimeCache(); 41 virtual void cleanMimeCache();
41 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&){return 1;} 42 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&){return 1;}
42 virtual void logout(){}; 43 virtual void logout(){};
43 virtual void storeMessage(const char*msg,size_t length, const QString&folder){}; 44 virtual void storeMessage(const char*msg,size_t length, const QString&folder){};
44 45
45protected: 46protected:
46 RecBodyP parseMail( mailmessage * msg ); 47 RecBodyP parseMail( mailmessage * msg );
47 QString parseMailboxList( mailimf_mailbox_list *list ); 48 QString parseMailboxList( mailimf_mailbox_list *list );
48 QString parseMailbox( mailimf_mailbox *box ); 49 QString parseMailbox( mailimf_mailbox *box );
49 QString parseGroup( mailimf_group *group ); 50 QString parseGroup( mailimf_group *group );
50 QString parseAddressList( mailimf_address_list *list ); 51 QString parseAddressList( mailimf_address_list *list );
51 QString parseDateTime( mailimf_date_time *date ); 52 QString parseDateTime( mailimf_date_time *date );
52 53
53 void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1); 54 void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
54 static void fillSingleBody(RecPartP&target,mailmessage*message,mailmime*mime); 55 static void fillSingleBody(RecPartP&target,mailmessage*message,mailmime*mime);
55 static void fillParameters(RecPartP&target,clist*parameters); 56 static void fillParameters(RecPartP&target,clist*parameters);
56 static QString getencoding(mailmime_mechanism*aEnc); 57 static QString getencoding(mailmime_mechanism*aEnc);
57 virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false); 58 virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false, int maxSizeInKb = 0);
58 QStringList parseInreplies(mailimf_in_reply_to * in_replies); 59 QStringList parseInreplies(mailimf_in_reply_to * in_replies);
59 60
60 QString msgTempName; 61 QString msgTempName;
61 unsigned int last_msg_id; 62 unsigned int last_msg_id;
62 QMap<QString,encodedString*> bodyCache; 63 QMap<QString,encodedString*> bodyCache;
63 mailstorage * m_storage; 64 mailstorage * m_storage;
64 mailfolder*m_folder; 65 mailfolder*m_folder;
65}; 66};
66 67
67#endif 68#endif
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index e0fb6f9..bb8bbfc 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -1,96 +1,97 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#include <stdlib.h> 2#include <stdlib.h>
2#include <libetpan/libetpan.h> 3#include <libetpan/libetpan.h>
3#include <qpe/global.h> 4#include <qpe/global.h>
4#include <qapplication.h> 5#include <qapplication.h>
5#include "imapwrapper.h" 6#include "imapwrapper.h"
6#include "mailtypes.h" 7#include "mailtypes.h"
7#include "logindialog.h" 8#include "logindialog.h"
8 9
9using namespace Opie::Core; 10using namespace Opie::Core;
10IMAPwrapper::IMAPwrapper( IMAPaccount *a ) 11IMAPwrapper::IMAPwrapper( IMAPaccount *a )
11 : AbstractMail() 12 : AbstractMail()
12{ 13{
13 account = a; 14 account = a;
14 m_imap = 0; 15 m_imap = 0;
15 m_Lastmbox = ""; 16 m_Lastmbox = "";
16} 17}
17 18
18IMAPwrapper::~IMAPwrapper() 19IMAPwrapper::~IMAPwrapper()
19{ 20{
20 logout(); 21 logout();
21} 22}
22 23
23/* to avoid to often select statements in loops etc. 24/* to avoid to often select statements in loops etc.
24 we trust that we are logged in and connection is established!*/ 25 we trust that we are logged in and connection is established!*/
25int IMAPwrapper::selectMbox(const QString&mbox) 26int IMAPwrapper::selectMbox(const QString&mbox)
26{ 27{
27 if (mbox == m_Lastmbox) { 28 if (mbox == m_Lastmbox) {
28 return MAILIMAP_NO_ERROR; 29 return MAILIMAP_NO_ERROR;
29 } 30 }
30 int err = mailimap_select( m_imap, (char*)mbox.latin1()); 31 int err = mailimap_select( m_imap, (char*)mbox.latin1());
31 if ( err != MAILIMAP_NO_ERROR ) { 32 if ( err != MAILIMAP_NO_ERROR ) {
32 m_Lastmbox = ""; 33 m_Lastmbox = "";
33 return err; 34 return err;
34 } 35 }
35 m_Lastmbox = mbox; 36 m_Lastmbox = mbox;
36 return err; 37 return err;
37} 38}
38 39
39void IMAPwrapper::imap_progress( size_t current, size_t maximum ) 40void IMAPwrapper::imap_progress( size_t current, size_t maximum )
40{ 41{
41 qApp->processEvents(); 42 qApp->processEvents();
42 qDebug("imap progress %d of %d ",current,maximum ); 43 qDebug("imap progress %d of %d ",current,maximum );
43} 44}
44 45
45bool IMAPwrapper::start_tls(bool force_tls) 46bool IMAPwrapper::start_tls(bool force_tls)
46{ 47{
47 int err; 48 int err;
48 bool try_tls; 49 bool try_tls;
49 mailimap_capability_data * cap_data = 0; 50 mailimap_capability_data * cap_data = 0;
50 51
51 err = mailimap_capability(m_imap,&cap_data); 52 err = mailimap_capability(m_imap,&cap_data);
52 if (err != MAILIMAP_NO_ERROR) { 53 if (err != MAILIMAP_NO_ERROR) {
53 Global::statusMessage("error getting capabilities!"); 54 Global::statusMessage("error getting capabilities!");
54 return false; 55 return false;
55 } 56 }
56 clistiter * cur; 57 clistiter * cur;
57 for(cur = clist_begin(cap_data->cap_list) ; cur != NULL;cur = clist_next(cur)) { 58 for(cur = clist_begin(cap_data->cap_list) ; cur != NULL;cur = clist_next(cur)) {
58 struct mailimap_capability * cap; 59 struct mailimap_capability * cap;
59 cap = (struct mailimap_capability *)clist_content(cur); 60 cap = (struct mailimap_capability *)clist_content(cur);
60 if (cap->cap_type == MAILIMAP_CAPABILITY_NAME) { 61 if (cap->cap_type == MAILIMAP_CAPABILITY_NAME) {
61 if (strcasecmp(cap->cap_data.cap_name, "STARTTLS") == 0) { 62 if (strcasecmp(cap->cap_data.cap_name, "STARTTLS") == 0) {
62 try_tls = true; 63 try_tls = true;
63 break; 64 break;
64 } 65 }
65 } 66 }
66 } 67 }
67 if (cap_data) { 68 if (cap_data) {
68 mailimap_capability_data_free(cap_data); 69 mailimap_capability_data_free(cap_data);
69 } 70 }
70 if (try_tls) { 71 if (try_tls) {
71 err = mailimap_starttls(m_imap); 72 err = mailimap_starttls(m_imap);
72 if (err != MAILIMAP_NO_ERROR && force_tls) { 73 if (err != MAILIMAP_NO_ERROR && force_tls) {
73 Global::statusMessage(tr("Server has no TLS support!")); 74 Global::statusMessage(tr("Server has no TLS support!"));
74 try_tls = false; 75 try_tls = false;
75 } else { 76 } else {
76 mailstream_low * low; 77 mailstream_low * low;
77 mailstream_low * new_low; 78 mailstream_low * new_low;
78 low = mailstream_get_low(m_imap->imap_stream); 79 low = mailstream_get_low(m_imap->imap_stream);
79 if (!low) { 80 if (!low) {
80 try_tls = false; 81 try_tls = false;
81 } else { 82 } else {
82 int fd = mailstream_low_get_fd(low); 83 int fd = mailstream_low_get_fd(low);
83 if (fd > -1 && (new_low = mailstream_low_ssl_open(fd))!=0) { 84 if (fd > -1 && (new_low = mailstream_low_ssl_open(fd))!=0) {
84 mailstream_low_free(low); 85 mailstream_low_free(low);
85 mailstream_set_low(m_imap->imap_stream, new_low); 86 mailstream_set_low(m_imap->imap_stream, new_low);
86 } else { 87 } else {
87 try_tls = false; 88 try_tls = false;
88 } 89 }
89 } 90 }
90 } 91 }
91 } 92 }
92 return try_tls; 93 return try_tls;
93} 94}
94 95
95void IMAPwrapper::login() 96void IMAPwrapper::login()
96{ 97{
@@ -109,244 +110,246 @@ void IMAPwrapper::login()
109 mailstream_flush(m_imap->imap_stream); 110 mailstream_flush(m_imap->imap_stream);
110 return; 111 return;
111 } 112 }
112 } 113 }
113 server = account->getServer().latin1(); 114 server = account->getServer().latin1();
114 port = account->getPort().toUInt(); 115 port = account->getPort().toUInt();
115 if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { 116 if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
116 LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); 117 LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
117 login.show(); 118 login.show();
118 if ( QDialog::Accepted == login.exec() ) { 119 if ( QDialog::Accepted == login.exec() ) {
119 // ok 120 // ok
120 user = login.getUser().latin1(); 121 user = login.getUser().latin1();
121 pass = login.getPassword().latin1(); 122 pass = login.getPassword().latin1();
122 } else { 123 } else {
123 // cancel 124 // cancel
124 return; 125 return;
125 } 126 }
126 } else { 127 } else {
127 user = account->getUser().latin1(); 128 user = account->getUser().latin1();
128 pass = account->getPassword().latin1(); 129 pass = account->getPassword().latin1();
129 } 130 }
130 131
131 m_imap = mailimap_new( 20, &imap_progress ); 132 m_imap = mailimap_new( 20, &imap_progress );
132 133
133 /* connect */ 134 /* connect */
134 bool ssl = false; 135 bool ssl = false;
135 bool try_tls = false; 136 bool try_tls = false;
136 bool force_tls = false; 137 bool force_tls = false;
137 138
138 if ( account->ConnectionType() == 2 ) { 139 if ( account->ConnectionType() == 2 ) {
139 ssl = true; 140 ssl = true;
140 } 141 }
141 if (account->ConnectionType()==1) { 142 if (account->ConnectionType()==1) {
142 force_tls = true; 143 force_tls = true;
143 } 144 }
144 145
145 if ( ssl ) { 146 if ( ssl ) {
146 qDebug("using ssl "); 147 qDebug("using ssl ");
147 err = mailimap_ssl_connect( m_imap, (char*)server, port ); 148 err = mailimap_ssl_connect( m_imap, (char*)server, port );
148 } else { 149 } else {
149 err = mailimap_socket_connect( m_imap, (char*)server, port ); 150 err = mailimap_socket_connect( m_imap, (char*)server, port );
150 } 151 }
151 152
152 if ( err != MAILIMAP_NO_ERROR && 153 if ( err != MAILIMAP_NO_ERROR &&
153 err != MAILIMAP_NO_ERROR_AUTHENTICATED && 154 err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
154 err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) { 155 err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
155 QString failure = ""; 156 QString failure = "";
156 if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) { 157 if (err == MAILIMAP_ERROR_CONNECTION_REFUSED) {
157 failure="Connection refused"; 158 failure="Connection refused";
158 } else { 159 } else {
159 failure="Unknown failure"; 160 failure="Unknown failure";
160 } 161 }
161 Global::statusMessage(tr("error connecting imap server: %1").arg(failure)); 162 Global::statusMessage(tr("error connecting imap server: %1").arg(failure));
162 mailimap_free( m_imap ); 163 mailimap_free( m_imap );
163 m_imap = 0; 164 m_imap = 0;
164 return; 165 return;
165 } 166 }
166 167
167 if (!ssl) { 168 if (!ssl) {
168 try_tls = start_tls(force_tls); 169 try_tls = start_tls(force_tls);
169 } 170 }
170 171
171 bool ok = true; 172 bool ok = true;
172 if (force_tls && !try_tls) { 173 if (force_tls && !try_tls) {
173 Global::statusMessage(tr("Server has no TLS support!")); 174 Global::statusMessage(tr("Server has no TLS support!"));
174 ok = false; 175 ok = false;
175 } 176 }
176 177
177 178
178 /* login */ 179 /* login */
179 180
180 if (ok) { 181 if (ok) {
181 err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); 182 err = mailimap_login_simple( m_imap, (char*)user, (char*)pass );
182 if ( err != MAILIMAP_NO_ERROR ) { 183 if ( err != MAILIMAP_NO_ERROR ) {
183 Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response)); 184 Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response));
184 ok = false; 185 ok = false;
185 } 186 }
186 } 187 }
187 if (!ok) { 188 if (!ok) {
188 err = mailimap_close( m_imap ); 189 err = mailimap_close( m_imap );
189 mailimap_free( m_imap ); 190 mailimap_free( m_imap );
190 m_imap = 0; 191 m_imap = 0;
191 } 192 }
192} 193}
193 194
194void IMAPwrapper::logout() 195void IMAPwrapper::logout()
195{ 196{
196 int err = MAILIMAP_NO_ERROR; 197 int err = MAILIMAP_NO_ERROR;
197 if (!m_imap) return; 198 if (!m_imap) return;
198 err = mailimap_logout( m_imap ); 199 err = mailimap_logout( m_imap );
199 err = mailimap_close( m_imap ); 200 err = mailimap_close( m_imap );
200 mailimap_free( m_imap ); 201 mailimap_free( m_imap );
201 m_imap = 0; 202 m_imap = 0;
202 m_Lastmbox = ""; 203 m_Lastmbox = "";
203} 204}
204 205
205void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) 206void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target , int maxSizeInKb)
206{ 207{
207 int err = MAILIMAP_NO_ERROR; 208 int err = MAILIMAP_NO_ERROR;
208 clist *result = 0; 209 clist *result = 0;
209 clistcell *current; 210 clistcell *current;
210 mailimap_fetch_type *fetchType = 0; 211 mailimap_fetch_type *fetchType = 0;
211 mailimap_set *set = 0; 212 mailimap_set *set = 0;
212 213
213 login(); 214 login();
214 if (!m_imap) { 215 if (!m_imap) {
215 return; 216 return;
216 } 217 }
217 /* select mailbox READONLY for operations */ 218 /* select mailbox READONLY for operations */
218 err = selectMbox(mailbox); 219 err = selectMbox(mailbox);
219 if ( err != MAILIMAP_NO_ERROR ) { 220 if ( err != MAILIMAP_NO_ERROR ) {
220 return; 221 return;
221 } 222 }
222 223
223 int last = m_imap->imap_selection_info->sel_exists; 224 int last = m_imap->imap_selection_info->sel_exists;
224 225
225 if (last == 0) { 226 if (last == 0) {
226 Global::statusMessage(tr("Mailbox has no mails")); 227 Global::statusMessage(tr("Mailbox has no mails"));
227 return; 228 return;
228 } else { 229 } else {
229 } 230 }
230 231
231 /* the range has to start at 1!!! not with 0!!!! */ 232 /* the range has to start at 1!!! not with 0!!!! */
232 set = mailimap_set_new_interval( 1, last ); 233 set = mailimap_set_new_interval( 1, last );
233 fetchType = mailimap_fetch_type_new_fetch_att_list_empty(); 234 fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
234 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope()); 235 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
235 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags()); 236 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
236 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate()); 237 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
237 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size()); 238 mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
238 239
239 err = mailimap_fetch( m_imap, set, fetchType, &result ); 240 err = mailimap_fetch( m_imap, set, fetchType, &result );
240 mailimap_set_free( set ); 241 mailimap_set_free( set );
241 mailimap_fetch_type_free( fetchType ); 242 mailimap_fetch_type_free( fetchType );
242 243
243 QString date,subject,from; 244 QString date,subject,from;
244 245
245 if ( err == MAILIMAP_NO_ERROR ) { 246 if ( err == MAILIMAP_NO_ERROR ) {
246 mailimap_msg_att * msg_att; 247 mailimap_msg_att * msg_att;
247 int i = 0; 248 int i = 0;
248 for (current = clist_begin(result); current != 0; current=clist_next(current)) { 249 for (current = clist_begin(result); current != 0; current=clist_next(current)) {
249 ++i; 250 ++i;
250 msg_att = (mailimap_msg_att*)current->data; 251 msg_att = (mailimap_msg_att*)current->data;
251 RecMail*m = parse_list_result(msg_att); 252 RecMail*m = parse_list_result(msg_att);
252 if (m) { 253 if (m) {
253 m->setNumber(i); 254 if ( maxSizeInKb == 0 || m->Msgsize()<=maxSizeInKb*1024 ) {
254 m->setMbox(mailbox); 255 m->setNumber(i);
255 m->setWrapper(this); 256 m->setMbox(mailbox);
256 target.append(m); 257 m->setWrapper(this);
258 target.append(m);
259 }
257 } 260 }
258 } 261 }
259 Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count())); 262 Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count()));
260 } else { 263 } else {
261 Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response)); 264 Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
262 } 265 }
263 if (result) mailimap_fetch_list_free(result); 266 if (result) mailimap_fetch_list_free(result);
264} 267}
265 268
266QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() 269QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
267{ 270{
268 const char *path, *mask; 271 const char *path, *mask;
269 int err = MAILIMAP_NO_ERROR; 272 int err = MAILIMAP_NO_ERROR;
270 clist *result = 0; 273 clist *result = 0;
271 clistcell *current = 0; 274 clistcell *current = 0;
272 clistcell*cur_flag = 0; 275 clistcell*cur_flag = 0;
273 mailimap_mbx_list_flags*bflags = 0; 276 mailimap_mbx_list_flags*bflags = 0;
274 277
275 QValueList<FolderP>* folders = new QValueList<FolderP>(); 278 QValueList<FolderP>* folders = new QValueList<FolderP>();
276 login(); 279 login();
277 if (!m_imap) { 280 if (!m_imap) {
278 return folders; 281 return folders;
279 } 282 }
280 283
281/* 284/*
282 * First we have to check for INBOX 'cause it sometimes it's not inside the path. 285 * First we have to check for INBOX 'cause it sometimes it's not inside the path.
283 * We must not forget to filter them out in next loop! 286 * We must not forget to filter them out in next loop!
284 * it seems like ugly code. and yes - it is ugly code. but the best way. 287 * it seems like ugly code. and yes - it is ugly code. but the best way.
285 */ 288 */
286 QString temp; 289 QString temp;
287 mask = "INBOX" ; 290 mask = "INBOX" ;
288 mailimap_mailbox_list *list; 291 mailimap_mailbox_list *list;
289 err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); 292 err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
290 QString del; 293 QString del;
291 bool selectable = true; 294 bool selectable = true;
292 bool no_inferiors = false; 295 bool no_inferiors = false;
293 if ( err == MAILIMAP_NO_ERROR ) { 296 if ( err == MAILIMAP_NO_ERROR ) {
294 current = result->first; 297 current = result->first;
295 for ( int i = result->count; i > 0; i-- ) { 298 for ( int i = result->count; i > 0; i-- ) {
296 list = (mailimap_mailbox_list *) current->data; 299 list = (mailimap_mailbox_list *) current->data;
297 // it is better use the deep copy mechanism of qt itself 300 // it is better use the deep copy mechanism of qt itself
298 // instead of using strdup! 301 // instead of using strdup!
299 temp = list->mb_name; 302 temp = list->mb_name;
300 del = list->mb_delimiter; 303 del = list->mb_delimiter;
301 current = current->next; 304 current = current->next;
302 if ( (bflags = list->mb_flag) ) { 305 if ( (bflags = list->mb_flag) ) {
303 selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& 306 selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
304 bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); 307 bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
305 for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { 308 for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) {
306 if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { 309 if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) {
307 no_inferiors = true; 310 no_inferiors = true;
308 } 311 }
309 } 312 }
310 } 313 }
311 folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); 314 folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
312 } 315 }
313 } else { 316 } else {
314 qDebug("error fetching folders: "); 317 qDebug("error fetching folders: ");
315 318
316 } 319 }
317 mailimap_list_result_free( result ); 320 mailimap_list_result_free( result );
318 321
319/* 322/*
320 * second stage - get the other then inbox folders 323 * second stage - get the other then inbox folders
321 */ 324 */
322 mask = "*" ; 325 mask = "*" ;
323 path = account->getPrefix().latin1(); 326 path = account->getPrefix().latin1();
324 if (!path) path = ""; 327 if (!path) path = "";
325 err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); 328 err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
326 if ( err == MAILIMAP_NO_ERROR ) { 329 if ( err == MAILIMAP_NO_ERROR ) {
327 current = result->first; 330 current = result->first;
328 for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) { 331 for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) {
329 no_inferiors = false; 332 no_inferiors = false;
330 list = (mailimap_mailbox_list *) current->data; 333 list = (mailimap_mailbox_list *) current->data;
331 // it is better use the deep copy mechanism of qt itself 334 // it is better use the deep copy mechanism of qt itself
332 // instead of using strdup! 335 // instead of using strdup!
333 temp = list->mb_name; 336 temp = list->mb_name;
334 if (temp.lower()=="inbox") 337 if (temp.lower()=="inbox")
335 continue; 338 continue;
336 if (temp.lower()==account->getPrefix().lower()) 339 if (temp.lower()==account->getPrefix().lower())
337 continue; 340 continue;
338 if ( (bflags = list->mb_flag) ) { 341 if ( (bflags = list->mb_flag) ) {
339 selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&& 342 selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
340 bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT); 343 bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
341 for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) { 344 for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) {
342 if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) { 345 if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) {
343 no_inferiors = true; 346 no_inferiors = true;
344 } 347 }
345 } 348 }
346 } 349 }
347 del = list->mb_delimiter; 350 del = list->mb_delimiter;
348 folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix())); 351 folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
349 } 352 }
350 } else { 353 } else {
351 qDebug("error fetching folders "); 354 qDebug("error fetching folders ");
352 355
@@ -773,226 +776,270 @@ void IMAPwrapper::fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*wh
773 param = (mailimap_single_body_fld_param*)cur->data; 776 param = (mailimap_single_body_fld_param*)cur->data;
774 if (param) { 777 if (param) {
775 target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value)); 778 target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
776 } 779 }
777 } 780 }
778 } 781 }
779} 782}
780 783
781void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which) 784void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which)
782{ 785{
783 if (!which) { 786 if (!which) {
784 return; 787 return;
785 } 788 }
786 QString type,sub; 789 QString type,sub;
787 switch (which->bd_media_basic->med_type) { 790 switch (which->bd_media_basic->med_type) {
788 case MAILIMAP_MEDIA_BASIC_APPLICATION: 791 case MAILIMAP_MEDIA_BASIC_APPLICATION:
789 type = "application"; 792 type = "application";
790 break; 793 break;
791 case MAILIMAP_MEDIA_BASIC_AUDIO: 794 case MAILIMAP_MEDIA_BASIC_AUDIO:
792 type = "audio"; 795 type = "audio";
793 break; 796 break;
794 case MAILIMAP_MEDIA_BASIC_IMAGE: 797 case MAILIMAP_MEDIA_BASIC_IMAGE:
795 type = "image"; 798 type = "image";
796 break; 799 break;
797 case MAILIMAP_MEDIA_BASIC_MESSAGE: 800 case MAILIMAP_MEDIA_BASIC_MESSAGE:
798 type = "message"; 801 type = "message";
799 break; 802 break;
800 case MAILIMAP_MEDIA_BASIC_VIDEO: 803 case MAILIMAP_MEDIA_BASIC_VIDEO:
801 type = "video"; 804 type = "video";
802 break; 805 break;
803 case MAILIMAP_MEDIA_BASIC_OTHER: 806 case MAILIMAP_MEDIA_BASIC_OTHER:
804 default: 807 default:
805 if (which->bd_media_basic->med_basic_type) { 808 if (which->bd_media_basic->med_basic_type) {
806 type = which->bd_media_basic->med_basic_type; 809 type = which->bd_media_basic->med_basic_type;
807 } else { 810 } else {
808 type = ""; 811 type = "";
809 } 812 }
810 break; 813 break;
811 } 814 }
812 if (which->bd_media_basic->med_subtype) { 815 if (which->bd_media_basic->med_subtype) {
813 sub = which->bd_media_basic->med_subtype; 816 sub = which->bd_media_basic->med_subtype;
814 } else { 817 } else {
815 sub = ""; 818 sub = "";
816 } 819 }
817 // odebug << "Type = " << type.latin1() << "/" << sub.latin1() << "" << oendl; 820 // odebug << "Type = " << type.latin1() << "/" << sub.latin1() << "" << oendl;
818 target_part->setType(type.lower()); 821 target_part->setType(type.lower());
819 target_part->setSubtype(sub.lower()); 822 target_part->setSubtype(sub.lower());
820 fillBodyFields(target_part,which->bd_fields); 823 fillBodyFields(target_part,which->bd_fields);
821} 824}
822 825
823void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which) 826void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which)
824{ 827{
825 if (!which) return; 828 if (!which) return;
826 if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) { 829 if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
827 clistcell*cur; 830 clistcell*cur;
828 mailimap_single_body_fld_param*param=0; 831 mailimap_single_body_fld_param*param=0;
829 for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) { 832 for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
830 param = (mailimap_single_body_fld_param*)cur->data; 833 param = (mailimap_single_body_fld_param*)cur->data;
831 if (param) { 834 if (param) {
832 target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value)); 835 target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
833 } 836 }
834 } 837 }
835 } 838 }
836 mailimap_body_fld_enc*enc = which->bd_encoding; 839 mailimap_body_fld_enc*enc = which->bd_encoding;
837 QString encoding(""); 840 QString encoding("");
838 switch (enc->enc_type) { 841 switch (enc->enc_type) {
839 case MAILIMAP_BODY_FLD_ENC_7BIT: 842 case MAILIMAP_BODY_FLD_ENC_7BIT:
840 encoding = "7bit"; 843 encoding = "7bit";
841 break; 844 break;
842 case MAILIMAP_BODY_FLD_ENC_8BIT: 845 case MAILIMAP_BODY_FLD_ENC_8BIT:
843 encoding = "8bit"; 846 encoding = "8bit";
844 break; 847 break;
845 case MAILIMAP_BODY_FLD_ENC_BINARY: 848 case MAILIMAP_BODY_FLD_ENC_BINARY:
846 encoding="binary"; 849 encoding="binary";
847 break; 850 break;
848 case MAILIMAP_BODY_FLD_ENC_BASE64: 851 case MAILIMAP_BODY_FLD_ENC_BASE64:
849 encoding="base64"; 852 encoding="base64";
850 break; 853 break;
851 case MAILIMAP_BODY_FLD_ENC_QUOTED_PRINTABLE: 854 case MAILIMAP_BODY_FLD_ENC_QUOTED_PRINTABLE:
852 encoding="quoted-printable"; 855 encoding="quoted-printable";
853 break; 856 break;
854 case MAILIMAP_BODY_FLD_ENC_OTHER: 857 case MAILIMAP_BODY_FLD_ENC_OTHER:
855 default: 858 default:
856 if (enc->enc_value) { 859 if (enc->enc_value) {
857 char*t=enc->enc_value; 860 char*t=enc->enc_value;
858 encoding=QString(enc->enc_value); 861 encoding=QString(enc->enc_value);
859 enc->enc_value=0L; 862 enc->enc_value=0L;
860 free(t); 863 free(t);
861 } 864 }
862 } 865 }
863 if (which->bd_description) { 866 if (which->bd_description) {
864 target_part->setDescription(QString(which->bd_description)); 867 target_part->setDescription(QString(which->bd_description));
865 } 868 }
866 target_part->setEncoding(encoding); 869 target_part->setEncoding(encoding);
867 target_part->setSize(which->bd_size); 870 target_part->setSize(which->bd_size);
868} 871}
872void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
873{
874 mailimap_flag_list*flist;
875 mailimap_set *set;
876 mailimap_store_att_flags * store_flags;
877 int err;
878 login();
879 if (!m_imap) {
880 return;
881 }
882 int iii = 0;
883 int count = target.count();
884 qDebug("imap remove count %d ", count);
885 while (iii < count ) {
886 qDebug("IMAP remove %d ", iii);
887 RecMailP mail = (*target.at( iii ));
869 888
889 err = selectMbox(mail->getMbox());
890 if ( err != MAILIMAP_NO_ERROR ) {
891 return;
892 }
893 flist = mailimap_flag_list_new_empty();
894 mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
895 store_flags = mailimap_store_att_flags_new_set_flags(flist);
896 set = mailimap_set_new_single(mail->getNumber());
897 err = mailimap_store(m_imap,set,store_flags);
898 mailimap_set_free( set );
899 mailimap_store_att_flags_free(store_flags);
900
901 if (err != MAILIMAP_NO_ERROR) {
902 // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl;
903 return;
904 }
905 // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl;
906 /* should we realy do that at this moment? */
907
908 err = mailimap_expunge(m_imap);
909 if (err != MAILIMAP_NO_ERROR) {
910 Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
911 }
912 ++iii;
913 }
914}
870void IMAPwrapper::deleteMail(const RecMailP&mail) 915void IMAPwrapper::deleteMail(const RecMailP&mail)
871{ 916{
872 mailimap_flag_list*flist; 917 mailimap_flag_list*flist;
873 mailimap_set *set; 918 mailimap_set *set;
874 mailimap_store_att_flags * store_flags; 919 mailimap_store_att_flags * store_flags;
875 int err; 920 int err;
876 login(); 921 login();
877 if (!m_imap) { 922 if (!m_imap) {
878 return; 923 return;
879 } 924 }
880 err = selectMbox(mail->getMbox()); 925 err = selectMbox(mail->getMbox());
881 if ( err != MAILIMAP_NO_ERROR ) { 926 if ( err != MAILIMAP_NO_ERROR ) {
882 return; 927 return;
883 } 928 }
884 flist = mailimap_flag_list_new_empty(); 929 flist = mailimap_flag_list_new_empty();
885 mailimap_flag_list_add(flist,mailimap_flag_new_deleted()); 930 mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
886 store_flags = mailimap_store_att_flags_new_set_flags(flist); 931 store_flags = mailimap_store_att_flags_new_set_flags(flist);
887 set = mailimap_set_new_single(mail->getNumber()); 932 set = mailimap_set_new_single(mail->getNumber());
888 err = mailimap_store(m_imap,set,store_flags); 933 err = mailimap_store(m_imap,set,store_flags);
889 mailimap_set_free( set ); 934 mailimap_set_free( set );
890 mailimap_store_att_flags_free(store_flags); 935 mailimap_store_att_flags_free(store_flags);
891 936
892 if (err != MAILIMAP_NO_ERROR) { 937 if (err != MAILIMAP_NO_ERROR) {
893 // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 938 // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl;
894 return; 939 return;
895 } 940 }
896 // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 941 // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl;
897 /* should we realy do that at this moment? */ 942 /* should we realy do that at this moment? */
943
898 err = mailimap_expunge(m_imap); 944 err = mailimap_expunge(m_imap);
899 if (err != MAILIMAP_NO_ERROR) { 945 if (err != MAILIMAP_NO_ERROR) {
900 // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 946 Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
901 } 947 }
902 // odebug << "Delete successfull " << m_imap->imap_response << "" << oendl; 948 qDebug("IMAPwrapper::deleteMail ");
949
903} 950}
904 951
905void IMAPwrapper::answeredMail(const RecMailP&mail) 952void IMAPwrapper::answeredMail(const RecMailP&mail)
906{ 953{
907 mailimap_flag_list*flist; 954 mailimap_flag_list*flist;
908 mailimap_set *set; 955 mailimap_set *set;
909 mailimap_store_att_flags * store_flags; 956 mailimap_store_att_flags * store_flags;
910 int err; 957 int err;
911 login(); 958 login();
912 if (!m_imap) { 959 if (!m_imap) {
913 return; 960 return;
914 } 961 }
915 err = selectMbox(mail->getMbox()); 962 err = selectMbox(mail->getMbox());
916 if ( err != MAILIMAP_NO_ERROR ) { 963 if ( err != MAILIMAP_NO_ERROR ) {
917 return; 964 return;
918 } 965 }
919 flist = mailimap_flag_list_new_empty(); 966 flist = mailimap_flag_list_new_empty();
920 mailimap_flag_list_add(flist,mailimap_flag_new_answered()); 967 mailimap_flag_list_add(flist,mailimap_flag_new_answered());
921 store_flags = mailimap_store_att_flags_new_add_flags(flist); 968 store_flags = mailimap_store_att_flags_new_add_flags(flist);
922 set = mailimap_set_new_single(mail->getNumber()); 969 set = mailimap_set_new_single(mail->getNumber());
923 err = mailimap_store(m_imap,set,store_flags); 970 err = mailimap_store(m_imap,set,store_flags);
924 mailimap_set_free( set ); 971 mailimap_set_free( set );
925 mailimap_store_att_flags_free(store_flags); 972 mailimap_store_att_flags_free(store_flags);
926 973
927 if (err != MAILIMAP_NO_ERROR) { 974 if (err != MAILIMAP_NO_ERROR) {
928 // odebug << "error marking mail: " << m_imap->imap_response << "" << oendl; 975 // odebug << "error marking mail: " << m_imap->imap_response << "" << oendl;
929 return; 976 return;
930 } 977 }
931} 978}
932 979
933QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc) 980QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
934{ 981{
935 QString body(""); 982 QString body("");
936 encodedString*res = fetchRawPart(mail,path,internal_call); 983 encodedString*res = fetchRawPart(mail,path,internal_call);
937 encodedString*r = decode_String(res,enc); 984 encodedString*r = decode_String(res,enc);
938 delete res; 985 delete res;
939 if (r) { 986 if (r) {
940 if (r->Length()>0) { 987 if (r->Length()>0) {
941 body = r->Content(); 988 body = r->Content();
942 } 989 }
943 delete r; 990 delete r;
944 } 991 }
945 return body; 992 return body;
946} 993}
947 994
948QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part) 995QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part)
949{ 996{
950 return fetchTextPart(mail,part->Positionlist(),false,part->Encoding()); 997 return fetchTextPart(mail,part->Positionlist(),false,part->Encoding());
951} 998}
952 999
953encodedString* IMAPwrapper::fetchDecodedPart(const RecMailP&mail,const RecPartP&part) 1000encodedString* IMAPwrapper::fetchDecodedPart(const RecMailP&mail,const RecPartP&part)
954{ 1001{
955 encodedString*res = fetchRawPart(mail,part->Positionlist(),false); 1002 encodedString*res = fetchRawPart(mail,part->Positionlist(),false);
956 encodedString*r = decode_String(res,part->Encoding()); 1003 encodedString*r = decode_String(res,part->Encoding());
957 delete res; 1004 delete res;
958 return r; 1005 return r;
959} 1006}
960 1007
961encodedString* IMAPwrapper::fetchRawPart(const RecMailP&mail,const RecPartP&part) 1008encodedString* IMAPwrapper::fetchRawPart(const RecMailP&mail,const RecPartP&part)
962{ 1009{
963 return fetchRawPart(mail,part->Positionlist(),false); 1010 return fetchRawPart(mail,part->Positionlist(),false);
964} 1011}
965 1012
966int IMAPwrapper::deleteAllMail(const FolderP&folder) 1013int IMAPwrapper::deleteAllMail(const FolderP&folder)
967{ 1014{
968 login(); 1015 login();
969 if (!m_imap) { 1016 if (!m_imap) {
970 return 0; 1017 return 0;
971 } 1018 }
972 mailimap_flag_list*flist; 1019 mailimap_flag_list*flist;
973 mailimap_set *set; 1020 mailimap_set *set;
974 mailimap_store_att_flags * store_flags; 1021 mailimap_store_att_flags * store_flags;
975 int err = selectMbox(folder->getName()); 1022 int err = selectMbox(folder->getName());
976 if ( err != MAILIMAP_NO_ERROR ) { 1023 if ( err != MAILIMAP_NO_ERROR ) {
977 return 0; 1024 return 0;
978 } 1025 }
979 1026
980 int last = m_imap->imap_selection_info->sel_exists; 1027 int last = m_imap->imap_selection_info->sel_exists;
981 if (last == 0) { 1028 if (last == 0) {
982 Global::statusMessage(tr("Mailbox has no mails!")); 1029 Global::statusMessage(tr("Mailbox has no mails!"));
983 return 0; 1030 return 0;
984 } 1031 }
985 flist = mailimap_flag_list_new_empty(); 1032 flist = mailimap_flag_list_new_empty();
986 mailimap_flag_list_add(flist,mailimap_flag_new_deleted()); 1033 mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
987 store_flags = mailimap_store_att_flags_new_set_flags(flist); 1034 store_flags = mailimap_store_att_flags_new_set_flags(flist);
988 set = mailimap_set_new_interval( 1, last ); 1035 set = mailimap_set_new_interval( 1, last );
989 err = mailimap_store(m_imap,set,store_flags); 1036 err = mailimap_store(m_imap,set,store_flags);
990 mailimap_set_free( set ); 1037 mailimap_set_free( set );
991 mailimap_store_att_flags_free(store_flags); 1038 mailimap_store_att_flags_free(store_flags);
992 if (err != MAILIMAP_NO_ERROR) { 1039 if (err != MAILIMAP_NO_ERROR) {
993 Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response)); 1040 Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
994 return 0; 1041 return 0;
995 } 1042 }
996 // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 1043 // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl;
997 /* should we realy do that at this moment? */ 1044 /* should we realy do that at this moment? */
998 err = mailimap_expunge(m_imap); 1045 err = mailimap_expunge(m_imap);
@@ -1027,156 +1074,157 @@ int IMAPwrapper::createMbox(const QString&folder,const FolderP&parentfolder,cons
1027 } 1074 }
1028 // odebug << "Creating " << pre.latin1() << "" << oendl; 1075 // odebug << "Creating " << pre.latin1() << "" << oendl;
1029 int res = mailimap_create(m_imap,pre.latin1()); 1076 int res = mailimap_create(m_imap,pre.latin1());
1030 if (res != MAILIMAP_NO_ERROR) { 1077 if (res != MAILIMAP_NO_ERROR) {
1031 Global::statusMessage(tr("%1").arg(m_imap->imap_response)); 1078 Global::statusMessage(tr("%1").arg(m_imap->imap_response));
1032 return 0; 1079 return 0;
1033 } 1080 }
1034 return 1; 1081 return 1;
1035} 1082}
1036 1083
1037int IMAPwrapper::deleteMbox(const FolderP&folder) 1084int IMAPwrapper::deleteMbox(const FolderP&folder)
1038{ 1085{
1039 if (!folder) return 0; 1086 if (!folder) return 0;
1040 login(); 1087 login();
1041 if (!m_imap) {return 0;} 1088 if (!m_imap) {return 0;}
1042 int res = mailimap_delete(m_imap,folder->getName()); 1089 int res = mailimap_delete(m_imap,folder->getName());
1043 if (res != MAILIMAP_NO_ERROR) { 1090 if (res != MAILIMAP_NO_ERROR) {
1044 Global::statusMessage(tr("%1").arg(m_imap->imap_response)); 1091 Global::statusMessage(tr("%1").arg(m_imap->imap_response));
1045 return 0; 1092 return 0;
1046 } 1093 }
1047 return 1; 1094 return 1;
1048} 1095}
1049 1096
1050void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) 1097void IMAPwrapper::statusFolder(folderStat&target_stat,const QString & mailbox)
1051{ 1098{
1052 mailimap_status_att_list * att_list =0; 1099 mailimap_status_att_list * att_list =0;
1053 mailimap_mailbox_data_status * status=0; 1100 mailimap_mailbox_data_status * status=0;
1054 clistiter * cur = 0; 1101 clistiter * cur = 0;
1055 int r = 0; 1102 int r = 0;
1056 target_stat.message_count = 0; 1103 target_stat.message_count = 0;
1057 target_stat.message_unseen = 0; 1104 target_stat.message_unseen = 0;
1058 target_stat.message_recent = 0; 1105 target_stat.message_recent = 0;
1059 login(); 1106 login();
1060 if (!m_imap) { 1107 if (!m_imap) {
1061 return; 1108 return;
1062 } 1109 }
1063 att_list = mailimap_status_att_list_new_empty(); 1110 att_list = mailimap_status_att_list_new_empty();
1064 if (!att_list) return; 1111 if (!att_list) return;
1065 r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_MESSAGES); 1112 r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_MESSAGES);
1066 r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_RECENT); 1113 r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_RECENT);
1067 r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_UNSEEN); 1114 r = mailimap_status_att_list_add(att_list, MAILIMAP_STATUS_ATT_UNSEEN);
1068 r = mailimap_status(m_imap, mailbox.latin1(), att_list, &status); 1115 r = mailimap_status(m_imap, mailbox.latin1(), att_list, &status);
1069 if (r==MAILIMAP_NO_ERROR&&status->st_info_list!=0) { 1116 if (r==MAILIMAP_NO_ERROR&&status->st_info_list!=0) {
1070 for (cur = clist_begin(status->st_info_list); 1117 for (cur = clist_begin(status->st_info_list);
1071 cur != NULL ; cur = clist_next(cur)) { 1118 cur != NULL ; cur = clist_next(cur)) {
1072 mailimap_status_info * status_info; 1119 mailimap_status_info * status_info;
1073 status_info = (mailimap_status_info *)clist_content(cur); 1120 status_info = (mailimap_status_info *)clist_content(cur);
1074 switch (status_info->st_att) { 1121 switch (status_info->st_att) {
1075 case MAILIMAP_STATUS_ATT_MESSAGES: 1122 case MAILIMAP_STATUS_ATT_MESSAGES:
1076 target_stat.message_count = status_info->st_value; 1123 target_stat.message_count = status_info->st_value;
1077 break; 1124 break;
1078 case MAILIMAP_STATUS_ATT_RECENT: 1125 case MAILIMAP_STATUS_ATT_RECENT:
1079 target_stat.message_recent = status_info->st_value; 1126 target_stat.message_recent = status_info->st_value;
1080 break; 1127 break;
1081 case MAILIMAP_STATUS_ATT_UNSEEN: 1128 case MAILIMAP_STATUS_ATT_UNSEEN:
1082 target_stat.message_unseen = status_info->st_value; 1129 target_stat.message_unseen = status_info->st_value;
1083 break; 1130 break;
1084 } 1131 }
1085 } 1132 }
1086 } else { 1133 } else {
1087 // odebug << "Error retrieving status" << oendl; 1134 // odebug << "Error retrieving status" << oendl;
1088 } 1135 }
1089 if (status) mailimap_mailbox_data_status_free(status); 1136 if (status) mailimap_mailbox_data_status_free(status);
1090 if (att_list) mailimap_status_att_list_free(att_list); 1137 if (att_list) mailimap_status_att_list_free(att_list);
1091} 1138}
1092 1139
1093void IMAPwrapper::storeMessage(const char*msg,size_t length, const QString&folder) 1140void IMAPwrapper::storeMessage(const char*msg,size_t length, const QString&folder)
1094{ 1141{
1095 login(); 1142 login();
1096 if (!m_imap) return; 1143 if (!m_imap) return;
1097 if (!msg) return; 1144 if (!msg) return;
1098 int r = mailimap_append(m_imap,(char*)folder.latin1(),0,0,msg,length); 1145 int r = mailimap_append(m_imap,(char*)folder.latin1(),0,0,msg,length);
1099 if (r != MAILIMAP_NO_ERROR) { 1146 if (r != MAILIMAP_NO_ERROR) {
1100 Global::statusMessage("Error storing mail!"); 1147 Global::statusMessage("Error storing mail!");
1101 } 1148 }
1102} 1149}
1103 1150
1104MAILLIB::ATYPE IMAPwrapper::getType()const 1151MAILLIB::ATYPE IMAPwrapper::getType()const
1105{ 1152{
1106 return account->getType(); 1153 return account->getType();
1107} 1154}
1108 1155
1109const QString&IMAPwrapper::getName()const 1156const QString&IMAPwrapper::getName()const
1110{ 1157{
1111 // odebug << "Get name: " << account->getAccountName().latin1() << "" << oendl; 1158 // odebug << "Get name: " << account->getAccountName().latin1() << "" << oendl;
1112 return account->getAccountName(); 1159 return account->getAccountName();
1113} 1160}
1114 1161
1115encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail) 1162encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail)
1116{ 1163{
1117 // dummy 1164 // dummy
1118 QValueList<int> path; 1165 QValueList<int> path;
1119 return fetchRawPart(mail,path,false); 1166 return fetchRawPart(mail,path,false);
1120} 1167}
1121 1168
1122void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, 1169void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
1123 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) 1170 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
1124{ 1171{
1125 if (targetWrapper != this) { 1172 if (targetWrapper != this || maxSizeInKb > 0 ) {
1126 AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit); 1173 AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb);
1174 qDebug("IMAPwrapper::mvcpAllMails::Using generic");
1127 // odebug << "Using generic" << oendl; 1175 // odebug << "Using generic" << oendl;
1128 return; 1176 return;
1129 } 1177 }
1130 mailimap_set *set = 0; 1178 mailimap_set *set = 0;
1131 login(); 1179 login();
1132 if (!m_imap) { 1180 if (!m_imap) {
1133 return; 1181 return;
1134 } 1182 }
1135 int err = selectMbox(fromFolder->getName()); 1183 int err = selectMbox(fromFolder->getName());
1136 if ( err != MAILIMAP_NO_ERROR ) { 1184 if ( err != MAILIMAP_NO_ERROR ) {
1137 return; 1185 return;
1138 } 1186 }
1139 int last = m_imap->imap_selection_info->sel_exists; 1187 int last = m_imap->imap_selection_info->sel_exists;
1140 set = mailimap_set_new_interval( 1, last ); 1188 set = mailimap_set_new_interval( 1, last );
1141 err = mailimap_copy(m_imap,set,targetFolder.latin1()); 1189 err = mailimap_copy(m_imap,set,targetFolder.latin1());
1142 mailimap_set_free( set ); 1190 mailimap_set_free( set );
1143 if ( err != MAILIMAP_NO_ERROR ) { 1191 if ( err != MAILIMAP_NO_ERROR ) {
1144 QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response); 1192 QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response);
1145 Global::statusMessage(error_msg); 1193 Global::statusMessage(error_msg);
1146 // odebug << error_msg << oendl; 1194 // odebug << error_msg << oendl;
1147 return; 1195 return;
1148 } 1196 }
1149 if (moveit) { 1197 if (moveit) {
1150 deleteAllMail(fromFolder); 1198 deleteAllMail(fromFolder);
1151 } 1199 }
1152} 1200}
1153 1201
1154void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) 1202void IMAPwrapper::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
1155{ 1203{
1156 if (targetWrapper != this) { 1204 if (targetWrapper != this) {
1157 // odebug << "Using generic" << oendl; 1205 // odebug << "Using generic" << oendl;
1158 AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit); 1206 AbstractMail::mvcpMail(mail,targetFolder,targetWrapper,moveit);
1159 return; 1207 return;
1160 } 1208 }
1161 mailimap_set *set = 0; 1209 mailimap_set *set = 0;
1162 login(); 1210 login();
1163 if (!m_imap) { 1211 if (!m_imap) {
1164 return; 1212 return;
1165 } 1213 }
1166 int err = selectMbox(mail->getMbox()); 1214 int err = selectMbox(mail->getMbox());
1167 if ( err != MAILIMAP_NO_ERROR ) { 1215 if ( err != MAILIMAP_NO_ERROR ) {
1168 return; 1216 return;
1169 } 1217 }
1170 set = mailimap_set_new_single(mail->getNumber()); 1218 set = mailimap_set_new_single(mail->getNumber());
1171 err = mailimap_copy(m_imap,set,targetFolder.latin1()); 1219 err = mailimap_copy(m_imap,set,targetFolder.latin1());
1172 mailimap_set_free( set ); 1220 mailimap_set_free( set );
1173 if ( err != MAILIMAP_NO_ERROR ) { 1221 if ( err != MAILIMAP_NO_ERROR ) {
1174 QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response); 1222 QString error_msg = tr("error copy mail: %1").arg(m_imap->imap_response);
1175 Global::statusMessage(error_msg); 1223 Global::statusMessage(error_msg);
1176 // odebug << error_msg << oendl; 1224 // odebug << error_msg << oendl;
1177 return; 1225 return;
1178 } 1226 }
1179 if (moveit) { 1227 if (moveit) {
1180 deleteMail(mail); 1228 deleteMail(mail);
1181 } 1229 }
1182} 1230}
diff --git a/kmicromail/libmailwrapper/imapwrapper.h b/kmicromail/libmailwrapper/imapwrapper.h
index e56605a..222fe95 100644
--- a/kmicromail/libmailwrapper/imapwrapper.h
+++ b/kmicromail/libmailwrapper/imapwrapper.h
@@ -1,80 +1,82 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#ifndef __IMAPWRAPPER 2#ifndef __IMAPWRAPPER
2#define __IMAPWRAPPER 3#define __IMAPWRAPPER
3 4
4#include <qlist.h> 5#include <qlist.h>
5#include "mailwrapper.h" 6#include "mailwrapper.h"
6#include "abstractmail.h" 7#include "abstractmail.h"
7#include <libetpan/clist.h> 8#include <libetpan/clist.h>
8 9
9struct mailimap; 10struct mailimap;
10struct mailimap_body; 11struct mailimap_body;
11struct mailimap_body_type_1part; 12struct mailimap_body_type_1part;
12struct mailimap_body_type_text; 13struct mailimap_body_type_text;
13struct mailimap_body_type_basic; 14struct mailimap_body_type_basic;
14struct mailimap_body_type_msg; 15struct mailimap_body_type_msg;
15struct mailimap_body_type_mpart; 16struct mailimap_body_type_mpart;
16struct mailimap_body_fields; 17struct mailimap_body_fields;
17struct mailimap_msg_att; 18struct mailimap_msg_att;
18class encodedString; 19class encodedString;
19 20
20class IMAPwrapper : public AbstractMail 21class IMAPwrapper : public AbstractMail
21{ 22{
22 Q_OBJECT 23 Q_OBJECT
23public: 24public:
24 IMAPwrapper( IMAPaccount *a ); 25 IMAPwrapper( IMAPaccount *a );
25 virtual ~IMAPwrapper(); 26 virtual ~IMAPwrapper();
26 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); 27 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
27 virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); 28 virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target , int sizeInKb = 0);
28 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); 29 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
29 30
30 virtual void deleteMail(const RecMailP&mail); 31 virtual void deleteMail(const RecMailP&mail);
32 void deleteMailList(const QValueList<RecMailP>&target);
31 virtual void answeredMail(const RecMailP&mail); 33 virtual void answeredMail(const RecMailP&mail);
32 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&folder); 34 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&folder);
33 virtual void storeMessage(const char*msg,size_t length, const QString&folder); 35 virtual void storeMessage(const char*msg,size_t length, const QString&folder);
34 virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder, 36 virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
35 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); 37 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit,int sizeInKb = 0);
36 virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); 38 virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
37 39
38 virtual RecBodyP fetchBody(const RecMailP&mail); 40 virtual RecBodyP fetchBody(const RecMailP&mail);
39 virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part); 41 virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part);
40 virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part); 42 virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part);
41 virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part); 43 virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part);
42 virtual encodedString* fetchRawBody(const RecMailP&mail); 44 virtual encodedString* fetchRawBody(const RecMailP&mail);
43 45
44 virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0, 46 virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0,
45 const QString& delemiter="/",bool getsubfolder=false); 47 const QString& delemiter="/",bool getsubfolder=false);
46 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&folder); 48 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&folder);
47 49
48 static void imap_progress( size_t current, size_t maximum ); 50 static void imap_progress( size_t current, size_t maximum );
49 51
50 virtual void logout(); 52 virtual void logout();
51 virtual MAILLIB::ATYPE getType()const; 53 virtual MAILLIB::ATYPE getType()const;
52 virtual const QString&getName()const; 54 virtual const QString&getName()const;
53 55
54protected: 56protected:
55 RecMail*parse_list_result(mailimap_msg_att*); 57 RecMail*parse_list_result(mailimap_msg_att*);
56 void login(); 58 void login();
57 bool start_tls(bool force=true); 59 bool start_tls(bool force=true);
58 60
59 virtual QString fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc=""); 61 virtual QString fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc="");
60 virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call); 62 virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call);
61 int selectMbox(const QString&mbox); 63 int selectMbox(const QString&mbox);
62 64
63 void fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description); 65 void fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description);
64 void fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which); 66 void fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which);
65 void fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which); 67 void fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which);
66 void fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which); 68 void fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which);
67 void fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which); 69 void fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which);
68 void traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,int current_recursion,QValueList<int>recList,int current_count=1); 70 void traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,int current_recursion,QValueList<int>recList,int current_count=1);
69 71
70 /* just helpers */ 72 /* just helpers */
71 static void fillBodyFields(RecPartP&target_part,mailimap_body_fields*which); 73 static void fillBodyFields(RecPartP&target_part,mailimap_body_fields*which);
72 static QStringList address_list_to_stringlist(clist*list); 74 static QStringList address_list_to_stringlist(clist*list);
73 75
74 76
75 IMAPaccount *account; 77 IMAPaccount *account;
76 mailimap *m_imap; 78 mailimap *m_imap;
77 QString m_Lastmbox; 79 QString m_Lastmbox;
78}; 80};
79 81
80#endif 82#endif
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index 7ef9b32..cbc52d9 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -1,173 +1,174 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#include "mhwrapper.h" 2#include "mhwrapper.h"
2#include "mailtypes.h" 3#include "mailtypes.h"
3#include "mailwrapper.h" 4#include "mailwrapper.h"
4#include <libetpan/libetpan.h> 5#include <libetpan/libetpan.h>
5#include <qdir.h> 6#include <qdir.h>
6#include <qmessagebox.h> 7#include <qmessagebox.h>
7#include <stdlib.h> 8#include <stdlib.h>
8#include <qpe/global.h> 9#include <qpe/global.h>
9#include <oprocess.h> 10#include <oprocess.h>
10//#include <opie2/odebug.h> 11//#include <opie2/odebug.h>
11 12
12using namespace Opie::Core; 13using namespace Opie::Core;
13MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) 14MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
14 : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) 15 : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name)
15{ 16{
16 if (MHPath.length()>0) { 17 if (MHPath.length()>0) {
17 if (MHPath[MHPath.length()-1]=='/') { 18 if (MHPath[MHPath.length()-1]=='/') {
18 MHPath=MHPath.left(MHPath.length()-1); 19 MHPath=MHPath.left(MHPath.length()-1);
19 } 20 }
20 //odebug << MHPath << oendl; 21 //odebug << MHPath << oendl;
21 QDir dir(MHPath); 22 QDir dir(MHPath);
22 if (!dir.exists()) { 23 if (!dir.exists()) {
23 dir.mkdir(MHPath); 24 dir.mkdir(MHPath);
24 } 25 }
25 init_storage(); 26 init_storage();
26 } 27 }
27} 28}
28 29
29void MHwrapper::init_storage() 30void MHwrapper::init_storage()
30{ 31{
31 int r; 32 int r;
32 QString pre = MHPath; 33 QString pre = MHPath;
33 if (!m_storage) { 34 if (!m_storage) {
34 m_storage = mailstorage_new(NULL); 35 m_storage = mailstorage_new(NULL);
35 r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); 36 r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0);
36 if (r != MAIL_NO_ERROR) { 37 if (r != MAIL_NO_ERROR) {
37 qDebug(" error init storage "); 38 qDebug(" error init storage ");
38 mailstorage_free(m_storage); 39 mailstorage_free(m_storage);
39 m_storage = 0; 40 m_storage = 0;
40 return; 41 return;
41 } 42 }
42 } 43 }
43 r = mailstorage_connect(m_storage); 44 r = mailstorage_connect(m_storage);
44 if (r!=MAIL_NO_ERROR) { 45 if (r!=MAIL_NO_ERROR) {
45 qDebug("error connecting storage "); 46 qDebug("error connecting storage ");
46 mailstorage_free(m_storage); 47 mailstorage_free(m_storage);
47 m_storage = 0; 48 m_storage = 0;
48 } 49 }
49} 50}
50 51
51void MHwrapper::clean_storage() 52void MHwrapper::clean_storage()
52{ 53{
53 if (m_storage) { 54 if (m_storage) {
54 mailstorage_disconnect(m_storage); 55 mailstorage_disconnect(m_storage);
55 mailstorage_free(m_storage); 56 mailstorage_free(m_storage);
56 m_storage = 0; 57 m_storage = 0;
57 } 58 }
58} 59}
59 60
60MHwrapper::~MHwrapper() 61MHwrapper::~MHwrapper()
61{ 62{
62 clean_storage(); 63 clean_storage();
63} 64}
64 65
65void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) 66void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
66{ 67{
67 init_storage(); 68 init_storage();
68 if (!m_storage) { 69 if (!m_storage) {
69 return; 70 return;
70 } 71 }
71 QString f = buildPath(mailbox); 72 QString f = buildPath(mailbox);
72 int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); 73 int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
73 if (r!=MAIL_NO_ERROR) { 74 if (r!=MAIL_NO_ERROR) {
74 qDebug("listMessages: error selecting folder! "); 75 qDebug("listMessages: error selecting folder! ");
75 return; 76 return;
76 } 77 }
77 parseList(target,m_storage->sto_session,f); 78 parseList(target,m_storage->sto_session,f, false, maxSizeInKb );
78 Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); 79 Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count()));
79} 80}
80 81
81QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() 82QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
82{ 83{
83 QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); 84 QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
84 /* this is needed! */ 85 /* this is needed! */
85 if (m_storage) mailstorage_disconnect(m_storage); 86 if (m_storage) mailstorage_disconnect(m_storage);
86 init_storage(); 87 init_storage();
87 if (!m_storage) { 88 if (!m_storage) {
88 return folders; 89 return folders;
89 } 90 }
90 mail_list*flist = 0; 91 mail_list*flist = 0;
91 clistcell*current=0; 92 clistcell*current=0;
92 int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); 93 int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist);
93 if (r != MAIL_NO_ERROR || !flist) { 94 if (r != MAIL_NO_ERROR || !flist) {
94 qDebug("error getting folder list "); 95 qDebug("error getting folder list ");
95 return folders; 96 return folders;
96 } 97 }
97 for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { 98 for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) {
98 QString t = (char*)current->data; 99 QString t = (char*)current->data;
99 t.replace(0,MHPath.length(),""); 100 t.replace(0,MHPath.length(),"");
100 folders->append(new MHFolder(t,MHPath)); 101 folders->append(new MHFolder(t,MHPath));
101 } 102 }
102 mail_list_free(flist); 103 mail_list_free(flist);
103 return folders; 104 return folders;
104} 105}
105 106
106void MHwrapper::deleteMail(const RecMailP&mail) 107void MHwrapper::deleteMail(const RecMailP&mail)
107{ 108{
108 init_storage(); 109 init_storage();
109 if (!m_storage) { 110 if (!m_storage) {
110 return; 111 return;
111 } 112 }
112 int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); 113 int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
113 if (r!=MAIL_NO_ERROR) { 114 if (r!=MAIL_NO_ERROR) {
114 qDebug("error selecting folder! "); 115 qDebug("error selecting folder! ");
115 return; 116 return;
116 } 117 }
117 r = mailsession_remove_message(m_storage->sto_session,mail->getNumber()); 118 r = mailsession_remove_message(m_storage->sto_session,mail->getNumber());
118 if (r != MAIL_NO_ERROR) { 119 if (r != MAIL_NO_ERROR) {
119 qDebug("error deleting mail "); 120 qDebug("error deleting mail ");
120 } 121 }
121} 122}
122 123
123void MHwrapper::answeredMail(const RecMailP&) 124void MHwrapper::answeredMail(const RecMailP&)
124{ 125{
125} 126}
126 127
127RecBodyP MHwrapper::fetchBody( const RecMailP &mail ) 128RecBodyP MHwrapper::fetchBody( const RecMailP &mail )
128{ 129{
129 RecBodyP body = new RecBody(); 130 RecBodyP body = new RecBody();
130 init_storage(); 131 init_storage();
131 if (!m_storage) { 132 if (!m_storage) {
132 return body; 133 return body;
133 } 134 }
134 mailmessage * msg; 135 mailmessage * msg;
135 char*data=0; 136 char*data=0;
136 137
137 /* mail should hold the complete path! */ 138 /* mail should hold the complete path! */
138 int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1()); 139 int r = mailsession_select_folder(m_storage->sto_session,(char*)mail->getMbox().latin1());
139 if (r != MAIL_NO_ERROR) { 140 if (r != MAIL_NO_ERROR) {
140 return body; 141 return body;
141 } 142 }
142 r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg); 143 r = mailsession_get_message(m_storage->sto_session, mail->getNumber(), &msg);
143 if (r != MAIL_NO_ERROR) { 144 if (r != MAIL_NO_ERROR) {
144 qDebug("Error fetching mail "); 145 qDebug("Error fetching mail ");
145 146
146 return body; 147 return body;
147 } 148 }
148 body = parseMail(msg); 149 body = parseMail(msg);
149 mailmessage_fetch_result_free(msg,data); 150 mailmessage_fetch_result_free(msg,data);
150 return body; 151 return body;
151} 152}
152 153
153void MHwrapper::mbox_progress( size_t current, size_t maximum ) 154void MHwrapper::mbox_progress( size_t current, size_t maximum )
154{ 155{
155 qDebug("MBox Progress %d of %d",current,maximum ); 156 qDebug("MBox Progress %d of %d",current,maximum );
156 //odebug << "MH " << current << " von " << maximum << "" << oendl; 157 //odebug << "MH " << current << " von " << maximum << "" << oendl;
157} 158}
158 159
159QString MHwrapper::buildPath(const QString&p) 160QString MHwrapper::buildPath(const QString&p)
160{ 161{
161 QString f=""; 162 QString f="";
162 if (p.length()==0||p=="/") 163 if (p.length()==0||p=="/")
163 return MHPath; 164 return MHPath;
164 if (!p.startsWith(MHPath)) { 165 if (!p.startsWith(MHPath)) {
165 f+=MHPath; 166 f+=MHPath;
166 } 167 }
167 if (!p.startsWith("/")) { 168 if (!p.startsWith("/")) {
168 f+="/"; 169 f+="/";
169 } 170 }
170 f+=p; 171 f+=p;
171 return f; 172 return f;
172} 173}
173 174
diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h
index 4310c84..550824d 100644
--- a/kmicromail/libmailwrapper/mhwrapper.h
+++ b/kmicromail/libmailwrapper/mhwrapper.h
@@ -1,60 +1,61 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#ifndef __MH_WRAPPER_H 2#ifndef __MH_WRAPPER_H
2#define __MH_WRAPPER_H 3#define __MH_WRAPPER_H
3 4
4#include "maildefines.h" 5#include "maildefines.h"
5 6
6#include "genericwrapper.h" 7#include "genericwrapper.h"
7#include <qstring.h> 8#include <qstring.h>
8 9
9class encodedString; 10class encodedString;
10struct mailmbox_folder; 11struct mailmbox_folder;
11namespace Opie {namespace Core {class OProcess;}} 12namespace Opie {namespace Core {class OProcess;}}
12 13
13class MHwrapper : public Genericwrapper 14class MHwrapper : public Genericwrapper
14{ 15{
15 Q_OBJECT 16 Q_OBJECT
16public: 17public:
17 MHwrapper(const QString & dir,const QString&name); 18 MHwrapper(const QString & dir,const QString&name);
18 virtual ~MHwrapper(); 19 virtual ~MHwrapper();
19 20
20 virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ); 21 virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
21 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); 22 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
22 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); 23 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
23 24
24 virtual void deleteMail(const RecMailP&mail); 25 virtual void deleteMail(const RecMailP&mail);
25 virtual void answeredMail(const RecMailP&mail); 26 virtual void answeredMail(const RecMailP&mail);
26 virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); 27 virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
27 virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder, 28 virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
28 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); 29 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
29 30
30 virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0, 31 virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0,
31 const QString&d="",bool s=false); 32 const QString&d="",bool s=false);
32 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&); 33 virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&);
33 34
34 virtual void storeMessage(const char*msg,size_t length, const QString&folder); 35 virtual void storeMessage(const char*msg,size_t length, const QString&folder);
35 36
36 virtual RecBodyP fetchBody( const RecMailP &mail ); 37 virtual RecBodyP fetchBody( const RecMailP &mail );
37 static void mbox_progress( size_t current, size_t maximum ); 38 static void mbox_progress( size_t current, size_t maximum );
38 39
39 virtual encodedString* fetchRawBody(const RecMailP&mail); 40 virtual encodedString* fetchRawBody(const RecMailP&mail);
40 virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> > &target); 41 virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> > &target);
41 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&); 42 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
42 virtual MAILLIB::ATYPE getType()const; 43 virtual MAILLIB::ATYPE getType()const;
43 virtual const QString&getName()const; 44 virtual const QString&getName()const;
44 45
45public slots: 46public slots:
46 /* for deleting maildirs we are using a system call */ 47 /* for deleting maildirs we are using a system call */
47 virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int ); 48 virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int );
48 virtual void processEnded(Opie::Core::OProcess *); 49 virtual void processEnded(Opie::Core::OProcess *);
49protected: 50protected:
50 QString buildPath(const QString&p); 51 QString buildPath(const QString&p);
51 QString MHPath; 52 QString MHPath;
52 QString MHName; 53 QString MHName;
53 54
54 void init_storage(); 55 void init_storage();
55 void clean_storage(); 56 void clean_storage();
56 57
57 bool removeMboxfailed; 58 bool removeMboxfailed;
58}; 59};
59 60
60#endif 61#endif
diff --git a/kmicromail/libmailwrapper/nntpwrapper.cpp b/kmicromail/libmailwrapper/nntpwrapper.cpp
index daa128e..f5d7f16 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.cpp
+++ b/kmicromail/libmailwrapper/nntpwrapper.cpp
@@ -1,204 +1,205 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#include "nntpwrapper.h" 2#include "nntpwrapper.h"
2#include "logindialog.h" 3#include "logindialog.h"
3#include "mailtypes.h" 4#include "mailtypes.h"
4 5
5#include <qfile.h> 6#include <qfile.h>
6 7
7#include <stdlib.h> 8#include <stdlib.h>
8 9
9#include <libetpan/libetpan.h> 10#include <libetpan/libetpan.h>
10 11
11 12
12 13
13#define HARD_MSG_SIZE_LIMIT 5242880 14#define HARD_MSG_SIZE_LIMIT 5242880
14 15
15using namespace Opie::Core; 16using namespace Opie::Core;
16NNTPwrapper::NNTPwrapper( NNTPaccount *a ) 17NNTPwrapper::NNTPwrapper( NNTPaccount *a )
17: Genericwrapper() { 18: Genericwrapper() {
18 account = a; 19 account = a;
19 m_nntp = NULL; 20 m_nntp = NULL;
20 msgTempName = a->getFileName()+"_msg_cache"; 21 msgTempName = a->getFileName()+"_msg_cache";
21 last_msg_id = 0; 22 last_msg_id = 0;
22} 23}
23 24
24NNTPwrapper::~NNTPwrapper() { 25NNTPwrapper::~NNTPwrapper() {
25 logout(); 26 logout();
26 QFile msg_cache(msgTempName); 27 QFile msg_cache(msgTempName);
27 if (msg_cache.exists()) { 28 if (msg_cache.exists()) {
28 msg_cache.remove(); 29 msg_cache.remove();
29 } 30 }
30} 31}
31 32
32void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { 33void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) {
33 ; // << "NNTP: " << current << " of " << maximum << "" << oendl; 34 ; // << "NNTP: " << current << " of " << maximum << "" << oendl;
34} 35}
35 36
36 37
37RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) { 38RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
38 int err = NEWSNNTP_NO_ERROR; 39 int err = NEWSNNTP_NO_ERROR;
39 char *message = 0; 40 char *message = 0;
40 size_t length = 0; 41 size_t length = 0;
41 42
42 RecBodyP body = new RecBody(); 43 RecBodyP body = new RecBody();
43 login(); 44 login();
44 if ( !m_nntp ) { 45 if ( !m_nntp ) {
45 return body; 46 return body;
46 } 47 }
47 48
48 mailmessage * mailmsg; 49 mailmessage * mailmsg;
49 if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { 50 if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
50 ; // << "Message to large: " << mail->Msgsize() << "" << oendl; 51 ; // << "Message to large: " << mail->Msgsize() << "" << oendl;
51 return body; 52 return body;
52 } 53 }
53 54
54 QFile msg_cache(msgTempName); 55 QFile msg_cache(msgTempName);
55 56
56 cleanMimeCache(); 57 cleanMimeCache();
57 58
58 if (mail->getNumber()!=last_msg_id) { 59 if (mail->getNumber()!=last_msg_id) {
59 if (msg_cache.exists()) { 60 if (msg_cache.exists()) {
60 msg_cache.remove(); 61 msg_cache.remove();
61 } 62 }
62 msg_cache.open(IO_ReadWrite|IO_Truncate); 63 msg_cache.open(IO_ReadWrite|IO_Truncate);
63 last_msg_id = mail->getNumber(); 64 last_msg_id = mail->getNumber();
64 err = mailsession_get_message(m_nntp->sto_session, mail->getNumber(), &mailmsg); 65 err = mailsession_get_message(m_nntp->sto_session, mail->getNumber(), &mailmsg);
65 err = mailmessage_fetch(mailmsg,&message,&length); 66 err = mailmessage_fetch(mailmsg,&message,&length);
66 msg_cache.writeBlock(message,length); 67 msg_cache.writeBlock(message,length);
67 } else { 68 } else {
68 QString msg=""; 69 QString msg="";
69 msg_cache.open(IO_ReadOnly); 70 msg_cache.open(IO_ReadOnly);
70 message = new char[4096]; 71 message = new char[4096];
71 memset(message,0,4096); 72 memset(message,0,4096);
72 while (msg_cache.readBlock(message,4095)>0) { 73 while (msg_cache.readBlock(message,4095)>0) {
73 msg+=message; 74 msg+=message;
74 memset(message,0,4096); 75 memset(message,0,4096);
75 } 76 }
76 delete message; 77 delete message;
77 message = (char*)malloc(msg.length()+1*sizeof(char)); 78 message = (char*)malloc(msg.length()+1*sizeof(char));
78 memset(message,0,msg.length()+1); 79 memset(message,0,msg.length()+1);
79 memcpy(message,msg.latin1(),msg.length()); 80 memcpy(message,msg.latin1(),msg.length());
80 /* transform to libetpan stuff */ 81 /* transform to libetpan stuff */
81 mailmsg = mailmessage_new(); 82 mailmsg = mailmessage_new();
82 mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); 83 mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message));
83 generic_message_t * msg_data; 84 generic_message_t * msg_data;
84 msg_data = (generic_message_t *)mailmsg->msg_data; 85 msg_data = (generic_message_t *)mailmsg->msg_data;
85 msg_data->msg_fetched = 1; 86 msg_data->msg_fetched = 1;
86 msg_data->msg_message = message; 87 msg_data->msg_message = message;
87 msg_data->msg_length = strlen(message); 88 msg_data->msg_length = strlen(message);
88 } 89 }
89 body = parseMail(mailmsg); 90 body = parseMail(mailmsg);
90 91
91 /* clean up */ 92 /* clean up */
92 if (mailmsg) 93 if (mailmsg)
93 mailmessage_free(mailmsg); 94 mailmessage_free(mailmsg);
94 if (message) 95 if (message)
95 free(message); 96 free(message);
96 97
97 return body; 98 return body;
98} 99}
99 100
100 101
101void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) 102void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb)
102{ 103{
103 login(); 104 login();
104 if (!m_nntp) 105 if (!m_nntp)
105 return; 106 return;
106 uint32_t res_messages,res_recent,res_unseen; 107 uint32_t res_messages,res_recent,res_unseen;
107 mailsession_status_folder(m_nntp->sto_session,(char*)which.latin1(),&res_messages,&res_recent,&res_unseen); 108 mailsession_status_folder(m_nntp->sto_session,(char*)which.latin1(),&res_messages,&res_recent,&res_unseen);
108 parseList(target,m_nntp->sto_session,which,true); 109 parseList(target,m_nntp->sto_session,which,true, maxSizeInKb);
109} 110}
110 111
111void NNTPwrapper::login() 112void NNTPwrapper::login()
112{ 113{
113 if (account->getOffline()) 114 if (account->getOffline())
114 return; 115 return;
115 /* we'll hold the line */ 116 /* we'll hold the line */
116 if ( m_nntp != NULL ) 117 if ( m_nntp != NULL )
117 return; 118 return;
118 119
119 const char *server, *user, *pass; 120 const char *server, *user, *pass;
120 QString User,Pass; 121 QString User,Pass;
121 uint16_t port; 122 uint16_t port;
122 int err = NEWSNNTP_NO_ERROR; 123 int err = NEWSNNTP_NO_ERROR;
123 124
124 server = account->getServer().latin1(); 125 server = account->getServer().latin1();
125 port = account->getPort().toUInt(); 126 port = account->getPort().toUInt();
126 127
127 user = pass = 0; 128 user = pass = 0;
128 129
129 if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) { 130 if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) {
130 LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); 131 LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
131 login.show(); 132 login.show();
132 if ( QDialog::Accepted == login.exec() ) { 133 if ( QDialog::Accepted == login.exec() ) {
133 // ok 134 // ok
134 User = login.getUser().latin1(); 135 User = login.getUser().latin1();
135 Pass = login.getPassword().latin1(); 136 Pass = login.getPassword().latin1();
136 } else { 137 } else {
137 // cancel 138 // cancel
138 ; // << "NNTP: Login canceled" << oendl; 139 ; // << "NNTP: Login canceled" << oendl;
139 return; 140 return;
140 } 141 }
141 } else { 142 } else {
142 User = account->getUser().latin1(); 143 User = account->getUser().latin1();
143 Pass = account->getPassword().latin1(); 144 Pass = account->getPassword().latin1();
144 } 145 }
145 146
146 if (User.isEmpty()) { 147 if (User.isEmpty()) {
147 user=0; 148 user=0;
148 pass = 0; 149 pass = 0;
149 } else { 150 } else {
150 user=User.latin1(); 151 user=User.latin1();
151 pass=Pass.latin1(); 152 pass=Pass.latin1();
152 } 153 }
153 // bool ssl = account->getSSL(); 154 // bool ssl = account->getSSL();
154 155
155 m_nntp=mailstorage_new(NULL); 156 m_nntp=mailstorage_new(NULL);
156 157
157 int conntypeset = account->ConnectionType(); 158 int conntypeset = account->ConnectionType();
158 int conntype = 0; 159 int conntype = 0;
159 if ( conntypeset == 3 ) { 160 if ( conntypeset == 3 ) {
160 conntype = CONNECTION_TYPE_COMMAND; 161 conntype = CONNECTION_TYPE_COMMAND;
161 } else if ( conntypeset == 2 ) { 162 } else if ( conntypeset == 2 ) {
162 conntype = CONNECTION_TYPE_TLS; 163 conntype = CONNECTION_TYPE_TLS;
163 } else if ( conntypeset == 1 ) { 164 } else if ( conntypeset == 1 ) {
164 conntype = CONNECTION_TYPE_STARTTLS; 165 conntype = CONNECTION_TYPE_STARTTLS;
165 } else if ( conntypeset == 0 ) { 166 } else if ( conntypeset == 0 ) {
166 conntype = CONNECTION_TYPE_TRY_STARTTLS; 167 conntype = CONNECTION_TYPE_TRY_STARTTLS;
167 } 168 }
168 169
169 nntp_mailstorage_init(m_nntp,(char*)server, port, NULL, CONNECTION_TYPE_PLAIN, NNTP_AUTH_TYPE_PLAIN, 170 nntp_mailstorage_init(m_nntp,(char*)server, port, NULL, CONNECTION_TYPE_PLAIN, NNTP_AUTH_TYPE_PLAIN,
170 (char*)user,(char*)pass,0,0,0); 171 (char*)user,(char*)pass,0,0,0);
171 172
172 err = mailstorage_connect( m_nntp ); 173 err = mailstorage_connect( m_nntp );
173 174
174 if (err != NEWSNNTP_NO_ERROR) { 175 if (err != NEWSNNTP_NO_ERROR) {
175 ; // << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; 176 ; // << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl;
176 // Global::statusMessage(tr("Error initializing folder")); 177 // Global::statusMessage(tr("Error initializing folder"));
177 mailstorage_free(m_nntp); 178 mailstorage_free(m_nntp);
178 m_nntp = 0; 179 m_nntp = 0;
179 180
180 } else { 181 } else {
181 mailsession * session = m_nntp->sto_session; 182 mailsession * session = m_nntp->sto_session;
182 newsnntp * news = ( ( nntp_session_state_data * )session->sess_data )->nntp_session; 183 newsnntp * news = ( ( nntp_session_state_data * )session->sess_data )->nntp_session;
183 news->nntp_progr_fun = &nntp_progress; 184 news->nntp_progr_fun = &nntp_progress;
184 } 185 }
185 186
186} 187}
187 188
188void NNTPwrapper::logout() 189void NNTPwrapper::logout()
189{ 190{
190 int err = NEWSNNTP_NO_ERROR; 191 int err = NEWSNNTP_NO_ERROR;
191 if ( m_nntp == NULL ) 192 if ( m_nntp == NULL )
192 return; 193 return;
193 mailstorage_free(m_nntp); 194 mailstorage_free(m_nntp);
194 m_nntp = 0; 195 m_nntp = 0;
195} 196}
196 197
197QValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() { 198QValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() {
198 199
199 QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); 200 QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
200 QStringList groups; 201 QStringList groups;
201 if (account) { 202 if (account) {
202 groups = account->getGroups(); 203 groups = account->getGroups();
203 } 204 }
204 for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) { 205 for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) {
diff --git a/kmicromail/libmailwrapper/nntpwrapper.h b/kmicromail/libmailwrapper/nntpwrapper.h
index 2fb82f2..5d4e5ce 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.h
+++ b/kmicromail/libmailwrapper/nntpwrapper.h
@@ -1,48 +1,49 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#ifndef __NNTPWRAPPER 2#ifndef __NNTPWRAPPER
2#define __NNTPWRAPPER 3#define __NNTPWRAPPER
3 4
4#include "mailwrapper.h" 5#include "mailwrapper.h"
5#include "genericwrapper.h" 6#include "genericwrapper.h"
6#include <qstring.h> 7#include <qstring.h>
7#include <libetpan/clist.h> 8#include <libetpan/clist.h>
8 9
9class encodedString; 10class encodedString;
10struct mailstorage; 11struct mailstorage;
11struct mailfolder; 12struct mailfolder;
12 13
13class NNTPwrapper : public Genericwrapper 14class NNTPwrapper : public Genericwrapper
14{ 15{
15 16
16 Q_OBJECT 17 Q_OBJECT
17 18
18public: 19public:
19 NNTPwrapper( NNTPaccount *a ); 20 NNTPwrapper( NNTPaccount *a );
20 virtual ~NNTPwrapper(); 21 virtual ~NNTPwrapper();
21 22
22 /* mailbox will be ignored */ 23 /* mailbox will be ignored */
23 virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ); 24 virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
24 /* should only get the subscribed one */ 25 /* should only get the subscribed one */
25 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); 26 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
26 /* mailbox will be ignored */ 27 /* mailbox will be ignored */
27 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); 28 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
28 QStringList listAllNewsgroups(const QString&mask = QString::null); 29 QStringList listAllNewsgroups(const QString&mask = QString::null);
29 virtual void deleteMail(const RecMailP&mail); 30 virtual void deleteMail(const RecMailP&mail);
30 virtual void answeredMail(const RecMailP&mail); 31 virtual void answeredMail(const RecMailP&mail);
31 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&); 32 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
32 33
33 virtual RecBodyP fetchBody( const RecMailP &mail ); 34 virtual RecBodyP fetchBody( const RecMailP &mail );
34 virtual encodedString* fetchRawBody(const RecMailP&mail); 35 virtual encodedString* fetchRawBody(const RecMailP&mail);
35 virtual void logout(); 36 virtual void logout();
36 virtual MAILLIB::ATYPE getType()const; 37 virtual MAILLIB::ATYPE getType()const;
37 virtual const QString&getName()const; 38 virtual const QString&getName()const;
38 static void nntp_progress( size_t current, size_t maximum ); 39 static void nntp_progress( size_t current, size_t maximum );
39 40
40protected: 41protected:
41 void login(); 42 void login();
42 NNTPaccount *account; 43 NNTPaccount *account;
43 mailstorage* m_nntp; 44 mailstorage* m_nntp;
44 45
45 46
46}; 47};
47 48
48#endif 49#endif
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index e5d083a..7a84b30 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -1,265 +1,282 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#include <stdlib.h> 2#include <stdlib.h>
2#include "pop3wrapper.h" 3#include "pop3wrapper.h"
3#include "mailtypes.h" 4#include "mailtypes.h"
4#include "logindialog.h" 5#include "logindialog.h"
5#include <libetpan/libetpan.h> 6#include <libetpan/libetpan.h>
6 7
7 8
8#include <qpe/global.h> 9#include <qpe/global.h>
9#include <qfile.h> 10#include <qfile.h>
10 11
11/* we don't fetch messages larger than 5 MB */ 12/* we don't fetch messages larger than 5 MB */
12#define HARD_MSG_SIZE_LIMIT 5242880 13#define HARD_MSG_SIZE_LIMIT 5242880
13 14
14using namespace Opie::Core; 15using namespace Opie::Core;
15POP3wrapper::POP3wrapper( POP3account *a ) 16POP3wrapper::POP3wrapper( POP3account *a )
16: Genericwrapper() { 17: Genericwrapper() {
17 account = a; 18 account = a;
18 m_pop3 = NULL; 19 m_pop3 = NULL;
19 msgTempName = a->getFileName()+"_msg_cache"; 20 msgTempName = a->getFileName()+"_msg_cache";
20 last_msg_id = 0; 21 last_msg_id = 0;
21} 22}
22 23
23POP3wrapper::~POP3wrapper() { 24POP3wrapper::~POP3wrapper() {
24 logout(); 25 logout();
25 QFile msg_cache(msgTempName); 26 QFile msg_cache(msgTempName);
26 if (msg_cache.exists()) { 27 if (msg_cache.exists()) {
27 msg_cache.remove(); 28 msg_cache.remove();
28 } 29 }
29} 30}
30 31
31void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { 32void POP3wrapper::pop3_progress( size_t current, size_t maximum ) {
32 ; // odebug << "POP3: " << current << " of " << maximum << "" << oendl; 33 ; // odebug << "POP3: " << current << " of " << maximum << "" << oendl;
33} 34}
34 35
35RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) { 36RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
36 int err = MAILPOP3_NO_ERROR; 37 int err = MAILPOP3_NO_ERROR;
37 char *message = 0; 38 char *message = 0;
38 size_t length = 0; 39 size_t length = 0;
39 40
40 RecBodyP body = new RecBody(); 41 RecBodyP body = new RecBody();
41 42
42 login(); 43 login();
43 if ( !m_pop3 ) { 44 if ( !m_pop3 ) {
44 return body; 45 return body;
45 } 46 }
46 47
47 mailmessage * mailmsg; 48 mailmessage * mailmsg;
48 if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) { 49 if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
49 ; // odebug << "Message to large: " << mail->Msgsize() << "" << oendl; 50 ; // odebug << "Message to large: " << mail->Msgsize() << "" << oendl;
50 return body; 51 return body;
51 } 52 }
52 53
53 QFile msg_cache(msgTempName); 54 QFile msg_cache(msgTempName);
54 55
55 cleanMimeCache(); 56 cleanMimeCache();
56 57
57 if (mail->getNumber()!=last_msg_id) { 58 if (mail->getNumber()!=last_msg_id) {
58 if (msg_cache.exists()) { 59 if (msg_cache.exists()) {
59 msg_cache.remove(); 60 msg_cache.remove();
60 } 61 }
61 msg_cache.open(IO_ReadWrite|IO_Truncate); 62 msg_cache.open(IO_ReadWrite|IO_Truncate);
62 last_msg_id = mail->getNumber(); 63 last_msg_id = mail->getNumber();
63 err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg); 64 err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg);
64 err = mailmessage_fetch(mailmsg,&message,&length); 65 err = mailmessage_fetch(mailmsg,&message,&length);
65 msg_cache.writeBlock(message,length); 66 msg_cache.writeBlock(message,length);
66 } else { 67 } else {
67 QString msg=""; 68 QString msg="";
68 msg_cache.open(IO_ReadOnly); 69 msg_cache.open(IO_ReadOnly);
69 message = new char[4096]; 70 message = new char[4096];
70 memset(message,0,4096); 71 memset(message,0,4096);
71 while (msg_cache.readBlock(message,4095)>0) { 72 while (msg_cache.readBlock(message,4095)>0) {
72 msg+=message; 73 msg+=message;
73 memset(message,0,4096); 74 memset(message,0,4096);
74 } 75 }
75 delete message; 76 delete message;
76 message = (char*)malloc(msg.length()+1*sizeof(char)); 77 message = (char*)malloc(msg.length()+1*sizeof(char));
77 memset(message,0,msg.length()+1); 78 memset(message,0,msg.length()+1);
78 memcpy(message,msg.latin1(),msg.length()); 79 memcpy(message,msg.latin1(),msg.length());
79 /* transform to libetpan stuff */ 80 /* transform to libetpan stuff */
80 mailmsg = mailmessage_new(); 81 mailmsg = mailmessage_new();
81 mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); 82 mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message));
82 generic_message_t * msg_data; 83 generic_message_t * msg_data;
83 msg_data = (generic_message_t *)mailmsg->msg_data; 84 msg_data = (generic_message_t *)mailmsg->msg_data;
84 msg_data->msg_fetched = 1; 85 msg_data->msg_fetched = 1;
85 msg_data->msg_message = message; 86 msg_data->msg_message = message;
86 msg_data->msg_length = strlen(message); 87 msg_data->msg_length = strlen(message);
87 } 88 }
88 body = parseMail(mailmsg); 89 body = parseMail(mailmsg);
89 90
90 /* clean up */ 91 /* clean up */
91 if (mailmsg) 92 if (mailmsg)
92 mailmessage_free(mailmsg); 93 mailmessage_free(mailmsg);
93 if (message) 94 if (message)
94 free(message); 95 free(message);
95 96
96 return body; 97 return body;
97} 98}
98 99
99void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) 100void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
100{ 101{
101 login(); 102 login();
102 if (!m_pop3) 103 if (!m_pop3)
103 return; 104 return;
104 uint32_t res_messages,res_recent,res_unseen; 105 uint32_t res_messages,res_recent,res_unseen;
105 mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen); 106 mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen);
106 parseList(target,m_pop3->sto_session,"INBOX"); 107 parseList(target,m_pop3->sto_session,"INBOX", false, maxSizeInKb);
107 Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages)); 108 Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages));
108} 109}
109 110
110void POP3wrapper::login() 111void POP3wrapper::login()
111{ 112{
112 if (account->getOffline()) 113 if (account->getOffline())
113 return; 114 return;
114 /* we'll hold the line */ 115 /* we'll hold the line */
115 if ( m_pop3 != NULL ) 116 if ( m_pop3 != NULL )
116 return; 117 return;
117 118
118 const char *server, *user, *pass; 119 const char *server, *user, *pass;
119 uint16_t port; 120 uint16_t port;
120 int err = MAILPOP3_NO_ERROR; 121 int err = MAILPOP3_NO_ERROR;
121 122
122 server = account->getServer().latin1(); 123 server = account->getServer().latin1();
123 port = account->getPort().toUInt(); 124 port = account->getPort().toUInt();
124 125
125 if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { 126 if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
126 LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); 127 LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
127 login.show(); 128 login.show();
128 if ( QDialog::Accepted == login.exec() ) { 129 if ( QDialog::Accepted == login.exec() ) {
129 // ok 130 // ok
130 user = login.getUser().latin1(); 131 user = login.getUser().latin1();
131 pass = login.getPassword().latin1(); 132 pass = login.getPassword().latin1();
132 } else { 133 } else {
133 // cancel 134 // cancel
134 ; // odebug << "POP3: Login canceled" << oendl; 135 ; // odebug << "POP3: Login canceled" << oendl;
135 return; 136 return;
136 } 137 }
137 } else { 138 } else {
138 user = account->getUser().latin1(); 139 user = account->getUser().latin1();
139 pass = account->getPassword().latin1(); 140 pass = account->getPassword().latin1();
140 } 141 }
141 142
142 // bool ssl = account->getSSL(); 143 // bool ssl = account->getSSL();
143 144
144 m_pop3=mailstorage_new(NULL); 145 m_pop3=mailstorage_new(NULL);
145 146
146 int conntypeset = account->ConnectionType(); 147 int conntypeset = account->ConnectionType();
147 int conntype = 0; 148 int conntype = 0;
148 if ( conntypeset == 3 ) { 149 if ( conntypeset == 3 ) {
149 conntype = CONNECTION_TYPE_COMMAND; 150 conntype = CONNECTION_TYPE_COMMAND;
150 } else if ( conntypeset == 2 ) { 151 } else if ( conntypeset == 2 ) {
151 conntype = CONNECTION_TYPE_TLS; 152 conntype = CONNECTION_TYPE_TLS;
152 } else if ( conntypeset == 1 ) { 153 } else if ( conntypeset == 1 ) {
153 conntype = CONNECTION_TYPE_STARTTLS; 154 conntype = CONNECTION_TYPE_STARTTLS;
154 } else if ( conntypeset == 0 ) { 155 } else if ( conntypeset == 0 ) {
155 conntype = CONNECTION_TYPE_TRY_STARTTLS; 156 conntype = CONNECTION_TYPE_TRY_STARTTLS;
156 } 157 }
157 158
158 //(ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN); 159 //(ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN);
159 160
160 pop3_mailstorage_init(m_pop3,(char*)server, port, NULL, conntype, POP3_AUTH_TYPE_PLAIN, 161 pop3_mailstorage_init(m_pop3,(char*)server, port, NULL, conntype, POP3_AUTH_TYPE_PLAIN,
161 (char*)user,(char*)pass,0,0,0); 162 (char*)user,(char*)pass,0,0,0);
162 163
163 164
164 err = mailstorage_connect(m_pop3); 165 err = mailstorage_connect(m_pop3);
165 if (err != MAIL_NO_ERROR) { 166 if (err != MAIL_NO_ERROR) {
166 ; // odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl; 167 ; // odebug << QString( "FEHLERNUMMER %1" ).arg( err ) << oendl;
167 Global::statusMessage(tr("Error initializing folder")); 168 Global::statusMessage(tr("Error initializing folder"));
168 mailstorage_free(m_pop3); 169 mailstorage_free(m_pop3);
169 m_pop3 = 0; 170 m_pop3 = 0;
170 } else { 171 } else {
171 mailsession * session = m_pop3->sto_session; 172 mailsession * session = m_pop3->sto_session;
172 mailpop3 * mail = ( ( pop3_session_state_data * )session->sess_data )->pop3_session; 173 mailpop3 * mail = ( ( pop3_session_state_data * )session->sess_data )->pop3_session;
173 if (mail) { 174 if (mail) {
174 mail->pop3_progr_fun = &pop3_progress; 175 mail->pop3_progr_fun = &pop3_progress;
175 } 176 }
176 } 177 }
177} 178}
178 179
179void POP3wrapper::logout() 180void POP3wrapper::logout()
180{ 181{
181 if ( m_pop3 == NULL ) 182 if ( m_pop3 == NULL )
182 return; 183 return;
183 mailstorage_free(m_pop3); 184 mailstorage_free(m_pop3);
184 m_pop3 = 0; 185 m_pop3 = 0;
185} 186}
186 187
187 188
188QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() { 189QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
189 QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>(); 190 QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>();
190 FolderP inb=new Folder("INBOX","/"); 191 FolderP inb=new Folder("INBOX","/");
191 folders->append(inb); 192 folders->append(inb);
192 return folders; 193 return folders;
193} 194}
194 195
196void POP3wrapper::deleteMailList(QValueList<RecMailP>&target)
197{
198 login();
199 if (!m_pop3)
200 return;
201 int iii = 0;
202 int count = target.count();
203 while (iii < count ) {
204 RecMailP mail = (*target.at( iii ));
205 int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber());
206 if (err != MAIL_NO_ERROR) {
207 Global::statusMessage(tr("error deleting mail"));
208 }
209 ++iii;
210 }
211}
195void POP3wrapper::deleteMail(const RecMailP&mail) { 212void POP3wrapper::deleteMail(const RecMailP&mail) {
196 login(); 213 login();
197 if (!m_pop3) 214 if (!m_pop3)
198 return; 215 return;
199 int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber()); 216 int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber());
200 if (err != MAIL_NO_ERROR) { 217 if (err != MAIL_NO_ERROR) {
201 Global::statusMessage(tr("error deleting mail")); 218 Global::statusMessage(tr("error deleting mail"));
202 } 219 }
203} 220}
204 221
205void POP3wrapper::answeredMail(const RecMailP&) {} 222void POP3wrapper::answeredMail(const RecMailP&) {}
206 223
207int POP3wrapper::deleteAllMail(const FolderP&) { 224int POP3wrapper::deleteAllMail(const FolderP&) {
208 login(); 225 login();
209 if (!m_pop3) 226 if (!m_pop3)
210 return 0; 227 return 0;
211 int res = 1; 228 int res = 1;
212 229
213 uint32_t result = 0; 230 uint32_t result = 0;
214 int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result); 231 int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result);
215 if (err != MAIL_NO_ERROR) { 232 if (err != MAIL_NO_ERROR) {
216 Global::statusMessage(tr("Error getting folder info")); 233 Global::statusMessage(tr("Error getting folder info"));
217 return 0; 234 return 0;
218 } 235 }
219 for (unsigned int i = 0; i < result; ++i) { 236 for (unsigned int i = 0; i < result; ++i) {
220 err = mailsession_remove_message(m_pop3->sto_session,i+1); 237 err = mailsession_remove_message(m_pop3->sto_session,i+1);
221 if (err != MAIL_NO_ERROR) { 238 if (err != MAIL_NO_ERROR) {
222 Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); 239 Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
223 res=0; 240 res=0;
224 } 241 }
225 break; 242 break;
226 } 243 }
227 return res; 244 return res;
228} 245}
229 246
230void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) { 247void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) {
231 login(); 248 login();
232 target_stat.message_count = 0; 249 target_stat.message_count = 0;
233 target_stat.message_unseen = 0; 250 target_stat.message_unseen = 0;
234 target_stat.message_recent = 0; 251 target_stat.message_recent = 0;
235 if (!m_pop3) 252 if (!m_pop3)
236 return; 253 return;
237 int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count, 254 int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count,
238 &target_stat.message_recent,&target_stat.message_unseen); 255 &target_stat.message_recent,&target_stat.message_unseen);
239 if (r != MAIL_NO_ERROR) { 256 if (r != MAIL_NO_ERROR) {
240 ; // odebug << "error getting folter status." << oendl; 257 ; // odebug << "error getting folter status." << oendl;
241 } 258 }
242} 259}
243 260
244encodedString* POP3wrapper::fetchRawBody(const RecMailP&mail) { 261encodedString* POP3wrapper::fetchRawBody(const RecMailP&mail) {
245 char*target=0; 262 char*target=0;
246 size_t length=0; 263 size_t length=0;
247 encodedString*res = 0; 264 encodedString*res = 0;
248 mailmessage * mailmsg = 0; 265 mailmessage * mailmsg = 0;
249 int err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg); 266 int err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg);
250 err = mailmessage_fetch(mailmsg,&target,&length); 267 err = mailmessage_fetch(mailmsg,&target,&length);
251 if (mailmsg) 268 if (mailmsg)
252 mailmessage_free(mailmsg); 269 mailmessage_free(mailmsg);
253 if (target) { 270 if (target) {
254 res = new encodedString(target,length); 271 res = new encodedString(target,length);
255 } 272 }
256 return res; 273 return res;
257} 274}
258 275
259MAILLIB::ATYPE POP3wrapper::getType()const { 276MAILLIB::ATYPE POP3wrapper::getType()const {
260 return account->getType(); 277 return account->getType();
261} 278}
262 279
263const QString&POP3wrapper::getName()const{ 280const QString&POP3wrapper::getName()const{
264 return account->getAccountName(); 281 return account->getAccountName();
265} 282}
diff --git a/kmicromail/libmailwrapper/pop3wrapper.h b/kmicromail/libmailwrapper/pop3wrapper.h
index 5101fa5..ee754a4 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.h
+++ b/kmicromail/libmailwrapper/pop3wrapper.h
@@ -1,42 +1,44 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#ifndef __POP3WRAPPER 2#ifndef __POP3WRAPPER
2#define __POP3WRAPPER 3#define __POP3WRAPPER
3 4
4#include "mailwrapper.h" 5#include "mailwrapper.h"
5#include "genericwrapper.h" 6#include "genericwrapper.h"
6#include <qstring.h> 7#include <qstring.h>
7 8
8class encodedString; 9class encodedString;
9struct mailstorage; 10struct mailstorage;
10struct mailfolder; 11struct mailfolder;
11 12
12class POP3wrapper : public Genericwrapper 13class POP3wrapper : public Genericwrapper
13{ 14{
14 Q_OBJECT 15 Q_OBJECT
15 16
16public: 17public:
17 POP3wrapper( POP3account *a ); 18 POP3wrapper( POP3account *a );
18 virtual ~POP3wrapper(); 19 virtual ~POP3wrapper();
19 /* mailbox will be ignored */ 20 /* mailbox will be ignored */
20 virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ); 21 virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
21 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); 22 virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
22 /* mailbox will be ignored */ 23 /* mailbox will be ignored */
23 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); 24 virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
24 25
25 virtual void deleteMail(const RecMailP&mail); 26 virtual void deleteMail(const RecMailP&mail);
26 virtual void answeredMail(const RecMailP&mail); 27 virtual void answeredMail(const RecMailP&mail);
28 virtual void deleteMailList(QValueList<RecMailP>&target);
27 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&); 29 virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
28 30
29 virtual RecBodyP fetchBody( const RecMailP &mail ); 31 virtual RecBodyP fetchBody( const RecMailP &mail );
30 virtual encodedString* fetchRawBody(const RecMailP&mail); 32 virtual encodedString* fetchRawBody(const RecMailP&mail);
31 virtual void logout(); 33 virtual void logout();
32 virtual MAILLIB::ATYPE getType()const; 34 virtual MAILLIB::ATYPE getType()const;
33 virtual const QString&getName()const; 35 virtual const QString&getName()const;
34 static void pop3_progress( size_t current, size_t maximum ); 36 static void pop3_progress( size_t current, size_t maximum );
35 37
36protected: 38protected:
37 void login(); 39 void login();
38 POP3account *account; 40 POP3account *account;
39 mailstorage*m_pop3; 41 mailstorage*m_pop3;
40}; 42};
41 43
42#endif 44#endif
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index d522ad0..3fbdcec 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,96 +1,97 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1// CHANGED 2004-08-06 Lutz Rogowski 2// CHANGED 2004-08-06 Lutz Rogowski
2 3
3#include "settingsdialog.h" 4#include "settingsdialog.h"
4#include "opiemail.h" 5#include "opiemail.h"
5#include "editaccounts.h" 6#include "editaccounts.h"
6#include "composemail.h" 7#include "composemail.h"
7#include "mailistviewitem.h" 8#include "mailistviewitem.h"
8#include "viewmail.h" 9#include "viewmail.h"
9#include "selectstore.h" 10#include "selectstore.h"
10#include "selectsmtp.h" 11#include "selectsmtp.h"
11 12
12#include <qmessagebox.h> 13#include <qmessagebox.h>
13 14
14#include <qpe/qpeapplication.h> 15#include <qpe/qpeapplication.h>
15#include <libmailwrapper/smtpwrapper.h> 16#include <libmailwrapper/smtpwrapper.h>
16#include <libmailwrapper/mailtypes.h> 17#include <libmailwrapper/mailtypes.h>
17#include <libmailwrapper/abstractmail.h> 18#include <libmailwrapper/abstractmail.h>
18/* OPIE */ 19/* OPIE */
19//#include <qpe/resource.h> 20//#include <qpe/resource.h>
20#include <qpe/qpeapplication.h> 21#include <qpe/qpeapplication.h>
21 22
22/* QT */ 23/* QT */
23 24
24using namespace Opie::Core; 25using namespace Opie::Core;
25 26
26OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) 27OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
27 : MainWindow( parent, name) //, WStyle_ContextHelp ) 28 : MainWindow( parent, name) //, WStyle_ContextHelp )
28{ 29{
29 settings = new Settings(); 30 settings = new Settings();
30 31
31 folderView->populate( settings->getAccounts() ); 32 folderView->populate( settings->getAccounts() );
32 33
33} 34}
34 35
35OpieMail::~OpieMail() 36OpieMail::~OpieMail()
36{ 37{
37 if (settings) delete settings; 38 if (settings) delete settings;
38} 39}
39 40
40void OpieMail::appMessage(const QCString &msg, const QByteArray &data) 41void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
41{ 42{
42 43
43} 44}
44#include <stdlib.h> 45#include <stdlib.h>
45void OpieMail::message(const QCString &msg, const QByteArray &data) 46void OpieMail::message(const QCString &msg, const QByteArray &data)
46{ 47{
47 // copied from old mail2 48 // copied from old mail2
48 static int ii = 0; 49 static int ii = 0;
49 50
50 // block second call 51 // block second call
51 if ( ii < 2 ) { 52 if ( ii < 2 ) {
52 ++ii; 53 ++ii;
53 if ( ii > 1 ) { 54 if ( ii > 1 ) {
54 qDebug("qcop call blocked "); 55 qDebug("qcop call blocked ");
55 return; 56 return;
56 } 57 }
57 } 58 }
58 //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); 59 //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this);
59 if (msg == "writeMail(QString,QString)") 60 if (msg == "writeMail(QString,QString)")
60 { 61 {
61 QDataStream stream(data,IO_ReadOnly); 62 QDataStream stream(data,IO_ReadOnly);
62 QString name, email; 63 QString name, email;
63 stream >> name >> email; 64 stream >> name >> email;
64 // removing the whitespaces at beginning and end is needed! 65 // removing the whitespaces at beginning and end is needed!
65 slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); 66 slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace());
66 } 67 }
67 else if (msg == "newMail()") 68 else if (msg == "newMail()")
68 { 69 {
69 slotComposeMail(); 70 slotComposeMail();
70 } 71 }
71 else if (msg == "newMail(QString)") 72 else if (msg == "newMail(QString)")
72 { 73 {
73 QDataStream stream(data,IO_ReadOnly); 74 QDataStream stream(data,IO_ReadOnly);
74 QString nameemail; 75 QString nameemail;
75 stream >> nameemail; 76 stream >> nameemail;
76 // the format is 77 // the format is
77 // NAME <EMAIL>:SUBJECT 78 // NAME <EMAIL>:SUBJECT
78 //qDebug("message %s ", nameemail.latin1()); 79 //qDebug("message %s ", nameemail.latin1());
79 80
80 slotwriteMail2( nameemail ); 81 slotwriteMail2( nameemail );
81 } 82 }
82} 83}
83void OpieMail::slotwriteMail2(const QString& namemail ) 84void OpieMail::slotwriteMail2(const QString& namemail )
84{ 85{
85 // qDebug("OpieMail::slotwriteMail2 "); 86 // qDebug("OpieMail::slotwriteMail2 ");
86 qApp->processEvents(); 87 qApp->processEvents();
87 ComposeMail compose( settings, this, 0, true ); 88 ComposeMail compose( settings, this, 0, true );
88 if ( !namemail.isEmpty() ) { 89 if ( !namemail.isEmpty() ) {
89 QString to = namemail; 90 QString to = namemail;
90 if ( namemail.find( " <") > 1 ) { 91 if ( namemail.find( " <") > 1 ) {
91 to = "\"" +to.replace( QRegExp( " <"), "\" <") ; 92 to = "\"" +to.replace( QRegExp( " <"), "\" <") ;
92 } else 93 } else
93 if ( namemail.find( "<") > 1 ) { 94 if ( namemail.find( "<") > 1 ) {
94 to = "\"" +to.replace( QRegExp( "<"), "\" <") ; 95 to = "\"" +to.replace( QRegExp( "<"), "\" <") ;
95 } 96 }
96 int sub = to.find( ">:"); 97 int sub = to.find( ">:");
@@ -185,180 +186,223 @@ void OpieMail::slotSearchMails()
185 186
186void OpieMail::slotEditSettings() 187void OpieMail::slotEditSettings()
187{ 188{
188 SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); 189 SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp );
189 settingsDialog.showMaximized(); 190 settingsDialog.showMaximized();
190 settingsDialog.exec(); 191 settingsDialog.exec();
191} 192}
192 193
193void OpieMail::slotEditAccounts() 194void OpieMail::slotEditAccounts()
194{ 195{
195 EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); 196 EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp );
196 eaDialog.slotAdjustColumns(); 197 eaDialog.slotAdjustColumns();
197 eaDialog.showMaximized(); 198 eaDialog.showMaximized();
198 eaDialog.exec(); 199 eaDialog.exec();
199 if ( settings ) delete settings; 200 if ( settings ) delete settings;
200 settings = new Settings(); 201 settings = new Settings();
201 202
202 folderView->populate( settings->getAccounts() ); 203 folderView->populate( settings->getAccounts() );
203} 204}
204 205
205void OpieMail::displayMail() 206void OpieMail::displayMail()
206{ 207{
207 QListViewItem*item = mailView->currentItem(); 208 QListViewItem*item = mailView->currentItem();
208 if (!item) return; 209 if (!item) return;
209 RecMailP mail = ((MailListViewItem*)item)->data(); 210 RecMailP mail = ((MailListViewItem*)item)->data();
210 RecBodyP body = folderView->fetchBody(mail); 211 RecBodyP body = folderView->fetchBody(mail);
211 ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp ); 212 ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp );
212 readMail.setBody( body ); 213 readMail.setBody( body );
213 readMail.setMail( mail ); 214 readMail.setMail( mail );
214 readMail.showMaximized(); 215 readMail.showMaximized();
215 readMail.exec(); 216 readMail.exec();
216 217
217 if ( readMail.deleted ) 218 if ( readMail.deleted )
218 { 219 {
219 folderView->refreshCurrent(); 220 folderView->refreshCurrent();
220 } 221 }
221 else 222 else
222 { 223 {
223 ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); 224 ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
224 } 225 }
225} 226}
226 227
227void OpieMail::slotDeleteMail() 228void OpieMail::slotDeleteMail()
228{ 229{
229 if (!mailView->currentItem()) return; 230 if (!mailView->currentItem()) return;
230 RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data(); 231 RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
231 if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) 232 if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
232 { 233 {
233 mail->Wrapper()->deleteMail( mail ); 234 mail->Wrapper()->deleteMail( mail );
234 folderView->refreshCurrent(); 235 folderView->refreshCurrent();
235 } 236 }
236} 237}
237void OpieMail::slotDeleteAllMail() 238void OpieMail::slotDeleteAllMail()
238{ 239{
239 if (!mailView->currentItem()) return; 240 if (!mailView->currentItem()) return;
240 RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data(); 241 RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
241 if ( QMessageBox::warning(this, tr("Delete All Mails"), tr("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) 242 if ( QMessageBox::warning(this, tr("Delete All Mails"), tr("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
242 { 243 {
243 MailListViewItem* item = (MailListViewItem*)mailView->firstChild (); 244 MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
244 while ( item ) { 245 while ( item ) {
245 if ( item->isSelected() ) { 246 if ( item->isSelected() ) {
246 RecMailP mail = item->data(); 247 RecMailP mail = item->data();
247 mail->Wrapper()->deleteMail( mail ); 248 mail->Wrapper()->deleteMail( mail );
248 } 249 }
249 item = (MailListViewItem*)item->nextSibling(); 250 item = (MailListViewItem*)item->nextSibling();
250 } 251 }
251 folderView->refreshCurrent(); 252 folderView->refreshCurrent();
252 } 253 }
253} 254}
254void OpieMail::clearSelection() 255void OpieMail::clearSelection()
255{ 256{
256 mailView->clearSelection(); 257 mailView->clearSelection();
257 258
258} 259}
259 260
260void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) 261void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int )
261{ 262{
262 if (!mailView->currentItem()) return; 263 if (!mailView->currentItem()) return;
263 MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType(); 264 MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType();
264 /* just the RIGHT button - or hold on pda */ 265 /* just the RIGHT button - or hold on pda */
265 if (button!=2) {return;} 266 if (button!=2) {return;}
266 if (!item) return; 267 if (!item) return;
267 QPopupMenu *m = new QPopupMenu(0); 268 QPopupMenu *m = new QPopupMenu(0);
268 if (m) 269 if (m)
269 { 270 {
270 if (mailtype==MAILLIB::A_NNTP) { 271 if (mailtype==MAILLIB::A_NNTP) {
271 m->insertItem(tr("Read this posting"),this,SLOT(displayMail())); 272 m->insertItem(tr("Read this posting"),this,SLOT(displayMail()));
272// m->insertItem(tr("Copy this posting"),this,SLOT(slotMoveCopyMail())); 273// m->insertItem(tr("Copy this posting"),this,SLOT(slotMoveCopyMail()));
273 } else { 274 } else {
274 if (folderView->currentisDraft()) { 275 if (folderView->currentisDraft()) {
275 m->insertItem(tr("Edit this mail"),this,SLOT(reEditMail())); 276 m->insertItem(tr("Edit this mail"),this,SLOT(reEditMail()));
276 } 277 }
277 m->insertItem(tr("Read this mail"),this,SLOT(displayMail())); 278 m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
278 m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail())); 279 m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail()));
279 m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail())); 280 m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
280 m->insertSeparator(); 281 m->insertSeparator();
282 m->insertItem(tr("Copy/Move all selected mail"),this,SLOT(slotMoveCopyAllMail()));
281 m->insertItem(tr("Delete all selected mails"),this,SLOT(slotDeleteAllMail())); 283 m->insertItem(tr("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
282 m->insertItem(tr("Clear selection"),this,SLOT(clearSelection())); 284 m->insertItem(tr("Clear selection"),this,SLOT(clearSelection()));
283 } 285 }
284 m->setFocus(); 286 m->setFocus();
285 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); 287 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
286 delete m; 288 delete m;
287 } 289 }
288} 290}
289 291
290void OpieMail::slotShowFolders( bool show ) 292void OpieMail::slotShowFolders( bool show )
291{ 293{
292 if ( show && folderView->isHidden() ) 294 if ( show && folderView->isHidden() )
293 { 295 {
294 folderView->show(); 296 folderView->show();
295 } 297 }
296 else if ( !show && !folderView->isHidden() ) 298 else if ( !show && !folderView->isHidden() )
297 { 299 {
298 folderView->hide(); 300 folderView->hide();
299 } 301 }
300} 302}
301 303
302void OpieMail::refreshMailView(const QValueList<RecMailP>&list) 304void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
303{ 305{
304 MailListViewItem*item = 0; 306 MailListViewItem*item = 0;
305 mailView->clear(); 307 mailView->clear();
306 308
307 QValueList<RecMailP>::ConstIterator it; 309 QValueList<RecMailP>::ConstIterator it;
308 for (it = list.begin(); it != list.end();++it) 310 for (it = list.begin(); it != list.end();++it)
309 { 311 {
310 item = new MailListViewItem(mailView,item); 312 item = new MailListViewItem(mailView,item);
311 item->storeData((*it)); 313 item->storeData((*it));
312 item->showEntry(); 314 item->showEntry();
313 } 315 }
314} 316}
315 317
316void OpieMail::mailLeftClicked( QListViewItem *item ) 318void OpieMail::mailLeftClicked( QListViewItem *item )
317{ 319{
318 mailView->clearSelection(); 320 mailView->clearSelection();
319 /* just LEFT button - or tap with stylus on pda */ 321 /* just LEFT button - or tap with stylus on pda */
320 //if (button!=1) return; 322 //if (button!=1) return;
321 if (!item) return; 323 if (!item) return;
322 if (folderView->currentisDraft()) { 324 if (folderView->currentisDraft()) {
323 reEditMail(); 325 reEditMail();
324 } else { 326 } else {
325 displayMail(); 327 displayMail();
326 } 328 }
327} 329}
328 330
329void OpieMail::slotMoveCopyMail() 331void OpieMail::slotMoveCopyMail()
330{ 332{
331 if (!mailView->currentItem()) return; 333 if (!mailView->currentItem()) return;
332 RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data(); 334 RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
333 AbstractMail*targetMail = 0; 335 AbstractMail*targetMail = 0;
334 QString targetFolder = ""; 336 QString targetFolder = "";
335 Selectstore sels; 337 Selectstore sels;
336 folderView->setupFolderselect(&sels); 338 folderView->setupFolderselect(&sels);
337 if (!sels.exec()) return; 339 if (!sels.exec()) return;
338 targetMail = sels.currentMail(); 340 targetMail = sels.currentMail();
339 targetFolder = sels.currentFolder(); 341 targetFolder = sels.currentFolder();
340 if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) || 342 if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
341 targetFolder.isEmpty()) 343 targetFolder.isEmpty())
342 { 344 {
343 return; 345 return;
344 } 346 }
345 if (sels.newFolder() && !targetMail->createMbox(targetFolder)) 347 if (sels.newFolder() && !targetMail->createMbox(targetFolder))
346 { 348 {
347 QMessageBox::critical(0,tr("Error creating new Folder"), 349 QMessageBox::critical(0,tr("Error creating new Folder"),
348 tr("<center>Error while creating<br>new folder - breaking.</center>")); 350 tr("<center>Error while creating<br>new folder - breaking.</center>"));
349 return; 351 return;
350 } 352 }
351 mail->Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails()); 353 mail->Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
352 folderView->refreshCurrent(); 354 folderView->refreshCurrent();
353} 355}
354 356
357void OpieMail::slotMoveCopyAllMail()
358{
359
360 if (!mailView->currentItem()) return;
361 QValueList<RecMailP> t;
362 if ( QMessageBox::warning(this, tr("Copy/Move all selected mails"), tr("Do you really want to copy/move\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
363 {
364 MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
365 while ( item ) {
366 if ( item->isSelected() ) {
367 t.append( item->data() );
368 }
369 item = (MailListViewItem*)item->nextSibling();
370 }
371 }
372 else
373 return;
374 if ( t.count() == 0 )
375 return;
376 RecMailP mail = t.first();
377 AbstractMail*targetMail = 0;
378 QString targetFolder = "";
379 Selectstore sels;
380 folderView->setupFolderselect(&sels);
381 if (!sels.exec()) return;
382 targetMail = sels.currentMail();
383 targetFolder = sels.currentFolder();
384 if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
385 targetFolder.isEmpty())
386 {
387 return;
388 }
389 if (sels.newFolder() && !targetMail->createMbox(targetFolder))
390 {
391 QMessageBox::critical(0,tr("Error creating new Folder"),
392 tr("<center>Error while creating<br>new folder - breaking.</center>"));
393 return;
394 }
395 mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails());
396 folderView->refreshCurrent();
397}
398
355void OpieMail::reEditMail() 399void OpieMail::reEditMail()
356{ 400{
357 if (!mailView->currentItem()) return; 401 if (!mailView->currentItem()) return;
358 402
359 ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); 403 ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
360 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); 404 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
361 compose.slotAdjustColumns(); 405 compose.slotAdjustColumns();
362 compose.showMaximized(); 406 compose.showMaximized();
363 compose.exec(); 407 compose.exec();
364} 408}
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 143b0c4..934f232 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -1,46 +1,48 @@
1// CHANGED 2004-09-31 Lutz Rogowski
1#ifndef OPIEMAIL_H 2#ifndef OPIEMAIL_H
2#define OPIEMAIL_H 3#define OPIEMAIL_H
3 4
4#include "mainwindow.h" 5#include "mainwindow.h"
5#include <libmailwrapper/settings.h> 6#include <libmailwrapper/settings.h>
6 7
7#include <opie2/osmartpointer.h> 8#include <opie2/osmartpointer.h>
8#include <libmailwrapper/mailtypes.h> 9#include <libmailwrapper/mailtypes.h>
9 10
10class OpieMail : public MainWindow 11class OpieMail : public MainWindow
11{ 12{
12 Q_OBJECT 13 Q_OBJECT
13 14
14public: 15public:
15 OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); 16 OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
16 virtual ~OpieMail(); 17 virtual ~OpieMail();
17 static QString appName() { return QString::fromLatin1("opiemail"); } 18 static QString appName() { return QString::fromLatin1("opiemail"); }
18 19
19public slots: 20public slots:
20 virtual void slotwriteMail(const QString&name,const QString&email); 21 virtual void slotwriteMail(const QString&name,const QString&email);
21 virtual void slotwriteMail2(const QString&nameemail); 22 virtual void slotwriteMail2(const QString&nameemail);
22 virtual void slotComposeMail(); 23 virtual void slotComposeMail();
23 virtual void appMessage(const QCString &msg, const QByteArray &data); 24 virtual void appMessage(const QCString &msg, const QByteArray &data);
24 virtual void message(const QCString &msg, const QByteArray &data); 25 virtual void message(const QCString &msg, const QByteArray &data);
25protected slots: 26protected slots:
26 virtual void slotSendQueued(); 27 virtual void slotSendQueued();
27 virtual void slotSearchMails(); 28 virtual void slotSearchMails();
28 virtual void slotEditSettings(); 29 virtual void slotEditSettings();
29 virtual void slotEditAccounts(); 30 virtual void slotEditAccounts();
30 virtual void displayMail(); 31 virtual void displayMail();
31 virtual void slotDeleteMail(); 32 virtual void slotDeleteMail();
32 virtual void slotDeleteAllMail(); 33 virtual void slotDeleteAllMail();
33 virtual void mailHold(int, QListViewItem *,const QPoint&,int); 34 virtual void mailHold(int, QListViewItem *,const QPoint&,int);
34 virtual void slotShowFolders( bool show ); 35 virtual void slotShowFolders( bool show );
35 virtual void refreshMailView(const QValueList<RecMailP>&); 36 virtual void refreshMailView(const QValueList<RecMailP>&);
36 virtual void mailLeftClicked( QListViewItem * ); 37 virtual void mailLeftClicked( QListViewItem * );
37 virtual void slotMoveCopyMail(); 38 virtual void slotMoveCopyMail();
39 virtual void slotMoveCopyAllMail();
38 virtual void reEditMail(); 40 virtual void reEditMail();
39 void clearSelection(); 41 void clearSelection();
40 42
41private: 43private:
42 Settings *settings; 44 Settings *settings;
43 45
44}; 46};
45 47
46#endif 48#endif
diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui
index 5f0e507..dd3fc92 100644
--- a/kmicromail/selectstoreui.ui
+++ b/kmicromail/selectstoreui.ui
@@ -1,279 +1,317 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>selectstoreui</class> 2<class>selectstoreui</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>selectstoreui</cstring> 7 <cstring>selectstoreui</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>182</width> 14 <width>275</width>
15 <height>273</height> 15 <height>304</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Select target box</string> 20 <string>Select target box</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <vbox> 28 <grid>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>1</number> 31 <number>11</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>1</number> 35 <number>6</number>
36 </property> 36 </property>
37 <widget> 37 <widget row="0" column="0" rowspan="1" colspan="2" >
38 <class>QLabel</class> 38 <class>QLabel</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>headlabel</cstring> 41 <cstring>headlabel</cstring>
42 </property> 42 </property>
43 <property stdset="1"> 43 <property stdset="1">
44 <name>text</name> 44 <name>text</name>
45 <string>&lt;b&gt;Store mail(s) to&lt;/b&gt;</string> 45 <string>&lt;b&gt;Store mail(s) to&lt;/b&gt;</string>
46 </property> 46 </property>
47 <property stdset="1"> 47 <property stdset="1">
48 <name>alignment</name> 48 <name>alignment</name>
49 <set>AlignCenter</set> 49 <set>AlignCenter</set>
50 </property> 50 </property>
51 <property> 51 <property>
52 <name>hAlign</name> 52 <name>hAlign</name>
53 </property> 53 </property>
54 </widget> 54 </widget>
55 <widget> 55 <widget row="1" column="0" rowspan="1" colspan="2" >
56 <class>QLayoutWidget</class> 56 <class>QLayoutWidget</class>
57 <property stdset="1"> 57 <property stdset="1">
58 <name>name</name> 58 <name>name</name>
59 <cstring>Layout2</cstring> 59 <cstring>Layout2</cstring>
60 </property> 60 </property>
61 <grid> 61 <grid>
62 <property stdset="1"> 62 <property stdset="1">
63 <name>margin</name> 63 <name>margin</name>
64 <number>0</number> 64 <number>0</number>
65 </property> 65 </property>
66 <property stdset="1"> 66 <property stdset="1">
67 <name>spacing</name> 67 <name>spacing</name>
68 <number>6</number> 68 <number>6</number>
69 </property> 69 </property>
70 <widget row="1" column="1" > 70 <widget row="1" column="1" >
71 <class>QComboBox</class> 71 <class>QComboBox</class>
72 <property stdset="1"> 72 <property stdset="1">
73 <name>name</name> 73 <name>name</name>
74 <cstring>folderSelection</cstring> 74 <cstring>folderSelection</cstring>
75 </property> 75 </property>
76 <property stdset="1"> 76 <property stdset="1">
77 <name>sizePolicy</name> 77 <name>sizePolicy</name>
78 <sizepolicy> 78 <sizepolicy>
79 <hsizetype>3</hsizetype> 79 <hsizetype>3</hsizetype>
80 <vsizetype>0</vsizetype> 80 <vsizetype>0</vsizetype>
81 </sizepolicy> 81 </sizepolicy>
82 </property> 82 </property>
83 </widget> 83 </widget>
84 <widget row="1" column="0" > 84 <widget row="1" column="0" >
85 <class>QLabel</class> 85 <class>QLabel</class>
86 <property stdset="1"> 86 <property stdset="1">
87 <name>name</name> 87 <name>name</name>
88 <cstring>folderLabel</cstring> 88 <cstring>folderLabel</cstring>
89 </property> 89 </property>
90 <property stdset="1"> 90 <property stdset="1">
91 <name>text</name> 91 <name>text</name>
92 <string>Folder:</string> 92 <string>Folder:</string>
93 </property> 93 </property>
94 <property stdset="1"> 94 <property stdset="1">
95 <name>alignment</name> 95 <name>alignment</name>
96 <set>AlignVCenter|AlignRight</set> 96 <set>AlignVCenter|AlignRight</set>
97 </property> 97 </property>
98 <property> 98 <property>
99 <name>hAlign</name> 99 <name>hAlign</name>
100 </property> 100 </property>
101 </widget> 101 </widget>
102 <widget row="0" column="1" > 102 <widget row="0" column="1" >
103 <class>QComboBox</class> 103 <class>QComboBox</class>
104 <property stdset="1"> 104 <property stdset="1">
105 <name>name</name> 105 <name>name</name>
106 <cstring>accountSelection</cstring> 106 <cstring>accountSelection</cstring>
107 </property> 107 </property>
108 <property stdset="1"> 108 <property stdset="1">
109 <name>sizePolicy</name> 109 <name>sizePolicy</name>
110 <sizepolicy> 110 <sizepolicy>
111 <hsizetype>3</hsizetype> 111 <hsizetype>3</hsizetype>
112 <vsizetype>0</vsizetype> 112 <vsizetype>0</vsizetype>
113 </sizepolicy> 113 </sizepolicy>
114 </property> 114 </property>
115 </widget> 115 </widget>
116 <widget row="0" column="0" > 116 <widget row="0" column="0" >
117 <class>QLabel</class> 117 <class>QLabel</class>
118 <property stdset="1"> 118 <property stdset="1">
119 <name>name</name> 119 <name>name</name>
120 <cstring>accountlabel</cstring> 120 <cstring>accountlabel</cstring>
121 </property> 121 </property>
122 <property stdset="1"> 122 <property stdset="1">
123 <name>sizePolicy</name> 123 <name>sizePolicy</name>
124 <sizepolicy> 124 <sizepolicy>
125 <hsizetype>1</hsizetype> 125 <hsizetype>1</hsizetype>
126 <vsizetype>1</vsizetype> 126 <vsizetype>1</vsizetype>
127 </sizepolicy> 127 </sizepolicy>
128 </property> 128 </property>
129 <property stdset="1"> 129 <property stdset="1">
130 <name>text</name> 130 <name>text</name>
131 <string>Account:</string> 131 <string>Account:</string>
132 </property> 132 </property>
133 <property stdset="1"> 133 <property stdset="1">
134 <name>alignment</name> 134 <name>alignment</name>
135 <set>AlignVCenter|AlignRight</set> 135 <set>AlignVCenter|AlignRight</set>
136 </property> 136 </property>
137 <property> 137 <property>
138 <name>hAlign</name> 138 <name>hAlign</name>
139 </property> 139 </property>
140 </widget> 140 </widget>
141 </grid> 141 </grid>
142 </widget> 142 </widget>
143 <widget> 143 <widget row="2" column="0" rowspan="1" colspan="2" >
144 <class>Line</class> 144 <class>Line</class>
145 <property stdset="1"> 145 <property stdset="1">
146 <name>name</name> 146 <name>name</name>
147 <cstring>Line1</cstring> 147 <cstring>Line1</cstring>
148 </property> 148 </property>
149 <property stdset="1"> 149 <property stdset="1">
150 <name>orientation</name> 150 <name>orientation</name>
151 <enum>Horizontal</enum> 151 <enum>Horizontal</enum>
152 </property> 152 </property>
153 </widget> 153 </widget>
154 <widget> 154 <widget row="3" column="0" rowspan="1" colspan="2" >
155 <class>QCheckBox</class> 155 <class>QCheckBox</class>
156 <property stdset="1"> 156 <property stdset="1">
157 <name>name</name> 157 <name>name</name>
158 <cstring>newFoldersel</cstring> 158 <cstring>newFoldersel</cstring>
159 </property> 159 </property>
160 <property stdset="1"> 160 <property stdset="1">
161 <name>text</name> 161 <name>text</name>
162 <string>Create new folder</string> 162 <string>Create new folder</string>
163 </property> 163 </property>
164 </widget> 164 </widget>
165 <widget> 165 <widget row="4" column="0" rowspan="1" colspan="2" >
166 <class>QLineEdit</class> 166 <class>QLineEdit</class>
167 <property stdset="1"> 167 <property stdset="1">
168 <name>name</name> 168 <name>name</name>
169 <cstring>newFolderedit</cstring> 169 <cstring>newFolderedit</cstring>
170 </property> 170 </property>
171 <property stdset="1"> 171 <property stdset="1">
172 <name>enabled</name> 172 <name>enabled</name>
173 <bool>false</bool> 173 <bool>false</bool>
174 </property> 174 </property>
175 </widget> 175 </widget>
176 <widget> 176 <widget row="5" column="0" rowspan="1" colspan="2" >
177 <class>QLabel</class> 177 <class>QLabel</class>
178 <property stdset="1"> 178 <property stdset="1">
179 <name>name</name> 179 <name>name</name>
180 <cstring>newFolderLabel</cstring> 180 <cstring>newFolderLabel</cstring>
181 </property> 181 </property>
182 <property stdset="1"> 182 <property stdset="1">
183 <name>text</name> 183 <name>text</name>
184 <string>Prefix will prepend, no need to enter it!</string> 184 <string>Prefix will prepend, no need to enter it!</string>
185 </property> 185 </property>
186 <property stdset="1"> 186 <property stdset="1">
187 <name>alignment</name> 187 <name>alignment</name>
188 <set>WordBreak|AlignCenter</set> 188 <set>WordBreak|AlignCenter</set>
189 </property> 189 </property>
190 <property> 190 <property>
191 <name>hAlign</name> 191 <name>hAlign</name>
192 </property> 192 </property>
193 <property> 193 <property>
194 <name>wordwrap</name> 194 <name>wordwrap</name>
195 </property> 195 </property>
196 </widget> 196 </widget>
197 <widget> 197 <widget row="6" column="0" rowspan="1" colspan="2" >
198 <class>Line</class> 198 <class>Line</class>
199 <property stdset="1"> 199 <property stdset="1">
200 <name>name</name> 200 <name>name</name>
201 <cstring>Line2</cstring> 201 <cstring>Line2</cstring>
202 </property> 202 </property>
203 <property stdset="1"> 203 <property stdset="1">
204 <name>orientation</name> 204 <name>orientation</name>
205 <enum>Horizontal</enum> 205 <enum>Horizontal</enum>
206 </property> 206 </property>
207 </widget> 207 </widget>
208 <widget> 208 <spacer row="9" column="0" >
209 <class>QCheckBox</class>
210 <property stdset="1">
211 <name>name</name>
212 <cstring>selMove</cstring>
213 </property>
214 <property stdset="1">
215 <name>text</name>
216 <string>Move mail(s)</string>
217 </property>
218 </widget>
219 <spacer>
220 <property> 209 <property>
221 <name>name</name> 210 <name>name</name>
222 <cstring>Spacer2</cstring> 211 <cstring>Spacer2</cstring>
223 </property> 212 </property>
224 <property stdset="1"> 213 <property stdset="1">
225 <name>orientation</name> 214 <name>orientation</name>
226 <enum>Vertical</enum> 215 <enum>Vertical</enum>
227 </property> 216 </property>
228 <property stdset="1"> 217 <property stdset="1">
229 <name>sizeType</name> 218 <name>sizeType</name>
230 <enum>Expanding</enum> 219 <enum>Expanding</enum>
231 </property> 220 </property>
232 <property> 221 <property>
233 <name>sizeHint</name> 222 <name>sizeHint</name>
234 <size> 223 <size>
235 <width>20</width> 224 <width>20</width>
236 <height>20</height> 225 <height>20</height>
237 </size> 226 </size>
238 </property> 227 </property>
239 </spacer> 228 </spacer>
240 </vbox> 229 <widget row="8" column="0" rowspan="1" colspan="2" >
230 <class>QCheckBox</class>
231 <property stdset="1">
232 <name>name</name>
233 <cstring>selMove</cstring>
234 </property>
235 <property stdset="1">
236 <name>text</name>
237 <string>Move mail(s)</string>
238 </property>
239 </widget>
240 <widget row="7" column="0" >
241 <class>QCheckBox</class>
242 <property stdset="1">
243 <name>name</name>
244 <cstring>useSize</cstring>
245 </property>
246 <property stdset="1">
247 <name>text</name>
248 <string>apply only to mails smaller</string>
249 </property>
250 </widget>
251 <widget row="7" column="1" >
252 <class>QSpinBox</class>
253 <property stdset="1">
254 <name>name</name>
255 <cstring>sizeSpinBox</cstring>
256 </property>
257 <property stdset="1">
258 <name>suffix</name>
259 <string> kB</string>
260 </property>
261 <property stdset="1">
262 <name>maxValue</name>
263 <number>8192</number>
264 </property>
265 <property stdset="1">
266 <name>minValue</name>
267 <number>1</number>
268 </property>
269 <property stdset="1">
270 <name>lineStep</name>
271 <number>1</number>
272 </property>
273 <property stdset="1">
274 <name>value</name>
275 <number>5</number>
276 </property>
277 </widget>
278 </grid>
241</widget> 279</widget>
242<connections> 280<connections>
243 <connection> 281 <connection>
244 <sender>selMove</sender> 282 <sender>selMove</sender>
245 <signal>clicked()</signal> 283 <signal>clicked()</signal>
246 <receiver>selectstoreui</receiver> 284 <receiver>selectstoreui</receiver>
247 <slot>slotMoveMail()</slot> 285 <slot>slotMoveMail()</slot>
248 </connection> 286 </connection>
249 <connection> 287 <connection>
250 <sender>newFoldersel</sender> 288 <sender>newFoldersel</sender>
251 <signal>clicked()</signal> 289 <signal>clicked()</signal>
252 <receiver>selectstoreui</receiver> 290 <receiver>selectstoreui</receiver>
253 <slot>slotCreateNewFolder()</slot> 291 <slot>slotCreateNewFolder()</slot>
254 </connection> 292 </connection>
255 <connection> 293 <connection>
256 <sender>accountSelection</sender> 294 <sender>accountSelection</sender>
257 <signal>activated(int)</signal> 295 <signal>activated(int)</signal>
258 <receiver>selectstoreui</receiver> 296 <receiver>selectstoreui</receiver>
259 <slot>slotAccountselected(int)</slot> 297 <slot>slotAccountselected(int)</slot>
260 </connection> 298 </connection>
261 <connection> 299 <connection>
262 <sender>folderSelection</sender> 300 <sender>folderSelection</sender>
263 <signal>activated(int)</signal> 301 <signal>activated(int)</signal>
264 <receiver>selectstoreui</receiver> 302 <receiver>selectstoreui</receiver>
265 <slot>slotFolderSelected(int)</slot> 303 <slot>slotFolderSelected(int)</slot>
266 </connection> 304 </connection>
267 <slot access="protected">slotFolderSelected(int)</slot> 305 <slot access="protected">slotFolderSelected(int)</slot>
268 <slot access="protected">slotAccountselected(int)</slot> 306 <slot access="protected">slotAccountselected(int)</slot>
269 <slot access="protected">slotCreateNewFolder()</slot> 307 <slot access="protected">slotCreateNewFolder()</slot>
270 <slot access="protected">slotMoveMail()</slot> 308 <slot access="protected">slotMoveMail()</slot>
271</connections> 309</connections>
272<tabstops> 310<tabstops>
273 <tabstop>accountSelection</tabstop> 311 <tabstop>accountSelection</tabstop>
274 <tabstop>folderSelection</tabstop> 312 <tabstop>folderSelection</tabstop>
275 <tabstop>newFoldersel</tabstop> 313 <tabstop>newFoldersel</tabstop>
276 <tabstop>newFolderedit</tabstop> 314 <tabstop>newFolderedit</tabstop>
277 <tabstop>selMove</tabstop> 315 <tabstop>selMove</tabstop>
278</tabstops> 316</tabstops>
279</UI> 317</UI>