X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sqloper.cpp;h=295f4aa94d4aab48e3f4efb123aa36d4953f7bec;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=cbf2450a0ebfaf1a508e035b93a6b3a42a7fae24;hpb=abc57eddfb56462ac3e433601d010abf1942e611;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index cbf2450a0..295f4aa94 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -32,7 +32,7 @@ class OpMeQuery : public SQLQuery
 
 	void OnResult(SQLResult& res) CXX11_OVERRIDE
 	{
-		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "SQLOPER: result for %s", uid.c_str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "result for %s", uid.c_str());
 		User* user = ServerInstance->FindNick(uid);
 		if (!user)
 			return;
@@ -44,14 +44,14 @@ class OpMeQuery : public SQLQuery
 			if (OperUser(user, row[0], row[1]))
 				return;
 		}
-		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "SQLOPER: no matches for %s (checked %d rows)", uid.c_str(), res.Rows());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "no matches for %s (checked %d rows)", uid.c_str(), res.Rows());
 		// nobody succeeded... fall back to OPER
 		fallback();
 	}
 
 	void OnError(SQLerror& error) CXX11_OVERRIDE
 	{
-		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "SQLOPER: query failed (%s)", error.Str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "query failed (%s)", error.Str());
 		fallback();
 	}
 
@@ -78,10 +78,10 @@ class OpMeQuery : public SQLQuery
 
 	bool OperUser(User* user, const std::string &pattern, const std::string &type)
 	{
-		OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + type);
-		if (iter == ServerInstance->Config->oper_blocks.end())
+		OperIndex::iterator iter = ServerInstance->Config->OperTypes.find(type);
+		if (iter == ServerInstance->Config->OperTypes.end())
 		{
-			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "SQLOPER: bad type '%s' in returned row for oper %s", type.c_str(), username.c_str());
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "bad type '%s' in returned row for oper %s", type.c_str(), username.c_str());
 			return false;
 		}
 		OperInfo* ifo = iter->second;
@@ -114,9 +114,6 @@ public:
 	void init() CXX11_OVERRIDE
 	{
 		OnRehash(NULL);
-
-		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void OnRehash(User* user) CXX11_OVERRIDE
@@ -143,7 +140,7 @@ public:
 				/* Query is in progress, it will re-invoke OPER if needed */
 				return MOD_RES_DENY;
 			}
-			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "SQLOPER: database not present");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "database not present");
 		}
 		return MOD_RES_PASSTHRU;
 	}