Review and optimize

[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 929c45f901ad4b7e30f76a15db06f10040ca744f..22d3242b7718fda657ec11208a3370fc57178ec1 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -14,12 +14,15 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include <string>
-
+#include "helperfuncs.h"
+#include "hashcomp.h"
 
 /* $ModDesc: Povides support for services +r user/chan modes and more */
 
@@ -27,9 +30,10 @@ class ModuleServices : public Module
 {
        Server *Srv; 
  public:
-       ModuleServices()
+       ModuleServices(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
 
                Srv->AddExtendedMode('r',MT_CHANNEL,false,0,0);
                Srv->AddExtendedMode('r',MT_CLIENT,false,0,0);
@@ -65,24 +69,28 @@ class ModuleServices : public Module
                        if (type == MT_CHANNEL)
                        {
                                // only a u-lined server may add or remove the +r mode.
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
+                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"") || (strchr(user->nick,'.'))))
                                {
+                                       log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",user->nick,user->server);
                                        return 1;
                                }
                                else
                                {
-                                       Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a U-Lined server may modify the +r channel mode");
+                                       log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",user->nick,user->server);
+                                       Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a server may modify the +r channel mode");
                                }
                        }
                        else
                        {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
+                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"") || (strchr(user->nick,'.'))))
                                {
+                                       log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",user->nick,user->server);
                                        return 1;
                                }
                                else
                                {
-                                       Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a U-Lined server may modify the +r user mode");
+                                       log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",user->nick,user->server);
+                                       Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a server may modify the +r user mode");
                                }
                        }
                }
@@ -198,7 +206,6 @@ class ModuleServices : public Module
 
        virtual ~ModuleServices()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -224,9 +231,9 @@ class ModuleServicesFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleServices;
+               return new ModuleServices(Me);
        }
        
 };