X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsnomasks.cpp;h=4b9c9d86b29194162eff736b61bee1da848af5c9;hb=2550d001423d25b50c7bfdc89f6efe81dbb64612;hp=f8e1fc1581f7cecbbdbb269e7cd9e58da50739ba;hpb=61197974c5f7ce009096468b208c3abf2c25810b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index f8e1fc158..4b9c9d86b 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | 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-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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"
 #include <stdarg.h>
 
@@ -83,7 +92,7 @@ SnomaskManager::SnomaskManager()
 
 void Snomask::SendMessage(const std::string &message, char mysnomask)
 {
-	if (message != LastMessage || mysnomask != LastLetter)
+	if (ServerInstance->Config->NoSnoticeStack || message != LastMessage || mysnomask != LastLetter)
 	{
 		this->Flush();
 		LastMessage = message;
@@ -91,7 +100,7 @@ void Snomask::SendMessage(const std::string &message, char mysnomask)
 
 		std::string desc = Description;
 		if (desc.empty())
-			desc = "SNO-" + tolower(mysnomask);
+			desc = std::string("SNO-") + (char)tolower(mysnomask);
 		if (isupper(mysnomask))
 			desc = "REMOTE" + desc;
 		ModResult MOD_RESULT;
@@ -127,7 +136,7 @@ void Snomask::Flush()
 	{
 		std::string desc = Description;
 		if (desc.empty())
-			desc = "SNO-" + tolower(LastLetter);
+			desc = std::string("SNO-") + (char)tolower(LastLetter);
 		if (isupper(LastLetter))
 			desc = "REMOTE" + desc;
 		std::string mesg = "(last message repeated "+ConvToStr(Count)+" times)";
@@ -154,7 +163,7 @@ void Snomask::Flush()
 		}
 
 	}
-	LastMessage = "";
+	LastMessage.clear();
 	LastBlocked = false;
 	Count = 0;
 }