diff --git a/core/Makefile.dep b/core/Makefile.dep index cc2f4bb..2b1ed9e 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -12,10 +12,10 @@ app.o: mount.h mountparser.h users.h ugcontainer.h lastcontainer.h groups.h app.o: group.h loadavg.h sessionmanager.h sessioncontainer.h notify.h app.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h app.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -app.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -app.o: ../../ezc/src/funinfo.h ../core/mount.h ../core/config.h +app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +app.o: ../../ezc/src/stringconv.h ../core/mount.h ../core/config.h app.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h -app.o: ../core/confparser.h ../templates/htmltextstream.h +app.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h app.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h app.o: ../core/system.h ../core/notify.h ../functions/functionparser.h app.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h @@ -64,8 +64,8 @@ config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h config.o: ../core/htmlfilter.h ../templates/templates.h ../../ezc/src/ezc.h config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -config.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -config.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h +config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +config.o: ../../ezc/src/stringconv.h ../templates/patterncacher.h config.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h config.o: ../core/log.h ../templates/indexpatterns.h config.o: ../templates/localefilter.h ../templates/locale.h @@ -82,12 +82,13 @@ dirs.o: session.h error.h user.h plugindata.h rebus.h config.h confparser.h dirs.o: htmlfilter.h ../templates/htmltextstream.h notify.h dirs.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h dirs.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -dirs.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h -dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h +dirs.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h ../core/mount.h dirs.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h dirs.o: ../templates/locale.h ../core/confparser.h -dirs.o: ../templates/htmltextstream.h system.h mounts.h mount.h mountparser.h -dirs.o: users.h ugcontainer.h lastcontainer.h groups.h group.h loadavg.h +dirs.o: ../templates/htmltextstream.h ../core/log.h system.h mounts.h mount.h +dirs.o: mountparser.h users.h ugcontainer.h lastcontainer.h groups.h group.h +dirs.o: loadavg.h groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h groups.o: item.h ../core/error.h log.h textstream.h ../db/dbitemquery.h @@ -101,8 +102,8 @@ loadavg.o: loadavg.h log.h textstream.h log.o: log.h textstream.h ../../ezc/src/utf8.h misc.o: misc.h item.h log.h textstream.h ../templates/templates.h misc.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -misc.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h -misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +misc.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +misc.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h misc.o: ../templates/patterncacher.h ../core/item.h misc.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h misc.o: ../core/log.h ../templates/indexpatterns.h @@ -150,8 +151,8 @@ mounts.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h mounts.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h mounts.o: ../core/htmlfilter.h ../templates/templates.h ../../ezc/src/ezc.h mounts.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -mounts.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -mounts.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h +mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +mounts.o: ../../ezc/src/stringconv.h ../templates/patterncacher.h mounts.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h mounts.o: ../core/log.h ../templates/indexpatterns.h mounts.o: ../templates/localefilter.h ../templates/locale.h @@ -159,13 +160,13 @@ mounts.o: ../core/confparser.h ../templates/htmltextstream.h mounts.o: ../core/sessionmanager.h notify.o: log.h textstream.h notify.h ../templatesnotify/templatesnotify.h notify.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -notify.o: ../../ezc/src/pattern.h item.h ../../ezc/src/stringconv.h -notify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h +notify.o: ../../ezc/src/pattern.h item.h ../../ezc/src/functions.h +notify.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h ../core/mount.h notify.o: ../core/config.h ../core/textstream.h misc.h ../templates/misc.h notify.o: ../templates/localefilter.h ../templates/locale.h notify.o: ../core/confparser.h ../templates/htmltextstream.h ../core/user.h -notify.o: request.h requesttypes.h session.h error.h user.h plugindata.h -notify.o: rebus.h config.h confparser.h htmlfilter.h +notify.o: ../core/log.h request.h requesttypes.h session.h error.h user.h +notify.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h notify.o: ../templates/htmltextstream.h system.h dirs.h dircontainer.h notify.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h notify.o: ../core/error.h ../db/dbitemquery.h ../core/item.h @@ -200,8 +201,8 @@ plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h plugin.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h plugin.o: ../core/htmlfilter.h ../templates/templates.h ../../ezc/src/ezc.h plugin.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -plugin.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -plugin.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h +plugin.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +plugin.o: ../../ezc/src/stringconv.h ../templates/patterncacher.h plugin.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h plugin.o: ../core/log.h ../templates/indexpatterns.h plugin.o: ../templates/localefilter.h ../templates/locale.h @@ -236,8 +237,8 @@ plugindata.o: ../functions/uname.h ../functions/upload.h plugindata.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h plugindata.o: ../core/htmlfilter.h ../templates/templates.h plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h -plugindata.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h -plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +plugindata.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +plugindata.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h plugindata.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h plugindata.o: ../core/httpsimpleparser.h ../core/log.h plugindata.o: ../templates/indexpatterns.h ../templates/localefilter.h @@ -276,8 +277,8 @@ request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h request.o: ../core/htmlfilter.h ../templates/templates.h ../../ezc/src/ezc.h request.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -request.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -request.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h +request.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +request.o: ../../ezc/src/stringconv.h ../templates/patterncacher.h request.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h request.o: ../core/log.h ../templates/indexpatterns.h request.o: ../templates/localefilter.h ../templates/locale.h @@ -321,8 +322,8 @@ sessionmanager.o: ../functions/uname.h ../functions/upload.h sessionmanager.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h sessionmanager.o: ../core/htmlfilter.h ../templates/templates.h sessionmanager.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h -sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h -sessionmanager.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h sessionmanager.o: ../templates/patterncacher.h sessionmanager.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h sessionmanager.o: ../core/log.h ../templates/indexpatterns.h @@ -350,15 +351,15 @@ system.o: ../templates/htmltextstream.h mounts.h mount.h mountparser.h system.o: users.h ugcontainer.h lastcontainer.h groups.h group.h loadavg.h system.o: notify.h ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h system.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -system.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h -system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h +system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h ../core/mount.h system.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h system.o: ../templates/locale.h ../core/confparser.h -system.o: ../templates/htmltextstream.h ../templates/templates.h -system.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -system.o: ../core/httpsimpleparser.h ../core/log.h -system.o: ../templates/indexpatterns.h ../core/request.h ../core/system.h -system.o: ../core/sessionmanager.h +system.o: ../templates/htmltextstream.h ../core/log.h +system.o: ../templates/templates.h ../templates/patterncacher.h +system.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +system.o: ../core/log.h ../templates/indexpatterns.h ../core/request.h +system.o: ../core/system.h ../core/sessionmanager.h textstream.o: textstream.h misc.h item.h users.o: users.h user.h ugcontainer.h lastcontainer.h request.h users.o: requesttypes.h session.h item.h error.h plugindata.h rebus.h diff --git a/core/app.cpp b/core/app.cpp index 3a559b6..07b0861 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -150,9 +150,10 @@ bool App::Init() // init templates after functions are created + templates.CreateFunctions(); // create functions first (functions will be cached by patterns) templates.ReadIndexFileNames(); templates.ReadTemplates(); - templates.CreateFunctions(); + session_manager.LoadSessions(); plugin.Call(WINIX_PLUGIN_INIT); @@ -213,8 +214,9 @@ void App::ProcessRequestThrow() // and then BaseUrlRedirect() will be called (for performance) if( !BaseUrlRedirect() ) { - session_manager.DeleteOldSessions(); session_manager.SetSession(); // set request.session as well + // !! dac zeby zwracalo wskaznik (zawsze prawidlowy) na sesje + // i tutaj przypisanie do request.session // !! tutaj dodac to ustawianie request.session @@ -227,6 +229,10 @@ void App::ProcessRequestThrow() SendAnswer(); notify.ItemChanged(request.notify_code); + + // it's better to remove sessions at the end of a request + // as it can take a little time + session_manager.DeleteOldSessions(); } @@ -258,6 +264,8 @@ void App::Start() if( was_stop_signal ) break; + // !! tu bedzie lock.WorkStart() + system.load_avg.StartRequest(); log << log2 << config.log_delimiter << logend; @@ -270,6 +278,8 @@ void App::Start() request.Clear(); system.load_avg.StopRequest(); log << logsave; + + // !! tu bedzie lock.WorkStop(); } } @@ -323,6 +333,7 @@ bool sent = false; // zmienic nazwe np na ProcessRequest +// !! ta nazwa chyba juz zajeta... void App::Make() { if( request.dir_tab.empty() ) diff --git a/core/notify.cpp b/core/notify.cpp index a643d8d..1d35108 100755 --- a/core/notify.cpp +++ b/core/notify.cpp @@ -186,6 +186,9 @@ void Notify::ReadTemplates() bool Notify::Init() { templates_notify->CreateFunctions(); + // CreateFunctions() should be called before ReadTemplates() + // because the patterns will cache the functions + ReadTemplates(); int t = pthread_create(&thread, 0, ThreadRoutine, (void*)this); diff --git a/core/sessioncontainer.cpp b/core/sessioncontainer.cpp index 0cad8b7..e3b17b2 100755 --- a/core/sessioncontainer.cpp +++ b/core/sessioncontainer.cpp @@ -119,16 +119,17 @@ return i->second; -void SessionContainer::DelFirstByTimeInterval(time_t interval, bool skip_remember_flag) +size_t SessionContainer::DelFirstByTimeInterval(time_t interval, size_t how_many_max, bool skip_remember_flag) { IndexTime::iterator i = index_time.begin(); IndexTime::iterator iold; time_t limit = std::time(0) - interval; Session * old_session = request->session; +size_t deleted = 0; - while( i != index_time.end() && i->second->last_time < limit ) + while( i != index_time.end() && i->second->last_time < limit && deleted < how_many_max ) { - long id = i->second->id; + //long id = i->second->id; // !! for logs (not used now) iold = i; ++i; // incrementing before deleting old one @@ -147,15 +148,22 @@ Session * old_session = request->session; index_time.erase(iold); table_size -= 1; request->session = 0; + deleted += 1; - log << log3 << "SC: deleted index_time for session id: " << id << logend; - log << log3 << "SC: deleted session, id: " << id << logend; + //log << log3 << "SC: deleted index_time for session id: " << id << logend; + //log << log3 << "SC: deleted session, id: " << id << logend; } request->session = old_session; + +return deleted; } + + + + void SessionContainer::DelFromIdIndex(SessionContainer::Iterator iter) { IndexId::iterator i; @@ -165,7 +173,7 @@ IndexId::iterator i; if( i->second == iter ) { index_id.erase(i); - log << log3 << "SC: deleted index_id for session id: " << iter->id << logend; + //log << log3 << "SC: deleted index_id for session id: " << iter->id << logend; break; } @@ -190,7 +198,8 @@ void SessionContainer::UpdateLastTime(SessionContainer::Iterator iter, time_t ne iter->last_time = new_time; iter->tm_last_time = Time(new_time); - log << log3 << "SC: last time and the time index for session id: " << iter->id << " updated" << logend; + //log << log3 << "SC: last time and the time index for session id: " << iter->id << " updated" << logend; + log << log3 << "SC: last time for session id: " << iter->id << " updated" << logend; found = true; break; } diff --git a/core/sessioncontainer.h b/core/sessioncontainer.h index ff08468..fccb922 100755 --- a/core/sessioncontainer.h +++ b/core/sessioncontainer.h @@ -70,7 +70,7 @@ public: bool PushBack(const Session & session); Iterator FindById(long); - void DelFirstByTimeInterval(time_t interval, bool skip_remember_flag = true); + size_t DelFirstByTimeInterval(time_t interval, size_t how_many_max, bool skip_remember_flag = true); void UpdateLastTime(Iterator iter, time_t new_time); diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp index 90c85c6..cdac39d 100755 --- a/core/sessionmanager.cpp +++ b/core/sessionmanager.cpp @@ -227,16 +227,21 @@ SessionContainer::Iterator SessionManager::SessionEnd() void SessionManager::DeleteOldSessions() { - session_tab.DelFirstByTimeInterval(config->session_max_idle); +size_t deleted; + + deleted = session_tab.DelFirstByTimeInterval(config->session_max_idle, 100); // !! dodac do konfiga if( ++session_checker > 1000 ) { // we make the test after 1000 requests - log << log3 << "SM: checking sessions which have 'remember me' flag set" << logend; + //log << log3 << "SM: checking sessions which have 'remember me' flag set" << logend; session_checker = 0; - session_tab.DelFirstByTimeInterval(config->session_remember_max_idle, false); + deleted += session_tab.DelFirstByTimeInterval(config->session_remember_max_idle, 100, false); } + + if( deleted > 0 ) + log << log3 << "SM: deleted " << deleted << " outdated sessions" << logend; } diff --git a/functions/Makefile.dep b/functions/Makefile.dep index a224e21..2131fc2 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -16,15 +16,15 @@ adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h adduser.o: ../core/notify.h ../templatesnotify/templatesnotify.h adduser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -adduser.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -adduser.o: functionparser.h cat.h chmod.h privchanger.h chown.h ckeditor.h -adduser.o: cp.h createthread.h default.h download.h emacs.h last.h login.h -adduser.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -adduser.o: stat.h subject.h funthread.h template.h tinymce.h uname.h upload.h -adduser.o: uptime.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +adduser.o: ../../ezc/src/pattern.h functions.h functionparser.h cat.h chmod.h +adduser.o: privchanger.h chown.h ckeditor.h cp.h createthread.h default.h +adduser.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h +adduser.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +adduser.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +adduser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h adduser.o: ../templates/misc.h ../templates/localefilter.h adduser.o: ../templates/locale.h ../core/confparser.h -adduser.o: ../templates/htmltextstream.h ../core/system.h +adduser.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h cat.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -41,14 +41,14 @@ cat.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h cat.o: ../core/loadavg.h ../core/notify.h cat.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h cat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -cat.o: ../../ezc/src/stringconv.h functions.h functionparser.h adduser.h -cat.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h default.h -cat.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h -cat.o: priv.h reload.h rm.h run.h stat.h subject.h funthread.h template.h -cat.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +cat.o: functions.h functionparser.h adduser.h chmod.h privchanger.h chown.h +cat.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h +cat.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h +cat.o: stat.h subject.h funthread.h template.h tinymce.h uname.h upload.h +cat.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h cat.o: ../core/mount.h ../templates/misc.h ../templates/localefilter.h cat.o: ../templates/locale.h ../core/confparser.h -cat.o: ../templates/htmltextstream.h ../core/system.h +cat.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h chmod.o: chmod.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h chmod.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -65,14 +65,15 @@ chmod.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h chmod.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h chmod.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h chmod.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -chmod.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -chmod.o: functionparser.h adduser.h cat.h chown.h privchanger.h ckeditor.h -chmod.o: cp.h createthread.h default.h download.h emacs.h last.h login.h -chmod.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -chmod.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -chmod.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +chmod.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +chmod.o: chown.h privchanger.h ckeditor.h cp.h createthread.h default.h +chmod.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h +chmod.o: priv.h reload.h rm.h run.h stat.h subject.h funthread.h template.h +chmod.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +chmod.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h chmod.o: ../templates/localefilter.h ../templates/locale.h -chmod.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +chmod.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +chmod.o: ../core/system.h chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h chown.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -89,14 +90,15 @@ chown.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h chown.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h chown.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h chown.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -chown.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -chown.o: functionparser.h adduser.h cat.h chmod.h privchanger.h ckeditor.h -chown.o: cp.h createthread.h default.h download.h emacs.h last.h login.h -chown.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -chown.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -chown.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +chown.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +chown.o: chmod.h privchanger.h ckeditor.h cp.h createthread.h default.h +chown.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h +chown.o: priv.h reload.h rm.h run.h stat.h subject.h funthread.h template.h +chown.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +chown.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h chown.o: ../templates/localefilter.h ../templates/locale.h -chown.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +chown.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +chown.o: ../core/system.h ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -114,15 +116,15 @@ ckeditor.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h ckeditor.o: ../core/groups.h ../core/group.h ../core/loadavg.h ckeditor.o: ../core/notify.h ../templatesnotify/templatesnotify.h ckeditor.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -ckeditor.o: ../../ezc/src/stringconv.h functions.h functionparser.h adduser.h -ckeditor.o: cat.h chmod.h privchanger.h chown.h cp.h createthread.h default.h -ckeditor.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h -ckeditor.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h -ckeditor.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -ckeditor.o: ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +ckeditor.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +ckeditor.o: cp.h createthread.h default.h download.h emacs.h last.h login.h +ckeditor.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h +ckeditor.o: stat.h subject.h funthread.h template.h tinymce.h uname.h +ckeditor.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +ckeditor.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h ckeditor.o: ../templates/localefilter.h ../templates/locale.h -ckeditor.o: ../core/confparser.h ../templates/htmltextstream.h +ckeditor.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h ckeditor.o: ../core/system.h cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h @@ -139,14 +141,15 @@ cp.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h cp.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h cp.o: ../core/loadavg.h ../core/notify.h ../templatesnotify/templatesnotify.h cp.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -cp.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -cp.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -cp.o: ckeditor.h createthread.h default.h download.h emacs.h last.h login.h -cp.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -cp.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -cp.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +cp.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +cp.o: chmod.h privchanger.h chown.h ckeditor.h createthread.h default.h +cp.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h +cp.o: priv.h reload.h rm.h run.h stat.h subject.h funthread.h template.h +cp.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +cp.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h cp.o: ../templates/localefilter.h ../templates/locale.h ../core/confparser.h -cp.o: ../templates/htmltextstream.h ../core/system.h ../core/misc.h +cp.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h +cp.o: ../core/misc.h createthread.o: createthread.h functionbase.h ../core/item.h ../db/db.h createthread.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h createthread.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -165,16 +168,16 @@ createthread.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h createthread.o: ../core/loadavg.h ../core/notify.h createthread.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h createthread.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -createthread.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h -createthread.o: functions.h functionparser.h adduser.h cat.h chmod.h -createthread.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h -createthread.o: emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h -createthread.o: priv.h reload.h rm.h run.h stat.h subject.h funthread.h -createthread.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -createthread.o: ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -createthread.o: ../templates/localefilter.h ../templates/locale.h -createthread.o: ../core/confparser.h ../templates/htmltextstream.h -createthread.o: ../core/system.h +createthread.o: ../../ezc/src/pattern.h functions.h functionparser.h +createthread.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +createthread.o: default.h download.h emacs.h last.h login.h logout.h ls.h +createthread.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h +createthread.o: subject.h funthread.h template.h tinymce.h uname.h upload.h +createthread.o: uptime.h who.h vim.h ../core/htmlfilter.h +createthread.o: ../../ezc/src/stringconv.h ../core/mount.h +createthread.o: ../templates/misc.h ../templates/localefilter.h +createthread.o: ../templates/locale.h ../core/confparser.h +createthread.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h default.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -191,15 +194,15 @@ default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h default.o: ../core/groups.h ../core/group.h ../core/loadavg.h default.o: ../core/notify.h ../templatesnotify/templatesnotify.h default.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -default.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -default.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -default.o: ckeditor.h cp.h createthread.h download.h emacs.h last.h login.h -default.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -default.o: stat.h subject.h funthread.h template.h tinymce.h uname.h upload.h -default.o: uptime.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +default.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h +default.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +default.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h +default.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +default.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +default.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h default.o: ../templates/misc.h ../templates/localefilter.h default.o: ../templates/locale.h ../core/confparser.h -default.o: ../templates/htmltextstream.h ../core/system.h +default.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h download.o: download.h functionbase.h ../core/item.h ../db/db.h download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h download.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -217,15 +220,15 @@ download.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h download.o: ../core/groups.h ../core/group.h ../core/loadavg.h download.o: ../core/notify.h ../templatesnotify/templatesnotify.h download.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -download.o: ../../ezc/src/stringconv.h functions.h functionparser.h adduser.h -download.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h -download.o: createthread.h default.h emacs.h last.h login.h logout.h ls.h -download.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h subject.h -download.o: funthread.h template.h tinymce.h uname.h upload.h uptime.h who.h -download.o: vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +download.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +download.o: ckeditor.h cp.h createthread.h default.h emacs.h last.h login.h +download.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h +download.o: stat.h subject.h funthread.h template.h tinymce.h uname.h +download.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +download.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h download.o: ../templates/localefilter.h ../templates/locale.h -download.o: ../core/confparser.h ../templates/htmltextstream.h +download.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h download.o: ../core/system.h emacs.o: emacs.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -243,14 +246,15 @@ emacs.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h emacs.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h emacs.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h emacs.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -emacs.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -emacs.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -emacs.o: ckeditor.h cp.h createthread.h default.h download.h last.h login.h -emacs.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -emacs.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -emacs.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -emacs.o: ../templates/localefilter.h ../templates/locale.h -emacs.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +emacs.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +emacs.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +emacs.o: default.h download.h last.h login.h logout.h ls.h mkdir.h mv.h +emacs.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +emacs.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +emacs.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +emacs.o: ../templates/misc.h ../templates/localefilter.h +emacs.o: ../templates/locale.h ../core/confparser.h +emacs.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h emacs.o: ../templates/templates.h ../templates/patterncacher.h emacs.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h emacs.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h @@ -272,17 +276,17 @@ functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h functionbase.o: ../core/groups.h ../core/group.h ../core/loadavg.h functionbase.o: ../core/notify.h ../templatesnotify/templatesnotify.h functionbase.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -functionbase.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -functionbase.o: ../../ezc/src/stringconv.h functions.h functionparser.h -functionbase.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h -functionbase.o: createthread.h default.h download.h emacs.h last.h login.h -functionbase.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -functionbase.o: stat.h subject.h funthread.h template.h tinymce.h uname.h -functionbase.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +functionbase.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +functionbase.o: functionparser.h adduser.h cat.h chmod.h privchanger.h +functionbase.o: chown.h ckeditor.h cp.h createthread.h default.h download.h +functionbase.o: emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h +functionbase.o: priv.h reload.h rm.h run.h stat.h subject.h funthread.h +functionbase.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +functionbase.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h functionbase.o: ../core/mount.h ../templates/misc.h functionbase.o: ../templates/localefilter.h ../templates/locale.h functionbase.o: ../core/confparser.h ../templates/htmltextstream.h -functionbase.o: ../core/system.h +functionbase.o: ../core/log.h ../core/system.h functionparser.o: functionparser.h ../core/request.h ../core/requesttypes.h functionparser.o: ../core/session.h ../core/item.h ../core/error.h functionparser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h @@ -331,14 +335,14 @@ functions.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h functions.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h functions.o: ../templates/localefilter.h ../templates/locale.h -functions.o: ../core/confparser.h ../templates/htmltextstream.h +functions.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h functions.o: ../core/system.h functionparser.h adduser.h cat.h chmod.h functions.o: privchanger.h chown.h ckeditor.h cp.h createthread.h default.h functions.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h functions.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h functions.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -functions.o: ../core/htmlfilter.h ../core/log.h ../core/misc.h -functions.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h +functions.o: ../core/htmlfilter.h ../core/misc.h ../core/plugin.h +functions.o: ../core/pluginmsg.h ../core/sessionmanager.h functions.o: ../core/sessioncontainer.h ../functions/functions.h functions.o: ../templates/templates.h ../templates/patterncacher.h functions.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h @@ -361,16 +365,16 @@ funthread.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h funthread.o: ../core/groups.h ../core/group.h ../core/loadavg.h funthread.o: ../core/notify.h ../templatesnotify/templatesnotify.h funthread.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -funthread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -funthread.o: ../../ezc/src/stringconv.h functions.h functionparser.h -funthread.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h -funthread.o: createthread.h default.h download.h emacs.h last.h login.h -funthread.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -funthread.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -funthread.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h -funthread.o: ../templates/misc.h ../templates/localefilter.h -funthread.o: ../templates/locale.h ../core/confparser.h -funthread.o: ../templates/htmltextstream.h ../core/system.h +funthread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +funthread.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +funthread.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h +funthread.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h +funthread.o: rm.h run.h stat.h subject.h template.h tinymce.h uname.h +funthread.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +funthread.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h +funthread.o: ../templates/localefilter.h ../templates/locale.h +funthread.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +funthread.o: ../core/system.h last.o: last.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h last.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -387,14 +391,15 @@ last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h last.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h last.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -last.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -last.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -last.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h login.h -last.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -last.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -last.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -last.o: ../templates/localefilter.h ../templates/locale.h -last.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +last.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +last.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +last.o: default.h download.h emacs.h login.h logout.h ls.h mkdir.h mv.h +last.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +last.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +last.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +last.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h +last.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +last.o: ../core/system.h login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h login.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -411,14 +416,15 @@ login.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h login.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h login.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -login.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -login.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -login.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -login.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -login.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -login.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -login.o: ../templates/localefilter.h ../templates/locale.h -login.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +login.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +login.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +login.o: default.h download.h emacs.h last.h logout.h ls.h mkdir.h mv.h +login.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +login.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +login.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +login.o: ../templates/misc.h ../templates/localefilter.h +login.o: ../templates/locale.h ../core/confparser.h +login.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h logout.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -435,15 +441,15 @@ logout.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h logout.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h logout.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h logout.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -logout.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -logout.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -logout.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -logout.o: login.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -logout.o: subject.h funthread.h template.h tinymce.h uname.h upload.h -logout.o: uptime.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +logout.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h +logout.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +logout.o: default.h download.h emacs.h last.h login.h ls.h mkdir.h mv.h +logout.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +logout.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +logout.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h logout.o: ../templates/misc.h ../templates/localefilter.h logout.o: ../templates/locale.h ../core/confparser.h -logout.o: ../templates/htmltextstream.h ../core/system.h +logout.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ls.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h @@ -459,14 +465,14 @@ ls.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h ls.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h ls.o: ../core/loadavg.h ../core/notify.h ../templatesnotify/templatesnotify.h ls.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -ls.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -ls.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -ls.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -ls.o: login.h logout.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h -ls.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -ls.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +ls.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +ls.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h default.h +ls.o: download.h emacs.h last.h login.h logout.h mkdir.h mv.h node.h priv.h +ls.o: reload.h rm.h run.h stat.h subject.h funthread.h template.h tinymce.h +ls.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +ls.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h ls.o: ../templates/localefilter.h ../templates/locale.h ../core/confparser.h -ls.o: ../templates/htmltextstream.h ../core/system.h +ls.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h mkdir.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -483,14 +489,15 @@ mkdir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h mkdir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h mkdir.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h mkdir.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -mkdir.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -mkdir.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -mkdir.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -mkdir.o: login.h logout.h ls.h mv.h node.h priv.h reload.h rm.h run.h stat.h -mkdir.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -mkdir.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -mkdir.o: ../templates/localefilter.h ../templates/locale.h -mkdir.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +mkdir.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +mkdir.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +mkdir.o: default.h download.h emacs.h last.h login.h logout.h ls.h mv.h +mkdir.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +mkdir.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +mkdir.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +mkdir.o: ../templates/misc.h ../templates/localefilter.h +mkdir.o: ../templates/locale.h ../core/confparser.h +mkdir.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h mv.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h @@ -506,14 +513,14 @@ mv.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h mv.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h mv.o: ../core/loadavg.h ../core/notify.h ../templatesnotify/templatesnotify.h mv.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -mv.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -mv.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -mv.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -mv.o: login.h logout.h ls.h mkdir.h node.h priv.h reload.h rm.h run.h stat.h -mv.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -mv.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +mv.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +mv.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h default.h +mv.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h node.h priv.h +mv.o: reload.h rm.h run.h stat.h subject.h funthread.h template.h tinymce.h +mv.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +mv.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h mv.o: ../templates/localefilter.h ../templates/locale.h ../core/confparser.h -mv.o: ../templates/htmltextstream.h ../core/system.h +mv.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h node.o: node.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h node.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -530,14 +537,15 @@ node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h node.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h node.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h node.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -node.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -node.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -node.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -node.o: login.h logout.h ls.h mkdir.h mv.h priv.h reload.h rm.h run.h stat.h -node.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -node.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -node.o: ../templates/localefilter.h ../templates/locale.h -node.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +node.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +node.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +node.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +node.o: mv.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +node.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +node.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +node.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h +node.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +node.o: ../core/system.h priv.o: priv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h priv.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -554,14 +562,15 @@ priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h priv.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h priv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -priv.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -priv.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -priv.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -priv.o: login.h logout.h ls.h mkdir.h mv.h node.h reload.h rm.h run.h stat.h -priv.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -priv.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -priv.o: ../templates/localefilter.h ../templates/locale.h -priv.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +priv.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +priv.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +priv.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +priv.o: mv.h node.h reload.h rm.h run.h stat.h subject.h funthread.h +priv.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +priv.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +priv.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h +priv.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +priv.o: ../core/system.h privchanger.o: privchanger.h ../core/request.h ../core/requesttypes.h privchanger.o: ../core/session.h ../core/item.h ../core/error.h privchanger.o: ../core/user.h ../core/plugindata.h ../core/rebus.h @@ -593,15 +602,15 @@ reload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h reload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h reload.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h reload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -reload.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -reload.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -reload.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -reload.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h rm.h run.h stat.h -reload.o: subject.h funthread.h template.h tinymce.h uname.h upload.h -reload.o: uptime.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +reload.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h +reload.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +reload.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +reload.o: mv.h node.h priv.h rm.h run.h stat.h subject.h funthread.h +reload.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +reload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h reload.o: ../templates/misc.h ../templates/localefilter.h reload.o: ../templates/locale.h ../core/confparser.h -reload.o: ../templates/htmltextstream.h ../core/system.h +reload.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h reload.o: ../templates/templates.h ../templates/patterncacher.h reload.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h reload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h @@ -621,19 +630,20 @@ rm.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h rm.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h rm.o: ../core/loadavg.h ../core/notify.h ../templatesnotify/templatesnotify.h rm.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -rm.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -rm.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -rm.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -rm.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h run.h stat.h -rm.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -rm.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +rm.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +rm.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h default.h +rm.o: download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h +rm.o: priv.h reload.h run.h stat.h subject.h funthread.h template.h tinymce.h +rm.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +rm.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h rm.o: ../templates/localefilter.h ../templates/locale.h ../core/confparser.h -rm.o: ../templates/htmltextstream.h ../core/system.h ../core/plugin.h -rm.o: ../core/pluginmsg.h ../core/sessionmanager.h ../core/sessioncontainer.h -rm.o: ../functions/functions.h ../templates/templates.h -rm.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -rm.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -rm.o: ../core/sessionmanager.h ../core/misc.h +rm.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h +rm.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h +rm.o: ../core/sessioncontainer.h ../functions/functions.h +rm.o: ../templates/templates.h ../templates/patterncacher.h +rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +rm.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +rm.o: ../core/misc.h run.o: run.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h run.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h run.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -650,14 +660,14 @@ run.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h run.o: ../core/loadavg.h ../core/notify.h run.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h run.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -run.o: ../../ezc/src/stringconv.h functions.h functionparser.h adduser.h -run.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h -run.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h -run.o: node.h priv.h reload.h rm.h stat.h subject.h funthread.h template.h -run.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +run.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h +run.o: chown.h ckeditor.h cp.h createthread.h default.h download.h emacs.h +run.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h +run.o: stat.h subject.h funthread.h template.h tinymce.h uname.h upload.h +run.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h run.o: ../core/mount.h ../templates/misc.h ../templates/localefilter.h run.o: ../templates/locale.h ../core/confparser.h -run.o: ../templates/htmltextstream.h ../core/system.h +run.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h stat.o: stat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h stat.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -674,14 +684,15 @@ stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h stat.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h stat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -stat.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -stat.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -stat.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -stat.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -stat.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h -stat.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -stat.o: ../templates/localefilter.h ../templates/locale.h -stat.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +stat.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +stat.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +stat.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +stat.o: mv.h node.h priv.h reload.h rm.h run.h subject.h funthread.h +stat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +stat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +stat.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h +stat.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +stat.o: ../core/system.h subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h subject.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -698,15 +709,15 @@ subject.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h subject.o: ../core/notify.h ../templatesnotify/templatesnotify.h subject.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -subject.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -subject.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -subject.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -subject.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h -subject.o: run.h stat.h funthread.h template.h tinymce.h uname.h upload.h -subject.o: uptime.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +subject.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h +subject.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +subject.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +subject.o: mv.h node.h priv.h reload.h rm.h run.h stat.h funthread.h +subject.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +subject.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h subject.o: ../templates/misc.h ../templates/localefilter.h subject.o: ../templates/locale.h ../core/confparser.h -subject.o: ../templates/htmltextstream.h ../core/system.h +subject.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h template.o: template.h functionbase.h ../core/item.h ../db/db.h template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h template.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -724,16 +735,16 @@ template.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h template.o: ../core/groups.h ../core/group.h ../core/loadavg.h template.o: ../core/notify.h ../templatesnotify/templatesnotify.h template.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -template.o: ../../ezc/src/stringconv.h functions.h functionparser.h adduser.h -template.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h -template.o: createthread.h default.h download.h emacs.h last.h login.h -template.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -template.o: stat.h subject.h funthread.h tinymce.h uname.h upload.h uptime.h -template.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h -template.o: ../templates/misc.h ../templates/localefilter.h -template.o: ../templates/locale.h ../core/confparser.h -template.o: ../templates/htmltextstream.h ../core/system.h ../core/misc.h +template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +template.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +template.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h +template.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h +template.o: rm.h run.h stat.h subject.h funthread.h tinymce.h uname.h +template.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +template.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h +template.o: ../templates/localefilter.h ../templates/locale.h +template.o: ../core/confparser.h ../templates/htmltextstream.h ../core/log.h +template.o: ../core/system.h ../core/misc.h tinymce.o: tinymce.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h tinymce.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -750,15 +761,15 @@ tinymce.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h tinymce.o: ../core/notify.h ../templatesnotify/templatesnotify.h tinymce.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -tinymce.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -tinymce.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -tinymce.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -tinymce.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h -tinymce.o: run.h stat.h subject.h funthread.h template.h uname.h upload.h -tinymce.o: uptime.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +tinymce.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h +tinymce.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +tinymce.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +tinymce.o: mv.h node.h priv.h reload.h rm.h run.h stat.h subject.h +tinymce.o: funthread.h template.h uname.h upload.h uptime.h who.h vim.h +tinymce.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h tinymce.o: ../templates/misc.h ../templates/localefilter.h tinymce.o: ../templates/locale.h ../core/confparser.h -tinymce.o: ../templates/htmltextstream.h ../core/system.h +tinymce.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h uname.o: uname.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uname.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -775,14 +786,15 @@ uname.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h uname.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h uname.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h uname.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -uname.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -uname.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -uname.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -uname.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -uname.o: stat.h subject.h funthread.h template.h tinymce.h upload.h uptime.h -uname.o: who.h vim.h ../core/htmlfilter.h ../core/mount.h ../templates/misc.h -uname.o: ../templates/localefilter.h ../templates/locale.h -uname.o: ../core/confparser.h ../templates/htmltextstream.h ../core/system.h +uname.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h +uname.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +uname.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +uname.o: mv.h node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +uname.o: template.h tinymce.h upload.h uptime.h who.h vim.h +uname.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h +uname.o: ../templates/misc.h ../templates/localefilter.h +uname.o: ../templates/locale.h ../core/confparser.h +uname.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h upload.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -799,16 +811,16 @@ upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h upload.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h upload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -upload.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -upload.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -upload.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -upload.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h -upload.o: run.h stat.h subject.h funthread.h template.h tinymce.h uname.h -upload.o: uptime.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +upload.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h +upload.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +upload.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +upload.o: mv.h node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +upload.o: template.h tinymce.h uname.h uptime.h who.h vim.h +upload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h upload.o: ../templates/misc.h ../templates/localefilter.h upload.o: ../templates/locale.h ../core/confparser.h -upload.o: ../templates/htmltextstream.h ../core/system.h ../core/misc.h -upload.o: ../functions/functions.h +upload.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h +upload.o: ../core/misc.h ../functions/functions.h uptime.o: uptime.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uptime.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -825,15 +837,15 @@ uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/notify.h uptime.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h uptime.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -uptime.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h functions.h -uptime.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -uptime.o: ckeditor.h cp.h createthread.h default.h download.h emacs.h last.h -uptime.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h -uptime.o: run.h stat.h subject.h funthread.h template.h tinymce.h uname.h -uptime.o: upload.h who.h vim.h ../core/htmlfilter.h ../core/mount.h +uptime.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h +uptime.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h +uptime.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h +uptime.o: mv.h node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h +uptime.o: template.h tinymce.h uname.h upload.h who.h vim.h +uptime.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ../core/mount.h uptime.o: ../templates/misc.h ../templates/localefilter.h uptime.o: ../templates/locale.h ../core/confparser.h -uptime.o: ../templates/htmltextstream.h ../core/system.h +uptime.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h vim.o: vim.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h vim.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h vim.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -850,14 +862,14 @@ vim.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h vim.o: ../core/loadavg.h ../core/notify.h vim.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h vim.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -vim.o: ../../ezc/src/stringconv.h functions.h functionparser.h adduser.h -vim.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h -vim.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h -vim.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h -vim.o: template.h tinymce.h uname.h upload.h uptime.h who.h -vim.o: ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +vim.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h +vim.o: chown.h ckeditor.h cp.h createthread.h default.h download.h emacs.h +vim.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h +vim.o: run.h stat.h subject.h funthread.h template.h tinymce.h uname.h +vim.o: upload.h uptime.h who.h ../core/htmlfilter.h +vim.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h vim.o: ../templates/localefilter.h ../templates/locale.h ../core/confparser.h -vim.o: ../templates/htmltextstream.h ../core/system.h +vim.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h who.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h @@ -874,11 +886,11 @@ who.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h who.o: ../core/loadavg.h ../core/notify.h who.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h who.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -who.o: ../../ezc/src/stringconv.h functions.h functionparser.h adduser.h -who.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h -who.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h -who.o: node.h priv.h reload.h rm.h run.h stat.h subject.h funthread.h -who.o: template.h tinymce.h uname.h upload.h uptime.h vim.h -who.o: ../core/htmlfilter.h ../core/mount.h ../templates/misc.h +who.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h +who.o: chown.h ckeditor.h cp.h createthread.h default.h download.h emacs.h +who.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h +who.o: run.h stat.h subject.h funthread.h template.h tinymce.h uname.h +who.o: upload.h uptime.h vim.h ../core/htmlfilter.h +who.o: ../../ezc/src/stringconv.h ../core/mount.h ../templates/misc.h who.o: ../templates/localefilter.h ../templates/locale.h ../core/confparser.h -who.o: ../templates/htmltextstream.h ../core/system.h +who.o: ../templates/htmltextstream.h ../core/log.h ../core/system.h diff --git a/html/fun_tinymce.html b/html/fun_tinymce.html index 6c6d18c..4cfaec8 100755 --- a/html/fun_tinymce.html +++ b/html/fun_tinymce.html @@ -28,7 +28,7 @@ [if mount_type_is "thread"]

{form_emacs_content_thread}

[end] [if mount_type_is "ticket"]

{form_emacs_content_ticket}

[end] - + diff --git a/main/Makefile.dep b/main/Makefile.dep index 240bd34..a9df2ab 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -16,8 +16,8 @@ main.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h main.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h main.o: ../core/notify.h ../templatesnotify/templatesnotify.h main.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -main.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h -main.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h +main.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +main.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h ../core/mount.h main.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h main.o: ../templates/locale.h ../core/confparser.h main.o: ../templates/htmltextstream.h ../functions/functions.h diff --git a/main/main.cpp b/main/main.cpp index 7a413c8..0055d98 100755 --- a/main/main.cpp +++ b/main/main.cpp @@ -125,7 +125,6 @@ int main(int argv, char ** argc) return 1; - app.notify.ReadTemplates(); // wrzucic do notify.Init() ? diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index b5f7678..76ca16f 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -23,29 +23,30 @@ init.o: ../../functions/functionbase.h ../../core/system.h init.o: ../../core/notify.h ../../templatesnotify/templatesnotify.h init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -init.o: ../../../ezc/src/stringconv.h ../../../ezc/src/functions.h -init.o: ../../../ezc/src/funinfo.h ../../core/mount.h ../../templates/misc.h -init.o: ../../templates/localefilter.h ../../templates/locale.h -init.o: ../../core/confparser.h ../../templates/htmltextstream.h -init.o: ../../functions/functionparser.h ../../functions/adduser.h -init.o: ../../functions/cat.h ../../functions/chmod.h -init.o: ../../functions/privchanger.h ../../functions/chown.h -init.o: ../../functions/ckeditor.h ../../functions/cp.h -init.o: ../../functions/createthread.h ../../functions/default.h -init.o: ../../functions/download.h ../../functions/emacs.h -init.o: ../../functions/last.h ../../functions/login.h -init.o: ../../functions/logout.h ../../functions/ls.h ../../functions/mkdir.h -init.o: ../../functions/mv.h ../../functions/node.h ../../functions/priv.h -init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/run.h -init.o: ../../functions/stat.h ../../functions/subject.h -init.o: ../../functions/funthread.h ../../functions/template.h -init.o: ../../functions/tinymce.h ../../functions/uname.h -init.o: ../../functions/upload.h ../../functions/uptime.h -init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h -init.o: ../../templates/templates.h ../../templates/patterncacher.h -init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h -init.o: ../../core/log.h ../../templates/indexpatterns.h -init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h +init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +init.o: ../../../ezc/src/stringconv.h ../../core/mount.h +init.o: ../../templates/misc.h ../../templates/localefilter.h +init.o: ../../templates/locale.h ../../core/confparser.h +init.o: ../../templates/htmltextstream.h ../../functions/functionparser.h +init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../functions/chmod.h ../../functions/privchanger.h +init.o: ../../functions/chown.h ../../functions/ckeditor.h +init.o: ../../functions/cp.h ../../functions/createthread.h +init.o: ../../functions/default.h ../../functions/download.h +init.o: ../../functions/emacs.h ../../functions/last.h +init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ls.h +init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h +init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h +init.o: ../../functions/run.h ../../functions/stat.h +init.o: ../../functions/subject.h ../../functions/funthread.h +init.o: ../../functions/template.h ../../functions/tinymce.h +init.o: ../../functions/uname.h ../../functions/upload.h +init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h +init.o: ../../core/htmlfilter.h ../../templates/templates.h +init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h +init.o: ../../core/httpsimpleparser.h ../../core/log.h +init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h +init.o: statssession.h ../../core/plugindata.h stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h stats.o: ../../core/misc.h ../../core/item.h ../../../ezc/src/utf8.h templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h @@ -71,29 +72,30 @@ templates.o: ../../core/misc.h ../../templates/htmltextstream.h templates.o: ../../core/config.h ../../core/system.h ../../core/notify.h templates.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h -templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h -templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h templates.o: ../../core/mount.h ../../templates/misc.h templates.o: ../../templates/localefilter.h ../../templates/locale.h templates.o: ../../core/confparser.h ../../templates/htmltextstream.h -templates.o: ../../functions/functionparser.h ../../functions/adduser.h -templates.o: ../../functions/cat.h ../../functions/chmod.h -templates.o: ../../functions/privchanger.h ../../functions/chown.h -templates.o: ../../functions/ckeditor.h ../../functions/cp.h -templates.o: ../../functions/createthread.h ../../functions/default.h -templates.o: ../../functions/download.h ../../functions/emacs.h -templates.o: ../../functions/last.h ../../functions/login.h -templates.o: ../../functions/logout.h ../../functions/ls.h -templates.o: ../../functions/mkdir.h ../../functions/mv.h -templates.o: ../../functions/node.h ../../functions/priv.h -templates.o: ../../functions/reload.h ../../functions/rm.h -templates.o: ../../functions/run.h ../../functions/stat.h -templates.o: ../../functions/subject.h ../../functions/funthread.h -templates.o: ../../functions/template.h ../../functions/tinymce.h -templates.o: ../../functions/uname.h ../../functions/upload.h -templates.o: ../../functions/uptime.h ../../functions/who.h -templates.o: ../../functions/vim.h ../../core/htmlfilter.h -templates.o: ../../templates/templates.h ../../templates/patterncacher.h +templates.o: ../../core/log.h ../../functions/functionparser.h +templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../functions/chmod.h ../../functions/privchanger.h +templates.o: ../../functions/chown.h ../../functions/ckeditor.h +templates.o: ../../functions/cp.h ../../functions/createthread.h +templates.o: ../../functions/default.h ../../functions/download.h +templates.o: ../../functions/emacs.h ../../functions/last.h +templates.o: ../../functions/login.h ../../functions/logout.h +templates.o: ../../functions/ls.h ../../functions/mkdir.h +templates.o: ../../functions/mv.h ../../functions/node.h +templates.o: ../../functions/priv.h ../../functions/reload.h +templates.o: ../../functions/rm.h ../../functions/run.h +templates.o: ../../functions/stat.h ../../functions/subject.h +templates.o: ../../functions/funthread.h ../../functions/template.h +templates.o: ../../functions/tinymce.h ../../functions/uname.h +templates.o: ../../functions/upload.h ../../functions/uptime.h +templates.o: ../../functions/who.h ../../functions/vim.h +templates.o: ../../core/htmlfilter.h ../../templates/templates.h +templates.o: ../../templates/patterncacher.h templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/plugins/stats/init.cpp b/plugins/stats/init.cpp index 289e52b..33f339f 100755 --- a/plugins/stats/init.cpp +++ b/plugins/stats/init.cpp @@ -145,7 +145,9 @@ void RemoveSession(PluginInfo & info) return; } - StatsSession * d = reinterpret_cast(info.plugin_data_base); + + /* + //StatsSession * d = reinterpret_cast(info.plugin_data_base); if( !d->nostat ) { @@ -153,6 +155,7 @@ void RemoveSession(PluginInfo & info) << ", plugin id: " << info.plugin_id << ", pointer: " << info.plugin_data_base << logend; } + */ delete info.plugin_data_base; } diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index 5e181b2..febaf2a 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -23,12 +23,12 @@ createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h createticket.o: ../../core/notify.h ../../templatesnotify/templatesnotify.h createticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h createticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -createticket.o: ../../../ezc/src/stringconv.h ../../../ezc/src/functions.h -createticket.o: ../../../ezc/src/funinfo.h ../../core/mount.h +createticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +createticket.o: ../../../ezc/src/stringconv.h ../../core/mount.h createticket.o: ../../templates/misc.h ../../templates/localefilter.h createticket.o: ../../templates/locale.h ../../core/confparser.h -createticket.o: ../../templates/htmltextstream.h ../../core/system.h -createticket.o: ticketinfo.h ticketparser.h ticketconf.h +createticket.o: ../../templates/htmltextstream.h ../../core/log.h +createticket.o: ../../core/system.h ticketinfo.h ticketparser.h ticketconf.h createticket.o: ../../functions/functions.h ../../functions/functionbase.h createticket.o: ../../functions/functionparser.h ../../functions/adduser.h createticket.o: ../../functions/cat.h ../../functions/chmod.h @@ -69,30 +69,30 @@ editticket.o: ../../core/plugindata.h ../../templates/htmltextstream.h editticket.o: ../../core/config.h ../../core/notify.h editticket.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h editticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h -editticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h -editticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +editticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +editticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h editticket.o: ../../core/mount.h ../../templates/misc.h editticket.o: ../../templates/localefilter.h ../../templates/locale.h editticket.o: ../../core/confparser.h ../../templates/htmltextstream.h -editticket.o: ../../core/system.h ../../functions/functions.h -editticket.o: ../../functions/functionbase.h ../../functions/functionparser.h -editticket.o: ../../functions/adduser.h ../../functions/cat.h -editticket.o: ../../functions/chmod.h ../../functions/privchanger.h -editticket.o: ../../functions/chown.h ../../functions/ckeditor.h -editticket.o: ../../functions/cp.h ../../functions/createthread.h -editticket.o: ../../functions/default.h ../../functions/download.h -editticket.o: ../../functions/emacs.h ../../functions/last.h -editticket.o: ../../functions/login.h ../../functions/logout.h -editticket.o: ../../functions/ls.h ../../functions/mkdir.h -editticket.o: ../../functions/mv.h ../../functions/node.h -editticket.o: ../../functions/priv.h ../../functions/reload.h -editticket.o: ../../functions/rm.h ../../functions/run.h -editticket.o: ../../functions/stat.h ../../functions/subject.h -editticket.o: ../../functions/funthread.h ../../functions/template.h -editticket.o: ../../functions/tinymce.h ../../functions/uname.h -editticket.o: ../../functions/upload.h ../../functions/uptime.h -editticket.o: ../../functions/who.h ../../functions/vim.h -editticket.o: ../../core/htmlfilter.h +editticket.o: ../../core/log.h ../../core/system.h +editticket.o: ../../functions/functions.h ../../functions/functionbase.h +editticket.o: ../../functions/functionparser.h ../../functions/adduser.h +editticket.o: ../../functions/cat.h ../../functions/chmod.h +editticket.o: ../../functions/privchanger.h ../../functions/chown.h +editticket.o: ../../functions/ckeditor.h ../../functions/cp.h +editticket.o: ../../functions/createthread.h ../../functions/default.h +editticket.o: ../../functions/download.h ../../functions/emacs.h +editticket.o: ../../functions/last.h ../../functions/login.h +editticket.o: ../../functions/logout.h ../../functions/ls.h +editticket.o: ../../functions/mkdir.h ../../functions/mv.h +editticket.o: ../../functions/node.h ../../functions/priv.h +editticket.o: ../../functions/reload.h ../../functions/rm.h +editticket.o: ../../functions/run.h ../../functions/stat.h +editticket.o: ../../functions/subject.h ../../functions/funthread.h +editticket.o: ../../functions/template.h ../../functions/tinymce.h +editticket.o: ../../functions/uname.h ../../functions/upload.h +editticket.o: ../../functions/uptime.h ../../functions/who.h +editticket.o: ../../functions/vim.h ../../core/htmlfilter.h funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h funticket.o: ../../db/dbtextstream.h ../../core/textstream.h funticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h @@ -115,12 +115,12 @@ funticket.o: ../../core/plugindata.h ../../templates/htmltextstream.h funticket.o: ../../core/config.h ../../core/notify.h funticket.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h funticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h -funticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h -funticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +funticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +funticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h funticket.o: ../../core/mount.h ../../templates/misc.h funticket.o: ../../templates/localefilter.h ../../templates/locale.h funticket.o: ../../core/confparser.h ../../templates/htmltextstream.h -funticket.o: ../../core/system.h ../../core/misc.h +funticket.o: ../../core/log.h ../../core/system.h ../../core/misc.h init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h init.o: ../../core/item.h ../../core/error.h ../../core/log.h @@ -141,12 +141,12 @@ init.o: ../../core/plugindata.h ../../templates/htmltextstream.h init.o: ../../core/config.h ../../core/notify.h init.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h -init.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h -init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../core/mount.h ../../templates/misc.h init.o: ../../templates/localefilter.h ../../templates/locale.h init.o: ../../core/confparser.h ../../templates/htmltextstream.h -init.o: ../../core/system.h editticket.h createticket.h ../../core/log.h +init.o: ../../core/log.h ../../core/system.h editticket.h createticket.h init.o: ../../core/plugin.h ../../core/pluginmsg.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h init.o: ../../functions/functions.h ../../functions/functionbase.h @@ -175,8 +175,8 @@ tdb.o: ../../core/item.h ../../core/error.h ../../core/log.h tdb.o: ../../core/textstream.h ../../core/log.h templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -templates.o: ../../core/item.h ../../../ezc/src/stringconv.h -templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +templates.o: ../../core/item.h ../../../ezc/src/functions.h +templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h templates.o: ticketinfo.h ticket.h ticketparser.h ticketconf.h templates.o: ../../core/item.h ../../core/system.h ../../core/dirs.h templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h @@ -199,29 +199,29 @@ templates.o: ../../core/config.h ../../core/notify.h templates.o: ../../templatesnotify/templatesnotify.h ../../core/mount.h templates.o: ../../templates/misc.h ../../templates/localefilter.h templates.o: ../../templates/locale.h ../../core/confparser.h -templates.o: ../../templates/htmltextstream.h ../../core/system.h -templates.o: createticket.h ../../core/misc.h ../../core/plugin.h -templates.o: ../../core/pluginmsg.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../functions/functionparser.h -templates.o: ../../functions/adduser.h ../../functions/cat.h -templates.o: ../../functions/chmod.h ../../functions/privchanger.h -templates.o: ../../functions/chown.h ../../functions/ckeditor.h -templates.o: ../../functions/cp.h ../../functions/createthread.h -templates.o: ../../functions/default.h ../../functions/download.h -templates.o: ../../functions/emacs.h ../../functions/last.h -templates.o: ../../functions/login.h ../../functions/logout.h -templates.o: ../../functions/ls.h ../../functions/mkdir.h -templates.o: ../../functions/mv.h ../../functions/node.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/run.h -templates.o: ../../functions/stat.h ../../functions/subject.h -templates.o: ../../functions/funthread.h ../../functions/template.h -templates.o: ../../functions/tinymce.h ../../functions/uname.h -templates.o: ../../functions/upload.h ../../functions/uptime.h -templates.o: ../../functions/who.h ../../functions/vim.h -templates.o: ../../core/htmlfilter.h ../../templates/templates.h -templates.o: ../../templates/patterncacher.h +templates.o: ../../templates/htmltextstream.h ../../core/log.h +templates.o: ../../core/system.h createticket.h ../../core/misc.h +templates.o: ../../core/plugin.h ../../core/pluginmsg.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../functions/functionparser.h ../../functions/adduser.h +templates.o: ../../functions/cat.h ../../functions/chmod.h +templates.o: ../../functions/privchanger.h ../../functions/chown.h +templates.o: ../../functions/ckeditor.h ../../functions/cp.h +templates.o: ../../functions/createthread.h ../../functions/default.h +templates.o: ../../functions/download.h ../../functions/emacs.h +templates.o: ../../functions/last.h ../../functions/login.h +templates.o: ../../functions/logout.h ../../functions/ls.h +templates.o: ../../functions/mkdir.h ../../functions/mv.h +templates.o: ../../functions/node.h ../../functions/priv.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/run.h ../../functions/stat.h +templates.o: ../../functions/subject.h ../../functions/funthread.h +templates.o: ../../functions/template.h ../../functions/tinymce.h +templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/uptime.h ../../functions/who.h +templates.o: ../../functions/vim.h ../../core/htmlfilter.h +templates.o: ../../templates/templates.h ../../templates/patterncacher.h templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/templates/Makefile.dep b/templates/Makefile.dep index 978cfa0..d923f44 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -2,33 +2,34 @@ adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -adduser.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -adduser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +adduser.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +adduser.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +adduser.o: ../core/textstream.h patterncacher.h ../core/item.h adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h -adduser.o: ../core/textstream.h indexpatterns.h ../core/config.h -adduser.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h -adduser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -adduser.o: ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h -adduser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h -adduser.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -adduser.o: ../core/session.h ../core/error.h ../core/user.h -adduser.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -adduser.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h -adduser.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h -adduser.o: ../core/mount.h ../core/mountparser.h ../core/users.h -adduser.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h -adduser.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h +adduser.o: indexpatterns.h ../core/config.h ../core/confparser.h +adduser.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +adduser.o: ../db/dbtextstream.h ../core/error.h ../core/log.h +adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +adduser.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h +adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h +adduser.o: ../core/error.h ../core/user.h ../core/plugindata.h +adduser.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h +adduser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +adduser.o: ../core/request.h ../core/mounts.h ../core/mount.h +adduser.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h +adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h +adduser.o: ../core/loadavg.h ../core/sessionmanager.h adduser.o: ../core/sessioncontainer.h ../core/system.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/stringconv.h ../../ezc/src/functions.h -dir.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h +dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +dir.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h 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/httpsimpleparser.h ../core/log.h ../core/textstream.h -dir.o: indexpatterns.h ../core/config.h ../core/confparser.h +dir.o: ../core/user.h ../core/log.h ../core/textstream.h patterncacher.h +dir.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h +dir.o: ../core/log.h indexpatterns.h ../core/config.h ../core/confparser.h dir.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h dir.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h dir.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h @@ -58,12 +59,12 @@ dir.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h dir.o: ../functions/vim.h ../core/htmlfilter.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/stringconv.h ../../ezc/src/functions.h -doc.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h +doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +doc.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h 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/httpsimpleparser.h ../core/log.h ../core/textstream.h -doc.o: indexpatterns.h ../core/config.h ../core/confparser.h +doc.o: ../core/user.h ../core/log.h ../core/textstream.h patterncacher.h +doc.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h +doc.o: ../core/log.h indexpatterns.h ../core/config.h ../core/confparser.h doc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h doc.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h doc.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h @@ -81,25 +82,28 @@ htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.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/pattern.h ../../ezc/src/item.h -htmltextstream.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -htmltextstream.o: ../../ezc/src/funinfo.h ../core/user.h +htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +htmltextstream.o: ../../ezc/src/stringconv.h ../core/user.h ../core/log.h +htmltextstream.o: ../core/textstream.h indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h indexpatterns.o: localefilter.h locale.h ../core/confparser.h -indexpatterns.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -indexpatterns.o: ../core/log.h ../core/textstream.h +indexpatterns.o: htmltextstream.h ../core/textstream.h ../core/user.h +indexpatterns.o: ../core/log.h ../core/textstream.h ../core/config.h +indexpatterns.o: ../core/confparser.h ../core/htmlfilter.h item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h item.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -item.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -item.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +item.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +item.o: ../core/textstream.h patterncacher.h ../core/item.h item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +item.o: indexpatterns.h ../core/config.h ../core/confparser.h +item.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +item.o: ../db/dbtextstream.h ../core/error.h ../core/log.h item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h item.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h item.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -113,14 +117,15 @@ item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h item.o: ../core/misc.h ../core/bbcodeparser.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/item.h ../../ezc/src/stringconv.h -last.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +last.o: ../core/textstream.h patterncacher.h ../core/item.h last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +last.o: indexpatterns.h ../core/config.h ../core/confparser.h +last.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +last.o: ../db/dbtextstream.h ../core/error.h ../core/log.h last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h last.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h last.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -136,17 +141,17 @@ locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h localefilter.o: localefilter.h locale.h ../core/confparser.h localefilter.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h localefilter.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -localefilter.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -localefilter.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h localefilter.o: ../core/misc.h ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h -ls.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -ls.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h +ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +ls.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h 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/httpsimpleparser.h ../core/log.h ../core/textstream.h -ls.o: indexpatterns.h ../core/config.h ../core/confparser.h +ls.o: ../core/user.h ../core/log.h ../core/textstream.h patterncacher.h +ls.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h +ls.o: ../core/log.h indexpatterns.h ../core/config.h ../core/confparser.h ls.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h ls.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h ls.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h @@ -161,14 +166,15 @@ ls.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h ls.o: ../core/sessioncontainer.h ../core/system.h ../core/request.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/item.h ../../ezc/src/stringconv.h -misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +misc.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +misc.o: ../core/textstream.h patterncacher.h ../core/item.h misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +misc.o: indexpatterns.h ../core/config.h ../core/confparser.h +misc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +misc.o: ../db/dbtextstream.h ../core/error.h ../core/log.h misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h misc.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h misc.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -182,14 +188,15 @@ misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h misc.o: ../core/misc.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/item.h ../../ezc/src/stringconv.h -mount.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +mount.o: ../core/textstream.h patterncacher.h ../core/item.h mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +mount.o: indexpatterns.h ../core/config.h ../core/confparser.h +mount.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +mount.o: ../db/dbtextstream.h ../core/error.h ../core/log.h mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h mount.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h mount.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -201,21 +208,25 @@ mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h mount.o: ../core/misc.h -patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.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: ../../ezc/src/utf8.h ../../ezc/src/generator.h patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/item.h -patterncacher.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -patterncacher.o: ../../ezc/src/funinfo.h ../core/log.h ../core/textstream.h +patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +patterncacher.o: ../../ezc/src/stringconv.h htmltextstream.h +patterncacher.o: ../core/textstream.h ../core/user.h ../core/log.h +patterncacher.o: ../core/textstream.h ../core/log.h priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h priv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -priv.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -priv.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +priv.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +priv.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +priv.o: ../core/textstream.h patterncacher.h ../core/item.h priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +priv.o: indexpatterns.h ../core/config.h ../core/confparser.h +priv.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +priv.o: ../db/dbtextstream.h ../core/error.h ../core/log.h priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h priv.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -243,12 +254,12 @@ priv.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h priv.o: ../functions/vim.h ../core/htmlfilter.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/pattern.h ../../ezc/src/item.h -rebus.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h -rebus.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h -rebus.o: ../core/confparser.h htmltextstream.h ../core/textstream.h -rebus.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h -rebus.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h +rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h +rebus.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h +rebus.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h +rebus.o: ../core/textstream.h ../core/user.h ../core/log.h +rebus.o: ../core/textstream.h patterncacher.h ../core/item.h +rebus.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h rebus.o: indexpatterns.h ../core/config.h ../core/confparser.h rebus.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h rebus.o: ../db/dbtextstream.h ../core/error.h ../core/log.h @@ -264,14 +275,15 @@ rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.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/item.h ../../ezc/src/stringconv.h -stat.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +stat.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +stat.o: ../core/textstream.h patterncacher.h ../core/item.h stat.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +stat.o: indexpatterns.h ../core/config.h ../core/confparser.h +stat.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +stat.o: ../db/dbtextstream.h ../core/error.h ../core/log.h stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h stat.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h stat.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -285,12 +297,12 @@ stat.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h stat.o: ../core/misc.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/stringconv.h ../../ezc/src/functions.h -sys.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h +sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +sys.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h 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/httpsimpleparser.h ../core/log.h ../core/textstream.h -sys.o: indexpatterns.h ../core/config.h ../core/confparser.h +sys.o: ../core/user.h ../core/log.h ../core/textstream.h patterncacher.h +sys.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h +sys.o: ../core/log.h indexpatterns.h ../core/config.h ../core/confparser.h sys.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h sys.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h sys.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h @@ -306,49 +318,49 @@ sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h sys.o: ../core/version.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/item.h ../../ezc/src/stringconv.h -template.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +template.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h template.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h -template.o: ../core/textstream.h ../core/user.h patterncacher.h -template.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h -template.o: ../core/log.h ../core/textstream.h indexpatterns.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/error.h ../core/log.h ../db/dbitemquery.h -template.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h -template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h -template.o: ../core/requesttypes.h ../core/session.h ../core/error.h -template.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -template.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h -template.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -template.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -template.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -template.o: ../core/groups.h ../core/group.h ../core/loadavg.h -template.o: ../core/sessionmanager.h ../core/sessioncontainer.h -template.o: ../core/system.h ../core/misc.h +template.o: ../core/textstream.h ../core/user.h ../core/log.h +template.o: ../core/textstream.h patterncacher.h ../core/item.h +template.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +template.o: indexpatterns.h ../core/config.h ../core/confparser.h +template.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +template.o: ../db/dbtextstream.h ../core/error.h ../core/log.h +template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +template.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h +template.o: ../core/request.h ../core/requesttypes.h ../core/session.h +template.o: ../core/error.h ../core/user.h ../core/plugindata.h +template.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h +template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +template.o: ../core/request.h ../core/mounts.h ../core/mount.h +template.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h +template.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h +template.o: ../core/loadavg.h ../core/sessionmanager.h +template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.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/item.h ../../ezc/src/stringconv.h -templates.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +templates.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h templates.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h -templates.o: ../core/textstream.h ../core/user.h patterncacher.h -templates.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h -templates.o: ../core/log.h ../core/textstream.h indexpatterns.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/error.h ../core/log.h ../db/dbitemquery.h -templates.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h -templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h -templates.o: ../core/requesttypes.h ../core/session.h ../core/error.h -templates.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -templates.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h -templates.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -templates.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -templates.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -templates.o: ../core/groups.h ../core/group.h ../core/loadavg.h -templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h -templates.o: ../core/system.h ../core/misc.h ../core/plugin.h -templates.o: ../core/pluginmsg.h ../core/sessionmanager.h +templates.o: ../core/textstream.h ../core/user.h ../core/log.h +templates.o: ../core/textstream.h patterncacher.h ../core/item.h +templates.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +templates.o: indexpatterns.h ../core/config.h ../core/confparser.h +templates.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +templates.o: ../db/dbtextstream.h ../core/error.h ../core/log.h +templates.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +templates.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h +templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h +templates.o: ../core/error.h ../core/user.h ../core/plugindata.h +templates.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h +templates.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +templates.o: ../core/request.h ../core/mounts.h ../core/mount.h +templates.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h +templates.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h +templates.o: ../core/loadavg.h ../core/sessionmanager.h +templates.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h +templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h templates.o: ../functions/functions.h ../functions/functionbase.h templates.o: ../core/notify.h ../templatesnotify/templatesnotify.h templates.o: ../core/mount.h ../templates/misc.h @@ -368,14 +380,15 @@ templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h templates.o: ../functions/vim.h ../core/htmlfilter.h ../templates/templates.h thread.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h thread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -thread.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -thread.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +thread.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +thread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h thread.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h -thread.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h +thread.o: ../core/textstream.h ../core/user.h ../core/log.h +thread.o: ../core/textstream.h patterncacher.h ../core/item.h thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h -thread.o: ../core/textstream.h indexpatterns.h ../core/config.h -thread.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h -thread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +thread.o: indexpatterns.h ../core/config.h ../core/confparser.h +thread.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +thread.o: ../db/dbtextstream.h ../core/error.h ../core/log.h thread.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h thread.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -405,14 +418,15 @@ thread.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h thread.o: ../core/htmlfilter.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/item.h ../../ezc/src/stringconv.h -upload.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +upload.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +upload.o: ../core/textstream.h patterncacher.h ../core/item.h upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +upload.o: indexpatterns.h ../core/config.h ../core/confparser.h +upload.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +upload.o: ../db/dbtextstream.h ../core/error.h ../core/log.h upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h upload.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -426,14 +440,15 @@ upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h upload.o: ../core/system.h ../core/request.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/item.h ../../ezc/src/stringconv.h -uptime.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +uptime.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +uptime.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +uptime.o: ../core/textstream.h patterncacher.h ../core/item.h uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +uptime.o: indexpatterns.h ../core/config.h ../core/confparser.h +uptime.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +uptime.o: ../db/dbtextstream.h ../core/error.h ../core/log.h uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h uptime.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h uptime.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -447,14 +462,15 @@ uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h uptime.o: ../core/system.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/item.h ../../ezc/src/stringconv.h -user.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +user.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +user.o: ../core/textstream.h patterncacher.h ../core/item.h user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +user.o: indexpatterns.h ../core/config.h ../core/confparser.h +user.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +user.o: ../db/dbtextstream.h ../core/error.h ../core/log.h user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h user.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h user.o: ../core/request.h ../core/requesttypes.h ../core/session.h @@ -468,12 +484,12 @@ user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h user.o: ../core/request.h ../core/misc.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/stringconv.h ../../ezc/src/functions.h -who.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h +who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +who.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h 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/httpsimpleparser.h ../core/log.h ../core/textstream.h -who.o: indexpatterns.h ../core/config.h ../core/confparser.h +who.o: ../core/user.h ../core/log.h ../core/textstream.h patterncacher.h +who.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h +who.o: ../core/log.h indexpatterns.h ../core/config.h ../core/confparser.h who.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h who.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h who.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h @@ -488,14 +504,15 @@ who.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h who.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.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/item.h ../../ezc/src/stringconv.h -winix.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h +winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h 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 ../core/log.h +winix.o: ../core/textstream.h patterncacher.h ../core/item.h winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h +winix.o: indexpatterns.h ../core/config.h ../core/confparser.h +winix.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +winix.o: ../db/dbtextstream.h ../core/error.h ../core/log.h winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h winix.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h diff --git a/templates/indexpatterns.cpp b/templates/indexpatterns.cpp index 9ad5a6d..88ee0cf 100755 --- a/templates/indexpatterns.cpp +++ b/templates/indexpatterns.cpp @@ -11,12 +11,22 @@ #include "core/log.h" +IndexPatterns::IndexPatterns() +{ + config = 0; + ezc_fun = 0; +} + void IndexPatterns::SetConfig(Config * pconfig) { config = pconfig; } +void IndexPatterns::SetEzcFunctions(TemplatesFunctions::EzcFun * fun) +{ + ezc_fun = fun; +} Ezc::Pattern * IndexPatterns::GetPattern(const std::wstring & file, Locale::Lang lang) { @@ -83,6 +93,9 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil templ.patterns[i].Directory(config->templates_dir, config->templates_dir_default); templ.patterns[i].ParseFile(iter->first); + if( ezc_fun ) + templ.patterns[i].CacheFunctions(*ezc_fun); + locale_filter.Filter(templ.patterns[i], locale, static_cast(i)); } } diff --git a/templates/indexpatterns.h b/templates/indexpatterns.h index 0cfc51f..f82222b 100755 --- a/templates/indexpatterns.h +++ b/templates/indexpatterns.h @@ -14,6 +14,7 @@ #include #include #include "ezc.h" +#include "misc.h" #include "localefilter.h" #include "locale.h" #include "core/config.h" @@ -24,7 +25,9 @@ class IndexPatterns { public: + IndexPatterns(); void SetConfig(Config * pconfig); + void SetEzcFunctions(TemplatesFunctions::EzcFun * fun); // can return null pointer if there is not such a pattern Ezc::Pattern * GetPattern(const std::wstring & file, Locale::Lang lang); @@ -43,6 +46,9 @@ private: Config * config; + // can be null (not set directly) + TemplatesFunctions::EzcFun * ezc_fun; + struct Template { bool to_delete; diff --git a/templates/item.cpp b/templates/item.cpp index 65a451e..5e2e053 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -280,8 +280,9 @@ void item_run(Info & i) Ezc::Pattern * p = pattern_cacher.GetPattern(request->item); HtmlTextStream item_run_content; // !! zrobic static z tego i tu dac tylko clearowanie - EzcGen gen(item_run_content, *p, ezc_functions); - gen.Generate(); + EzcGen gen; + //gen.Generate(item_run_content, *p, ezc_functions); + gen.Generate(item_run_content, *p); item_print_content(i.out, item_run_content.Str(), request->item.content_type); } @@ -553,8 +554,9 @@ void item_tab_run(Info & i) Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]); HtmlTextStream item_run_content; // !! zrobic static z tego i tu dac tylko clearowanie - EzcGen gen(item_run_content, *p, ezc_functions); - gen.Generate(); + EzcGen gen; + //gen.Generate(item_run_content, *p, ezc_functions); + gen.Generate(item_run_content, *p); item_print_content(i.out, item_run_content.Str(), request->item_tab[item_index].content_type); } diff --git a/templates/misc.cpp b/templates/misc.cpp index 6880ed7..4ca019d 100755 --- a/templates/misc.cpp +++ b/templates/misc.cpp @@ -175,27 +175,6 @@ return ckeditor_getparser.fun_num; // those functions from here are used in the second thread too -void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const wchar_t * file, bool delete_white) -{ - size_t i; - size_t len = patterns.size(); - - for(i=0 ; itemplates_dir, config->templates_dir_default); - patterns[i][pat].ParseFile(file); - - locale_filter.Filter(patterns[i][pat], locale, static_cast(i)); - } - } -} - - - void ClearPatterns(Patterns & patterns, size_t len) { size_t loc, pat; diff --git a/templates/misc.h b/templates/misc.h index 76ce880..a4ee132 100755 --- a/templates/misc.h +++ b/templates/misc.h @@ -18,6 +18,8 @@ #include "htmltextstream.h" #include "core/user.h" +// !! usunac +#include "core/log.h" namespace TemplatesFunctions { @@ -48,9 +50,35 @@ void print_user_name(Info & i, const User * puser, const std::wstring & guest_na int ParseCKeditorFun(); + + + // those functions from here are used in the second thread too -void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const wchar_t * file, bool delete_white = false); +template +void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, + Ezc::Functions & ezc_fun, const wchar_t * file, bool read_file_as_utf8, + const std::wstring & templates_dir, const std::wstring & templates_dir_default, + bool delete_white = false) +{ + size_t i; + size_t len = patterns.size(); + + for(i=0 ; i(i)); + } + } +} + void ClearPatterns(Patterns & patterns, size_t len); diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index 02085eb..8e714d2 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -17,9 +17,16 @@ PatternCacher::PatternCacher() // !! tymczasowe wartosci dla testow when_delete_patterns = 3; // 130 how_many_delete = 2; // 30 + + ezc_fun = 0; } +void PatternCacher::SetEzcFunctions(TemplatesFunctions::EzcFun * fun) +{ + ezc_fun = fun; +} + void PatternCacher::CheckTableSize() { @@ -52,11 +59,13 @@ void PatternCacher::CheckTableSize() } - void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern) { pattern.AllowInclude(false); pattern.ParseString(item.content); + + if( ezc_fun ) + pattern.CacheFunctions(*ezc_fun); } @@ -100,6 +109,8 @@ PatternTab::iterator i; + + void PatternCacher::UpdatePattern(const Item & item) { PatternTab::iterator i; @@ -108,7 +119,7 @@ PatternTab::iterator i; if( i == pattern_tab.end() ) { - log << log2 << "PC: there is no such an item to update, id: " << item.id << ", url: " << item.url << logend; + //log << log2 << "PC: there is no such an item to update, id: " << item.id << ", url: " << item.url << logend; return; } diff --git a/templates/patterncacher.h b/templates/patterncacher.h index 2e67f17..1eaaf01 100755 --- a/templates/patterncacher.h +++ b/templates/patterncacher.h @@ -14,6 +14,7 @@ #include #include "core/item.h" +#include "misc.h" #include "ezc.h" @@ -59,10 +60,15 @@ class PatternCacher // how many items to delete size_t how_many_delete; + // can be null (not set directly) + TemplatesFunctions::EzcFun * ezc_fun; + public: PatternCacher(); + void SetEzcFunctions(TemplatesFunctions::EzcFun * fun); + // returning a pattern corresponding to the 'item' Ezc::Pattern * GetPattern(const Item & item); diff --git a/templates/templates.cpp b/templates/templates.cpp index ead96ab..de92a0c 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -19,12 +19,12 @@ namespace TemplatesFunctions { -IndexPatterns index_patterns; -Patterns patterns; -Patterns patterns_fun; -EzcFun ezc_functions; -PatternCacher pattern_cacher; +IndexPatterns index_patterns; // patterns for main index template (those from mountpoint) +Patterns patterns; // those patterns from enum Pat +Patterns patterns_fun; // patterns for winix functions +PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set) Locale locale; +EzcFun ezc_functions; LocaleFilter locale_filter; CKEditorGetParser ckeditor_getparser; @@ -111,8 +111,9 @@ Ezc::Pattern * p = 0; if( p ) { - EzcGen gen(i.out, *p, ezc_functions); - gen.Generate(); + EzcGen gen; + //gen.Generate(i.out, *p, ezc_functions); + gen.Generate(i.out, *p); } else { @@ -436,7 +437,8 @@ void Templates::ReadFile(TemplatesFunctions::Pat pat, const wchar_t * file) { using namespace TemplatesFunctions; - Read(patterns, static_cast(pat), locale, locale_filter, file); + Read(patterns, static_cast(pat), locale, locale_filter, ezc_functions, file, config->utf8, + config->templates_dir, config->templates_dir_default); } @@ -444,7 +446,8 @@ void Templates::ReadFileFun(size_t index, const wchar_t * file) { using namespace TemplatesFunctions; - Read(patterns_fun, index, locale, locale_filter, file); + Read(patterns_fun, index, locale, locale_filter, ezc_functions, file, config->utf8, + config->templates_dir, config->templates_dir_default); } @@ -557,7 +560,7 @@ using namespace TemplatesFunctions; } - +// index_patterns and patterns for items are not cleared here void Templates::ClearPatterns() { using namespace TemplatesFunctions; @@ -607,8 +610,9 @@ using namespace TemplatesFunctions; if( !index ) index = &patterns[locale.GetLang()][pat_index]; - EzcGen generator(request->page, *index, ezc_functions); - generator.Generate(); + EzcGen generator; + //generator.Generate(request->page, *index, ezc_functions); + generator.Generate(request->page, *index); } @@ -668,6 +672,9 @@ void Templates::SetSessionManager(SessionManager * psession_manager) Templates::Templates() { + using namespace TemplatesFunctions; + index_patterns.SetEzcFunctions(&ezc_functions); + pattern_cacher.SetEzcFunctions(&ezc_functions); } diff --git a/templates/templates.h b/templates/templates.h index 599501d..4ab39a3 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -42,10 +42,10 @@ namespace TemplatesFunctions pat_last // should be last }; - extern IndexPatterns index_patterns; - extern Patterns patterns; - extern Patterns patterns_fun; - extern PatternCacher pattern_cacher; + extern IndexPatterns index_patterns; // patterns for main index template + extern Patterns patterns; // those patterns from enum Pat + extern Patterns patterns_fun; // patterns for winix functions + extern PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set) extern Locale locale; extern EzcFun ezc_functions; extern CKEditorGetParser ckeditor_getparser; @@ -375,7 +375,7 @@ public: void ReadTemplates(); void ReadNewIndexTemplates(); void ReadIndexFileNames(bool add_pattern = false); - void CreateFunctions(); + void CreateFunctions(); // should be called before reading patterns (patterns will cache ezc functions) void Generate(); void GenerateRunRaw(); diff --git a/templatesnotify/Makefile.dep b/templatesnotify/Makefile.dep index f53b936..826a3ed 100755 --- a/templatesnotify/Makefile.dep +++ b/templatesnotify/Makefile.dep @@ -2,32 +2,33 @@ notify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h notify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -notify.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -notify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h -notify.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -notify.o: ../core/textstream.h ../core/misc.h ../templates/misc.h -notify.o: ../templates/localefilter.h ../templates/locale.h -notify.o: ../core/confparser.h ../templates/htmltextstream.h ../core/user.h -notify.o: ../core/notify.h ../templatesnotify/templatesnotify.h -notify.o: ../core/request.h ../core/requesttypes.h ../core/session.h -notify.o: ../core/error.h ../core/log.h ../core/textstream.h ../core/user.h -notify.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -notify.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h -notify.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -notify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h -notify.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h -notify.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -notify.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -notify.o: ../core/groups.h ../core/group.h ../core/loadavg.h +notify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +notify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h +notify.o: ../core/mount.h ../core/config.h ../core/confparser.h +notify.o: ../core/htmlfilter.h ../core/textstream.h ../core/misc.h +notify.o: ../templates/misc.h ../templates/localefilter.h +notify.o: ../templates/locale.h ../core/confparser.h +notify.o: ../templates/htmltextstream.h ../core/user.h ../core/log.h +notify.o: ../core/textstream.h ../core/notify.h +notify.o: ../templatesnotify/templatesnotify.h ../core/request.h +notify.o: ../core/requesttypes.h ../core/session.h ../core/error.h +notify.o: ../core/log.h ../core/user.h ../core/plugindata.h ../core/rebus.h +notify.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h +notify.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h +notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h +notify.o: ../core/group.h ../core/thread.h ../core/dircontainer.h +notify.o: ../core/ugcontainer.h ../core/mounts.h ../core/mount.h +notify.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h +notify.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h +notify.o: ../core/loadavg.h templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h -templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h +templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h templatesnotify.o: ../core/mount.h ../core/config.h ../core/confparser.h templatesnotify.o: ../core/htmlfilter.h ../core/textstream.h ../core/misc.h templatesnotify.o: ../templates/misc.h ../templates/localefilter.h templatesnotify.o: ../templates/locale.h ../core/confparser.h -templatesnotify.o: ../templates/htmltextstream.h ../core/user.h -templatesnotify.o: ../core/misc.h ../core/log.h ../core/textstream.h -templatesnotify.o: ../templates/locale.h +templatesnotify.o: ../templates/htmltextstream.h ../core/user.h ../core/log.h +templatesnotify.o: ../core/textstream.h ../core/misc.h ../templates/locale.h diff --git a/templatesnotify/templatesnotify.cpp b/templatesnotify/templatesnotify.cpp index 8446b7c..96b99e5 100755 --- a/templatesnotify/templatesnotify.cpp +++ b/templatesnotify/templatesnotify.cpp @@ -106,7 +106,11 @@ using namespace TemplatesNotifyFunctions; ClearPatterns(); locale.UTF8(config->utf8); locale.Read(config->locale_dir, config->locale_dir_default); - TemplatesFunctions::Read(patterns, pat_email_notify, locale, locale_filter, L"notify_email.txt", true); + + // !! nazwe pliku do konfiga + TemplatesFunctions::Read(patterns, pat_email_notify, locale, locale_filter, ezc_functions, + L"notify_email.txt", config->utf8, + config->templates_dir, config->templates_dir_default, true); notify_msg = 0; } @@ -128,11 +132,11 @@ using namespace TemplatesNotifyFunctions; return; } - Ezc::Generator > generator(notify_str, patterns[lang][pat_email_notify], ezc_functions); + Ezc::Generator > generator; generator.RecognizeSpecialChars(true); generator.TrimWhite(true); generator.SkipNewLine(true); - generator.Generate(); + generator.Generate(notify_str, patterns[lang][pat_email_notify]); }