author | groucho <groucho> | 2003-04-24 11:19:11 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-04-24 11:19:11 (UTC) |
commit | 9671975e21266e3bfa6f3c793a3278b67cea34b7 (patch) (unidiff) | |
tree | 876c77939cfd0e00fc844b1b5af09b2978564a6d /noncore/unsupported/mailit/smtpclient.cpp | |
parent | 51e782b9658de61dc02579e115a9c62f396609a3 (diff) | |
download | opie-9671975e21266e3bfa6f3c793a3278b67cea34b7.zip opie-9671975e21266e3bfa6f3c793a3278b67cea34b7.tar.gz opie-9671975e21266e3bfa6f3c793a3278b67cea34b7.tar.bz2 |
- reworked size filtering
- started reworking offline download
- better tab focus switching
- Hello "Whats this" capability
- Fixed parsing of To: header files (no more Delivered-To: and Reply-To: matches)
- Good bye Settings.txt, hello Config Objects and encrypted passwords
- Translation improvements (added trs)
- Parser optimizations
Diffstat (limited to 'noncore/unsupported/mailit/smtpclient.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/unsupported/mailit/smtpclient.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp index b2e38e5..8a51a5b 100644 --- a/noncore/unsupported/mailit/smtpclient.cpp +++ b/noncore/unsupported/mailit/smtpclient.cpp | |||
@@ -84,60 +84,54 @@ void SmtpClient::incomingData() | |||
84 | QString response; | 84 | QString response; |
85 | 85 | ||
86 | if (!socket->canReadLine()) | 86 | if (!socket->canReadLine()) |
87 | return; | 87 | return; |
88 | 88 | ||
89 | response = socket->readLine(); | 89 | response = socket->readLine(); |
90 | //qDebug(response); | ||
91 | 90 | ||
92 | switch(status) { | 91 | switch(status) { |
93 | case Init: { | 92 | case Init: { |
94 | if (response[0] == '2') { | 93 | if (response[0] == '2') { |
95 | status = From; | 94 | status = From; |
96 | mailPtr = mailList.first(); | 95 | mailPtr = mailList.first(); |
97 | *stream << "HELO there\r\n"; | 96 | *stream << "HELO there\r\n"; |
98 | //qDebug("HELO"); | ||
99 | } else errorHandling(ErrUnknownResponse); | 97 | } else errorHandling(ErrUnknownResponse); |
100 | break; | 98 | break; |
101 | } | 99 | } |
102 | case From: { | 100 | case From: { |
103 | if (response[0] == '2') { | 101 | if (response[0] == '2') { |
104 | *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; | 102 | *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; |
105 | status = Recv; | 103 | status = Recv; |
106 | //qDebug("MAIL FROM: "+mailPtr->from); | ||
107 | } else errorHandling(ErrUnknownResponse); | 104 | } else errorHandling(ErrUnknownResponse); |
108 | break; | 105 | break; |
109 | } | 106 | } |
110 | case Recv: { | 107 | case Recv: { |
111 | if (response[0] == '2') { | 108 | if (response[0] == '2') { |
112 | it = mailPtr->to.begin(); | 109 | it = mailPtr->to.begin(); |
113 | if (it == NULL) | 110 | if (it == NULL) |
114 | errorHandling(ErrUnknownResponse); | 111 | errorHandling(ErrUnknownResponse); |
115 | *stream << "RCPT TO: " << *it << ">\r\n"; | 112 | *stream << "RCPT TO: " << *it << ">\r\n"; |
116 | //qDebug("RCPT TO: "+ *it); | ||
117 | status = MRcv; | 113 | status = MRcv; |
118 | } else errorHandling(ErrUnknownResponse); | 114 | } else errorHandling(ErrUnknownResponse); |
119 | break; | 115 | break; |
120 | } | 116 | } |
121 | case MRcv: { | 117 | case MRcv: { |
122 | if (response[0] == '2') { | 118 | if (response[0] == '2') { |
123 | it++; | 119 | it++; |
124 | if ( it != mailPtr->to.end() ) { | 120 | if ( it != mailPtr->to.end() ) { |
125 | *stream << "RCPT TO: <" << *it << ">\r\n"; | 121 | *stream << "RCPT TO: <" << *it << ">\r\n"; |
126 | //qDebug("RCPT TO: "+ *it); | ||
127 | break; | 122 | break; |
128 | } else { | 123 | } else { |
129 | status = Data; | 124 | status = Data; |
130 | } | 125 | } |
131 | } else errorHandling(ErrUnknownResponse); | 126 | } else errorHandling(ErrUnknownResponse); |
132 | } | 127 | } |
133 | case Data: { | 128 | case Data: { |
134 | if (response[0] == '2') { | 129 | if (response[0] == '2') { |
135 | *stream << "DATA\r\n"; | 130 | *stream << "DATA\r\n"; |
136 | status = Body; | 131 | status = Body; |
137 | //qDebug("DATA"); | ||
138 | emit updateStatus(tr("Sending: ") + mailPtr->subject); | 132 | emit updateStatus(tr("Sending: ") + mailPtr->subject); |
139 | } else errorHandling(ErrUnknownResponse); | 133 | } else errorHandling(ErrUnknownResponse); |
140 | break; | 134 | break; |
141 | } | 135 | } |
142 | case Body: { | 136 | case Body: { |
143 | if (response[0] == '3') { | 137 | if (response[0] == '3') { |
@@ -145,13 +139,12 @@ void SmtpClient::incomingData() | |||
145 | mailPtr = mailList.next(); | 139 | mailPtr = mailList.next(); |
146 | if (mailPtr != NULL) { | 140 | if (mailPtr != NULL) { |
147 | status = From; | 141 | status = From; |
148 | } else { | 142 | } else { |
149 | status = Quit; | 143 | status = Quit; |
150 | } | 144 | } |
151 | //qDebug("BODY"); | ||
152 | } else errorHandling(ErrUnknownResponse); | 145 | } else errorHandling(ErrUnknownResponse); |
153 | break; | 146 | break; |
154 | } | 147 | } |
155 | case Quit: { | 148 | case Quit: { |
156 | if (response[0] == '2') { | 149 | if (response[0] == '2') { |
157 | *stream << "QUIT\r\n"; | 150 | *stream << "QUIT\r\n"; |
@@ -160,12 +153,11 @@ void SmtpClient::incomingData() | |||
160 | temp.setNum(mailList.count()); | 153 | temp.setNum(mailList.count()); |
161 | emit updateStatus(tr("Sent ") + temp + tr(" messages")); | 154 | emit updateStatus(tr("Sent ") + temp + tr(" messages")); |
162 | emit mailSent(); | 155 | emit mailSent(); |
163 | mailList.clear(); | 156 | mailList.clear(); |
164 | sending = FALSE; | 157 | sending = FALSE; |
165 | socket->close(); | 158 | socket->close(); |
166 | //qDebug("QUIT"); | ||
167 | } else errorHandling(ErrUnknownResponse); | 159 | } else errorHandling(ErrUnknownResponse); |
168 | break; | 160 | break; |
169 | } | 161 | } |
170 | } | 162 | } |
171 | } | 163 | } |