std::string usk="";\r
std::string fcphost="";\r
std::string hidden="";\r
+ int freesiteedition=-1;\r
+\r
+ std::string fproxyport="8888";\r
+ Option::Instance()->Get("FProxyPort",fproxyport);\r
\r
if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")\r
{\r
\r
Option::Instance()->Get("FCPHost",fcphost);\r
\r
- SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod,Hidden FROM tblIdentity WHERE IdentityID=?;");\r
+ SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod,Hidden,FreesiteEdition FROM tblIdentity WHERE IdentityID=?;");\r
st.Bind(0,identityid);\r
st.Step();\r
\r
st.ResultText(3,lastseen);\r
st.ResultText(4,addedmethod);\r
st.ResultText(5,hidden);\r
+ if(st.ResultNull(6)==false)\r
+ {\r
+ st.ResultInt(6,freesiteedition);\r
+ }\r
\r
usk=publickey;\r
- if(usk.find("SSK@")==0)\r
+ if(freesiteedition>=0 && usk.find("SSK@")==0)\r
{\r
std::string messagebase="";\r
+ std::string editionstr="";\r
Option::Instance()->Get("MessageBase",messagebase);\r
usk.erase(0,3);\r
- usk="USK"+usk+messagebase+"/0/";\r
+ StringFunctions::Convert(freesiteedition,editionstr);\r
+ usk="USK"+usk+messagebase+"/"+editionstr+"/";\r
+ }\r
+ else\r
+ {\r
+ usk="";\r
}\r
\r
content+="<tr><td>Name</td><td>"+SanitizeOutput(name)+"</td></tr>";\r
content+="<tr><td>Public Key</td><td class=\"smaller\">"+SanitizeOutput(publickey)+"</td></tr>";\r
- content+="<tr><td>Freesite</td><td class=\"smaller\"><a href=\"http://"+fcphost+":8888/"+SanitizeOutput(usk)+"\">"+SanitizeOutput(usk)+"</a></td></tr>";\r
+ if(usk!="")\r
+ {\r
+ content+="<tr><td>Freesite</td><td class=\"smaller\"><a href=\"http://"+fcphost+":"+fproxyport+"/"+SanitizeOutput(usk)+"\">"+SanitizeOutput(usk)+"</a></td></tr>";\r
+ }\r
content+="<tr><td>Date Added</td><td>"+dateadded+"</td></tr>";\r
content+="<tr><td>Last Seen</td><td>"+lastseen+"</td></tr>";\r
content+="<tr><td>Added Method</td><td class=\"smaller\">"+SanitizeOutput(addedmethod)+"</td></tr>";\r