Changeset 6302

Timestamp:

06/14/08 11:11:04 (6 months ago)

Author:

eugene

Message:

Revised the functions that used the New User setting.

Files:

• trunk/licq/src/icqpacket.cpp (modified) (4 diffs)

trunk/licq/src/icqpacket.cpp

@@ -2823 +2823 @@
       }
 
-      // No group yet?  Use default.  No default? Use ID of 1 (general)
+      // No group yet? Use ID of the first one in the list
       if (m_nGSID == 0)
       {
-        unsigned short nNewGroup = gUserManager.NewUserGroup();
-        m_nGSID = gUserManager.GetIDFromGroup(nNewGroup);
+        // First group if none was specified
+        GroupMap* groups = gUserManager.LockGroupList(LOCK_R);
+        if (groups->size() > 0)
+        {
+          LicqGroup* g = groups->begin()->second;
+          g->Lock(LOCK_R);
+          m_nGSID = g->icqGroupId();
+          g->Unlock();
+        }
+        gUserManager.UnlockGroupList();
 
         if (m_nGSID == 0)
-        {
-          // First group if none was specified
-          GroupMap* groups = gUserManager.LockGroupList(LOCK_R);
-          if (groups->size() > 0)
-          {
-            LicqGroup* g = groups->begin()->second;
-            g->Lock(LOCK_R);
-            m_nGSID = g->icqGroupId();
-            g->Unlock();
-          }
-          gUserManager.UnlockGroupList();
-        }
-
-        if (m_nGSID == 0)
-          m_nGSID = 1; // General (unless user renamed group or wasnt created yet)
+          m_nGSID = 1; // Must never actually reach this point
       }
 
@@ -2971 +2965 @@
 
       // Check for a group id
-      const UserGroupList& userGroups = u->GetGroups();
-      if (_nGroup)
+      unsigned short i = 0;
+      while (m_nGSID == 0)
       {
-        // Use the passed in group
-        m_nGSID = gUserManager.GetIDFromGroup(_nGroup);
-      }
-      else if (u->GetGSID() && _bAuthReq)
-      {
-        m_nGSID = u->GetGSID(); // changing groups but require auth
-      }
-      else
-      {
-        // Use the first group that the user is in as the server stored group
-        for (UserGroupList::iterator i = userGroups.begin(); i != userGroups.end(); ++i)
+        switch (i)
         {
-          m_nGSID = gUserManager.GetIDFromGroup(*i);
-          if (m_nGSID != 0)
+          case 0:
+            // Passed in id
+            m_nGSID = gUserManager.GetIDFromGroup(_nGroup);
+            break;
+
+          case 1:
+            // Preset id
+            m_nGSID = u->GetGSID();
+            break;
+
+          case 2:
+            // Use the first group the user is in as the server stored group
+            {
+              const UserGroupList& userGroups = u->GetGroups();
+              for (UserGroupList::iterator i = userGroups.begin(); i != userGroups.end(); ++i)
+              {
+                m_nGSID = gUserManager.GetIDFromGroup(*i);
+                if (m_nGSID != 0)
+                  break;
+              }
+            }
+            break;
+
+          case 3:
+            // Use the first group from the list
+            {
+              GroupMap* groups = gUserManager.LockGroupList(LOCK_R);
+              if (groups->size() > 0)
+              {
+                LicqGroup* g = groups->begin()->second;
+                g->Lock(LOCK_R);
+                m_nGSID = g->icqGroupId();
+                g->Unlock();
+              }
+              gUserManager.UnlockGroupList();
+            }
+            break;
+
+          default:
+            m_nGSID = 1;
             break;
         }
+        i++;
       }
 
@@ -3008 +3031 @@
       for (tlv_iter = tlvs.begin(); tlv_iter != tlvs.end(); ++tlv_iter)
         tlvBuffer.PackTLV(tlv_iter->second);
-
-      if (m_nGSID == 0)
-      {
-        unsigned short nNewGroup = gUserManager.NewUserGroup();
-        m_nGSID = gUserManager.GetIDFromGroup(nNewGroup);
-
-        if (m_nGSID == 0)
-        {
-          GroupMap* groups = gUserManager.LockGroupList(LOCK_R);
-          if (groups->size() > 0)
-          {
-            LicqGroup* g = groups->begin()->second;
-            g->Lock(LOCK_R);
-            m_nGSID = g->icqGroupId();
-            g->Unlock();
-          }
-          gUserManager.UnlockGroupList();
-        }
-
-        if (m_nGSID == 0)
-          m_nGSID = 1; // General (unless user renamed group or wasnt created yet)
-      }
-
-      szUnicodeAlias = 0;//strdup(u->GetAlias());
-      nExportSize = 0;//4 + strlen(szUnicodeAlias);
 
       SetExtraInfo(m_nGSID);
@@ -3087 +3085 @@
 
   buffer->PackUnsignedShortBE(nStrLen);
-  if (szUnicodeName && _nType == ICQ_ROSTxGROUP)
-    buffer->Pack(szUnicodeName, nStrLen);
-  else
-    buffer->Pack(_szName, nStrLen);
+  buffer->Pack(szUnicodeName != NULL ? szUnicodeName : _szName, nStrLen);
   buffer->PackUnsignedShortBE(m_nGSID);
   buffer->PackUnsignedShortBE(m_nSID);