X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fboardlist.cpp;h=7a7a5e21d267a5c066e1a2daaa361f391511fbeb;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=71c5e46cbe649dfbd80e6e4526406453e1944b4c;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f;p=fms.git

diff --git a/src/boardlist.cpp b/src/boardlist.cpp
index 71c5e46..7a7a5e2 100644
--- a/src/boardlist.cpp
+++ b/src/boardlist.cpp
@@ -8,14 +8,42 @@ 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;
+	std::string addedmethod="";
+
+	SQLite3DB::Statement st=m_db->Prepare("SELECT tblBoard.BoardID, BoardName, BoardDescription, DateAdded, HighMessageID, LowMessageID, MessageCount, SaveReceivedMessages, AddedMethod 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);
+		st.ResultText(8,addedmethod);
+
+		if(savereceivedstr=="true")
+		{
+			savereceived=true;
+		}		
+		else
+		{
+			savereceived=false;
+		}
+
+		push_back(Board(m_db,boardid,boardname,boarddescription,dateadded,lowmessageid,highmessageid,messagecount,savereceived,addedmethod));
 		st.Step();
 	}
 }
@@ -32,7 +60,7 @@ void BoardList::LoadNew(const std::string &date)
 	while(st.RowReturned())
 	{
 		st.ResultInt(0,tempint);
-		push_back(Board(tempint));
+		push_back(Board(m_db,tempint));
 		st.Step();
 	}
 }