Don't permit non-opers to /NOTICE $* and /PRIVMSG $* :p

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 9b5c1348cde3f42c22d511f6d11f7f82741ad8d5..9ab0532c59178af2d7c14ee9c58ed21e27c9abde 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -57,10 +57,9 @@ extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -69,9 +68,9 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 
        user->idle_lastmsg = TIME;
        
-       /*if (ServerInstance->Parser->LoopCall(handle_privmsg,parameters,pcnt,user,0,pcnt-2,0))
-               return;*/
-        if (parameters[0][0] == '$')
+       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
+               return;
+       if ((parameters[0][0] == '$') && (*user->oper))
        {
                // notice to server mask
                char* servermask = parameters[0];
@@ -82,26 +81,34 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                 }
                return;
         }
-        else if (parameters[0][0] == '#')
+        char status = 0;
+        if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+        {
+                status = *parameters[0];
+                parameters[0]++;
+        }
+        if (parameters[0][0] == '#')
        {
                chan = FindChan(parameters[0]);
                if (chan)
                {
-                       if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan)))
+                       if (IS_LOCAL(user))
                        {
-                               WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
-                               return;
+                               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->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
+                               {
+                                       WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+                                       return;
+                               }
                        }
-                       if ((chan->binarymodes & CM_MODERATED) && (cstatus(user,chan)<STATUS_VOICE))
-                       {
-                               WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-                               return;
-                       }
-                       
                        int MOD_RESULT = 0;
 
                        std::string temp = parameters[1];
-                       FOREACH_RESULT(OnUserPreMessage(user,chan,TYPE_CHANNEL,temp));
+                       FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status));
                        if (MOD_RESULT) {
                                return;
                        }
@@ -113,8 +120,8 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                                return;
                        }
                        
-                       ChanExceptSender(chan, user, "PRIVMSG %s :%s", chan->name, parameters[1]);
-                       FOREACH_MOD OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1]);
+                       ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
+                       FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
                }
                else
                {
@@ -127,7 +134,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
        dest = Find(parameters[0]);
        if (dest)
        {
-               if (strcmp(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);
@@ -136,7 +143,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                int MOD_RESULT = 0;
                
                std::string temp = parameters[1];
-               FOREACH_RESULT(OnUserPreMessage(user,dest,TYPE_USER,temp));
+               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,dest,TYPE_USER,temp,0));
                if (MOD_RESULT) {
                        return;
                }
@@ -148,7 +155,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                        WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
                }
 
-               FOREACH_MOD OnUserMessage(user,dest,TYPE_USER,parameters[1]);
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
        }
        else
        {