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 d7dfe8d2cc27c75cafaa718cb3429053fb43d253..997a926489b72e6b1e64df525a3a8885d82c36e6 100644 (file)
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -21,37 +21,30 @@
 
 #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());
                }
        }
 };