fixes

3 files changed, 93 insertions, 2 deletions

diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 2bd9e71..c89939d 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -34,24 +34,25 @@ $Id$
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
+#include <kglobalsettings.h>
 
 #include "formatfactory.h"
 
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 #define NO_DIRWATCH
 #include "resourcefile.h"
 
 //#define ALLOW_LOCKING
 
 
@@ -70,46 +71,47 @@ __declspec(dllexport)
     return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
   }
 #ifndef _WIN32_
 }
 #endif
 
 ResourceFile::ResourceFile( const KConfig *config )
   : Resource( config ) , mFormat( 0 )
 {
   QString fileName, formatName, default_fileName;
 
   default_fileName = StdAddressBook::fileName();
-
+  mLastBackupDate = -1;
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     fileName = cfg->readEntry( "FileName", default_fileName );
     formatName = cfg->readEntry( "FileFormat", "vcard" );
     mFamily =  cfg->readEntry( "ResourceName", "std" );
+    mLastBackupDate = cfg->readNumEntry( "LastBackupDate", 0 );
   } else {
     fileName = default_fileName;
     formatName = "vcard";
   }
 
   init( fileName, formatName );
 }
 
 ResourceFile::ResourceFile( const QString &fileName ,
                             const QString &formatName )
   : Resource( 0 )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
    
 
-
+    mLastBackupDate = -1;
   init( fileName, formatName );
 }
 
 void ResourceFile::init( const QString &fileName, const QString &formatName )
 {
   mFormatName = formatName;
 
   FormatFactory *factory = FormatFactory::self();
   mFormat = factory->format( mFormatName );
 
   if ( !mFormat ) {
     mFormatName = "vcard";
@@ -248,24 +250,67 @@ bool ResourceFile::save( Ticket *ticket )
   bool ok = false;
   if ( saveFile.status() == 0 && saveFile.file() )
   {
     mFormat->saveAll( addressBook(), this, saveFile.file() );
     ok = saveFile.close();
   }
 */
 
 //US ToDo: write backupfile
 #ifndef NO_DIRWATCH
   mDirWatch.stopScan();
 #endif
+  if ( mLastBackupDate >= 0  && mFamily != "sync_res") {
+      KConfig conf (locateLocal("config","microkdeglobalrc"));
+      conf.setGroup( "BackupSettings" );
+      bool b_enabled =   conf.readBoolEntry( "BackupEnabled" );
+      if ( b_enabled ) {
+          int num = conf.readNumEntry( "BackupNumbers" );
+          int d_count = conf.readNumEntry( "BackupDayCount" );
+          bool stdDir = conf.readBoolEntry( "BackupUseDefaultDir" );
+          QString bupDir = conf.readEntry( "BackupDatadir" );
+          QDate reference ( 2000,1,1 );
+          int daysTo = reference.daysTo ( QDate::currentDate() ); 
+          bool saveDate = false;
+          if ( daysTo - d_count >= mLastBackupDate ) {
+                qDebug("KA: Last backup was %d days ago ", daysTo - mLastBackupDate );
+                if ( stdDir )
+                    bupDir = KGlobalSettings::backupDataDir();
+                int retval =  KApplication::createBackup(  fileName(), bupDir, num );
+                if ( retval == 0 ) {
+                    qDebug("KO: Backup cancelled. Will try again tomorrow ");
+                    // retval == 0 : backup skipped for today, try again tomorrow
+                    mLastBackupDate = daysTo - d_count+1;
+                    saveDate = true;
+                } else if ( retval == 1 ){
+                    qDebug("KO: Backup created.");
+                    // backup ok
+                    mLastBackupDate =  daysTo;
+                    saveDate = true;
+                } else if ( retval == 2 ){
+                    qDebug("KO: Backup globally cancelled.");
+                    // backup globally cancelled
+                    b_enabled = false;
+                }
+                if ( !b_enabled ) {
+                    conf.writeEntry( "mBackupEnabled", false );
+                }
+                if ( saveDate ) {
+                    KConfig config ( locateLocal("config","kabcrc") );
+                    config.setGroup( "Resource_" + identifier() );
+                    config.writeEntry( "LastBackupDate", mLastBackupDate );
+                }
+          }
+      }
+  }
   QFile info;
   info.setName( fileName() );
   bool ok = info.open( IO_WriteOnly );
   if ( ok ) {
     mFormat->saveAll( addressBook(), this, &info );
 
     info.close();
     ok = true;
   }
   else {
 
   }
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index 3e9edfc..61da154 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -138,24 +138,25 @@ public:
   virtual void cleanUp();
 
 protected slots:
   void fileChanged();
 
 protected:
   void init( const QString &fileName, const QString &format );
 
   bool lock( const QString &fileName );
   void unlock( const QString &fileName );
 
 private:
+  int mLastBackupDate;
   QString mFamily;
   QString mFileName2;
   QString mFormatName;
 
   FormatPlugin *mFormat;
 
   QString mLockUniqueName;
 #ifndef  NO_DIRWATCH
   KDirWatch mDirWatch;
 #endif
 };
 
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 61f2616..36b0df5 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -26,24 +26,26 @@
 #include "serializer.h"
 #include "compressgzip.h"
 //US#include "compressbzip2.h"
 #include "randomizer.h"
 #include "pwminit.h"
 #include "libgcryptif.h"
 #ifdef PWM_EMBEDDED
 #include "pwmprefs.h"
 #include "kglobal.h"
 #endif
 
 #include <kmessagebox.h>
+#include <kconfig.h>
+#include <kglobalsettings.h>
 #include <libkcal/syncdefines.h>
 
 
 #ifdef CONFIG_KWALLETIF
 # include "kwalletemu.h"
 #endif // CONFIG_KWALLETIF
 
 #include <qdatetime.h>
 #include <qsize.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 
@@ -418,24 +420,67 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
 		printWarn("Invalid Hash-Algorithm selected! "
 			  "Config-file seems to be corrupt. "
 			  "Falling back to SHA1.");
 		_hashAlgo = PWM_HASH_SHA1;
 	}
 	char cryptAlgo = static_cast<char>(_cryptAlgo);
 	char hashAlgo = static_cast<char>(_hashAlgo);
 
 	if (conf()->confGlobMakeFileBackup()) {
 		if (!backupFile(filename))
 			return e_fileBackup;
 	}
+    int mLastBackupDate = 0;
+    KConfig configGlobal (locateLocal("config","pwmanagerbuprc"));
+    QFileInfo fileInfo ( filename );
+    mLastBackupDate = configGlobal.readNumEntry( "LastBackupDate-"+ fileInfo.fileName (), 0 );
+      KConfig config (locateLocal("config","microkdeglobalrc"));
+      config.setGroup( "BackupSettings" );
+      bool b_enabled =   config.readBoolEntry( "BackupEnabled" );
+      if ( b_enabled ) {
+          int num = config.readNumEntry( "BackupNumbers" );
+          int d_count = config.readNumEntry( "BackupDayCount" );
+          bool stdDir = config.readBoolEntry( "BackupUseDefaultDir" );
+          QString bupDir = config.readEntry( "BackupDatadir" );
+          QDate reference ( 2000,1,1 );
+          int daysTo = reference.daysTo ( QDate::currentDate() ); 
+          bool saveDate = false;
+          if ( daysTo - d_count >= mLastBackupDate ) {
+                qDebug("KA: Last backup was %d days ago ", daysTo - mLastBackupDate );
+                if ( stdDir )
+                    bupDir = KGlobalSettings::backupDataDir();
+                int retval =  KApplication::createBackup(  filename, bupDir, num );
+                if ( retval == 0 ) {
+                    qDebug("KO: Backup cancelled. Will try again tomorrow ");
+                    // retval == 0 : backup skipped for today, try again tomorrow
+                    mLastBackupDate = daysTo - d_count+1;
+                    saveDate = true;
+                } else if ( retval == 1 ){
+                    qDebug("KO: Backup created.");
+                    // backup ok
+                    mLastBackupDate =  daysTo;
+                    saveDate = true;
+                } else if ( retval == 2 ){
+                    qDebug("KO: Backup globally cancelled.");
+                    // backup globally cancelled
+                    b_enabled = false;
+                }
+                if ( !b_enabled ) {
+                    config.writeEntry( "mBackupEnabled", false );
+                }
+                if ( saveDate ) {
+                    configGlobal.writeEntry( "LastBackupDate-"+ fileInfo.fileName (), mLastBackupDate );
+                }
+          }
+      }
 	if (QFile::exists(filename)) {
 		/* Move the existing file to some tmp file.
 		 * When saving file succeeds, delete tmp file. Otherwise
 		 * move tmp file back. See below.
 		 */
 		Randomizer *rnd = Randomizer::obj();
 		char rnd_buf[5];
 		sprintf(rnd_buf, "%X%X%X%X", rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF,
 			rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF);
 		tmpFileMoved = filename + "." + rnd_buf + ".mv";
 		if (!copyFile(filename, tmpFileMoved))
 			return e_openFile;