Committing patches from crox/psychon

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@790 726aef4b-f618-498e-8847-2d620e286838

modules/awaynick.cpp

@@ -117,6 +117,19 @@ public:
 
 				PutModule(sMsg);
 			}
+		} else if (sCommand.Token(0).CaseCmp("SHOW") == 0) {
+			if (m_pUser) {
+				CString sExpanded = GetAwayNick();
+				CString sMsg = "AwayNick is set to [" + m_sFormat + "]";
+
+				if (m_sFormat != sExpanded) {
+					sMsg += " (" + sExpanded + ")";
+				}
+
+				PutModule(sMsg);
+			}
+		} else if(sCommand.Token(0).CaseCmp("HELP") == 0) {
+			PutModule("Commands are: show, timers, set [awaynick]");
 		}
 	}
 
@@ -125,7 +138,7 @@ public:
 		CIRCSock* pIRCSock = m_pUser->GetIRCSock();
 
 		if (pIRCSock) {
-			pIRCSock->GetMaxNickLen();
+			uLen = pIRCSock->GetMaxNickLen();
 		}
 
 		return m_pUser->ExpandString(m_sFormat).Left(uLen);

modules/perform.cpp

@@ -35,12 +35,13 @@ public:
 			if(sPerf.Left(1) == "/")
 				sPerf.LeftChomp();
 
-			if(sPerf.Token(0).AsUpper() == "MSG") {
+			if(sPerf.Token(0).CaseCmp("MSG") == 0) {
 				sPerf = "PRIVMSG " + sPerf.Token(1, true);
 			}
 
-			if(sPerf.Token(0).AsUpper() == "PRIVMSG" ||
-				sPerf.Token(0).AsUpper() == "NOTICE") {
+			if((sPerf.Token(0).CaseCmp("PRIVMSG") == 0 ||
+				sPerf.Token(0).CaseCmp("NOTICE") == 0) &&
+				sPerf.Token(2).Left(1) != ":") {
 				sPerf = sPerf.Token(0) + " " + sPerf.Token(1)
 					+ " :" + sPerf.Token(2, true);
 			}
@@ -64,9 +65,14 @@ public:
 		} else if(sCmdName == "list")
 		{
 			int i = 1;
+			CString sExpanded;
 			for(VCString::iterator it = m_vPerform.begin(); it != m_vPerform.end(); it++, i++)
 			{
-				PutModule(CString( i ) + ": " + *it);
+				sExpanded = GetUser()->ExpandString( *it );
+				if(sExpanded != *it)
+					PutModule(CString( i ) + ": " + *it + " (" + sExpanded + ")");
+				else
+					PutModule(CString( i ) + ": " + *it);
 			}
 			PutModule(" -- End of List");
 		} else if(sCmdName == "save")
@@ -86,7 +92,7 @@ public:
 		for( VCString::iterator it = m_vPerform.begin();
 			it != m_vPerform.end();  it++)
 		{
-			PutIRC(*it);
+			PutIRC( GetUser()->ExpandString( *it ) );
 		}
 	}
 

modules/webadmin.cpp

@@ -115,10 +115,27 @@ public:
 		return true;
 	}
 
-	virtual bool OnLoad(const CString& sArgs) {
+	virtual bool OnLoad(const CString& sArgStr) {
 		bool bSSL = false;
+		bool bIPv6 = false;
+		CString sArgs(sArgStr);
+		CString sOpt;
 		CString sPort;
 
+		if (sArgs.Left(1) == "-") {
+			sOpt = sArgs.Token(0);
+			sArgs = sArgs.Token(1, true);
+
+			if (sOpt.CaseCmp("-IPV6") == 0) {
+				bIPv6 = true;
+			} else if (sOpt.CaseCmp("-IPV4") == 0) {
+				bIPv6 = false;
+			} else {
+				CUtils::PrintMessage("Unknown option [" + sOpt + "] valid options are -ipv4 or -ipv6", true);
+				return false;
+			}
+		}
+
 		if (sArgs.find(" ") != CString::npos) {
 			m_sListenHost = sArgs.Token(0);
 			sPort = sArgs.Token(1);
@@ -146,7 +163,7 @@ public:
 		}
 #endif
 
-		return m_pManager->ListenHost(m_uPort, "WebAdmin::Listener", m_sListenHost, bSSL, SOMAXCONN, pListenSock);
+		return m_pManager->ListenHost(m_uPort, "WebAdmin::Listener", m_sListenHost, bSSL, SOMAXCONN, pListenSock, 0, bIPv6);
 	}
 
 	void AddSock(CWebAdminSock* pSock) {