version 0.2.4

[fms.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index f4a6ea6..f95f541 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -146,7 +146,7 @@ void Message::HandleAdministrationMessage()
                                        }\r
                                        else\r
                                        {\r
-                                               origmessagetrust=50;\r
+                                               origmessagetrust=m_minlocalmessagetrust;\r
                                        }\r
                                        if(origmess.ResultNull(3)==false)\r
                                        {\r
@@ -154,28 +154,16 @@ void Message::HandleAdministrationMessage()
                                        }\r
                                        else\r
                                        {\r
-                                               origtrustlisttrust=50;\r
+                                               origtrustlisttrust=m_minlocaltrustlisttrust;\r
                                        }\r
 \r
                                        origmessagetrust+=changemessagetrust;\r
                                        origtrustlisttrust+=changetrustlisttrust;\r
 \r
-                                       if(origmessagetrust<0)\r
-                                       {\r
-                                               origmessagetrust=0;\r
-                                       }\r
-                                       if(origmessagetrust>100)\r
-                                       {\r
-                                               origmessagetrust=100;\r
-                                       }\r
-                                       if(origtrustlisttrust<0)\r
-                                       {\r
-                                               origtrustlisttrust=0;\r
-                                       }\r
-                                       if(origtrustlisttrust>100)\r
-                                       {\r
-                                               origtrustlisttrust=100;\r
-                                       }\r
+                                       origmessagetrust<0 ? origmessagetrust=0 : false;\r
+                                       origmessagetrust>100 ? origmessagetrust=100 : false;\r
+                                       origtrustlisttrust<0 ? origtrustlisttrust=0 : false;\r
+                                       origtrustlisttrust>100 ? origtrustlisttrust=100 : false;\r
 \r
                                        // update new trust levels\r
                                        SQLite3DB::Statement update=m_db->Prepare("UPDATE tblIdentity SET LocalMessageTrust=?, LocalTrustListTrust=? WHERE IdentityID=?;");\r
@@ -242,7 +230,7 @@ void Message::HandleChangeTrust()
                        }\r
                        else\r
                        {\r
-                               localmessagetrust=50;\r
+                               localmessagetrust=m_minlocalmessagetrust;\r
                        }\r
 \r
                        localmessagetrust+=m_changemessagetrustonreply;\r
@@ -288,6 +276,12 @@ void Message::Initialize()
        {\r
                m_addnewpostfromidentities=false;\r
        }\r
+       tempval="50";\r
+       Option::Instance()->Get("MinLocalMessageTrust",tempval);\r
+       StringFunctions::Convert(tempval,m_minlocalmessagetrust);\r
+       tempval="51";\r
+       Option::Instance()->Get("MinLocalTrustListTrust",tempval);\r
+       StringFunctions::Convert(tempval,m_minlocaltrustlisttrust);\r
 }\r
 \r
 const bool Message::Load(const long messageid, const long boardid)\r