version 0.2.10

diff --git a/include/freenet/identityxml.h b/include/freenet/identityxml.h
index cc37c76..d270a35 100644 (file)
--- a/include/freenet/identityxml.h
+++ b/include/freenet/identityxml.h
@@ -24,6 +24,9 @@ public:
        const bool GetSingleUse()                                               { return m_singleuse; }\r
        void SetSingleUse(const bool singleuse)                 { m_singleuse=singleuse; }\r
 \r
+       const int GetFreesiteEdition()                                  { return m_freesiteedition; }\r
+       void SetFreesiteEdition(const int edition)              { m_freesiteedition=edition; }\r
+\r
 private:\r
        void Initialize();\r
 \r
@@ -31,6 +34,7 @@ private:
        bool m_publishtrustlist;\r
        bool m_publishboardlist;\r
        bool m_singleuse;\r
+       int m_freesiteedition;\r
 \r
 };\r
 \r

diff --git a/include/global.h b/include/global.h
index a220145..6db0d86 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -5,7 +5,7 @@
 #include <vector>\r
 #include "pthreadwrapper/thread.h"\r
 \r
-#define FMS_VERSION    "0.2.9"\r
+#define FMS_VERSION    "0.2.10"\r
 \r
 // opens database and creates tables and initial inserts if necessary\r
 void SetupDB();\r
@@ -15,6 +15,7 @@ void ConvertDB0103To0104();
 void ConvertDB0104To0105();\r
 void ConvertDB0105To0106();\r
 void ConvertDB0106To0107();\r
+void ConvertDB0107To0108();\r
 // inserts default options into the database\r
 void SetupDefaultOptions();\r
 // opens logfile and sets it up\r

diff --git a/src/freenet/identityinserter.cpp b/src/freenet/identityinserter.cpp
index 3fabf00..f246d66 100644 (file)
--- a/src/freenet/identityinserter.cpp
+++ b/src/freenet/identityinserter.cpp
@@ -150,7 +150,7 @@ void IdentityInserter::StartInsert(const long localidentityid)
        StringFunctions::Convert(localidentityid,idstring);\r
        date.SetToGMTime();\r
 \r
-       SQLite3DB::Recordset rs=m_db->Query("SELECT Name,PrivateKey,SingleUse,PublishTrustList,PublishBoardList FROM tblLocalIdentity WHERE LocalIdentityID="+idstring+";");\r
+       SQLite3DB::Recordset rs=m_db->Query("SELECT Name,PrivateKey,SingleUse,PublishTrustList,PublishBoardList,PublishFreesite,FreesiteEdition FROM tblLocalIdentity WHERE LocalIdentityID="+idstring+";");\r
 \r
        if(rs.Empty()==false)\r
        {\r
@@ -166,6 +166,8 @@ void IdentityInserter::StartInsert(const long localidentityid)
                std::string singleuse="false";\r
                std::string publishtrustlist="false";\r
                std::string publishboardlist="false";\r
+               std::string freesiteedition="";\r
+               int edition=-1;\r
 \r
                now.SetToGMTime();\r
 \r
@@ -213,6 +215,16 @@ void IdentityInserter::StartInsert(const long localidentityid)
                }\r
                publishboardlist=="true" ? idxml.SetPublishBoardList(true) : idxml.SetPublishBoardList(false);\r
 \r
+               if(rs.GetField(5) && rs.GetField(6))\r
+               {\r
+                       if(std::string(rs.GetField(5))=="true")\r
+                       {\r
+                               freesiteedition=rs.GetField(6);\r
+                               StringFunctions::Convert(freesiteedition,edition);\r
+                               idxml.SetFreesiteEdition(edition);\r
+                       }\r
+               }\r
+\r
                data=idxml.GetXML();\r
                StringFunctions::Convert(data.size(),datasizestr);\r
 \r

diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index e464cfb..c0f6c8a 100644 (file)
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -56,7 +56,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
        if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
        {\r
 \r
-               st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=? WHERE IdentityID=?");\r
+               st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=?, FreesiteEdition=? WHERE IdentityID=?");\r
                name=xml.GetName();\r
                if(name.size()>40)\r
                {\r
@@ -88,7 +88,15 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
                {\r
                        st.Bind(4,"false");\r
                }\r
-               st.Bind(5,identityid);\r
+               if(xml.GetFreesiteEdition()>=0)\r
+               {\r
+                       st.Bind(5,xml.GetFreesiteEdition());\r
+               }\r
+               else\r
+               {\r
+                       st.Bind(5);\r
+               }\r
+               st.Bind(6,identityid);\r
                st.Step();\r
                st.Finalize();\r
 \r

diff --git a/src/freenet/identityxml.cpp b/src/freenet/identityxml.cpp
index e3905a9..3f8ec17 100644 (file)
--- a/src/freenet/identityxml.cpp
+++ b/src/freenet/identityxml.cpp
@@ -28,6 +28,12 @@ std::string IdentityXML::GetXML()
 \r
        tid->LinkEndChild(XMLCreateBooleanElement("PublishBoardList",m_publishboardlist));\r
 \r
+       // freesite edition will be -1 if identity isn't publishing a freesite\r
+       if(m_freesiteedition>=0)\r
+       {\r
+               tid->LinkEndChild(XMLCreateTextElement("FreesiteEdition",m_freesiteedition));\r
+       }\r
+\r
        td.Accept(&tp);\r
        return std::string(tp.CStr());\r
 \r
@@ -39,6 +45,7 @@ void IdentityXML::Initialize()
        m_publishtrustlist=false;\r
        m_publishboardlist=false;\r
        m_singleuse=false;\r
+       m_freesiteedition=-1;\r
 }\r
 \r
 const bool IdentityXML::ParseXML(const std::string &xml)\r
@@ -70,6 +77,13 @@ const bool IdentityXML::ParseXML(const std::string &xml)
 \r
                m_publishboardlist=XMLGetBooleanElement(hnd.FirstChild("Identity").ToElement(),"PublishBoardList");\r
 \r
+               txt=hnd.FirstChild("Identity").FirstChild("FreesiteEdition").FirstChild().ToText();\r
+               if(txt)\r
+               {\r
+                       std::string editionstr=txt->ValueStr();\r
+                       StringFunctions::Convert(editionstr,m_freesiteedition);\r
+               }\r
+\r
                return true;\r
 \r
        }\r

diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index 76bfb95..9db9651 100644 (file)
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -192,7 +192,7 @@ std::string SiteInserter::GenerateTrustList(const std::string &htmltemplate, con
 \r
        date.SetToGMTime();\r
        date.Add(0,0,0,-20);\r
-       SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,tblIdentityTrust.LocalMessageTrust,tblIdentityTrust.LocalTrustListTrust,tblIdentity.IdentityID,tblIdentityTrust.MessageTrustComment,tblIdentityTrust.TrustListTrustComment FROM tblIdentity LEFT JOIN (SELECT IdentityID,LocalMessageTrust,LocalTrustListTrust,MessageTrustComment,TrustListTrustComment FROM tblIdentityTrust WHERE LocalIdentityID=?) AS 'tblIdentityTrust' ON tblIdentity.IdentityID=tblIdentityTrust.IdentityID WHERE PublicKey IS NOT NULL AND LastSeen IS NOT NULL AND LastSeen>=? ORDER BY Name COLLATE NOCASE;");\r
+       SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,tblIdentityTrust.LocalMessageTrust,tblIdentityTrust.LocalTrustListTrust,tblIdentity.IdentityID,tblIdentityTrust.MessageTrustComment,tblIdentityTrust.TrustListTrustComment,tblIdentity.FreesiteEdition FROM tblIdentity LEFT JOIN (SELECT IdentityID,LocalMessageTrust,LocalTrustListTrust,MessageTrustComment,TrustListTrustComment FROM tblIdentityTrust WHERE LocalIdentityID=?) AS 'tblIdentityTrust' ON tblIdentity.IdentityID=tblIdentityTrust.IdentityID WHERE PublicKey IS NOT NULL AND LastSeen IS NOT NULL AND LastSeen>=? ORDER BY Name COLLATE NOCASE;");\r
        st.Bind(0,localidentityid);\r
        st.Bind(1,date.Format("%Y-%m-%d %H:%M:%S"));\r
        st.Step();\r
@@ -212,6 +212,7 @@ std::string SiteInserter::GenerateTrustList(const std::string &htmltemplate, con
                std::string trustlisttrust="";\r
                std::string publickey="";\r
                std::string uskkey="";\r
+               std::string freesiteedition="";\r
 \r
                st.ResultText(0,idname);\r
                st.ResultText(1,publickey);\r
@@ -220,17 +221,28 @@ std::string SiteInserter::GenerateTrustList(const std::string &htmltemplate, con
                st.ResultText(4,thisid);\r
                st.ResultText(5,messagetrustcomment);\r
                st.ResultText(6,trustlisttrustcomment);\r
+               st.ResultText(7,freesiteedition);\r
 \r
-               if(publickey.find("SSK@")==0)\r
+               if(freesiteedition!="")\r
                {\r
-                       uskkey=publickey;\r
-                       uskkey.erase(0,3);\r
-                       uskkey="USK"+uskkey;\r
-                       uskkey+=m_messagebase+"/0/";\r
+                       if(publickey.find("SSK@")==0)\r
+                       {\r
+                               uskkey=publickey;\r
+                               uskkey.erase(0,3);\r
+                               uskkey="USK"+uskkey;\r
+                               uskkey+=m_messagebase+"/"+freesiteedition+"/";\r
+                       }\r
                }\r
 \r
                content+="<tr>";\r
-               content+="<td><a href=\""+uskkey+"\">"+SanitizeOutput(CreateShortIdentityName(idname,publickey))+"</a></td>";\r
+               if(freesiteedition!="")\r
+               {\r
+                       content+="<td><a href=\""+uskkey+"\">"+SanitizeOutput(CreateShortIdentityName(idname,publickey))+"</a></td>";\r
+               }\r
+               else\r
+               {\r
+                       content+="<td>"+SanitizeOutput(CreateShortIdentityName(idname,publickey))+"</td>";\r
+               }\r
                content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";\r
                content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";\r
                content+="<td "+GetClassString(trustlisttrust)+">"+trustlisttrust+"</td>";\r
@@ -279,7 +291,9 @@ const bool SiteInserter::HandlePutFailed(FCPMessage &message)
 const bool SiteInserter::HandlePutSuccessful(FCPMessage &message)\r
 {\r
        std::vector<std::string> idparts;\r
+       std::vector<std::string> uriparts;\r
        long localidentityid;\r
+       int edition=-1;\r
        DateTime now;\r
 \r
        now.SetToGMTime();\r
@@ -287,9 +301,17 @@ const bool SiteInserter::HandlePutSuccessful(FCPMessage &message)
        StringFunctions::Split(message["Identifier"],"|",idparts);\r
        StringFunctions::Convert(idparts[1],localidentityid);\r
 \r
-       SQLite3DB::Statement st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedFreesite=? WHERE LocalIdentityID=?;");\r
+       // edition is very last part of uri\r
+       StringFunctions::Split(message["URI"],"/",uriparts);\r
+       if(uriparts.size()>0)\r
+       {\r
+               StringFunctions::Convert(uriparts[uriparts.size()-1],edition);\r
+       }\r
+\r
+       SQLite3DB::Statement st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedFreesite=?, FreesiteEdition=? WHERE LocalIdentityID=?;");\r
        st.Bind(0,now.Format("%Y-%m-%d %H:%M:%S"));\r
-       st.Bind(1,localidentityid);\r
+       st.Bind(1,edition);\r
+       st.Bind(2,localidentityid);\r
        st.Step();\r
 \r
        m_log->WriteLog(LogFile::LOGLEVEL_INFO,"SiteInserter::HandlePutSuccessful successfully inserted Freesite.");\r

diff --git a/src/global.cpp b/src/global.cpp
index 587f141..2dea27b 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -95,13 +95,19 @@ void SetupDB()
                        major=1;\r
                        minor=7;\r
                }\r
+               if(major==1 && minor==7)\r
+               {\r
+                       ConvertDB0107To0108();\r
+                       major=1;\r
+                       minor=8;\r
+               }\r
        }\r
        else\r
        {\r
-               db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,7);");\r
+               db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,8);");\r
        }\r
 \r
-       db->Execute("UPDATE tblDBVersion SET Major=1, Minor=7;");\r
+       db->Execute("UPDATE tblDBVersion SET Major=1, Minor=8;");\r
 \r
        db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\\r
                                Option                          TEXT UNIQUE,\\r
@@ -118,6 +124,7 @@ void SetupDB()
                                PublishTrustList                BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\\r
                                PublishBoardList                BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\\r
                                PublishFreesite                 BOOL CHECK(PublishFreesite IN('true','false')) DEFAULT 'false',\\r
+                               FreesiteEdition                 INTEGER,\\r
                                InsertingIdentity               BOOL CHECK(InsertingIdentity IN('true','false')) DEFAULT 'false',\\r
                                LastInsertedIdentity    DATETIME,\\r
                                InsertingPuzzle                 BOOL CHECK(InsertingPuzzle IN('true','false')) DEFAULT 'false',\\r
@@ -170,6 +177,7 @@ void SetupDB()
                                SingleUse                               BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\\r
                                PublishTrustList                BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\\r
                                PublishBoardList                BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\\r
+                               FreesiteEdition                 INTEGER,\\r
                                DateAdded                               DATETIME,\\r
                                LastSeen                                DATETIME,\\r
                                LocalMessageTrust               INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\\r
@@ -581,6 +589,15 @@ void ConvertDB0106To0107()
        db->Execute("UPDATE tblDBVersion SET Major=1, Minor=7;");\r
 }\r
 \r
+void ConvertDB0107To0108()\r
+{\r
+       // add FreesiteEdition to tblLocalIdentity and tblIdentity\r
+       SQLite3DB::DB *db=SQLite3DB::DB::Instance();\r
+       db->Execute("ALTER TABLE tblLocalIdentity ADD COLUMN FreesiteEdition INTEGER;");\r
+       db->Execute("ALTER TABLE tblIdentity ADD COLUMN FreesiteEdition INTEGER;");\r
+       db->Execute("UPDATE tblDBVersion SET Major=1, Minor=8;");\r
+}\r
+\r
 void SetupDefaultOptions()\r
 {\r
        // OptionValue should always be inserted as a string, even if the option really isn't a string - just to keep the field data type consistent\r

diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index 5aa8006..842df31 100644 (file)
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -22,6 +22,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
        std::string usk="";\r
        std::string fcphost="";\r
        std::string hidden="";\r
+       int freesiteedition=-1;\r
 \r
        if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")\r
        {\r
@@ -52,7 +53,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 \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
@@ -65,19 +66,32 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
                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+":8888/"+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

diff --git a/src/message.cpp b/src/message.cpp
index 4bc8cb6..d2693f5 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -183,7 +183,8 @@ void Message::HandleAdministrationMessage()
                                        }\r
                                        else\r
                                        {\r
-                                               origmessagetrust=m_minlocalmessagetrust;\r
+                                               //origmessagetrust=m_minlocalmessagetrust;\r
+                                               origmessagetrust=50;\r
                                        }\r
                                        if(origmess.ResultNull(3)==false)\r
                                        {\r
@@ -191,7 +192,8 @@ void Message::HandleAdministrationMessage()
                                        }\r
                                        else\r
                                        {\r
-                                               origtrustlisttrust=m_minlocaltrustlisttrust;\r
+                                               //origtrustlisttrust=m_minlocaltrustlisttrust;\r
+                                               origtrustlisttrust=50;\r
                                        }\r
 \r
                                        origmessagetrust+=changemessagetrust;\r
@@ -282,7 +284,8 @@ void Message::HandleChangeTrust()
                                }\r
                                else\r
                                {\r
-                                       localmessagetrust=m_minlocalmessagetrust;\r
+                                       //localmessagetrust=m_minlocalmessagetrust;\r
+                                       localmessagetrust=50;\r
                                }\r
 \r
                                localmessagetrust+=m_changemessagetrustonreply;\r