Merge pull request #1328 from Adam-/insp20+sakick

[user/henk/code/inspircd.git] / src / modules / m_chancreate.cpp

diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index 1d70a7b4d05ccedcff344b787e1a564c3d8a0f12..997a926489b72e6b1e64df525a3a8885d82c36e6 100644 (file)
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -1,49 +1,50 @@
-/*       +------------------------------------+
- *       | 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) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.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"
 
-/* $ModDesc: Creates a snomask with notices whenever a new channel is created */
+/* $ModDesc: Provides snomasks 'j' and 'J', to which notices about newly created channels are sent */
 
 class ModuleChanCreate : public Module
 {
  private:
  public:
-       ModuleChanCreate()
-                       {
+       void init()
+       {
                ServerInstance->SNO->EnableSnomask('j', "CHANCREATE");
                Implementation eventlist[] = { I_OnUserJoin };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion()
        {
-               return Version("Creates a snomask with notices whenever a new channel is created",VF_VENDOR);
+               return Version("Provides snomasks 'j' and 'J', to which notices about newly created channels are sent",VF_VENDOR);
        }
 
 
        void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except)
        {
-               if (created)
+               if ((created) && (IS_LOCAL(memb->user)))
                {
-                       if (IS_LOCAL(memb->user))
-                               ServerInstance->SNO->WriteToSnoMask('j', "Channel %s created by %s!%s@%s",
-                                       memb->chan->name.c_str(), memb->user->nick.c_str(),
-                                       memb->user->ident.c_str(), memb->user->host.c_str());
-                       else
-                               ServerInstance->SNO->WriteGlobalSno('J', "Channel %s created by %s!%s@%s",
-                                       memb->chan->name.c_str(), memb->user->nick.c_str(),
-                                       memb->user->ident.c_str(), memb->user->host.c_str());
+                       ServerInstance->SNO->WriteGlobalSno('j', "Channel %s created by %s", memb->chan->name.c_str(), memb->user->GetFullRealHost().c_str());
                }
        }
 };