Changeset 6372

Timestamp:

07/01/08 05:59:12 (2 months ago)

Author:

flynd

Message:

More uin usage removed from console plugin.

Location:

trunk/console/src

Files:

• console.cpp (modified) (12 diffs)
• console.h (modified) (2 diffs)
• console_menu.cpp (modified) (18 diffs)
• console_print.cpp (modified) (4 diffs)
• window.cpp (modified) (1 diff)
• window.h (modified) (2 diffs)

trunk/console/src/console.cpp

@@ -299 +299 @@
     if (o->Password()[0] == '\0')
     {
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
       UserSelect();
     }
     else
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
   }
 
@@ -517 +517 @@
       for (unsigned short i = 0; i < MAX_CON; i++)
       {
-        if (s->Uin() == winCon[i]->nLastUin)
-          winCon[i]->nLastUin = 0;
+        if (s->Id() == winCon[i]->myLastId)
+          winCon[i]->myLastId.clear();
       }
     }
@@ -639 +639 @@
     // Needs to be better dealt with...
     // How's this then?
-    winMain->wprintf("Registration complete!\nYour UIN is %ld\n",
-                     gUserManager.OwnerUin());
+      winMain->wprintf("Registration complete!\nYour UIN is %s\n",
+          gUserManager.OwnerId(LICQ_PPID).c_str());
     winMain->fProcessInput = &CLicqConsole::InputCommand;
     PrintStatus();
@@ -815 +815 @@
         if (e->SubResult() == ICQ_TCPxACK_RETURN)
         {
-          u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+          u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
           win->wprintf("%s is in %s mode:\n%s\n[Send \"urgent\" ('.u') to ignore]\n",
                        u->GetAlias(), u->StatusStr(), u->AutoResponse());
@@ -822 +822 @@
         else if (e->SubResult() == ICQ_TCPxACK_REFUSE)
         {
-          u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+          u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
           win->wprintf("%s refused %s.\n",
                        u->GetAlias(), ue->Description());
@@ -839 +839 @@
           if(!ea->Accepted())
           {
-            u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+            u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
             win->wprintf("%s refused file: %s\n",
                          u->GetAlias(), ea->Response());
@@ -906 +906 @@
         else
         {
-          u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+          u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
           if (u != NULL && u->Away() && u->ShowAwayMsg())
           {
@@ -2149 +2149 @@
     {
       *sz = '\0';
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+      ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
       o->SetAutoResponse(data->szRsp);
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
       winMain->wprintf("%C%AAuto-response set.\n",
                        m_cColorInfo->nColor, m_cColorInfo->nAttr);
@@ -3037 +3037 @@
             winMain->wprintf("Registration complete for user %s\n",data->szUin);
             gUserManager.SetOwnerUin(atol(data->szUin));
-            ICQOwner *owner = gUserManager.FetchOwner(LOCK_W);
+            ICQOwner* owner = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
             owner->SetPassword(data->szPassword1);
-            gUserManager.DropOwner();
+            gUserManager.DropOwner(owner);
 
             winMain->wprintf("Save password? (y/N) ");
@@ -3052 +3052 @@
       break;
     }
-  
+
   case STATE_QUERY:
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
     o->SetSavePassword(tolower(cIn) == 'y');
-    gUserManager.DropOwner();
-    
+    gUserManager.DropOwner(o);
+
     if (data->szOption[0] == '1')
     {
@@ -3251 +3251 @@
   winMain->state = STATE_LE;
 
-  char sz[20];
   //TODO which owner
-  sprintf(sz, "%lu", gUserManager.OwnerUin());
-  
-  winMain->data = new DataUserSelect(sz, LICQ_PPID); 
-  
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  winMain->data = new DataUserSelect(gUserManager.OwnerId(LICQ_PPID).c_str(), LICQ_PPID);
+
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   winMain->wprintf("%A%CEnter your password for %s (%s):%C%Z\n", A_BOLD,
                    COLOR_GREEN, o->GetAlias(), o->IdString(), COLOR_WHITE, A_BOLD);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 }
 
@@ -3288 +3285 @@
     case STATE_QUERY:
     {
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+      ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
       o->SetSavePassword(tolower(cIn) == 'y');
       o->SetPassword(data->szPassword);
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
 
       if (winMain->data)

trunk/console/src/console.h

@@ -11 +11 @@
 #include "licq_user.h"
 
+#include <string>
 using namespace std;
 
@@ -209 +210 @@
   void InputUserSelect(int cIn);
   bool ParseMacro(char *);
-  unsigned long GetUinFromArg(char **);
+  std::string GetUserFromArg(char** p_szArg);
   void SaveLastUser(const char *, unsigned long);
   struct SContact GetContactFromArg(char **);

trunk/console/src/console_menu.cpp

@@ -3 +3 @@
 
 #include <ctype.h>
+#include <string>
+
+using std::string;
 
 const unsigned short NUM_COMMANDS = 24;
@@ -539 +542 @@
     if (nStatus == ICQ_STATUS_OFFLINE)
     {
-      gUserManager.DropOwner(nPPID);
+      gUserManager.DropOwner(o);
       licqDaemon->ProtoLogoff(nPPID);
       continue;
@@ -548 +551 @@
     // call the right function
     bool b = o->StatusOffline();
-    gUserManager.DropOwner(nPPID);
+    gUserManager.DropOwner(o);
     if (b)
     {
@@ -591 +594 @@
  * CLicqConsole::GetUinFromArg
  *-------------------------------------------------------------------------*/
-unsigned long CLicqConsole::GetUinFromArg(char **p_szArg)
+string CLicqConsole::GetUserFromArg(char** p_szArg)
 {
   char *szAlias, *szCmd;
-  unsigned long nUin = 0;
+  string id;
   bool bCheckUin = true;
   char *szArg = *p_szArg;
@@ -611 +614 @@
     {
       winMain->wprintf("%CUnbalanced quotes.\n", COLOR_RED);
-      return (unsigned long)-1;
+      return "-";
     }
     *szCmd++ = '\0';
@@ -619 +622 @@
   {
     *p_szArg = NULL;
-    return gUserManager.OwnerUin();
+    return gUserManager.OwnerId(LICQ_PPID);
   }
   else if (szArg[0] == '$')
   {
     *p_szArg = NULL;
-    return winMain->nLastUin;
+    return winMain->myLastId;
   }
   else
@@ -639 +642 @@
   *p_szArg = szCmd;
 
-  // Find the user
-  // See if all the chars are digits
-  if (bCheckUin)
-  {
-    char *sz = szAlias;
-    while (isdigit(*sz)) sz++;
-    if (*sz == '\0') nUin = atol(szAlias);
-  }
-
-  if (nUin == 0)
-  {
-    FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
-    {
-      if (strcasecmp(szAlias, pUser->GetAlias()) == 0)
-      {
-        nUin = pUser->Uin();
-        FOR_EACH_USER_BREAK;
-      }
-    }
-    FOR_EACH_PROTO_USER_END
-    if (nUin == 0)
-    {
-      winMain->wprintf("%CInvalid user: %A%s\n", COLOR_RED, A_BOLD, szAlias);
-      return (unsigned long)-1;
-    }
-  }
-  else
-  {
-    if (!gUserManager.IsOnList(nUin))
-    {
-      winMain->wprintf("%CInvalid uin: %A%lu\n", COLOR_RED, A_BOLD, nUin);
-      return (unsigned long)-1;
-    }
+  FOR_EACH_PROTO_USER_START(LICQ_PPID, LOCK_R)
+  {
+    if (strcasecmp(szAlias, pUser->GetAlias()) == 0 ||
+        (bCheckUin && strcasecmp(szAlias, pUser->IdString()) == 0))
+    {
+      id = pUser->IdString();
+      FOR_EACH_USER_BREAK;
+    }
+  }
+  FOR_EACH_PROTO_USER_END
+
+  if (id.empty())
+  {
+    winMain->wprintf("%CInvalid user: %A%s\n", COLOR_RED, A_BOLD, szAlias);
+    return "-";
   }
 
   // Save this as the last user
-  if (winMain->nLastUin != nUin)
-  {
-    winMain->nLastUin = nUin;
+  if (winMain->myLastId != id)
+  {
+    winMain->myLastId = id;
     PrintStatus();
   }
 
-  return nUin;
+  return id;
 }
 
@@ -738 +723 @@
   {
     *p_szArg = NULL;
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     scon.szId = o->IdString();
-    scon.nPPID = o->PPID(); 
-    gUserManager.DropOwner();
+    scon.nPPID = o->PPID();
+    gUserManager.DropOwner(o);
     return scon;
   }
@@ -815 +800 @@
 {
   char *sz = szArg;
-  unsigned long nUin = GetUinFromArg(&sz);
-
-  if (nUin == gUserManager.OwnerUin())
+  string id = GetUserFromArg(&sz);
+
+  if (gUserManager.FindOwner(id.c_str(), LICQ_PPID) != NULL)
     winMain->wprintf("%CSetting personal info not implemented yet.\n", COLOR_RED);
-  else if (nUin == 0) {
-    char szUin[24];
-    sprintf(szArg, "%lu", gUserManager.OwnerUin());
-    UserCommand_Info(szUin, LICQ_PPID, sz);
-  } else if (nUin != (unsigned long)-1)
-    sprintf(szArg, "%lu", nUin);
-    UserCommand_Info(szArg, LICQ_PPID, sz);
+  else if (id.empty())
+    UserCommand_Info(gUserManager.OwnerId(LICQ_PPID).c_str(), LICQ_PPID, sz);
+  else if (id != "-")
+    UserCommand_Info(id.c_str(), LICQ_PPID, sz);
 }
 
@@ -836 +818 @@
 {
   char *sz = szArg;
-  unsigned long nUin = GetUinFromArg(&sz);
-
-  if (nUin == gUserManager.OwnerUin())
+  string id = GetUserFromArg(&sz);
+
+  if (gUserManager.FindOwner(id.c_str(), LICQ_PPID) != NULL)
     winMain->wprintf("%CYou can't send URLs to yourself!\n", COLOR_RED);
-  else if (nUin == 0)
+  else if (id.empty())
     winMain->wprintf("%CYou must specify a user to send a URL to.\n", COLOR_RED);
-  else if (nUin != (unsigned long)-1)
-    sprintf(szArg, "%lu", nUin);
-    UserCommand_Url(szArg, LICQ_PPID, sz);
-
+  else if (id != "-")
+    UserCommand_Url(id.c_str(), LICQ_PPID, sz);
 }
 
@@ -856 +836 @@
 {
   char *sz = szArg;
-  unsigned long nUin = GetUinFromArg(&sz);
-
-  if (nUin == 0)
+  string id = GetUserFromArg(&sz);
+
+  if (id.empty())
     winMain->wprintf("%CInvalid user\n", COLOR_RED);
-  else if (nUin != (unsigned long)-1)
-  {
-    sprintf(szArg, "%lu", nUin);
-    UserCommand_Sms(szArg, LICQ_PPID, sz);
-  }
+  else if (id != "-")
+    UserCommand_Sms(id.c_str(), LICQ_PPID, sz);
 }
 
@@ -887 +864 @@
     ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     unsigned short nNumMsg = o->NewMessages();
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
     if (nNumMsg > 0)
     {
       //TODO which owner?
-      char szUin[24];
-      sprintf(szUin, "%lu", gUserManager.OwnerUin());
-      UserCommand_View(szUin, LICQ_PPID, NULL);
+      UserCommand_View(gUserManager.OwnerId(LICQ_PPID).c_str(), LICQ_PPID, NULL);
       return;
     }
@@ -927 +902 @@
 {
   char *sz = szArg;
-  unsigned long nUin = GetUinFromArg(&sz);
-
-  if (nUin == gUserManager.OwnerUin())
+  string id = GetUserFromArg(&sz);
+
+  if (gUserManager.FindOwner(id.c_str(), LICQ_PPID) != NULL)
     winMain->wprintf("%CYou can't establish a secure connection to yourself!\n", COLOR_RED);
-  else if (nUin == 0)
+  else if (id.empty())
     winMain->wprintf("%CYou must specify a user to talk to.\n", COLOR_RED);
-  else if (nUin != (unsigned long)-1)
-  {
-    sprintf(szArg, "%lu", nUin);
-    UserCommand_Secure(szArg, LICQ_PPID, sz);
-  }
+  else if (id != "-")
+    UserCommand_Secure(id.c_str(), LICQ_PPID, sz);
 }
 
@@ -947 +919 @@
 {
   char *sz = szArg;
-  unsigned long nUin = GetUinFromArg(&sz);
-
-  if (nUin == gUserManager.OwnerUin())
+  string id = GetUserFromArg(&sz);
+
+  if (gUserManager.FindOwner(id.c_str(), LICQ_PPID) != NULL)
     winMain->wprintf("%CYou can't send files to yourself!\n", COLOR_RED);
-  else if (nUin == 0)
+  else if (id.empty())
   {
     bool bNum = false;
@@ -970 +942 @@
     }
   }
-  else if (nUin != (unsigned long)-1)
-  {
-    sprintf(szArg, "%lu", nUin);
-    UserCommand_SendFile(szArg, LICQ_PPID, sz);
-  }
+  else if (id != "-")
+    UserCommand_SendFile(id.c_str(), LICQ_PPID, sz);
 }
 
@@ -984 +953 @@
 {
   char *sz = szArg;
-  unsigned long nUin = GetUinFromArg(&sz);
-
-  if (nUin == gUserManager.OwnerUin())
+  string id = GetUserFromArg(&sz);
+
+  if (gUserManager.FindOwner(id.c_str(), LICQ_PPID) != NULL)
   {
     wattron(winMain->Win(), A_BOLD);
@@ -995 +964 @@
     winMain->wprintf("%B%CAuto response:\n%b%s\n",
                      COLOR_WHITE, o->AutoResponse());
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
     wattron(winMain->Win(), A_BOLD);
     for (unsigned short i = 0; i < winMain->Cols() - 10; i++)
@@ -1003 +972 @@
     wattroff(winMain->Win(), A_BOLD);
   }
-  else if (nUin == 0)
+  else if (id.empty())
     UserCommand_SetAutoResponse(NULL, LICQ_PPID, sz);
-  else if (nUin != (unsigned long)-1)
+  else if (id != "-")
     UserCommand_FetchAutoResponse(NULL, LICQ_PPID, sz);
 }

trunk/console/src/console_print.cpp

@@ -131 +131 @@
 
   unsigned short nNumOwnerEvents = 0;
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   if (o)
   {
     nNumOwnerEvents = o->NewMessages();
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
 
@@ -161 +161 @@
     szLastUser = strdup("<None>");
 
-  o = gUserManager.FetchOwner(LOCK_R);
+  o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   wbkgdset(winStatus->Win(), COLOR_PAIR(COLOR_WHITE));
   mvwhline(winStatus->Win(), 0, 0, ACS_HLINE, COLS);
@@ -176 +176 @@
                        53, szMsgStr, 29, 53,
                        szLastUser, 29);
-    gUserManager.DropOwner();
-  }
-  
+    gUserManager.DropOwner(o);
+  }
+
   wclrtoeol(winStatus->Win());
   winStatus->RefreshWin();
@@ -775 +775 @@
 {
   // Get the user's name
-  ICQUser *u = gUserManager.FetchUser(ftman->Uin(), LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(ftman->Id(), LICQ_PPID, LOCK_R);
 
   // Make the title

trunk/console/src/window.cpp

@@ -82 +82 @@
   }
 
-  nLastUin = 0;
+  myLastId.clear();
   sLastContact.szId = 0;
   sLastContact.nPPID = 0;

trunk/console/src/window.h

@@ -3 +3 @@
 
 #include <iostream>
+#include <string>
 extern "C" {
 #include <cdk.h>
@@ -69 +70 @@
   InputState state;
   CData *data;
-  unsigned long nLastUin;
+  std::string myLastId;
   struct SContact sLastContact;
   unsigned short nLastHistory;