Merge branch '1.6.x'

src/ClientCommand.cpp

@@ -1625,16 +1625,14 @@ static void AddCommandHelp(CTable& Table, const CString& sCmd, const CString& sA
 {
 	if (sFilter.empty() || sCmd.StartsWith(sFilter) || sCmd.AsLower().WildCmp(sFilter.AsLower())) {
 		Table.AddRow();
-		Table.SetCell("Command", sCmd);
-		Table.SetCell("Arguments", sArgs);
+		Table.SetCell("Command", sCmd + " " + sArgs);
 		Table.SetCell("Description", sDesc);
 	}
 }
 
 void CClient::HelpUser(const CString& sFilter) {
 	CTable Table;
 	Table.AddColumn("Command");
-	Table.AddColumn("Arguments");
 	Table.AddColumn("Description");
 
 	if (sFilter.empty()) {

src/HTTPSock.cpp

@@ -136,7 +136,7 @@ void CHTTPSock::ReadLine(const CString& sData) {
 		sLine.Token(2).Base64Decode(sUnhashed);
 		m_sUser = sUnhashed.Token(0, false, ":");
 		m_sPass = sUnhashed.Token(1, true, ":");
-		m_bLoggedIn = OnLogin(m_sUser, m_sPass, true);
+		// Postpone authorization attempt until end of headers, because cookies should be read before that, otherwise session id will be overwritten in GetSession()
 	} else if (sName.Equals("Content-Length:")) {
 		m_uPostLen = sLine.Token(1).ToULong();
 		if (m_uPostLen > MAX_POST_SIZE)
@@ -184,6 +184,14 @@ void CHTTPSock::ReadLine(const CString& sData) {
 	} else if (sLine.empty()) {
 		m_bGotHeader = true;
 
+		if (!m_sUser.empty()) {
+			m_bLoggedIn = OnLogin(m_sUser, m_sPass, true);
+			if (!m_bLoggedIn) {
+				// Error message already was sent
+				return;
+			}
+		}
+
 		if (m_bPost) {
 			m_sPostData = GetInternalReadBuffer();
 			CheckPost();

src/WebModules.cpp

@@ -473,7 +473,6 @@ CWebSock::EPageReqResult CWebSock::PrintTemplate(const CString& sPageName, CStri
 	m_Template["PageName"] = sPageName;
 
 	if (pModule) {
-		CUser* pUser = pModule->GetUser();
 		m_Template["ModName"] = pModule->GetModName();
 
 		if (m_Template.find("Title") == m_Template.end()) {