Fixed some channel pointer stuff (eeeky)

[user/henk/code/inspircd.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index e71e72a48b032f3ed7a9d0d25d0633ab680d736a..a86f84ea2f99e21237f66669a820952e4844f31a 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -58,7 +58,7 @@ int common_channels(userrec *u, userrec *u2)
                {
                        if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL))
                        {
-                               if ((u->chans[i].channel == u2->chans[z].channel) && (u->chans[i].channel) && (u2->chans[z].channel) && (u->registered == 7) && (u2->registered == 7))
+                               if ((!strcasecmp(u->chans[i].channel->name,u2->chans[z].channel->name)) && (u->chans[i].channel) && (u2->chans[z].channel) && (u->registered == 7) && (u2->registered == 7))
                                {
                                        if ((c_count(u)) && (c_count(u2)))
                                        {
@@ -234,14 +234,6 @@ bool hasumode(userrec* user, char mode)
 void ChangeName(userrec* user, const char* gecos)
 {
        strncpy(user->fullname,gecos,MAXBUF);
-
-       // TODO: replace these with functions:
-       // NetSendToAll - to all
-       // NetSendToCommon - to all that hold users sharing a common channel with another user
-       // NetSendToOne - to one server
-       // NetSendToAllExcept - send to all but one
-       // all by servername
-
        char buffer[MAXBUF];
        snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos);
        NetSendToAll(buffer);
@@ -336,21 +328,24 @@ char* cmode(userrec *user, chanrec *chan)
        int i;
        for (int i = 0; i != MAXCHANS; i++)
        {
-               if ((user->chans[i].channel == chan) && (chan != NULL))
+               if (u->chans[i].channel)
                {
-                       if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
-                       {
-                               return "@";
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
-                       {
-                               return "%";
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
+                       if ((!strcasecmp(u->chans[i].channel->name,chan->name)) && (chan != NULL))
                        {
-                               return "+";
+                               if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
+                               {
+                                       return "@";
+                               }
+                               if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
+                               {
+                                       return "%";
+                               }
+                               if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
+                               {
+                                       return "+";
+                               }
+                               return "";
                        }
-                       return "";
                }
        }
 }
@@ -369,21 +364,24 @@ int cstatus(userrec *user, chanrec *chan)
 
        for (int i = 0; i != MAXCHANS; i++)
        {
-               if ((user->chans[i].channel == chan) && (chan != NULL))
+               if (u->chans[i].channel)
                {
-                       if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
+                       if ((!strcasecmp(u->chans[i].channel->name,chan->name)) && (chan != NULL))
                        {
-                               return STATUS_OP;
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
-                       {
-                               return STATUS_HOP;
-                       }
-                       if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
-                       {
-                               return STATUS_VOICE;
+                               if ((user->chans[i].uc_modes & UCMODE_OP) > 0)
+                               {
+                                       return STATUS_OP;
+                               }
+                               if ((user->chans[i].uc_modes & UCMODE_HOP) > 0)
+                               {
+                                       return STATUS_HOP;
+                               }
+                               if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0)
+                               {
+                                       return STATUS_VOICE;
+                               }
+                               return STATUS_NORMAL;
                        }
-                       return STATUS_NORMAL;
                }
        }
 }
@@ -399,9 +397,12 @@ int has_channel(userrec *u, chanrec *c)
        }
        for (int i =0; i != MAXCHANS; i++)
        {
-               if (u->chans[i].channel == c)
+               if (u->chans[i].channel)
                {
-                       return 1;
+                       if (!strcasecmp(u->chans[i].channel->name,c->name))
+                       {
+                               return 1;
+                       }
                }
        }
        return 0;