author | llornkcor <llornkcor> | 2003-04-06 19:03:38 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-04-06 19:03:38 (UTC) |
commit | e6023e382d816195ff209b421f58ed5abfffe0e9 (patch) (unidiff) | |
tree | 786e10ac117b17f2eee1bfbaec9a1027a33e969a | |
parent | b284e2c4dcddc4314f94933616d664b08587e29e (diff) | |
download | opie-e6023e382d816195ff209b421f58ed5abfffe0e9.zip opie-e6023e382d816195ff209b421f58ed5abfffe0e9.tar.gz opie-e6023e382d816195ff209b421f58ed5abfffe0e9.tar.bz2 |
grumble
-rw-r--r-- | noncore/net/mailit/emailhandler.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailhandler.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index a086dfc..2144899 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp | |||
@@ -172,32 +172,32 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) | |||
172 | delimiter = lineShift + lineShift; // "\n\n" or "\r\n\r\n" | 172 | delimiter = lineShift + lineShift; // "\n\n" or "\r\n\r\n" |
173 | pos = in.find(delimiter, 0, FALSE); | 173 | pos = in.find(delimiter, 0, FALSE); |
174 | header = in.left(pos); | 174 | header = in.left(pos); |
175 | body = in.right(in.length() - pos - delimiter.length()); | 175 | body = in.right(in.length() - pos - delimiter.length()); |
176 | if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n')) | 176 | if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n')) |
177 | body.truncate(body.length()-2); | 177 | body.truncate(body.length()-2); |
178 | 178 | ||
179 | TextParser p(header, lineShift); | 179 | TextParser p(header, lineShift); |
180 | 180 | ||
181 | if ((pos = p.find("FROM",':', 0, TRUE)) != -1) { | 181 | if ((pos = p.find("FROM",':', 0, TRUE)) != -1) { |
182 | pos++; | 182 | pos++; |
183 | if (p.separatorAt(pos) == ' ') { | 183 | if (p.separatorAt(pos) == ' ') { |
184 | mail->from = p.getString(&pos, '<'); | 184 | mail->from = p.getString(&pos, '<', false); |
185 | mail->from = mail->from.stripWhiteSpace(); | 185 | mail->from = mail->from.stripWhiteSpace(); |
186 | if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) { | 186 | if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) { |
187 | mail->from = mail->from.left(mail->from.length() - 1); | 187 | mail->from = mail->from.left(mail->from.length() - 1); |
188 | mail->from = mail->from.right(mail->from.length() - 1); | 188 | mail->from = mail->from.right(mail->from.length() - 1); |
189 | } | 189 | } |
190 | pos++; | 190 | pos++; |
191 | mail->fromMail = p.getString(&pos, '>'); | 191 | mail->fromMail = p.getString(&pos, '>', false); |
192 | } else { | 192 | } else { |
193 | if ((p.separatorAt(pos) == '<') | 193 | if ((p.separatorAt(pos) == '<') |
194 | || (p.separatorAt(pos) == ' ')) //No name.. nasty | 194 | || (p.separatorAt(pos) == ' ')) //No name.. nasty |
195 | pos++; | 195 | pos++; |
196 | pos++; | 196 | pos++; |
197 | mail->fromMail = p.getString(&pos, 'z', TRUE); | 197 | mail->fromMail = p.getString(&pos, 'z', TRUE); |
198 | if (mail->fromMail.at(mail->fromMail.length()-1) == '>') | 198 | if (mail->fromMail.at(mail->fromMail.length()-1) == '>') |
199 | mail->fromMail.truncate(mail->fromMail.length() - 1); | 199 | mail->fromMail.truncate(mail->fromMail.length() - 1); |
200 | mail->from=mail->fromMail; | 200 | mail->from=mail->fromMail; |
201 | } | 201 | } |
202 | } | 202 | } |
203 | if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { | 203 | if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { |
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index a086dfc..2144899 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp | |||
@@ -172,32 +172,32 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) | |||
172 | delimiter = lineShift + lineShift; // "\n\n" or "\r\n\r\n" | 172 | delimiter = lineShift + lineShift; // "\n\n" or "\r\n\r\n" |
173 | pos = in.find(delimiter, 0, FALSE); | 173 | pos = in.find(delimiter, 0, FALSE); |
174 | header = in.left(pos); | 174 | header = in.left(pos); |
175 | body = in.right(in.length() - pos - delimiter.length()); | 175 | body = in.right(in.length() - pos - delimiter.length()); |
176 | if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n')) | 176 | if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n')) |
177 | body.truncate(body.length()-2); | 177 | body.truncate(body.length()-2); |
178 | 178 | ||
179 | TextParser p(header, lineShift); | 179 | TextParser p(header, lineShift); |
180 | 180 | ||
181 | if ((pos = p.find("FROM",':', 0, TRUE)) != -1) { | 181 | if ((pos = p.find("FROM",':', 0, TRUE)) != -1) { |
182 | pos++; | 182 | pos++; |
183 | if (p.separatorAt(pos) == ' ') { | 183 | if (p.separatorAt(pos) == ' ') { |
184 | mail->from = p.getString(&pos, '<'); | 184 | mail->from = p.getString(&pos, '<', false); |
185 | mail->from = mail->from.stripWhiteSpace(); | 185 | mail->from = mail->from.stripWhiteSpace(); |
186 | if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) { | 186 | if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) { |
187 | mail->from = mail->from.left(mail->from.length() - 1); | 187 | mail->from = mail->from.left(mail->from.length() - 1); |
188 | mail->from = mail->from.right(mail->from.length() - 1); | 188 | mail->from = mail->from.right(mail->from.length() - 1); |
189 | } | 189 | } |
190 | pos++; | 190 | pos++; |
191 | mail->fromMail = p.getString(&pos, '>'); | 191 | mail->fromMail = p.getString(&pos, '>', false); |
192 | } else { | 192 | } else { |
193 | if ((p.separatorAt(pos) == '<') | 193 | if ((p.separatorAt(pos) == '<') |
194 | || (p.separatorAt(pos) == ' ')) //No name.. nasty | 194 | || (p.separatorAt(pos) == ' ')) //No name.. nasty |
195 | pos++; | 195 | pos++; |
196 | pos++; | 196 | pos++; |
197 | mail->fromMail = p.getString(&pos, 'z', TRUE); | 197 | mail->fromMail = p.getString(&pos, 'z', TRUE); |
198 | if (mail->fromMail.at(mail->fromMail.length()-1) == '>') | 198 | if (mail->fromMail.at(mail->fromMail.length()-1) == '>') |
199 | mail->fromMail.truncate(mail->fromMail.length() - 1); | 199 | mail->fromMail.truncate(mail->fromMail.length() - 1); |
200 | mail->from=mail->fromMail; | 200 | mail->from=mail->fromMail; |
201 | } | 201 | } |
202 | } | 202 | } |
203 | if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { | 203 | if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) { |