Change User::oper to an OperInfo reference

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11945 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 11 insertions, 16 deletions

diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index c4eaa6911..a6da1ddaa 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -275,26 +275,21 @@ public:
 
 	bool OperUser(User* user, const std::string &pattern, const std::string &type)
 	{
-		ConfigReader Conf;
-
-		for (int j = 0; j < Conf.Enumerate("type"); j++)
-		{
-			std::string tname = Conf.ReadValue("type","name",j);
-			std::string hostname(user->ident);
+		OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + type);
+		if (iter == ServerInstance->Config->oper_blocks.end())
+			return false;
+		OperInfo* ifo = iter->second;
 
-			hostname.append("@").append(user->host);
+		std::string hostname(user->ident);
 
-			if ((tname == type) && OneOfMatches(hostname.c_str(), user->GetIPString(), pattern.c_str()))
-			{
-				/* Opertype and host match, looks like this is it. */
-				std::string operhost = Conf.ReadValue("type", "host", j);
+		hostname.append("@").append(user->host);
 
-				if (operhost.size())
-					user->ChangeDisplayedHost(operhost.c_str());
+		if (OneOfMatches(hostname.c_str(), user->GetIPString(), pattern.c_str()))
+		{
+			/* Opertype and host match, looks like this is it. */
 
-				user->Oper(type, tname);
-				return true;
-			}
+			user->Oper(ifo);
+			return true;
 		}
 
 		return false;