-rw-r--r-- | libkdepim/ksyncmanager.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index feb184b..e09050e 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -52,12 +52,15 @@ | |||
52 | 52 | ||
53 | #include <klocale.h> | 53 | #include <klocale.h> |
54 | #include <kglobal.h> | 54 | #include <kglobal.h> |
55 | #include <kconfig.h> | 55 | #include <kconfig.h> |
56 | #include <kfiledialog.h> | 56 | #include <kfiledialog.h> |
57 | 57 | ||
58 | QDateTime KSyncManager::mRequestedSyncEvent; | ||
59 | |||
60 | |||
58 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) | 61 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) |
59 | : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu) | 62 | : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu) |
60 | { | 63 | { |
61 | mServerSocket = 0; | 64 | mServerSocket = 0; |
62 | bar = new QProgressBar ( 1, 0 ); | 65 | bar = new QProgressBar ( 1, 0 ); |
63 | bar->setCaption (""); | 66 | bar->setCaption (""); |
@@ -1108,15 +1111,22 @@ void KServerSocket::readClient() | |||
1108 | //qDebug("KServerSocket::readClient()"); | 1111 | //qDebug("KServerSocket::readClient()"); |
1109 | if ( mSocket->canReadLine() ) { | 1112 | if ( mSocket->canReadLine() ) { |
1110 | QString line = mSocket->readLine(); | 1113 | QString line = mSocket->readLine(); |
1111 | //qDebug("KServerSocket readline: %s ", line.latin1()); | 1114 | //qDebug("KServerSocket readline: %s ", line.latin1()); |
1112 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | 1115 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); |
1113 | if ( tokens[0] == "GET" ) { | 1116 | if ( tokens[0] == "GET" ) { |
1114 | if ( tokens[1] == mPassWord ) | 1117 | if ( tokens[1] == mPassWord ) { |
1115 | //emit sendFile( mSocket ); | 1118 | //emit sendFile( mSocket ); |
1119 | bool ok = false; | ||
1120 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); | ||
1121 | if ( ok ) | ||
1122 | KSyncManager::mRequestedSyncEvent = dt; | ||
1123 | else | ||
1124 | KSyncManager::mRequestedSyncEvent = QDateTime(); | ||
1116 | send_file(); | 1125 | send_file(); |
1126 | } | ||
1117 | else { | 1127 | else { |
1118 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1128 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); |
1119 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1129 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1120 | } | 1130 | } |
1121 | } | 1131 | } |
1122 | if ( tokens[0] == "PUT" ) { | 1132 | if ( tokens[0] == "PUT" ) { |
@@ -1264,13 +1274,15 @@ void KCommandSocket::readFile( QString fn ) | |||
1264 | mFileString = ""; | 1274 | mFileString = ""; |
1265 | mFileName = fn; | 1275 | mFileName = fn; |
1266 | mFirst = true; | 1276 | mFirst = true; |
1267 | mSocket->connectToHost( mHost, mPort ); | 1277 | mSocket->connectToHost( mHost, mPort ); |
1268 | QTextStream os( mSocket ); | 1278 | QTextStream os( mSocket ); |
1269 | os.setEncoding( QTextStream::Latin1 ); | 1279 | os.setEncoding( QTextStream::Latin1 ); |
1270 | os << "GET " << mPassWord << "\r\n"; | 1280 | |
1281 | QString curDt = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | ||
1282 | os << "GET " << mPassWord << curDt <<"\r\n"; | ||
1271 | mTimerSocket->start( 20000 ); | 1283 | mTimerSocket->start( 20000 ); |
1272 | } | 1284 | } |
1273 | 1285 | ||
1274 | void KCommandSocket::writeFile( QString fileName ) | 1286 | void KCommandSocket::writeFile( QString fileName ) |
1275 | { | 1287 | { |
1276 | if ( !mSocket ) { | 1288 | if ( !mSocket ) { |