Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

[user/henk/code/inspircd.git] / src / snomasks.cpp

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index e0849147bdd2800e60c11e6e73c6cedd9208bc08..4b9c9d86b29194162eff736b61bee1da848af5c9 100644 (file)
--- 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>
 
@@ -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;
 }