7 files changed, 193 insertions, 79 deletions

diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 6462036be..45008bb32 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
 /*

 ** Lua binding: AllToLua

-** Generated automatically by tolua++-1.0.92 on 01/31/12 01:23:11.

+** Generated automatically by tolua++-1.0.92 on 01/31/12 19:40:39.

 */

 

 #ifndef __cplusplus

@@ -164,53 +164,54 @@ static void tolua_reg_types (lua_State* tolua_S)
  tolua_usertype(tolua_S,"TakeDamageInfo");

  tolua_usertype(tolua_S,"cPlugin");

  tolua_usertype(tolua_S,"cStringMap");

+ tolua_usertype(tolua_S,"Lua__cEntity");

  tolua_usertype(tolua_S,"Json::Value");

  tolua_usertype(tolua_S,"cInventory");

  tolua_usertype(tolua_S,"cRoot");

- tolua_usertype(tolua_S,"Lua__cPickup");

  tolua_usertype(tolua_S,"Lua__cPacket_BlockDig");

+ tolua_usertype(tolua_S,"Lua__cTCPLink");

  tolua_usertype(tolua_S,"cWorld");

  tolua_usertype(tolua_S,"cPlugin::CommandStruct");

  tolua_usertype(tolua_S,"cPickup");

- tolua_usertype(tolua_S,"Vector3i");

+ tolua_usertype(tolua_S,"cGroup");

  tolua_usertype(tolua_S,"cPacket_Login");

  tolua_usertype(tolua_S,"cClientHandle");

- tolua_usertype(tolua_S,"cGroup");

- tolua_usertype(tolua_S,"cFurnaceRecipe");

  tolua_usertype(tolua_S,"cTracer");

- tolua_usertype(tolua_S,"cChatColor");

+ tolua_usertype(tolua_S,"cFurnaceRecipe");

  tolua_usertype(tolua_S,"cMCLogger");

+ tolua_usertype(tolua_S,"cChatColor");

+ tolua_usertype(tolua_S,"cCuboid");

  tolua_usertype(tolua_S,"cPacket_PickupSpawn");

  tolua_usertype(tolua_S,"Lua__cWebPlugin");

  tolua_usertype(tolua_S,"Lua__cPawn");

- tolua_usertype(tolua_S,"cCuboid");

+ tolua_usertype(tolua_S,"Vector3i");

  tolua_usertype(tolua_S,"cItem");

  tolua_usertype(tolua_S,"Vector3f");

  tolua_usertype(tolua_S,"cPlugin_Lua");

  tolua_usertype(tolua_S,"cWebPlugin_Lua");

- tolua_usertype(tolua_S,"Lua__cPlayer");

+ tolua_usertype(tolua_S,"Lua__cPlugin_NewLua");

  tolua_usertype(tolua_S,"cPacket");

  tolua_usertype(tolua_S,"cPacket_BlockDig");

  tolua_usertype(tolua_S,"cWebAdmin");

- tolua_usertype(tolua_S,"Lua__cTCPLink");

- tolua_usertype(tolua_S,"cBlockEntity");

  tolua_usertype(tolua_S,"cTCPLink");

+ tolua_usertype(tolua_S,"cBlockEntity");

  tolua_usertype(tolua_S,"cRecipeChecker");

- tolua_usertype(tolua_S,"Lua__cPlugin");

  tolua_usertype(tolua_S,"cGroupManager");

+ tolua_usertype(tolua_S,"Lua__cPlugin");

+ tolua_usertype(tolua_S,"Lua__cPickup");

  tolua_usertype(tolua_S,"cPacket_BlockPlace");

  tolua_usertype(tolua_S,"cLadder");

- tolua_usertype(tolua_S,"Lua__cPlugin_NewLua");

  tolua_usertype(tolua_S,"cPluginManager");

+ tolua_usertype(tolua_S,"Lua__cPlayer");

  tolua_usertype(tolua_S,"cIniFile");

- tolua_usertype(tolua_S,"Lua__cEntity");

+ tolua_usertype(tolua_S,"cWebPlugin");

  tolua_usertype(tolua_S,"HTTPRequest");

  tolua_usertype(tolua_S,"cPawn");

  tolua_usertype(tolua_S,"cPlayer");

  tolua_usertype(tolua_S,"cTorch");

  tolua_usertype(tolua_S,"cEntity");

- tolua_usertype(tolua_S,"cWebPlugin");

  tolua_usertype(tolua_S,"cPlugin_NewLua");

+ tolua_usertype(tolua_S,"HTTPFormData");

  tolua_usertype(tolua_S,"cServer");

  tolua_usertype(tolua_S,"cStairs");

  tolua_usertype(tolua_S,"Vector3d");

@@ -10363,121 +10364,151 @@ static int tolua_set_cItem_m_ItemHealth(lua_State* tolua_S)
 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* get function: Method of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_get_HTTPRequest_Method

-static int tolua_get_HTTPRequest_Method(lua_State* tolua_S)

+/* get function: Name of class  HTTPFormData */

+#ifndef TOLUA_DISABLE_tolua_get_HTTPFormData_Name

+static int tolua_get_HTTPFormData_Name(lua_State* tolua_S)

 {

-  HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

+  HTTPFormData* self = (HTTPFormData*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Method'",NULL);

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Name'",NULL);

 #endif

-  tolua_pushcppstring(tolua_S,(const char*)self->Method);

+  tolua_pushcppstring(tolua_S,(const char*)self->Name);

  return 1;

 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* set function: Method of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_set_HTTPRequest_Method

-static int tolua_set_HTTPRequest_Method(lua_State* tolua_S)

+/* set function: Name of class  HTTPFormData */

+#ifndef TOLUA_DISABLE_tolua_set_HTTPFormData_Name

+static int tolua_set_HTTPFormData_Name(lua_State* tolua_S)

 {

-  HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

+  HTTPFormData* self = (HTTPFormData*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

   tolua_Error tolua_err;

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Method'",NULL);

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Name'",NULL);

   if (!tolua_iscppstring(tolua_S,2,0,&tolua_err))

    tolua_error(tolua_S,"#vinvalid type in variable assignment.",&tolua_err);

 #endif

-  self->Method = ((std::string)  tolua_tocppstring(tolua_S,2,0))

+  self->Name = ((std::string)  tolua_tocppstring(tolua_S,2,0))

 ;

  return 0;

 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* get function: Path of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_get_HTTPRequest_Path

-static int tolua_get_HTTPRequest_Path(lua_State* tolua_S)

+/* get function: Value of class  HTTPFormData */

+#ifndef TOLUA_DISABLE_tolua_get_HTTPFormData_Value

+static int tolua_get_HTTPFormData_Value(lua_State* tolua_S)

 {

-  HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

+  HTTPFormData* self = (HTTPFormData*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Path'",NULL);

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Value'",NULL);

 #endif

-  tolua_pushcppstring(tolua_S,(const char*)self->Path);

+  tolua_pushcppstring(tolua_S,(const char*)self->Value);

  return 1;

 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* set function: Path of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_set_HTTPRequest_Path

-static int tolua_set_HTTPRequest_Path(lua_State* tolua_S)

+/* set function: Value of class  HTTPFormData */

+#ifndef TOLUA_DISABLE_tolua_set_HTTPFormData_Value

+static int tolua_set_HTTPFormData_Value(lua_State* tolua_S)

 {

-  HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

+  HTTPFormData* self = (HTTPFormData*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

   tolua_Error tolua_err;

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Path'",NULL);

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Value'",NULL);

   if (!tolua_iscppstring(tolua_S,2,0,&tolua_err))

    tolua_error(tolua_S,"#vinvalid type in variable assignment.",&tolua_err);

 #endif

-  self->Path = ((std::string)  tolua_tocppstring(tolua_S,2,0))

+  self->Value = ((std::string)  tolua_tocppstring(tolua_S,2,0))

 ;

  return 0;

 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* get function: Params of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_get_HTTPRequest_Params_ptr

-static int tolua_get_HTTPRequest_Params_ptr(lua_State* tolua_S)

+/* get function: Type of class  HTTPFormData */

+#ifndef TOLUA_DISABLE_tolua_get_HTTPFormData_Type

+static int tolua_get_HTTPFormData_Type(lua_State* tolua_S)

+{

+  HTTPFormData* self = (HTTPFormData*)  tolua_tousertype(tolua_S,1,0);

+#ifndef TOLUA_RELEASE

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Type'",NULL);

+#endif

+  tolua_pushcppstring(tolua_S,(const char*)self->Type);

+ return 1;

+}

+#endif //#ifndef TOLUA_DISABLE

+

+/* set function: Type of class  HTTPFormData */

+#ifndef TOLUA_DISABLE_tolua_set_HTTPFormData_Type

+static int tolua_set_HTTPFormData_Type(lua_State* tolua_S)

+{

+  HTTPFormData* self = (HTTPFormData*)  tolua_tousertype(tolua_S,1,0);

+#ifndef TOLUA_RELEASE

+  tolua_Error tolua_err;

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Type'",NULL);

+  if (!tolua_iscppstring(tolua_S,2,0,&tolua_err))

+   tolua_error(tolua_S,"#vinvalid type in variable assignment.",&tolua_err);

+#endif

+  self->Type = ((std::string)  tolua_tocppstring(tolua_S,2,0))

+;

+ return 0;

+}

+#endif //#ifndef TOLUA_DISABLE

+

+/* get function: Method of class  HTTPRequest */

+#ifndef TOLUA_DISABLE_tolua_get_HTTPRequest_Method

+static int tolua_get_HTTPRequest_Method(lua_State* tolua_S)

 {

   HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Params'",NULL);

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Method'",NULL);

 #endif

-   tolua_pushusertype(tolua_S,(void*)self->Params,"cStringMap");

+  tolua_pushcppstring(tolua_S,(const char*)self->Method);

  return 1;

 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* set function: Params of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_set_HTTPRequest_Params_ptr

-static int tolua_set_HTTPRequest_Params_ptr(lua_State* tolua_S)

+/* set function: Method of class  HTTPRequest */

+#ifndef TOLUA_DISABLE_tolua_set_HTTPRequest_Method

+static int tolua_set_HTTPRequest_Method(lua_State* tolua_S)

 {

   HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

   tolua_Error tolua_err;

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Params'",NULL);

-  if (!tolua_isusertype(tolua_S,2,"cStringMap",0,&tolua_err))

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Method'",NULL);

+  if (!tolua_iscppstring(tolua_S,2,0,&tolua_err))

    tolua_error(tolua_S,"#vinvalid type in variable assignment.",&tolua_err);

 #endif

-  self->Params = ((cStringMap*)  tolua_tousertype(tolua_S,2,0))

+  self->Method = ((std::string)  tolua_tocppstring(tolua_S,2,0))

 ;

  return 0;

 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* get function: PostParams of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_get_HTTPRequest_PostParams_ptr

-static int tolua_get_HTTPRequest_PostParams_ptr(lua_State* tolua_S)

+/* get function: Path of class  HTTPRequest */

+#ifndef TOLUA_DISABLE_tolua_get_HTTPRequest_Path

+static int tolua_get_HTTPRequest_Path(lua_State* tolua_S)

 {

   HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'PostParams'",NULL);

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Path'",NULL);

 #endif

-   tolua_pushusertype(tolua_S,(void*)self->PostParams,"cStringMap");

+  tolua_pushcppstring(tolua_S,(const char*)self->Path);

  return 1;

 }

 #endif //#ifndef TOLUA_DISABLE

 

-/* set function: PostParams of class  HTTPRequest */

-#ifndef TOLUA_DISABLE_tolua_set_HTTPRequest_PostParams_ptr

-static int tolua_set_HTTPRequest_PostParams_ptr(lua_State* tolua_S)

+/* set function: Path of class  HTTPRequest */

+#ifndef TOLUA_DISABLE_tolua_set_HTTPRequest_Path

+static int tolua_set_HTTPRequest_Path(lua_State* tolua_S)

 {

   HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

 #ifndef TOLUA_RELEASE

   tolua_Error tolua_err;

-  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'PostParams'",NULL);

-  if (!tolua_isusertype(tolua_S,2,"cStringMap",0,&tolua_err))

+  if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable 'Path'",NULL);

+  if (!tolua_iscppstring(tolua_S,2,0,&tolua_err))

    tolua_error(tolua_S,"#vinvalid type in variable assignment.",&tolua_err);

 #endif

-  self->PostParams = ((cStringMap*)  tolua_tousertype(tolua_S,2,0))

+  self->Path = ((std::string)  tolua_tocppstring(tolua_S,2,0))

 ;

  return 0;

 }

@@ -17026,12 +17057,16 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
    tolua_variable(tolua_S,"m_ItemCount",tolua_get_cItem_m_ItemCount,tolua_set_cItem_m_ItemCount);

    tolua_variable(tolua_S,"m_ItemHealth",tolua_get_cItem_m_ItemHealth,tolua_set_cItem_m_ItemHealth);

   tolua_endmodule(tolua_S);

+  tolua_cclass(tolua_S,"HTTPFormData","HTTPFormData","",NULL);

+  tolua_beginmodule(tolua_S,"HTTPFormData");

+   tolua_variable(tolua_S,"Name",tolua_get_HTTPFormData_Name,tolua_set_HTTPFormData_Name);

+   tolua_variable(tolua_S,"Value",tolua_get_HTTPFormData_Value,tolua_set_HTTPFormData_Value);

+   tolua_variable(tolua_S,"Type",tolua_get_HTTPFormData_Type,tolua_set_HTTPFormData_Type);

+  tolua_endmodule(tolua_S);

   tolua_cclass(tolua_S,"HTTPRequest","HTTPRequest","",NULL);

   tolua_beginmodule(tolua_S,"HTTPRequest");

    tolua_variable(tolua_S,"Method",tolua_get_HTTPRequest_Method,tolua_set_HTTPRequest_Method);

    tolua_variable(tolua_S,"Path",tolua_get_HTTPRequest_Path,tolua_set_HTTPRequest_Path);

-   tolua_variable(tolua_S,"Params",tolua_get_HTTPRequest_Params_ptr,tolua_set_HTTPRequest_Params_ptr);

-   tolua_variable(tolua_S,"PostParams",tolua_get_HTTPRequest_PostParams_ptr,tolua_set_HTTPRequest_PostParams_ptr);

    tolua_variable(tolua_S,"Username",tolua_get_HTTPRequest_Username,tolua_set_HTTPRequest_Username);

   tolua_endmodule(tolua_S);

   #ifdef __cplusplus

diff --git a/source/Bindings.h b/source/Bindings.h
index 6e1a7b46c..061f9231e 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
 /*

 ** Lua binding: AllToLua

-** Generated automatically by tolua++-1.0.92 on 01/31/12 01:23:11.

+** Generated automatically by tolua++-1.0.92 on 01/31/12 19:40:39.

 */

 

 /* Exported function */

diff --git a/source/ManualBindings.cpp b/source/ManualBindings.cpp
index 06a148b91..7e2e45855 100644
--- a/source/ManualBindings.cpp
+++ b/source/ManualBindings.cpp
@@ -11,6 +11,8 @@
 #include "cWebPlugin_Lua.h"

 #include "cLuaCommandBinder.h"

 #include "cPlayer.h"

+#include "cWebAdmin.h"

+#include "cStringMap.h"

 #include "md5/md5.h"

 

 extern std::vector<std::string> StringSplit(std::string str, std::string delim);

@@ -266,6 +268,54 @@ static int tolua_md5(lua_State* tolua_S)
 	return 1;

 }

 

+static int tolua_push_StringStringMap(lua_State* tolua_S, std::map< std::string, std::string >& a_StringStringMap )

+{

+	lua_newtable(tolua_S);

+	int top = lua_gettop(tolua_S);

+

+	for( std::map< std::string, std::string >::iterator it = a_StringStringMap.begin(); it != a_StringStringMap.end(); ++it )

+	{

+		const char* key = it->first.c_str();

+		const char* value = it->second.c_str();

+		lua_pushstring(tolua_S, key);

+		lua_pushstring(tolua_S, value);

+		lua_settable(tolua_S, top);

+	}

+

+	return 1;

+}

+

+static int tolua_get_HTTPRequest_Params(lua_State* tolua_S)

+{

+	HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

+	return tolua_push_StringStringMap(tolua_S, self->Params);

+}

+

+static int tolua_get_HTTPRequest_PostParams(lua_State* tolua_S)

+{

+	HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

+	return tolua_push_StringStringMap(tolua_S, self->PostParams);

+}

+

+static int tolua_get_HTTPRequest_FormData(lua_State* tolua_S)

+{

+	HTTPRequest* self = (HTTPRequest*)  tolua_tousertype(tolua_S,1,0);

+	std::map< std::string, HTTPFormData >& FormData = self->FormData;

+

+	lua_newtable(tolua_S);

+	int top = lua_gettop(tolua_S);

+

+	for( std::map< std::string, HTTPFormData >::iterator it = FormData.begin(); it != FormData.end(); ++it )

+	{

+		lua_pushstring(tolua_S, it->first.c_str() );

+		tolua_pushusertype(tolua_S, &(it->second), "HTTPFormData" );

+		//lua_pushlstring(tolua_S, it->second.Value.c_str(), it->second.Value.size() ); // Might contain binary data

+		lua_settable(tolua_S, top);

+	}

+

+	return 1;

+}

+

 void ManualBindings::Bind( lua_State* tolua_S )

 {

 	tolua_beginmodule(tolua_S,NULL);

@@ -293,6 +343,15 @@ void ManualBindings::Bind( lua_State* tolua_S )
 		tolua_beginmodule(tolua_S,"cWebPlugin_Lua");

 			tolua_function(tolua_S,"AddTab",tolua_cWebPlugin_Lua_AddTab);

 		tolua_endmodule(tolua_S);

+

+		tolua_cclass(tolua_S,"HTTPRequest","HTTPRequest","",NULL);

+		tolua_beginmodule(tolua_S,"HTTPRequest");

+			//tolua_variable(tolua_S,"Method",tolua_get_HTTPRequest_Method,tolua_set_HTTPRequest_Method);

+			//tolua_variable(tolua_S,"Path",tolua_get_HTTPRequest_Path,tolua_set_HTTPRequest_Path);

+			tolua_variable(tolua_S,"Params",tolua_get_HTTPRequest_Params,0);

+			tolua_variable(tolua_S,"PostParams",tolua_get_HTTPRequest_PostParams,0);

+			tolua_variable(tolua_S,"FormData",tolua_get_HTTPRequest_FormData,0);

+		tolua_endmodule(tolua_S);

 			

 		tolua_function(tolua_S,"md5",tolua_md5);

 

diff --git a/source/cPlayer.h b/source/cPlayer.h
index c05600f80..d18e3ac4f 100644
--- a/source/cPlayer.h
+++ b/source/cPlayer.h
@@ -68,7 +68,7 @@ public:
 	bool CanUseCommand( const char* a_Command );							//tolua_export

 	bool HasPermission( const char* a_Permission );							//tolua_export

 	const GroupList & GetGroups();											// >> EXPORTED IN MANUALBINDINGS <<

-	StringList GetResolvedPermissions();								// >> EXPORTED IN MANUALBINDINGS <<

+	StringList GetResolvedPermissions();									// >> EXPORTED IN MANUALBINDINGS <<

 	bool IsInGroup( const char* a_Group );									//tolua_export

 

 	std::string GetColor();													//tolua_export

diff --git a/source/cStringMap.h b/source/cStringMap.h
index 454218cf4..e6b61c171 100644
--- a/source/cStringMap.h
+++ b/source/cStringMap.h
@@ -18,6 +18,8 @@ public:								// tolua_export
 	unsigned int size() const;		// tolua_export

 

 	std::string & get( const std::string & index );	//tolua_export

+

+	std::map< std::string, std::string >& GetStringMap() { return m_StringMap; }

 private:

 	std::map< std::string, std::string > m_StringMap;

 };									// tolua_export

diff --git a/source/cWebAdmin.cpp b/source/cWebAdmin.cpp
index 002505c1f..b99b8e779 100644
--- a/source/cWebAdmin.cpp
+++ b/source/cWebAdmin.cpp
@@ -136,10 +136,22 @@ void cWebAdmin::Request_Handler(webserver::http_request* r)
 				HTTPRequest Request;

 				Request.Username = r->username_;

 				Request.Method = r->method_;

-				Request.Params = new cStringMap(r->params_);

-				Request.PostParams = new cStringMap(r->params_post_);

+				Request.Params = r->params_;

+				Request.PostParams = r->params_post_;

 				Request.Path = r->path_;

 

+				for( unsigned int i = 0; i < r->multipart_formdata_.size(); ++i )

+				{

+					webserver::formdata& fd = r->multipart_formdata_[i];

+

+					HTTPFormData HTTPfd;//( fd.value_ );

+					HTTPfd.Value = fd.value_;

+					HTTPfd.Type = fd.content_type_;

+					HTTPfd.Name = fd.name_;

+					LOGINFO("Form data name: %s", fd.name_.c_str() );

+					Request.FormData[ fd.name_ ] = HTTPfd;

+				}

+

 				if( Split.size() > 1 )

 				{

 					for( PluginList::iterator itr = WebAdmin->m_Plugins.begin(); itr != WebAdmin->m_Plugins.end(); ++itr )

@@ -159,9 +171,6 @@ void cWebAdmin::Request_Handler(webserver::http_request* r)
 					}

 				}

 

-				delete Request.Params;

-				delete Request.PostParams;

-

 				if( FoundPlugin.empty() )	// Default page

 				{

 					Content.clear();

diff --git a/source/cWebAdmin.h b/source/cWebAdmin.h
index da60a5492..3be9426ad 100644
--- a/source/cWebAdmin.h
+++ b/source/cWebAdmin.h
@@ -4,16 +4,25 @@
 #include "cSocket.h"

 

 class cStringMap;

-//tolua_begin

-struct HTTPRequest

-{

-	std::string Method;

-	std::string Path;

-	cStringMap* Params;

-	cStringMap* PostParams;

-	std::string Username;

-};

-//tolua_end

+

+struct HTTPFormData		//tolua_export

+{						//tolua_export

+	std::string Name;	//tolua_export

+	std::string Value;	//tolua_export

+	std::string Type;	//tolua_export

+};//tolua_export

+

+struct HTTPRequest	//tolua_export

+{					//tolua_export

+	typedef std::map< std::string, std::string > StringStringMap;

+	typedef std::map< std::string, HTTPFormData > FormDataMap;

+	std::string Method;			//tolua_export

+	std::string Path;			//tolua_export

+	StringStringMap Params;		// >> EXPORTED IN MANUALBINDINGS <<

+	StringStringMap PostParams;	// >> EXPORTED IN MANUALBINDINGS <<

+	std::string Username;		//tolua_export

+	FormDataMap FormData;		// >> EXPORTED IN MANUALBINDINGS <<

+}; //tolua_export

 

 struct lua_State;

 class cEvent;