Fixed bug #1258, more Windows stuff, and more language strings

6 files changed, 12 insertions, 12 deletions

diff --git a/src/commands.cpp b/src/commands.cpp
index 01f8eb45b..233253319 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -65,7 +65,7 @@ void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope:
 	// Command requires registered users only
 	if (!c->HasFlag(CFLAG_ALLOW_UNREGISTERED) && !u->IsIdentified())
 	{
-		u->SendMessage(bi, _(NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
+		u->SendMessage(bi, _(NICK_IDENTIFY_REQUIRED), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 		Log(LOG_COMMAND, "denied", bi) << "Access denied for unregistered user " << u->GetMask() << " with command " << command;
 		PopLanguage();
 		return;
diff --git a/src/language.cpp b/src/language.cpp
index 8a08ebdcc..250415e9f 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -117,6 +117,6 @@ const char *anope_gettext(const char *string)
 void SyntaxError(CommandSource &source, const Anope::string &command, const Anope::string &message)
 {
 	source.Reply(_("Syntax: \002%s\002"), message.c_str());
-	source.Reply(_(_(MORE_INFO)), source.owner->nick.c_str(), command.c_str());
+	source.Reply(_(_(MORE_INFO)), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str(), command.c_str());
 }
 
diff --git a/src/memoserv.cpp b/src/memoserv.cpp
index a92742864..f10a11d5f 100644
--- a/src/memoserv.cpp
+++ b/src/memoserv.cpp
@@ -182,7 +182,7 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
 	else if (!u->IsIdentified() && !u->IsRecognized())
 	{
 		if (!z || z == 3)
-			source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
+			source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 	}
 	else if (!(mi = getmemoinfo(name, ischan, isforbid)))
 	{
@@ -248,13 +248,13 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
 						NickAlias *na = *it;
 						User *user = finduser(na->nick);
 						if (user && user->IsIdentified())
-							user->SendMessage(MemoServ, _(MEMO_NEW_MEMO_ARRIVED), sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
+							user->SendMessage(MemoServ, _(MEMO_NEW_MEMO_ARRIVED), sender.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
 					}
 				}
 				else
 				{
 					if ((u = finduser(name)) && u->IsIdentified() && nc->HasFlag(NI_MEMO_RECEIVE))
-						u->SendMessage(MemoServ, _(MEMO_NEW_MEMO_ARRIVED), sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
+						u->SendMessage(MemoServ, _(MEMO_NEW_MEMO_ARRIVED), sender.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
 				} /* if (flags & MEMO_RECEIVE) */
 			}
 			/* if (MSNotifyAll) */
@@ -277,7 +277,7 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
 					if (check_access(cu->user, c->ci, CA_MEMO))
 					{
 						if (cu->user->Account() && cu->user->Account()->HasFlag(NI_MEMO_RECEIVE))
-							cu->user->SendMessage(MemoServ, _(MEMO_NEW_X_MEMO_ARRIVED), c->ci->name.c_str(), Config->s_MemoServ.c_str(), c->ci->name.c_str(), mi->memos.size());
+							cu->user->SendMessage(MemoServ, _(MEMO_NEW_X_MEMO_ARRIVED), c->ci->name.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_MemoServ.c_str(), c->ci->name.c_str(), mi->memos.size());
 					}
 				}
 			} /* MSNotifyAll */
diff --git a/src/misc.cpp b/src/misc.cpp
index edabe8f56..113dc059c 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -789,12 +789,12 @@ bool Anope::Match(const Anope::string &str, const Anope::string &mask, bool case
  * @param ... any number of parameters
  * @return a Anope::string
  */
-Anope::string Anope::printf(const Anope::string &fmt, ...)
+Anope::string Anope::printf(const char *fmt, ...)
 {
 	va_list args;
 	char buf[1024];
 	va_start(args, fmt);
-	vsnprintf(buf, sizeof(buf), fmt.c_str(), args);
+	vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
 	return buf;
 }
diff --git a/src/nickserv.cpp b/src/nickserv.cpp
index 0c036f564..870ea6d2c 100644
--- a/src/nickserv.cpp
+++ b/src/nickserv.cpp
@@ -208,9 +208,9 @@ int validate_user(User *u)
 	if (u->IsRecognized() || !na->nc->HasFlag(NI_KILL_IMMED))
 	{
 		if (na->nc->HasFlag(NI_SECURE))
-			u->SendMessage(NickServ, _(NICK_IS_SECURE), Config->s_NickServ.c_str());
+			u->SendMessage(NickServ, _(NICK_IS_SECURE), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 		else
-			u->SendMessage(NickServ, _(NICK_IS_REGISTERED), Config->s_NickServ.c_str());
+			u->SendMessage(NickServ, _(NICK_IS_REGISTERED), Config->UseStrictPrivMsgString.c_str(), Config->s_NickServ.c_str());
 	}
 
 	if (na->nc->HasFlag(NI_KILLPROTECT) && !u->IsRecognized())
diff --git a/src/sessions.cpp b/src/sessions.cpp
index 2be83410c..358527ea0 100644
--- a/src/sessions.cpp
+++ b/src/sessions.cpp
@@ -134,8 +134,8 @@ void add_session(User *u)
 			if (Config->MaxSessionKill && session->hits >= Config->MaxSessionKill && SGLine)
 			{
 				const Anope::string &akillmask = "*@" + u->host;
-				XLine *x = new XLine(akillmask, Config->s_OperServ, Anope::CurTime + Config->SessionAutoKillExpiry, "Session limit exceeded");
-				SGLine->AddXLine(x);
+				const Anope::string &akillreason = "Session limit exceeded for " + u->host;
+				SGLine->Add(NULL, NULL, akillmask, Anope::CurTime + Config->SessionAutoKillExpiry, akillreason);
 				ircdproto->SendGlobops(OperServ, "Added a temporary AKILL for \2%s\2 due to excessive connections", akillmask.c_str());
 			}
 		}