summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 5214fe7..d8ca3ba 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1162,59 +1162,62 @@ void KServerSocket::readClient()
1162 if ( blockRC ) 1162 if ( blockRC )
1163 return; 1163 return;
1164 if ( mSocket == 0 ) { 1164 if ( mSocket == 0 ) {
1165 qDebug("ERROR::KSS::readClient(): mSocket == 0 "); 1165 qDebug("ERROR::KSS::readClient(): mSocket == 0 ");
1166 return; 1166 return;
1167 } 1167 }
1168 //qDebug("KServerSocket::readClient()"); 1168 //qDebug("KServerSocket::readClient()");
1169 if ( mSocket->canReadLine() ) { 1169 if ( mSocket->canReadLine() ) {
1170 QString line = mSocket->readLine(); 1170 QString line = mSocket->readLine();
1171 //qDebug("KServerSocket readline: %s ", line.latin1()); 1171 //qDebug("KServerSocket readline: %s ", line.latin1());
1172 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); 1172 QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
1173 if ( tokens[0] == "GET" ) { 1173 if ( tokens[0] == "GET" ) {
1174 if ( tokens[1] == mPassWord ) { 1174 if ( tokens[1] == mPassWord ) {
1175 //emit sendFile( mSocket ); 1175 //emit sendFile( mSocket );
1176 bool ok = false; 1176 bool ok = false;
1177 QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); 1177 QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
1178 if ( ok ) { 1178 if ( ok ) {
1179 KSyncManager::mRequestedSyncEvent = dt; 1179 KSyncManager::mRequestedSyncEvent = dt;
1180 } 1180 }
1181 else 1181 else
1182 KSyncManager::mRequestedSyncEvent = QDateTime(); 1182 KSyncManager::mRequestedSyncEvent = QDateTime();
1183 send_file(); 1183 send_file();
1184 } 1184 }
1185 else { 1185 else {
1186 error_connect();
1186 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); 1187 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
1187 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); 1188 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
1188 } 1189 }
1189 } 1190 }
1190 if ( tokens[0] == "PUT" ) { 1191 if ( tokens[0] == "PUT" ) {
1191 if ( tokens[1] == mPassWord ) { 1192 if ( tokens[1] == mPassWord ) {
1192 //emit getFile( mSocket ); 1193 //emit getFile( mSocket );
1193 blockRC = true; 1194 blockRC = true;
1194 get_file(); 1195 get_file();
1195 } 1196 }
1196 else { 1197 else {
1198 error_connect();
1199 end_connect();
1197 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); 1200 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
1198 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); 1201 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
1199 } 1202 }
1200 } 1203 }
1201 if ( tokens[0] == "STOP" ) { 1204 if ( tokens[0] == "STOP" ) {
1202 //emit endConnect(); 1205 //emit endConnect();
1203 end_connect(); 1206 end_connect();
1204 } 1207 }
1205 } 1208 }
1206} 1209}
1207void KServerSocket::error_connect() 1210void KServerSocket::error_connect()
1208{ 1211{
1209 QTextStream os( mSocket ); 1212 QTextStream os( mSocket );
1210 os.setEncoding( QTextStream::Latin1 ); 1213 os.setEncoding( QTextStream::Latin1 );
1211 os << "ERROR_PW\r\n\r\n"; 1214 os << "ERROR_PW\r\n\r\n";
1212 mSocket->close(); 1215 mSocket->close();
1213 if ( mSocket->state() == QSocket::Idle ) 1216 if ( mSocket->state() == QSocket::Idle )
1214 QTimer::singleShot( 10, this , SLOT ( discardClient())); 1217 QTimer::singleShot( 10, this , SLOT ( discardClient()));
1215} 1218}
1216void KServerSocket::end_connect() 1219void KServerSocket::end_connect()
1217{ 1220{
1218 delete mSyncActionDialog; 1221 delete mSyncActionDialog;
1219 mSyncActionDialog = 0; 1222 mSyncActionDialog = 0;
1220} 1223}