projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.13
[fms.git]
/
src
/
http
/
pages
/
addpeerpage.cpp
diff --git
a/src/http/pages/addpeerpage.cpp
b/src/http/pages/addpeerpage.cpp
index
7b4d706
..
4453af5
100644
(file)
--- a/
src/http/pages/addpeerpage.cpp
+++ b/
src/http/pages/addpeerpage.cpp
@@
-1,6
+1,8
@@
#include "../../../include/http/pages/addpeerpage.h"
\r
#include "../../../include/stringfunctions.h"
\r
#include "../../../include/http/pages/addpeerpage.h"
\r
#include "../../../include/stringfunctions.h"
\r
-#include "../../../include/datetime.h"
\r
+
\r
+#include <Poco/DateTime.h>
\r
+#include <Poco/DateTimeFormatter.h>
\r
\r
#ifdef XMEM
\r
#include <xmem.h>
\r
\r
#ifdef XMEM
\r
#include <xmem.h>
\r
@@
-10,9
+12,9
@@
const std::string AddPeerPage::GeneratePage(const std::string &method, const std
{
\r
std::string content="";
\r
\r
{
\r
std::string content="";
\r
\r
- if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="add")
\r
+ if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="add"
&& ValidateFormPassword(queryvars)
)
\r
{
\r
{
\r
- DateTime date;
\r
+
Poco::
DateTime date;
\r
std::string publickey="";
\r
if(queryvars.find("publickey")!=queryvars.end())
\r
{
\r
std::string publickey="";
\r
if(queryvars.find("publickey")!=queryvars.end())
\r
{
\r
@@
-20,10
+22,10
@@
const std::string AddPeerPage::GeneratePage(const std::string &method, const std
}
\r
if(publickey!="" && publickey.find("SSK@")==0 && publickey[publickey.size()-1]=='/')
\r
{
\r
}
\r
if(publickey!="" && publickey.find("SSK@")==0 && publickey[publickey.size()-1]=='/')
\r
{
\r
- date.SetToGMTime();
\r
- SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES(?,?);");
\r
+ SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES(?,?,?);");
\r
st.Bind(0,publickey);
\r
st.Bind(0,publickey);
\r
- st.Bind(1,date.Format("%Y-%m-%d %H:%M:%S"));
\r
+ st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
\r
+ st.Bind(2,"manually");
\r
st.Step();
\r
st.Reset();
\r
}
\r
st.Step();
\r
st.Reset();
\r
}
\r
@@
-31,6
+33,7
@@
const std::string AddPeerPage::GeneratePage(const std::string &method, const std
\r
content+="<h2>Add Peer</h2>";
\r
content+="<form name=\"frmaddpeer\" method=\"POST\">";
\r
\r
content+="<h2>Add Peer</h2>";
\r
content+="<form name=\"frmaddpeer\" method=\"POST\">";
\r
+ content+=CreateFormPassword();
\r
content+="<input type=\"hidden\" name=\"formaction\" value=\"add\">";
\r
content+="Public Key : ";
\r
content+="<input type=\"text\" name=\"publickey\" size=\"100\">";
\r
content+="<input type=\"hidden\" name=\"formaction\" value=\"add\">";
\r
content+="Public Key : ";
\r
content+="<input type=\"text\" name=\"publickey\" size=\"100\">";
\r
@@
-40,7
+43,7
@@
const std::string AddPeerPage::GeneratePage(const std::string &method, const std
content+="<input type=\"submit\" value=\"Add\">";
\r
content+="</form>";
\r
\r
content+="<input type=\"submit\" value=\"Add\">";
\r
content+="</form>";
\r
\r
- return
"HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"+
StringFunctions::Replace(m_template,"[CONTENT]",content);
\r
+ return StringFunctions::Replace(m_template,"[CONTENT]",content);
\r
}
\r
\r
const bool AddPeerPage::WillHandleURI(const std::string &uri)
\r
}
\r
\r
const bool AddPeerPage::WillHandleURI(const std::string &uri)
\r