Regressed buffering code

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 6dcab95534dc79dd7fd91d789d14429c883e2d60..589bf38c7c09b89a66da603110f7e6ab519385dc 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -70,7 +70,7 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
        
        if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
                return;
-       if (parameters[0][0] == '$')
+       if ((parameters[0][0] == '$') && (*user->oper))
        {
                // notice to server mask
                char* servermask = parameters[0];
@@ -94,12 +94,12 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user)
                {
                        if (IS_LOCAL(user))
                        {
-                               if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan)))
+                               if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
                                {
                                        WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
                                        return;
                                }
-                               if ((chan->binarymodes & CM_MODERATED) && (cstatus(user,chan)<STATUS_VOICE))
+                               if ((chan->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
                                {
                                        WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
                                        return;