diff options
| -rw-r--r-- | src/cmd_privmsg.cpp | 2 | ||||
| -rw-r--r-- | src/cmd_topic.cpp | 23 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp index 883a75d47..35707d5a3 100644 --- a/src/cmd_privmsg.cpp +++ b/src/cmd_privmsg.cpp @@ -135,7 +135,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user) dest = Find(parameters[0]); if (dest) { - if (*dest->awaymsg) + if ((IS_LOCAL(user)) && (*dest->awaymsg)) { /* auto respond with aweh msg */ WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg); diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp index 48f6b7b7e..96aadd8fd 100644 --- a/src/cmd_topic.cpp +++ b/src/cmd_topic.cpp @@ -102,15 +102,18 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user) Ptr = FindChan(parameters[0]); if (Ptr) { - if ((Ptr) && (!has_channel(user,Ptr))) + if (IS_LOCAL(user)) { - WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name); - return; - } - if ((Ptr->binarymodes & CM_TOPICLOCK) && (cstatus(user,Ptr)<STATUS_HOP)) - { - WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel", user->nick, Ptr->name); - return; + if ((Ptr) && (!has_channel(user,Ptr))) + { + WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name); + return; + } + if ((Ptr->binarymodes & CM_TOPICLOCK) && (cstatus(user,Ptr)<STATUS_HOP)) + { + WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel", user->nick, Ptr->name); + return; + } } char topic[MAXBUF]; @@ -120,7 +123,7 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user) topic[MAXTOPIC] = '\0'; } - if (user->fd > -1) + if (IS_LOCAL(user)) { int MOD_RESULT = 0; FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(user,Ptr,topic)); @@ -132,7 +135,7 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user) strlcpy(Ptr->setby,user->nick,NICKMAX); Ptr->topicset = TIME; WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic); - if (user->fd > -1) + if (IS_LOCAL(user)) { FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(user,Ptr,topic)); } |