part II of rewriting

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@635 e52654a7-88a9-db11-a3e9-0013d4bc506e

core/config.h

@@ -12,6 +12,7 @@
 
 #include <string>
 #include "confparser.h"
+#include "htmlfilter.h"
 
 
 
@@ -38,6 +39,9 @@ public:
 	// default: 1
 	int log_request;
 
+	// request delimiter in the log file, default "---------"
+	std::string log_delimiter;
+
 	// fast cgi: socket (unix domain)
 	std::string fcgi_socket;
 
@@ -80,13 +84,45 @@ public:
 
 	// allow the html ouput to be compressed
 	bool compression;
+
+	// if the output is shorter than this value then it will not be compressed
+	int compression_page_min_size;
 	
 	// plugins
 	std::vector<std::string> plugin_file;
 
-	// the html code is cleaned by our filter
+	// should the html code be cleaned by the html filter
 	bool html_filter;
 
+	// should white characters be trimmed
+	bool html_filter_trim_white;
+
+	// when long lines (lines without a white character) should be break (inserted a space)
+	// default: after 60 non white characters will be put a space
+	// set zero to turn off
+	int html_filter_break_lines;
+
+	// how many spaces will be put at one tree level
+	// default: 2
+	size_t html_filter_tabs;
+
+	// use checking for 'orphans' for a specicic language
+	// default: false
+	bool html_filter_orphans;
+
+	// language for html orphans
+	// default: pl
+	// can be either: "pl" or "cz" or "sk"
+	std::string html_filter_orphans_lang_str;
+	HTMLFilter::Lang html_filter_orphans_lang;
+
+	// orphans mode
+	// either: "nbsp" or "160"
+	// default: "nbsp"
+	std::string html_filter_orphans_mode_str;
+	HTMLFilter::OrphanMode html_filter_orphans_mode;
+
+
 	// the url of a new empty item (if there is not the subject too)
 	std::string item_url_empty;
 
@@ -129,6 +165,21 @@ public:
 	// separator used in <title> html tag
 	std::string title_separator;
 
+	// http header recognized by www server as a file to send back
+	// default: X-LIGHTTPD-send-file
+	std::string http_header_send_file;
+
+	// the minimum size of a password for new users (function: adduser)
+	// default: 5
+	size_t password_min_size;
+
+	// prints additional information (in the end of the html page as a commentary)
+	// 
+	bool debug_info;
+
+
+	/*
+	*/
 
 	// based on base_url
 	// set by SetAdditionalVariables()
@@ -146,6 +197,9 @@ public:
 	int Int(const char *);
 	int Int(const char * name, int def);
 	int Int(const std::string & name, int def);
+	size_t Size(const char *);
+	size_t Size(const char * name, size_t def);
+	size_t Size(const std::string & name, size_t def);
 	bool Bool(const char *);
 	bool Bool(const char * name, bool def);
 	bool Bool(const std::string & name, bool def);