controlapi/config: switch to new plain output format

Origin commit data
------------------
Branch: ni/coolstream
Commit: b941eb950e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-20 (Sat, 20 Feb 2016)

Origin message was:
------------------
- controlapi/config: switch to new plain output format

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-02-20 12:12:17 +01:00
parent 75139c0af9
commit 0ebec6ab3a

View File

@@ -2996,7 +2996,7 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) {
std::string result = ""; std::string result = "";
std::string configFileName = hh->ParamList["config"]; std::string configFileName = hh->ParamList["config"];
TOutType outType = hh->outStart(true /*old mode*/); TOutType outType = hh->outStart();
if (hh->ParamList["action"] == "submit") if (hh->ParamList["action"] == "submit")
load = false; load = false;
@@ -3022,13 +3022,9 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) {
replace(key, ".", "_dot_"); replace(key, ".", "_dot_");
replace(key, "-", "_bind_"); replace(key, "-", "_bind_");
if (!(hh->ParamList["config"] == "nhttpd" && it->first == "mod_auth.password")) { if (!(hh->ParamList["config"] == "nhttpd" && it->first == "mod_auth.password")) {
if(outType == plain) if(it != start)
result += key + "=" + it->second + "\n"; result += hh->outNext();
else { result += hh->outPair(key, it->second, false);
if(it != start)
result += hh->outNext();
result += hh->outPair(key, it->second, false);
}
} }
} }
} }