diff --git a/core/app.cpp b/core/app.cpp index 44d2fc6..4dcdaf3 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -34,6 +34,7 @@ App::App() // temporary there is only one request cur.request = &req; cur.session = session_manager.GetTmpSession(); + cur.mount = system.mounts.GetEmptyMount(); db.SetConn(db_conn); @@ -215,7 +216,7 @@ void App::ProcessRequestThrow() plugin.Call(WINIX_SESSION_CHANGED); functions.Parse(); // parsing directories,files,functions and parameters - system.mounts.CalcCurMount(); + cur.mount = system.mounts.CalcCurMount(); if( system.mounts.pmount->type != system.mounts.MountTypeStatic() ) Make(); diff --git a/core/cur.h b/core/cur.h index e26e339..f54a5ca 100755 --- a/core/cur.h +++ b/core/cur.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,7 @@ #include "request.h" #include "session.h" +#include "mount.h" /* @@ -21,6 +22,7 @@ struct Cur { Request * request; Session * session; + Mount * mount; // those pointers are never null, if there is no a session for the user // the 'session' pointer pointers at a special temporary session diff --git a/core/dirs.cpp b/core/dirs.cpp index fb5cd26..d69468b 100755 --- a/core/dirs.cpp +++ b/core/dirs.cpp @@ -208,7 +208,6 @@ size_t level = 0; if( i == dir_tab.End() || i->parent_id == id ) // means a loop (something wrong in the db) { - // we don't change path if there is no such a directory return level; } @@ -221,6 +220,30 @@ size_t level = 0; } +bool Dirs::IsChild(long parent_id, long child_id) +{ + if( child_id == parent_id ) + return false; + + DirContainer::Iterator i; + + while( child_id != -1 ) + { + i = dir_tab.FindId(child_id); + + if( i == dir_tab.End() ) + return false; + + if( i->parent_id == parent_id ) + return true; + + child_id = i->parent_id; + } + +return false; +} + + bool Dirs::ChangeParent(long dir_id, long new_parent_id) { return dir_tab.ChangeParent(dir_id, new_parent_id); diff --git a/core/dirs.h b/core/dirs.h index fc75a2e..625fc0a 100755 --- a/core/dirs.h +++ b/core/dirs.h @@ -83,6 +83,9 @@ public: // "/abc/def" -> 2 size_t DirLevel(long id); + // checking if child_id is really a child of parent_id + bool IsChild(long parent_id, long child_id); + private: Cur * cur; diff --git a/core/mountparser.cpp b/core/mountparser.cpp index 0d1b510..4b9f67e 100755 --- a/core/mountparser.cpp +++ b/core/mountparser.cpp @@ -360,7 +360,84 @@ void MountParser::ReadMountParams() -void MountParser::ReadRow(std::map & output) +void MountParser::AddParams(Mount::Param & src, Mount::Param & dst) +{ + if( src.size() != dst.size() ) + { + log << log1 << "MP: addparams: incorrect sizes" << logend; + return; + } + + for(size_t p=0 ; p < src.size() ; ++p) + { + if( src[p].defined && !dst[p].defined ) + dst[p] = src[p]; + } +} + + + + +bool MountParser::AddParamsBefore(long dir_id) +{ + std::map::iterator i = poutput->find(dir_id); + + if( i == poutput->end() ) + return false; + + AddParams(i->second.param, mount_inserted.first->second.param); + +return true; +} + + +/* + adding all non-existing parameters to this mount point from parents +*/ +void MountParser::AddParamsBefore() +{ + if( !pdir ) + return; + + Item * dir; + long dir_id = pdir->parent_id; + + while( dir_id != -1 ) + { + if( AddParamsBefore(dir_id) ) + { + // we don't have to check others parents + // the parameters are already copied + break; + } + + dir = dirs->GetDir(dir_id); + + if( !dir ) + break; + + dir_id = dir->parent_id; + } +} + + + +/* + adding all non-existing parameters to childs (childs to this mount point) +*/ +void MountParser::AddParamsAfter() +{ + std::map::iterator i = poutput->begin(); + + for( ; i != poutput->end() ; ++i) + { + if( dirs->IsChild(mount_inserted.first->second.dir_id, i->first) ) + AddParams(mount_inserted.first->second.param, i->second.param); + } +} + + +void MountParser::ReadRow() { if( ReadMountType() && ReadMountPoint() && ReadFs() ) { @@ -373,13 +450,19 @@ void MountParser::ReadRow(std::map & output) } else { - std::pair::iterator, bool> res = output.insert( std::make_pair(mount.dir_id, mount) ); - - if( !res.second ) + mount_inserted = poutput->insert( std::make_pair(mount.dir_id, mount) ); + + if( mount_inserted.second ) + { + AddParamsBefore(); + AddParamsAfter(); + } + else { log << log1 << "MP: this mount point exists (skipped)" << logend; slog << logwarning << T("mount_exists") << ": " << last_dir << " (" << T("skipped") << ")" << logend; } + } } @@ -397,13 +480,14 @@ void MountParser::Parse(const std::wstring & input, std::map & outp return; } - pinput = input.c_str(); + pinput = input.c_str(); + poutput = &output; mount.param.resize(mount_par_tab->size()); mount.ClearParams(); - output.clear(); + poutput->clear(); while( *pinput ) - ReadRow(output); + ReadRow(); } diff --git a/core/mountparser.h b/core/mountparser.h index cf34698..64bab03 100755 --- a/core/mountparser.h +++ b/core/mountparser.h @@ -64,7 +64,11 @@ private: bool ReadFs(); void LogMountParams(); void ReadMountParams(); - void ReadRow(std::map & output); + void ReadRow(); + void AddParams(Mount::Param & src, Mount::Param & dst); + bool AddParamsBefore(long dir_id); + void AddParamsBefore(); + void AddParamsAfter(); const wchar_t * pinput; std::wstring temp; @@ -73,6 +77,8 @@ private: Mount::ParamRow::ParamArg param_args; Mount mount; Item * pdir; + std::map * poutput; + std::pair::iterator, bool> mount_inserted; }; diff --git a/core/mounts.cpp b/core/mounts.cpp index e1dd538..1ea032d 100755 --- a/core/mounts.cpp +++ b/core/mounts.cpp @@ -253,7 +253,7 @@ void Mounts::MountCmsForRoot() -void Mounts::CalcCurMount() +Mount * Mounts::CalcCurMount() { std::vector::reverse_iterator i; @@ -262,7 +262,7 @@ std::vector::reverse_iterator i; // when the program starts (when the dir_tab is empty() // we don't want to call MountCmsForRoot() if( cur->request->dir_tab.empty() ) - return; + return pmount; for(i = cur->request->dir_tab.rbegin() ; i!=cur->request->dir_tab.rend() ; ++i) { @@ -273,7 +273,7 @@ std::vector::reverse_iterator i; pmount = &(m->second); log << log2 << "M: current mount point is: " << GetMountType(pmount->type) << ", fs: " << GetMountFs(pmount->fs) << logend; - return; + return pmount; } } @@ -282,6 +282,8 @@ std::vector::reverse_iterator i; MountCmsForRoot(); log << log2 << "M: current mount point is: " << GetMountType(pmount->type) << " (default)" << ", fs: " << GetMountFs(pmount->fs) << logend; + +return pmount; } @@ -312,3 +314,7 @@ const Mounts::MountTab * Mounts::GetMountTab() } +Mount * Mounts::GetEmptyMount() +{ + return &empty_mount; +} diff --git a/core/mounts.h b/core/mounts.h index 2c7420c..c7e6590 100755 --- a/core/mounts.h +++ b/core/mounts.h @@ -92,16 +92,22 @@ public: void ReadMounts(const std::wstring & mounts); Error ReadMounts(); - void CalcCurMount(); + Mount * CalcCurMount(); Mount * CalcMount(long dir_id); // current mount point // will not be null after calling CalcCurMount() or ReadMounts([...]) + // !! nie korzystac obecnie z niego + // korzystac z cur->mount + // a tez zostanie wycofany Mount * pmount; const MountTab * GetMountTab(); + // at the beginning used to initialize cur->mount + Mount * GetEmptyMount(); + private: Db * db; diff --git a/functions/Makefile.dep b/functions/Makefile.dep index 757644f..dff9086 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -18,16 +18,16 @@ adduser.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h adduser.o: functionparser.h ../core/cur.h cat.h chmod.h privchanger.h chown.h adduser.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h -adduser.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h -adduser.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h -adduser.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -adduser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -adduser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -adduser.o: ../core/basethread.h ../core/synchro.h +adduser.o: logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h +adduser.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +adduser.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +adduser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +adduser.o: ../templates/htmltextstream.h ../notify/notifythread.h +adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +adduser.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +adduser.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -45,16 +45,16 @@ cat.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h cat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h cat.o: functions.h functionparser.h ../core/cur.h adduser.h chmod.h cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -cat.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -cat.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -cat.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -cat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -cat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -cat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -cat.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -cat.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -cat.o: ../core/synchro.h +cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +cat.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +cat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +cat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +cat.o: ../templates/htmltextstream.h ../notify/notifythread.h +cat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +cat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +cat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +cat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +cat.o: ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -73,16 +73,16 @@ chmod.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h chmod.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h chmod.o: functionparser.h ../core/cur.h adduser.h cat.h chown.h privchanger.h chmod.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -chmod.o: ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h -chmod.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +chmod.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h +chmod.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h chmod.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h chmod.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h chmod.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h chmod.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -chmod.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -chmod.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -chmod.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -chmod.o: ../core/basethread.h ../core/synchro.h +chmod.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +chmod.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +chmod.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +chmod.o: ../core/synchro.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 ../db/dbitemquery.h @@ -101,16 +101,16 @@ chown.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h chown.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h chown.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -chown.o: ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h -chown.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +chown.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h +chown.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h chown.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h chown.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h chown.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h chown.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -chown.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -chown.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -chown.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -chown.o: ../core/basethread.h ../core/synchro.h +chown.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +chown.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +chown.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +chown.o: ../core/synchro.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 @@ -130,17 +130,17 @@ ckeditor.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h ckeditor.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h ckeditor.o: privchanger.h chown.h cp.h default.h download.h emacs.h last.h -ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -ckeditor.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -ckeditor.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h +ckeditor.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +ckeditor.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h ckeditor.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ckeditor.o: ../templates/htmltextstream.h ../notify/notifythread.h ckeditor.o: ../core/basethread.h ../core/synchro.h ckeditor.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -ckeditor.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -ckeditor.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -ckeditor.o: ../core/groups.h ../core/group.h ../core/loadavg.h -ckeditor.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +ckeditor.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +ckeditor.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +ckeditor.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ckeditor.o: ../core/synchro.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 cp.o: ../core/item.h ../core/error.h ../db/dbitemquery.h @@ -158,15 +158,15 @@ cp.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h cp.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h cp.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h cp.o: privchanger.h chown.h ckeditor.h default.h download.h emacs.h last.h -cp.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +cp.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h cp.o: reload.h rm.h run.h specialdefault.h stat.h subject.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 ../templates/htmltextstream.h cp.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h cp.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -cp.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -cp.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -cp.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +cp.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +cp.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +cp.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h cp.o: ../core/synchro.h ../core/misc.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 @@ -186,17 +186,16 @@ default.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h default.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h default.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h default.o: privchanger.h chown.h ckeditor.h cp.h download.h emacs.h last.h -default.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -default.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -default.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +default.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h +default.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.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 default.o: ../templates/htmltextstream.h ../notify/notifythread.h default.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -default.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -default.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -default.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -default.o: ../core/synchro.h +default.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +default.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +default.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 @@ -216,17 +215,17 @@ download.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h download.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h download.o: privchanger.h chown.h ckeditor.h cp.h default.h emacs.h last.h -download.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -download.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -download.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +download.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h +download.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +download.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h download.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h download.o: ../templates/htmltextstream.h ../notify/notifythread.h download.o: ../core/basethread.h ../core/synchro.h download.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -download.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -download.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -download.o: ../core/groups.h ../core/group.h ../core/loadavg.h -download.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +download.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +download.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +download.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +download.o: ../core/synchro.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 emacs.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h @@ -245,16 +244,16 @@ emacs.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h emacs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h emacs.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h emacs.o: chown.h ckeditor.h cp.h default.h download.h last.h login.h logout.h -emacs.o: ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h -emacs.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +emacs.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h +emacs.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h emacs.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h emacs.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h emacs.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h emacs.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -emacs.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -emacs.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -emacs.o: ../core/basethread.h ../core/synchro.h ../templates/templates.h +emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +emacs.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +emacs.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +emacs.o: ../core/synchro.h ../templates/templates.h emacs.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h emacs.o: ../core/httpsimpleparser.h ../core/log.h emacs.o: ../templates/indexpatterns.h ../core/sessionmanager.h @@ -279,18 +278,18 @@ functionbase.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h functionbase.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h functionbase.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h functionbase.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h -functionbase.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -functionbase.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h -functionbase.o: stat.h subject.h template.h tinymce.h uname.h upload.h -functionbase.o: uptime.h who.h vim.h ../core/htmlfilter.h +functionbase.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mount.h +functionbase.o: mv.h nicedit.h node.h priv.h reload.h rm.h run.h +functionbase.o: specialdefault.h stat.h subject.h template.h tinymce.h +functionbase.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h functionbase.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h functionbase.o: ../notify/notifythread.h ../core/basethread.h functionbase.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h -functionbase.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -functionbase.o: ../core/crypt.h ../core/users.h ../core/groups.h -functionbase.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -functionbase.o: ../core/basethread.h ../core/synchro.h +functionbase.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +functionbase.o: ../core/users.h ../core/groups.h ../core/group.h +functionbase.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +functionbase.o: ../core/synchro.h functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h functionparser.o: ../core/item.h ../core/error.h ../db/dbitemquery.h @@ -312,18 +311,18 @@ functionparser.o: ../../ezc/src/pattern.h functions.h functionbase.h functionparser.o: ../core/request.h ../core/config.h ../core/synchro.h functionparser.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h functionparser.o: cp.h default.h download.h emacs.h last.h login.h logout.h -functionparser.o: ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h -functionparser.o: rm.h run.h specialdefault.h stat.h subject.h template.h -functionparser.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +functionparser.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h +functionparser.o: reload.h rm.h run.h specialdefault.h stat.h subject.h +functionparser.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h functionparser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h functionparser.o: ../templates/htmltextstream.h ../notify/notifythread.h functionparser.o: ../core/basethread.h ../core/synchro.h functionparser.o: ../notify/templatesnotify.h ../core/users.h functionparser.o: ../core/ugcontainer.h ../core/lastcontainer.h -functionparser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -functionparser.o: ../core/crypt.h ../core/users.h ../core/groups.h -functionparser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -functionparser.o: ../core/basethread.h ../core/log.h +functionparser.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +functionparser.o: ../core/users.h ../core/groups.h ../core/group.h +functionparser.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +functionparser.o: ../core/log.h functions.o: functions.h functionbase.h ../core/item.h ../db/db.h functions.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h functions.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -345,7 +344,7 @@ functions.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h functions.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h functions.o: ../notify/templatesnotify.h ../core/users.h functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h -functions.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h run.h +functions.o: mount.h ../core/mountparser.h ../core/crypt.h run.h functions.o: ../core/users.h ../core/groups.h ../core/group.h functions.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h functions.o: ../core/synchro.h functionparser.h ../core/cur.h adduser.h cat.h @@ -377,14 +376,14 @@ last.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h last.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h last.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h last.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h -last.o: default.h download.h emacs.h login.h logout.h ln.h ls.h mkdir.h mv.h -last.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -last.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -last.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -last.o: ../templates/htmltextstream.h ../notify/notifythread.h -last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -last.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +last.o: default.h download.h emacs.h login.h logout.h ln.h ls.h mkdir.h +last.o: mount.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +last.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +last.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +last.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h last.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h last.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h last.o: ../core/synchro.h @@ -405,15 +404,15 @@ ln.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h ln.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h ln.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h ln.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -ln.o: last.h login.h logout.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -ln.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +ln.o: last.h login.h logout.h ls.h mkdir.h mount.h mv.h nicedit.h node.h +ln.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h ln.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h ln.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ln.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h ln.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -ln.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -ln.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -ln.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ln.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +ln.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +ln.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h ln.o: ../core/synchro.h ../core/misc.h ../functions/functions.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 @@ -433,16 +432,16 @@ login.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h login.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h login.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h login.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h logout.h -login.o: ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h -login.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +login.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h +login.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h login.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h login.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h login.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h login.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -login.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -login.o: ../core/basethread.h ../core/synchro.h +login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +login.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +login.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +login.o: ../core/synchro.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 ../db/dbitemquery.h @@ -461,17 +460,16 @@ logout.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h logout.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h logout.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h logout.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -logout.o: last.h login.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -logout.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -logout.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +logout.o: last.h login.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h +logout.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.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 logout.o: ../templates/htmltextstream.h ../notify/notifythread.h logout.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h logout.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -logout.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -logout.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -logout.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -logout.o: ../core/synchro.h +logout.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +logout.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +logout.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -489,15 +487,15 @@ ls.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h ls.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h ls.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h ls.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -ls.o: last.h login.h logout.h ln.h mkdir.h mv.h nicedit.h node.h priv.h -ls.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +ls.o: last.h login.h logout.h ln.h mkdir.h mount.h mv.h nicedit.h node.h +ls.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h ls.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h ls.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -ls.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -ls.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -ls.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ls.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +ls.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h ls.o: ../core/synchro.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 @@ -517,16 +515,44 @@ mkdir.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h mkdir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h mkdir.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h mkdir.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -mkdir.o: logout.h ln.h ls.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h -mkdir.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -mkdir.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +mkdir.o: logout.h ln.h ls.h mount.h mv.h nicedit.h node.h priv.h reload.h +mkdir.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +mkdir.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h mkdir.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mkdir.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h mkdir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -mkdir.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -mkdir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -mkdir.o: ../core/basethread.h ../core/synchro.h +mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +mkdir.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +mkdir.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +mkdir.o: ../core/synchro.h +mount.o: mount.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h +mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h +mount.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h +mount.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +mount.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h +mount.o: ../core/cur.h ../core/request.h ../core/requesttypes.h +mount.o: ../core/error.h ../core/config.h ../core/confparser.h +mount.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +mount.o: ../templates/locale.h ../core/confparser.h ../core/request.h +mount.o: ../core/config.h ../core/system.h ../core/dirs.h +mount.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h +mount.o: ../templates/misc.h ../templates/localefilter.h +mount.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +mount.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h +mount.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h +mount.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h +mount.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +mount.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +mount.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +mount.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +mount.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +mount.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +mount.o: ../core/synchro.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 ../db/dbitemquery.h @@ -544,15 +570,15 @@ mv.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h mv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h mv.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h mv.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -mv.o: last.h login.h logout.h ln.h ls.h mkdir.h nicedit.h node.h priv.h -mv.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +mv.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h nicedit.h node.h +mv.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h mv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h mv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h mv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -mv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -mv.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -mv.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +mv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +mv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +mv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h mv.o: ../core/synchro.h nicedit.o: nicedit.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h nicedit.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -572,17 +598,16 @@ nicedit.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h nicedit.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h nicedit.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h nicedit.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -nicedit.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h -nicedit.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -nicedit.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +nicedit.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h node.h +nicedit.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +nicedit.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h nicedit.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h nicedit.o: ../templates/htmltextstream.h ../notify/notifythread.h nicedit.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h nicedit.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -nicedit.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -nicedit.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -nicedit.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -nicedit.o: ../core/synchro.h +nicedit.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +nicedit.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +nicedit.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -601,13 +626,13 @@ node.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h node.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h node.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h node.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -node.o: mkdir.h mv.h nicedit.h priv.h reload.h rm.h run.h specialdefault.h -node.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -node.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -node.o: ../templates/htmltextstream.h ../notify/notifythread.h -node.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -node.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +node.o: mkdir.h mount.h mv.h nicedit.h priv.h reload.h rm.h run.h +node.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +node.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +node.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +node.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +node.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +node.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h node.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h node.o: ../core/synchro.h @@ -629,13 +654,13 @@ priv.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h priv.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h priv.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h priv.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -priv.o: mkdir.h mv.h nicedit.h node.h reload.h rm.h run.h specialdefault.h -priv.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -priv.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -priv.o: ../templates/htmltextstream.h ../notify/notifythread.h -priv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -priv.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +priv.o: mkdir.h mount.h mv.h nicedit.h node.h reload.h rm.h run.h +priv.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +priv.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +priv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h priv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h priv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h priv.o: ../core/synchro.h @@ -658,17 +683,17 @@ privchanger.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h privchanger.o: functionbase.h ../core/config.h ../core/synchro.h privchanger.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h chown.h privchanger.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h -privchanger.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -privchanger.o: reload.h rm.h run.h specialdefault.h stat.h subject.h +privchanger.o: logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h +privchanger.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h privchanger.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h privchanger.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h privchanger.o: ../templates/htmltextstream.h ../notify/notifythread.h privchanger.o: ../core/basethread.h ../core/synchro.h privchanger.o: ../notify/templatesnotify.h ../core/users.h privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h -privchanger.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h -privchanger.o: ../core/users.h ../core/groups.h ../core/group.h -privchanger.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +privchanger.o: ../core/mountparser.h ../core/crypt.h ../core/users.h +privchanger.o: ../core/groups.h ../core/group.h ../core/loadavg.h +privchanger.o: ../core/thumb.h ../core/basethread.h reload.o: reload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h reload.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h @@ -687,20 +712,19 @@ reload.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h reload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h reload.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h reload.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -reload.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h -reload.o: priv.h rm.h run.h specialdefault.h stat.h subject.h template.h -reload.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +reload.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +reload.o: node.h priv.h rm.h run.h specialdefault.h stat.h subject.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 reload.o: ../templates/htmltextstream.h ../notify/notifythread.h reload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h reload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -reload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -reload.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -reload.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -reload.o: ../core/synchro.h ../templates/templates.h -reload.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -reload.o: ../core/httpsimpleparser.h ../core/log.h -reload.o: ../templates/indexpatterns.h ../core/sessionmanager.h +reload.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +reload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +reload.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 reload.o: ../core/sessioncontainer.h ../core/system.h rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h @@ -719,15 +743,15 @@ rm.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h rm.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h rm.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h rm.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -rm.o: reload.h run.h specialdefault.h stat.h subject.h template.h tinymce.h -rm.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h +rm.o: priv.h reload.h run.h specialdefault.h stat.h subject.h template.h +rm.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h rm.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h rm.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h rm.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -rm.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -rm.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -rm.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +rm.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +rm.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +rm.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h rm.o: ../core/synchro.h ../core/plugin.h ../core/pluginmsg.h ../core/system.h rm.o: ../core/sessionmanager.h ../core/sessioncontainer.h rm.o: ../functions/functions.h ../templates/templates.h @@ -751,16 +775,16 @@ run.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h run.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h run.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h run.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -run.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -run.o: reload.h rm.h specialdefault.h stat.h subject.h template.h tinymce.h -run.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -run.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -run.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -run.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -run.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -run.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -run.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -run.o: ../core/synchro.h +run.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +run.o: node.h priv.h reload.h rm.h specialdefault.h stat.h subject.h +run.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +run.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +run.o: ../templates/htmltextstream.h ../notify/notifythread.h +run.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +run.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +run.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +run.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +run.o: ../core/basethread.h ../core/synchro.h specialdefault.o: specialdefault.h functionbase.h ../core/item.h ../db/db.h specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h specialdefault.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -782,14 +806,14 @@ specialdefault.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h specialdefault.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h specialdefault.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h specialdefault.o: download.h emacs.h last.h login.h logout.h ln.h ls.h -specialdefault.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h -specialdefault.o: stat.h subject.h template.h tinymce.h uname.h upload.h -specialdefault.o: uptime.h who.h vim.h ../core/htmlfilter.h +specialdefault.o: mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h +specialdefault.o: run.h stat.h subject.h template.h tinymce.h uname.h +specialdefault.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h specialdefault.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h specialdefault.o: ../notify/notifythread.h ../core/basethread.h specialdefault.o: ../core/synchro.h ../notify/templatesnotify.h specialdefault.o: ../core/users.h ../core/ugcontainer.h -specialdefault.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +specialdefault.o: ../core/lastcontainer.h ../core/mounts.h specialdefault.o: ../core/mountparser.h ../core/crypt.h ../core/users.h specialdefault.o: ../core/groups.h ../core/group.h ../core/loadavg.h specialdefault.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h @@ -811,16 +835,15 @@ stat.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h stat.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h stat.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h stat.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -stat.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +stat.o: mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h stat.o: specialdefault.h subject.h template.h tinymce.h uname.h upload.h stat.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h stat.o: ../templates/htmltextstream.h ../notify/notifythread.h stat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -stat.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -stat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -stat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -stat.o: ../core/synchro.h +stat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +stat.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -839,17 +862,16 @@ subject.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h subject.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h subject.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h subject.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -subject.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h -subject.o: priv.h reload.h rm.h run.h specialdefault.h stat.h template.h -subject.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +subject.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +subject.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.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 subject.o: ../templates/htmltextstream.h ../notify/notifythread.h subject.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h subject.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -subject.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -subject.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -subject.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -subject.o: ../core/synchro.h +subject.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +subject.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +subject.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 @@ -869,18 +891,17 @@ template.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h template.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h template.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h -template.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h -template.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -template.o: subject.h tinymce.h uname.h upload.h uptime.h who.h vim.h +template.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h +template.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h +template.o: stat.h subject.h tinymce.h uname.h upload.h uptime.h who.h vim.h template.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h template.o: ../templates/htmltextstream.h ../notify/notifythread.h template.o: ../core/basethread.h ../core/synchro.h template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -template.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -template.o: ../core/groups.h ../core/group.h ../core/loadavg.h -template.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -template.o: ../core/misc.h +template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +template.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +template.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +template.o: ../core/synchro.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 ../db/dbitemquery.h @@ -899,17 +920,16 @@ tinymce.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h tinymce.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h tinymce.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h tinymce.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -tinymce.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h -tinymce.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -tinymce.o: template.h uname.h upload.h uptime.h who.h vim.h +tinymce.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +tinymce.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +tinymce.o: subject.h template.h uname.h upload.h uptime.h who.h vim.h tinymce.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h tinymce.o: ../templates/htmltextstream.h ../notify/notifythread.h tinymce.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h tinymce.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -tinymce.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -tinymce.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -tinymce.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -tinymce.o: ../core/synchro.h +tinymce.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +tinymce.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +tinymce.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -928,16 +948,16 @@ uname.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h uname.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h uname.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h uname.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -uname.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h -uname.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h -uname.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +uname.o: logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h +uname.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +uname.o: tinymce.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h uname.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h uname.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h uname.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -uname.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -uname.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -uname.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -uname.o: ../core/basethread.h ../core/synchro.h +uname.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +uname.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +uname.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +uname.o: ../core/synchro.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 ../db/dbitemquery.h @@ -956,17 +976,17 @@ upload.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h upload.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h upload.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -upload.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h -upload.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +upload.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +upload.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h upload.o: template.h tinymce.h uname.h uptime.h who.h vim.h upload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h upload.o: ../templates/htmltextstream.h ../notify/notifythread.h upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -upload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -upload.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -upload.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -upload.o: ../core/synchro.h ../core/misc.h ../functions/functions.h +upload.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +upload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +upload.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -985,17 +1005,16 @@ uptime.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h uptime.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h uptime.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -uptime.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h -uptime.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +uptime.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +uptime.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h uptime.o: template.h tinymce.h uname.h upload.h who.h vim.h uptime.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h uptime.o: ../templates/htmltextstream.h ../notify/notifythread.h uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -uptime.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -uptime.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -uptime.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -uptime.o: ../core/synchro.h +uptime.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +uptime.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +uptime.o: ../core/thumb.h ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -1013,16 +1032,16 @@ vim.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h vim.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h vim.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h vim.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -vim.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -vim.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -vim.o: tinymce.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h -vim.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -vim.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -vim.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -vim.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -vim.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -vim.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -vim.o: ../core/synchro.h +vim.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +vim.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +vim.o: template.h tinymce.h uname.h upload.h uptime.h who.h +vim.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +vim.o: ../templates/htmltextstream.h ../notify/notifythread.h +vim.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +vim.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +vim.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +vim.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +vim.o: ../core/basethread.h ../core/synchro.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 ../db/dbitemquery.h @@ -1040,13 +1059,13 @@ who.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h who.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h who.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h who.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -who.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -who.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -who.o: tinymce.h uname.h upload.h uptime.h vim.h ../core/htmlfilter.h -who.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -who.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h -who.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -who.o: ../core/synchro.h +who.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h +who.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +who.o: template.h tinymce.h uname.h upload.h uptime.h vim.h +who.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +who.o: ../templates/htmltextstream.h ../notify/notifythread.h +who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +who.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +who.o: ../core/basethread.h ../core/synchro.h diff --git a/functions/Makefile.o.dep b/functions/Makefile.o.dep index e9284ac..13148e3 100755 --- a/functions/Makefile.o.dep +++ b/functions/Makefile.o.dep @@ -1 +1 @@ -o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o mkdir.o mv.o nicedit.o node.o priv.o privchanger.o reload.o rm.o run.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o +o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o mkdir.o mount.o mv.o nicedit.o node.o priv.o privchanger.o reload.o rm.o run.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o diff --git a/functions/functions.cpp b/functions/functions.cpp index 1de8243..2c28875 100755 --- a/functions/functions.cpp +++ b/functions/functions.cpp @@ -186,6 +186,7 @@ void Functions::CreateFunctions() Add(fun_ln); Add(fun_ls); Add(fun_mkdir); + Add(fun_mount); Add(fun_mv); Add(fun_nicedit); Add(fun_node); diff --git a/functions/functions.h b/functions/functions.h index 5cc97f1..1681ed0 100755 --- a/functions/functions.h +++ b/functions/functions.h @@ -28,6 +28,7 @@ #include "ln.h" #include "ls.h" #include "mkdir.h" +#include "mount.h" #include "mv.h" #include "nicedit.h" #include "node.h" @@ -71,6 +72,7 @@ public: Fun::Ln fun_ln; Fun::Ls fun_ls; Fun::Mkdir fun_mkdir; + Fun::Mount fun_mount; Fun::Mv fun_mv; Fun::Nicedit fun_nicedit; Fun::Node fun_node; diff --git a/functions/mount.cpp b/functions/mount.cpp new file mode 100755 index 0000000..3abaa3a --- /dev/null +++ b/functions/mount.cpp @@ -0,0 +1,41 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#include "mount.h" +#include "functions.h" + + + +namespace Fun +{ + +Mount::Mount() +{ + fun.url = L"mount"; +} + + +bool Mount::HasAccess() +{ + if( cur->session->puser && cur->session->puser->super_user ) + return true; + +return false; +} + + +void Mount::MakeGet() +{ + +} + + + + +} // namespace diff --git a/functions/mount.h b/functions/mount.h new file mode 100755 index 0000000..85e8a06 --- /dev/null +++ b/functions/mount.h @@ -0,0 +1,34 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_functions_mount +#define headerfile_winix_functions_mount + +#include "functionbase.h" + + + +namespace Fun +{ + + +class Mount : public FunctionBase +{ +public: + + Mount(); + bool HasAccess(); + void MakeGet(); + +}; + + +} // namespace + +#endif diff --git a/functions/upload.cpp b/functions/upload.cpp index 390e7e7..704120d 100755 --- a/functions/upload.cpp +++ b/functions/upload.cpp @@ -91,7 +91,7 @@ bool Upload::UploadSaveStaticFile(const Item & item, const std::wstring & tmp_fi void Upload::CreateThumb(Item & item) { - Mount & m = *system->mounts.pmount; + ::Mount & m = *system->mounts.pmount; size_t cx = config->thumb_cx; size_t cy = config->thumb_cy; int mode = config->thumb_mode; diff --git a/html/fun_mount.html b/html/fun_mount.html new file mode 100755 index 0000000..2373df0 --- /dev/null +++ b/html/fun_mount.html @@ -0,0 +1,52 @@ +

{mount_header}

+ + +

{mount_current}:

+ + + + + + + + + + + + + + + + +
{mount_type}{mount_dir}{mount_fs}{mount_parameters}
[mount_cur_type][mount_cur_dir][mount_cur_fs][mount_cur_parlist]
+ + + + +

{mount_table}:

+ +[if mount_tab] + + + + + + + + + + [for mount_tab] + + + + + + + + + [end] + +
{mount_type}{mount_dir}{mount_fs}{mount_parameters}
[mount_tab_type][mount_tab_dir][mount_tab_fs][mount_tab_parlist]
+[end] + + diff --git a/locale/en b/locale/en index d8a630b..e915076 100755 --- a/locale/en +++ b/locale/en @@ -227,6 +227,15 @@ adduser_submit = Add user register_user_submit = Register +mount_header = Mount points +mount_type = Mount point type +mount_dir = Directory +mount_fs = File system +mount_parameters = Parameters +mount_table = Table with all mount points +mount_current = Current mount point + + mv_header = Move mv_form_legend = Move form mv_page = Move page diff --git a/locale/pl b/locale/pl index 58dca77..0ce9187 100755 --- a/locale/pl +++ b/locale/pl @@ -239,6 +239,14 @@ adduser_submit = Dodaj użytkownika register_user_submit = Rejestruj +mount_header = Punkty montowania +mount_type = Rodzaj punktu montowania +mount_dir = Katalog +mount_fs = System plików +mount_parameters = Parametry +mount_table = Tabela wszystkich punktów montowania +mount_current = Bieżący punkt montowania + mv_header = Przenieś mv_form_legend = Formularz zmiany diff --git a/static/layout1/winix.css b/static/layout1/winix.css index 985ad21..c47832e 100755 --- a/static/layout1/winix.css +++ b/static/layout1/winix.css @@ -818,4 +818,12 @@ ul.galleryimages img { background: none; } +table.mountpoints { +} + +table.mountpoints th { +font-weight: bold; +white-space: normal; +text-align: center; +} diff --git a/templates/mount.cpp b/templates/mount.cpp index 9f917b0..f326bb8 100755 --- a/templates/mount.cpp +++ b/templates/mount.cpp @@ -2,13 +2,14 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ #include "templates.h" #include "core/misc.h" +#include "core/mounts.h" @@ -49,6 +50,141 @@ void mount_first_html_template(Info & i) } + + + + +static bool mount_tab_inited = false; +static Mounts::MountTab::const_iterator mount_iter; +static std::wstring dir_str; + + + +void mount_cur_type(Info & i) +{ + i.out << system->mounts.GetMountType(cur->mount->type); +} + + +void mount_cur_dir(Info & i) +{ + Item * pdir = system->dirs.GetDir(cur->mount->dir_id); + + if( pdir && system->dirs.MakePath(pdir->id, dir_str) ) + i.out << dir_str; +} + + +void mount_cur_fs(Info & i) +{ + i.out << system->mounts.GetMountFs(cur->mount->fs); +} + + +void mount_print_parlist(Info & i, const Mount::Param & param) +{ + bool was_printed = false; + + for(size_t p=0 ; p < param.size() ; ++p) + { + if( param[p].defined ) + { + if( was_printed ) + i.out << ", "; + + i.out << system->mounts.GetMountPar(p); + was_printed = true; + + if( !param[p].arg.empty() ) + { + i.out << "("; + + for(size_t a=0 ; a < param[p].arg.size() ; ++a) + { + i.out << param[p].arg[a]; + + if( a + 1 < param[p].arg.size() ) + i.out << ", "; + } + + i.out << ")"; + } + } + } +} + + +void mount_cur_parlist(Info & i) +{ + mount_print_parlist(i, cur->mount->param); +} + + + +void mount_tab(Info & i) +{ + const Mounts::MountTab * pmount_tab = system->mounts.GetMountTab(); + + if( i.iter == 0 ) + { + mount_iter = pmount_tab->begin(); + } + else + { + if( mount_iter != pmount_tab->end() ) + ++mount_iter; + } + + mount_tab_inited = (mount_iter != pmount_tab->end()); + i.res = mount_tab_inited; +} + + +void mount_tab_type(Info & i) +{ + if( mount_tab_inited ) + { + i.out << system->mounts.GetMountType(mount_iter->second.type); + } +} + + +void mount_tab_dir(Info & i) +{ + if( mount_tab_inited ) + { + Item * pdir = system->dirs.GetDir(mount_iter->second.dir_id); + + if( pdir && system->dirs.MakePath(pdir->id, dir_str) ) + i.out << dir_str; + } +} + + + +void mount_tab_fs(Info & i) +{ + if( mount_tab_inited ) + { + i.out << system->mounts.GetMountFs(mount_iter->second.fs); + } +} + + + + + + +void mount_tab_parlist(Info & i) +{ + if( !mount_tab_inited ) + return; + + mount_print_parlist(i, mount_iter->second.param); +} + + + } // namespace TemplatesFunctions diff --git a/templates/templates.cpp b/templates/templates.cpp index 9053482..99b52ab 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -297,6 +297,15 @@ void Templates::CreateFunctions() ezc_functions.Insert("mount_page_arg_is", mount_page_arg_is); ezc_functions.Insert("mount_has_html_template", mount_has_html_template); ezc_functions.Insert("mount_first_html_template", mount_first_html_template); + ezc_functions.Insert("mount_cur_type", mount_cur_type); + ezc_functions.Insert("mount_cur_dir", mount_cur_dir); + ezc_functions.Insert("mount_cur_fs", mount_cur_fs); + ezc_functions.Insert("mount_cur_parlist", mount_cur_parlist); + ezc_functions.Insert("mount_tab", mount_tab); + ezc_functions.Insert("mount_tab_type", mount_tab_type); + ezc_functions.Insert("mount_tab_dir", mount_tab_dir); + ezc_functions.Insert("mount_tab_fs", mount_tab_fs); + ezc_functions.Insert("mount_tab_parlist", mount_tab_parlist); /* diff --git a/templates/templates.h b/templates/templates.h index 00fb5ed..e27bd50 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -229,7 +229,15 @@ namespace TemplatesFunctions void mount_page_arg_is(Info & i); void mount_has_html_template(Info & i); void mount_first_html_template(Info & i); - + void mount_cur_type(Info & i); + void mount_cur_dir(Info & i); + void mount_cur_fs(Info & i); + void mount_cur_parlist(Info & i); + void mount_tab(Info & i); + void mount_tab_type(Info & i); + void mount_tab_dir(Info & i); + void mount_tab_fs(Info & i); + void mount_tab_parlist(Info & i); /*