Changeset 5985 for branches/newosd

Timestamp:

01/03/08 08:28:26 (11 months ago)

Author:

eugene

Message:

Added user group filtering.

Files:

• branches/newosd/src/iface.cpp (modified) (3 diffs)

branches/newosd/src/iface.cpp

@@ -161 +161 @@
     return true;
 
-  bool ret = false;
-
   ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
   if (u == NULL)
     return true;
 
-  if (u->IgnoreList())
-    ret = true;
+  bool ret = u->IgnoreList();
+  bool on = u->OnlineNotify();
 
   gUserManager.DropUser(u);
@@ -179 +177 @@
     return true;
 
+  if (sig->SubSignal() == USER_STATUS)
+  {
+    if (sig->Argument() == 0)
+    {
+      if (conf->statusChange == GROUP_TYPE_NONE ||
+          (conf->statusChange == GROUP_TYPE_ONLINE_NOTIFY && !on))
+        ret = true;
+    }
+    else
+      if (conf->logonLogoff == GROUP_TYPE_NONE ||
+          (conf->logonLogoff == GROUP_TYPE_ONLINE_NOTIFY && !on))
+        ret = true;
+  }
+
+  if (sig->SubSignal() == USER_EVENTS)
+  {
+    if (sig->Argument() < 0)
+      ret = true;
+    else
+      if (sig->Argument() == 0)
+      {
+        if (conf->statusChange == GROUP_TYPE_NONE ||
+            (conf->statusChange == GROUP_TYPE_ONLINE_NOTIFY && !on))
+          ret = true;
+      }
+      else
+      {
+        if (conf->showMessage == GROUP_TYPE_NONE ||
+            (conf->showMessage == GROUP_TYPE_ONLINE_NOTIFY && !on &&
+             strcmp(sig->Id(), o->IdString()) != 0))
+          ret = true;
+      }
+  }
+
+  if (ret)
+  {
+    gUserManager.DropOwner(o->PPID());
+    return true;
+  }
+
   do
   {
@@ -184 +222 @@
 
     // Don't let owner messages (e.g. auth-reqs) be filtered
-    if (sig->Signal() == SIGNAL_UPDATExUSER &&
-        sig->SubSignal() == USER_EVENTS &&
+    if (sig->SubSignal() == USER_EVENTS &&
         sig->Argument() > 0)
       break;