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

renamed: config option 'html_filter_break_lines' to 'html_filter_break_word' 

added:   config option 'html_filter_wrap_line'
         this wraps the whole line (line calculated with html tags as well)
changed: orphans (for html filter) are read from locale files now
         ('language_orphans' value )



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@728 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2011-04-16 08:42:22 +00:00
parent aadf12c7b3
commit 426beae796
19 changed files with 1079 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile.dep
View File

@ -114,12 +114,12 @@ misc.o: ../templates/patterncacher.h ../core/item.h
misc.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h misc.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
misc.o: ../core/log.h ../templates/indexpatterns.h misc.o: ../core/log.h ../templates/indexpatterns.h
misc.o: ../templates/localefilter.h ../templates/locale.h ../core/config.h misc.o: ../templates/localefilter.h ../templates/locale.h ../core/config.h
misc.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h misc.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h
misc.o: ../core/sessionmanager.h ../core/htmlfilter.h ../db/db.h
misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
misc.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h misc.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h
misc.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h misc.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h misc.o: ../core/dircontainer.h ../core/ugcontainer.h
misc.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h
misc.o: ../core/sessionmanager.h
mount.o: mount.h misc.h item.h mount.o: mount.h misc.h item.h
mountparser.o: mountparser.h mount.h item.h error.h dirs.h dircontainer.h mountparser.o: mountparser.h mount.h item.h error.h dirs.h dircontainer.h
mountparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h mountparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
@ -372,8 +372,8 @@ system.o: thumb.h basethread.h ../templates/templates.h
system.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h system.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h
system.o: ../core/httpsimpleparser.h ../core/log.h system.o: ../core/httpsimpleparser.h ../core/log.h
system.o: ../templates/indexpatterns.h ../core/cur.h ../core/system.h system.o: ../templates/indexpatterns.h ../core/cur.h ../core/system.h
system.o: ../core/sessionmanager.h ../functions/functionbase.h system.o: ../core/sessionmanager.h ../core/htmlfilter.h
system.o: ../core/request.h ../core/synchro.h system.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h
textstream.o: textstream.h misc.h item.h textstream.o: textstream.h misc.h item.h
thumb.o: thumb.h basethread.h textstream.h ../db/db.h ../db/dbbase.h thumb.o: thumb.h basethread.h textstream.h ../db/db.h ../db/dbbase.h
thumb.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h thumb.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h

13
core/app.cpp
View File

@ -604,16 +604,6 @@ void App::SendHeaders(bool compressing, int compress_encoding, Header header)
void App::SetHtmlFilterConf()
{
html_filter.TrimWhite(config.html_filter_trim_white);
html_filter.BreakLines(config.html_filter_break_lines);
html_filter.InsertTabs(config.html_filter_tabs);
if( config.html_filter_orphans )
html_filter.CheckOrphans(config.html_filter_orphans_lang, config.html_filter_orphans_mode);
}
void App::FilterCompressSend(bool compressing, int compress_encoding, const std::wstring & source_ref) void App::FilterCompressSend(bool compressing, int compress_encoding, const std::wstring & source_ref)
{ {
@ -624,8 +614,7 @@ void App::FilterCompressSend(bool compressing, int compress_encoding, const std:
if( config.html_filter && !raw ) if( config.html_filter && !raw )
{ {
SetHtmlFilterConf(); TemplatesFunctions::html_filter.Filter(*source, clean_html);
html_filter.Filter(*source, clean_html);
AddDebugInfo(clean_html); AddDebugInfo(clean_html);
source = &clean_html; source = &clean_html;
} }

3
core/app.h
View File

@ -30,7 +30,6 @@
#include "functions/functions.h" #include "functions/functions.h"
#include "templates/templates.h" #include "templates/templates.h"
#include "compress.h" #include "compress.h"
#include "htmlfilter.h"
#include "getparser.h" #include "getparser.h"
#include "postparser.h" #include "postparser.h"
#include "cookieparser.h" #include "cookieparser.h"
@ -124,7 +123,6 @@ private:
CookieParser cookie_parser; CookieParser cookie_parser;
AcceptEncodingParser accept_encoding_parser; AcceptEncodingParser accept_encoding_parser;
Compress compress; Compress compress;
HTMLFilter html_filter;
std::wstring clean_html, html_with_debug; std::wstring clean_html, html_with_debug;
FCGX_Request fcgi_request; FCGX_Request fcgi_request;
int fcgi_socket; int fcgi_socket;
@ -153,7 +151,6 @@ private:
void CheckRequestMethod(); void CheckRequestMethod();
void CheckFCGIRole(); void CheckFCGIRole();
void SetHtmlFilterConf();
void PrepareSessionCookie(); void PrepareSessionCookie();
void AddDebugInfo(std::wstring & out); void AddDebugInfo(std::wstring & out);
void FilterCompressSend(bool compressing, int compress_encoding, const std::wstring & source_ref); void FilterCompressSend(bool compressing, int compress_encoding, const std::wstring & source_ref);

8
core/bbcodeparser.cpp
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2008-2010, Tomasz Sowa * Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -201,6 +201,12 @@ const BBCODEParser::Tags * BBCODEParser::FindTag(const wchar_t * tag)
return 0; return 0;
} }
const BBCODEParser::Tags * BBCODEParser::FindTag(const std::wstring & tag)
{
return FindTag(tag.c_str());
}
void BBCODEParser::PrintArgumentCheckQuotes(const wchar_t * & start, const wchar_t * & end) void BBCODEParser::PrintArgumentCheckQuotes(const wchar_t * & start, const wchar_t * & end)
{ {

3
core/bbcodeparser.h
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2008-2010, Tomasz Sowa * Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -58,6 +58,7 @@ class BBCODEParser : public HTMLFilter
virtual void PutClosingTag(const wchar_t * tag); virtual void PutClosingTag(const wchar_t * tag);
const Tags * FindTag(const wchar_t * tag); const Tags * FindTag(const wchar_t * tag);
const Tags * FindTag(const std::wstring & tag);
void PrintArgumentCheckQuotes(const wchar_t * & start, const wchar_t * & end); void PrintArgumentCheckQuotes(const wchar_t * & start, const wchar_t * & end);

17
core/config.cpp
View File

@ -159,10 +159,10 @@ void Config::AssignValues(bool stdout_is_closed)
html_filter = Bool(L"html_filter", true); html_filter = Bool(L"html_filter", true);
html_filter_trim_white = Bool(L"html_filter_trim_white", true); html_filter_trim_white = Bool(L"html_filter_trim_white", true);
html_filter_break_lines = Int(L"html_filter_break_lines", 60); html_filter_break_word = Int(L"html_filter_break_word", 60);
html_filter_wrap_line = Int(L"html_filter_wrap_line", 110);
html_filter_tabs = Size(L"html_filter_tabs", 2); html_filter_tabs = Size(L"html_filter_tabs", 2);
html_filter_orphans = Bool(L"html_filter_orphans", false); html_filter_orphans = Bool(L"html_filter_orphans", true);
html_filter_orphans_lang_str = AText(L"html_filter_orphans_lang", L"pl");
html_filter_orphans_mode_str = AText(L"html_filter_orphans_mode_str", L"nbsp"); html_filter_orphans_mode_str = AText(L"html_filter_orphans_mode_str", L"nbsp");
locale_dir = Text(L"locale_dir"); locale_dir = Text(L"locale_dir");
@ -200,17 +200,6 @@ void Config::SetAdditionalVariables()
{ {
SetHttpHost(base_url, base_url_http_host); SetHttpHost(base_url, base_url_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" ) if( html_filter_orphans_mode_str == "160" )
html_filter_orphans_mode = HTMLFilter::orphan_160space; html_filter_orphans_mode = HTMLFilter::orphan_160space;
else else

17
core/config.h
View File

@ -167,25 +167,24 @@ public:
// should white characters be trimmed // should white characters be trimmed
bool html_filter_trim_white; bool html_filter_trim_white;
// when long lines (lines without a white character) should be break (inserted a space) // when long words should be broken (a space will be inserted)
// default: after 60 non white characters will be put a space // default: after 60 non white characters will be put a space
// set zero to turn off // set zero to turn off
int html_filter_break_lines; size_t html_filter_break_word;
// when long lines should be broken (a new line character will be inserted)
// default: 80
// set zero to turn off
size_t html_filter_wrap_line;
// how many spaces will be put at one tree level // how many spaces will be put at one tree level
// default: 2 // default: 2
size_t html_filter_tabs; size_t html_filter_tabs;
// use checking for 'orphans' for a specicic language // use checking for 'orphans' for a specicic language
// default: false // default: true
bool html_filter_orphans; 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 // orphans mode
// either: "nbsp" or "160" // either: "nbsp" or "160"
// default: "nbsp" // default: "nbsp"

818
core/htmlfilter.cpp
View File

File diff suppressed because it is too large Load Diff

166
core/htmlfilter.h
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2008-2010, Tomasz Sowa * Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -11,18 +11,31 @@
#define headerfile_winix_core_htmlfilter #define headerfile_winix_core_htmlfilter
#include <string> #include <string>
#include <map>
#include <vector>
#include <algorithm>
// max length of a name of a html tag (with terminating null) // max length of a name of a html tag (with terminating null)
#define WINIX_HTMLFILTER_ITEM_MAXLEN 30 #define WINIX_HTMLFILTER_ITEM_NAME_MAXLEN 30
// max length of a html lang attribute (e.g. "en", "pl")
#define WINIX_HTMLFILTER_ITEM_LANG_MAXLEN 10
#define WINIX_HTMLFILTER_ATTR_NAME_MAXLEN 40
#define WINIX_HTMLFILTER_ATTR_VALUE_MAXLEN 500
// depth of the html tree // depth of the html tree
#define WINIX_HTMLFILTER_STACK_MAXLEN 100 #define WINIX_HTMLFILTER_STACK_MAXLEN 100
// length of a buffer used for printing // length of a buffer used for printing
// it should be at least: WINIX_HTMLFILTER_ITEM_MAXLEN+3 // it should be at least: WINIX_HTMLFILTER_ITEM_NAME_MAXLEN+3
#define WINIX_HTMLFILTER_BUFFER_MAXLEN 2048 #define WINIX_HTMLFILTER_BUFFER_MAXLEN 2048
@ -48,23 +61,12 @@ class HTMLFilter
{ {
public: public:
// for checking orphans
enum Lang
{
lang_pl,
lang_cz,
lang_sk,
lang_none
};
enum OrphanMode enum OrphanMode
{ {
orphan_nbsp, // putting "&nbsp;" string orphan_nbsp, // putting "&nbsp;" string
orphan_160space // putting 160 ascii code orphan_160space // putting 160 ascii code
}; };
HTMLFilter(); HTMLFilter();
HTMLFilter(const HTMLFilter & f); HTMLFilter(const HTMLFilter & f);
HTMLFilter & operator=(const HTMLFilter & f); HTMLFilter & operator=(const HTMLFilter & f);
@ -76,12 +78,18 @@ public:
void Filter(const std::wstring & in, std::wstring & out); void Filter(const std::wstring & in, std::wstring & out);
// insert a white space into long lines // insert a white space into long words
// only between html tags // (only between html tags)
// skipped in such tags: script, pre, textarea // skipped in such tags: script, pre, textarea
// break_after - after how many characters insert a space (0 - off) // break_after - after how many characters insert a space (0 - off)
void BreakLines(size_t break_after_); void BreakWord(size_t break_after_);
// insert a new line character into long lines
// (only between html tags)
// skipped in such tags: script, pre, textarea
// wrap_line - after how many characters wrap a line (0 - off)
// lines are wrapped only in 'body' tag (useful for text in 'title' tag which is in 'head' section)
void WrapLine(size_t wrap_line_);
// trimming white characters (with new lines) // trimming white characters (with new lines)
// at the beginning, at the end and in the middle of a string // at the beginning, at the end and in the middle of a string
@ -98,10 +106,16 @@ public:
void InsertTabs(size_t tabsize); void InsertTabs(size_t tabsize);
// orphans are checked only in 'body' tag
void AssignOrphans(const wchar_t * lang_code, const std::vector<std::wstring> & otab);
void AssignOrphans(const std::wstring & lang_code, const std::vector<std::wstring> & otab);
void ClearOrphans();
// check 'orphans' for the specicic language // check 'orphans' for the specicic language
// if an orphan is detected then the non-break space ("&nbsp;" or ascii 160 code) will be put // if an orphan is detected then the non-break space ("&nbsp;" or ascii 160 code) will be put
// default disable (lang_none) // default disable (lang_none)
void CheckOrphans(Lang lang_, OrphanMode mode = orphan_nbsp); void OrphansMode(OrphanMode mode = orphan_nbsp);
// skipping some unsafe tags // skipping some unsafe tags
@ -112,52 +126,80 @@ public:
protected: protected:
// orphans for one language
struct Orphans
{
std::vector<std::wstring> tab;
size_t max_len;
};
// orphans for all languages
// map<language_code, Orphans>
typedef std::map<std::wstring, Orphans> OrphansTab;
OrphansTab orphans_tab;
struct Item struct Item
{ {
wchar_t name[WINIX_HTMLFILTER_ITEM_MAXLEN]; std::wstring name; // max size: WINIX_HTMLFILTER_ITEM_NAME_MAXLEN
size_t name_len;
enum Type enum Type
{ {
opening, opening, /* sample: <h1> */
closing, closing, /* sample: </h1> */
simple, simple, /* sample: <br/> */
special, special, /* sample: <!doctype> */
none none
} type; } type;
// is there a new line after this tag // is there a new line after this tag
bool new_line; bool new_line;
// current orphans table
// (will be propagated)
Orphans * porphans;
// this item or one from its parents is a 'body' html tag
// (will be propagated)
bool has_body_tag;
void Clear(); void Clear();
Item(); Item();
}; };
// only this method have direct access to the output string
// you can easily change the output from a std::wstring to something else
virtual void Put(const wchar_t * str, const wchar_t * end);
Item & GetItem(size_t i); Item & GetItem(size_t i);
Item & LastItem(); Item & LastItem();
wchar_t ToLower(wchar_t c); wchar_t ToLower(wchar_t c);
bool IsNameEqual(const wchar_t * name1, const wchar_t * name2); void ToLower(std::wstring & str);
bool IsNameEqual(const wchar_t * name1, const wchar_t * name2, size_t len);
bool IsNameEqual(const wchar_t * name1, const wchar_t * name2);
bool IsNameEqual(const wchar_t * name1, const std::wstring & name2);
bool IsNameEqual(const std::wstring & name1, const wchar_t * name2);
bool IsNameEqual(const std::wstring & name1, const std::wstring & name2);
bool IsNameEqual(const wchar_t * name1, const wchar_t * name2, size_t len);
bool IsNameEqual(const wchar_t * name1, const std::wstring & name2, size_t len);
bool IsNameEqual(const std::wstring & name1, const wchar_t * name2, size_t len);
bool IsNameEqual(const std::wstring & name1, const std::wstring & name2, size_t len);
bool IsLastTag(const wchar_t * name); bool IsLastTag(const wchar_t * name);
bool IsTagSafe(const wchar_t * tag); bool IsTagSafe(const wchar_t * tag);
bool IsTagSafe(const std::wstring & tag);
int CheckOrphan(const wchar_t * str, const wchar_t * end, const wchar_t * orphan); int CheckOrphan(const wchar_t * str, const wchar_t * end, const std::wstring & orphan_str);
bool CheckOrphanTable(const wchar_t * str, const wchar_t * end, const wchar_t ** table, size_t o1, size_t o2); bool CheckOrphan(const wchar_t * str, const wchar_t * end, const std::vector<std::wstring> & orphans);
bool CheckOrphanLangPl(const wchar_t * str, const wchar_t * end);
bool CheckOrphanLangCz(const wchar_t * str, const wchar_t * end);
bool CheckOrphan(const wchar_t * str, const wchar_t * end); bool CheckOrphan(const wchar_t * str, const wchar_t * end);
bool IsWhite(int c); bool IsWhite(int c);
void SkipWhite(); void SkipWhite();
void SkipWhiteLines(); void SkipWhiteLines();
void SkipWhiteWithFirstNewLine(); void SkipWhiteWithFirstNewLine();
void SkipWhiteLines(const wchar_t * & str, const wchar_t * end);
bool IsClosingTagForLastItem(); bool IsClosingTagForLastItem();
virtual bool IsOpeningTagMark(); virtual bool IsOpeningTagMark();
virtual bool IsOpeningCommentaryTagMark(); virtual bool IsOpeningCommentaryTagMark();
@ -165,11 +207,12 @@ protected:
virtual bool IsClosingTagMark(); virtual bool IsClosingTagMark();
virtual bool IsClosingXmlSimpleTagMark(); virtual bool IsClosingXmlSimpleTagMark();
bool SkipCommentaryTagIfExists(); bool SkipCommentaryTagIfExists();
const wchar_t * SkipItemCheckXmlSimple(); void SkipAndCheckClosingTag();
void PopStack(); void PopStack();
bool PushStack(); bool PushStack();
virtual bool IsValidCharForName(int c); virtual bool IsValidCharForName(int c);
virtual bool IsValidCharForAttrName(int c);
void CheckNewLine(); void CheckNewLine();
virtual void CheckExceptions(); virtual void CheckExceptions();
void CheckStackPrintRest(); void CheckStackPrintRest();
@ -178,41 +221,68 @@ protected:
virtual void ReadNormalTextSkipWhite(const wchar_t * & start, const wchar_t * & last_non_white); virtual void ReadNormalTextSkipWhite(const wchar_t * & start, const wchar_t * & last_non_white);
void ReadNormalText(); void ReadNormalText();
bool PrintRest(); bool PrintRest();
void PrintItem(const wchar_t * start, const wchar_t * end); void PrintOpeningItem();
void ReadItemName(); void ReadItemName();
void ReadItemAttrName();
void ReadItemAttrValue(bool has_quote);
bool ReadItemAttr();
bool CheckItemAttr();
void PrinItemAttr();
void ReadItemClosing();
void ReadItemSpecial();
void ReadItemOpening();
bool ReadItem(); bool ReadItem();
virtual void Init(); virtual void Init();
virtual void Deinit(); virtual void Deinit();
void ReadLoop();
void Read(); void Read();
size_t PutNormalTextTrimFillBuffer(const wchar_t * & str, const wchar_t * & end); void CheckChar(wchar_t c);
size_t PutNormalTextFillBuffer(const wchar_t * & str, const wchar_t * & end);
virtual void Put(wchar_t c);
virtual void Put(const wchar_t * str);
virtual void Put(const wchar_t * str, const wchar_t * end);
virtual void Put(const std::wstring & str);
void CheckLineWrap();
bool HasSemiloconAround(const wchar_t * str, const wchar_t * end);
void PutNormalNonWhite(const wchar_t * & str, const wchar_t * end);
void PutNormalWhite(const wchar_t * & str, const wchar_t * end);
virtual void PutNormalText(const wchar_t * str, const wchar_t * end); virtual void PutNormalText(const wchar_t * str, const wchar_t * end);
virtual void PutNormalTextTrim(const wchar_t * str, const wchar_t * end);
void PutLastTagWithClosingTag(); void PutLastTagWithClosingTag();
virtual void PutOpeningTagMark(); virtual void PutOpeningTagMark();
virtual void PutClosingTagMark(); virtual void PutClosingTagMark();
virtual void PutTagName(const wchar_t * name); virtual void PutTagName(const wchar_t * name);
virtual void PutOpeningTag(const wchar_t * start, const wchar_t * end); void PutTagName(const std::wstring & name);
virtual void PutOpeningTag(bool close_tag = true);
virtual void PutClosingTag(const wchar_t * tag); virtual void PutClosingTag(const wchar_t * tag);
size_t PutTabsToBuffer(size_t index, size_t len);
size_t PutNonBreakSpaceToBuffer(size_t index);
void PutTabs(size_t len); void PutTabs(size_t len);
void PutNonBreakingSpace();
void PutNewLine(); void PutNewLine();
void CalcOrphansMaxLen(Orphans & orphans);
const wchar_t * pchar; const wchar_t * pchar;
Item empty; Item empty;
Item * pstack; // stack pointer Item * pstack; // stack pointer
size_t stack_len; // length of the stack size_t stack_len; // length of the stack
wchar_t * buffer; // buffer used when printing wchar_t * buffer; // buffer used when printing
std::wstring * out_string; std::wstring * out_string;
bool last_new_line; bool last_new_line;
size_t break_after; // insert a space into long lines after break_after characters size_t break_after; // insert a space into long words after 'break_after' characters
bool trim_white; // trimming white characters size_t wrap_line; // insert a new line character into long lines
bool trim_white; // trimming white characters
size_t tab_size; size_t tab_size;
Lang lang; // current language for checking orphans
OrphanMode orphan_mode; OrphanMode orphan_mode;
bool safe_mode; // skipping some unsafe tags std::wstring attr_name;
std::wstring attr_value;
std::wstring attr_value_lower;
bool attr_has_value;
std::wstring lang_code_lower;
size_t line_len; //length of the current line (without first spaces which create the html tree)
bool safe_mode; // skipping some unsafe tags
Orphans orphans_temp;
}; };

7
functions/functions.cpp
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2010, Tomasz Sowa * Copyright (c) 2010-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -470,11 +470,12 @@ void Functions::ReadItemUrlSubject(Item & item, Item::Type item_type)
void Functions::ReadItemFilterHtml(Item & item) void Functions::ReadItemFilterHtml(Item & item)
{ {
html_filter.BreakLines(0); html_filter.BreakWord(0);
html_filter.WrapLine(0);
html_filter.TrimWhite(false); html_filter.TrimWhite(false);
html_filter.InsertTabs(0); html_filter.InsertTabs(0);
html_filter.CheckOrphans(HTMLFilter::lang_none);
html_filter.SafeMode(true); html_filter.SafeMode(true);
html_filter.ClearOrphans();
html_filter.Filter(cur->request->PostVar(L"itemcontent"), item.content); html_filter.Filter(cur->request->PostVar(L"itemcontent"), item.content);
} }

3
locale/en
View File

@ -121,6 +121,9 @@ ls_header = Directory listing
mkdir_header = Make directory mkdir_header = Make directory
mkdir_form_legend = Make directory form mkdir_form_legend = Make directory form
html_lang_attr_value = "en"
language_orphans = ()
priv_header = Permissions priv_header = Permissions
priv_form_legend = Permissions priv_form_legend = Permissions
priv_change_in_dir = Change permissions for all items in the following directory priv_change_in_dir = Change permissions for all items in the following directory

15
locale/pl
View File

@ -120,6 +120,21 @@ ls_header = Zawartość katalogu
mkdir_header = Stwórz katalog mkdir_header = Stwórz katalog
mkdir_form_legend = Wypełnij wszystkie pozycje formularza mkdir_form_legend = Wypełnij wszystkie pozycje formularza
html_lang_attr_value = "pl"
# current limitation: winix is not allowed to convert polish capital letters to lower case
# so we need to give both versions (small and capital letters)
language_orphans = ( "(np.", "a", "ale", "bo", "by", "co", "czy", "do", "go", "i", "ich", "ja",
"je", "jej", "jest", "już", "juŻ", "ją", "jĄ", "ku", "li", "mi", "na", "nie",
"np.", "nr", "o", "od", "po", "s.", "są", "sĄ", "ta", "to", "tu", "tą", "tĄ"
"tę", "tĘ", "u", "w", "we", "wy", "z", "za", "ze", "że", "Że", "ów", "Ów" )
# orphans for SK i CZ (winix for those languages are not translated yet)
# ("a", "i", "k", "o", "s", "u", "v", "z")
priv_header = Zmień uprawnienia dostępu priv_header = Zmień uprawnienia dostępu
priv_form_legend = Uprawnienia priv_form_legend = Uprawnienia
priv_change_in_dir = Zmień hurtowo uprawnienia w katalogu priv_change_in_dir = Zmień hurtowo uprawnienia w katalogu

5
notify/Makefile.dep
View File

@ -26,8 +26,8 @@ notify.o: ../notify/notify.h ../core/mounts.h ../core/mount.h
notify.o: ../core/mountparser.h ../core/users.h ../core/groups.h notify.o: ../core/mountparser.h ../core/users.h ../core/groups.h
notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
notify.o: ../core/basethread.h ../core/sessionmanager.h notify.o: ../core/basethread.h ../core/sessionmanager.h
notify.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h notify.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
notify.o: ../core/dirs.h ../core/synchro.h ../core/plugin.h notify.o: ../core/request.h ../core/dirs.h ../core/synchro.h ../core/plugin.h
notify.o: ../core/pluginmsg.h ../core/sessionmanager.h notify.o: ../core/pluginmsg.h ../core/sessionmanager.h
notify.o: ../functions/functions.h ../functions/functionbase.h notify.o: ../functions/functions.h ../functions/functionbase.h
notify.o: ../functions/functionparser.h ../functions/adduser.h notify.o: ../functions/functionparser.h ../functions/adduser.h
@ -42,7 +42,6 @@ notify.o: ../functions/specialdefault.h ../functions/stat.h
notify.o: ../functions/subject.h ../functions/template.h notify.o: ../functions/subject.h ../functions/template.h
notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
notify.o: ../core/htmlfilter.h
notifypool.o: notifypool.h ../templates/locale.h ../core/confparser.h notifypool.o: notifypool.h ../templates/locale.h ../core/confparser.h
notifythread.o: notifythread.h ../core/basethread.h ../core/synchro.h notifythread.o: notifythread.h ../core/basethread.h ../core/synchro.h
notifythread.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h notifythread.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h

25
plugins/groupitem/Makefile.dep
View File

@ -57,21 +57,21 @@ templates.o: ../../templates/patterncacher.h ../../core/item.h
templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../templates/ckeditorgetparser.h
templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h
templates.o: ../../templates/indexpatterns.h ../../templates/localefilter.h templates.o: ../../templates/indexpatterns.h ../../templates/localefilter.h
templates.o: ../../templates/locale.h ../../core/config.h ../../db/db.h templates.o: ../../templates/locale.h ../../core/config.h
templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h templates.o: ../../templates/htmltextstream.h ../../core/cur.h
templates.o: ../../core/system.h ../../core/sessionmanager.h
templates.o: ../../core/htmlfilter.h ../../db/db.h ../../db/dbbase.h
templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/error.h templates.o: ../../core/textstream.h ../../core/error.h
templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
templates.o: ../../core/ugcontainer.h ../../core/log.h templates.o: ../../core/ugcontainer.h ../../core/log.h ../../core/plugin.h
templates.o: ../../templates/htmltextstream.h ../../core/cur.h templates.o: ../../core/pluginmsg.h ../../core/plugindata.h
templates.o: ../../core/system.h ../../core/sessionmanager.h templates.o: ../../core/config.h ../../core/confparser.h
templates.o: ../../core/plugin.h ../../core/pluginmsg.h templates.o: ../../core/htmlfilter.h ../../core/request.h
templates.o: ../../core/plugindata.h ../../core/config.h templates.o: ../../core/requesttypes.h ../../core/error.h
templates.o: ../../core/confparser.h ../../core/htmlfilter.h templates.o: ../../core/textstream.h ../../templates/htmltextstream.h
templates.o: ../../core/request.h ../../core/requesttypes.h templates.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
templates.o: ../../core/error.h ../../core/textstream.h
templates.o: ../../templates/htmltextstream.h ../../core/system.h
templates.o: ../../core/dirs.h ../../core/dircontainer.h
templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../notify/notify.h ../../notify/notifypool.h
templates.o: ../../templates/locale.h ../../core/confparser.h templates.o: ../../templates/locale.h ../../core/confparser.h
templates.o: ../../templates/misc.h ../../notify/notifythread.h templates.o: ../../templates/misc.h ../../notify/notifythread.h
@ -102,4 +102,3 @@ templates.o: ../../functions/subject.h ../../functions/template.h
templates.o: ../../functions/tinymce.h ../../functions/uname.h templates.o: ../../functions/tinymce.h ../../functions/uname.h
templates.o: ../../functions/upload.h ../../functions/uptime.h templates.o: ../../functions/upload.h ../../functions/uptime.h
templates.o: ../../functions/who.h ../../functions/vim.h templates.o: ../../functions/who.h ../../functions/vim.h
templates.o: ../../core/htmlfilter.h

485
templates/Makefile.dep
View File

@ -8,15 +8,15 @@ adduser.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
adduser.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h adduser.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
adduser.o: ../core/textstream.h indexpatterns.h ../core/config.h adduser.o: ../core/textstream.h indexpatterns.h ../core/config.h
adduser.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h adduser.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
adduser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h adduser.o: ../core/request.h ../core/requesttypes.h ../core/error.h
adduser.o: ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h adduser.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
adduser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
adduser.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
adduser.o: ../core/error.h ../core/config.h ../templates/htmltextstream.h
adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h
adduser.o: ../core/rebus.h ../core/system.h ../core/dirs.h adduser.o: ../core/rebus.h ../core/system.h ../core/dirs.h
adduser.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h adduser.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
adduser.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
adduser.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
adduser.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
adduser.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h adduser.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
@ -24,7 +24,8 @@ adduser.o: ../core/cur.h ../core/mounts.h ../core/mount.h
adduser.o: ../core/mountparser.h ../core/users.h ../core/groups.h adduser.o: ../core/mountparser.h ../core/users.h ../core/groups.h
adduser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h adduser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
adduser.o: ../core/basethread.h ../core/sessionmanager.h adduser.o: ../core/basethread.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
adduser.o: ../core/request.h
dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
dir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h dir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@ -33,34 +34,34 @@ dir.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
dir.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h dir.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
dir.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h dir.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
dir.o: indexpatterns.h ../core/config.h ../core/confparser.h dir.o: indexpatterns.h ../core/config.h ../core/confparser.h
dir.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h dir.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
dir.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h dir.o: ../core/requesttypes.h ../core/error.h ../core/log.h ../core/config.h
dir.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
dir.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
dir.o: ../core/requesttypes.h ../core/error.h ../core/config.h
dir.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h dir.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
dir.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h dir.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
dir.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h dir.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
dir.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
dir.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
dir.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
dir.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h dir.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
dir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h dir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
dir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h dir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
dir.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h dir.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
dir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h dir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
dir.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h dir.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
dir.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h dir.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
dir.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
dir.o: ../core/synchro.h ../functions/functionparser.h ../functions/adduser.h dir.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h
dir.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
dir.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h dir.o: ../functions/privchanger.h ../functions/chown.h
dir.o: ../functions/default.h ../functions/download.h ../functions/emacs.h dir.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
dir.o: ../functions/last.h ../functions/login.h ../functions/logout.h dir.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
dir.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h dir.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
dir.o: ../functions/mv.h ../functions/node.h ../functions/priv.h dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
dir.o: ../functions/reload.h ../functions/rm.h ../functions/run.h dir.o: ../functions/node.h ../functions/priv.h ../functions/reload.h
dir.o: ../functions/specialdefault.h ../functions/stat.h dir.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h
dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h dir.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
dir.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h dir.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
doc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h doc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@ -69,22 +70,22 @@ doc.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
doc.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h doc.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
doc.o: indexpatterns.h ../core/config.h ../core/confparser.h doc.o: indexpatterns.h ../core/config.h ../core/confparser.h
doc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h doc.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
doc.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h doc.o: ../core/requesttypes.h ../core/error.h ../core/log.h ../core/config.h
doc.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
doc.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
doc.o: ../core/requesttypes.h ../core/error.h ../core/config.h
doc.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h doc.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
doc.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h doc.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
doc.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h doc.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
doc.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
doc.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
doc.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
doc.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h doc.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
doc.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h doc.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
doc.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h doc.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
doc.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h doc.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
doc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h doc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
doc.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h doc.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
doc.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
doc.o: ../core/misc.h doc.o: ../core/request.h ../core/misc.h
filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -93,15 +94,15 @@ filters.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
filters.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h filters.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
filters.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h filters.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
filters.o: ../core/textstream.h indexpatterns.h ../core/config.h filters.o: ../core/textstream.h indexpatterns.h ../core/config.h
filters.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h filters.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
filters.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h filters.o: ../core/request.h ../core/requesttypes.h ../core/error.h
filters.o: ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h filters.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
filters.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
filters.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
filters.o: ../core/error.h ../core/config.h ../templates/htmltextstream.h
filters.o: ../core/session.h ../core/user.h ../core/plugindata.h filters.o: ../core/session.h ../core/user.h ../core/plugindata.h
filters.o: ../core/rebus.h ../core/system.h ../core/dirs.h filters.o: ../core/rebus.h ../core/system.h ../core/dirs.h
filters.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h filters.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
filters.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
filters.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
filters.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
filters.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h filters.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
filters.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h filters.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
filters.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h filters.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
@ -109,7 +110,8 @@ filters.o: ../core/cur.h ../core/mounts.h ../core/mount.h
filters.o: ../core/mountparser.h ../core/users.h ../core/groups.h filters.o: ../core/mountparser.h ../core/users.h ../core/groups.h
filters.o: ../core/group.h ../core/loadavg.h ../core/thumb.h filters.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
filters.o: ../core/basethread.h ../core/sessionmanager.h filters.o: ../core/basethread.h ../core/sessionmanager.h
filters.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h filters.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
filters.o: ../core/misc.h
htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
htmltextstream.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h htmltextstream.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h
htmltextstream.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h htmltextstream.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
@ -132,14 +134,14 @@ item.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
item.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h item.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
item.o: ../core/textstream.h indexpatterns.h ../core/config.h item.o: ../core/textstream.h indexpatterns.h ../core/config.h
item.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h item.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
item.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
item.o: ../core/request.h ../core/requesttypes.h ../core/error.h item.o: ../core/request.h ../core/requesttypes.h ../core/error.h
item.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h item.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h item.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
item.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h item.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
item.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
item.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
item.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h item.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
item.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h item.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
item.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h item.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@ -147,8 +149,8 @@ item.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
item.o: ../core/mount.h ../core/mountparser.h ../core/users.h item.o: ../core/mount.h ../core/mountparser.h ../core/users.h
item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
item.o: ../core/basethread.h ../core/sessionmanager.h item.o: ../core/basethread.h ../core/sessionmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h item.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
item.o: ../core/misc.h ../core/bbcodeparser.h item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h
last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -157,14 +159,14 @@ last.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
last.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h last.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
last.o: ../core/textstream.h indexpatterns.h ../core/config.h last.o: ../core/textstream.h indexpatterns.h ../core/config.h
last.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h last.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
last.o: ../core/request.h ../core/requesttypes.h ../core/error.h last.o: ../core/request.h ../core/requesttypes.h ../core/error.h
last.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h last.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h last.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
last.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
last.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
last.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
last.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h last.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@ -172,8 +174,8 @@ last.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
last.o: ../core/mount.h ../core/mountparser.h ../core/users.h last.o: ../core/mount.h ../core/mountparser.h ../core/users.h
last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
last.o: ../core/basethread.h ../core/sessionmanager.h last.o: ../core/basethread.h ../core/sessionmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
last.o: ../core/request.h ../core/misc.h last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h
locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h
locale.o: ../../ezc/src/utf8.h locale.o: ../../ezc/src/utf8.h
localefilter.o: localefilter.h locale.h ../core/confparser.h localefilter.o: localefilter.h locale.h ../core/confparser.h
@ -190,21 +192,22 @@ ls.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
ls.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h ls.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
ls.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h ls.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
ls.o: indexpatterns.h ../core/config.h ../core/confparser.h ls.o: indexpatterns.h ../core/config.h ../core/confparser.h
ls.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h ls.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
ls.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h ls.o: ../core/requesttypes.h ../core/error.h ../core/log.h ../core/config.h
ls.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
ls.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
ls.o: ../core/requesttypes.h ../core/error.h ../core/config.h
ls.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h ls.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
ls.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h ls.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
ls.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h ls.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
ls.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
ls.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
ls.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
ls.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h ls.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
ls.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h ls.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
ls.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h ls.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
ls.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h ls.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
ls.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h ls.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
ls.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h ls.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
ls.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h ls.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
ls.o: ../core/request.h
misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
misc.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h misc.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -213,14 +216,14 @@ misc.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
misc.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h misc.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
misc.o: ../core/textstream.h indexpatterns.h ../core/config.h misc.o: ../core/textstream.h indexpatterns.h ../core/config.h
misc.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h misc.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
misc.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
misc.o: ../core/request.h ../core/requesttypes.h ../core/error.h misc.o: ../core/request.h ../core/requesttypes.h ../core/error.h
misc.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h misc.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h misc.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
misc.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h misc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
misc.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h misc.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
misc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h misc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
misc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h misc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@ -228,8 +231,8 @@ misc.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
misc.o: ../core/basethread.h ../core/sessionmanager.h misc.o: ../core/basethread.h ../core/sessionmanager.h
misc.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h misc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
misc.o: ../core/request.h misc.o: ../core/misc.h ../core/request.h
mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -238,22 +241,23 @@ mount.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
mount.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h mount.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
mount.o: ../core/textstream.h indexpatterns.h ../core/config.h mount.o: ../core/textstream.h indexpatterns.h ../core/config.h
mount.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h mount.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
mount.o: ../core/request.h ../core/requesttypes.h ../core/error.h mount.o: ../core/request.h ../core/requesttypes.h ../core/error.h
mount.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h mount.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h mount.o: ../core/session.h ../core/user.h ../core/plugindata.h
mount.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h mount.o: ../core/rebus.h ../core/system.h ../core/dirs.h
mount.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h mount.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
mount.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h mount.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h mount.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
mount.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h mount.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
mount.o: ../core/mount.h ../core/mountparser.h ../core/users.h mount.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h mount.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
mount.o: ../core/basethread.h ../core/sessionmanager.h mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
mount.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h mount.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
mount.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
mount.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
mount.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
mount.o: ../core/misc.h
patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h
patterncacher.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h patterncacher.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h
patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
@ -270,14 +274,14 @@ priv.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
priv.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h priv.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
priv.o: ../core/textstream.h indexpatterns.h ../core/config.h priv.o: ../core/textstream.h indexpatterns.h ../core/config.h
priv.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h priv.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/error.h priv.o: ../core/request.h ../core/requesttypes.h ../core/error.h
priv.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h priv.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h priv.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
priv.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
priv.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
priv.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h priv.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@ -285,21 +289,21 @@ priv.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h
priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
priv.o: ../core/basethread.h ../core/sessionmanager.h priv.o: ../core/basethread.h ../core/sessionmanager.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h priv.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
priv.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h priv.o: ../core/request.h ../core/misc.h ../functions/functions.h
priv.o: ../core/synchro.h ../functions/functionparser.h priv.o: ../functions/functionbase.h ../core/synchro.h
priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h priv.o: ../functions/functionparser.h ../functions/adduser.h
priv.o: ../functions/privchanger.h ../functions/chown.h priv.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
priv.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h priv.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
priv.o: ../functions/download.h ../functions/emacs.h ../functions/last.h priv.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
priv.o: ../functions/login.h ../functions/logout.h ../functions/ln.h priv.o: ../functions/last.h ../functions/login.h ../functions/logout.h
priv.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h priv.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
priv.o: ../functions/node.h ../functions/priv.h ../functions/reload.h priv.o: ../functions/mv.h ../functions/node.h ../functions/priv.h
priv.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h priv.o: ../functions/reload.h ../functions/rm.h ../functions/run.h
priv.o: ../functions/stat.h ../functions/subject.h ../functions/template.h priv.o: ../functions/specialdefault.h ../functions/stat.h
priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h priv.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
priv.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
priv.o: ../core/htmlfilter.h priv.o: ../functions/who.h ../functions/vim.h
rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h
rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -308,22 +312,22 @@ rebus.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
rebus.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h rebus.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
rebus.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h rebus.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
rebus.o: ../core/textstream.h indexpatterns.h ../core/config.h rebus.o: ../core/textstream.h indexpatterns.h ../core/config.h
rebus.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h rebus.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
rebus.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
rebus.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
rebus.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
rebus.o: ../core/request.h ../core/requesttypes.h ../core/error.h rebus.o: ../core/request.h ../core/requesttypes.h ../core/error.h
rebus.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h rebus.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h rebus.o: ../core/session.h ../core/user.h ../core/plugindata.h
rebus.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h rebus.o: ../core/rebus.h ../core/system.h ../core/dirs.h
rebus.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h rebus.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
rebus.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h rebus.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
rebus.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h rebus.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
rebus.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h rebus.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
rebus.o: ../core/mount.h ../core/mountparser.h ../core/users.h rebus.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h rebus.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
rebus.o: ../core/basethread.h ../core/sessionmanager.h rebus.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
rebus.o: ../core/sessioncontainer.h ../core/system.h rebus.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
rebus.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
rebus.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
rebus.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
stat.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h stat.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -332,14 +336,14 @@ stat.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
stat.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h stat.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
stat.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h stat.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
stat.o: ../core/textstream.h indexpatterns.h ../core/config.h stat.o: ../core/textstream.h indexpatterns.h ../core/config.h
stat.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h stat.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
stat.o: ../core/request.h ../core/requesttypes.h ../core/error.h stat.o: ../core/request.h ../core/requesttypes.h ../core/error.h
stat.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h stat.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h stat.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
stat.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
stat.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
stat.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h stat.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@ -347,8 +351,8 @@ stat.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
stat.o: ../core/mount.h ../core/mountparser.h ../core/users.h stat.o: ../core/mount.h ../core/mountparser.h ../core/users.h
stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
stat.o: ../core/basethread.h ../core/sessionmanager.h stat.o: ../core/basethread.h ../core/sessionmanager.h
stat.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h stat.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
stat.o: ../core/misc.h stat.o: ../core/request.h ../core/misc.h
sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@ -357,22 +361,22 @@ sys.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
sys.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h sys.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
sys.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h sys.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
sys.o: indexpatterns.h ../core/config.h ../core/confparser.h sys.o: indexpatterns.h ../core/config.h ../core/confparser.h
sys.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h sys.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
sys.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h sys.o: ../core/requesttypes.h ../core/error.h ../core/log.h ../core/config.h
sys.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
sys.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
sys.o: ../core/requesttypes.h ../core/error.h ../core/config.h
sys.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h sys.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
sys.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h sys.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
sys.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h sys.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
sys.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
sys.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
sys.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
sys.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h sys.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
sys.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h sys.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
sys.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h sys.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
sys.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h sys.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
sys.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h sys.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
sys.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h sys.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h sys.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
sys.o: ../core/version.h sys.o: ../core/request.h ../core/version.h
template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -382,14 +386,14 @@ template.o: ../core/textstream.h ../core/user.h patterncacher.h
template.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h template.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
template.o: ../core/log.h ../core/textstream.h indexpatterns.h template.o: ../core/log.h ../core/textstream.h indexpatterns.h
template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
template.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h template.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
template.o: ../core/error.h ../core/log.h ../db/dbitemquery.h template.o: ../core/error.h ../core/log.h ../core/config.h
template.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
template.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
template.o: ../core/requesttypes.h ../core/error.h ../core/config.h
template.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h template.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
template.o: ../core/plugindata.h ../core/rebus.h ../core/system.h template.o: ../core/plugindata.h ../core/rebus.h ../core/system.h
template.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h template.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h
template.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
template.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
template.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h template.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@ -397,7 +401,8 @@ template.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
template.o: ../core/mount.h ../core/mountparser.h ../core/users.h template.o: ../core/mount.h ../core/mountparser.h ../core/users.h
template.o: ../core/groups.h ../core/group.h ../core/loadavg.h template.o: ../core/groups.h ../core/group.h ../core/loadavg.h
template.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h template.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h template.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
template.o: ../core/misc.h
templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -407,14 +412,14 @@ templates.o: ../core/textstream.h ../core/user.h patterncacher.h
templates.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h templates.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
templates.o: ../core/log.h ../core/textstream.h indexpatterns.h templates.o: ../core/log.h ../core/textstream.h indexpatterns.h
templates.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h templates.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h templates.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
templates.o: ../core/error.h ../core/log.h ../db/dbitemquery.h templates.o: ../core/error.h ../core/log.h ../core/config.h
templates.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
templates.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/error.h ../core/config.h
templates.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h templates.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
templates.o: ../core/plugindata.h ../core/rebus.h ../core/system.h templates.o: ../core/plugindata.h ../core/rebus.h ../core/system.h
templates.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h templates.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h
templates.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
templates.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
templates.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h templates.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
templates.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h templates.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
templates.o: ../notify/templatesnotify.h ../core/users.h templates.o: ../notify/templatesnotify.h ../core/users.h
@ -423,8 +428,8 @@ templates.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
templates.o: ../core/users.h ../core/groups.h ../core/group.h templates.o: ../core/users.h ../core/groups.h ../core/group.h
templates.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h templates.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h
templates.o: ../core/system.h ../core/misc.h ../core/plugin.h templates.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h
templates.o: ../core/pluginmsg.h ../core/sessionmanager.h templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
templates.o: ../functions/functions.h ../functions/functionbase.h templates.o: ../functions/functions.h ../functions/functionbase.h
templates.o: ../core/request.h ../core/synchro.h templates.o: ../core/request.h ../core/synchro.h
templates.o: ../functions/functionparser.h ../functions/adduser.h templates.o: ../functions/functionparser.h ../functions/adduser.h
@ -440,7 +445,7 @@ templates.o: ../functions/specialdefault.h ../functions/stat.h
templates.o: ../functions/subject.h ../functions/template.h templates.o: ../functions/subject.h ../functions/template.h
templates.o: ../functions/tinymce.h ../functions/uname.h templates.o: ../functions/tinymce.h ../functions/uname.h
templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
templates.o: ../functions/vim.h ../core/htmlfilter.h ../templates/templates.h templates.o: ../functions/vim.h ../templates/templates.h
upload.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h upload.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -449,22 +454,24 @@ upload.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
upload.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h upload.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
upload.o: ../core/textstream.h indexpatterns.h ../core/config.h upload.o: ../core/textstream.h indexpatterns.h ../core/config.h
upload.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h upload.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
upload.o: ../core/request.h ../core/requesttypes.h ../core/error.h upload.o: ../core/request.h ../core/requesttypes.h ../core/error.h
upload.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h upload.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
upload.o: ../core/user.h ../core/plugindata.h ../core/rebus.h upload.o: ../core/session.h ../core/user.h ../core/plugindata.h
upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h upload.o: ../core/rebus.h ../core/system.h ../core/dirs.h
upload.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h upload.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
upload.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h upload.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
upload.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h upload.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h upload.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
upload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h upload.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
upload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
upload.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h upload.o: ../core/cur.h ../core/mounts.h ../core/mount.h
upload.o: ../core/mountparser.h ../core/users.h ../core/groups.h
upload.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
upload.o: ../core/basethread.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
upload.o: ../core/request.h
uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
uptime.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h uptime.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -473,22 +480,23 @@ uptime.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
uptime.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h uptime.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
uptime.o: ../core/textstream.h indexpatterns.h ../core/config.h uptime.o: ../core/textstream.h indexpatterns.h ../core/config.h
uptime.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h uptime.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
uptime.o: ../core/request.h ../core/requesttypes.h ../core/error.h uptime.o: ../core/request.h ../core/requesttypes.h ../core/error.h
uptime.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h uptime.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
uptime.o: ../core/user.h ../core/plugindata.h ../core/rebus.h uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h
uptime.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h uptime.o: ../core/rebus.h ../core/system.h ../core/dirs.h
uptime.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h uptime.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
uptime.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h uptime.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
uptime.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h uptime.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h uptime.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
uptime.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h uptime.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
uptime.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
uptime.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
uptime.o: ../core/sessioncontainer.h ../core/system.h uptime.o: ../core/cur.h ../core/mounts.h ../core/mount.h
uptime.o: ../core/mountparser.h ../core/users.h ../core/groups.h
uptime.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
uptime.o: ../core/basethread.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
user.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h user.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
user.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h user.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -497,14 +505,14 @@ user.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
user.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h user.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
user.o: ../core/textstream.h indexpatterns.h ../core/config.h user.o: ../core/textstream.h indexpatterns.h ../core/config.h
user.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h user.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
user.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
user.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
user.o: ../core/request.h ../core/requesttypes.h ../core/error.h user.o: ../core/request.h ../core/requesttypes.h ../core/error.h
user.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h user.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h user.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
user.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h user.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
user.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
user.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
user.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h user.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
user.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h user.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
user.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h user.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@ -512,8 +520,8 @@ user.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
user.o: ../core/mount.h ../core/mountparser.h ../core/users.h user.o: ../core/mount.h ../core/mountparser.h ../core/users.h
user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
user.o: ../core/basethread.h ../core/sessionmanager.h user.o: ../core/basethread.h ../core/sessionmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h user.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
user.o: ../core/misc.h user.o: ../core/request.h ../core/misc.h
who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@ -522,22 +530,22 @@ who.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
who.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h who.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
who.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h who.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
who.o: indexpatterns.h ../core/config.h ../core/confparser.h who.o: indexpatterns.h ../core/config.h ../core/confparser.h
who.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h who.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
who.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h who.o: ../core/requesttypes.h ../core/error.h ../core/log.h ../core/config.h
who.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
who.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
who.o: ../core/requesttypes.h ../core/error.h ../core/config.h
who.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h who.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
who.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h who.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
who.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h who.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
who.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
who.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
who.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
who.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h who.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
who.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h who.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
who.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h who.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
who.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h who.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
who.o: ../core/misc.h who.o: ../core/request.h ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@ -546,34 +554,35 @@ winix.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
winix.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h winix.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
winix.o: ../core/textstream.h indexpatterns.h ../core/config.h winix.o: ../core/textstream.h indexpatterns.h ../core/config.h
winix.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h winix.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
winix.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
winix.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/error.h winix.o: ../core/request.h ../core/requesttypes.h ../core/error.h
winix.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h winix.o: ../core/log.h ../core/config.h ../templates/htmltextstream.h
winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h winix.o: ../core/session.h ../core/user.h ../core/plugindata.h
winix.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h winix.o: ../core/rebus.h ../core/system.h ../core/dirs.h
winix.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h winix.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
winix.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h winix.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
winix.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h winix.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
winix.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h winix.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
winix.o: ../core/mount.h ../core/mountparser.h ../core/users.h winix.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
winix.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h winix.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
winix.o: ../core/basethread.h ../core/sessionmanager.h winix.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
winix.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h winix.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
winix.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h winix.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
winix.o: ../functions/functions.h ../functions/functionbase.h winix.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
winix.o: ../core/synchro.h ../functions/functionparser.h winix.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
winix.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h winix.o: ../core/request.h ../core/plugin.h ../core/pluginmsg.h
winix.o: ../functions/privchanger.h ../functions/chown.h winix.o: ../core/sessionmanager.h ../functions/functions.h
winix.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h winix.o: ../functions/functionbase.h ../core/synchro.h
winix.o: ../functions/download.h ../functions/emacs.h ../functions/last.h winix.o: ../functions/functionparser.h ../functions/adduser.h
winix.o: ../functions/login.h ../functions/logout.h ../functions/ln.h winix.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
winix.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h winix.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
winix.o: ../functions/node.h ../functions/priv.h ../functions/reload.h winix.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
winix.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h winix.o: ../functions/last.h ../functions/login.h ../functions/logout.h
winix.o: ../functions/stat.h ../functions/subject.h ../functions/template.h winix.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
winix.o: ../functions/mv.h ../functions/node.h ../functions/priv.h
winix.o: ../functions/reload.h ../functions/rm.h ../functions/run.h
winix.o: ../functions/specialdefault.h ../functions/stat.h
winix.o: ../functions/subject.h ../functions/template.h
winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
winix.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h winix.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
winix.o: ../core/htmlfilter.h ../templates/templates.h ../core/misc.h winix.o: ../templates/templates.h ../core/misc.h

90
templates/locale.cpp
View File

@ -17,6 +17,7 @@ Locale::Locale()
{ {
locale_files.push_back(L"en"); locale_files.push_back(L"en");
loc_tab.resize(locale_files.size()); loc_tab.resize(locale_files.size());
loc_tab_multi.resize(locale_files.size());
default_lang = 0; default_lang = 0;
current_lang = 0; current_lang = 0;
@ -32,6 +33,7 @@ void Locale::SetLocaleFiles(const std::vector<std::wstring> & files)
locale_files.push_back(L"en"); locale_files.push_back(L"en");
loc_tab.resize(locale_files.size()); loc_tab.resize(locale_files.size());
loc_tab_multi.resize(locale_files.size());
} }
@ -86,6 +88,13 @@ void Locale::AddLocale(size_t lang)
for( ; i != loc_parser.table_single.end() ; ++i) for( ; i != loc_parser.table_single.end() ; ++i)
loc_tab[lang][i->first] = i->second; loc_tab[lang][i->first] = i->second;
// lists
ConfParser::Table::iterator i2 = loc_parser.table.begin();
for( ; i2 != loc_parser.table.end() ; ++i2)
loc_tab_multi[lang][i2->first] = i2->second;
} }
@ -180,6 +189,12 @@ void Locale::Read(const std::wstring & dir, const std::wstring & dir_def)
} }
size_t Locale::Size() const
{
return loc_tab.size();
}
void Locale::SetLang(size_t lang) void Locale::SetLang(size_t lang)
{ {
current_lang = lang; current_lang = lang;
@ -260,6 +275,26 @@ bool Locale::IsKey(const std::wstring & key, size_t lang) const
} }
bool Locale::IsKeyLang(const wchar_t * key, size_t lang)
{
key_str = key;
return IsKeyLang(key_str, lang);
}
bool Locale::IsKeyLang(const std::wstring & key, size_t lang) const
{
if( lang >= loc_tab.size() )
return false;
// looking in the 'lang' language
ConfParser::TableSingle::const_iterator i = loc_tab[lang].find(key);
return i != loc_tab[lang].end();
}
const std::wstring & Locale::Get(const wchar_t * key) const std::wstring & Locale::Get(const wchar_t * key)
{ {
key_str = key; key_str = key;
@ -311,6 +346,61 @@ const std::wstring & Locale::Get(const std::wstring & key, size_t lang) const
} }
bool Locale::IsKeyLangList(const wchar_t * key, size_t lang)
{
key_str = key;
return IsKeyLangList(key_str, lang);
}
bool Locale::IsKeyLangList(const std::wstring & key, size_t lang) const
{
if( lang >= loc_tab_multi.size() )
return false;
// looking in the 'lang' language
ConfParser::Table::const_iterator i = loc_tab_multi[lang].find(key);
return i != loc_tab_multi[lang].end();
}
const std::vector<std::wstring> & Locale::GetList(const std::wstring & key) const
{
return GetList(key, current_lang);
}
const std::vector<std::wstring> & Locale::GetList(const std::wstring & key, size_t lang) const
{
if( lang >= loc_tab_multi.size() )
return empty_list;
// looking in the 'lang' language
ConfParser::Table::const_iterator i = loc_tab_multi[lang].find(key);
if( i != loc_tab_multi[lang].end() )
return i->second;
if( lang == default_lang )
return empty_list;
if( default_lang >= loc_tab_multi.size() )
return empty_list;
// looking in a default language
i = loc_tab_multi[default_lang].find(key);
if( i != loc_tab_multi[default_lang].end() )
return i->second;
// there is no such a key
return empty_list;
}
size_t Locale::FileNameToLang(const std::wstring & str) const size_t Locale::FileNameToLang(const std::wstring & str) const
{ {
for(size_t i=0 ; i<locale_files.size() ; ++i) for(size_t i=0 ; i<locale_files.size() ; ++i)

28
templates/locale.h
View File

@ -40,12 +40,33 @@ public:
bool IsKey(const std::wstring & key) const; bool IsKey(const std::wstring & key) const;
bool IsKey(const std::wstring & key, size_t lang) const; bool IsKey(const std::wstring & key, size_t lang) const;
// checking whether there is a 'key' in the lang language
// (default language is not checked)
bool IsKeyLang(const wchar_t * key, size_t lang);
bool IsKeyLang(const std::wstring & key, size_t lang) const;
// returning specific 'key' // returning specific 'key'
const std::wstring & Get(const wchar_t * key); const std::wstring & Get(const wchar_t * key);
const std::wstring & Get(const wchar_t * key, size_t lang); const std::wstring & Get(const wchar_t * key, size_t lang);
const std::wstring & Get(const std::wstring & key) const; const std::wstring & Get(const std::wstring & key) const;
const std::wstring & Get(const std::wstring & key, size_t lang) const; const std::wstring & Get(const std::wstring & key, size_t lang) const;
/*
lists
*/
// checking whether there is a 'key' in the lang language
// (default language is not checked)
bool IsKeyLangList(const wchar_t * key, size_t lang);
bool IsKeyLangList(const std::wstring & key, size_t lang) const;
const std::vector<std::wstring> & GetList(const std::wstring & key) const;
const std::vector<std::wstring> & GetList(const std::wstring & key, size_t lang) const;
// how many languages we have
size_t Size();
// setting/getting current language // setting/getting current language
// default: 0 // default: 0
void SetLang(size_t lang); void SetLang(size_t lang);
@ -65,7 +86,7 @@ public:
const std::wstring & LangToFileName(size_t lang) const; const std::wstring & LangToFileName(size_t lang) const;
// returning how many locale files (languages) there are // returning how many locale files (languages) there are
size_t Size(); size_t Size() const;
// it sets whether we should parse locale files as utf-8 files // it sets whether we should parse locale files as utf-8 files
// default: false // default: false
@ -93,6 +114,10 @@ private:
// this table has the same size as locale_files (at least one item) // this table has the same size as locale_files (at least one item)
std::vector<ConfParser::TableSingle> loc_tab; std::vector<ConfParser::TableSingle> loc_tab;
// messages vector<via language>
// this table has the same size as locale_files (at least one item)
std::vector<ConfParser::Table> loc_tab_multi;
// these tables are used to change url characters // these tables are used to change url characters
std::wstring subst_original; std::wstring subst_original;
std::wstring subst_changeto; std::wstring subst_changeto;
@ -103,6 +128,7 @@ private:
std::string file_name; std::string file_name;
std::wstring key_str; std::wstring key_str;
const std::wstring empty; // used when returning a non existing key from loc_tab (or in LangToFileName) const std::wstring empty; // used when returning a non existing key from loc_tab (or in LangToFileName)
const std::vector<std::wstring> empty_list; // the same as above
std::string adir1, adir2; std::string adir1, adir2;
size_t default_lang; // index to loc_tab size_t default_lang; // index to loc_tab
size_t current_lang; // index to loc_tab size_t current_lang; // index to loc_tab

31
templates/templates.cpp
View File

@ -25,6 +25,7 @@ PatternCacher pattern_cacher; // patterns for user items (files with an exec
Locale locale; Locale locale;
EzcFun ezc_functions; EzcFun ezc_functions;
LocaleFilter locale_filter; LocaleFilter locale_filter;
HTMLFilter html_filter;
CKEditorGetParser ckeditor_getparser; CKEditorGetParser ckeditor_getparser;
// used by GenerateRunRaw() // used by GenerateRunRaw()
@ -500,6 +501,34 @@ using namespace TemplatesFunctions;
} }
void Templates::SetHtmlFilter()
{
using namespace TemplatesFunctions;
html_filter.TrimWhite(config->html_filter_trim_white);
html_filter.BreakWord(config->html_filter_break_word);
html_filter.WrapLine(config->html_filter_wrap_line);
html_filter.InsertTabs(config->html_filter_tabs);
html_filter.ClearOrphans();
if( config->html_filter_orphans )
{
html_filter.OrphansMode(config->html_filter_orphans_mode);
for(size_t i=0 ; i<locale.Size() ; ++i)
{
if( locale.IsKeyLang(L"html_lang_attr_value", i) &&
locale.IsKeyLangList(L"language_orphans", i) )
{
html_filter.AssignOrphans(locale.Get(L"html_lang_attr_value", i),
locale.GetList(L"language_orphans", i));
}
}
}
}
void Templates::ReadTemplates() void Templates::ReadTemplates()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
@ -513,6 +542,8 @@ using namespace TemplatesFunctions;
ReadFunctionsTemplates(); ReadFunctionsTemplates();
index_patterns.ReloadPatterns(locale, locale_filter, false); index_patterns.ReloadPatterns(locale, locale_filter, false);
SetHtmlFilter();
} }

7
templates/templates.h
View File

@ -18,13 +18,14 @@
#include "ckeditorgetparser.h" #include "ckeditorgetparser.h"
#include "indexpatterns.h" #include "indexpatterns.h"
#include "locale.h" #include "locale.h"
#include "db/db.h"
#include "htmltextstream.h" #include "htmltextstream.h"
#include "localefilter.h"
#include "core/config.h" #include "core/config.h"
#include "core/cur.h" #include "core/cur.h"
#include "core/system.h" #include "core/system.h"
#include "core/sessionmanager.h" #include "core/sessionmanager.h"
#include "localefilter.h" #include "core/htmlfilter.h"
#include "db/db.h"
@ -50,6 +51,7 @@ namespace TemplatesFunctions
extern Locale locale; extern Locale locale;
extern EzcFun ezc_functions; extern EzcFun ezc_functions;
extern LocaleFilter locale_filter; extern LocaleFilter locale_filter;
extern HTMLFilter html_filter;
extern CKEditorGetParser ckeditor_getparser; extern CKEditorGetParser ckeditor_getparser;
extern Db * db; extern Db * db;
@ -397,6 +399,7 @@ private:
void ReadFileFun(size_t index, const wchar_t * file); void ReadFileFun(size_t index, const wchar_t * file);
void ReadFunctionsTemplates(); void ReadFunctionsTemplates();
void SetLocale(); void SetLocale();
void SetHtmlFilter();
void ClearPatterns(TemplatesFunctions::Patterns & patterns, size_t len); void ClearPatterns(TemplatesFunctions::Patterns & patterns, size_t len);
TemplatesFunctions::EzcGen generator; TemplatesFunctions::EzcGen generator;