Mergable part of bug #441 fix

git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@8480 e03df62e-2008-0410-955e-edbf42e46eb7
danieldg · Nov 3, 2007 · 8e4a314 · 8e4a314
1 parent c1db857
commit 8e4a314
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/mode.cpp b/src/mode.cpp
@@ -393,7 +393,8 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 						 * 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
@@ -98,7 +98,8 @@ class cmd_tban : public command_t
 				}
 				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
@@ -53,7 +53,8 @@ class cmd_uninvite : public command_t
 		{
 			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;
 			}
 		}