auto-set +s when +n is set (as +n requires +s) - allow +n to be 'set twice' allowing...

[user/henk/code/inspircd.git] / src / modes / cmode_k.cpp

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 8e00f96f7059229e6645e0d10d336790b74d1bf4..4f95f3ad1baf5de5836d218b8d5686563c3d1e0b 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -33,15 +33,20 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
                if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
                {
                        /* Key is currently set and the correct key wasnt given */
-                       log(DEBUG,"Key Cond 2");
+                       ServerInstance->Log(DEBUG,"Key Cond 2");
                        return MODEACTION_DENY;
                }
                else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
                {
                        /* Key isnt currently set */
-                       strlcpy(channel->key,parameter.c_str(),32);
-                       channel->modes[CM_KEY] = adding;
-                       return MODEACTION_ALLOW;
+                       if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
+                       {
+                               strlcpy(channel->key,parameter.c_str(),32);
+                               channel->modes[CM_KEY] = adding;
+                               return MODEACTION_ALLOW;
+                       }
+                       else
+                               return MODEACTION_DENY;
                }
                else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
                {
@@ -50,12 +55,12 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
                        channel->modes[CM_KEY] = adding;
                        return MODEACTION_ALLOW;
                }
-               log(DEBUG,"Key Cond three");
+               ServerInstance->Log(DEBUG,"Key Cond three");
                return MODEACTION_DENY;
        }
        else
        {
-               log(DEBUG,"Key Condition one");
+               ServerInstance->Log(DEBUG,"Key Condition one");
                return MODEACTION_DENY;
        }
 }