X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=f95f541ec5ccce2c9490f9720a1b258e35cbced0;hb=8a0a83a78390f22f99d4487cda2569909dfbc28e;hp=d8adc87c64c1f334f87ea0f7c2ac76c225b2c645;hpb=ee580d19b7920904587e18d72a3465d52eab6204;p=fms.git

diff --git a/src/message.cpp b/src/message.cpp
index d8adc87..f95f541 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -146,7 +146,7 @@ void Message::HandleAdministrationMessage()
 					}
 					else
 					{
-						origmessagetrust=50;
+						origmessagetrust=m_minlocalmessagetrust;
 					}
 					if(origmess.ResultNull(3)==false)
 					{
@@ -154,28 +154,16 @@ void Message::HandleAdministrationMessage()
 					}
 					else
 					{
-						origtrustlisttrust=50;
+						origtrustlisttrust=m_minlocaltrustlisttrust;
 					}
 
 					origmessagetrust+=changemessagetrust;
 					origtrustlisttrust+=changetrustlisttrust;
 
-					if(origmessagetrust<0)
-					{
-						origmessagetrust=0;
-					}
-					if(origmessagetrust>100)
-					{
-						origmessagetrust=100;
-					}
-					if(origtrustlisttrust<0)
-					{
-						origtrustlisttrust=0;
-					}
-					if(origtrustlisttrust>100)
-					{
-						origtrustlisttrust=100;
-					}
+					origmessagetrust<0 ? origmessagetrust=0 : false;
+					origmessagetrust>100 ? origmessagetrust=100 : false;
+					origtrustlisttrust<0 ? origtrustlisttrust=0 : false;
+					origtrustlisttrust>100 ? origtrustlisttrust=100 : false;
 
 					// update new trust levels
 					SQLite3DB::Statement update=m_db->Prepare("UPDATE tblIdentity SET LocalMessageTrust=?, LocalTrustListTrust=? WHERE IdentityID=?;");
@@ -242,7 +230,7 @@ void Message::HandleChangeTrust()
 			}
 			else
 			{
-				localmessagetrust=50;
+				localmessagetrust=m_minlocalmessagetrust;
 			}
 
 			localmessagetrust+=m_changemessagetrustonreply;
@@ -288,6 +276,12 @@ void Message::Initialize()
 	{
 		m_addnewpostfromidentities=false;
 	}
+	tempval="50";
+	Option::Instance()->Get("MinLocalMessageTrust",tempval);
+	StringFunctions::Convert(tempval,m_minlocalmessagetrust);
+	tempval="51";
+	Option::Instance()->Get("MinLocalTrustListTrust",tempval);
+	StringFunctions::Convert(tempval,m_minlocaltrustlisttrust);
 }
 
 const bool Message::Load(const long messageid, const long boardid)
@@ -630,6 +624,7 @@ const bool Message::StartFreenetInsert()
 	xml.SetDate(m_datetime.Format("%Y-%m-%d"));
 	xml.SetTime(m_datetime.Format("%H:%M:%S"));
 	
+	StripAdministrationBoards();
 	for(std::vector<std::string>::iterator i=m_boards.begin(); i!=m_boards.end(); i++)
 	{
 		xml.AddBoard((*i));
@@ -678,3 +673,22 @@ const bool Message::StartFreenetInsert()
 	return true;
 
 }
+
+void Message::StripAdministrationBoards()
+{
+	SQLite3DB::Statement st=m_db->Prepare("SELECT tblBoard.BoardID FROM tblBoard INNER JOIN tblAdministrationBoard ON tblBoard.BoardID=tblAdministrationBoard.BoardID WHERE BoardName=?;");
+	for(std::vector<std::string>::iterator i=m_boards.begin(); i!=m_boards.end(); )
+	{
+		st.Bind(0,(*i));
+		st.Step();
+		if(st.RowReturned())
+		{
+			i=m_boards.erase(i);
+		}
+		else
+		{
+			i++;
+		}
+		st.Reset();
+	}
+}