cmd_userhost Fix +H hidden opers being shown as opers

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

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 855a5ca5685369e95f8b97fcaf979ef9158aa1da..ae1c19d9148022e2324d27ba96ec19182b051f99 100644 (file)
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Oliver Lupton <oliverlupton@gmail.com>
  *
- * 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/>.
  */
 
+
 /* $ModDesc: Provides a SATOPIC command */
 
 #include "inspircd.h"
@@ -20,11 +26,9 @@
 class CommandSATopic : public Command
 {
  public:
-       CommandSATopic (InspIRCd* Instance)
-       : Command(Instance,"SATOPIC", "o", 2, false, 0)
+       CommandSATopic(Module* Creator) : Command(Creator,"SATOPIC", 2, 2)
        {
-               this->source = "m_satopic.so";
-               syntax = "<target> <topic>";
+               flags_needed = 'o'; Penalty = 0; syntax = "<target> <topic>";
        }
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -37,13 +41,12 @@ class CommandSATopic : public Command
                if(target)
                {
                        std::string newTopic = parameters[1];
-                       
+
                        // 3rd parameter overrides access checks
                        target->SetTopic(user, newTopic, true);
-                       ServerInstance->SNO->WriteToSnoMask('A', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
-                       ServerInstance->PI->SendSNONotice("A", user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {
@@ -55,13 +58,16 @@ class CommandSATopic : public Command
 
 class ModuleSATopic : public Module
 {
-       CommandSATopic* mycommand;
+       CommandSATopic cmd;
  public:
-       ModuleSATopic(InspIRCd* Me)
-       : Module(Me)
+       ModuleSATopic()
+       : cmd(this)
+       {
+       }
+
+       void init()
        {
-               mycommand = new CommandSATopic(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->Modules->AddService(cmd);
        }
 
        virtual ~ModuleSATopic()
@@ -70,7 +76,7 @@ class ModuleSATopic : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides a SATOPIC command", VF_VENDOR);
        }
 };