Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 38497f1bb640630092337895e5094e3b6e91e9f3..026d98f869032be75394fdedb528e109a1b9702f 100644 (file)
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
+
 /*
  * Written for InspIRCd-1.2 by Taros on the Tel'Laerad M&D Team
  * <http://tellaerad.net>
@@ -55,7 +61,7 @@ class CommandOjoin : public Command
                // Make sure the channel name is allowable.
                if (!ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
                {
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long");
+                       user->WriteServ("NOTICE "+user->nick+" :*** Invalid characters in channel name or name too long");
                        return CMD_FAILURE;
                }
 
@@ -65,24 +71,25 @@ class CommandOjoin : public Command
 
                if (channel)
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used OJOIN to join "+channel->name);
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN to join "+channel->name);
 
                        if (notice)
                        {
-                               channel = ServerInstance->FindChan(parameters[0]);
-                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s joined on official network business.",
+                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s joined on official network business.",
                                        parameters[0].c_str(), user->nick.c_str());
-                               ServerInstance->PI->SendChannelNotice(channel, 0, std::string(user->nick) + " joined on official network business.");
+                               ServerInstance->PI->SendChannelNotice(channel, 0, user->nick + " joined on official network business.");
                        }
                }
                else
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used OJOIN in "+parameters[0]);
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN in "+parameters[0]);
                        // they're already in the channel
                        std::vector<std::string> modes;
                        modes.push_back(parameters[0]);
-                       modes.push_back("+Y");
+                       modes.push_back(op ? "+Yo" : "+Y");
                        modes.push_back(user->nick);
+                       if (op)
+                               modes.push_back(user->nick);
                        ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
                }
                return CMD_SUCCESS;
@@ -98,7 +105,7 @@ class NetworkPrefix : public ModeHandler
        {
                list = true;
                prefix = NPrefix;
-               levelrequired = 0xFFFFFFFF;
+               levelrequired = INT_MAX;
                m_paramtype = TR_NICK;
        }
 
@@ -182,7 +189,7 @@ class ModuleOjoin : public Module
                ServerInstance->Modules->AddService(mycommand);
 
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
@@ -200,27 +207,24 @@ class ModuleOjoin : public Module
 
        void OnRehash(User* user)
        {
-               ConfigReader Conf;
+               ConfigTag* Conf = ServerInstance->Config->ConfValue("ojoin");
 
                if (!np)
                {
                        // This is done on module load only
-                       std::string npre = Conf.ReadValue("ojoin", "prefix", 0);
+                       std::string npre = Conf->getString("prefix");
                        NPrefix = npre.empty() ? 0 : npre[0];
 
                        if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
                                throw ModuleException("Looks like the +Y prefix you picked for m_ojoin is already in use. Pick another.");
                }
 
-               notice = Conf.ReadFlag("ojoin", "notice", "yes", 0);
-               op = Conf.ReadFlag("ojoin", "op", "yes", 0);
+               notice = Conf->getBool("notice", true);
+               op = Conf->getBool("op", true);
        }
 
        ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
        {
-               if ((ServerInstance->ULine(source->nick.c_str())) || ServerInstance->ULine(source->server))
-                       return MOD_RES_PASSTHRU;
-
                // Don't do anything if they're not +Y
                if (!memb->hasMode('Y'))
                        return MOD_RES_PASSTHRU;
@@ -245,7 +249,7 @@ class ModuleOjoin : public Module
 
        Version GetVersion()
        {
-               return Version("Network Buisness Join", VF_VENDOR);
+               return Version("Network Business Join", VF_VENDOR);
        }
 };