summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/editaccounts.cpp21
-rw-r--r--noncore/net/mail/editaccounts.h2
-rw-r--r--noncore/net/mail/imapconfigui.ui159
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp36
-rw-r--r--noncore/net/mail/libmailwrapper/settings.cpp2
5 files changed, 129 insertions, 91 deletions
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 9fc97e8..1cb202e 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -266,13 +266,22 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
266 266
267 fillValues(); 267 fillValues();
268 268
269 connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) ); 269 connect( ComboBox1, SIGNAL( activated( int ) ), SLOT( slotConnectionToggle( int ) ) );
270 ComboBox1->insertItem( "Only if available", 0 );
271 ComboBox1->insertItem( "Always, Negotiated", 1 );
272 ComboBox1->insertItem( "Connect on secure port", 2 );
273 ComboBox1->insertItem( "Run command instead", 3 );
274 CommandEdit->hide();
275 ComboBox1->setCurrentItem( data->ConnectionType() );
270} 276}
271 277
272void IMAPconfig::slotSSL( bool enabled ) 278void IMAPconfig::slotConnectionToggle( int index )
273{ 279{
274 if ( enabled ) { 280 if ( index == 2 ) {
275 portLine->setText( IMAP_SSL_PORT ); 281 portLine->setText( IMAP_SSL_PORT );
282 } else if ( index == 3 ) {
283 portLine->setText( IMAP_PORT );
284 CommandEdit->show();
276 } else { 285 } else {
277 portLine->setText( IMAP_PORT ); 286 portLine->setText( IMAP_PORT );
278 } 287 }
@@ -283,7 +292,7 @@ void IMAPconfig::fillValues()
283 accountLine->setText( data->getAccountName() ); 292 accountLine->setText( data->getAccountName() );
284 serverLine->setText( data->getServer() ); 293 serverLine->setText( data->getServer() );
285 portLine->setText( data->getPort() ); 294 portLine->setText( data->getPort() );
286 sslBox->setChecked( data->getSSL() ); 295 ComboBox1->setCurrentItem( data->ConnectionType() );
287 userLine->setText( data->getUser() ); 296 userLine->setText( data->getUser() );
288 passLine->setText( data->getPassword() ); 297 passLine->setText( data->getPassword() );
289 prefixLine->setText(data->getPrefix()); 298 prefixLine->setText(data->getPrefix());
@@ -294,7 +303,7 @@ void IMAPconfig::accept()
294 data->setAccountName( accountLine->text() ); 303 data->setAccountName( accountLine->text() );
295 data->setServer( serverLine->text() ); 304 data->setServer( serverLine->text() );
296 data->setPort( portLine->text() ); 305 data->setPort( portLine->text() );
297 data->setSSL( sslBox->isChecked() ); 306 data->setConnectionType( ComboBox1->currentItem() );
298 data->setUser( userLine->text() ); 307 data->setUser( userLine->text() );
299 data->setPassword( passLine->text() ); 308 data->setPassword( passLine->text() );
300 data->setPrefix(prefixLine->text()); 309 data->setPrefix(prefixLine->text());
diff --git a/noncore/net/mail/editaccounts.h b/noncore/net/mail/editaccounts.h
index d51e299..d8e1219 100644
--- a/noncore/net/mail/editaccounts.h
+++ b/noncore/net/mail/editaccounts.h
@@ -79,7 +79,7 @@ public slots:
79 void fillValues(); 79 void fillValues();
80 80
81protected slots: 81protected slots:
82 void slotSSL( bool enabled ); 82 void slotConnectionToggle( int index );
83 void accept(); 83 void accept();
84 84
85private: 85private:
diff --git a/noncore/net/mail/imapconfigui.ui b/noncore/net/mail/imapconfigui.ui
index ac0297f..a96c1a2 100644
--- a/noncore/net/mail/imapconfigui.ui
+++ b/noncore/net/mail/imapconfigui.ui
@@ -11,8 +11,8 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>228</width> 14 <width>425</width>
15 <height>320</height> 15 <height>428</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
@@ -32,30 +32,8 @@
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>2</number> 35 <number>3</number>
36 </property> 36 </property>
37 <widget row="6" column="0" >
38 <class>QLabel</class>
39 <property stdset="1">
40 <name>name</name>
41 <cstring>userLabel</cstring>
42 </property>
43 <property stdset="1">
44 <name>text</name>
45 <string>User</string>
46 </property>
47 </widget>
48 <widget row="4" column="1" >
49 <class>QCheckBox</class>
50 <property stdset="1">
51 <name>name</name>
52 <cstring>sslBox</cstring>
53 </property>
54 <property stdset="1">
55 <name>text</name>
56 <string>Use SSL</string>
57 </property>
58 </widget>
59 <widget row="2" column="1" > 37 <widget row="2" column="1" >
60 <class>QLineEdit</class> 38 <class>QLineEdit</class>
61 <property stdset="1"> 39 <property stdset="1">
@@ -63,24 +41,6 @@
63 <cstring>serverLine</cstring> 41 <cstring>serverLine</cstring>
64 </property> 42 </property>
65 </widget> 43 </widget>
66 <widget row="6" column="1" >
67 <class>QLineEdit</class>
68 <property stdset="1">
69 <name>name</name>
70 <cstring>userLine</cstring>
71 </property>
72 </widget>
73 <widget row="7" column="0" >
74 <class>QLabel</class>
75 <property stdset="1">
76 <name>name</name>
77 <cstring>passLabel</cstring>
78 </property>
79 <property stdset="1">
80 <name>text</name>
81 <string>Password</string>
82 </property>
83 </widget>
84 <widget row="3" column="0" > 44 <widget row="3" column="0" >
85 <class>QLabel</class> 45 <class>QLabel</class>
86 <property stdset="1"> 46 <property stdset="1">
@@ -110,18 +70,40 @@
110 <cstring>portLine</cstring> 70 <cstring>portLine</cstring>
111 </property> 71 </property>
112 </widget> 72 </widget>
113 <widget row="7" column="1" > 73 <widget row="0" column="1" >
114 <class>QLineEdit</class> 74 <class>QLineEdit</class>
115 <property stdset="1"> 75 <property stdset="1">
116 <name>name</name> 76 <name>name</name>
117 <cstring>passLine</cstring> 77 <cstring>accountLine</cstring>
78 </property>
79 <property>
80 <name>toolTip</name>
81 <string>Name of the Account</string>
118 </property> 82 </property>
83 </widget>
84 <widget row="0" column="0" >
85 <class>QLabel</class>
119 <property stdset="1"> 86 <property stdset="1">
120 <name>echoMode</name> 87 <name>name</name>
121 <enum>Password</enum> 88 <cstring>accountLabel</cstring>
89 </property>
90 <property stdset="1">
91 <name>text</name>
92 <string>Account</string>
93 </property>
94 </widget>
95 <widget row="1" column="0" rowspan="1" colspan="2" >
96 <class>Line</class>
97 <property stdset="1">
98 <name>name</name>
99 <cstring>line1</cstring>
100 </property>
101 <property stdset="1">
102 <name>orientation</name>
103 <enum>Horizontal</enum>
122 </property> 104 </property>
123 </widget> 105 </widget>
124 <spacer row="10" column="1" > 106 <spacer row="12" column="1" >
125 <property> 107 <property>
126 <name>name</name> 108 <name>name</name>
127 <cstring>spacer</cstring> 109 <cstring>spacer</cstring>
@@ -142,58 +124,54 @@
142 </size> 124 </size>
143 </property> 125 </property>
144 </spacer> 126 </spacer>
145 <widget row="0" column="1" > 127 <widget row="8" column="1" >
146 <class>QLineEdit</class> 128 <class>QLineEdit</class>
147 <property stdset="1"> 129 <property stdset="1">
148 <name>name</name> 130 <name>name</name>
149 <cstring>accountLine</cstring> 131 <cstring>userLine</cstring>
150 </property>
151 <property>
152 <name>toolTip</name>
153 <string>Name of the Account</string>
154 </property> 132 </property>
155 </widget> 133 </widget>
156 <widget row="0" column="0" > 134 <widget row="9" column="1" >
157 <class>QLabel</class> 135 <class>QLineEdit</class>
158 <property stdset="1"> 136 <property stdset="1">
159 <name>name</name> 137 <name>name</name>
160 <cstring>accountLabel</cstring> 138 <cstring>passLine</cstring>
161 </property> 139 </property>
162 <property stdset="1"> 140 <property stdset="1">
163 <name>text</name> 141 <name>echoMode</name>
164 <string>Account</string> 142 <enum>Password</enum>
165 </property> 143 </property>
166 </widget> 144 </widget>
167 <widget row="1" column="0" rowspan="1" colspan="2" > 145 <widget row="11" column="0" >
168 <class>Line</class> 146 <class>QLabel</class>
169 <property stdset="1"> 147 <property stdset="1">
170 <name>name</name> 148 <name>name</name>
171 <cstring>line1</cstring> 149 <cstring>prefixLabel</cstring>
172 </property> 150 </property>
173 <property stdset="1"> 151 <property stdset="1">
174 <name>orientation</name> 152 <name>text</name>
175 <enum>Horizontal</enum> 153 <string>Prefix</string>
176 </property> 154 </property>
177 </widget> 155 </widget>
178 <widget row="9" column="1" > 156 <widget row="11" column="1" >
179 <class>QLineEdit</class> 157 <class>QLineEdit</class>
180 <property stdset="1"> 158 <property stdset="1">
181 <name>name</name> 159 <name>name</name>
182 <cstring>prefixLine</cstring> 160 <cstring>prefixLine</cstring>
183 </property> 161 </property>
184 </widget> 162 </widget>
185 <widget row="9" column="0" > 163 <widget row="8" column="0" >
186 <class>QLabel</class> 164 <class>QLabel</class>
187 <property stdset="1"> 165 <property stdset="1">
188 <name>name</name> 166 <name>name</name>
189 <cstring>prefixLabel</cstring> 167 <cstring>userLabel</cstring>
190 </property> 168 </property>
191 <property stdset="1"> 169 <property stdset="1">
192 <name>text</name> 170 <name>text</name>
193 <string>Prefix</string> 171 <string>User</string>
194 </property> 172 </property>
195 </widget> 173 </widget>
196 <widget row="5" column="0" rowspan="1" colspan="2" > 174 <widget row="7" column="0" rowspan="1" colspan="2" >
197 <class>Line</class> 175 <class>Line</class>
198 <property stdset="1"> 176 <property stdset="1">
199 <name>name</name> 177 <name>name</name>
@@ -218,7 +196,7 @@
218 <name>layoutSpacing</name> 196 <name>layoutSpacing</name>
219 </property> 197 </property>
220 </widget> 198 </widget>
221 <widget row="8" column="0" rowspan="1" colspan="2" > 199 <widget row="10" column="0" rowspan="1" colspan="2" >
222 <class>Line</class> 200 <class>Line</class>
223 <property stdset="1"> 201 <property stdset="1">
224 <name>name</name> 202 <name>name</name>
@@ -229,13 +207,52 @@
229 <enum>Horizontal</enum> 207 <enum>Horizontal</enum>
230 </property> 208 </property>
231 </widget> 209 </widget>
210 <widget row="9" column="0" >
211 <class>QLabel</class>
212 <property stdset="1">
213 <name>name</name>
214 <cstring>passLabel</cstring>
215 </property>
216 <property stdset="1">
217 <name>text</name>
218 <string>Password</string>
219 </property>
220 </widget>
221 <widget row="6" column="0" rowspan="1" colspan="2" >
222 <class>QLineEdit</class>
223 <property stdset="1">
224 <name>name</name>
225 <cstring>CommandEdit</cstring>
226 </property>
227 <property stdset="1">
228 <name>text</name>
229 <string>ssh $SERVER exec</string>
230 </property>
231 </widget>
232 <widget row="5" column="0" rowspan="1" colspan="2" >
233 <class>QComboBox</class>
234 <property stdset="1">
235 <name>name</name>
236 <cstring>ComboBox1</cstring>
237 </property>
238 </widget>
239 <widget row="4" column="0" rowspan="1" colspan="2" >
240 <class>QLabel</class>
241 <property stdset="1">
242 <name>name</name>
243 <cstring>TextLabel1</cstring>
244 </property>
245 <property stdset="1">
246 <name>text</name>
247 <string>Use secure sockets:</string>
248 </property>
249 </widget>
232 </grid> 250 </grid>
233</widget> 251</widget>
234<tabstops> 252<tabstops>
235 <tabstop>accountLine</tabstop> 253 <tabstop>accountLine</tabstop>
236 <tabstop>serverLine</tabstop> 254 <tabstop>serverLine</tabstop>
237 <tabstop>portLine</tabstop> 255 <tabstop>portLine</tabstop>
238 <tabstop>sslBox</tabstop>
239 <tabstop>userLine</tabstop> 256 <tabstop>userLine</tabstop>
240 <tabstop>passLine</tabstop> 257 <tabstop>passLine</tabstop>
241</tabstops> 258</tabstops>
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 4b633ea..1c22c26 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -80,8 +80,18 @@ void IMAPwrapper::login()
80 80
81 m_imap = mailimap_new( 20, &imap_progress ); 81 m_imap = mailimap_new( 20, &imap_progress );
82 82
83
84
83 /* connect */ 85 /* connect */
84 if (account->getSSL()) { 86
87 bool ssl = false;
88
89 if ( account->ConnectionType() == 2 ) {
90 ssl = true;
91 }
92
93 if ( ssl ) {
94 qDebug( "using ssl" );
85 err = mailimap_ssl_connect( m_imap, (char*)server, port ); 95 err = mailimap_ssl_connect( m_imap, (char*)server, port );
86 } else { 96 } else {
87 err = mailimap_socket_connect( m_imap, (char*)server, port ); 97 err = mailimap_socket_connect( m_imap, (char*)server, port );
@@ -369,7 +379,7 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
369 QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec)); 379 QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec));
370 qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec); 380 qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec);
371 qDebug(da.toString()); 381 qDebug(da.toString());
372#endif 382#endif
373 } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) { 383 } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) {
374 size = item->att_data.att_static->att_data.att_rfc822_size; 384 size = item->att_data.att_static->att_data.att_rfc822_size;
375 } 385 }
@@ -408,7 +418,7 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail)
408 if ( err != MAILIMAP_NO_ERROR ) { 418 if ( err != MAILIMAP_NO_ERROR ) {
409 return body; 419 return body;
410 } 420 }
411 421
412 /* the range has to start at 1!!! not with 0!!!! */ 422 /* the range has to start at 1!!! not with 0!!!! */
413 set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); 423 set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
414 fetchAtt = mailimap_fetch_att_new_bodystructure(); 424 fetchAtt = mailimap_fetch_att_new_bodystructure();
@@ -495,9 +505,9 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
495 } 505 }
496 } 506 }
497 set = mailimap_set_new_single(mail.getNumber()); 507 set = mailimap_set_new_single(mail.getNumber());
498 508
499 clist*id_list = 0; 509 clist*id_list = 0;
500 510
501 /* if path == empty then its a request for the whole rfc822 mail and generates 511 /* if path == empty then its a request for the whole rfc822 mail and generates
502 a "fetch <id> (body[])" statement on imap server */ 512 a "fetch <id> (body[])" statement on imap server */
503 if (path.count()>0 ) { 513 if (path.count()>0 ) {
@@ -510,17 +520,17 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
510 section_part = mailimap_section_part_new(id_list); 520 section_part = mailimap_section_part_new(id_list);
511 section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL); 521 section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
512 } 522 }
513 523
514 section = mailimap_section_new(section_spec); 524 section = mailimap_section_new(section_spec);
515 fetch_att = mailimap_fetch_att_new_body_section(section); 525 fetch_att = mailimap_fetch_att_new_body_section(section);
516 fetchType = mailimap_fetch_type_new_fetch_att(fetch_att); 526 fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
517 527
518 clist*result = 0; 528 clist*result = 0;
519 529
520 err = mailimap_fetch( m_imap, set, fetchType, &result ); 530 err = mailimap_fetch( m_imap, set, fetchType, &result );
521 mailimap_set_free( set ); 531 mailimap_set_free( set );
522 mailimap_fetch_type_free( fetchType ); 532 mailimap_fetch_type_free( fetchType );
523 533
524 if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { 534 if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
525 mailimap_msg_att * msg_att; 535 mailimap_msg_att * msg_att;
526 msg_att = (mailimap_msg_att*)current->data; 536 msg_att = (mailimap_msg_att*)current->data;
@@ -535,7 +545,7 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int>
535 res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length); 545 res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length);
536 } 546 }
537 } 547 }
538 } 548 }
539 } else { 549 } else {
540 qDebug("error fetching text: %s",m_imap->imap_response); 550 qDebug("error fetching text: %s",m_imap->imap_response);
541 } 551 }
@@ -664,11 +674,11 @@ void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*w
664 qDebug("Message part"); 674 qDebug("Message part");
665 /* we set this type to text/plain */ 675 /* we set this type to text/plain */
666 target_part.setLines(which->bd_lines); 676 target_part.setLines(which->bd_lines);
667 fillBodyFields(target_part,which->bd_fields); 677 fillBodyFields(target_part,which->bd_fields);
668} 678}
669 679
670void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which) 680void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which)
671{ 681{
672 if (!which) return; 682 if (!which) return;
673 QString sub = which->bd_media_subtype; 683 QString sub = which->bd_media_subtype;
674 target_part.setSubtype(sub.lower()); 684 target_part.setSubtype(sub.lower());
@@ -680,7 +690,7 @@ void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*whi
680 if (param) { 690 if (param) {
681 target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value)); 691 target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
682 } 692 }
683 } 693 }
684 } 694 }
685} 695}
686 696
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index 7b6a58d..3279f39 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -164,6 +164,7 @@ void IMAPaccount::read()
164 if (server.isNull()) server=""; 164 if (server.isNull()) server="";
165 port = conf->readEntry( "Port","" ); 165 port = conf->readEntry( "Port","" );
166 if (port.isNull()) port="143"; 166 if (port.isNull()) port="143";
167 connectionType = conf->readNumEntry( "ConnectionType" );
167 ssl = conf->readBoolEntry( "SSL",false ); 168 ssl = conf->readBoolEntry( "SSL",false );
168 user = conf->readEntry( "User","" ); 169 user = conf->readEntry( "User","" );
169 if (user.isNull()) user = ""; 170 if (user.isNull()) user = "";
@@ -186,6 +187,7 @@ void IMAPaccount::save()
186 conf->writeEntry( "Server", server ); 187 conf->writeEntry( "Server", server );
187 conf->writeEntry( "Port", port ); 188 conf->writeEntry( "Port", port );
188 conf->writeEntry( "SSL", ssl ); 189 conf->writeEntry( "SSL", ssl );
190 conf->writeEntry( "ConnectionType", connectionType );
189 conf->writeEntry( "User", user ); 191 conf->writeEntry( "User", user );
190 conf->writeEntryCrypt( "Password", password ); 192 conf->writeEntryCrypt( "Password", password );
191 conf->writeEntry( "MailPrefix",prefix); 193 conf->writeEntry( "MailPrefix",prefix);