author | groucho <groucho> | 2003-04-15 08:07:53 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-04-15 08:07:53 (UTC) |
commit | d0de397e46581f6ed5fcfad320b2b61be3858c5d (patch) (unidiff) | |
tree | 1110503d72aa11947642a640ab50656f82c33a71 | |
parent | e263613e83b64fa93b5f3c1b904715daf076cc78 (diff) | |
download | opie-d0de397e46581f6ed5fcfad320b2b61be3858c5d.zip opie-d0de397e46581f6ed5fcfad320b2b61be3858c5d.tar.gz opie-d0de397e46581f6ed5fcfad320b2b61be3858c5d.tar.bz2 |
- SMTP fix preventing authorization with SMTP after POP
- removed debug output
- smaller bug fixes
-rw-r--r-- | noncore/net/mailit/addresslist.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mailit/emailclient.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mailit/emailhandler.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mailit/mailitwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/net/mailit/popclient.cpp | 8 | ||||
-rw-r--r-- | noncore/net/mailit/readmail.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mailit/smtpclient.cpp | 20 | ||||
-rw-r--r-- | noncore/unsupported/mailit/addresslist.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailhandler.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mailit/mailitwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/unsupported/mailit/popclient.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/mailit/readmail.cpp | 1 | ||||
-rw-r--r-- | noncore/unsupported/mailit/smtpclient.cpp | 20 |
14 files changed, 40 insertions, 48 deletions
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp index 9fe558a..8d9ab91 100644 --- a/noncore/net/mailit/addresslist.cpp +++ b/noncore/net/mailit/addresslist.cpp | |||
@@ -129,3 +129,3 @@ void AddressList::read() | |||
129 | if ((*it).defaultEmail().length()!=0) | 129 | if ((*it).defaultEmail().length()!=0) |
130 | addContact((*it).defaultEmail(),(*it).fullName()); | 130 | addContact((*it).defaultEmail(),(*it).fileAs()); |
131 | } | 131 | } |
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp index 6612541..0d82a9a 100644 --- a/noncore/net/mailit/emailclient.cpp +++ b/noncore/net/mailit/emailclient.cpp | |||
@@ -534,3 +534,3 @@ void EmailClient::readMail() | |||
534 | // QFileInfo fi(f); | 534 | // QFileInfo fi(f); |
535 | qDebug( f.name()); | 535 | //qDebug( f.name()); |
536 | 536 | ||
@@ -588,3 +588,3 @@ void EmailClient::saveMail(QString fileName, QListView *view) | |||
588 | item = (EmailListItem *) view->firstChild(); | 588 | item = (EmailListItem *) view->firstChild(); |
589 | qDebug (QString("Write : ") ); | 589 | //qDebug (QString("Write : ") ); |
590 | QTextStream t(&f); | 590 | QTextStream t(&f); |
@@ -592,4 +592,4 @@ void EmailClient::saveMail(QString fileName, QListView *view) | |||
592 | mail = item->getMail(); | 592 | mail = item->getMail(); |
593 | qDebug(mail->rawMail); | 593 | //qDebug(mail->rawMail); |
594 | qDebug(mail->recipients.first()); | 594 | //qDebug(mail->recipients.first()); |
595 | t << mail->rawMail; | 595 | t << mail->rawMail; |
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index 9c1c814..03f8a28 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp | |||
@@ -165,4 +165,2 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) | |||
165 | if (in.right(temp.length()) != temp) { | 165 | if (in.right(temp.length()) != temp) { |
166 | qWarning(in.right(temp.length())); | ||
167 | qWarning(" . added at end of email as separator"); | ||
168 | mail->rawMail += temp; | 166 | mail->rawMail += temp; |
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp index fd49c1f..2bf1dcb 100644 --- a/noncore/net/mailit/mailitwindow.cpp +++ b/noncore/net/mailit/mailitwindow.cpp | |||
@@ -29,3 +29,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
29 | 29 | ||
30 | qWarning("***Starting writeMail"); | ||
31 | emailClient = new EmailClient(views, "client"); | 30 | emailClient = new EmailClient(views, "client"); |
@@ -33,3 +32,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
33 | readMail = new ReadMail(views, "reading"); | 32 | readMail = new ReadMail(views, "reading"); |
34 | qWarning("***Finished readMail"); | ||
35 | 33 | ||
@@ -62,3 +60,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
62 | 60 | ||
63 | qWarning("***Finished MailitWindow"); | ||
64 | } | 61 | } |
diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp index 2f14ed2..f9cc337 100644 --- a/noncore/net/mailit/popclient.cpp +++ b/noncore/net/mailit/popclient.cpp | |||
@@ -121,3 +121,3 @@ void PopClient::incomingData() | |||
121 | response = socket->readLine(); | 121 | response = socket->readLine(); |
122 | qDebug(response +" %d", status); | 122 | //qDebug(response +" %d", status); |
123 | 123 | ||
@@ -133,3 +133,3 @@ void PopClient::incomingData() | |||
133 | md5Source = timeStamp + popPassword; | 133 | md5Source = timeStamp + popPassword; |
134 | qDebug( md5Source); | 134 | //qDebug( md5Source); |
135 | // for( int i = 0; i < md5Source.length(); i++) { | 135 | // for( int i = 0; i < md5Source.length(); i++) { |
@@ -194,3 +194,3 @@ void PopClient::incomingData() | |||
194 | lastSync = 0; | 194 | lastSync = 0; |
195 | messageCount = lastSync + 1; | 195 | messageCount = 1; |
196 | } | 196 | } |
@@ -242,3 +242,3 @@ void PopClient::incomingData() | |||
242 | } else { | 242 | } else { |
243 | qWarning(response); | 243 | //qWarning(response); |
244 | errorHandling(ErrUnknownResponse); | 244 | errorHandling(ErrUnknownResponse); |
diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp index a5e7147..7cd3e09 100644 --- a/noncore/net/mailit/readmail.cpp +++ b/noncore/net/mailit/readmail.cpp | |||
@@ -91,2 +91,3 @@ void ReadMail::init() | |||
91 | emailView = new QTextView( this, "emailView" ); | 91 | emailView = new QTextView( this, "emailView" ); |
92 | |||
92 | setCentralWidget(emailView); | 93 | setCentralWidget(emailView); |
diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp index 6699a90..b2e38e5 100644 --- a/noncore/net/mailit/smtpclient.cpp +++ b/noncore/net/mailit/smtpclient.cpp | |||
@@ -89,3 +89,3 @@ void SmtpClient::incomingData() | |||
89 | response = socket->readLine(); | 89 | response = socket->readLine(); |
90 | qDebug(response); | 90 | //qDebug(response); |
91 | 91 | ||
@@ -97,3 +97,3 @@ void SmtpClient::incomingData() | |||
97 | *stream << "HELO there\r\n"; | 97 | *stream << "HELO there\r\n"; |
98 | qDebug("HELO"); | 98 | //qDebug("HELO"); |
99 | } else errorHandling(ErrUnknownResponse); | 99 | } else errorHandling(ErrUnknownResponse); |
@@ -103,5 +103,5 @@ void SmtpClient::incomingData() | |||
103 | if (response[0] == '2') { | 103 | if (response[0] == '2') { |
104 | *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n"; | 104 | *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; |
105 | status = Recv; | 105 | status = Recv; |
106 | qDebug("MAIL FROM: "+mailPtr->from); | 106 | //qDebug("MAIL FROM: "+mailPtr->from); |
107 | } else errorHandling(ErrUnknownResponse); | 107 | } else errorHandling(ErrUnknownResponse); |
@@ -114,4 +114,4 @@ void SmtpClient::incomingData() | |||
114 | errorHandling(ErrUnknownResponse); | 114 | errorHandling(ErrUnknownResponse); |
115 | *stream << "RCPT TO: <" << *it << ">\r\n"; | 115 | *stream << "RCPT TO: " << *it << ">\r\n"; |
116 | qDebug("RCPT TO: "+ *it); | 116 | //qDebug("RCPT TO: "+ *it); |
117 | status = MRcv; | 117 | status = MRcv; |
@@ -125,3 +125,3 @@ void SmtpClient::incomingData() | |||
125 | *stream << "RCPT TO: <" << *it << ">\r\n"; | 125 | *stream << "RCPT TO: <" << *it << ">\r\n"; |
126 | qDebug("RCPT TO: "+ *it); | 126 | //qDebug("RCPT TO: "+ *it); |
127 | break; | 127 | break; |
@@ -136,3 +136,3 @@ void SmtpClient::incomingData() | |||
136 | status = Body; | 136 | status = Body; |
137 | qDebug("DATA"); | 137 | //qDebug("DATA"); |
138 | emit updateStatus(tr("Sending: ") + mailPtr->subject); | 138 | emit updateStatus(tr("Sending: ") + mailPtr->subject); |
@@ -150,3 +150,3 @@ void SmtpClient::incomingData() | |||
150 | } | 150 | } |
151 | qDebug("BODY"); | 151 | //qDebug("BODY"); |
152 | } else errorHandling(ErrUnknownResponse); | 152 | } else errorHandling(ErrUnknownResponse); |
@@ -165,3 +165,3 @@ void SmtpClient::incomingData() | |||
165 | socket->close(); | 165 | socket->close(); |
166 | qDebug("QUIT"); | 166 | //qDebug("QUIT"); |
167 | } else errorHandling(ErrUnknownResponse); | 167 | } else errorHandling(ErrUnknownResponse); |
diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp index 9fe558a..8d9ab91 100644 --- a/noncore/unsupported/mailit/addresslist.cpp +++ b/noncore/unsupported/mailit/addresslist.cpp | |||
@@ -129,3 +129,3 @@ void AddressList::read() | |||
129 | if ((*it).defaultEmail().length()!=0) | 129 | if ((*it).defaultEmail().length()!=0) |
130 | addContact((*it).defaultEmail(),(*it).fullName()); | 130 | addContact((*it).defaultEmail(),(*it).fileAs()); |
131 | } | 131 | } |
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index 6612541..0d82a9a 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp | |||
@@ -534,3 +534,3 @@ void EmailClient::readMail() | |||
534 | // QFileInfo fi(f); | 534 | // QFileInfo fi(f); |
535 | qDebug( f.name()); | 535 | //qDebug( f.name()); |
536 | 536 | ||
@@ -588,3 +588,3 @@ void EmailClient::saveMail(QString fileName, QListView *view) | |||
588 | item = (EmailListItem *) view->firstChild(); | 588 | item = (EmailListItem *) view->firstChild(); |
589 | qDebug (QString("Write : ") ); | 589 | //qDebug (QString("Write : ") ); |
590 | QTextStream t(&f); | 590 | QTextStream t(&f); |
@@ -592,4 +592,4 @@ void EmailClient::saveMail(QString fileName, QListView *view) | |||
592 | mail = item->getMail(); | 592 | mail = item->getMail(); |
593 | qDebug(mail->rawMail); | 593 | //qDebug(mail->rawMail); |
594 | qDebug(mail->recipients.first()); | 594 | //qDebug(mail->recipients.first()); |
595 | t << mail->rawMail; | 595 | t << mail->rawMail; |
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index 9c1c814..03f8a28 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp | |||
@@ -165,4 +165,2 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) | |||
165 | if (in.right(temp.length()) != temp) { | 165 | if (in.right(temp.length()) != temp) { |
166 | qWarning(in.right(temp.length())); | ||
167 | qWarning(" . added at end of email as separator"); | ||
168 | mail->rawMail += temp; | 166 | mail->rawMail += temp; |
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp index fd49c1f..2bf1dcb 100644 --- a/noncore/unsupported/mailit/mailitwindow.cpp +++ b/noncore/unsupported/mailit/mailitwindow.cpp | |||
@@ -29,3 +29,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
29 | 29 | ||
30 | qWarning("***Starting writeMail"); | ||
31 | emailClient = new EmailClient(views, "client"); | 30 | emailClient = new EmailClient(views, "client"); |
@@ -33,3 +32,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
33 | readMail = new ReadMail(views, "reading"); | 32 | readMail = new ReadMail(views, "reading"); |
34 | qWarning("***Finished readMail"); | ||
35 | 33 | ||
@@ -62,3 +60,2 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
62 | 60 | ||
63 | qWarning("***Finished MailitWindow"); | ||
64 | } | 61 | } |
diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp index 2f14ed2..f9cc337 100644 --- a/noncore/unsupported/mailit/popclient.cpp +++ b/noncore/unsupported/mailit/popclient.cpp | |||
@@ -121,3 +121,3 @@ void PopClient::incomingData() | |||
121 | response = socket->readLine(); | 121 | response = socket->readLine(); |
122 | qDebug(response +" %d", status); | 122 | //qDebug(response +" %d", status); |
123 | 123 | ||
@@ -133,3 +133,3 @@ void PopClient::incomingData() | |||
133 | md5Source = timeStamp + popPassword; | 133 | md5Source = timeStamp + popPassword; |
134 | qDebug( md5Source); | 134 | //qDebug( md5Source); |
135 | // for( int i = 0; i < md5Source.length(); i++) { | 135 | // for( int i = 0; i < md5Source.length(); i++) { |
@@ -194,3 +194,3 @@ void PopClient::incomingData() | |||
194 | lastSync = 0; | 194 | lastSync = 0; |
195 | messageCount = lastSync + 1; | 195 | messageCount = 1; |
196 | } | 196 | } |
@@ -242,3 +242,3 @@ void PopClient::incomingData() | |||
242 | } else { | 242 | } else { |
243 | qWarning(response); | 243 | //qWarning(response); |
244 | errorHandling(ErrUnknownResponse); | 244 | errorHandling(ErrUnknownResponse); |
diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp index a5e7147..7cd3e09 100644 --- a/noncore/unsupported/mailit/readmail.cpp +++ b/noncore/unsupported/mailit/readmail.cpp | |||
@@ -91,2 +91,3 @@ void ReadMail::init() | |||
91 | emailView = new QTextView( this, "emailView" ); | 91 | emailView = new QTextView( this, "emailView" ); |
92 | |||
92 | setCentralWidget(emailView); | 93 | setCentralWidget(emailView); |
diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp index 6699a90..b2e38e5 100644 --- a/noncore/unsupported/mailit/smtpclient.cpp +++ b/noncore/unsupported/mailit/smtpclient.cpp | |||
@@ -89,3 +89,3 @@ void SmtpClient::incomingData() | |||
89 | response = socket->readLine(); | 89 | response = socket->readLine(); |
90 | qDebug(response); | 90 | //qDebug(response); |
91 | 91 | ||
@@ -97,3 +97,3 @@ void SmtpClient::incomingData() | |||
97 | *stream << "HELO there\r\n"; | 97 | *stream << "HELO there\r\n"; |
98 | qDebug("HELO"); | 98 | //qDebug("HELO"); |
99 | } else errorHandling(ErrUnknownResponse); | 99 | } else errorHandling(ErrUnknownResponse); |
@@ -103,5 +103,5 @@ void SmtpClient::incomingData() | |||
103 | if (response[0] == '2') { | 103 | if (response[0] == '2') { |
104 | *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n"; | 104 | *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; |
105 | status = Recv; | 105 | status = Recv; |
106 | qDebug("MAIL FROM: "+mailPtr->from); | 106 | //qDebug("MAIL FROM: "+mailPtr->from); |
107 | } else errorHandling(ErrUnknownResponse); | 107 | } else errorHandling(ErrUnknownResponse); |
@@ -114,4 +114,4 @@ void SmtpClient::incomingData() | |||
114 | errorHandling(ErrUnknownResponse); | 114 | errorHandling(ErrUnknownResponse); |
115 | *stream << "RCPT TO: <" << *it << ">\r\n"; | 115 | *stream << "RCPT TO: " << *it << ">\r\n"; |
116 | qDebug("RCPT TO: "+ *it); | 116 | //qDebug("RCPT TO: "+ *it); |
117 | status = MRcv; | 117 | status = MRcv; |
@@ -125,3 +125,3 @@ void SmtpClient::incomingData() | |||
125 | *stream << "RCPT TO: <" << *it << ">\r\n"; | 125 | *stream << "RCPT TO: <" << *it << ">\r\n"; |
126 | qDebug("RCPT TO: "+ *it); | 126 | //qDebug("RCPT TO: "+ *it); |
127 | break; | 127 | break; |
@@ -136,3 +136,3 @@ void SmtpClient::incomingData() | |||
136 | status = Body; | 136 | status = Body; |
137 | qDebug("DATA"); | 137 | //qDebug("DATA"); |
138 | emit updateStatus(tr("Sending: ") + mailPtr->subject); | 138 | emit updateStatus(tr("Sending: ") + mailPtr->subject); |
@@ -150,3 +150,3 @@ void SmtpClient::incomingData() | |||
150 | } | 150 | } |
151 | qDebug("BODY"); | 151 | //qDebug("BODY"); |
152 | } else errorHandling(ErrUnknownResponse); | 152 | } else errorHandling(ErrUnknownResponse); |
@@ -165,3 +165,3 @@ void SmtpClient::incomingData() | |||
165 | socket->close(); | 165 | socket->close(); |
166 | qDebug("QUIT"); | 166 | //qDebug("QUIT"); |
167 | } else errorHandling(ErrUnknownResponse); | 167 | } else errorHandling(ErrUnknownResponse); |