From 136ce32f859471a50057be029c6a08fdfc3272dc Mon Sep 17 00:00:00 2001 From: cflakes Date: Sun, 25 Apr 2010 21:58:56 +0000 Subject: [PATCH] Fixed some weird code in webadmin.cpp that prevented module arguments from showing up with the new GetParam(). git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1944 726aef4b-f618-498e-8847-2d620e286838 --- modules/webadmin.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp index 063a664c..4529ebaf 100644 --- a/modules/webadmin.cpp +++ b/modules/webadmin.cpp @@ -40,9 +40,7 @@ public: return true; } - CString GetModArgs(CWebSock& WebSock, const CString& sModName, bool bGlobal = false) { - CUser* pUser = CZNC::Get().FindUser(WebSock.GetParam("user")); - + CString GetModArgs(CUser* pUser, const CString& sModName, bool bGlobal = false) { if (!bGlobal && !pUser) { return ""; } @@ -604,7 +602,7 @@ public: l["Name"] = Info.GetName(); l["Description"] = Info.GetDescription(); - l["Args"] = GetModArgs(WebSock, Info.GetName()); + l["Args"] = GetModArgs(pUser, Info.GetName()); if (pUser && pUser->GetModules().FindModule(Info.GetName())) { l["Checked"] = "true"; @@ -832,7 +830,7 @@ public: l["Name"] = Info.GetName(); l["Description"] = Info.GetDescription(); - l["Args"] = GetModArgs(WebSock, Info.GetName(), true); + l["Args"] = GetModArgs(NULL, Info.GetName(), true); } return true;