fixed bug with QDomDocument handling, plus some GUI enhancements

3 files changed, 23 insertions, 4 deletions

diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp
index e42dd9d..5e675fc 100644
--- a/pwmanager/pwmanager/pwmdocui.cpp
+++ b/pwmanager/pwmanager/pwmdocui.cpp
@@ -59,399 +59,399 @@ PwMDocUi::~PwMDocUi()
 QString PwMDocUi::requestMpw(bool chipcard)
 {
         QString pw;
 
         if (chipcard) {
 #ifdef CONFIG_KEYCARD
                 PWM_ASSERT(keyCard);
                 uint32_t id;
                 string ret;
                 SpinForSignal *spinner = keyCard->getSpinner();
                 connect(keyCard, SIGNAL(keyAvailable(uint32_t, const string &)),
                         spinner, SLOT(u32_str_slot(uint32_t, const string &)));
                 keyCard->getKey();
                 spinner->spin(&id, &ret);
                 disconnect(keyCard, SIGNAL(keyAvailable(uint32_t, const string &)),
                            spinner, SLOT(u32_str_slot(uint32_t, const string &)));
                 if (ret == "")
                         return "";
                 pw = ret.c_str();
 #else // CONFIG_KEYCARD
                 no_keycard_support_msg_box(currentView);
 #endif // CONFIG_KEYCARD
         } else {
 #ifndef PWM_EMBEDDED
                 GetMasterPwWndImpl pwWnd;
                 KWin::setState(pwWnd.winId(), NET::StaysOnTop);
 #else
                 GetMasterPwWndImpl pwWnd;
 #endif
                 if (pwWnd.exec() != 1)
                         return "";
                 pw = pwWnd.pwLineEdit->text();
         }
 
         return pw;
 }
 
 QString PwMDocUi::requestNewMpw(bool *chipcard)
 {
         QString pw;
         SetMasterPwWndImpl pwWnd(currentView);
         pwWnd.setPwMKeyCard(keyCard);
         if (!chipcard) {
 #ifndef PWM_EMBEDDED
                 pwWnd.mainTab->removePage(pwWnd.mainTab->page(1));
 #else
                 pwWnd.mainTab->removePage(pwWnd.tab_2);
 #endif
         }
 
         if (pwWnd.exec() != 1)
                 return "";
         pw = pwWnd.getPw(chipcard).c_str();
 
         return pw;
 }
 
 QString PwMDocUi::requestMpwChange(const QString *currentPw, bool *chipcard)
 {
         QString pw(requestMpw(*chipcard));
         if (pw == "")
                 return "";
         if (pw != *currentPw) {
                 wrongMpwMsgBox(*chipcard);
                 return "";
         }
 
         pw = requestNewMpw(chipcard);
         if (pw == "")
                 return "";
         return pw;
 }
 
 void PwMDocUi::wrongMpwMsgBox(bool chipcard, QString prefix, QString postfix)
 {
         QString msg;
         if (prefix != "") {
                 msg += prefix;
                 msg += "\n";
         }
 
         if (chipcard) {
                 msg += i18n("Wrong key-card!\n"
                             "Please try again with the\n"
                             "correct key-card.");
         } else {
                 msg += i18n("Wrong master-password!\n"
                             "Please try again.");
         }
 
         if (postfix != "") {
                 msg += "\n";
                 msg += postfix;
         }
         KMessageBox::error(currentView, msg,
                            (chipcard) ? (i18n("wrong chipcard"))
                                          : (i18n("password error")));
 }
 
 void PwMDocUi::noMpwMsgBox(bool chipcard, QString prefix, QString postfix)
 {
         QString msg;
         if (prefix != "") {
                 msg += prefix;
                 msg += "\n";
         }
 
         if (chipcard) {
                 msg += i18n("No key-card found!\n"
                             "Please insert the\n"
                             "correct key-card.");
         } else {
                 msg += i18n("No master-password given!");
         }
 
         if (postfix != "") {
                 msg += "\n";
                 msg += postfix;
         }
         KMessageBox::error(currentView, msg,
                            (chipcard) ? (i18n("no chipcard"))
                                          : (i18n("password error")));
 }
 
 void PwMDocUi::rootAlertMsgBox()
 {
         KMessageBox::error(currentView,
                            i18n("This feature is not available, "
                                 "if you execute PwM with \"root\" "
                                 "UID 0 privileges, for security reasons!"),
                            i18n("not allowed as root!"));
 }
 
 void PwMDocUi::cantDeeplock_notSavedMsgBox()
 {
         KMessageBox::error(currentView,
                            i18n("Can't deep-lock, because the document "
                                 "hasn't been saved, yet. Please save "
                                 "to a file and try again."),
                            i18n("not saved, yet"));
 }
 
 void PwMDocUi::gpmPwLenErrMsgBox()
 {
         KMessageBox::error(currentView,
                            i18n("GPasman does not support passwords "
                                 "shorter than 4 characters! Please try "
                                 "again with a longer password."),
                            i18n("password too short"));
 }
 
 int PwMDocUi::dirtyAskSave(const QString &docTitle)
 {
         int ret;
 #ifndef PWM_EMBEDDED
         ret = KMessageBox::questionYesNoCancel(currentView,
                                                i18n("The list \"") +
                                                docTitle +
                                                i18n
                                                ("\" has been modified.\n"
                                                 "Do you want to save it?"),
                                                i18n("save?"));
         if (ret == KMessageBox::Yes) {
                 return 0;
         } else if (ret == KMessageBox::No) {
                 return 1;
         }
 #else
         ret = KMessageBox::warningYesNoCancel(currentView,
                                                i18n("The list \"") +
                                                docTitle +
                                                i18n
                                                ("\" has been modified.\n"
                                                 "Do you want to save it?"),
                                                i18n("save?"));
         if (ret == KMessageBox::Yes) {
                 return 0;
         } else if (ret == KMessageBox::No) {
                 return 1;
         }
 
 #endif
 
         // cancel
         return -1;
 }
 
 bool PwMDocUi::saveDocUi(PwMDoc *doc)
 {
         PWM_ASSERT(doc);
         doc->timer()->getLock(DocTimer::id_autoLockTimer);
         if (doc->isDocEmpty()) {
                 KMessageBox::information(currentView,
                                          i18n
                                          ("Sorry, there's nothing to save.\n"
                                           "Please first add some passwords."),
                                          i18n("nothing to do"));
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return true;
         }
         PwMerror ret = doc->saveDoc(conf()->confGlobCompression());
         if (ret == e_filename) {
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return saveAsDocUi(doc);
         } else if (ret == e_weakPw) {
                 KMessageBox::error(currentView,
                                    i18n("Error: This is a weak password.\n"
                                         "Please select another password."),
                                    i18n("weak password"));
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return false;
         } else if (ret == e_fileBackup) {
                 KMessageBox::error(currentView,
                                    i18n("Error: Couldn't make backup-file!"),
                                    i18n("backup failed"));
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return false;
         } else if (ret != e_success) {
                 KMessageBox::error(currentView,
                                    i18n("Error: Couldn't write to file.\n"
                                         "Please check if you have permission to "
                                         "write to the file in that directory."),
                                    i18n("error while writing"));
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return false;
         }
         doc->timer()->putLock(DocTimer::id_autoLockTimer);
         return true;
 }
 
 bool PwMDocUi::saveAsDocUi(PwMDoc *doc)
 {
         PWM_ASSERT(doc);
         doc->timer()->getLock(DocTimer::id_autoLockTimer);
         if (doc->isDocEmpty()) {
                 KMessageBox::information(currentView,
                                          i18n
                                          ("Sorry, there's nothing to save.\n"
                                           "Please first add some passwords."),
                                          i18n("nothing to do"));
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return true;
         }
 #ifndef PWM_EMBEDDED
         QString fn(KFileDialog::getSaveFileName(QString::null,
                                                 i18n("*.pwm|PwManager Password file"),
                                                 currentView));
 #else
         QString fn = locateLocal( "data", KGlobal::getAppName() + "/*.pwm" );
         fn = KFileDialog::getSaveFileName(fn,
                                                 i18n("password filename(*.pwm)"),
                                                 currentView);
 
 #endif
         if (fn == "") {
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return false;
         }
         if (fn.right(4) != ".pwm")
                 fn += ".pwm";
 
         PwMerror ret = doc->saveDoc(conf()->confGlobCompression(), &fn);
         if (ret != e_success) {
                 KMessageBox::error(currentView,
                                    i18n("Error: Couldn't write to file.\n"
                                         "Please check if you have permission to "
                                         "write to the file in that directory."),
                                    i18n("error while writing"));
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return false;
         }
         doc->timer()->putLock(DocTimer::id_autoLockTimer);
         return true;
 }
 
 bool PwMDocUi::openDocUi(PwMDoc *doc,
                          QString filename,
                          bool openDeepLocked)
 {
         if (filename.isEmpty())
           {
 #ifndef PWM_EMBEDDED
                 filename = KFileDialog::getOpenFileName(QString::null,
                                                         i18n("*.pwm|PwManager Password file\n"
                                                              "*|All files"), getCurrentView());
 #else
                 filename = locateLocal( "data", KGlobal::getAppName() + "/*.pwm");
                 filename = KFileDialog::getOpenFileName(filename,
                                                         i18n("password filename(*.pwm)"), getCurrentView());
 #endif
           }
         if (filename.isEmpty())
                 goto cancelOpen;
         PwMerror ret;
         while (true) {
                 int lockStat = -1;
                 if (openDeepLocked) {
                         lockStat = 2;
                 } else {
                         if (conf()->confGlobUnlockOnOpen()) {
                                 lockStat = 0;
                         } else {
                                 lockStat = 1;
                         }
                 }
                 ret = doc->openDoc(&filename, lockStat);
                         qDebug("pwmdocui::OpenDocui %i", ret);  
                 if (ret != e_success) {
                         if (ret == e_readFile || ret == e_openFile) {
                                 KMessageBox::error(getCurrentView(),
                                                    i18n("Could not read file!")
                                                    + "\n"
                                                    + filename,
                                                    i18n("file error"));
                                 goto cancelOpen;
                         }
                         if (ret == e_alreadyOpen) {
                                 KMessageBox::error(getCurrentView(),
                                                    i18n("This file is already open."),
                                                    i18n("already open"));
                                 goto cancelOpen;
                         }
                         if (ret == e_fileVer) {
                                 KMessageBox::error(getCurrentView(),
                                                    i18n
                                                    ("File-version is not supported!\n"
                                                     "Did you create this file with an older or newer version of PwM?"),
                                                    i18n
                                                    ("incompatible version"));
                                 goto cancelOpen;
                         }
                         if (ret == e_wrongPw) {
                                 continue;
                         }
                         if (ret == e_noPw) {
                                 goto cancelOpen;
                         }
                         if (ret == e_fileFormat) {
                                 KMessageBox::error(getCurrentView(),
                                                    i18n
                                                    ("Sorry, this file has not been recognized "
                                                     "as a PwM Password file.\n"
                                                     "Probably you have selected the wrong file."),
                                                    i18n
                                                    ("no PwM password-file"));
                                 goto cancelOpen;
                         }
                         if (ret == e_fileCorrupt) {
                                 KMessageBox::error(getCurrentView(),
                                                    i18n
                                                    ("File corrupt!\n"
                                                     "Maybe the media, you stored this file on, "
                                                     "had bad sectors?"),
                                                    i18n
                                                    ("checksum error"));
                                 goto cancelOpen;
                         }
                 }
                 break;
         }
         return true;
 
       cancelOpen:
         return false;
 }
 
 QString PwMDocUi::string_defaultCategory()
 {
         return i18n("Default");
 }
 
 QString PwMDocUi::string_locked()
 {
         return i18n("<LOCKED>");
 }
 
 QString PwMDocUi::string_deepLockedShort()
 {
         return i18n("DEEP-LOCKED");
 }
 
 QString PwMDocUi::string_deepLockedLong()
 {
         return i18n("This file is DEEP-LOCKED!\n"
-                    "That means all data has been encrypted "
-                    "and written out to the file. If you want "
-                    "to see the entries, please UNLOCK the file. "
-                    "While unlocking, you will be prompted for the "
+                    "That means all data has been encrypted\n"
+                    "and written out to the file. If you want\n"
+                    "to see the entries, please UNLOCK the file.\n"
+                    "While unlocking, you will be prompted for the\n"
                     "master-password or the key-card.");
 }
 
 QString PwMDocUi::string_defaultTitle()
 {
         return i18n("Untitled");
 }
 
 #ifndef PWM_EMBEDDED
 #include "pwmdocui.moc"
 #endif
diff --git a/pwmanager/pwmanager/pwmexception.cpp b/pwmanager/pwmanager/pwmexception.cpp
index 4c00b04..c0dbb39 100644
--- a/pwmanager/pwmanager/pwmexception.cpp
+++ b/pwmanager/pwmanager/pwmexception.cpp
@@ -1,58 +1,65 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2003, 2004 by Michael Buesch                            *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 
 #include "pwmexception.h"
 
 #include <kmessagebox.h>
 
 
 void pwmFatal(const char *id,
               const char *file,
               int line)
 {
         cerr << PROG_NAME " " << id << " at "
              << file << ":" << line
              << endl;
 }
 
 void __printError(const string &msg)
 {
         QString __msg(PROG_NAME " generated a fatal fault:\n");
         __msg += msg.c_str();
         cerr << "\n\n" << __msg.latin1() << endl;
         KMessageBox::error(0, __msg, PROG_NAME " fatal ERROR!");
 }
 
 void __printInfo(const string &msg)
 {
         cout << PROG_NAME " INFO: " << msg << endl;
+#ifdef PWM_DEBUG
+        qDebug("%s INFO: %s", PROG_NAME, msg.c_str()) ;
+#endif
 }
 
 void __printWarn(const string &msg)
 {
         cerr << PROG_NAME " WARNING: " << msg << endl;
+#ifdef PWM_DEBUG
+        qDebug("%s WARNING: %s", PROG_NAME, msg.c_str()) ;
+#endif
 }
 
 #ifdef PWM_DEBUG
 void __printDebug(const string &msg)
 {
         cout << PROG_NAME " DEBUG: " << msg << endl;
+        qDebug("%s DEBUG: %s", PROG_NAME, msg.c_str()) ;
 }
 #endif // PWM_DEBUG
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 2810b48..fcdcec3 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -1,569 +1,581 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2004 by Michael Buesch                                  *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 2.0 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "serializer.h"
 #include "pwmexception.h"
 
 #ifdef PWM_EMBEDDED
 #include <kglobal.h>
 #include <klocale.h>
 #endif
 
 /* enable/disable serializer debugging (0/1) */
         #define SERIALIZER_DEBUG1
 /* use the old xml tags for writing (0/1) */
         #define USE_OLD_TAGS    0
 /* write a CDATA section (0/1) */
         #define WRITE_CDATA_SEC         0
 
 
         #define META_CREATE_DATE"c"
         #define META_VALID_DATE         "v"
         #define META_EXPIRE_DATE"e"
         #define META_UPDATE_DATE"u"
         #define META_UPDATE_INT         "i"
 //US ENH : uniqueid
 #define META_UNIQUEID "n" 
 
 /* This is compatibility stuff.
  * The names of the entries have changed and here are the
  * new and old ones
  */
         #define ROOT_MAGIC_OLD  "PwM-xml-dat"
         #define VER_STR_OLD     "ver"
         #define COMPAT_VER_OLD  "0x02"
         #define CAT_ROOT_OLD    "categories"
         #define CAT_PREFIX_OLD  "cat_"
         #define CAT_NAME_OLD    "name"
         #define ENTRY_PREFIX_OLD"entry_"
         #define ENTRY_DESC_OLD  "desc"
         #define ENTRY_NAME_OLD  "name"
         #define ENTRY_PW_OLD    "pw"
         #define ENTRY_COMMENT_OLD"comment"
         #define ENTRY_URL_OLD   "url"
         #define ENTRY_LAUNCHER_OLD"launcher"
         #define ENTRY_LVP_OLD   "listViewPos"
         #define ENTRY_BIN_OLD   "b"
         #define ENTRY_META_OLD  "m"
 
         #define ROOT_MAGIC_NEW  "P"
         #define VER_STR_NEW     "v"
         #define COMPAT_VER_NEW  "2"
         #define CAT_ROOT_NEW    "c"
         #define CAT_PREFIX_NEW  "c"
         #define CAT_NAME_NEW    "n"
         #define ENTRY_PREFIX_NEW"e"
         #define ENTRY_DESC_NEW  "d"
         #define ENTRY_NAME_NEW  "n"
         #define ENTRY_PW_NEW    "p"
         #define ENTRY_COMMENT_NEW"c"
         #define ENTRY_URL_NEW   "u"
         #define ENTRY_LAUNCHER_NEW"l"
         #define ENTRY_LVP_NEW   "v"
         #define ENTRY_BIN_NEW   ENTRY_BIN_OLD
         #define ENTRY_META_NEW  ENTRY_META_OLD
 
 #if USE_OLD_TAGS != 0
         # define ROOT_MAGIC_WR  ROOT_MAGIC_OLD
         # define VER_STR_WR     VER_STR_OLD
         # define COMPAT_VER_WR  COMPAT_VER_OLD
         # define CAT_ROOT_WR    CAT_ROOT_OLD
         # define CAT_PREFIX_WR  CAT_PREFIX_OLD
         # define CAT_NAME_WR    CAT_NAME_OLD
         # define ENTRY_PREFIX_WRENTRY_PREFIX_OLD
         # define ENTRY_DESC_WR  ENTRY_DESC_OLD
         # define ENTRY_NAME_WR  ENTRY_NAME_OLD
         # define ENTRY_PW_WR    ENTRY_PW_OLD
         # define ENTRY_COMMENT_WRENTRY_COMMENT_OLD
         # define ENTRY_URL_WR   ENTRY_URL_OLD
         # define ENTRY_LAUNCHER_WRENTRY_LAUNCHER_OLD
         # define ENTRY_LVP_WR   ENTRY_LVP_OLD
         # define ENTRY_BIN_WR   ENTRY_BIN_OLD
         # define ENTRY_META_WR  ENTRY_META_OLD
 #else
         # define ROOT_MAGIC_WR  ROOT_MAGIC_NEW
         # define VER_STR_WR     VER_STR_NEW
         # define COMPAT_VER_WR  COMPAT_VER_NEW
         # define CAT_ROOT_WR    CAT_ROOT_NEW
         # define CAT_PREFIX_WR  CAT_PREFIX_NEW
         # define CAT_NAME_WR    CAT_NAME_NEW
         # define ENTRY_PREFIX_WRENTRY_PREFIX_NEW
         # define ENTRY_DESC_WR  ENTRY_DESC_NEW
         # define ENTRY_NAME_WR  ENTRY_NAME_NEW
         # define ENTRY_PW_WR    ENTRY_PW_NEW
         # define ENTRY_COMMENT_WRENTRY_COMMENT_NEW
         # define ENTRY_URL_WR   ENTRY_URL_NEW
         # define ENTRY_LAUNCHER_WRENTRY_LAUNCHER_NEW
         # define ENTRY_LVP_WR   ENTRY_LVP_NEW
         # define ENTRY_BIN_WR   ENTRY_BIN_NEW
         # define ENTRY_META_WR  ENTRY_META_NEW
 #endif
 
 
 Serializer::Serializer()
 {
         defaultLockStat = true;
+//US BUG: I needed to specify a document name. Otherwise impl will not be created for serializing
+#ifndef PWM_EMBEDDED
         domDoc = new QDomDocument;
+#else
+        domDoc = new QDomDocument("mydoc");
+#endif
 }
 
 Serializer::Serializer(const QCString &buffer)
 {
         defaultLockStat = true;
+//US BUG: I needed to specify a document name. Otherwise impl will not be created for serializing
+#ifndef PWM_EMBEDDED
         domDoc = new QDomDocument;
+#else
+        domDoc = new QDomDocument("mydoc");
+#endif
+
         if (!parseXml(buffer)) {
                 delete domDoc;
 #ifndef PWM_EMBEDDED
                 throw PwMException(PwMException::EX_PARSE);
 #else
                 qDebug("Serializer::Serializer : Parse Exception ");
 #endif
         }
 }
 
 Serializer::~Serializer()
 {
         delete_ifnot_null(domDoc);
 }
 
 void Serializer::clear()
 {
         delete_ifnot_null(domDoc);
         domDoc = new QDomDocument;
 }
 
 bool Serializer::parseXml(const QCString &buffer)
 {
         PWM_ASSERT(domDoc);
 #ifndef PWM_EMBEDDED
         if (!domDoc->setContent(buffer, true))
                 return false;
 #else
         if (!domDoc->setContent(buffer))
                 return false;
 #endif
         if (!checkValid())
                 return false;
         return true;
 }
 
 QCString Serializer::getXml()
 {
         PWM_ASSERT(domDoc);
 
 #ifndef PWM_EMBEDDED
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
         QCString tmp(domDoc->toCString(8));
         printDebug("<BEGIN Serializer::getXml() dump>\n");
         cout << tmp << endl;
         printDebug("<END Serializer::getXml() dump>");
 #endif // DEBUG
 
         QCString ret(domDoc->toCString(0));
         ret.replace('\n', "");
         return ret;
 #else
 
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
         QCString tmp("        " + domDoc->toCString());
         printDebug("<BEGIN Serializer::getXml() dump>\n");
+        qDebug(tmp);
         cout << tmp << endl;
         printDebug("<END Serializer::getXml() dump>");
 #endif // DEBUG
 
         QCString ret(domDoc->toCString());
         ret.replace(QRegExp("\n"), "");
         return ret;
 
 #endif
 }
 
 bool Serializer::serialize(const vector<PwMCategoryItem> &dta)
 {
         PWM_ASSERT(domDoc);
         QDomElement root(genNewRoot());
         QDomElement catNode(domDoc->createElement(CAT_ROOT_WR));
         root.appendChild(catNode);
         if (!addCategories(&catNode, dta))
                 return false;
         return true;
 }
 
 bool Serializer::deSerialize(vector<PwMCategoryItem> *dta)
 {
         PWM_ASSERT(domDoc);
         PWM_ASSERT(dta);
         QDomElement root(domDoc->documentElement());
         QDomNode n;
 
         dta->clear();
         for (n = root.firstChild(); !n.isNull(); n = n.nextSibling()) {
                 // find <categories> ... </categories>
                 //      <c>          ... </c>
                 if (n.nodeName() == CAT_ROOT_NEW ||
                     n.nodeName() == CAT_ROOT_OLD) {
                         if (!readCategories(n, dta)) {
                                 return false;
                         }
 
                         /* NOTE: We can stop processing here, as we
                          *       don't have more nodes in root, yet.
                          */
                         return true;
                 }
         }
         return false;
 }
 
 bool Serializer::readCategories(const QDomNode &n,
                                 vector<PwMCategoryItem> *dta)
 {
         QDomNodeList nl(n.childNodes());
         QDomNode cur;
         QString name;
         unsigned int numCat = nl.count(), i;
         PwMCategoryItem curCat;
         vector<PwMDataItem> curEntr;
 
         if (!numCat) {
                 printDebug("Serializer::readCategories(): empty");
                 return false;
         }
         for (i = 0; i < numCat; ++i) {
                 cur = nl.item(i);
                 if (cur.nodeName().left(1) == CAT_PREFIX_NEW ||
                     cur.nodeName().left(4) == CAT_PREFIX_OLD) {
                         name = cur.toElement().attribute(CAT_NAME_NEW);
                         if (name == QString::null)
                                 name = cur.toElement().attribute(CAT_NAME_OLD);
                         PWM_ASSERT(name != QString::null);
                         PWM_ASSERT(name != "");
                         curCat.clear();
                         curCat.name = name.latin1();
                         if (!readEntries(cur, &curEntr)) {
                                 dta->clear();
                                 return false;
                         }
                         curCat.d = curEntr;
                         dta->push_back(curCat);
                 } else {
                         printDebug("Serializer::readCategories(): uh? not a category?");
                 }
         }
         return true;
 }
 
 bool Serializer::readEntries(const QDomNode &n,
                              vector<PwMDataItem> *dta)
 {
         QDomNodeList nl(n.childNodes());
         QDomNode cur;
         unsigned int numEntr = nl.count(), i;
         PwMDataItem curEntr;
 
         dta->clear();
         for (i = 0; i < numEntr; ++i) {
                 cur = nl.item(i);
                 if (cur.nodeName().left(1) == ENTRY_PREFIX_NEW ||
                     cur.nodeName().left(6) == ENTRY_PREFIX_OLD) {
                         if (!extractEntry(cur, &curEntr)) {
                                 return false;
                         }
                         dta->push_back(curEntr);
                 } else {
                         printDebug("Serializer::readEntries(): hm? not an entry?");
                 }
         }
         return true;
 }
 
 bool Serializer::extractEntry(const QDomNode &n,
                               PwMDataItem *dta)
 {
         QDomNodeList nl(n.childNodes());
         QDomNode cur, cdata;
         unsigned int cnt = nl.count(), i;
         QString name, text;
 
         if (!cnt) {
                 printDebug("Serializer::extractEntry(): empty");
                 return false;
         }
         dta->clear();
         for (i = 0; i < cnt; ++i) {
                 cur = nl.item(i);
                 name = cur.nodeName();
                 cdata = cur.firstChild();
                 if (unlikely(cdata.isCDATASection())) {
                         text = cdata.toCDATASection().data();
                 } else if (likely(cur.isElement())) {
                         text = cur.toElement().text();
                 } else {
                         printDebug("Serializer::extractEntry(): neither CDATA nor element.");
                         return false;
                 }
                 if (text == " ")
                         text = ""; // for backward compatibility.
                 if (name == ENTRY_DESC_NEW ||
                     name == ENTRY_DESC_OLD) {
                         dta->desc = unescapeEntryData(text).latin1();
                 } else if (name == ENTRY_NAME_NEW ||
                            name == ENTRY_NAME_OLD) {
                         dta->name = unescapeEntryData(text).latin1();
                 } else if (name == ENTRY_PW_NEW ||
                            name == ENTRY_PW_OLD) {
                         dta->pw = unescapeEntryData(text).latin1();
                 } else if (name == ENTRY_COMMENT_NEW ||
                            name == ENTRY_COMMENT_OLD) {
                         dta->comment = unescapeEntryData(text).latin1();
                 } else if (name == ENTRY_URL_NEW ||
                            name == ENTRY_URL_OLD) {
                         dta->url = unescapeEntryData(text).latin1();
                 } else if (name == ENTRY_LAUNCHER_NEW ||
                            name == ENTRY_LAUNCHER_OLD) {
                         dta->launcher = unescapeEntryData(text).latin1();
                 } else if (name == ENTRY_LVP_NEW ||
                            name == ENTRY_LVP_OLD) {
                         dta->listViewPos = strtol(text.latin1(), 0, 10);
                 } else if (name == ENTRY_BIN_NEW) {
                         // ENTRY_BIN_NEW == ENTRY_BIN_OLD
                         if (text == "0") {
                                 dta->binary = false;
                         } else {
                                 dta->binary = true;
                         }
                 } else if (name == ENTRY_META_NEW) {
                         // ENTRY_META_NEW == ENTRY_META_OLD
                         if (!extractMeta(cur, &dta->meta))
                                 return false;
                 } else {
                         printDebug(string("Serializer::extractEntry(): invalid: ")
                                    + name.latin1());
                 }
         }
         dta->lockStat = defaultLockStat;
         return true;
 }
 
 bool Serializer::extractMeta(const QDomNode &n,
                              PwMMetaData *dta)
 {
         QDomNode cur(n.firstChild());
         QString name, val;
         while (!cur.isNull()) {
                 name = cur.nodeName();
                 val = cur.toElement().text();
                 if (val == "") {
                         cur = cur.nextSibling();
                         continue;
                 }
 #ifndef PWM_EMBEDDED
                 if (name == META_CREATE_DATE) {
                         dta->create = QDateTime::fromString(val, Qt::ISODate);
                 } else if (name == META_VALID_DATE) {
                         dta->valid = QDateTime::fromString(val, Qt::ISODate);
                 } else if (name == META_EXPIRE_DATE) {
                         dta->expire = QDateTime::fromString(val, Qt::ISODate);
                 } else if (name == META_UPDATE_DATE) {
                         dta->update = QDateTime::fromString(val, Qt::ISODate);
                 } else if (name == META_UPDATE_INT) {
                         dta->updateInt = strtoul(val.latin1(), 0, 10);
                 } else if (name == META_UNIQUEID) {
                         dta->uniqueid = unescapeEntryData(val).latin1();
                 } else {
                         printDebug(string("extractMeta(): invalid: ")
                                    + name.latin1());
                 }
 #else
 
                 QDateTime m_dt;
 
                 if ((name == META_CREATE_DATE) ||
                     (name == META_VALID_DATE)  ||
                     (name == META_EXPIRE_DATE) ||
                     (name == META_UPDATE_DATE)) 
                   {
                     int pos = val.find("T");
                     QString date = val.left(pos);
                     QString time = val.mid(pos+1);
                     qDebug("Serializer::extractMeta : date=%s ,time=%s",date.latin1(), time.latin1()  );
                     bool ok1, ok2;
 
                     QDate m_date = KGlobal::locale()->readDate(date, &ok1);
                     QTime m_time = KGlobal::locale()->readTime(time, &ok2);
                     if ((ok1 == false) || (ok2 == false))
                       qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
                     m_dt.setDate(m_date);
                     m_dt.setTime(m_time);
                   }
 
 
                 if (name == META_CREATE_DATE) {
                         dta->create = m_dt;
                 } else if (name == META_VALID_DATE) {
                         dta->valid = m_dt;
                 } else if (name == META_EXPIRE_DATE) {
                   dta->expire = m_dt;
                 } else if (name == META_UPDATE_DATE) {
                   dta->update = m_dt;
                 } else if (name == META_UPDATE_INT) {
                         dta->updateInt = strtoul(val.latin1(), 0, 10);
                 } else if (name == META_UNIQUEID) {
                         dta->uniqueid = unescapeEntryData(val).latin1();
                 } else {
                         printDebug(string("extractMeta(): invalid: ")
                                    + name.latin1());
                 }
 #endif
                 cur = cur.nextSibling();
         }
         return true;
 }
 
 bool Serializer::checkValid()
 {
         PWM_ASSERT(domDoc);
         QDomElement root(domDoc->documentElement());
         if (root.nodeName() != ROOT_MAGIC_NEW &&
             root.nodeName() != ROOT_MAGIC_OLD) {
                 printDebug("Serializer: wrong magic");
                 return false;
         }
         if (root.attribute(VER_STR_NEW) != COMPAT_VER_NEW &&
             root.attribute(VER_STR_OLD) != COMPAT_VER_OLD) {
                 printDebug("Serializer: wrong version");
                 return false;
         }
         return true;
 }
 
 QDomElement Serializer::genNewRoot()
 {
         PWM_ASSERT(domDoc);
         QDomElement root(domDoc->createElement(ROOT_MAGIC_WR));
         root.setAttribute(VER_STR_WR, COMPAT_VER_WR);
         domDoc->appendChild(root);
         return root;
 }
 
 bool Serializer::addCategories(QDomElement *e,
                                const vector<PwMCategoryItem> &dta)
 {
         unsigned int numCat = dta.size(), i;
         QString curId, curName;
         QDomElement curCat;
 
         for (i = 0; i < numCat; ++i) {
                 curId = CAT_PREFIX_WR;
                 curId += tostr(i).c_str();
                 curName = dta[i].name.c_str();
                 curCat = domDoc->createElement(curId);
                 curCat.setAttribute(CAT_NAME_WR, curName);
                 if (!addEntries(&curCat, dta[i].d)) {
                         return false;
                 }
                 e->appendChild(curCat);
         }
         return true;
 }
 
 bool Serializer::addEntries(QDomElement *e,
                             const vector<PwMDataItem> &dta)
 {
         unsigned int numEntr = dta.size(), i;
         QString curId;
         QDomElement curEntr;
 
         for (i = 0; i < numEntr; ++i) {
                 curId = ENTRY_PREFIX_WR;
                 curId += tostr(i).c_str();
                 curEntr = domDoc->createElement(curId);
                 if (!writeEntry(&curEntr, dta[i])) {
                         return false;
                 }
                 e->appendChild(curEntr);
         }
         return true;
 }
 
 bool Serializer::writeEntry(QDomElement *e,
                             const PwMDataItem &_dta)
 {
 #if WRITE_CDATA_SEC != 0
         # define new_text(x)domDoc->createCDATASection(x)
         QDomCDATASection curText;
 #else
         # define new_text(x)domDoc->createTextNode(x)
         QDomText curText;
 #endif
 
         QDomText plainText;
         QDomElement tag;
 
         // begin -- This is for compatibility with the old serializer
         PwMDataItem dta = _dta;
         if (!dta.desc.size())
                 dta.desc = " ";
         if (!dta.name.size())
                 dta.name = " ";
         if (!dta.pw.size())
                 dta.pw = " ";
         if (!dta.comment.size())
                 dta.comment = " ";
         if (!dta.url.size())
                 dta.url = " ";
         if (!dta.launcher.size())
                 dta.launcher = " ";
         // end -- This is for compatibility with the old serializer
 
         tag = domDoc->createElement(ENTRY_DESC_WR);
         curText = new_text(escapeEntryData(dta.desc.c_str()));
         tag.appendChild(curText);
         e->appendChild(tag);
 
         tag = domDoc->createElement(ENTRY_NAME_WR);
         curText = new_text(escapeEntryData(dta.name.c_str()));
         tag.appendChild(curText);
         e->appendChild(tag);
 
         tag = domDoc->createElement(ENTRY_PW_WR);
         curText = new_text(escapeEntryData(dta.pw.c_str()));
         tag.appendChild(curText);
         e->appendChild(tag);
 
         tag = domDoc->createElement(ENTRY_COMMENT_WR);
         curText = new_text(escapeEntryData(dta.comment.c_str()));
         tag.appendChild(curText);
         e->appendChild(tag);
 
         tag = domDoc->createElement(ENTRY_URL_WR);
         curText = new_text(escapeEntryData(dta.url.c_str()));
         tag.appendChild(curText);
         e->appendChild(tag);
 
         tag = domDoc->createElement(ENTRY_LAUNCHER_WR);
         curText = new_text(escapeEntryData(dta.launcher.c_str()));
         tag.appendChild(curText);
         e->appendChild(tag);
 
         tag = domDoc->createElement(ENTRY_LVP_WR);
         plainText = domDoc->createTextNode(tostr(dta.listViewPos).c_str());
         tag.appendChild(plainText);
         e->appendChild(tag);