mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

nhttpd: just cosmetics (remove annoying linebreaks)

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae23144065
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: just cosmetics (remove annoying linebreaks)

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-05 00:18:14 +02:00
committed by Thilo Graf
parent 71d200fcd5
commit 4e064bc8cf
1 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/nhttpd/yhttpd.cpp
View File

@@ -330,29 +330,19 @@ void Cyhttpd::ReadConfig(void) {
CConfigFile OrgConfig = *Config; CConfigFile OrgConfig = *Config;
Config->clear(); Config->clear();
Config->setInt32("server.log.loglevel", OrgConfig.getInt32( Config->setInt32("server.log.loglevel", OrgConfig.getInt32("LogLevel", 0));
"LogLevel", 0));
Config->setInt32("configfile.version", CONF_VERSION); Config->setInt32("configfile.version", CONF_VERSION);
Config->setString("webserver.websites", "WebsiteMain"); Config->setString("webserver.websites", "WebsiteMain");
Config->setBool("webserver.threading", OrgConfig.getBool("THREADS", Config->setBool("webserver.threading", OrgConfig.getBool("THREADS", true));
true)); Config->setInt32("WebsiteMain.port", OrgConfig.getInt32("Port", HTTPD_STANDARD_PORT));
Config->setInt32("WebsiteMain.port", OrgConfig.getInt32("Port", Config->setString("WebsiteMain.directory", OrgConfig.getString("PrivatDocRoot", PRIVATEDOCUMENTROOT));
HTTPD_STANDARD_PORT));
Config->setString("WebsiteMain.directory", OrgConfig.getString(
"PrivatDocRoot", PRIVATEDOCUMENTROOT));
if (!OrgConfig.getString("PublicDocRoot", "").empty()) if (!OrgConfig.getString("PublicDocRoot", "").empty())
Config->setString("WebsiteMain.override_directory", Config->setString("WebsiteMain.override_directory", OrgConfig.getString("PublicDocRoot", PRIVATEDOCUMENTROOT));
OrgConfig.getString("PublicDocRoot",
PRIVATEDOCUMENTROOT));
// mod_auth // mod_auth
Config->setString("mod_auth.username", OrgConfig.getString( Config->setString("mod_auth.username", OrgConfig.getString("AuthUser", AUTHUSER));
"AuthUser", AUTHUSER)); Config->setString("mod_auth.password", OrgConfig.getString("AuthPassword", AUTHPASSWORD));
Config->setString("mod_auth.password", OrgConfig.getString( Config->setString("mod_auth.no_auth_client", OrgConfig.getString("NoAuthClient", ""));
"AuthPassword", AUTHPASSWORD)); Config->setString("mod_auth.authenticate", OrgConfig.getString("Authenticate", "false"));
Config->setString("mod_auth.no_auth_client", OrgConfig.getString(
"NoAuthClient", ""));
Config->setString("mod_auth.authenticate", OrgConfig.getString(
"Authenticate", "false"));
Config->setString("mod_sendfile.mime_types", HTTPD_SENDFILE_EXT); Config->setString("mod_sendfile.mime_types", HTTPD_SENDFILE_EXT);
@@ -383,29 +373,19 @@ void Cyhttpd::ReadConfig(void) {
CLogging::getInstance()->setDebug(true); CLogging::getInstance()->setDebug(true);
// get variables // get variables
webserver->init(Config->getInt32("WebsiteMain.port", HTTPD_STANDARD_PORT), webserver->init(Config->getInt32("WebsiteMain.port", HTTPD_STANDARD_PORT), Config->getBool("webserver.threading", true));
Config->getBool("webserver.threading", true));
// informational use // informational use
ConfigList["WebsiteMain.port"] = itoa(Config->getInt32("WebsiteMain.port", ConfigList["WebsiteMain.port"] = itoa(Config->getInt32("WebsiteMain.port", HTTPD_STANDARD_PORT));
HTTPD_STANDARD_PORT)); ConfigList["webserver.threading"] = Config->getString("webserver.threading", "true");
ConfigList["webserver.threading"] = Config->getString( ConfigList["configfile.version"] = Config->getInt32("configfile.version", CONF_VERSION);
"webserver.threading", "true"); ConfigList["server.log.loglevel"] = itoa(Config->getInt32("server.log.loglevel", 0));
ConfigList["configfile.version"] = Config->getInt32("configfile.version", ConfigList["server.no_keep-alive_ips"] = Config->getString("server.no_keep-alive_ips", "");
CONF_VERSION); webserver->conf_no_keep_alive_ips = Config->getStringVector("server.no_keep-alive_ips");
ConfigList["server.log.loglevel"] = itoa(Config->getInt32(
"server.log.loglevel", 0));
ConfigList["server.no_keep-alive_ips"] = Config->getString(
"server.no_keep-alive_ips", "");
webserver->conf_no_keep_alive_ips = Config->getStringVector(
"server.no_keep-alive_ips");
// MainSite // MainSite
ConfigList["WebsiteMain.directory"] = Config->getString( ConfigList["WebsiteMain.directory"] = Config->getString("WebsiteMain.directory", PRIVATEDOCUMENTROOT);
"WebsiteMain.directory", PRIVATEDOCUMENTROOT); ConfigList["WebsiteMain.override_directory"] = Config->getString("WebsiteMain.override_directory", PUBLICDOCUMENTROOT);
ConfigList["WebsiteMain.override_directory"] = Config->getString( ConfigList["WebsiteMain.hosted_directory"] = Config->getString("WebsiteMain.hosted_directory", HOSTEDDOCUMENTROOT);
"WebsiteMain.override_directory", PUBLICDOCUMENTROOT);
ConfigList["WebsiteMain.hosted_directory"] = Config->getString(
"WebsiteMain.hosted_directory", HOSTEDDOCUMENTROOT);
ConfigList["Tuxbox.DisplayLogos"] = Config->getString("Tuxbox.DisplayLogos", "true"); ConfigList["Tuxbox.DisplayLogos"] = Config->getString("Tuxbox.DisplayLogos", "true");
// Check location of logos // Check location of logos
@@ -438,15 +418,12 @@ void Cyhttpd::ReadConfig(void) {
CySocket::initSSL(); CySocket::initSSL();
#endif #endif
ConfigList["server.user_name"] = Config->getString("server.user_name", ""); ConfigList["server.user_name"] = Config->getString("server.user_name", "");
ConfigList["server.group_name"] ConfigList["server.group_name"] = Config->getString("server.group_name", "");
= Config->getString("server.group_name", "");
ConfigList["server.chroot"] = Config->getString("server.chroot", ""); ConfigList["server.chroot"] = Config->getString("server.chroot", "");
// language // language
ConfigList["Language.directory"] = Config->getString("Language.directory", ConfigList["Language.directory"] = Config->getString("Language.directory", HTTPD_LANGUAGEDIR);
HTTPD_LANGUAGEDIR); ConfigList["Language.selected"] = Config->getString("Language.selected", HTTPD_DEFAULT_LANGUAGE);
ConfigList["Language.selected"] = Config->getString("Language.selected",
HTTPD_DEFAULT_LANGUAGE);
yhttpd->ReadLanguage(); yhttpd->ReadLanguage();
// Read App specifig settings by Hook // Read App specifig settings by Hook
@@ -464,7 +441,6 @@ void Cyhttpd::ReadConfig(void) {
void Cyhttpd::ReadLanguage(void) { void Cyhttpd::ReadLanguage(void) {
// Init Class vars // Init Class vars
CLanguage *lang = CLanguage::getInstance(); CLanguage *lang = CLanguage::getInstance();
log_level_printf(3, "ReadLanguage:%s\n", log_level_printf(3, "ReadLanguage:%s\n", ConfigList["Language.selected"].c_str());
ConfigList["Language.selected"].c_str());
lang->setLanguage(ConfigList["Language.selected"]); lang->setLanguage(ConfigList["Language.selected"]);
} }