Added a parameter to OnRehash for the rehash parameter

[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 801ab1fd9f4846eda62fc58798ca57a029a123ce..d98e218a7632e49159dcd2d601937a1718073176 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 */
 
@@ -65,24 +68,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)))
+                               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");
                                }
                        }
                }
@@ -111,7 +118,7 @@ class ModuleServices : public Module
                        chanrec* c = (chanrec*)dest;
                        if ((c->IsCustomModeSet('M')) && (!strchr(user->modes,'r')))
                        {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -203,7 +210,7 @@ class ModuleServices : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
        
        virtual void OnUserConnect(userrec* user)