This is better now.

[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 c7f2eca066c0d17b2004572c2a93e5c37b64c26c..b746f64924ae5d203a64ac60a7cf4fb4671da0b7 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -16,22 +16,17 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include <string>
-#include "helperfuncs.h"
-#include "commands.h"
-#include "hashcomp.h"
 #include "inspircd.h"
 
 static bool kludgeme = false;
 
 /* $ModDesc: Povides support for services +r user/chan modes and more */
 
-extern InspIRCd* ServerInstance;
-
+/** Channel mode +r - mark a channel as identified
+ */
 class Channel_r : public ModeHandler
 {
        
@@ -41,21 +36,23 @@ class Channel_r : public ModeHandler
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
                // only a u-lined server may add or remove the +r mode.
-               if ((is_uline(source->nick)) || (is_uline(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+               if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
                {
-                       log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server);
+                       ServerInstance->Log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server);
                        channel->SetMode('r',adding);
                        return MODEACTION_ALLOW;
                }
                else
                {
-                       log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server);
+                       ServerInstance->Log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server);
                        source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r channel mode");
                        return MODEACTION_DENY;
                }
        }
 };
 
+/** User mode +r - mark a user as identified
+ */
 class User_r : public ModeHandler
 {
        
@@ -64,21 +61,27 @@ class User_r : public ModeHandler
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               if ((kludgeme) || (is_uline(source->nick)) || (is_uline(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+               if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
                {
-                       log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
-                       dest->SetMode('r',adding);
-                       return MODEACTION_ALLOW;
+                       if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r')))
+                       {
+                               ServerInstance->Log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
+                               dest->SetMode('r',adding);
+                               return MODEACTION_ALLOW;
+                       }
+                       return MODEACTION_DENY;
                }
                else
                {
-                       log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server);
+                       ServerInstance->Log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server);
                        source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r user mode");
                        return MODEACTION_DENY;
                }
        }
 };
 
+/** Channel mode +R - registered users only
+ */
 class Channel_R : public ModeHandler
 {
  public:
@@ -107,6 +110,8 @@ class Channel_R : public ModeHandler
        }
 };
 
+/** User mode +R - only allow PRIVMSG and NOTICE from registered users
+ */
 class User_R : public ModeHandler
 {
  public:
@@ -135,6 +140,8 @@ class User_R : public ModeHandler
        }
 };
 
+/** Channel mode +M - only allow privmsg and notice to channel from registered users
+ */
 class Channel_M : public ModeHandler
 {
  public:
@@ -154,7 +161,7 @@ class Channel_M : public ModeHandler
                {
                        if (channel->IsModeSet('M'))
                        {
-                               channel->SetMode('M',true);
+                               channel->SetMode('M',false);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -163,6 +170,8 @@ class Channel_M : public ModeHandler
        }
 };
 
+/** Dreamnforge-like services support
+ */
 class ModuleServices : public Module
 {
        
@@ -189,24 +198,19 @@ class ModuleServices : public Module
                kludgeme = false;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output, "rRM", 4);
-       }
-
        /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
        virtual void OnWhois(userrec* source, userrec* dest)
        {
                if (dest->IsModeSet('r'))
                {
                        /* user is registered */
-                       source->WriteServ("307 %s %s :is a registered nick", source->nick, dest->nick);
+                       ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick, dest->nick);
                }
        }
 
        void Implements(char* List)
        {
-               List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+               List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
        }
 
        virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
@@ -223,14 +227,14 @@ class ModuleServices : public Module
                }
        }
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* c = (chanrec*)dest;
                        if ((c->IsModeSet('M')) && (!user->IsModeSet('r')))
                        {
-                               if ((is_uline(user->nick)) || (is_uline(user->server)) || (!strcmp(user->server,"")))
+                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -243,9 +247,9 @@ class ModuleServices : public Module
                if (target_type == TYPE_USER)
                {
                        userrec* u = (userrec*)dest;
-                       if ((u->IsModeSet('R')) && (user->IsModeSet('r')))
+                       if ((u->IsModeSet('R')) && (!user->IsModeSet('r')))
                        {
-                               if ((is_uline(user->nick)) || (is_uline(user->server)))
+                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -258,20 +262,20 @@ class ModuleServices : public Module
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreMessage(user,dest,target_type,text,status);
+               return OnUserPreMessage(user,dest,target_type,text,status, exempt_list);
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {
                        if (chan->IsModeSet('R'))
                        {
-                               if (user->IsModeSet('r'))
+                               if (!user->IsModeSet('r'))
                                {
-                                       if ((is_uline(user->nick)) || (is_uline(user->server)))
+                                       if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
                                        {
                                                // user is ulined, won't be stopped from joining
                                                return 0;
@@ -287,6 +291,12 @@ class ModuleServices : public Module
 
        virtual ~ModuleServices()
        {
+               kludgeme = true;
+               ServerInstance->Modes->DelMode(m1);
+               ServerInstance->Modes->DelMode(m2);
+               ServerInstance->Modes->DelMode(m3);
+               ServerInstance->Modes->DelMode(m4);
+               ServerInstance->Modes->DelMode(m5);
                DELETE(m1);
                DELETE(m2);
                DELETE(m3);
@@ -296,7 +306,7 @@ class ModuleServices : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };