Changeset 6314

Timestamp:

06/15/08 12:10:04 (6 months ago)

Author:

emostar

Message:

Allow the plugins to specify with group to add the user into when the user is added.
Pass the group id as an argument to the LIST_ADD signal.
Needs testing from a gui (once it is implemented) to make sure it works...

Location:

trunk/licq

Files:

• include/licq_icqd.h (modified) (3 diffs)
• src/icqd-srv.cpp (modified) (4 diffs)
• src/icqd.cpp (modified) (2 diffs)
• src/icqpacket.cpp (modified) (1 diff)

trunk/licq/include/licq_icqd.h

@@ -171 +171 @@
       \param szId The user ID to add.
       \param nPPID The user's protocol plugin ID.
+      \param groupId The group id to add the user into.
       \param _bAuthRequired True if we need to get authorization first.
   */
-  void ProtoAddUser(const char *szId, unsigned long nPPID, bool _bAuthRequired = false);
+  void ProtoAddUser(const char *szId, unsigned long nPPID, bool _bAuthRequired = false, unsigned short groupId = 0);
 
   //! Remove a user from the local contact list.
@@ -454 +455 @@
   void icqAlertUser(const char* id, unsigned long ppid);
   void icqAddUser(unsigned long _nUin, bool _bAuthReq = false);
-  void icqAddUser(const char *_szId, bool _bAuthReq = false);
-  void icqAddUserServer(const char *_szId, bool _bAuthReq);
+  void icqAddUser(const char *_szId, bool _bAuthReq = false, unsigned short groupId = 0);
+  void icqAddUserServer(const char *_szId, bool _bAuthReq, unsigned short groupId = 0);
   void icqAddUserServer(unsigned long _nUin, bool _bAuthReq);
   void icqAddGroup(const char *);
@@ -571 +572 @@
 
   bool AddUserToList(const char *szId, unsigned long PPID, bool bNotify = true,
-                     bool bTempUser = false);
+                     bool bTempUser = false, unsigned short groupId = 0);
   bool AddUserToList(unsigned long _nUin, bool bNotify = true);
   void AddUserToList(ICQUser *);

trunk/licq/src/icqd-srv.cpp

@@ -46 +46 @@
 
 void CICQDaemon::ProtoAddUser(const char *_szId, unsigned long _nPPID,
-                              bool _bAuthRequired)
+                              bool _bAuthRequired, unsigned short groupId)
 {
   if (_nPPID == LICQ_PPID)
-    icqAddUser(_szId, _bAuthRequired);
+    icqAddUser(_szId, _bAuthRequired, groupId);
   else
     PushProtoSignal(new CAddUserSignal(_szId, _bAuthRequired), _nPPID);
@@ -55 +55 @@
 
 //-----icqAddUser----------------------------------------------------------
-void CICQDaemon::icqAddUser(const char *_szId, bool _bAuthRequired)
+void CICQDaemon::icqAddUser(const char *_szId, bool _bAuthRequired, unsigned short groupId)
 {
   CSrvPacketTcp *p = new CPU_GenericUinList(_szId, ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_ADDxTOxLIST);
@@ -81 +81 @@
 
 //-----icqAddUserServer--------------------------------------------------------
-void CICQDaemon::icqAddUserServer(const char *_szId, bool _bAuthRequired)
+void CICQDaemon::icqAddUserServer(const char *_szId, bool _bAuthRequired,
+    unsigned short groupId)
 {
   CSrvPacketTcp *pStart = 0;
@@ -95 +96 @@
 
   CPU_AddToServerList *pAdd = new CPU_AddToServerList(_szId, ICQ_ROSTxNORMAL,
-    0, _bAuthRequired);
+    groupId, _bAuthRequired);
   gLog.Info(tr("%sAdding %s to server list...\n"), L_SRVxSTR, _szId);
   addToModifyUsers(pAdd->SubSequence(), _szId);

trunk/licq/src/icqd.cpp

@@ -1166 +1166 @@
                                     
 bool CICQDaemon::AddUserToList(const char *szId, unsigned long nPPID,
-                               bool bNotify, bool bTempUser)
+                               bool bNotify, bool bTempUser, unsigned short groupId)
 {
   // Don't add invalid uins
@@ -1186 +1186 @@
   // this notify is for local only adds
   if (nPPID == LICQ_PPID && m_nTCPSrvSocketDesc != -1 && bNotify && !bTempUser)
-    icqAddUser(szId);
+    icqAddUser(szId, false, groupId);
   else if (nPPID != LICQ_PPID && bNotify)
     PushProtoSignal(new CAddUserSignal(szId, false), nPPID);
   
-  PushPluginSignal(new CICQSignal(SIGNAL_UPDATExLIST, LIST_ADD, szId, nPPID));
+  PushPluginSignal(new CICQSignal(SIGNAL_UPDATExLIST, LIST_ADD, szId, nPPID, groupId));
 
   return true;

trunk/licq/src/icqpacket.cpp

@@ -2977 +2977 @@
             {
               const UserGroupList& userGroups = u->GetGroups();
-              for (UserGroupList::iterator i = userGroups.begin(); i != userGroups.end(); ++i)
+              for (UserGroupList::iterator iter = userGroups.begin(); iter != userGroups.end(); ++iter)
               {
-                m_nGSID = gUserManager.GetIDFromGroup(*i);
+                m_nGSID = gUserManager.GetIDFromGroup(*iter);
                 if (m_nGSID != 0)
                   break;