X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fhomepage.cpp;h=a37d50f92270991aaee786d85b725ceca053c335;hb=b88f50bfec6dbcd169bb8285e7c42b93baf52b6b;hp=b295f451653fff51139f91f89f21293f0d71de46;hpb=76805933f794915a72b7f0a21b12af6654759f4f;p=fms.git

diff --git a/src/http/pages/homepage.cpp b/src/http/pages/homepage.cpp
index b295f45..a37d50f 100644
--- a/src/http/pages/homepage.cpp
+++ b/src/http/pages/homepage.cpp
@@ -32,25 +32,38 @@ const std::string HomePage::GeneratePage(const std::string &method, const std::m
 	content+="</b><br>";
 
 	bool showgenericupdate=true;
-	SQLite3DB::Statement st=m_db->Prepare("SELECT Major, Minor, Release, PageKey FROM tblFMSVersion ORDER BY Major DESC, Minor DESC, Release DESC;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT Major, Minor, Release, PageKey FROM tblFMSVersion ORDER BY Major DESC, Minor DESC, Release DESC LIMIT 1;");
 	st.Step();
 	if(st.RowReturned())
 	{
-		std::string currentmajor=VERSION_MAJOR;
-		std::string currentminor=VERSION_MINOR;
-		std::string currentrelease=VERSION_RELEASE;
-		std::string major="";
-		std::string minor="";
-		std::string release="";
+		int major=0;
+		int minor=0;
+		int release=0;
+		int currentmajor=0;
+		int currentminor=0;
+		int currentrelease=0;
 		std::string freesite="";
-		st.ResultText(0,major);
-		st.ResultText(1,minor);
-		st.ResultText(2,release);
+		std::string majorstr="";
+		std::string minorstr="";
+		std::string releasestr="";
+
+		StringFunctions::Convert(VERSION_MAJOR,currentmajor);
+		StringFunctions::Convert(VERSION_MINOR,currentminor);
+		StringFunctions::Convert(VERSION_RELEASE,currentrelease);
+
+		st.ResultInt(0,major);
+		st.ResultInt(1,minor);
+		st.ResultInt(2,release);
 		st.ResultText(3,freesite);
 
+		StringFunctions::Convert(major,majorstr);
+		StringFunctions::Convert(minor,minorstr);
+		StringFunctions::Convert(release,releasestr);
+
 		if(currentmajor<major || (currentmajor==major && currentminor<minor) || (currentmajor==major && currentminor==minor && currentrelease<release))
 		{
-			content+="<b>You are running an old version of FMS.  Please update here: <a href=\"http://"+fcphost+":"+fproxyport+"/"+freesite+"\">FMS "+major+"."+minor+"."+release+"</a></b><br>";
+			content+="<b>You are running an old version of FMS.  Please update here: <a href=\"http://"+fcphost+":"+fproxyport+"/"+freesite+"\">FMS "+majorstr+"."+minorstr+"."+releasestr+"</a></b><br>";
+			content+="You can see the release info <a href=\"versioninfo.htm?Major="+majorstr+"&Minor="+minorstr+"&Release="+releasestr+"\">here</a><br>";
 			showgenericupdate=false;
 		}
 
@@ -58,7 +71,7 @@ const std::string HomePage::GeneratePage(const std::string &method, const std::m
 
 	if(showgenericupdate)
 	{
-		content+="Check for new versions at the <a href=\"http://"+fcphost+":"+fproxyport+"/USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/60/\">FMS Freesite</a><br>";
+		content+="Check for new versions at the <a href=\"http://"+fcphost+":"+fproxyport+"/USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/69/\">FMS Freesite</a><br>";
 	}
 
 	content+="Use these pages to administer your FMS installation.";