Partial fix for bug #441

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8479 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/mode.cpp b/src/mode.cpp
index 2b31c725b28551012c2c14311292201fe9285a3f..3406393cf1bfcfb914b2ea8b6bc71a28d86d852f 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -395,7 +395,8 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser
                                                 * NOT a uline and NOT a servermode,
                                                 * OR, NOT halfop or above.
                                                 */
-                                               user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name);
+                                               user->WriteServ("482 %s %s :You're not a channel %soperator",user->nick, targetchannel->name,
+                                                               ServerInstance->Config->AllowHalfop ? "(half)" : "");
                                                return;
                                        }
                                }

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 682fc2f013f1e2946fdd07acffc7523bb632e8a2..30dda81f5f53a7d3c08c7f45365169e0ab3f83df 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -94,7 +94,8 @@ class CommandTban : public Command
                                }
                                return CMD_FAILURE;
                        }
-                       else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
+                       else user->WriteServ("482 %s %s :You must be at least a%soperator to change modes on this channel",user->nick, channel->name,
+                                       ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
                        return CMD_FAILURE;
                }
                user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 88148340598fbeb5bbaf080009eb07cae358ba1b..0adc26cb7a3e2dcf25c674a129ebade2db398d03 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -50,7 +50,8 @@ class CommandUninvite : public Command
                {
                        if (c->GetStatus(user) < STATUS_HOP)
                        {
-                               user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
+                               user->WriteServ("482 %s %s :You must be at least a%soperator to change modes on this channel",user->nick, c->name,
+                                               ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
                                return CMD_FAILURE;
                        }
                }