Merge pull request #179 from SaberUK/master+oline

Remove operserv/oline and CanSVSO/SendSVSO in IRCDProto.

5 files changed, 4 insertions, 103 deletions

diff --git a/data/anope.example.conf b/data/anope.example.conf
index 571f84182..8c9be4f64 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -731,7 +731,7 @@ log
 log
 {
 	target = "globops"
-	admin = "global/* operserv/chankill operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/oline operserv/set operserv/svsnick operserv/svsjoin operserv/svspart */drop"
+	admin = "global/* operserv/chankill operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/set operserv/svsnick operserv/svsjoin operserv/svspart */drop"
 	servers = "squit"
 	users = "oper"
 	other = "expire/* bados akill/*"
@@ -800,7 +800,7 @@ log
  *   operserv/oper         operserv/config       operserv/umode      operserv/logsearch
  *   operserv/modload      operserv/jupe         operserv/set        operserv/noop
  *   operserv/quit         operserv/update       operserv/reload     operserv/restart
- *   operserv/shutdown     operserv/svs          operserv/oline      operserv/kill
+ *   operserv/shutdown     operserv/svs          operserv/kill
  *
  * Firstly, we define 'opertypes' which are named whatever we want ('Network Administrator', etc).
  * These can contain commands for oper-only strings (see above) which grants access to that specific command,
@@ -851,7 +851,7 @@ opertype
 
 	inherits = "Services Operator"
 
-	commands = "botserv/* chanserv/access/list chanserv/drop chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svs operserv/stats operserv/oline operserv/noop operserv/forbid global/*"
+	commands = "botserv/* chanserv/access/list chanserv/drop chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svs operserv/stats operserv/noop operserv/forbid global/*"
 
 	privs = "*"
 }
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index 6deedddcd..c2ec7e250 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -498,17 +498,6 @@ module { name = "operserv/noop" }
 command { service = "OperServ"; name = "NOOP"; command = "operserv/noop"; permission = "operserv/noop"; }
 
 /*
- * operserv/oline
- *
- * Provides the command operserv/oline.
- *
- * Used to set oper flags on users, and is specific to UnrealIRCd.
- * See /helpop ?svso on your IRCd for more information.
- */
-module { name = "operserv/oline" }
-command { service = "OperServ"; name = "OLINE"; command = "operserv/oline"; permission = "operserv/oline"; }
-
-/*
  * operserv/oper
  *
  * Provides the command operserv/oper.
diff --git a/include/protocol.h b/include/protocol.h
index 4fdc97f0c..f7e7460f0 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -71,8 +71,6 @@ class CoreExport IRCDProto : public Service
 	bool CanSZLine;
 	/* Can we place temporary holds on specific nicknames? */
 	bool CanSVSHold;
-	/* See os_oline */
-	bool CanSVSO;
 	/* See ns_cert */
 	bool CanCertFP;
 	/* Whether this IRCd requires unique IDs for each user or server. See TS6/P10. */
@@ -197,10 +195,6 @@ class CoreExport IRCDProto : public Service
 	virtual void SendInvite(const MessageSource &source, const Channel *c, User *u);
 	virtual void SendGlobops(const MessageSource &source, const char *fmt, ...);
 
-	/** Sets oper flags on a user, currently only supported by Unreal
-	 */
-	virtual void SendSVSO(ServiceBot *, const Anope::string &, const Anope::string &) { }
-
 	/** Sends a nick change of one of our clients.
 	 */
 	virtual void SendNickChange(User *u, const Anope::string &newnick);
diff --git a/modules/operserv/oline.cpp b/modules/operserv/oline.cpp
deleted file mode 100644
index 9564dceac..000000000
--- a/modules/operserv/oline.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Anope IRC Services
- *
- * Copyright (C) 2003-2016 Anope Team <team@anope.org>
- *
- * This file is part of Anope. Anope 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 see <http://www.gnu.org/licenses/>.
- */
-
-#include "module.h"
-
-class CommandOSOLine : public Command
-{
- public:
-	CommandOSOLine(Module *creator) : Command(creator, "operserv/oline", 2, 2)
-	{
-		this->SetDesc(_("Give Operflags to a certain user"));
-		this->SetSyntax(_("\037nick\037 \037flags\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
-	{
-		const Anope::string &nick = params[0];
-		const Anope::string &flag = params[1];
-		User *u2 = NULL;
-
-		/* let's check whether the user is online */
-		if (!(u2 = User::Find(nick, true)))
-			source.Reply(_("\002{0}\002 isn't currently online."), nick);
-		else if (u2 && flag[0] == '+')
-		{
-			IRCD->SendSVSO(source.service, nick, flag);
-			u2->SetMode(source.service, "OPER");
-			u2->SendMessage(*source.service, _("You are now an IRC Operator."));
-			source.Reply(_("Operflags \002{0}\002 have been added for \002{1}\002."), flag, nick);
-			Log(LOG_ADMIN, source, this) << "for " << nick;
-		}
-		else if (u2 && flag[0] == '-')
-		{
-			IRCD->SendSVSO(source.service, nick, flag);
-			source.Reply(_("Operflags \002{0}\002 have been removed from \002{1}\002."), flag, nick);
-			Log(LOG_ADMIN, source, this) << "for " << nick;
-		}
-		else
-		{
-			this->OnSyntaxError(source, "");
-		}
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
-	{
-		source.Reply(_("Allows Services Operators to give Operflags to any user. Flags have to be prefixed with a \"+\" or a \"-\". To remove all flags simply type a \"-\" instead of any flags."));
-		return true;
-	}
-};
-
-class OSOLine : public Module
-{
-	CommandOSOLine commandosoline;
-
- public:
-	OSOLine(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
-		, commandosoline(this)
-	{
-
-		if (!IRCD || !IRCD->CanSVSO)
-			throw ModuleException("Your IRCd does not support OMODE.");
-
-	}
-};
-
-MODULE_INIT(OSOLine)
diff --git a/src/protocol.cpp b/src/protocol.cpp
index c5b555cad..f23117952 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -33,7 +33,7 @@ IRCDProto::IRCDProto(Module *creator, const Anope::string &p) : Service(creator,
 {
 	DefaultPseudoclientModes = "+io";
 	CanSVSNick = CanSVSJoin = CanSetVHost = CanSetVIdent = CanSNLine = CanSQLine = CanSQLineChannel
-		= CanSZLine = CanSVSHold = CanSVSO = CanCertFP = RequiresID = AmbiguousID = false;
+		= CanSZLine = CanSVSHold = CanCertFP = RequiresID = AmbiguousID = false;
 	MaxModes = 3;
 	MaxLine = 512;