Changeset 6263

Timestamp:

06/11/08 10:06:56 (3 months ago)

Author:

eugene

Message:

Revised user adding algorithm.

Files:

• branches/qt4-gui_group/src/dialogs/adduserdlg.cpp (modified) (1 diff)

branches/qt4-gui_group/src/dialogs/adduserdlg.cpp

@@ -92 +92 @@
 void AddUserDlg::ok()
 {
-  QString id = myId->text().trimmed();
+  QByteArray id = myId->text().trimmed().toLatin1();
+  unsigned long ppid = myProtocol->currentPpid();
+  unsigned short group = myGroup->currentGroupId();
+  bool notify = myNotify->isChecked();
 
   if (!id.isEmpty())
   {
-    unsigned short currentNewGroup = gUserManager.NewUserGroup();
-    gUserManager.SetNewUserGroup(myGroup->currentGroupId());
-    gLicqDaemon->AddUserToList(id.toLatin1(), myProtocol->currentPpid(),
-        myNotify->isChecked());
-    gUserManager.SetNewUserGroup(currentNewGroup);
+    ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_W);
+
+    if (u == NULL)
+    {
+      unsigned short currentNewGroup = gUserManager.NewUserGroup();
+      gUserManager.SetNewUserGroup(group);
+      gLicqDaemon->AddUserToList(id, ppid, notify);
+      gUserManager.SetNewUserGroup(currentNewGroup);
+    }
+    else
+    {
+      if (u->NotInList())
+      {
+        u->SetPermanent();
+        gUserManager.DropUser(u);
+        gUserManager.AddUserToGroup(id.toLatin1());
+        if (notify && ppid == LICQ_PPID)
+          gLicqDaemon->icqAlertUser(id.toULong());
+      }
+      else
+        gUserManager.DropUser(u);
+    }
   }