X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_notice.cpp;h=d0845a0517a6f5a22b4150462aeb913b898a6d9d;hb=8f27fefa75e2952e7ab8757eb9fe4af4586817f0;hp=0aa793cb9070a459826cb854e67bade987b6f6bf;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_notice.cpp b/src/commands/cmd_notice.cpp
index 0aa793cb9..d0845a051 100644
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 /** Handle /NOTICE. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -49,7 +57,9 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
 	CUList exempt_list;
 
-	user->idle_lastmsg = ServerInstance->Time();
+	LocalUser* localuser = IS_LOCAL(user);
+	if (localuser)
+		localuser->idle_lastmsg = ServerInstance->Time();
 
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
 		return CMD_SUCCESS;
@@ -90,7 +100,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
 		if (chan)
 		{
-			if (IS_LOCAL(user))
+			if (localuser)
 			{
 				if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
 				{
@@ -102,6 +112,15 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 					user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str());
 					return CMD_FAILURE;
 				}
+
+				if (ServerInstance->Config->RestrictBannedUsers)
+				{
+					if (chan->IsBanned(user))
+					{
+						user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
+						return CMD_FAILURE;
+					}
+				}
 			}
 			ModResult MOD_RESULT;
 
@@ -149,7 +168,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
 	const char* destnick = parameters[0].c_str();
 
-	if (IS_LOCAL(user))
+	if (localuser)
 	{
 		const char* targetserver = strchr(destnick, '@');
 
@@ -172,7 +191,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 	else
 		dest = ServerInstance->FindNick(destnick);
 
-	if (dest)
+	if ((dest) && (dest->registered == REG_ALL))
 	{
 		if (parameters[1].empty())
 		{