Moved a ton of functions into helperfuncs.h to speed up recompiles

[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 8787241680af15262b38bd68df7735b93762ada3..929c45f901ad4b7e30f76a15db06f10040ca744f 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -37,6 +37,25 @@ class ModuleServices : public Module
                Srv->AddExtendedMode('R',MT_CLIENT,false,0,0);
                Srv->AddExtendedMode('M',MT_CHANNEL,false,0,0);
        }
+
+        virtual void On005Numeric(std::string &output)
+        {
+                std::stringstream line(output);
+                std::string temp1, temp2;
+                while (!line.eof())
+                {
+                        line >> temp1;
+                        if (temp1.substr(0,10) == "CHANMODES=")
+                        {
+                                // append the chanmode to the end
+                                temp1 = temp1.substr(10,temp1.length());
+                                temp1 = "CHANMODES=" + temp1 + "rRM";
+                        }
+                        temp2 = temp2 + temp1 + " ";
+                }
+               if (temp2.length())
+                       output = temp2.substr(0,temp2.length()-1);
+        }
        
        virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
        {
@@ -46,16 +65,9 @@ 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,"")))
                                {
-                                       // FCS - BugFix for #27 :)
-                                       if ((!strchr(user->modes,'r')) && (mode_on == false)) {
-                                               return 1;
-                                       } else if ((strchr(user->modes,'r')) && (mode_on == true)) {
-                                               return 1;
-                                       } else { 
-                                               return 0;
-                                       }
+                                       return 1;
                                }
                                else
                                {
@@ -64,13 +76,13 @@ class ModuleServices : public Module
                        }
                        else
                        {
-                               if (!strcmp(user->server,""))
+                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
                                {
                                        return 1;
                                }
                                else
                                {
-                                       Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a server may modify the +r user mode");
+                                       Srv->SendServ(user->fd,"500 "+std::string(user->nick)+" :Only a U-Lined server may modify the +r user mode");
                                }
                        }
                }
@@ -99,7 +111,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;
@@ -191,7 +203,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)