More stuff so that freebsd users can still use the ports version of openssl if they...

[user/henk/code/inspircd.git] / src / modules / m_services.cpp

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 88a6b8fb91b22c44afaab769ddea98801ddd144f..5b39de93147c8efcdd41a9d032a225f7ba314462 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,7 +25,7 @@ class Channel_r : public ModeHandler
  public:
        Channel_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                // only a u-lined server may add or remove the +r mode.
                if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
@@ -35,7 +35,7 @@ class Channel_r : public ModeHandler
                }
                else
                {
-                       source->WriteServ("500 %s :Only a server may modify the +r channel mode", source->nick);
+                       source->WriteNumeric(500, "%s :Only a server may modify the +r channel mode", source->nick);
                        return MODEACTION_DENY;
                }
        }
@@ -49,7 +49,7 @@ class User_r : public ModeHandler
  public:
        User_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
                {
@@ -62,7 +62,7 @@ class User_r : public ModeHandler
                }
                else
                {
-                       source->WriteServ("500 %s :Only a server may modify the +r user mode", source->nick);
+                       source->WriteNumeric(500, "%s :Only a server may modify the +r user mode", source->nick);
                        return MODEACTION_DENY;
                }
        }
@@ -75,7 +75,7 @@ class Channel_R : public ModeHandler
  public:
        Channel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -105,7 +105,7 @@ class User_R : public ModeHandler
  public:
        User_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -135,7 +135,7 @@ class Channel_M : public ModeHandler
  public:
        Channel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -179,13 +179,15 @@ class ModuleServices : public Module
                m4 = new User_r(ServerInstance);
                m5 = new User_R(ServerInstance);
 
-               if (!ServerInstance->AddMode(m1, 'r') || !ServerInstance->AddMode(m2, 'R') || !ServerInstance->AddMode(m3, 'M')
-                       || !ServerInstance->AddMode(m4, 'r') || !ServerInstance->AddMode(m5, 'R'))
+               if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3)
+                       || !ServerInstance->Modes->AddMode(m4) || !ServerInstance->Modes->AddMode(m5))
                {
                        throw ModuleException("Could not add user and channel modes!");
                }
        
                kludgeme = false;
+               Implementation eventlist[] = { I_OnWhois, I_OnUserPostNick, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
        /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
@@ -198,10 +200,6 @@ class ModuleServices : public Module
                }
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
-       }
 
        virtual void OnUserPostNick(User* user, const std::string &oldnick)
        {
@@ -233,7 +231,7 @@ class ModuleServices : public Module
                                        return 0;
                                }
                                // user messaging a +M channel and is not registered
-                               user->WriteServ("477 %s %s :You need a registered nickname to speak on this channel", user->nick, c->name);
+                               user->WriteNumeric(477, "%s %s :You need a registered nickname to speak on this channel", user->nick, c->name);
                                return 1;
                        }
                }
@@ -248,7 +246,7 @@ class ModuleServices : public Module
                                        return 0;
                                }
                                // user messaging a +R user and is not registered
-                               user->WriteServ("477 %s %s :You need a registered nickname to message this user", user->nick, u->nick);
+                               user->WriteNumeric(477, "%s %s :You need a registered nickname to message this user", user->nick, u->nick);
                                return 1;
                        }
                }
@@ -260,7 +258,7 @@ class ModuleServices : public Module
                return OnUserPreMessage(user,dest,target_type,text,status, exempt_list);
        }
        
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
@@ -274,7 +272,7 @@ class ModuleServices : public Module
                                                return 0;
                                        }
                                        // joining a +R channel and not identified
-                                       user->WriteServ("477 %s %s :You need a registered nickname to join this channel", user->nick, chan->name);
+                                       user->WriteNumeric(477, "%s %s :You need a registered nickname to join this channel", user->nick, chan->name);
                                        return 1;
                                }
                        }
@@ -299,7 +297,7 @@ class ModuleServices : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };