X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ojoin.cpp;h=d5f7b9443f8c77ce93cf773e1b1562ad1ef8cbe4;hb=c4d6ce8c5e1802e5b834d5845e31c3adf7700585;hp=8b8c1401e3f81334802c8df7204a4462ba884a3f;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 8b8c1401e..d5f7b9443 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -70,7 +70,7 @@ class CommandOjoin : public Command
 			if (notice)
 			{
 				channel = ServerInstance->FindChan(parameters[0]);
-				channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s joined on official network business.",
+				channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "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.");
 			}
@@ -95,7 +95,7 @@ class CommandOjoin : public Command
 class NetworkPrefix : public ModeHandler
 {
  public:
-	NetworkPrefix(Module* parent) : ModeHandler(parent, 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+	NetworkPrefix(Module* parent) : ModeHandler(parent, "official-join", 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
 	{
 		list = true;
 		prefix = NPrefix;
@@ -212,7 +212,6 @@ class NetworkPrefix : public ModeHandler
 			((source == theuser) && (!adding)) ||
 			(ServerInstance->ULine(source->nick.c_str())) ||
 			(ServerInstance->ULine(source->server)) ||
-			(!*source->server) ||
 			(!IS_LOCAL(source))
 			)
 		{
@@ -289,7 +288,7 @@ class ModuleOjoin : public Module
 
 	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
 	{
-		if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
+		if ((ServerInstance->ULine(source->nick.c_str())) || ServerInstance->ULine(source->server))
 			return MOD_RES_PASSTHRU;
 
 		// Don't do anything if they're not +Y
@@ -306,7 +305,6 @@ class ModuleOjoin : public Module
 
 	~ModuleOjoin()
 	{
-		ServerInstance->Modes->DelMode(np);
 		delete np;
 	}