Diffstat (limited to 'noncore/net/mail/libmailwrapper/settings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/settings.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp index 02a80a3..83e51e3 100644 --- a/noncore/net/mail/libmailwrapper/settings.cpp +++ b/noncore/net/mail/libmailwrapper/settings.cpp | |||
@@ -87,72 +87,75 @@ void Settings::saveAccounts() | |||
87 | { | 87 | { |
88 | checkDirectory(); | 88 | checkDirectory(); |
89 | Account *it; | 89 | Account *it; |
90 | 90 | ||
91 | for ( it = accounts.first(); it; it = accounts.next() ) { | 91 | for ( it = accounts.first(); it; it = accounts.next() ) { |
92 | it->save(); | 92 | it->save(); |
93 | } | 93 | } |
94 | } | 94 | } |
95 | 95 | ||
96 | void Settings::readAccounts() | 96 | void Settings::readAccounts() |
97 | { | 97 | { |
98 | checkDirectory(); | 98 | checkDirectory(); |
99 | Account *it; | 99 | Account *it; |
100 | 100 | ||
101 | for ( it = accounts.first(); it; it = accounts.next() ) { | 101 | for ( it = accounts.first(); it; it = accounts.next() ) { |
102 | it->read(); | 102 | it->read(); |
103 | } | 103 | } |
104 | } | 104 | } |
105 | 105 | ||
106 | Account::Account() | 106 | Account::Account() |
107 | { | 107 | { |
108 | accountName = "changeMe"; | 108 | accountName = "changeMe"; |
109 | type = "changeMe"; | 109 | type = "changeMe"; |
110 | ssl = false; | 110 | ssl = false; |
111 | connectionType = 1; | ||
111 | } | 112 | } |
112 | 113 | ||
113 | void Account::remove() | 114 | void Account::remove() |
114 | { | 115 | { |
115 | QFile file( getFileName() ); | 116 | QFile file( getFileName() ); |
116 | file.remove(); | 117 | file.remove(); |
117 | } | 118 | } |
118 | 119 | ||
119 | IMAPaccount::IMAPaccount() | 120 | IMAPaccount::IMAPaccount() |
120 | : Account() | 121 | : Account() |
121 | { | 122 | { |
122 | file = IMAPaccount::getUniqueFileName(); | 123 | file = IMAPaccount::getUniqueFileName(); |
123 | accountName = "New IMAP Account"; | 124 | accountName = "New IMAP Account"; |
124 | ssl = false; | 125 | ssl = false; |
126 | connectionType = 1; | ||
125 | type = "IMAP"; | 127 | type = "IMAP"; |
126 | port = IMAP_PORT; | 128 | port = IMAP_PORT; |
127 | } | 129 | } |
128 | 130 | ||
129 | IMAPaccount::IMAPaccount( QString filename ) | 131 | IMAPaccount::IMAPaccount( QString filename ) |
130 | : Account() | 132 | : Account() |
131 | { | 133 | { |
132 | file = filename; | 134 | file = filename; |
133 | accountName = "New IMAP Account"; | 135 | accountName = "New IMAP Account"; |
134 | ssl = false; | 136 | ssl = false; |
137 | connectionType = 1; | ||
135 | type = "IMAP"; | 138 | type = "IMAP"; |
136 | port = IMAP_PORT; | 139 | port = IMAP_PORT; |
137 | } | 140 | } |
138 | 141 | ||
139 | QString IMAPaccount::getUniqueFileName() | 142 | QString IMAPaccount::getUniqueFileName() |
140 | { | 143 | { |
141 | int num = 0; | 144 | int num = 0; |
142 | QString unique; | 145 | QString unique; |
143 | 146 | ||
144 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); | 147 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); |
145 | 148 | ||
146 | QStringList imap = dir.entryList( "imap-*" ); | 149 | QStringList imap = dir.entryList( "imap-*" ); |
147 | do { | 150 | do { |
148 | unique.setNum( num++ ); | 151 | unique.setNum( num++ ); |
149 | } while ( imap.contains( "imap-" + unique ) > 0 ); | 152 | } while ( imap.contains( "imap-" + unique ) > 0 ); |
150 | 153 | ||
151 | return unique; | 154 | return unique; |
152 | } | 155 | } |
153 | 156 | ||
154 | void IMAPaccount::read() | 157 | void IMAPaccount::read() |
155 | { | 158 | { |
156 | Config *conf = new Config( getFileName(), Config::File ); | 159 | Config *conf = new Config( getFileName(), Config::File ); |
157 | conf->setGroup( "IMAP Account" ); | 160 | conf->setGroup( "IMAP Account" ); |
158 | accountName = conf->readEntry( "Account","" ); | 161 | accountName = conf->readEntry( "Account","" ); |
@@ -182,102 +185,106 @@ void IMAPaccount::save() | |||
182 | conf->writeEntry( "Account", accountName ); | 185 | conf->writeEntry( "Account", accountName ); |
183 | conf->writeEntry( "Server", server ); | 186 | conf->writeEntry( "Server", server ); |
184 | conf->writeEntry( "Port", port ); | 187 | conf->writeEntry( "Port", port ); |
185 | conf->writeEntry( "SSL", ssl ); | 188 | conf->writeEntry( "SSL", ssl ); |
186 | conf->writeEntry( "User", user ); | 189 | conf->writeEntry( "User", user ); |
187 | conf->writeEntryCrypt( "Password", password ); | 190 | conf->writeEntryCrypt( "Password", password ); |
188 | conf->writeEntry( "MailPrefix",prefix); | 191 | conf->writeEntry( "MailPrefix",prefix); |
189 | conf->writeEntry( "Offline",offline); | 192 | conf->writeEntry( "Offline",offline); |
190 | conf->write(); | 193 | conf->write(); |
191 | delete conf; | 194 | delete conf; |
192 | } | 195 | } |
193 | 196 | ||
194 | 197 | ||
195 | QString IMAPaccount::getFileName() | 198 | QString IMAPaccount::getFileName() |
196 | { | 199 | { |
197 | return (QString) getenv( "HOME" ) + "/Applications/opiemail/imap-" + file; | 200 | return (QString) getenv( "HOME" ) + "/Applications/opiemail/imap-" + file; |
198 | } | 201 | } |
199 | 202 | ||
200 | POP3account::POP3account() | 203 | POP3account::POP3account() |
201 | : Account() | 204 | : Account() |
202 | { | 205 | { |
203 | file = POP3account::getUniqueFileName(); | 206 | file = POP3account::getUniqueFileName(); |
204 | accountName = "New POP3 Account"; | 207 | accountName = "New POP3 Account"; |
205 | ssl = false; | 208 | ssl = false; |
209 | connectionType = 1; | ||
206 | type = "POP3"; | 210 | type = "POP3"; |
207 | port = POP3_PORT; | 211 | port = POP3_PORT; |
208 | } | 212 | } |
209 | 213 | ||
210 | POP3account::POP3account( QString filename ) | 214 | POP3account::POP3account( QString filename ) |
211 | : Account() | 215 | : Account() |
212 | { | 216 | { |
213 | file = filename; | 217 | file = filename; |
214 | accountName = "New POP3 Account"; | 218 | accountName = "New POP3 Account"; |
215 | ssl = false; | 219 | ssl = false; |
220 | connectionType = 1; | ||
216 | type = "POP3"; | 221 | type = "POP3"; |
217 | port = POP3_PORT; | 222 | port = POP3_PORT; |
218 | } | 223 | } |
219 | 224 | ||
220 | QString POP3account::getUniqueFileName() | 225 | QString POP3account::getUniqueFileName() |
221 | { | 226 | { |
222 | int num = 0; | 227 | int num = 0; |
223 | QString unique; | 228 | QString unique; |
224 | 229 | ||
225 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); | 230 | QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" ); |
226 | 231 | ||
227 | QStringList imap = dir.entryList( "pop3-*" ); | 232 | QStringList imap = dir.entryList( "pop3-*" ); |
228 | do { | 233 | do { |
229 | unique.setNum( num++ ); | 234 | unique.setNum( num++ ); |
230 | } while ( imap.contains( "pop3-" + unique ) > 0 ); | 235 | } while ( imap.contains( "pop3-" + unique ) > 0 ); |
231 | 236 | ||
232 | return unique; | 237 | return unique; |
233 | } | 238 | } |
234 | 239 | ||
235 | void POP3account::read() | 240 | void POP3account::read() |
236 | { | 241 | { |
237 | Config *conf = new Config( getFileName(), Config::File ); | 242 | Config *conf = new Config( getFileName(), Config::File ); |
238 | conf->setGroup( "POP3 Account" ); | 243 | conf->setGroup( "POP3 Account" ); |
239 | accountName = conf->readEntry( "Account" ); | 244 | accountName = conf->readEntry( "Account" ); |
240 | server = conf->readEntry( "Server" ); | 245 | server = conf->readEntry( "Server" ); |
241 | port = conf->readEntry( "Port" ); | 246 | port = conf->readEntry( "Port" ); |
242 | ssl = conf->readBoolEntry( "SSL" ); | 247 | ssl = conf->readBoolEntry( "SSL" ); |
248 | connectionType = conf->readNumEntry( "ConnectionType" ); | ||
243 | user = conf->readEntry( "User" ); | 249 | user = conf->readEntry( "User" ); |
244 | password = conf->readEntryCrypt( "Password" ); | 250 | password = conf->readEntryCrypt( "Password" ); |
245 | offline = conf->readBoolEntry("Offline",false); | 251 | offline = conf->readBoolEntry("Offline",false); |
246 | delete conf; | 252 | delete conf; |
247 | } | 253 | } |
248 | 254 | ||
249 | void POP3account::save() | 255 | void POP3account::save() |
250 | { | 256 | { |
251 | qDebug( "saving " + getFileName() ); | 257 | qDebug( "saving " + getFileName() ); |
252 | Settings::checkDirectory(); | 258 | Settings::checkDirectory(); |
253 | 259 | ||
254 | Config *conf = new Config( getFileName(), Config::File ); | 260 | Config *conf = new Config( getFileName(), Config::File ); |
255 | conf->setGroup( "POP3 Account" ); | 261 | conf->setGroup( "POP3 Account" ); |
256 | conf->writeEntry( "Account", accountName ); | 262 | conf->writeEntry( "Account", accountName ); |
257 | conf->writeEntry( "Server", server ); | 263 | conf->writeEntry( "Server", server ); |
258 | conf->writeEntry( "Port", port ); | 264 | conf->writeEntry( "Port", port ); |
259 | conf->writeEntry( "SSL", ssl ); | 265 | conf->writeEntry( "SSL", ssl ); |
266 | conf->writeEntry( "ConnectionType", connectionType ); | ||
260 | conf->writeEntry( "User", user ); | 267 | conf->writeEntry( "User", user ); |
261 | conf->writeEntryCrypt( "Password", password ); | 268 | conf->writeEntryCrypt( "Password", password ); |
262 | conf->writeEntry( "Offline",offline); | 269 | conf->writeEntry( "Offline",offline); |
263 | conf->write(); | 270 | conf->write(); |
264 | delete conf; | 271 | delete conf; |
265 | } | 272 | } |
266 | 273 | ||
267 | 274 | ||
268 | QString POP3account::getFileName() | 275 | QString POP3account::getFileName() |
269 | { | 276 | { |
270 | return (QString) getenv( "HOME" ) + "/Applications/opiemail/pop3-" + file; | 277 | return (QString) getenv( "HOME" ) + "/Applications/opiemail/pop3-" + file; |
271 | } | 278 | } |
272 | 279 | ||
273 | SMTPaccount::SMTPaccount() | 280 | SMTPaccount::SMTPaccount() |
274 | : Account() | 281 | : Account() |
275 | { | 282 | { |
276 | file = SMTPaccount::getUniqueFileName(); | 283 | file = SMTPaccount::getUniqueFileName(); |
277 | accountName = "New SMTP Account"; | 284 | accountName = "New SMTP Account"; |
278 | ssl = false; | 285 | ssl = false; |
279 | login = false; | 286 | login = false; |
280 | useCC = false; | 287 | useCC = false; |
281 | useBCC = false; | 288 | useBCC = false; |
282 | useReply = false; | 289 | useReply = false; |
283 | type = "SMTP"; | 290 | type = "SMTP"; |