X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fboardlist.cpp;h=cd6e07145a530420be71074f3108f29b6cc34ddd;hp=71c5e46cbe649dfbd80e6e4526406453e1944b4c;hb=4430e7762844c66428b6f822288beb71b7f82b95;hpb=ee580d19b7920904587e18d72a3465d52eab6204

diff --git a/src/boardlist.cpp b/src/boardlist.cpp
index 71c5e46..cd6e071 100644
--- a/src/boardlist.cpp
+++ b/src/boardlist.cpp
@@ -8,14 +8,40 @@ void BoardList::Load()
 {
 	clear();
 	
-	int tempint;
-	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardID FROM tblBoard ORDER BY BoardName;");
+	int boardid=0;
+	std::string boardname="";
+	std::string boarddescription="";
+	std::string dateadded="";
+	std::string savereceivedstr="";
+	bool savereceived=false;
+	int highmessageid=0;
+	int lowmessageid=0;
+	int messagecount=0;
+
+	SQLite3DB::Statement st=m_db->Prepare("SELECT tblBoard.BoardID, BoardName, BoardDescription, DateAdded, HighMessageID, LowMessageID, MessageCount, SaveReceivedMessages FROM tblBoard LEFT JOIN vwBoardStats ON tblBoard.BoardID=vwBoardStats.BoardID ORDER BY BoardName COLLATE NOCASE;");
 	st.Step();
 	
 	while(st.RowReturned())
 	{
-		st.ResultInt(0,tempint);
-		push_back(Board(tempint));
+		st.ResultInt(0,boardid);
+		st.ResultText(1,boardname);
+		st.ResultText(2,boarddescription);
+		st.ResultText(3,dateadded);
+		st.ResultInt(4,highmessageid);
+		st.ResultInt(5,lowmessageid);
+		st.ResultInt(6,messagecount);
+		st.ResultText(7,savereceivedstr);
+
+		if(savereceivedstr=="true")
+		{
+			savereceived=true;
+		}		
+		else
+		{
+			savereceived=false;
+		}
+
+		push_back(Board(boardid,boardname,boarddescription,dateadded,lowmessageid,highmessageid,messagecount,savereceived));
 		st.Step();
 	}
 }