X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fipagehandler.cpp;h=53211b116dfbcacdf401be05c3c03123258fd1cc;hb=023b2219068d481cd6a300982427c99bacd88a12;hp=c4ebbb9c2aceb469754fcc0b745d82e7d3af81b8;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;p=fms.git

diff --git a/src/http/ipagehandler.cpp b/src/http/ipagehandler.cpp
index c4ebbb9..53211b1 100644
--- a/src/http/ipagehandler.cpp
+++ b/src/http/ipagehandler.cpp
@@ -1,6 +1,10 @@
 #include "../../include/http/ipagehandler.h"
-#include "../../include/http/httpdefs.h"
 #include "../../include/stringfunctions.h"
+#include "../../include/http/multipartparser.h"
+
+#include <Poco/Net/HTMLForm.h>
+
+#include <cstring>
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -12,7 +16,7 @@ void IPageHandler::CreateArgArray(const std::map<std::string,std::string> &vars,
 	{
 		if((*i).first.find(basename)==0 && (*i).first.find("[")!=std::string::npos && (*i).first.find("]")!=std::string::npos)
 		{
-			int index;
+			int index=0;
 			std::string indexstr;
 			std::string::size_type startpos;
 			std::string::size_type endpos;
@@ -31,127 +35,79 @@ void IPageHandler::CreateArgArray(const std::map<std::string,std::string> &vars,
 	}
 }
 
-const bool IPageHandler::Handle(shttpd_arg *arg)
+const std::string IPageHandler::CreateTrueFalseDropDown(const std::string &name, const std::string &selected)
 {
-	const char *uri=shttpd_get_env(arg,"REQUEST_URI");
-	const char *method=shttpd_get_env(arg,"REQUEST_METHOD");
-	std::string methodstr="";
-	if(method)
+	std::string rval="";
+
+	rval+="<select name=\""+name+"\">";
+	rval+="<option value=\"true\"";
+	if(selected=="true")
 	{
-		methodstr=method;
+		rval+=" SELECTED";
 	}
+	rval+=">true</option>";
+	rval+="<option value=\"false\"";
+	if(selected=="false")
+	{
+		rval+=" SELECTED";
+	}
+	rval+=">false</option>";
+	rval+="</select>";
+
+	return rval;
+}
 
-	if(uri && WillHandleURI(std::string(uri)))
+void IPageHandler::CreateQueryVarMap(Poco::Net::HTTPServerRequest &request, std::map<std::string,std::string> &vars)
+{
+	for(Poco::Net::HTTPServerRequest::ConstIterator i=request.begin(); i!=request.end(); i++)
 	{
-		httpstate *mystate=(httpstate *)arg->state;
-		// this is a new request - create a new arg object
-		if(arg->state==NULL)
-		{
-			arg->state=new httpstate;
-			memset(arg->state,0,sizeof(httpstate));
-			mystate=(httpstate *)arg->state;
+		vars[(*i).first]=(*i).second;
+	}
 
-			// if post then create input buffer
-			if(methodstr=="POST")
-			{
-				const char *lenstr=shttpd_get_header(arg,"Content-Length");
-				if(lenstr)
-				{
-					long len;
-					StringFunctions::Convert(std::string(lenstr),len);
-					mystate->m_indata=new char[len+1];
-					mystate->m_indata[len]=NULL;
-					mystate->m_indatalen=len;
-					mystate->m_indatapos=0;
-				}
-			}
-		}
+	// handle HTMLForm and multiparts
+	MultiPartParser mpp;
+	Poco::Net::HTMLForm form(request,request.stream(),mpp);
+	for(Poco::Net::HTMLForm::ConstIterator i=form.begin(); i!=form.end(); i++)
+	{
+		vars[(*i).first]=(*i).second;
+	}
 
-		// we have more POST data to get
-		if(arg->in.len>0)
+	// for a POST method, the HTMLForm won't grab vars off the query string so we
+	// temporarily set the method to GET and parse with the HTMLForm again
+	if(request.getMethod()=="POST")
+	{
+		request.setMethod("GET");
+		Poco::Net::HTMLForm form1(request,request.stream(),mpp);
+		for(Poco::Net::HTMLForm::ConstIterator i=form1.begin(); i!=form1.end(); i++)
 		{
-			int pos=0;
-			while(pos<arg->in.len)
-			{
-				mystate->m_indata[mystate->m_indatapos++]=arg->in.buf[pos++];
-			}
-			arg->in.num_bytes=arg->in.len;
+			vars[(*i).first]=(*i).second;
 		}
+		request.setMethod("POST");
+	}
 
-		// we have all POST data (or it was 0 to begin with) - generate the page
-		if(mystate->m_indatalen==mystate->m_indatapos && mystate->m_outdata==NULL)
-		{
-			//parse POST data and any QUERY_STRING before generating page
-			std::map<std::string,std::string> args;
-			std::vector<std::string> argparts;
-			
-			if(mystate->m_indata)
-			{
-				StringFunctions::Split(mystate->m_indata,"&",argparts);
-			}
-			if(shttpd_get_env(arg,"QUERY_STRING"))
-			{
-				StringFunctions::Split(shttpd_get_env(arg,"QUERY_STRING"),"&",argparts);
-			}
-			for(std::vector<std::string>::iterator argi=argparts.begin(); argi!=argparts.end(); argi++)
-			{
-				std::vector<std::string> parts;
-				StringFunctions::Split((*argi),"=",parts);
-				if(parts.size()>0)
-				{
-					// replace + with space before UriDecoding
-					parts[0]=StringFunctions::Replace(parts[0],"+"," ");
-					args[StringFunctions::UriDecode(parts[0])];
-					if(parts.size()>1)
-					{
-						// replace + with space before UriDecoding
-						parts[1]=StringFunctions::Replace(parts[1],"+"," ");
-						args[StringFunctions::UriDecode(parts[0])]=StringFunctions::UriDecode(parts[1]);
-					}
-				}
-			}
+	// get any multiparts
+	std::map<std::string,std::string> mpvars=mpp.GetVars();
+	for(std::map<std::string,std::string>::iterator i=mpvars.begin(); i!=mpvars.end(); i++)
+	{
+		vars[(*i).first]=(*i).second;
+	}
 
-			std::string page=GeneratePage(methodstr,args);
-			mystate->m_outdata=new char[page.size()];
-			memcpy(mystate->m_outdata,page.c_str(),page.size());
-			mystate->m_outdatalen=page.size();
-			mystate->m_outdatapos=0;
-		}
+}
 
-		// if we have output data, push next block of data onto out buffer
-		if(mystate->m_outdata && mystate->m_outdatapos<mystate->m_outdatalen)
-		{
-			int pos=0;
-			while(mystate->m_outdatapos<mystate->m_outdatalen && pos<arg->out.len)
-			{
-				arg->out.buf[pos++]=mystate->m_outdata[mystate->m_outdatapos++];
-			}
-			arg->out.num_bytes=pos;
-		}
+void IPageHandler::handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response)
+{
+	m_log->trace("IPageHandler::handleRequest from "+request.clientAddress().toString());
 
-		// if we have no more output data to send - delete the data pointers and set end of output flag
-		if(mystate->m_outdata && mystate->m_outdatapos==mystate->m_outdatalen)
-		{
-			if(mystate->m_indata)
-			{
-				delete [] mystate->m_indata;
-			}
-			if(mystate->m_outdata)
-			{
-				delete [] mystate->m_outdata;
-			}
-			delete mystate;
-			arg->state=NULL;
+	std::map<std::string,std::string> vars;
 
-			arg->flags|=SHTTPD_END_OF_OUTPUT;
-		}
+	CreateQueryVarMap(request,vars);
+
+	response.setChunkedTransferEncoding(true);
+	response.setContentType("text/html");
+
+	std::ostream &ostr = response.send();
+	ostr << GeneratePage(request.getMethod(),vars);
 
-		return true;
-	}
-	else
-	{
-		return false;
-	}
 }
 
 const std::string IPageHandler::SanitizeOutput(const std::string &input)