From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sat, 3 Nov 2007 19:55:04 +0000 (+0000)
Subject: Partial fix for bug #441
X-Git-Tag: v2.0.23~4228
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=3593e33ce374caee9aec0575b49ec9b0001a8ec6;p=user%2Fhenk%2Fcode%2Finspircd.git

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 2b31c725b..3406393cf 100644
--- 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 682fc2f01..30dda81f5 100644
--- 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 881483405..0adc26cb7 100644
--- 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;
 			}
 		}