tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

part II of rewriting

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@635 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-12 19:10:12 +00:00
parent c3fac2e83f
commit 9a199cd834
38 changed files with 1159 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/config.cpp
View File

@@ -91,6 +91,7 @@ void Config::AssignValues(bool stdout_is_closed)
{
log_file = Text("log_file");
log_notify_file = Text("log_notify_file");
log_delimiter = Text("log_delimiter", "---------------------------------------------------------------------------------");
fcgi_socket = Text("fcgi_socket");
fcgi_socket_chmod = Int("fcgi_socket_chmod", 0770);
fcgi_socket_user = Text("fcgi_socket_user");
@@ -132,7 +133,15 @@ void Config::AssignValues(bool stdout_is_closed)
session_file = Text("session_file");
compression = Bool("compression", true);
html_filter = Bool("html_filter", true);
compression_page_min_size = Int("compression_page_min_size", 512);
html_filter = Bool("html_filter", true);
html_filter_trim_white = Bool("html_filter_trim_white", true);
html_filter_break_lines = Int("html_filter_break_lines", 60);
html_filter_tabs = Size("html_filter_tabs", 2);
html_filter_orphans = Bool("html_filter_orphans", false);
html_filter_orphans_lang_str = Text("html_filter_orphans_lang", "pl");
html_filter_orphans_mode_str = Text("html_filter_orphans_mode_str", "nbsp");
locale_str = Text("locale", "en");
locale_dir = Text("locale_dir");
@@ -140,6 +149,10 @@ void Config::AssignValues(bool stdout_is_closed)
title_separator = Text("title_separator", " / ");
http_header_send_file = Text("http_header_send_file", "X-LIGHTTPD-send-file");
password_min_size = Size("password_min_size", 5);
debug_info = Bool("debug_info", false);
parser.ListText("plugins", plugin_file);
}
@@ -148,6 +161,22 @@ void Config::SetAdditionalVariables()
{
SetHttpHost(base_url, base_url_http_host);
SetHttpHost(base_url_auth, base_url_auth_http_host);
if( html_filter_orphans_lang_str == "pl" )
html_filter_orphans_lang = HTMLFilter::lang_pl;
else
if( html_filter_orphans_lang_str == "cz" )
html_filter_orphans_lang = HTMLFilter::lang_cz;
else
if( html_filter_orphans_lang_str == "sk" )
html_filter_orphans_lang = HTMLFilter::lang_sk;
else
html_filter_orphans_lang = HTMLFilter::lang_none;
if( html_filter_orphans_mode_str == "160" )
html_filter_orphans_mode = HTMLFilter::orphan_160space;
else
html_filter_orphans_mode = HTMLFilter::orphan_nbsp;
}
@@ -201,6 +230,24 @@ int Config::Int(const std::string & name, int def)
}
size_t Config::Size(const char * name)
{
return parser.Size(name);
}
size_t Config::Size(const char * name, size_t def)
{
return parser.Size(name, def);
}
size_t Config::Size(const std::string & name, size_t def)
{
return parser.Size(name, def);
}
bool Config::Bool(const char * name)
{
return parser.Bool(name);