[ZNC-commits] SF.net SVN: znc:[1944] trunk/modules/webadmin.cpp

[<cf...@us...>]

Revision: 1944
          http://znc.svn.sourceforge.net/znc/?rev=1944&view=rev
Author:   cflakes
Date:     2010-04-25 21:58:56 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
Fixed some weird code in webadmin.cpp that prevented
module arguments from showing up with the new GetParam().

Modified Paths:
--------------
    trunk/modules/webadmin.cpp

Modified: trunk/modules/webadmin.cpp
===================================================================
--- trunk/modules/webadmin.cpp	2010-04-25 21:49:07 UTC (rev 1943)
+++ trunk/modules/webadmin.cpp	2010-04-25 21:58:56 UTC (rev 1944)
@@ -40,9 +40,7 @@
 		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 @@
 
 				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 @@
 
 				l["Name"] = Info.GetName();
 				l["Description"] = Info.GetDescription();
-				l["Args"] = GetModArgs(WebSock, Info.GetName(), true);
+				l["Args"] = GetModArgs(NULL, Info.GetName(), true);
 			}
 
 			return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.