X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnntp%2Fnntpconnection.cpp;h=3fffad7d312c4e12194da23d85e0a94949227c25;hb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;hp=0ccef18ae7ad859b00668a003fdd94211d1ccc10;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp
index 0ccef18..3fffad7 100644
--- a/src/nntp/nntpconnection.cpp
+++ b/src/nntp/nntpconnection.cpp
@@ -319,7 +319,7 @@ const bool NNTPConnection::HandleListCommand(const NNTPCommand &command)
 
 			if(show==true)
 			{
-				tempstr << (*i).GetBoardName() << "\t" << (*i).GetHighMessageID() << "\t" << (*i).GetLowMessageID() << "\t" << (m_status.m_allowpost ? "y" : "n");
+				tempstr << (*i).GetBoardName() << " " << (*i).GetHighMessageID() << " " << (*i).GetLowMessageID() << " " << (m_status.m_allowpost ? "y" : "n");
 				SendBufferedLine(tempstr.str());
 			}
 		}
@@ -387,7 +387,6 @@ const bool NNTPConnection::HandleListGroupCommand(const NNTPCommand &command)
 	std::ostringstream tempstr;
 	Board board;
 	bool validgroup=false;
-	int tempint;
 	int lownum=-1;
 	int highnum=-1;
 
@@ -636,6 +635,11 @@ const bool NNTPConnection::HandleOverCommand(const NNTPCommand &command)
 			messageuuid=command.m_arguments[0];
 			messageuuid=StringFunctions::Replace(messageuuid,"<","");
 			messageuuid=StringFunctions::Replace(messageuuid,">","");
+			// get rid of @ and everything after
+			if(messageuuid.find("@")!=std::string::npos)
+			{
+				messageuuid.erase(messageuuid.find("@"));
+			}
 		}
 		// single article or range
 		else
@@ -774,7 +778,14 @@ void NNTPConnection::HandlePostedMessage(const std::string &message)
 
 	if(mess.ParseNNTPMessage(message))
 	{
-		mess.StartFreenetInsert();
+		if(mess.PostedToAdministrationBoard()==true)
+		{
+			mess.HandleAdministrationMessage();
+		}
+		else
+		{
+			mess.StartFreenetInsert();
+		}
 		SendBufferedLine("240 Article received OK");
 	}
 	else
@@ -944,7 +955,7 @@ void NNTPConnection::SendArticleOverInfo(Message &message)
 			{
 				line+=" ";
 			}
-			line+="<"+(*i).second+">";
+			line+="<"+(*i).second+"@freenetproject.org>";
 		}
 		line+="\t";
 	}