AMD64 warning 'fix' which tested fine when I added it seems to now...stop things...

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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 7948dc0dbce3796158da2280ea508101e06730c0..9169cfd4cb0a93391b55f94651ec37da166fd0b0 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -25,7 +25,7 @@ using namespace std;
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-Server *Srv;
+static Server *Srv;
 
 class cmd_knock : public command_t
 {
@@ -40,18 +40,19 @@ class cmd_knock : public command_t
                chanrec* c = Srv->FindChannel(parameters[0]);
                std::string line = "";
 
+               if (c->IsModeSet('K'))
+               {
+                       WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+                       return;
+               }
+
                for (int i = 1; i < pcnt - 1; i++)
                {
                        line = line + std::string(parameters[i]) + " ";
                }
                line = line + std::string(parameters[pcnt-1]);
 
-               if (c->IsCustomModeSet('K'))
-               {
-                       WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
-                       return;
-               }
-               if (c->binarymodes & CM_INVITEONLY)
+               if (c->modes[CM_INVITEONLY])
                {
                        WriteChannelWithServ((char*)Srv->GetServerName().c_str(),c,"NOTICE %s :User %s is KNOCKing on %s (%s)",c->name,user->nick,c->name,line.c_str());
                        WriteServ(user->fd,"NOTICE %s :KNOCKing on %s",user->nick,c->name);
@@ -78,26 +79,14 @@ class ModuleKnock : public Module
                Srv->AddCommand(mycommand);
        }
 
+       void Implements(char* List)
+       {
+               List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+       }
+
         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 + "K";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-               {
-                       output = temp2.substr(0,temp2.length()-1) + std::string(" KNOCK");
-               }
-               else output = output + std::string(" KNOCK");
+               InsertMode(output,"K",4);
         }
 
        virtual ~ModuleKnock()