Change includes, use --libs_r rather than mysql_config --libs, we want re-enterant...

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

diff --git a/src/mode.cpp b/src/mode.cpp
index 61fc362c783f683c81ad0ea11b62368c22de79d7..86b0024c0432df2fd2ebf999b6c50a54487192ee 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -63,6 +63,8 @@ using namespace std;
 #include "modes/umode_i.h"
 /* +o (operator) */
 #include "modes/umode_o.h"
+/* +n (notice mask - our implementation of snomasks) */
+#include "modes/umode_n.h"
 
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
@@ -244,14 +246,16 @@ void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec
        {
                /* Display user's current mode string */
                WriteServ(user->fd,"221 %s :+%s",targetuser->nick,targetuser->FormatModes());
+               WriteServ(user->fd, "008 %s :+%s", targetuser->nick, targetuser->FormatNoticeMasks());
                return;
        }
+
        /* No such nick/channel */
        WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, text);
        return;
 }
 
-void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool servermode)
+void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode)
 {
        std::string target = parameters[0];
        ModeType type = MODETYPE_USER;
@@ -310,7 +314,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                 */
                if ((type== MODETYPE_CHANNEL) && (pcnt == 2))
                {
-                       char* mode = parameters[1];
+                       const char* mode = parameters[1];
                        if (*mode == '+')
                                mode++;
 
@@ -400,7 +404,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
                                                        /* It's an oper only mode, check if theyre an oper. If they arent,
                                                         * eat any parameter that  came with the mode, and continue to next
                                                         */
-                                                       if ((modehandlers[handler_id]->NeedsOper()) && (!*user->oper))
+                                                       if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!*user->oper))
                                                                continue;
 
                                                        /* Call the handler for the mode */
@@ -478,7 +482,7 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
 }
 
 
-void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_mode::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (!user)
                return;
@@ -521,10 +525,6 @@ void ModeParser::CleanMask(std::string &mask)
        }
 }
 
-void ModeParser::BuildModeString(userrec* user)
-{
-}
-
 bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
 {
        unsigned char mask = 0;
@@ -534,17 +534,62 @@ bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
         * If they do that, thats their problem, and if i ever EVER see an
         * official InspIRCd developer do that, i'll beat them with a paddle!
         */
-       if ((modeletter < 'A') || (modeletter > 'z'))
+       if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
                return false;
 
        mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
-       pos = (modeletter-65) | mask;
+       pos = (mh->GetModeChar()-65) | mask;
 
        if (modehandlers[pos])
                return false;
 
        modehandlers[pos] = mh;
-       log(DEBUG,"ModeParser::AddMode: added mode %c",modeletter);
+       log(DEBUG,"ModeParser::AddMode: added mode %c",mh->GetModeChar());
+       return true;
+}
+
+bool ModeParser::AddModeWatcher(ModeWatcher* mw)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       if (!mw)
+               return false;
+
+       if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z'))
+               return false;
+
+       mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mw->GetModeChar()-65) | mask;
+
+       modewatchers[pos].push_back(mw);
+       log(DEBUG,"ModeParser::AddModeWatcher: watching mode %c",mw->GetModeChar());
+
+       return true;
+}
+
+bool ModeParser::DelModeWatcher(ModeWatcher* mw)
+{
+       unsigned char mask = 0;
+       unsigned char pos = 0;
+
+       if (!mw)
+               return false;
+
+       if ((mw->GetModeType() < 'A') || (mw->GetModeType() > 'z'))
+               return false;
+
+       mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+       pos = (mw->GetModeChar()-65) | mask;
+
+       ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
+
+       if (a == modewatchers[pos].end())
+               return false;
+
+       modewatchers[pos].erase(a);
+       log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar());
+
        return true;
 }
 
@@ -579,7 +624,6 @@ ModeParser::ModeParser()
        this->AddMode(new ModeUserWallops, 'w');
        this->AddMode(new ModeUserInvisible, 'i');
        this->AddMode(new ModeUserOperator, 'o');
-
-       /* TODO: User modes +swio */
+       this->AddMode(new ModeUserServerNoticeMask, 'n');
 }