version 0.3.33

[fms.git] / src / http / pages / peertrustpage.cpp

diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index d80ae18..b90a106 100644 (file)
--- a/src/http/pages/peertrustpage.cpp
+++ b/src/http/pages/peertrustpage.cpp
@@ -23,7 +23,7 @@ const std::string PeerTrustPage::BuildQueryString(const long startrow, const std
                {\r
                        returnval+="&";\r
                }\r
-               returnval+="namesearch="+namesearch;\r
+               returnval+="namesearch="+StringFunctions::UriEncode(namesearch);\r
        }\r
 \r
        if(sortby!="")\r
@@ -233,6 +233,10 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
        if(queryvars.find("sortby")!=queryvars.end())\r
        {\r
                sortby=(*queryvars.find("sortby")).second;\r
+               if(sortby!="Name" && sortby!="tblIdentityTrust.LocalMessageTrust" && sortby!="PeerMessageTrust" && sortby!="tblIdentityTrust.LocalTrustListTrust" && sortby!="PeerTrustListTrust" && sortby!="MessageCount")\r
+               {\r
+                       sortby="Name";\r
+               }\r
        }\r
        else\r
        {\r
@@ -243,6 +247,10 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
        if(queryvars.find("sortorder")!=queryvars.end())\r
        {\r
                sortorder=(*queryvars.find("sortorder")).second;\r
+               if(sortorder!="ASC" && sortorder!="DESC")\r
+               {\r
+                       sortorder="ASC";\r
+               }\r
        }\r
        else\r
        {\r