X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=66b175a1ad5d9785aed9cab63d78b75f5aeb3a4f;hb=244a65e8556328642350575c4a94ee8fc1b676b4;hp=6790b45e77715a37020345b72db58948635c90f9;hpb=895554aebccbeeb45e2c469d0bafa1e0d85dd8fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 6790b45e7..66b175a1a 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -66,24 +66,13 @@ void RehashHandler::Call(const std::string &reason)
 	}
 }
 
-std::string InspIRCd::GetVersionString(bool operstring)
+std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
-	char versiondata[MAXBUF];
-	if (operstring)
-	{
-		std::string sename = SE->GetName();
-		snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION, Config->ServerName.c_str(), SYSTEM,REVISION, sename.c_str(), Config->sid.c_str());
-	}
-	else
-		snprintf(versiondata,MAXBUF,"%s %s :%s",BRANCH,Config->ServerName.c_str(),Config->CustomVersion.c_str());
-	return versiondata;
+	if (getFullVersion)
+		return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," + SE->GetName() + "," + Config->sid + "]";
+	return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
-const char InspIRCd::LogHeader[] =
-	"Log started for " VERSION " (" REVISION ", " MODULE_INIT_STR ")"
-	" - compiled on " SYSTEM;
-
-
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
 {
 	unsigned int sid = 0;
@@ -94,6 +83,7 @@ std::string UIDGenerator::GenerateSID(const std::string& servername, const std::
 		sid = 5 * sid + *i;
 
 	std::string sidstr = ConvToStr(sid % 1000);
+	sidstr.insert(0, 3 - sidstr.length(), '0');
 	return sidstr;
 }