Fix all typos (not as fun as 'kill all humans' but meh, beggers cant be choosers)

[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 bd6049718b064dca9f93f35f1d282a1c8b1e4796..0629f102332fd4e45fc34b54506bc167519db31f 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -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
 {
@@ -38,20 +38,28 @@ class cmd_knock : public command_t
        void Handle (char **parameters, int pcnt, userrec *user)
        {
                chanrec* c = Srv->FindChannel(parameters[0]);
-               std::string line = "";
 
-               for (int i = 1; i < pcnt - 1; i++)
+               if (!c)
                {
-                       line = line + std::string(parameters[i]) + " ";
+                       WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]);
+                       return;
                }
-               line = line + std::string(parameters[pcnt-1]);
 
-               if (c->IsCustomModeSet('K'))
+               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;
                }
-               if (c->binarymodes & CM_INVITEONLY)
+
+               for (int i = 1; i < pcnt - 1; i++)
+               {
+                       line = line + std::string(parameters[i]) + " ";
+               }
+               line = line + std::string(parameters[pcnt-1]);
+
+               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);
@@ -83,10 +91,10 @@ class ModuleKnock : public Module
                List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
+       virtual void On005Numeric(std::string &output)
+       {
                InsertMode(output,"K",4);
-        }
+       }
 
        virtual ~ModuleKnock()
        {