-rw-r--r-- | noncore/net/mail/accountview.cpp | 60 | ||||
-rw-r--r-- | noncore/net/mail/accountview.h | 16 | ||||
-rw-r--r-- | noncore/net/mail/defines.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 57 | ||||
-rw-r--r-- | noncore/net/mail/pop3wrapper.cpp | 57 |
5 files changed, 153 insertions, 39 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index d725b87..8e21d39 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -1,177 +1,227 @@ | |||
1 | #include "accountview.h" | 1 | #include "accountview.h" |
2 | #include "mailtypes.h" | 2 | #include "mailtypes.h" |
3 | #include "defines.h" | 3 | #include "defines.h" |
4 | 4 | ||
5 | 5 | ||
6 | /** | 6 | /** |
7 | * POP3 Account stuff | 7 | * POP3 Account stuff |
8 | */ | 8 | */ |
9 | 9 | ||
10 | POP3viewItem::POP3viewItem( POP3account *a, QListView *parent ) | 10 | POP3viewItem::POP3viewItem( POP3account *a, QListView *parent ) |
11 | : AccountViewItem( parent ) | 11 | : AccountViewItem( parent ) |
12 | { | 12 | { |
13 | account = a; | 13 | account = a; |
14 | wrapper = AbstractMail::getWrapper( account ); | 14 | wrapper = AbstractMail::getWrapper( account ); |
15 | setPixmap( 0, PIXMAP_POP3FOLDER ); | 15 | setPixmap( 0, PIXMAP_POP3FOLDER ); |
16 | setText( 0, account->getAccountName() ); | 16 | setText( 0, account->getAccountName() ); |
17 | } | 17 | } |
18 | 18 | ||
19 | POP3viewItem::~POP3viewItem() | 19 | POP3viewItem::~POP3viewItem() |
20 | { | 20 | { |
21 | delete wrapper; | 21 | delete wrapper; |
22 | } | 22 | } |
23 | 23 | ||
24 | void POP3viewItem::refresh( QList<RecMail> &target ) | 24 | AbstractMail *POP3viewItem::getWrapper() |
25 | { | 25 | { |
26 | qDebug( "POP3: refresh" ); | 26 | return wrapper; |
27 | wrapper->listMessages("INBOX", target ); | ||
28 | } | 27 | } |
29 | 28 | ||
29 | void POP3viewItem::refresh( QList<RecMail> & ) | ||
30 | { | ||
31 | QList<Folder> *folders = wrapper->listFolders(); | ||
32 | QListViewItem *child = firstChild(); | ||
33 | while ( child ) { | ||
34 | QListViewItem *tmp = child; | ||
35 | child = child->nextSibling(); | ||
36 | delete tmp; | ||
37 | } | ||
38 | Folder *it; | ||
39 | QListViewItem*item = 0; | ||
40 | for ( it = folders->first(); it; it = folders->next() ) { | ||
41 | item = new POP3folderItem( it, this , item ); | ||
42 | item->setSelectable(it->may_select()); | ||
43 | } | ||
44 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
45 | folders->setAutoDelete(false); | ||
46 | delete folders; | ||
47 | } | ||
30 | 48 | ||
31 | RecBody POP3viewItem::fetchBody( const RecMail &mail ) | 49 | RecBody POP3viewItem::fetchBody( const RecMail &mail ) |
32 | { | 50 | { |
33 | qDebug( "POP3 fetchBody" ); | 51 | qDebug( "POP3 fetchBody" ); |
34 | return wrapper->fetchBody( mail ); | 52 | return wrapper->fetchBody( mail ); |
35 | } | 53 | } |
36 | 54 | ||
55 | POP3folderItem::~POP3folderItem() | ||
56 | { | ||
57 | delete folder; | ||
58 | } | ||
59 | |||
60 | POP3folderItem::POP3folderItem( Folder *folderInit, POP3viewItem *parent , QListViewItem*after ) | ||
61 | : AccountViewItem( parent,after ) | ||
62 | { | ||
63 | folder = folderInit; | ||
64 | pop3 = parent; | ||
65 | if (folder->getDisplayName().lower()!="inbox") { | ||
66 | setPixmap( 0, PIXMAP_POP3FOLDER ); | ||
67 | } else { | ||
68 | setPixmap( 0, PIXMAP_INBOXFOLDER); | ||
69 | } | ||
70 | setText( 0, folder->getDisplayName() ); | ||
71 | } | ||
72 | |||
73 | void POP3folderItem::refresh(QList<RecMail>&target) | ||
74 | { | ||
75 | if (folder->may_select()) | ||
76 | pop3->getWrapper()->listMessages( folder->getName(),target ); | ||
77 | } | ||
78 | |||
79 | RecBody POP3folderItem::fetchBody(const RecMail&aMail) | ||
80 | { | ||
81 | return pop3->getWrapper()->fetchBody(aMail); | ||
82 | } | ||
83 | |||
37 | /** | 84 | /** |
38 | * IMAP Account stuff | 85 | * IMAP Account stuff |
39 | */ | 86 | */ |
40 | |||
41 | IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent ) | 87 | IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent ) |
42 | : AccountViewItem( parent ) | 88 | : AccountViewItem( parent ) |
43 | { | 89 | { |
44 | account = a; | 90 | account = a; |
45 | wrapper = AbstractMail::getWrapper( account ); | 91 | wrapper = AbstractMail::getWrapper( account ); |
46 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | 92 | setPixmap( 0, PIXMAP_IMAPFOLDER ); |
47 | setText( 0, account->getAccountName() ); | 93 | setText( 0, account->getAccountName() ); |
48 | setOpen( true ); | 94 | setOpen( true ); |
49 | } | 95 | } |
50 | 96 | ||
51 | IMAPviewItem::~IMAPviewItem() | 97 | IMAPviewItem::~IMAPviewItem() |
52 | { | 98 | { |
53 | delete wrapper; | 99 | delete wrapper; |
54 | } | 100 | } |
55 | 101 | ||
56 | AbstractMail *IMAPviewItem::getWrapper() | 102 | AbstractMail *IMAPviewItem::getWrapper() |
57 | { | 103 | { |
58 | return wrapper; | 104 | return wrapper; |
59 | } | 105 | } |
60 | 106 | ||
61 | void IMAPviewItem::refresh(QList<RecMail>&) | 107 | void IMAPviewItem::refresh(QList<RecMail>&) |
62 | { | 108 | { |
63 | QList<Folder> *folders = wrapper->listFolders(); | 109 | QList<Folder> *folders = wrapper->listFolders(); |
64 | 110 | ||
65 | QListViewItem *child = firstChild(); | 111 | QListViewItem *child = firstChild(); |
66 | while ( child ) { | 112 | while ( child ) { |
67 | QListViewItem *tmp = child; | 113 | QListViewItem *tmp = child; |
68 | child = child->nextSibling(); | 114 | child = child->nextSibling(); |
69 | delete tmp; | 115 | delete tmp; |
70 | } | 116 | } |
71 | 117 | ||
72 | Folder *it; | 118 | Folder *it; |
73 | QListViewItem*item = 0; | 119 | QListViewItem*item = 0; |
74 | for ( it = folders->first(); it; it = folders->next() ) { | 120 | for ( it = folders->first(); it; it = folders->next() ) { |
75 | item = new IMAPfolderItem( it, this , item ); | 121 | item = new IMAPfolderItem( it, this , item ); |
76 | item->setSelectable(it->may_select()); | 122 | item->setSelectable(it->may_select()); |
77 | } | 123 | } |
78 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 124 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
79 | folders->setAutoDelete(false); | 125 | folders->setAutoDelete(false); |
80 | delete folders; | 126 | delete folders; |
81 | } | 127 | } |
82 | 128 | ||
83 | RecBody IMAPviewItem::fetchBody(const RecMail&) | 129 | RecBody IMAPviewItem::fetchBody(const RecMail&) |
84 | { | 130 | { |
85 | return RecBody(); | 131 | return RecBody(); |
86 | } | 132 | } |
87 | 133 | ||
88 | IMAPfolderItem::~IMAPfolderItem() | 134 | IMAPfolderItem::~IMAPfolderItem() |
89 | { | 135 | { |
90 | delete folder; | 136 | delete folder; |
91 | } | 137 | } |
92 | 138 | ||
93 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after ) | 139 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after ) |
94 | : AccountViewItem( parent,after ) | 140 | : AccountViewItem( parent,after ) |
95 | { | 141 | { |
96 | folder = folderInit; | 142 | folder = folderInit; |
97 | imap = parent; | 143 | imap = parent; |
98 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | 144 | if (folder->getDisplayName().lower()!="inbox") { |
145 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | ||
146 | } else { | ||
147 | setPixmap( 0, PIXMAP_INBOXFOLDER); | ||
148 | } | ||
99 | setText( 0, folder->getDisplayName() ); | 149 | setText( 0, folder->getDisplayName() ); |
100 | } | 150 | } |
101 | 151 | ||
102 | void IMAPfolderItem::refresh(QList<RecMail>&target) | 152 | void IMAPfolderItem::refresh(QList<RecMail>&target) |
103 | { | 153 | { |
104 | if (folder->may_select()) | 154 | if (folder->may_select()) |
105 | imap->getWrapper()->listMessages( folder->getName(),target ); | 155 | imap->getWrapper()->listMessages( folder->getName(),target ); |
106 | } | 156 | } |
107 | 157 | ||
108 | RecBody IMAPfolderItem::fetchBody(const RecMail&aMail) | 158 | RecBody IMAPfolderItem::fetchBody(const RecMail&aMail) |
109 | { | 159 | { |
110 | return imap->getWrapper()->fetchBody(aMail); | 160 | return imap->getWrapper()->fetchBody(aMail); |
111 | } | 161 | } |
112 | 162 | ||
113 | /** | 163 | /** |
114 | * Generic stuff | 164 | * Generic stuff |
115 | */ | 165 | */ |
116 | 166 | ||
117 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) | 167 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) |
118 | : QListView( parent, name, flags ) | 168 | : QListView( parent, name, flags ) |
119 | { | 169 | { |
120 | connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), | 170 | connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), |
121 | SLOT( refresh( QListViewItem * ) ) ); | 171 | SLOT( refresh( QListViewItem * ) ) ); |
122 | setSorting(-1); | 172 | setSorting(-1); |
123 | } | 173 | } |
124 | 174 | ||
125 | void AccountView::populate( QList<Account> list ) | 175 | void AccountView::populate( QList<Account> list ) |
126 | { | 176 | { |
127 | clear(); | 177 | clear(); |
128 | 178 | ||
129 | Account *it; | 179 | Account *it; |
130 | for ( it = list.first(); it; it = list.next() ) { | 180 | for ( it = list.first(); it; it = list.next() ) { |
131 | if ( it->getType().compare( "IMAP" ) == 0 ) { | 181 | if ( it->getType().compare( "IMAP" ) == 0 ) { |
132 | IMAPaccount *imap = static_cast<IMAPaccount *>(it); | 182 | IMAPaccount *imap = static_cast<IMAPaccount *>(it); |
133 | qDebug( "added IMAP " + imap->getAccountName() ); | 183 | qDebug( "added IMAP " + imap->getAccountName() ); |
134 | (void) new IMAPviewItem( imap, this ); | 184 | (void) new IMAPviewItem( imap, this ); |
135 | } else if ( it->getType().compare( "POP3" ) == 0 ) { | 185 | } else if ( it->getType().compare( "POP3" ) == 0 ) { |
136 | POP3account *pop3 = static_cast<POP3account *>(it); | 186 | POP3account *pop3 = static_cast<POP3account *>(it); |
137 | qDebug( "added POP3 " + pop3->getAccountName() ); | 187 | qDebug( "added POP3 " + pop3->getAccountName() ); |
138 | (void) new POP3viewItem( pop3, this ); | 188 | (void) new POP3viewItem( pop3, this ); |
139 | } | 189 | } |
140 | } | 190 | } |
141 | } | 191 | } |
142 | 192 | ||
143 | void AccountView::refresh(QListViewItem *item) { | 193 | void AccountView::refresh(QListViewItem *item) { |
144 | 194 | ||
145 | qDebug("AccountView refresh..."); | 195 | qDebug("AccountView refresh..."); |
146 | if ( item ) { | 196 | if ( item ) { |
147 | m_currentItem = item; | 197 | m_currentItem = item; |
148 | QList<RecMail> headerlist; | 198 | QList<RecMail> headerlist; |
149 | headerlist.setAutoDelete(true); | 199 | headerlist.setAutoDelete(true); |
150 | AccountViewItem *view = static_cast<AccountViewItem *>(item); | 200 | AccountViewItem *view = static_cast<AccountViewItem *>(item); |
151 | view->refresh(headerlist); | 201 | view->refresh(headerlist); |
152 | emit refreshMailview(&headerlist); | 202 | emit refreshMailview(&headerlist); |
153 | } | 203 | } |
154 | } | 204 | } |
155 | 205 | ||
156 | void AccountView::refreshCurrent() | 206 | void AccountView::refreshCurrent() |
157 | { | 207 | { |
158 | if ( !m_currentItem ) return; | 208 | if ( !m_currentItem ) return; |
159 | QList<RecMail> headerlist; | 209 | QList<RecMail> headerlist; |
160 | headerlist.setAutoDelete(true); | 210 | headerlist.setAutoDelete(true); |
161 | AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem); | 211 | AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem); |
162 | view->refresh(headerlist); | 212 | view->refresh(headerlist); |
163 | emit refreshMailview(&headerlist); | 213 | emit refreshMailview(&headerlist); |
164 | } | 214 | } |
165 | 215 | ||
166 | void AccountView::refreshAll() | 216 | void AccountView::refreshAll() |
167 | { | 217 | { |
168 | 218 | ||
169 | } | 219 | } |
170 | 220 | ||
171 | RecBody AccountView::fetchBody(const RecMail&aMail) | 221 | RecBody AccountView::fetchBody(const RecMail&aMail) |
172 | { | 222 | { |
173 | QListViewItem*item = selectedItem (); | 223 | QListViewItem*item = selectedItem (); |
174 | if (!item) return RecBody(); | 224 | if (!item) return RecBody(); |
175 | AccountViewItem *view = static_cast<AccountViewItem *>(item); | 225 | AccountViewItem *view = static_cast<AccountViewItem *>(item); |
176 | return view->fetchBody(aMail); | 226 | return view->fetchBody(aMail); |
177 | } | 227 | } |
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h index 04f9b7a..d035af4 100644 --- a/noncore/net/mail/accountview.h +++ b/noncore/net/mail/accountview.h | |||
@@ -1,90 +1,102 @@ | |||
1 | #ifndef ACCOUNTVIEW_H | 1 | #ifndef ACCOUNTVIEW_H |
2 | #define ACCOUNTVIEW_H | 2 | #define ACCOUNTVIEW_H |
3 | 3 | ||
4 | #include <qlistview.h> | 4 | #include <qlistview.h> |
5 | #include <qlist.h> | 5 | #include <qlist.h> |
6 | 6 | ||
7 | #include "settings.h" | 7 | #include "settings.h" |
8 | #include "mailwrapper.h" | 8 | #include "mailwrapper.h" |
9 | #include "abstractmail.h" | 9 | #include "abstractmail.h" |
10 | 10 | ||
11 | class POP3wrapper; | 11 | class POP3wrapper; |
12 | class RecMail; | 12 | class RecMail; |
13 | class RecBody; | 13 | class RecBody; |
14 | 14 | ||
15 | class AccountViewItem : public QListViewItem | 15 | class AccountViewItem : public QListViewItem |
16 | { | 16 | { |
17 | 17 | ||
18 | public: | 18 | public: |
19 | AccountViewItem( QListView *parent ) : QListViewItem( parent ) {} | 19 | AccountViewItem( QListView *parent ) : QListViewItem( parent ) {} |
20 | AccountViewItem( QListViewItem *parent) : QListViewItem( parent) {} | 20 | AccountViewItem( QListViewItem *parent) : QListViewItem( parent) {} |
21 | AccountViewItem( QListViewItem *parent , QListViewItem*after ) : QListViewItem( parent,after ) {} | 21 | AccountViewItem( QListViewItem *parent , QListViewItem*after ) : QListViewItem( parent,after ) {} |
22 | virtual void refresh(QList<RecMail>&)=0; | 22 | virtual void refresh(QList<RecMail>&)=0; |
23 | virtual RecBody fetchBody(const RecMail&)=0; | 23 | virtual RecBody fetchBody(const RecMail&)=0; |
24 | }; | 24 | }; |
25 | 25 | ||
26 | class POP3viewItem : public AccountViewItem | 26 | class POP3viewItem : public AccountViewItem |
27 | { | 27 | { |
28 | 28 | ||
29 | public: | 29 | public: |
30 | POP3viewItem( POP3account *a, QListView *parent ); | 30 | POP3viewItem( POP3account *a, QListView *parent ); |
31 | ~POP3viewItem(); | 31 | ~POP3viewItem(); |
32 | virtual void refresh( QList<RecMail> &target ); | 32 | virtual void refresh( QList<RecMail> &target ); |
33 | virtual RecBody fetchBody( const RecMail &mail ); | 33 | virtual RecBody fetchBody( const RecMail &mail ); |
34 | 34 | AbstractMail *getWrapper(); | |
35 | private: | 35 | private: |
36 | POP3account *account; | 36 | POP3account *account; |
37 | AbstractMail *wrapper; | 37 | AbstractMail *wrapper; |
38 | 38 | ||
39 | }; | 39 | }; |
40 | 40 | ||
41 | class POP3folderItem : public AccountViewItem | ||
42 | { | ||
43 | |||
44 | public: | ||
45 | POP3folderItem( Folder *folder, POP3viewItem *parent , QListViewItem*after ); | ||
46 | ~POP3folderItem(); | ||
47 | virtual void refresh(QList<RecMail>&); | ||
48 | virtual RecBody fetchBody(const RecMail&); | ||
49 | private: | ||
50 | Folder *folder; | ||
51 | POP3viewItem *pop3; | ||
52 | }; | ||
53 | |||
41 | class IMAPviewItem : public AccountViewItem | 54 | class IMAPviewItem : public AccountViewItem |
42 | { | 55 | { |
43 | 56 | ||
44 | public: | 57 | public: |
45 | IMAPviewItem( IMAPaccount *a, QListView *parent ); | 58 | IMAPviewItem( IMAPaccount *a, QListView *parent ); |
46 | ~IMAPviewItem(); | 59 | ~IMAPviewItem(); |
47 | virtual void refresh(QList<RecMail>&); | 60 | virtual void refresh(QList<RecMail>&); |
48 | virtual RecBody fetchBody(const RecMail&); | 61 | virtual RecBody fetchBody(const RecMail&); |
49 | AbstractMail *getWrapper(); | 62 | AbstractMail *getWrapper(); |
50 | private: | 63 | private: |
51 | IMAPaccount *account; | 64 | IMAPaccount *account; |
52 | AbstractMail *wrapper; | 65 | AbstractMail *wrapper; |
53 | }; | 66 | }; |
54 | 67 | ||
55 | class IMAPfolderItem : public AccountViewItem | 68 | class IMAPfolderItem : public AccountViewItem |
56 | { | 69 | { |
57 | 70 | ||
58 | public: | 71 | public: |
59 | IMAPfolderItem( Folder *folder, IMAPviewItem *parent , QListViewItem*after ); | 72 | IMAPfolderItem( Folder *folder, IMAPviewItem *parent , QListViewItem*after ); |
60 | ~IMAPfolderItem(); | 73 | ~IMAPfolderItem(); |
61 | virtual void refresh(QList<RecMail>&); | 74 | virtual void refresh(QList<RecMail>&); |
62 | virtual RecBody fetchBody(const RecMail&); | 75 | virtual RecBody fetchBody(const RecMail&); |
63 | private: | 76 | private: |
64 | Folder *folder; | 77 | Folder *folder; |
65 | IMAPviewItem *imap; | 78 | IMAPviewItem *imap; |
66 | |||
67 | }; | 79 | }; |
68 | 80 | ||
69 | class AccountView : public QListView | 81 | class AccountView : public QListView |
70 | { | 82 | { |
71 | Q_OBJECT | 83 | Q_OBJECT |
72 | 84 | ||
73 | public: | 85 | public: |
74 | AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); | 86 | AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); |
75 | void populate( QList<Account> list ); | 87 | void populate( QList<Account> list ); |
76 | RecBody fetchBody(const RecMail&aMail); | 88 | RecBody fetchBody(const RecMail&aMail); |
77 | 89 | ||
78 | public slots: | 90 | public slots: |
79 | void refreshAll(); | 91 | void refreshAll(); |
80 | void refresh(QListViewItem *item); | 92 | void refresh(QListViewItem *item); |
81 | void refreshCurrent(); | 93 | void refreshCurrent(); |
82 | 94 | ||
83 | signals: | 95 | signals: |
84 | void refreshMailview(QList<RecMail>*); | 96 | void refreshMailview(QList<RecMail>*); |
85 | 97 | ||
86 | private: | 98 | private: |
87 | QListViewItem* m_currentItem; | 99 | QListViewItem* m_currentItem; |
88 | }; | 100 | }; |
89 | 101 | ||
90 | #endif | 102 | #endif |
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h index 679459d..c849f1a 100644 --- a/noncore/net/mail/defines.h +++ b/noncore/net/mail/defines.h | |||
@@ -1,38 +1,40 @@ | |||
1 | #ifndef DEFINE_CONSTANTS_H | 1 | #ifndef DEFINE_CONSTANTS_H |
2 | #define DEFINE_CONSTANTS_H | 2 | #define DEFINE_CONSTANTS_H |
3 | 3 | ||
4 | #include <qpe/resource.h> | 4 | #include <qpe/resource.h> |
5 | 5 | ||
6 | #define USER_AGENT "OpieMail v0.0.1-alpha" | 6 | #define USER_AGENT "OpieMail v0.0.1-alpha" |
7 | 7 | ||
8 | #define PIC_COMPOSEMAIL "opiemail/composemail" | 8 | #define PIC_COMPOSEMAIL "opiemail/composemail" |
9 | #define PIC_SENDQUEUED "opiemail/sendqueued" | 9 | #define PIC_SENDQUEUED "opiemail/sendqueued" |
10 | #define PIC_SHOWFOLDERS "opiemail/showfolders" | 10 | #define PIC_SHOWFOLDERS "opiemail/showfolders" |
11 | #define PIC_SEARCHMAILS "opiemail/searchmails" | 11 | #define PIC_SEARCHMAILS "opiemail/searchmails" |
12 | #define PIC_EDITSETTINGS "opiemail/editsettings" | 12 | #define PIC_EDITSETTINGS "opiemail/editsettings" |
13 | #define PIC_EDITACCOUNTS "opiemail/editaccounts" | 13 | #define PIC_EDITACCOUNTS "opiemail/editaccounts" |
14 | #define PIC_SYNC "opiemail/sync" | 14 | #define PIC_SYNC "opiemail/sync" |
15 | #define PIC_IMAPFOLDER "opiemail/imapfolder" | 15 | #define PIC_IMAPFOLDER "opiemail/imapfolder" |
16 | #define PIC_POP3FOLDER "opiemail/pop3folder" | 16 | #define PIC_POP3FOLDER "opiemail/pop3folder" |
17 | #define PIC_INBOXFOLDER "opiemail/inbox" | ||
17 | 18 | ||
18 | #define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) | 19 | #define ICON_COMPOSEMAIL QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) |
19 | #define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) | 20 | #define ICON_SENDQUEUED QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) |
20 | #define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) | 21 | #define ICON_SHOWFOLDERS QIconSet( Resource::loadPixmap( PIC_SHOWFOLDERS ) ) |
21 | #define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) | 22 | #define ICON_SEARCHMAILS QIconSet( Resource::loadPixmap( PIC_SEARCHMAILS ) ) |
22 | #define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) | 23 | #define ICON_EDITSETTINGS QIconSet( Resource::loadPixmap( PIC_EDITSETTINGS ) ) |
23 | #define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) | 24 | #define ICON_EDITACCOUNTS QIconSet( Resource::loadPixmap( PIC_EDITACCOUNTS ) ) |
24 | #define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) ) | 25 | #define ICON_SYNC QIconSet( Resource::loadPixmap( PIC_SYNC ) ) |
25 | 26 | ||
26 | #define PIXMAP_IMAPFOLDER QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) ) | 27 | #define PIXMAP_IMAPFOLDER QPixmap( Resource::loadPixmap( PIC_IMAPFOLDER ) ) |
27 | #define PIXMAP_POP3FOLDER QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) ) | 28 | #define PIXMAP_POP3FOLDER QPixmap( Resource::loadPixmap( PIC_POP3FOLDER ) ) |
29 | #define PIXMAP_INBOXFOLDER QPixmap( Resource::loadPixmap( PIC_INBOXFOLDER) ) | ||
28 | 30 | ||
29 | #define IMAP_PORT "143" | 31 | #define IMAP_PORT "143" |
30 | #define IMAP_SSL_PORT "993" | 32 | #define IMAP_SSL_PORT "993" |
31 | #define SMTP_PORT "25" | 33 | #define SMTP_PORT "25" |
32 | #define SMTP_SSL_PORT "465" | 34 | #define SMTP_SSL_PORT "465" |
33 | #define POP3_PORT "110" | 35 | #define POP3_PORT "110" |
34 | #define POP3_SSL_PORT "995" | 36 | #define POP3_SSL_PORT "995" |
35 | #define NNTP_PORT "119" | 37 | #define NNTP_PORT "119" |
36 | #define NNTP_SSL_PORT "563" | 38 | #define NNTP_SSL_PORT "563" |
37 | 39 | ||
38 | #endif | 40 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 46c854b..2411399 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -1,220 +1,245 @@ | |||
1 | 1 | #include <stdlib.h> | |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include <libetpan/mailpop3.h> | 4 | #include <libetpan/mailpop3.h> |
5 | 5 | ||
6 | POP3wrapper::POP3wrapper( POP3account *a ) | 6 | POP3wrapper::POP3wrapper( POP3account *a ) |
7 | { | 7 | { |
8 | account = a; | 8 | account = a; |
9 | m_pop3 = NULL; | 9 | m_pop3 = NULL; |
10 | } | 10 | } |
11 | 11 | ||
12 | POP3wrapper::~POP3wrapper() | 12 | POP3wrapper::~POP3wrapper() |
13 | { | 13 | { |
14 | logout(); | 14 | logout(); |
15 | } | 15 | } |
16 | 16 | ||
17 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) | 17 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) |
18 | { | 18 | { |
19 | qDebug( "POP3: %i of %i", current, maximum ); | 19 | qDebug( "POP3: %i of %i", current, maximum ); |
20 | } | 20 | } |
21 | 21 | ||
22 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) | 22 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) |
23 | { | 23 | { |
24 | int err = MAILPOP3_NO_ERROR; | 24 | int err = MAILPOP3_NO_ERROR; |
25 | char *message; | 25 | char *message; |
26 | size_t length; | 26 | size_t length; |
27 | 27 | ||
28 | login(); | 28 | login(); |
29 | if ( !m_pop3 ) return RecBody(); | 29 | if ( !m_pop3 ) return RecBody(); |
30 | 30 | ||
31 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); | 31 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); |
32 | if ( err != MAILPOP3_NO_ERROR ) { | 32 | if ( err != MAILPOP3_NO_ERROR ) { |
33 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); | 33 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); |
34 | logout(); | 34 | logout(); |
35 | return RecBody(); | 35 | return RecBody(); |
36 | } | 36 | } |
37 | 37 | ||
38 | logout(); | 38 | logout(); |
39 | 39 | ||
40 | return parseBody( message ); | 40 | return parseBody( message ); |
41 | } | 41 | } |
42 | 42 | ||
43 | RecBody POP3wrapper::parseBody( const char *message ) | 43 | RecBody POP3wrapper::parseBody( const char *message ) |
44 | { | 44 | { |
45 | int err = MAILIMF_NO_ERROR; | 45 | int err = MAILIMF_NO_ERROR; |
46 | size_t curTok; | 46 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
47 | mailimf_message *result; | 47 | size_t curTok = 0; |
48 | mailimf_message *result = 0; | ||
48 | RecBody body; | 49 | RecBody body; |
49 | 50 | ||
50 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); | 51 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); |
51 | if ( err != MAILIMF_NO_ERROR ) return body; | 52 | if ( err != MAILIMF_NO_ERROR ) { |
53 | if (result) mailimf_message_free(result); | ||
54 | return body; | ||
55 | } | ||
52 | 56 | ||
53 | if ( result && result->msg_body && result->msg_body->bd_text ) { | 57 | if ( result && result->msg_body && result->msg_body->bd_text ) { |
54 | qDebug( "POP3: bodytext found" ); | 58 | qDebug( "POP3: bodytext found" ); |
55 | // TODO: why does this line segfault???? gdb says segfault in strlen(), maybe a bug in libetpan. | 59 | // when curTok isn't set to 0 this line will fault! 'cause upper line faults! |
56 | body.setBodytext( QString( result->msg_body->bd_text ) ); | 60 | body.setBodytext( QString( result->msg_body->bd_text ) ); |
57 | } | 61 | } |
58 | 62 | if (result) mailimf_message_free(result); | |
59 | return body; | 63 | return body; |
60 | } | 64 | } |
61 | 65 | ||
62 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | 66 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) |
63 | { | 67 | { |
64 | int err = MAILPOP3_NO_ERROR; | 68 | int err = MAILPOP3_NO_ERROR; |
65 | char *header; | 69 | char * header = 0; |
66 | size_t length; | 70 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
67 | carray *messages; | 71 | size_t length = 0; |
72 | carray * messages = 0; | ||
68 | 73 | ||
69 | login(); | 74 | login(); |
70 | if (!m_pop3) return; | 75 | if (!m_pop3) return; |
71 | mailpop3_list( m_pop3, &messages ); | 76 | mailpop3_list( m_pop3, &messages ); |
72 | 77 | ||
73 | for ( int i = carray_count( messages ); i > 0; i-- ) { | 78 | //for ( int i = carray_count( messages ); i > 0; i-- ) { |
74 | mailpop3_msg_info *info = (mailpop3_msg_info *) carray_get( messages, i - 1 ); | 79 | for (unsigned int i = 0; i < carray_count(messages);++i) { |
75 | 80 | mailpop3_msg_info *info; | |
81 | int r = mailpop3_get_msg_info(m_pop3,i+1,&info); | ||
76 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); | 82 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); |
77 | if ( err != MAILPOP3_NO_ERROR ) { | 83 | if ( err != MAILPOP3_NO_ERROR ) { |
78 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); | 84 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); |
85 | free(header); | ||
79 | logout(); | 86 | logout(); |
80 | return; | 87 | return; |
81 | } | 88 | } |
82 | RecMail *mail = parseHeader( header ); | 89 | RecMail *mail = parseHeader( header ); |
83 | mail->setNumber( info->msg_index ); | 90 | mail->setNumber( info->msg_index ); |
84 | mail->setWrapper(this); | 91 | mail->setWrapper(this); |
85 | target.append( mail ); | 92 | target.append( mail ); |
93 | free(header); | ||
86 | } | 94 | } |
87 | |||
88 | logout(); | 95 | logout(); |
89 | } | 96 | } |
90 | 97 | ||
91 | RecMail *POP3wrapper::parseHeader( const char *header ) | 98 | RecMail *POP3wrapper::parseHeader( const char *header ) |
92 | { | 99 | { |
93 | int err = MAILIMF_NO_ERROR; | 100 | int err = MAILIMF_NO_ERROR; |
94 | size_t curTok; | 101 | size_t curTok = 0; |
95 | RecMail *mail = new RecMail(); | 102 | RecMail *mail = new RecMail(); |
96 | mailimf_fields *fields; | 103 | mailimf_fields *fields; |
97 | 104 | mailimf_references * refs; | |
105 | mailimf_keywords*keys; | ||
106 | |||
98 | err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); | 107 | err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); |
99 | for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) { | 108 | for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) { |
100 | mailimf_field *field = (mailimf_field *) current->data; | 109 | mailimf_field *field = (mailimf_field *) current->data; |
101 | switch ( field->fld_type ) { | 110 | switch ( field->fld_type ) { |
102 | case MAILIMF_FIELD_FROM: | 111 | case MAILIMF_FIELD_FROM: |
103 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); | 112 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); |
104 | break; | 113 | break; |
105 | case MAILIMF_FIELD_TO: | 114 | case MAILIMF_FIELD_TO: |
106 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); | 115 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); |
107 | break; | 116 | break; |
108 | case MAILIMF_FIELD_CC: | 117 | case MAILIMF_FIELD_CC: |
109 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); | 118 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); |
110 | break; | 119 | break; |
111 | case MAILIMF_FIELD_BCC: | 120 | case MAILIMF_FIELD_BCC: |
112 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); | 121 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); |
113 | break; | 122 | break; |
114 | case MAILIMF_FIELD_SUBJECT: | 123 | case MAILIMF_FIELD_SUBJECT: |
115 | mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) ); | 124 | mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) ); |
116 | break; | 125 | break; |
117 | case MAILIMF_FIELD_ORIG_DATE: | 126 | case MAILIMF_FIELD_ORIG_DATE: |
118 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); | 127 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); |
119 | break; | 128 | break; |
129 | case MAILIMF_FIELD_MESSAGE_ID: | ||
130 | mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); | ||
131 | break; | ||
132 | case MAILIMF_FIELD_REFERENCES: | ||
133 | refs = field->fld_data.fld_references; | ||
134 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { | ||
135 | char * text = (char*)refs->mid_list->first->data; | ||
136 | mail->setReplyto(QString(text)); | ||
137 | } | ||
138 | break; | ||
139 | case MAILIMF_FIELD_KEYWORDS: | ||
140 | keys = field->fld_data.fld_keywords; | ||
141 | for (clistcell*cur = clist_begin(keys->kw_list);cur!=0;cur=clist_next(cur)) { | ||
142 | qDebug("Keyword: %s",(char*)cur->data); | ||
143 | } | ||
144 | break; | ||
120 | default: | 145 | default: |
121 | break; | 146 | break; |
122 | } | 147 | } |
123 | } | 148 | } |
124 | 149 | if (fields) mailimf_fields_free(fields); | |
125 | return mail; | 150 | return mail; |
126 | } | 151 | } |
127 | 152 | ||
128 | QString POP3wrapper::parseDateTime( mailimf_date_time *date ) | 153 | QString POP3wrapper::parseDateTime( mailimf_date_time *date ) |
129 | { | 154 | { |
130 | char tmp[23]; | 155 | char tmp[23]; |
131 | 156 | ||
132 | snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", | 157 | snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", |
133 | date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); | 158 | date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); |
134 | 159 | ||
135 | return QString( tmp ); | 160 | return QString( tmp ); |
136 | } | 161 | } |
137 | 162 | ||
138 | QString POP3wrapper::parseAddressList( mailimf_address_list *list ) | 163 | QString POP3wrapper::parseAddressList( mailimf_address_list *list ) |
139 | { | 164 | { |
140 | QString result( "" ); | 165 | QString result( "" ); |
141 | 166 | ||
142 | bool first = true; | 167 | bool first = true; |
143 | for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) { | 168 | for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) { |
144 | mailimf_address *addr = (mailimf_address *) current->data; | 169 | mailimf_address *addr = (mailimf_address *) current->data; |
145 | 170 | ||
146 | if ( !first ) { | 171 | if ( !first ) { |
147 | result.append( "," ); | 172 | result.append( "," ); |
148 | } else { | 173 | } else { |
149 | first = false; | 174 | first = false; |
150 | } | 175 | } |
151 | 176 | ||
152 | switch ( addr->ad_type ) { | 177 | switch ( addr->ad_type ) { |
153 | case MAILIMF_ADDRESS_MAILBOX: | 178 | case MAILIMF_ADDRESS_MAILBOX: |
154 | result.append( parseMailbox( addr->ad_data.ad_mailbox ) ); | 179 | result.append( parseMailbox( addr->ad_data.ad_mailbox ) ); |
155 | break; | 180 | break; |
156 | case MAILIMF_ADDRESS_GROUP: | 181 | case MAILIMF_ADDRESS_GROUP: |
157 | result.append( parseGroup( addr->ad_data.ad_group ) ); | 182 | result.append( parseGroup( addr->ad_data.ad_group ) ); |
158 | break; | 183 | break; |
159 | default: | 184 | default: |
160 | qDebug( "POP3: unkown mailimf address type" ); | 185 | qDebug( "POP3: unkown mailimf address type" ); |
161 | break; | 186 | break; |
162 | } | 187 | } |
163 | } | 188 | } |
164 | 189 | ||
165 | return result; | 190 | return result; |
166 | } | 191 | } |
167 | 192 | ||
168 | QString POP3wrapper::parseGroup( mailimf_group *group ) | 193 | QString POP3wrapper::parseGroup( mailimf_group *group ) |
169 | { | 194 | { |
170 | QString result( "" ); | 195 | QString result( "" ); |
171 | 196 | ||
172 | result.append( group->grp_display_name ); | 197 | result.append( group->grp_display_name ); |
173 | result.append( ": " ); | 198 | result.append( ": " ); |
174 | 199 | ||
175 | if ( group->grp_mb_list != NULL ) { | 200 | if ( group->grp_mb_list != NULL ) { |
176 | result.append( parseMailboxList( group->grp_mb_list ) ); | 201 | result.append( parseMailboxList( group->grp_mb_list ) ); |
177 | } | 202 | } |
178 | 203 | ||
179 | result.append( ";" ); | 204 | result.append( ";" ); |
180 | 205 | ||
181 | return result; | 206 | return result; |
182 | } | 207 | } |
183 | 208 | ||
184 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) | 209 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) |
185 | { | 210 | { |
186 | QString result( "" ); | 211 | QString result( "" ); |
187 | 212 | ||
188 | if ( box->mb_display_name == NULL ) { | 213 | if ( box->mb_display_name == NULL ) { |
189 | result.append( box->mb_addr_spec ); | 214 | result.append( box->mb_addr_spec ); |
190 | } else { | 215 | } else { |
191 | result.append( box->mb_display_name ); | 216 | result.append( box->mb_display_name ); |
192 | result.append( " <" ); | 217 | result.append( " <" ); |
193 | result.append( box->mb_addr_spec ); | 218 | result.append( box->mb_addr_spec ); |
194 | result.append( ">" ); | 219 | result.append( ">" ); |
195 | } | 220 | } |
196 | 221 | ||
197 | return result; | 222 | return result; |
198 | } | 223 | } |
199 | 224 | ||
200 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) | 225 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) |
201 | { | 226 | { |
202 | QString result( "" ); | 227 | QString result( "" ); |
203 | 228 | ||
204 | bool first = true; | 229 | bool first = true; |
205 | for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) { | 230 | for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) { |
206 | mailimf_mailbox *box = (mailimf_mailbox *) current->data; | 231 | mailimf_mailbox *box = (mailimf_mailbox *) current->data; |
207 | 232 | ||
208 | if ( !first ) { | 233 | if ( !first ) { |
209 | result.append( "," ); | 234 | result.append( "," ); |
210 | } else { | 235 | } else { |
211 | first = false; | 236 | first = false; |
212 | } | 237 | } |
213 | 238 | ||
214 | result.append( parseMailbox( box ) ); | 239 | result.append( parseMailbox( box ) ); |
215 | } | 240 | } |
216 | 241 | ||
217 | return result; | 242 | return result; |
218 | } | 243 | } |
219 | 244 | ||
220 | void POP3wrapper::login() | 245 | void POP3wrapper::login() |
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp index 46c854b..2411399 100644 --- a/noncore/net/mail/pop3wrapper.cpp +++ b/noncore/net/mail/pop3wrapper.cpp | |||
@@ -1,220 +1,245 @@ | |||
1 | 1 | #include <stdlib.h> | |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include <libetpan/mailpop3.h> | 4 | #include <libetpan/mailpop3.h> |
5 | 5 | ||
6 | POP3wrapper::POP3wrapper( POP3account *a ) | 6 | POP3wrapper::POP3wrapper( POP3account *a ) |
7 | { | 7 | { |
8 | account = a; | 8 | account = a; |
9 | m_pop3 = NULL; | 9 | m_pop3 = NULL; |
10 | } | 10 | } |
11 | 11 | ||
12 | POP3wrapper::~POP3wrapper() | 12 | POP3wrapper::~POP3wrapper() |
13 | { | 13 | { |
14 | logout(); | 14 | logout(); |
15 | } | 15 | } |
16 | 16 | ||
17 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) | 17 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) |
18 | { | 18 | { |
19 | qDebug( "POP3: %i of %i", current, maximum ); | 19 | qDebug( "POP3: %i of %i", current, maximum ); |
20 | } | 20 | } |
21 | 21 | ||
22 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) | 22 | RecBody POP3wrapper::fetchBody( const RecMail &mail ) |
23 | { | 23 | { |
24 | int err = MAILPOP3_NO_ERROR; | 24 | int err = MAILPOP3_NO_ERROR; |
25 | char *message; | 25 | char *message; |
26 | size_t length; | 26 | size_t length; |
27 | 27 | ||
28 | login(); | 28 | login(); |
29 | if ( !m_pop3 ) return RecBody(); | 29 | if ( !m_pop3 ) return RecBody(); |
30 | 30 | ||
31 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); | 31 | err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length ); |
32 | if ( err != MAILPOP3_NO_ERROR ) { | 32 | if ( err != MAILPOP3_NO_ERROR ) { |
33 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); | 33 | qDebug( "POP3: error retrieving body with index %i", mail.getNumber() ); |
34 | logout(); | 34 | logout(); |
35 | return RecBody(); | 35 | return RecBody(); |
36 | } | 36 | } |
37 | 37 | ||
38 | logout(); | 38 | logout(); |
39 | 39 | ||
40 | return parseBody( message ); | 40 | return parseBody( message ); |
41 | } | 41 | } |
42 | 42 | ||
43 | RecBody POP3wrapper::parseBody( const char *message ) | 43 | RecBody POP3wrapper::parseBody( const char *message ) |
44 | { | 44 | { |
45 | int err = MAILIMF_NO_ERROR; | 45 | int err = MAILIMF_NO_ERROR; |
46 | size_t curTok; | 46 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
47 | mailimf_message *result; | 47 | size_t curTok = 0; |
48 | mailimf_message *result = 0; | ||
48 | RecBody body; | 49 | RecBody body; |
49 | 50 | ||
50 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); | 51 | err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result ); |
51 | if ( err != MAILIMF_NO_ERROR ) return body; | 52 | if ( err != MAILIMF_NO_ERROR ) { |
53 | if (result) mailimf_message_free(result); | ||
54 | return body; | ||
55 | } | ||
52 | 56 | ||
53 | if ( result && result->msg_body && result->msg_body->bd_text ) { | 57 | if ( result && result->msg_body && result->msg_body->bd_text ) { |
54 | qDebug( "POP3: bodytext found" ); | 58 | qDebug( "POP3: bodytext found" ); |
55 | // TODO: why does this line segfault???? gdb says segfault in strlen(), maybe a bug in libetpan. | 59 | // when curTok isn't set to 0 this line will fault! 'cause upper line faults! |
56 | body.setBodytext( QString( result->msg_body->bd_text ) ); | 60 | body.setBodytext( QString( result->msg_body->bd_text ) ); |
57 | } | 61 | } |
58 | 62 | if (result) mailimf_message_free(result); | |
59 | return body; | 63 | return body; |
60 | } | 64 | } |
61 | 65 | ||
62 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) | 66 | void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) |
63 | { | 67 | { |
64 | int err = MAILPOP3_NO_ERROR; | 68 | int err = MAILPOP3_NO_ERROR; |
65 | char *header; | 69 | char * header = 0; |
66 | size_t length; | 70 | /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */ |
67 | carray *messages; | 71 | size_t length = 0; |
72 | carray * messages = 0; | ||
68 | 73 | ||
69 | login(); | 74 | login(); |
70 | if (!m_pop3) return; | 75 | if (!m_pop3) return; |
71 | mailpop3_list( m_pop3, &messages ); | 76 | mailpop3_list( m_pop3, &messages ); |
72 | 77 | ||
73 | for ( int i = carray_count( messages ); i > 0; i-- ) { | 78 | //for ( int i = carray_count( messages ); i > 0; i-- ) { |
74 | mailpop3_msg_info *info = (mailpop3_msg_info *) carray_get( messages, i - 1 ); | 79 | for (unsigned int i = 0; i < carray_count(messages);++i) { |
75 | 80 | mailpop3_msg_info *info; | |
81 | int r = mailpop3_get_msg_info(m_pop3,i+1,&info); | ||
76 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); | 82 | err = mailpop3_header( m_pop3, info->msg_index, &header, &length ); |
77 | if ( err != MAILPOP3_NO_ERROR ) { | 83 | if ( err != MAILPOP3_NO_ERROR ) { |
78 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); | 84 | qDebug( "POP3: error retrieving header msgid: %i", info->msg_index ); |
85 | free(header); | ||
79 | logout(); | 86 | logout(); |
80 | return; | 87 | return; |
81 | } | 88 | } |
82 | RecMail *mail = parseHeader( header ); | 89 | RecMail *mail = parseHeader( header ); |
83 | mail->setNumber( info->msg_index ); | 90 | mail->setNumber( info->msg_index ); |
84 | mail->setWrapper(this); | 91 | mail->setWrapper(this); |
85 | target.append( mail ); | 92 | target.append( mail ); |
93 | free(header); | ||
86 | } | 94 | } |
87 | |||
88 | logout(); | 95 | logout(); |
89 | } | 96 | } |
90 | 97 | ||
91 | RecMail *POP3wrapper::parseHeader( const char *header ) | 98 | RecMail *POP3wrapper::parseHeader( const char *header ) |
92 | { | 99 | { |
93 | int err = MAILIMF_NO_ERROR; | 100 | int err = MAILIMF_NO_ERROR; |
94 | size_t curTok; | 101 | size_t curTok = 0; |
95 | RecMail *mail = new RecMail(); | 102 | RecMail *mail = new RecMail(); |
96 | mailimf_fields *fields; | 103 | mailimf_fields *fields; |
97 | 104 | mailimf_references * refs; | |
105 | mailimf_keywords*keys; | ||
106 | |||
98 | err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); | 107 | err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields ); |
99 | for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) { | 108 | for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) { |
100 | mailimf_field *field = (mailimf_field *) current->data; | 109 | mailimf_field *field = (mailimf_field *) current->data; |
101 | switch ( field->fld_type ) { | 110 | switch ( field->fld_type ) { |
102 | case MAILIMF_FIELD_FROM: | 111 | case MAILIMF_FIELD_FROM: |
103 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); | 112 | mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) ); |
104 | break; | 113 | break; |
105 | case MAILIMF_FIELD_TO: | 114 | case MAILIMF_FIELD_TO: |
106 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); | 115 | mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) ); |
107 | break; | 116 | break; |
108 | case MAILIMF_FIELD_CC: | 117 | case MAILIMF_FIELD_CC: |
109 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); | 118 | mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) ); |
110 | break; | 119 | break; |
111 | case MAILIMF_FIELD_BCC: | 120 | case MAILIMF_FIELD_BCC: |
112 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); | 121 | mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) ); |
113 | break; | 122 | break; |
114 | case MAILIMF_FIELD_SUBJECT: | 123 | case MAILIMF_FIELD_SUBJECT: |
115 | mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) ); | 124 | mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) ); |
116 | break; | 125 | break; |
117 | case MAILIMF_FIELD_ORIG_DATE: | 126 | case MAILIMF_FIELD_ORIG_DATE: |
118 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); | 127 | mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) ); |
119 | break; | 128 | break; |
129 | case MAILIMF_FIELD_MESSAGE_ID: | ||
130 | mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value)); | ||
131 | break; | ||
132 | case MAILIMF_FIELD_REFERENCES: | ||
133 | refs = field->fld_data.fld_references; | ||
134 | if (refs && refs->mid_list && clist_count(refs->mid_list)) { | ||
135 | char * text = (char*)refs->mid_list->first->data; | ||
136 | mail->setReplyto(QString(text)); | ||
137 | } | ||
138 | break; | ||
139 | case MAILIMF_FIELD_KEYWORDS: | ||
140 | keys = field->fld_data.fld_keywords; | ||
141 | for (clistcell*cur = clist_begin(keys->kw_list);cur!=0;cur=clist_next(cur)) { | ||
142 | qDebug("Keyword: %s",(char*)cur->data); | ||
143 | } | ||
144 | break; | ||
120 | default: | 145 | default: |
121 | break; | 146 | break; |
122 | } | 147 | } |
123 | } | 148 | } |
124 | 149 | if (fields) mailimf_fields_free(fields); | |
125 | return mail; | 150 | return mail; |
126 | } | 151 | } |
127 | 152 | ||
128 | QString POP3wrapper::parseDateTime( mailimf_date_time *date ) | 153 | QString POP3wrapper::parseDateTime( mailimf_date_time *date ) |
129 | { | 154 | { |
130 | char tmp[23]; | 155 | char tmp[23]; |
131 | 156 | ||
132 | snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", | 157 | snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", |
133 | date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); | 158 | date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); |
134 | 159 | ||
135 | return QString( tmp ); | 160 | return QString( tmp ); |
136 | } | 161 | } |
137 | 162 | ||
138 | QString POP3wrapper::parseAddressList( mailimf_address_list *list ) | 163 | QString POP3wrapper::parseAddressList( mailimf_address_list *list ) |
139 | { | 164 | { |
140 | QString result( "" ); | 165 | QString result( "" ); |
141 | 166 | ||
142 | bool first = true; | 167 | bool first = true; |
143 | for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) { | 168 | for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) { |
144 | mailimf_address *addr = (mailimf_address *) current->data; | 169 | mailimf_address *addr = (mailimf_address *) current->data; |
145 | 170 | ||
146 | if ( !first ) { | 171 | if ( !first ) { |
147 | result.append( "," ); | 172 | result.append( "," ); |
148 | } else { | 173 | } else { |
149 | first = false; | 174 | first = false; |
150 | } | 175 | } |
151 | 176 | ||
152 | switch ( addr->ad_type ) { | 177 | switch ( addr->ad_type ) { |
153 | case MAILIMF_ADDRESS_MAILBOX: | 178 | case MAILIMF_ADDRESS_MAILBOX: |
154 | result.append( parseMailbox( addr->ad_data.ad_mailbox ) ); | 179 | result.append( parseMailbox( addr->ad_data.ad_mailbox ) ); |
155 | break; | 180 | break; |
156 | case MAILIMF_ADDRESS_GROUP: | 181 | case MAILIMF_ADDRESS_GROUP: |
157 | result.append( parseGroup( addr->ad_data.ad_group ) ); | 182 | result.append( parseGroup( addr->ad_data.ad_group ) ); |
158 | break; | 183 | break; |
159 | default: | 184 | default: |
160 | qDebug( "POP3: unkown mailimf address type" ); | 185 | qDebug( "POP3: unkown mailimf address type" ); |
161 | break; | 186 | break; |
162 | } | 187 | } |
163 | } | 188 | } |
164 | 189 | ||
165 | return result; | 190 | return result; |
166 | } | 191 | } |
167 | 192 | ||
168 | QString POP3wrapper::parseGroup( mailimf_group *group ) | 193 | QString POP3wrapper::parseGroup( mailimf_group *group ) |
169 | { | 194 | { |
170 | QString result( "" ); | 195 | QString result( "" ); |
171 | 196 | ||
172 | result.append( group->grp_display_name ); | 197 | result.append( group->grp_display_name ); |
173 | result.append( ": " ); | 198 | result.append( ": " ); |
174 | 199 | ||
175 | if ( group->grp_mb_list != NULL ) { | 200 | if ( group->grp_mb_list != NULL ) { |
176 | result.append( parseMailboxList( group->grp_mb_list ) ); | 201 | result.append( parseMailboxList( group->grp_mb_list ) ); |
177 | } | 202 | } |
178 | 203 | ||
179 | result.append( ";" ); | 204 | result.append( ";" ); |
180 | 205 | ||
181 | return result; | 206 | return result; |
182 | } | 207 | } |
183 | 208 | ||
184 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) | 209 | QString POP3wrapper::parseMailbox( mailimf_mailbox *box ) |
185 | { | 210 | { |
186 | QString result( "" ); | 211 | QString result( "" ); |
187 | 212 | ||
188 | if ( box->mb_display_name == NULL ) { | 213 | if ( box->mb_display_name == NULL ) { |
189 | result.append( box->mb_addr_spec ); | 214 | result.append( box->mb_addr_spec ); |
190 | } else { | 215 | } else { |
191 | result.append( box->mb_display_name ); | 216 | result.append( box->mb_display_name ); |
192 | result.append( " <" ); | 217 | result.append( " <" ); |
193 | result.append( box->mb_addr_spec ); | 218 | result.append( box->mb_addr_spec ); |
194 | result.append( ">" ); | 219 | result.append( ">" ); |
195 | } | 220 | } |
196 | 221 | ||
197 | return result; | 222 | return result; |
198 | } | 223 | } |
199 | 224 | ||
200 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) | 225 | QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list ) |
201 | { | 226 | { |
202 | QString result( "" ); | 227 | QString result( "" ); |
203 | 228 | ||
204 | bool first = true; | 229 | bool first = true; |
205 | for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) { | 230 | for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) { |
206 | mailimf_mailbox *box = (mailimf_mailbox *) current->data; | 231 | mailimf_mailbox *box = (mailimf_mailbox *) current->data; |
207 | 232 | ||
208 | if ( !first ) { | 233 | if ( !first ) { |
209 | result.append( "," ); | 234 | result.append( "," ); |
210 | } else { | 235 | } else { |
211 | first = false; | 236 | first = false; |
212 | } | 237 | } |
213 | 238 | ||
214 | result.append( parseMailbox( box ) ); | 239 | result.append( parseMailbox( box ) ); |
215 | } | 240 | } |
216 | 241 | ||
217 | return result; | 242 | return result; |
218 | } | 243 | } |
219 | 244 | ||
220 | void POP3wrapper::login() | 245 | void POP3wrapper::login() |