From 0e9f587591c1ff6e426601bfdd3e2cfa24adc229 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 28 Feb 2012 21:09:44 +0000 Subject: [PATCH] added: to IsWhite (core/misc) other unicode white characters 25 characters -- without a new line character (10) added: config option: account_need_email_verification if true then when creating an account a user has to provide his email address and a message with an activation link will be sent back to him added: 'pw' winix function (not finished yet) at the moment only one parameter 'activate' git-svn-id: svn://ttmath.org/publicrep/winix/trunk@810 e52654a7-88a9-db11-a3e9-0013d4bc506e --- core/Makefile.dep | 156 +++++----- core/config.cpp | 1 + core/config.h | 6 +- core/misc.cpp | 46 ++- core/user.h | 42 +++ core/users.cpp | 52 +++- core/users.h | 2 +- db/db.cpp | 34 ++- db/db.h | 7 +- functions/Makefile.dep | 528 ++++++++++++++++----------------- functions/Makefile.o.dep | 2 +- functions/adduser.cpp | 184 +++++++++--- functions/adduser.h | 9 +- functions/functions.cpp | 1 + functions/functions.h | 2 + functions/login.cpp | 39 +-- functions/login.h | 1 + functions/passwd.cpp | 4 +- functions/pw.cpp | 126 ++++++++ functions/pw.h | 41 +++ html/fun_adduser.html | 14 +- html/slog.html | 4 +- locale/en | 28 +- locale/pl | 28 +- main/Makefile.dep | 20 +- notify/Makefile.dep | 11 +- notify/notify.cpp | 36 ++- notify/notify.h | 9 +- notify/notifypool.h | 52 ++-- notify/notifythread.cpp | 28 +- notify/templatesnotify.cpp | 2 +- plugins/export/Makefile.dep | 19 +- plugins/gallery/Makefile.dep | 35 ++- plugins/group/Makefile.dep | 35 +-- plugins/menu/Makefile.dep | 61 ++-- plugins/stats/Makefile.dep | 42 +-- plugins/thread/Makefile.dep | 78 +++-- plugins/ticket/Makefile.dep | 180 ++++++----- static/basic/winix.css | 10 + static/layout1/winix.css | 10 + templates/Makefile.dep | 358 +++++++++++----------- templates/templates.cpp | 61 ++-- templates/templates.h | 1 + templates/winix.cpp | 5 + txt/notify_confirm_account.txt | 25 ++ 45 files changed, 1489 insertions(+), 946 deletions(-) create mode 100755 functions/pw.cpp create mode 100755 functions/pw.h create mode 100755 txt/notify_confirm_account.txt diff --git a/core/Makefile.dep b/core/Makefile.dep index 335fd86..189a831 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -16,27 +16,28 @@ app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h app.o: ../../ezc/src/stringconv.h ../notify/notifythread.h app.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h app.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h -app.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h -app.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h image.h -app.o: basethread.h threadmanager.h sessionmanager.h sessioncontainer.h -app.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h -app.o: ../core/system.h ../core/synchro.h ../functions/functionparser.h -app.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h -app.o: ../functions/chmod.h ../functions/privchanger.h ../functions/chown.h +app.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h +app.o: loadavg.h image.h basethread.h threadmanager.h sessionmanager.h +app.o: sessioncontainer.h ../functions/functions.h +app.o: ../functions/functionbase.h ../core/request.h ../core/system.h +app.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +app.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +app.o: ../functions/privchanger.h ../functions/chown.h app.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h app.o: ../functions/download.h ../functions/emacs.h ../functions/env.h app.o: ../functions/last.h ../functions/login.h ../functions/logout.h app.o: ../functions/ln.h ../functions/ls.h ../functions/man.h app.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h app.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -app.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -app.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h -app.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h -app.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h -app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h -app.o: ../templates/templates.h ../templates/patterncacher.h -app.o: ../templates/indexpatterns.h ../templates/patterns.h -app.o: ../templates/changepatterns.h ../core/sessionmanager.h compress.h +app.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +app.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h +app.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +app.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +app.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h +app.o: ../core/htmlfilter.h ../templates/templates.h +app.o: ../templates/patterncacher.h ../templates/indexpatterns.h +app.o: ../templates/patterns.h ../templates/changepatterns.h +app.o: ../templates/htmltextstream.h ../core/sessionmanager.h compress.h app.o: postparser.h httpsimpleparser.h cookieparser.h postmultiparser.h app.o: acceptencodingparser.h acceptbaseparser.h plugin.h pluginmsg.h basethread.o: basethread.h @@ -62,9 +63,8 @@ config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h config.o: ../../ezc/src/stringconv.h ../notify/notifythread.h config.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h config.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h -config.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h -config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -config.o: image.h basethread.h threadmanager.h sessionmanager.h +config.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h +config.o: loadavg.h image.h basethread.h threadmanager.h sessionmanager.h config.o: sessioncontainer.h ../functions/functions.h config.o: ../functions/functionbase.h ../core/request.h ../core/system.h config.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h @@ -76,15 +76,15 @@ config.o: ../functions/last.h ../functions/login.h ../functions/logout.h config.o: ../functions/ln.h ../functions/ls.h ../functions/man.h config.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h config.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -config.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -config.o: ../functions/sort.h ../functions/specialdefault.h +config.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +config.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h config.o: ../functions/stat.h ../functions/subject.h ../functions/template.h 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 config.o: ../templates/patterncacher.h ../templates/indexpatterns.h config.o: ../templates/patterns.h ../templates/changepatterns.h -config.o: ../core/sessionmanager.h +config.o: ../templates/htmltextstream.h ../core/sessionmanager.h crypt.o: crypt.h run.h config.h htmlfilter.h user.h misc.h item.h crypt.o: requesttypes.h log.h textstream.h logmanipulators.h slog.h cur.h crypt.o: request.h error.h ../templates/htmltextstream.h ../core/textstream.h @@ -109,7 +109,6 @@ dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h dirs.o: ../../ezc/src/stringconv.h ../notify/notifythread.h dirs.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h dirs.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h -dirs.o: ../templates/misc.h ../templates/htmltextstream.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 requesttypes.h ../core/error.h ../db/dbitemquery.h @@ -135,10 +134,9 @@ image.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h image.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h image.o: ../../ezc/src/stringconv.h ../notify/notifythread.h image.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h -image.o: ../core/users.h ugcontainer.h lastcontainer.h ../templates/misc.h -image.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h -image.o: users.h groups.h group.h loadavg.h threadmanager.h plugin.h -image.o: pluginmsg.h sessionmanager.h sessioncontainer.h +image.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h +image.o: crypt.h run.h users.h groups.h group.h loadavg.h threadmanager.h +image.o: plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h image.o: ../functions/functions.h ../functions/functionbase.h image.o: ../core/request.h ../core/system.h ../core/synchro.h image.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h @@ -149,15 +147,16 @@ image.o: ../functions/env.h ../functions/last.h ../functions/login.h image.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h image.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h image.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -image.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -image.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h -image.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +image.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +image.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h +image.o: ../functions/specialdefault.h ../functions/stat.h +image.o: ../functions/subject.h ../functions/template.h image.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h image.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h image.o: ../core/htmlfilter.h ../templates/templates.h image.o: ../templates/patterncacher.h ../templates/indexpatterns.h image.o: ../templates/patterns.h ../templates/changepatterns.h -image.o: ../core/sessionmanager.h +image.o: ../templates/htmltextstream.h ../core/sessionmanager.h item.o: item.h misc.h requesttypes.h crypt.h run.h config.h htmlfilter.h item.o: user.h lastcontainer.o: lastcontainer.h log.h textstream.h logmanipulators.h slog.h @@ -207,8 +206,7 @@ mountparser.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h mountparser.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h mountparser.o: ../notify/notifythread.h ../core/basethread.h synchro.h mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -mountparser.o: ugcontainer.h lastcontainer.h ../templates/misc.h -mountparser.o: ../templates/htmltextstream.h +mountparser.o: ugcontainer.h lastcontainer.h mounts.o: mounts.h mount.h error.h dirs.h item.h dircontainer.h ../db/db.h mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h mounts.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h @@ -224,8 +222,7 @@ mounts.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h mounts.o: ../notify/notifythread.h ../core/basethread.h synchro.h mounts.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -mounts.o: ugcontainer.h lastcontainer.h ../templates/misc.h -mounts.o: ../templates/htmltextstream.h mountparser.h plugin.h pluginmsg.h +mounts.o: ugcontainer.h lastcontainer.h mountparser.h plugin.h pluginmsg.h mounts.o: system.h crypt.h run.h users.h groups.h group.h loadavg.h image.h mounts.o: basethread.h threadmanager.h sessionmanager.h sessioncontainer.h mounts.o: ../functions/functions.h ../functions/functionbase.h @@ -238,15 +235,16 @@ mounts.o: ../functions/env.h ../functions/last.h ../functions/login.h mounts.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h mounts.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h mounts.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -mounts.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -mounts.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h -mounts.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +mounts.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +mounts.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h +mounts.o: ../functions/specialdefault.h ../functions/stat.h +mounts.o: ../functions/subject.h ../functions/template.h 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 mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h mounts.o: ../templates/patterns.h ../templates/changepatterns.h -mounts.o: ../core/sessionmanager.h +mounts.o: ../templates/htmltextstream.h ../core/sessionmanager.h plugin.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h plugin.o: cur.h request.h requesttypes.h item.h error.h config.h htmlfilter.h plugin.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h @@ -262,8 +260,7 @@ plugin.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h plugin.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h plugin.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -plugin.o: ugcontainer.h lastcontainer.h ../templates/misc.h -plugin.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h +plugin.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h plugin.o: users.h groups.h group.h loadavg.h image.h basethread.h plugin.o: threadmanager.h sessionmanager.h sessioncontainer.h plugin.o: ../functions/functions.h ../functions/functionbase.h @@ -276,15 +273,16 @@ plugin.o: ../functions/env.h ../functions/last.h ../functions/login.h plugin.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h plugin.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h plugin.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -plugin.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h -plugin.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +plugin.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h +plugin.o: ../functions/specialdefault.h ../functions/stat.h +plugin.o: ../functions/subject.h ../functions/template.h 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 plugin.o: ../templates/patterncacher.h ../templates/indexpatterns.h plugin.o: ../templates/patterns.h ../templates/changepatterns.h -plugin.o: ../core/sessionmanager.h +plugin.o: ../templates/htmltextstream.h ../core/sessionmanager.h plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h plugindata.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h plugindata.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h @@ -301,8 +299,7 @@ plugindata.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h plugindata.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h plugindata.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -plugindata.o: ugcontainer.h lastcontainer.h ../templates/misc.h -plugindata.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h +plugindata.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h plugindata.o: run.h users.h groups.h group.h loadavg.h image.h basethread.h plugindata.o: threadmanager.h sessionmanager.h sessioncontainer.h plugindata.o: ../functions/functions.h ../functions/functionbase.h @@ -317,15 +314,16 @@ plugindata.o: ../functions/login.h ../functions/logout.h ../functions/ln.h plugindata.o: ../functions/ls.h ../functions/man.h ../functions/meta.h plugindata.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h plugindata.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h -plugindata.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h -plugindata.o: ../functions/specialdefault.h ../functions/stat.h -plugindata.o: ../functions/subject.h ../functions/template.h -plugindata.o: ../functions/tinymce.h ../functions/uname.h -plugindata.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h -plugindata.o: ../functions/vim.h ../core/htmlfilter.h -plugindata.o: ../templates/templates.h ../templates/patterncacher.h -plugindata.o: ../templates/indexpatterns.h ../templates/patterns.h -plugindata.o: ../templates/changepatterns.h ../core/sessionmanager.h +plugindata.o: ../functions/pw.h ../functions/reload.h ../functions/rm.h +plugindata.o: ../functions/sort.h ../functions/specialdefault.h +plugindata.o: ../functions/stat.h ../functions/subject.h +plugindata.o: ../functions/template.h ../functions/tinymce.h +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: ../templates/patterncacher.h ../templates/indexpatterns.h +plugindata.o: ../templates/patterns.h ../templates/changepatterns.h +plugindata.o: ../templates/htmltextstream.h ../core/sessionmanager.h postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h postmultiparser.o: htmlfilter.h misc.h item.h log.h textstream.h postmultiparser.o: logmanipulators.h slog.h cur.h request.h @@ -352,9 +350,8 @@ request.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h request.o: ../../ezc/src/stringconv.h ../notify/notifythread.h request.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h request.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h -request.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h -request.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -request.o: image.h basethread.h threadmanager.h sessionmanager.h +request.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h +request.o: loadavg.h image.h basethread.h threadmanager.h sessionmanager.h request.o: sessioncontainer.h ../functions/functions.h request.o: ../functions/functionbase.h ../core/request.h ../core/system.h request.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h @@ -366,15 +363,16 @@ request.o: ../functions/last.h ../functions/login.h ../functions/logout.h request.o: ../functions/ln.h ../functions/ls.h ../functions/man.h request.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h request.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -request.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -request.o: ../functions/sort.h ../functions/specialdefault.h -request.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +request.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +request.o: ../functions/rm.h ../functions/sort.h +request.o: ../functions/specialdefault.h ../functions/stat.h +request.o: ../functions/subject.h ../functions/template.h 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 request.o: ../templates/patterncacher.h ../templates/indexpatterns.h request.o: ../templates/patterns.h ../templates/changepatterns.h -request.o: ../core/sessionmanager.h +request.o: ../templates/htmltextstream.h ../core/sessionmanager.h run.o: run.h log.h textstream.h logmanipulators.h slog.h cur.h request.h run.o: requesttypes.h item.h error.h config.h htmlfilter.h run.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h @@ -405,8 +403,7 @@ sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h sessionmanager.o: ../notify/notifythread.h ../core/basethread.h synchro.h sessionmanager.o: ../notify/templatesnotify.h ../core/config.h -sessionmanager.o: ../core/users.h ugcontainer.h ../templates/misc.h -sessionmanager.o: ../templates/htmltextstream.h mounts.h mountparser.h +sessionmanager.o: ../core/users.h ugcontainer.h mounts.h mountparser.h sessionmanager.o: crypt.h run.h users.h groups.h group.h loadavg.h image.h sessionmanager.o: basethread.h threadmanager.h sessionparser.h plugin.h sessionmanager.o: pluginmsg.h ../functions/functions.h @@ -423,15 +420,16 @@ sessionmanager.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h sessionmanager.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h sessionmanager.o: ../functions/mv.h ../functions/nicedit.h sessionmanager.o: ../functions/node.h ../functions/passwd.h -sessionmanager.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -sessionmanager.o: ../functions/sort.h ../functions/specialdefault.h -sessionmanager.o: ../functions/stat.h ../functions/subject.h -sessionmanager.o: ../functions/template.h ../functions/tinymce.h -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: ../templates/patterncacher.h ../templates/indexpatterns.h -sessionmanager.o: ../templates/patterns.h ../templates/changepatterns.h +sessionmanager.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +sessionmanager.o: ../functions/rm.h ../functions/sort.h +sessionmanager.o: ../functions/specialdefault.h ../functions/stat.h +sessionmanager.o: ../functions/subject.h ../functions/template.h +sessionmanager.o: ../functions/tinymce.h ../functions/uname.h +sessionmanager.o: ../functions/upload.h ../functions/uptime.h +sessionmanager.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h +sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h +sessionmanager.o: ../templates/indexpatterns.h ../templates/patterns.h +sessionmanager.o: ../templates/changepatterns.h ../templates/htmltextstream.h sessionmanager.o: ../core/sessionmanager.h sessionparser.o: sessionparser.h session.h item.h error.h user.h plugindata.h sessionparser.o: rebus.h textstream.h sessioncontainer.h cur.h request.h @@ -459,13 +457,13 @@ system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h system.o: ../notify/notifythread.h ../core/basethread.h synchro.h system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -system.o: ugcontainer.h lastcontainer.h ../templates/misc.h -system.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h +system.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h system.o: users.h groups.h group.h loadavg.h image.h basethread.h system.o: threadmanager.h ../templates/templates.h system.o: ../templates/patterncacher.h ../templates/indexpatterns.h -system.o: ../templates/patterns.h ../templates/changepatterns.h ../core/cur.h -system.o: ../core/system.h ../core/sessionmanager.h ../core/htmlfilter.h +system.o: ../templates/patterns.h ../templates/changepatterns.h +system.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h +system.o: ../core/sessionmanager.h ../core/htmlfilter.h system.o: ../functions/functions.h ../functions/functionbase.h system.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h system.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h @@ -476,8 +474,8 @@ system.o: ../functions/last.h ../functions/login.h ../functions/logout.h system.o: ../functions/ln.h ../functions/ls.h ../functions/man.h system.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h system.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -system.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -system.o: ../functions/sort.h ../functions/specialdefault.h +system.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +system.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h system.o: ../functions/stat.h ../functions/subject.h ../functions/template.h system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h diff --git a/core/config.cpp b/core/config.cpp index 4f661c0..3988b81 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -234,6 +234,7 @@ void Config::AssignValues(bool stdout_is_closed) ezc_max_elements = Size(L"ezc_max_elements", 50000); ezc_max_loop_elements = Size(L"ezc_max_loop_elements", 5000); + account_need_email_verification = Bool(L"account_need_email_verification", true); } diff --git a/core/config.h b/core/config.h index 28a0118..763ab39 100755 --- a/core/config.h +++ b/core/config.h @@ -458,7 +458,6 @@ public: // default: 0222 int umask; - // maximum number for elements through the whole template // default: 50000 size_t ezc_max_elements; @@ -467,6 +466,11 @@ public: // default: 5000 (from ezc generator) size_t ezc_max_loop_elements; + // when true then when a user want to create a new account + // he has to provide his email and a message will be sent back to him + // with a link to activate the account + // default: true + bool account_need_email_verification; diff --git a/core/misc.cpp b/core/misc.cpp index 5d24aa5..ef3c134 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -19,13 +19,15 @@ namespace misc_private { + // white_chars table should be sorted + // we do not treat a new line character (10) as a white character + static const wchar_t white_chars[] = { 0x0009, 0x000B, 0x000C, 0x000D, 0x0020, 0x0085, 0x00A0, + 0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, + 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x2028, + 0x2029, 0x202F, 0x205F, 0x3000 }; + std::ifstream get_file_content; std::string get_file_content_ansi; - - - - - } @@ -536,18 +538,42 @@ return buffer; -// !! IMPROVE ME -// in UNICODE there are some additional white characters -bool IsWhite(wchar_t s) +/* + we do not treat a new line character (10) as a white character +*/ +bool IsWhite(wchar_t c) { - if( s==' ' || s=='\t' || s==13 || s==160 ) +using misc_private::white_chars; + + size_t len = sizeof(white_chars) / sizeof(wchar_t); + size_t o1 = 0; + size_t o2 = len - 1; + + if( c < white_chars[o1] || c > white_chars[o2] ) + return false; + + if( c == white_chars[o1] || c == white_chars[o2] ) return true; - + + while( o1 + 1 < o2 ) + { + size_t o = (o2 - o1)/2 + o1; + + if( c == white_chars[o] ) + return true; + + if( c > white_chars[o] ) + o1 = o; + else + o2 = o; + } + return false; } + bool IsLastSlash(const std::wstring & path) { if( path.empty() ) diff --git a/core/user.h b/core/user.h index f19804f..ec01f90 100755 --- a/core/user.h +++ b/core/user.h @@ -15,6 +15,41 @@ #include "confparser/space.h" +#define WINIX_ACCOUNT_MAX_LOGIN_SIZE 250 +#define WINIX_ACCOUNT_MAX_PASSWORD_SIZE 250 +#define WINIX_ACCOUNT_MAX_EMAIL_SIZE 250 + + + +// account status +// 1 - a user has created its account -- an email was sent back to him +#define WINIX_ACCOUNT_NOT_ACTIVATED 1 + +// 2 - a user clicked on the link in the mail and now can normally use his account +#define WINIX_ACCOUNT_READY 2 + +// 3 - account was suspended +#define WINIX_ACCOUNT_SUSPENDED 3 + +// 4 - account was banned +#define WINIX_ACCOUNT_BLOCKED 4 + + +/* + a user can login only to an account which status is equal to WINIX_ACCOUNT_READY + + actually there is no difference between WINIX_ACCOUNT_SUSPENDED and WINIX_ACCOUNT_BANNED + only a different message will be present on the website + + you can use other values of status in your plugins - this not have any impact on winix + the default 'login' winix function only allowes to login a user who has WINIX_ACCOUNT_READY value + but you can provide your own 'login' function which can work in a different way + + winix knows that user is login when cur->session->puser pointer is set + (when the pointer is not null then winix do not check what the value of 'status' is -- + the status is only tested in 'login' function) +*/ + /* a temporary struct used for hashing and encrypting a user's password @@ -51,6 +86,12 @@ struct User // an administrator can use 'env' winix function with 'a' parameter PT::Space aenv; + // account status + // WINIX_ACCOUNT_* + // a user can normally login only when status is WINIX_ACCOUNT_READY + int status; + + User() @@ -70,6 +111,7 @@ struct User time_zone_offset = 0; env.Clear(); aenv.Clear(); + status = WINIX_ACCOUNT_BLOCKED; } diff --git a/core/users.cpp b/core/users.cpp index 81959b3..f7d2aa0 100755 --- a/core/users.cpp +++ b/core/users.cpp @@ -128,26 +128,58 @@ User & Users::operator[](Users::SizeType pos) } -void Users::LoginUser(long user_id, bool remember_me) +bool Users::LoginUser(long user_id, bool remember_me, bool use_ses_log) { if( !cur->session ) - return; + return false; if( cur->session->id == 0 ) { log << log1 << "Users: cannot login a user on a temporary session" << logend; - return; + + if( use_ses_log ) + slog << logerror << T(L"service_unavailable") << logend; + + return false; } - cur->session->puser = GetUser(user_id); - cur->session->spam_score = 0; + User * puser = GetUser(user_id); - if( !cur->session->puser ) + if( !puser ) { - log << log1 << "Users: user id: " << user_id << " is not in system.users table" << logend; - return; + log << log1 << "Users: user id: " << user_id << " is not in system.users table" << logend; + + if( use_ses_log ) + slog << logerror << T(L"service_unavailable") << logend; + + return false; } - + + if( puser->status != WINIX_ACCOUNT_READY ) + { + log << log1 << "Users: user id: " << user_id << " is not ready for logging in (status: " + << puser->status << ")" << logend; + + if( use_ses_log ) + { + if( puser->status == WINIX_ACCOUNT_NOT_ACTIVATED ) + slog << logerror << T(L"account_not_activated") << logend; + else + if( puser->status == WINIX_ACCOUNT_SUSPENDED ) + slog << logerror << T(L"account_suspended") << logend; + else + if( puser->status == WINIX_ACCOUNT_BLOCKED ) + slog << logerror << T(L"account_banned") << logend; + } + + return false; + } + + if( cur->session->puser ) + LogoutCurrentUser(); + + cur->session->puser = puser; + cur->session->spam_score = 0; cur->session->remember_me = remember_me; last.UserLogin(user_id, cur->session->puser->name, inet_addr(cur->request->env_remote_addr), cur->session->id); @@ -156,6 +188,8 @@ void Users::LoginUser(long user_id, bool remember_me) how_many_logged += 1; log << log2 << "User " << cur->session->puser->name << " (id: " << user_id << ") logged" << logend; + +return true; } diff --git a/core/users.h b/core/users.h index e8df917..2dd7d40 100755 --- a/core/users.h +++ b/core/users.h @@ -50,7 +50,7 @@ public: SizeType Size(); User & operator[](SizeType pos); - void LoginUser(long user_id, bool remember_me); + bool LoginUser(long user_id, bool remember_me, bool use_ses_log = false); void LogoutCurrentUser(); void IncrementLoggedUsers(); diff --git a/db/db.cpp b/db/db.cpp index 5636b0e..cca1425 100755 --- a/db/db.cpp +++ b/db/db.cpp @@ -77,7 +77,7 @@ Error Db::AddUser(User & user, const UserPass & up) { query.Clear(); query << R("insert into core.user (login, password, pass_encrypted, super_user, email," - "notify, pass_type, pass_hash_salted, env, aenv) values (") + "notify, pass_type, pass_hash_salted, env, aenv, status) values (") << user.name; // for safety we put up.pass only if there is not an encrypted version @@ -96,6 +96,7 @@ Error Db::AddUser(User & user, const UserPass & up) << up.pass_hash_salted << user.env << user.aenv + << user.status << R(");"); r = AssertQuery(query); @@ -116,24 +117,22 @@ return status; -Error Db::ChangePass(const std::wstring & login, - const std::wstring & password, const std::string & password_encrypted, - int pass_type, bool pass_hash_salted) +Error Db::ChangeUserPass(const std::wstring & login, const UserPass & up) { query.Clear(); query << R("update core.user set(password, pass_encrypted," "pass_type, pass_hash_salted) = ("); // for safety - if( password_encrypted.empty() ) - query << password; + if( up.pass_encrypted.empty() ) + query << up.pass; else query << ""; - query.EPutBin(password_encrypted); + query.EPutBin(up.pass_encrypted); - query << pass_type - << pass_hash_salted + query << up.pass_type + << up.pass_hash_salted << R(") where login=") << login << R(";"); @@ -168,6 +167,19 @@ return DoCommand(query); } +Error Db::ChangeUserStatus(long user_id, int status) +{ + query.Clear(); + query << R("update core.user set(status) = (") + << status + << R(") where id = ") + << user_id + << R(";"); + +return DoCommand(query); +} + + //!! wywalic z nazwy 'Subject' nic nie jest robione z tytulem // ta metoda uzywana tez jest w EditParentUrlById() bool Db::AddItemCreateUrlSubject(Item & item) @@ -1528,7 +1540,7 @@ void Db::GetUsers(UGContainer & user_tab) try { query.Clear(); - query << R("select id, login, super_user, group_id, email, notify, env, aenv" + query << R("select id, login, super_user, group_id, email, notify, env, aenv, status" " from core.user left outer join core.group_mem on" " core.user.id = core.group_mem.user_id order by id asc;"); @@ -1545,6 +1557,7 @@ void Db::GetUsers(UGContainer & user_tab) int cnotify = AssertColumn(r, "notify"); int cenv = AssertColumn(r, "env"); int caenv = AssertColumn(r, "aenv"); + int cstatus = AssertColumn(r, "status"); User u; long last_id = -1; @@ -1560,6 +1573,7 @@ void Db::GetUsers(UGContainer & user_tab) u.super_user = AssertValueBool(r, i, csuper_user); u.email = AssertValueWide(r, i, cemail); u.notify = AssertValueInt(r, i, cnotify); + u.status = AssertValueInt(r, i, cstatus); AssertValueSpace(r, i, cenv, u.env); AssertValueSpace(r, i, caenv, u.aenv); diff --git a/db/db.h b/db/db.h index 4637df5..a620ee2 100755 --- a/db/db.h +++ b/db/db.h @@ -44,13 +44,12 @@ public: } - bool GetUserPass(const std::wstring & login, long & user_id, UserPass & up); + bool GetUserPass(const std::wstring & login, long & user_id, UserPass & up); Error AddUser(User & user, const UserPass & up); - - // !! change name to: ChangeUserPass ? - Error ChangePass(const std::wstring & login, const std::wstring & password, const std::string & password_encrypted, int pass_type, bool pass_hash_salted); + Error ChangeUserPass(const std::wstring & login, const UserPass & up); Error ChangeUserEnv(long user_id, const PT::Space & space); Error ChangeUserAdminEnv(long user_id, const PT::Space & space); + Error ChangeUserStatus(long user_id, int status); Error AddItem(Item & item); Error EditItemById(Item & item, bool with_url = true); diff --git a/functions/Makefile.dep b/functions/Makefile.dep index 61c8628..700c818 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -19,22 +19,22 @@ 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 env.h last.h login.h adduser.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -adduser.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -adduser.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -adduser.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h +adduser.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +adduser.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +adduser.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -adduser.o: ../templates/htmltextstream.h ../core/mounts.h -adduser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -adduser.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h -adduser.o: ../core/slog.h ../core/plugin.h ../core/pluginmsg.h -adduser.o: ../core/system.h ../core/sessionmanager.h -adduser.o: ../core/sessioncontainer.h ../functions/functions.h -adduser.o: ../templates/templates.h ../templates/patterncacher.h -adduser.o: ../templates/indexpatterns.h ../templates/patterns.h -adduser.o: ../templates/changepatterns.h ../core/sessionmanager.h +adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +adduser.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +adduser.o: ../core/loadavg.h ../core/image.h ../core/basethread.h +adduser.o: ../core/threadmanager.h ../core/synchro.h ../core/slog.h +adduser.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h +adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h +adduser.o: ../functions/functions.h ../templates/templates.h +adduser.o: ../templates/patterncacher.h ../templates/indexpatterns.h +adduser.o: ../templates/patterns.h ../templates/changepatterns.h +adduser.o: ../templates/htmltextstream.h ../core/sessionmanager.h +adduser.o: ../core/misc.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/requesttypes.h ../core/error.h @@ -52,13 +52,12 @@ cat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h cat.o: functionparser.h ../core/cur.h adduser.h chmod.h privchanger.h chown.h cat.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h login.h cat.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h -cat.o: priv.h reload.h rm.h run.h sort.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: priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h stat.h +cat.o: subject.h 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: ../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 ../templates/misc.h -cat.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +cat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h cat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h cat.o: ../core/loadavg.h ../core/image.h ../core/basethread.h cat.o: ../core/threadmanager.h ../core/synchro.h @@ -80,13 +79,12 @@ 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 env.h last.h login.h chmod.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -chmod.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -chmod.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -chmod.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +chmod.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +chmod.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +chmod.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -chmod.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h chmod.o: ../core/threadmanager.h ../core/synchro.h @@ -108,13 +106,12 @@ 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 env.h last.h login.h chown.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -chown.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -chown.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -chown.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +chown.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +chown.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +chown.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -chown.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h chown.o: ../core/threadmanager.h ../core/synchro.h @@ -137,18 +134,16 @@ 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 env.h ckeditor.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -ckeditor.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h +ckeditor.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h ckeditor.o: specialdefault.h stat.h subject.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 ../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 ../templates/misc.h -ckeditor.o: ../templates/htmltextstream.h ../core/mounts.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/image.h ../core/basethread.h ../core/threadmanager.h -ckeditor.o: ../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/image.h ../core/basethread.h +ckeditor.o: ../core/threadmanager.h ../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/requesttypes.h ../core/error.h @@ -166,13 +161,12 @@ cp.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h cp.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h cp.o: chown.h ckeditor.h default.h download.h emacs.h env.h last.h login.h cp.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h -cp.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h -cp.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +cp.o: priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h stat.h +cp.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h cp.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -cp.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h cp.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h @@ -181,7 +175,7 @@ cp.o: ../core/sessionmanager.h ../core/sessioncontainer.h cp.o: ../functions/functions.h ../templates/templates.h cp.o: ../templates/patterncacher.h ../templates/indexpatterns.h cp.o: ../templates/patterns.h ../templates/changepatterns.h -cp.o: ../core/sessionmanager.h +cp.o: ../templates/htmltextstream.h ../core/sessionmanager.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/requesttypes.h @@ -201,16 +195,16 @@ 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 env.h default.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -default.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h +default.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h default.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h default.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h default.o: ../../ezc/src/stringconv.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: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h -default.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -default.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -default.o: ../core/basethread.h ../core/threadmanager.h ../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/image.h ../core/basethread.h ../core/threadmanager.h +default.o: ../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 @@ -230,18 +224,16 @@ 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 env.h download.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -download.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h +download.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h download.o: specialdefault.h stat.h subject.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 ../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 ../templates/misc.h -download.o: ../templates/htmltextstream.h ../core/mounts.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/image.h ../core/basethread.h ../core/threadmanager.h -download.o: ../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/image.h ../core/basethread.h +download.o: ../core/threadmanager.h ../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/requesttypes.h ../core/error.h @@ -260,19 +252,18 @@ 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 env.h last.h login.h emacs.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -emacs.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -emacs.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -emacs.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +emacs.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +emacs.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +emacs.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -emacs.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h emacs.o: ../core/threadmanager.h ../core/synchro.h ../templates/templates.h emacs.o: ../templates/patterncacher.h ../templates/indexpatterns.h emacs.o: ../templates/patterns.h ../templates/changepatterns.h -emacs.o: ../core/sessionmanager.h +emacs.o: ../templates/htmltextstream.h ../core/sessionmanager.h env.o: env.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h env.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h env.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -290,13 +281,12 @@ env.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h env.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h env.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h env.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h -env.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h -env.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +env.o: priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h stat.h +env.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h env.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h env.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h env.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -env.o: ../core/lastcontainer.h ../templates/misc.h -env.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +env.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h env.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h env.o: ../core/loadavg.h ../core/image.h ../core/basethread.h env.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h @@ -320,14 +310,13 @@ functionbase.o: ../../ezc/src/pattern.h functions.h functionparser.h functionbase.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h functionbase.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h functionbase.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -functionbase.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h -functionbase.o: specialdefault.h stat.h subject.h template.h tinymce.h +functionbase.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h +functionbase.o: sort.h 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 ../notify/notifythread.h functionbase.o: ../core/basethread.h ../core/synchro.h functionbase.o: ../notify/templatesnotify.h ../core/users.h functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h -functionbase.o: ../templates/misc.h ../templates/htmltextstream.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/image.h ../core/basethread.h @@ -352,17 +341,17 @@ functionparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functionparser.o: functions.h adduser.h cat.h chmod.h privchanger.h chown.h functionparser.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h functionparser.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -functionparser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h -functionparser.o: specialdefault.h stat.h subject.h template.h tinymce.h -functionparser.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -functionparser.o: ../../ezc/src/stringconv.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: ../templates/misc.h ../templates/htmltextstream.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/image.h ../core/basethread.h +functionparser.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h +functionparser.o: sort.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: ../core/htmlfilter.h ../../ezc/src/stringconv.h +functionparser.o: ../notify/notifythread.h ../core/basethread.h +functionparser.o: ../core/synchro.h ../notify/templatesnotify.h +functionparser.o: ../core/users.h ../core/ugcontainer.h +functionparser.o: ../core/lastcontainer.h ../core/mounts.h +functionparser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h +functionparser.o: ../core/groups.h ../core/group.h ../core/loadavg.h +functionparser.o: ../core/image.h ../core/basethread.h functionparser.o: ../core/threadmanager.h ../core/synchro.h ../core/cur.h functionparser.o: ../core/log.h functions.o: functions.h functionbase.h ../core/item.h ../db/db.h @@ -384,24 +373,23 @@ functions.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.o: ../../ezc/src/stringconv.h ../notify/notifythread.h functions.o: ../core/basethread.h ../core/synchro.h functions.o: ../notify/templatesnotify.h ../core/users.h -functions.o: ../core/ugcontainer.h ../core/lastcontainer.h -functions.o: ../templates/misc.h ../templates/htmltextstream.h -functions.o: ../core/mounts.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/image.h ../core/basethread.h -functions.o: ../core/threadmanager.h ../core/synchro.h functionparser.h -functions.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h -functions.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h -functions.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h -functions.o: node.h passwd.h priv.h reload.h rm.h sort.h specialdefault.h -functions.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -functions.o: who.h vim.h ../core/htmlfilter.h ../core/log.h ../core/misc.h +functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +functions.o: ../core/mountparser.h ../core/crypt.h run.h ../core/users.h +functions.o: ../core/groups.h ../core/group.h ../core/loadavg.h +functions.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +functions.o: ../core/synchro.h functionparser.h ../core/cur.h adduser.h cat.h +functions.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h +functions.o: download.h emacs.h env.h last.h login.h logout.h ln.h ls.h man.h +functions.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h +functions.o: reload.h rm.h sort.h specialdefault.h stat.h subject.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/system.h functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h functions.o: ../functions/functions.h ../templates/templates.h functions.o: ../templates/patterncacher.h ../templates/indexpatterns.h functions.o: ../templates/patterns.h ../templates/changepatterns.h -functions.o: ../core/sessionmanager.h +functions.o: ../templates/htmltextstream.h ../core/sessionmanager.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/requesttypes.h ../core/error.h @@ -419,13 +407,12 @@ last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h last.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h last.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h login.h last.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -last.o: passwd.h priv.h reload.h rm.h run.h sort.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: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +last.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +last.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -last.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h last.o: ../core/threadmanager.h ../core/synchro.h @@ -446,13 +433,12 @@ ln.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h ln.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h ln.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h ln.o: login.h logout.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -ln.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h +ln.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h stat.h ln.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h ln.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -ln.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h ln.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h @@ -475,13 +461,12 @@ 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 env.h last.h login.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -login.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -login.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -login.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +login.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +login.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +login.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -login.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h login.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h @@ -489,7 +474,8 @@ login.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h login.o: ../core/sessioncontainer.h ../functions/functions.h login.o: ../templates/templates.h ../templates/patterncacher.h login.o: ../templates/indexpatterns.h ../templates/patterns.h -login.o: ../templates/changepatterns.h ../core/sessionmanager.h +login.o: ../templates/changepatterns.h ../templates/htmltextstream.h +login.o: ../core/sessionmanager.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/requesttypes.h @@ -509,21 +495,21 @@ 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: env.h last.h login.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h -logout.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h -logout.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -logout.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -logout.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -logout.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -logout.o: ../core/lastcontainer.h ../templates/misc.h -logout.o: ../templates/htmltextstream.h ../core/mounts.h -logout.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -logout.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -logout.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h -logout.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h -logout.o: ../core/sessionmanager.h ../core/sessioncontainer.h -logout.o: ../functions/functions.h ../templates/templates.h -logout.o: ../templates/patterncacher.h ../templates/indexpatterns.h -logout.o: ../templates/patterns.h ../templates/changepatterns.h +logout.o: node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h +logout.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +logout.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +logout.o: ../../ezc/src/stringconv.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/mountparser.h ../core/crypt.h +logout.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +logout.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +logout.o: ../core/synchro.h ../core/plugin.h ../core/pluginmsg.h +logout.o: ../core/system.h ../core/sessionmanager.h +logout.o: ../core/sessioncontainer.h ../functions/functions.h +logout.o: ../templates/templates.h ../templates/patterncacher.h +logout.o: ../templates/indexpatterns.h ../templates/patterns.h +logout.o: ../templates/changepatterns.h ../templates/htmltextstream.h logout.o: ../core/sessionmanager.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 @@ -542,13 +528,12 @@ ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h ls.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h ls.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h ls.o: login.h logout.h ln.h man.h meta.h mkdir.h mv.h nicedit.h node.h -ls.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h +ls.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h stat.h ls.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h ls.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -ls.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h ls.o: ../core/threadmanager.h ../core/synchro.h @@ -569,13 +554,12 @@ man.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h man.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h man.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h man.o: login.h logout.h ln.h ls.h meta.h mkdir.h mv.h nicedit.h node.h -man.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -man.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -man.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +man.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +man.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +man.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h man.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h man.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -man.o: ../core/lastcontainer.h ../templates/misc.h -man.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +man.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h man.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h man.o: ../core/loadavg.h ../core/image.h ../core/basethread.h man.o: ../core/threadmanager.h ../core/synchro.h @@ -596,13 +580,12 @@ meta.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h meta.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h meta.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h meta.o: login.h logout.h ln.h ls.h man.h mkdir.h mv.h nicedit.h node.h -meta.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -meta.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -meta.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +meta.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +meta.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +meta.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h meta.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h meta.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -meta.o: ../core/lastcontainer.h ../templates/misc.h -meta.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +meta.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h meta.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h meta.o: ../core/loadavg.h ../core/image.h ../core/basethread.h meta.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h @@ -624,13 +607,12 @@ 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 env.h last.h mkdir.o: login.h logout.h ln.h ls.h man.h meta.h mv.h nicedit.h node.h -mkdir.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -mkdir.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -mkdir.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +mkdir.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +mkdir.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +mkdir.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -mkdir.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h mkdir.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h @@ -638,7 +620,8 @@ mkdir.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h mkdir.o: ../core/sessioncontainer.h ../functions/functions.h mkdir.o: ../templates/templates.h ../templates/patterncacher.h mkdir.o: ../templates/indexpatterns.h ../templates/patterns.h -mkdir.o: ../templates/changepatterns.h ../core/sessionmanager.h +mkdir.o: ../templates/changepatterns.h ../templates/htmltextstream.h +mkdir.o: ../core/sessionmanager.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/requesttypes.h ../core/error.h @@ -657,16 +640,16 @@ 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 env.h last.h mount.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h -mount.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h -mount.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -mount.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -mount.o: ../templates/htmltextstream.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/image.h ../core/basethread.h -mount.o: ../core/threadmanager.h ../core/synchro.h +mount.o: node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h +mount.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +mount.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +mount.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +mount.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +mount.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +mount.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +mount.o: ../core/image.h ../core/basethread.h ../core/threadmanager.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/requesttypes.h ../core/error.h @@ -684,13 +667,12 @@ mv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h mv.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h mv.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h mv.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h nicedit.h node.h -mv.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h +mv.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h stat.h mv.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h mv.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -mv.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h mv.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h @@ -698,7 +680,8 @@ mv.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h mv.o: ../core/sessioncontainer.h ../functions/functions.h mv.o: ../templates/templates.h ../templates/patterncacher.h mv.o: ../templates/indexpatterns.h ../templates/patterns.h -mv.o: ../templates/changepatterns.h ../core/sessionmanager.h +mv.o: ../templates/changepatterns.h ../templates/htmltextstream.h +mv.o: ../core/sessionmanager.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 nicedit.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -718,16 +701,16 @@ 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: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -nicedit.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h -nicedit.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -nicedit.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -nicedit.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -nicedit.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -nicedit.o: ../core/lastcontainer.h ../templates/misc.h -nicedit.o: ../templates/htmltextstream.h ../core/mounts.h -nicedit.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -nicedit.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -nicedit.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h +nicedit.o: node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h +nicedit.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +nicedit.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +nicedit.o: ../../ezc/src/stringconv.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/mountparser.h ../core/crypt.h +nicedit.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +nicedit.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +nicedit.o: ../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/requesttypes.h ../core/error.h @@ -745,13 +728,12 @@ node.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h node.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h node.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h node.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h -node.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -node.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -node.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +node.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.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: ../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 ../templates/misc.h -node.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h node.o: ../core/threadmanager.h ../core/synchro.h @@ -774,17 +756,16 @@ passwd.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h passwd.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h passwd.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h passwd.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -passwd.o: nicedit.h node.h priv.h reload.h rm.h run.h sort.h specialdefault.h -passwd.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -passwd.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -passwd.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -passwd.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -passwd.o: ../core/lastcontainer.h ../templates/misc.h -passwd.o: ../templates/htmltextstream.h ../core/mounts.h -passwd.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -passwd.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -passwd.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h -passwd.o: ../core/slog.h ../functions/functions.h +passwd.o: nicedit.h node.h priv.h pw.h reload.h rm.h run.h sort.h +passwd.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +passwd.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +passwd.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +passwd.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +passwd.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +passwd.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +passwd.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +passwd.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +passwd.o: ../core/synchro.h ../core/slog.h ../functions/functions.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/requesttypes.h ../core/error.h @@ -802,13 +783,12 @@ priv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h priv.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h priv.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h priv.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -priv.o: passwd.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h -priv.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +priv.o: passwd.h pw.h reload.h rm.h run.h sort.h specialdefault.h stat.h +priv.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h priv.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -priv.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h priv.o: ../core/threadmanager.h ../core/synchro.h @@ -832,18 +812,42 @@ privchanger.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.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 env.h last.h privchanger.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h -privchanger.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h +privchanger.o: node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h privchanger.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h privchanger.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h privchanger.o: ../../ezc/src/stringconv.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 -privchanger.o: ../templates/misc.h ../templates/htmltextstream.h -privchanger.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -privchanger.o: ../core/users.h ../core/groups.h ../core/group.h -privchanger.o: ../core/loadavg.h ../core/image.h ../core/basethread.h -privchanger.o: ../core/threadmanager.h +privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.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/image.h ../core/basethread.h ../core/threadmanager.h +pw.o: pw.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h +pw.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h +pw.o: ../core/item.h ../core/requesttypes.h ../core/error.h +pw.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +pw.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +pw.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +pw.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +pw.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h +pw.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +pw.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h +pw.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +pw.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h +pw.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h +pw.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +pw.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h +pw.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h +pw.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h +pw.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h +pw.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +pw.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +pw.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +pw.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +pw.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +pw.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +pw.o: ../core/loadavg.h ../core/image.h ../core/basethread.h +pw.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h ../core/misc.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/requesttypes.h @@ -863,19 +867,19 @@ 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: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -reload.o: nicedit.h node.h passwd.h priv.h rm.h run.h sort.h specialdefault.h -reload.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -reload.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -reload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -reload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -reload.o: ../core/lastcontainer.h ../templates/misc.h -reload.o: ../templates/htmltextstream.h ../core/mounts.h -reload.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -reload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -reload.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h -reload.o: ../templates/templates.h ../templates/patterncacher.h -reload.o: ../templates/indexpatterns.h ../templates/patterns.h -reload.o: ../templates/changepatterns.h ../core/sessionmanager.h +reload.o: nicedit.h node.h passwd.h priv.h pw.h rm.h run.h sort.h +reload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +reload.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +reload.o: ../../ezc/src/stringconv.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/mountparser.h ../core/crypt.h +reload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +reload.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +reload.o: ../core/synchro.h ../templates/templates.h +reload.o: ../templates/patterncacher.h ../templates/indexpatterns.h +reload.o: ../templates/patterns.h ../templates/changepatterns.h +reload.o: ../templates/htmltextstream.h ../core/sessionmanager.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 rm.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -893,13 +897,12 @@ rm.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h rm.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h rm.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h rm.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -rm.o: passwd.h priv.h reload.h run.h sort.h specialdefault.h stat.h subject.h -rm.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +rm.o: passwd.h priv.h pw.h reload.h run.h sort.h specialdefault.h stat.h +rm.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h rm.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -rm.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h rm.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h @@ -907,7 +910,8 @@ rm.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h rm.o: ../core/sessioncontainer.h ../functions/functions.h rm.o: ../templates/templates.h ../templates/patterncacher.h rm.o: ../templates/indexpatterns.h ../templates/patterns.h -rm.o: ../templates/changepatterns.h ../core/sessionmanager.h ../core/misc.h +rm.o: ../templates/changepatterns.h ../templates/htmltextstream.h +rm.o: ../core/sessionmanager.h ../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/requesttypes.h ../core/error.h @@ -925,13 +929,12 @@ run.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h run.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h run.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h run.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -run.o: passwd.h priv.h reload.h rm.h sort.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: passwd.h priv.h pw.h reload.h rm.h sort.h specialdefault.h stat.h +run.o: subject.h 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: ../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 ../templates/misc.h -run.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +run.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h run.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h run.o: ../core/loadavg.h ../core/image.h ../core/basethread.h run.o: ../core/threadmanager.h ../core/synchro.h @@ -952,13 +955,12 @@ sort.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h sort.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h sort.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h sort.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -sort.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -sort.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +sort.o: passwd.h priv.h pw.h reload.h rm.h run.h specialdefault.h stat.h +sort.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h sort.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h sort.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h sort.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -sort.o: ../core/lastcontainer.h ../templates/misc.h -sort.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +sort.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h sort.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h sort.o: ../core/loadavg.h ../core/image.h ../core/basethread.h sort.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h @@ -966,7 +968,8 @@ sort.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h sort.o: ../core/sessioncontainer.h ../functions/functions.h sort.o: ../templates/templates.h ../templates/patterncacher.h sort.o: ../templates/indexpatterns.h ../templates/patterns.h -sort.o: ../templates/changepatterns.h ../core/sessionmanager.h +sort.o: ../templates/changepatterns.h ../templates/htmltextstream.h +sort.o: ../core/sessionmanager.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 @@ -988,14 +991,13 @@ 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 env.h last.h login.h logout.h ln.h ls.h specialdefault.o: man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h -specialdefault.o: reload.h rm.h run.h sort.h stat.h subject.h template.h +specialdefault.o: pw.h reload.h rm.h run.h sort.h stat.h subject.h template.h specialdefault.o: tinymce.h uname.h upload.h uptime.h who.h vim.h specialdefault.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -specialdefault.o: ../templates/htmltextstream.h ../core/mounts.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/image.h ../core/basethread.h @@ -1017,13 +1019,12 @@ stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h stat.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h stat.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h stat.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -stat.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h subject.h -stat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +stat.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +stat.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h stat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -stat.o: ../core/lastcontainer.h ../templates/misc.h -stat.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +stat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h stat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h stat.o: ../core/loadavg.h ../core/image.h ../core/basethread.h stat.o: ../core/threadmanager.h ../core/synchro.h @@ -1046,16 +1047,16 @@ 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: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -subject.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h +subject.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h subject.o: specialdefault.h stat.h template.h tinymce.h uname.h upload.h subject.o: uptime.h who.h vim.h ../core/htmlfilter.h subject.o: ../../ezc/src/stringconv.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: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h -subject.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -subject.o: ../core/basethread.h ../core/threadmanager.h ../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/image.h ../core/basethread.h ../core/threadmanager.h +subject.o: ../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 @@ -1075,18 +1076,16 @@ 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 env.h last.h login.h logout.h ln.h ls.h man.h meta.h -template.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h -template.o: sort.h specialdefault.h stat.h subject.h tinymce.h uname.h +template.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h +template.o: run.h sort.h specialdefault.h stat.h subject.h tinymce.h uname.h template.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h template.o: ../../ezc/src/stringconv.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 ../templates/misc.h -template.o: ../templates/htmltextstream.h ../core/mounts.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/image.h ../core/basethread.h ../core/threadmanager.h -template.o: ../core/synchro.h ../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/image.h ../core/basethread.h +template.o: ../core/threadmanager.h ../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/requesttypes.h @@ -1106,16 +1105,16 @@ 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: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -tinymce.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h +tinymce.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h tinymce.o: specialdefault.h stat.h subject.h template.h uname.h upload.h tinymce.o: uptime.h who.h vim.h ../core/htmlfilter.h tinymce.o: ../../ezc/src/stringconv.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: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h -tinymce.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -tinymce.o: ../core/basethread.h ../core/threadmanager.h ../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/image.h ../core/basethread.h ../core/threadmanager.h +tinymce.o: ../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/requesttypes.h ../core/error.h @@ -1134,13 +1133,12 @@ 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 env.h last.h uname.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h -uname.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h -uname.o: stat.h subject.h template.h tinymce.h upload.h uptime.h who.h vim.h -uname.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +uname.o: node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h +uname.o: specialdefault.h stat.h subject.h template.h tinymce.h upload.h +uname.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -uname.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.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/image.h ../core/basethread.h uname.o: ../core/threadmanager.h ../core/synchro.h @@ -1163,22 +1161,22 @@ 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: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -upload.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h +upload.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h upload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h upload.o: uptime.h who.h vim.h ../core/htmlfilter.h upload.o: ../../ezc/src/stringconv.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: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h -upload.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -upload.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h -upload.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h -upload.o: ../core/system.h ../core/sessionmanager.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/image.h ../core/basethread.h ../core/threadmanager.h +upload.o: ../core/synchro.h ../core/misc.h ../core/plugin.h +upload.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h upload.o: ../core/sessioncontainer.h ../functions/functions.h upload.o: ../templates/templates.h ../templates/patterncacher.h upload.o: ../templates/indexpatterns.h ../templates/patterns.h -upload.o: ../templates/changepatterns.h ../core/sessionmanager.h +upload.o: ../templates/changepatterns.h ../templates/htmltextstream.h +upload.o: ../core/sessionmanager.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/requesttypes.h @@ -1198,16 +1196,16 @@ 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: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h -uptime.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h +uptime.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h run.h sort.h uptime.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h uptime.o: upload.h who.h vim.h ../core/htmlfilter.h uptime.o: ../../ezc/src/stringconv.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: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h -uptime.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -uptime.o: ../core/basethread.h ../core/threadmanager.h ../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/image.h ../core/basethread.h ../core/threadmanager.h +uptime.o: ../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/requesttypes.h ../core/error.h @@ -1225,13 +1223,12 @@ vim.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h vim.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h vim.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h vim.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -vim.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -vim.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +vim.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +vim.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -vim.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +vim.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h vim.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h vim.o: ../core/loadavg.h ../core/image.h ../core/basethread.h vim.o: ../core/threadmanager.h ../core/synchro.h @@ -1252,13 +1249,12 @@ who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h who.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h who.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h who.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h -who.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h -who.o: subject.h template.h tinymce.h uname.h upload.h uptime.h vim.h +who.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h +who.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h vim.h who.o: ../core/htmlfilter.h ../../ezc/src/stringconv.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 ../templates/misc.h -who.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h who.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h who.o: ../core/loadavg.h ../core/image.h ../core/basethread.h who.o: ../core/threadmanager.h ../core/synchro.h diff --git a/functions/Makefile.o.dep b/functions/Makefile.o.dep index bdd2d33..7ed47bc 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 env.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o man.o meta.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o reload.o rm.o run.o sort.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 env.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o man.o meta.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o pw.o reload.o rm.o run.o sort.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/adduser.cpp b/functions/adduser.cpp index 2938093..fa48323 100755 --- a/functions/adduser.cpp +++ b/functions/adduser.cpp @@ -7,9 +7,11 @@ * */ +#include #include "adduser.h" #include "core/slog.h" #include "core/plugin.h" +#include "core/misc.h" @@ -24,15 +26,12 @@ AddUser::AddUser() /* - checking whether login consists of allowed characters - currently all characters above 32 (space) are available - - 160 - unbreakable space + checking whether a login consists of allowed characters */ bool AddUser::HasLoginCorrectChars(const std::wstring & login) { for(size_t i=0 ; i WINIX_ACCOUNT_MAX_LOGIN_SIZE ) + { + log << log2 << "AddUser: login can't be longer than: " << WINIX_ACCOUNT_MAX_LOGIN_SIZE << " characters" << logend; + + if( use_ses_log ) + slog << logerror << T("adduser_err_login_too_big") << " " << WINIX_ACCOUNT_MAX_LOGIN_SIZE + << " " << T("adduser_err_login_too_big2") << logend; + return false; } if( !HasLoginCorrectChars(login) ) { - log << log3 << "AddUser: incorrect login characters" << logend; - slog << logerror << T("adduser_err_login_incorrect_chars") << logend; + log << log2 << "AddUser: incorrect login characters" << logend; + + if( use_ses_log ) + slog << logerror << T("adduser_err_login_incorrect_chars") << logend; + return false; } if( system->users.IsUser(login) ) { - log << log3 << "AddUser: such user already exists" << logend; - slog << logerror << T("adduser_err_user_exists") << logend; + log << log2 << "AddUser: such user already exists" << logend; + + if( use_ses_log ) + slog << logerror << T("adduser_err_user_exists") << logend; + return false; } @@ -68,27 +87,103 @@ return true; -bool AddUser::IsPasswordCorrect(const std::wstring & pass, const std::wstring & conf_pass) +// !! IMPROVE ME +// add some email validation here +bool AddUser::IsEmailCorrect(const std::wstring & email, bool use_ses_log) +{ + if( email.size() > WINIX_ACCOUNT_MAX_EMAIL_SIZE ) + { + log << log2 << "AddUser: email can't be longer than: " << WINIX_ACCOUNT_MAX_EMAIL_SIZE << " characters" << logend; + + if( use_ses_log ) + slog << logerror << T("adduser_err_email_too_big") << " " << WINIX_ACCOUNT_MAX_EMAIL_SIZE + << " " << T("adduser_err_email_too_big2") << logend; + + return false; + } + +return true; +} + + +bool AddUser::IsPasswordCorrect(const std::wstring & pass, const std::wstring & conf_pass, bool use_ses_log) { if( pass != conf_pass ) { - log << log3 << "AddUser: passwords are different" << logend; - slog << logerror << T("adduser_err_passwords_different") << logend; + log << log2 << "AddUser: passwords are different" << logend; + + if( use_ses_log ) + slog << logerror << T("adduser_err_passwords_different") << logend; + return false; } if( pass.size() < config->pass_min_size ) { - log << log3 << "AddUser: password is too small" << logend; - slog << logerror << T("adduser_err_password_too_small") << " " - << config->pass_min_size << " " << T("adduser_err_password_too_small2") << logend; + log << log2 << "AddUser: password is too small" << logend; + + if( use_ses_log ) + slog << logerror << T("adduser_err_password_too_small") << " " + << config->pass_min_size << " " << T("adduser_err_password_too_small2") << logend; + return false; } + if( pass.size() > WINIX_ACCOUNT_MAX_PASSWORD_SIZE ) + { + log << log2 << "AddUser: password can't be longer than: " << WINIX_ACCOUNT_MAX_PASSWORD_SIZE << " characters" << logend; + + if( use_ses_log ) + slog << logerror << T("adduser_err_password_too_big") << " " << WINIX_ACCOUNT_MAX_PASSWORD_SIZE + << " " << T("adduser_err_password_too_big2") << logend; + + return false; + } + + return true; } +/* + adding a new account + this method doesn't check whether the login or password is correct + (consist of allowed characters) + + input: + user - all fields from User struct without 'id' + pass - user's password + + output: + result: true when the account has been successfully created + and user.id will be set +*/ +bool AddUser::AddNewUser(User & user, const std::wstring & pass) +{ + up.pass = pass; + system->crypt.PassHashCrypt(up); + + if( db->AddUser(user, up) == WINIX_ERR_OK ) + { + if( system->users.AddUser(user) ) + { + log << log2 << "AddUser: added a new user: " << user.name << logend; + return true; + } + else + { + log << log1 << "AddUser: I can't add to system->users: " << user.name + << " but the user was added to the db correctly" << logend; + } + } + else + { + log << log1 << "AddUser: I cannot add a user -- database error" << logend; + } + +return false; +} + void AddUser::MakePost() @@ -97,35 +192,46 @@ void AddUser::MakePost() const std::wstring & login = cur->request->PostVar(L"login"); const std::wstring & pass = cur->request->PostVar(L"password"); const std::wstring & conf_pass = cur->request->PostVar(L"passwordconfirm"); + const std::wstring & email = cur->request->PostVar(L"email"); + long code = 0; - if( !IsLoginCorrect(login) || !IsPasswordCorrect(pass, conf_pass) ) + if( !IsLoginCorrect(login, true) || !IsEmailCorrect(email, true) || !IsPasswordCorrect(pass, conf_pass, true) ) return; - user.name = login; - user.email = cur->request->PostVar(L"email"); + user.name = login; + user.email = email; + user.super_user = false; + user.notify = 0; + user.status = (config->account_need_email_verification)? WINIX_ACCOUNT_NOT_ACTIVATED : WINIX_ACCOUNT_READY; - up.pass = pass; - system->crypt.PassHashCrypt(up); - - cur->request->status = db->AddUser(user, up); - - if( cur->request->status == WINIX_ERR_OK ) + if( cur->session->puser && cur->session->puser->super_user ) { - if( system->users.AddUser(user) ) + if( cur->request->IsPostVar(L"autoactivate") ) { - log << log2 << "AddUser: added a new user: " << user.name << logend; - - if( !cur->session->puser ) - { - system->users.LoginUser(user.id, false); - log << log2 << "AddUser: now logged as: " << user.name << logend; - plugin.Call(WINIX_USER_LOGGED); - } + user.status = WINIX_ACCOUNT_READY; + log << log2 << "AddUser: account activated by an admin" << logend; } - else + } + + if( user.status == WINIX_ACCOUNT_NOT_ACTIVATED ) + { + code = std::rand(); + user.aenv.Add(L"activation_code", code); + } + + if( AddNewUser(user, pass) ) + { + if( !cur->session->puser && user.status == WINIX_ACCOUNT_READY ) { - log << log1 << "AddUser: I can't add to system->users: " << user.name - << " but the user was added to the db correctly" << logend; + system->users.LoginUser(user.id, false); + log << log2 << "AddUser: now logged as: " << user.name << logend; + plugin.Call(WINIX_USER_LOGGED); + } + + if( user.status == WINIX_ACCOUNT_NOT_ACTIVATED ) + { + system->notify.ActivateAccount(user.name, user.email, code); + slog << loginfo << T(L"account_email_sent") << logend; } system->RedirectToLastItem(); diff --git a/functions/adduser.h b/functions/adduser.h index 99c1a3e..861c291 100755 --- a/functions/adduser.h +++ b/functions/adduser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2012, Tomasz Sowa * All rights reserved. * */ @@ -26,9 +26,12 @@ public: void MakePost(); void MakeGet(); - bool IsLoginCorrect(const std::wstring & login); - bool IsPasswordCorrect(const std::wstring & pass, const std::wstring & conf_pass); + bool IsLoginCorrect(const std::wstring & login, bool use_ses_log = false); + bool IsPasswordCorrect(const std::wstring & pass, const std::wstring & conf_pass, bool use_ses_log = false); + bool IsEmailCorrect(const std::wstring & email, bool use_ses_log = false); + bool HasLoginCorrectChars(const std::wstring & login); + bool AddNewUser(User & user, const std::wstring & pass); private: diff --git a/functions/functions.cpp b/functions/functions.cpp index 031896c..b449707 100755 --- a/functions/functions.cpp +++ b/functions/functions.cpp @@ -200,6 +200,7 @@ void Functions::CreateFunctions() Add(fun_node); Add(fun_passwd); Add(fun_priv); + Add(fun_pw); Add(fun_reload); Add(fun_rm); Add(fun_run); diff --git a/functions/functions.h b/functions/functions.h index e7e1ecd..bca5a9d 100755 --- a/functions/functions.h +++ b/functions/functions.h @@ -37,6 +37,7 @@ #include "node.h" #include "passwd.h" #include "priv.h" +#include "pw.h" #include "reload.h" #include "rm.h" #include "run.h" @@ -86,6 +87,7 @@ public: Fun::Node fun_node; Fun::Passwd fun_passwd; Fun::Priv fun_priv; + Fun::Pw fun_pw; Fun::Reload fun_reload; Fun::Rm fun_rm; Fun::Run fun_run; diff --git a/functions/login.cpp b/functions/login.cpp index 64090d2..33a93a9 100755 --- a/functions/login.cpp +++ b/functions/login.cpp @@ -95,41 +95,44 @@ return result; } - -void Login::MakePost() +bool Login::LoginUser(const std::wstring & login, const std::wstring & password, bool remember_me, bool use_ses_log) { +long user_id; + if( cur->session->id == 0 ) { log << log1 << "Login: can't login in a temporary session (skipped)" << logend; - return; + return false; } - if( cur->session->puser ) - system->users.LogoutCurrentUser(); - - const std::wstring & login = cur->request->PostVar(L"login"); - const std::wstring & pass = cur->request->PostVar(L"password"); - const std::wstring & remem = cur->request->PostVar(L"rememberme"); - long user_id; - - if( CheckUserPass(login, pass, user_id) ) + if( CheckUserPass(login, password, user_id) ) { - system->users.LoginUser(user_id, !remem.empty()); - - if( cur->session->puser ) + if( system->users.LoginUser(user_id, remember_me, use_ses_log) ) + { plugin.Call(WINIX_USER_LOGGED); + return true; + } } else { log << log2 << "Login: incorrect login/password" << logend; } - system->RedirectToLastItem(); +return false; +} + + +void Login::MakePost() +{ + const std::wstring & login = cur->request->PostVar(L"login"); + const std::wstring & pass = cur->request->PostVar(L"password"); + const std::wstring & remem = cur->request->PostVar(L"rememberme"); + + if( LoginUser(login, pass, !remem.empty(), true) ) + system->RedirectToLastItem(); } - - } // namespace diff --git a/functions/login.h b/functions/login.h index e117626..e6c43eb 100755 --- a/functions/login.h +++ b/functions/login.h @@ -26,6 +26,7 @@ public: Login(); void MakePost(); bool CheckUserPass(const std::wstring & login, const std::wstring & password, long & user_id); + bool LoginUser(const std::wstring & login, const std::wstring & password, bool remember_me, bool use_ses_log = false); private: diff --git a/functions/passwd.cpp b/functions/passwd.cpp index 7c49ba2..f20cb94 100755 --- a/functions/passwd.cpp +++ b/functions/passwd.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2012, Tomasz Sowa * All rights reserved. * */ @@ -34,7 +34,7 @@ bool Passwd::ChangePassword(const std::wstring & login, const std::wstring & new { up.pass = new_password; system->crypt.PassHashCrypt(up); - Error res = db->ChangePass(login, up.pass, up.pass_encrypted, up.pass_type, up.pass_hash_salted); + Error res = db->ChangeUserPass(login, up); return res == WINIX_ERR_OK; } diff --git a/functions/pw.cpp b/functions/pw.cpp new file mode 100755 index 0000000..9e9f6af --- /dev/null +++ b/functions/pw.cpp @@ -0,0 +1,126 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2012, Tomasz Sowa + * All rights reserved. + * + */ + +#include "pw.h" +#include "core/log.h" +#include "core/misc.h" + + +namespace Fun +{ + +Pw::Pw() +{ + fun.url = L"pw"; +} + + +bool Pw::HasAccess() +{ + return true; +} + + + +bool Pw::ActivateAccount(User * puser, long code, bool use_ses_log) +{ + std::wstring * user_code_str = puser->aenv.GetValue(L"activation_code"); + + if( user_code_str ) + { + if( Tol(*user_code_str) == code ) + { + if( db->ChangeUserStatus(puser->id, WINIX_ACCOUNT_READY) == WINIX_ERR_OK ) + { + // !! IMPROVE ME + // remove 'activation_code' value from admin environment for the user + puser->status = WINIX_ACCOUNT_READY; + log << log2 << "Pw: account: " << puser->name << " activated" << logend; + + if( use_ses_log ) + slog << loginfo << T(L"account_activated") << logend; + + return true; + } + else + { + log << log1 << "Pw: account not activated -- database error" << logend; + } + } + else + { + log << log2 << "Pw: incorrect activation code" << logend; + + if( use_ses_log ) + slog << logerror << T(L"incorrect_activation_code") << logend; + } + } + else + { + log << log1 << "Pw: there is no activation_code value in admin environment" << logend; + + if( use_ses_log ) + slog << loginfo << T(L"account_cannot_be_activated") << logend; + } + +return false; +} + + +bool Pw::ActivateAccount(const std::wstring & login, long code, bool use_ses_log) +{ + bool result = false; + User * puser = system->users.GetUser(login); + + if( puser ) + { + if( puser->status == WINIX_ACCOUNT_NOT_ACTIVATED ) + { + result = ActivateAccount(puser, code, use_ses_log); + } + else + { + log << log2 << "Pw: this account is already activated" << logend; + + if( use_ses_log ) + slog << loginfo << T(L"account_already_activated") << logend; + } + } + else + { + log << log1 << "Pw: there is no a user: " << login << logend; + } + +return result; +} + + + +void Pw::ActivateAccount() +{ + const std::wstring & login = cur->request->ParamValue(L"login"); + long code = Tol(cur->request->ParamValue(L"code")); + + if( ActivateAccount(login, code, true) ) + system->RedirectToLastItem(); +} + + + +void Pw::MakeGet() +{ + if( cur->request->IsParam(L"activate") ) + ActivateAccount(); +} + + + + +} // namespace + diff --git a/functions/pw.h b/functions/pw.h new file mode 100755 index 0000000..ce5fc3b --- /dev/null +++ b/functions/pw.h @@ -0,0 +1,41 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2012, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_functions_pw +#define headerfile_winix_functions_pw + +#include "functionbase.h" + + +namespace Fun +{ + + +class Pw : public FunctionBase +{ +public: + + Pw(); + + bool HasAccess(); + void MakeGet(); + + bool ActivateAccount(const std::wstring & login, long code, bool use_ses_log = false); + +private: + + bool ActivateAccount(User * puser, long code, bool use_ses_log); + void ActivateAccount(); + +}; + + +} // namespace + +#endif diff --git a/html/fun_adduser.html b/html/fun_adduser.html index 18f3f2d..100de48 100755 --- a/html/fun_adduser.html +++ b/html/fun_adduser.html @@ -12,10 +12,20 @@

{adduser_confirm_password}:

- -

{adduser_email}:

+ + [if winix_account_need_email_verification] +

{adduser_need_email}
{adduser_need_email2}:

+ [else] +

{adduser_email}:

+ [end] + [if user_super_user] +

+ +

+ [end] + diff --git a/html/slog.html b/html/slog.html index 61a1637..86bacb5 100755 --- a/html/slog.html +++ b/html/slog.html @@ -5,10 +5,10 @@ [for slog_tab] - + [if slog_tab_is_info] - + {slog_info}: [end] [if slog_tab_is_warning] diff --git a/locale/en b/locale/en index 112d649..913707a 100755 --- a/locale/en +++ b/locale/en @@ -4,6 +4,18 @@ charset = UTF-8 logged_as = logged as logged_as_long = You are logged as +account_not_activated = This account is not activated yet. +account_suspended = This account is temporarily suspended +account_banned = This account has been banned +account_activated = Your account has been activated +incorrect_activation_code = Incorrect activation code +account_already_activated = This account is already activated +account_cannot_be_activated = This account cannot be activated, please contact with system administrator +account_email_sent = An email with an activation link has been sent to you + +service_unavailable = We are sorry, this service is temporarily unavailable + + logout = logout form_login_legend = Loging @@ -289,7 +301,9 @@ adduser_form_legend = Register user form adduser_login = Login adduser_password = Password adduser_confirm_password = Confirm password -adduser_email = You can also provide your email address. If you ever forget your password we will be able send you the password back +adduser_email = You can also provide your email address. If you ever forget your password we will be able send you the password back. +adduser_need_email = You have to provide your email address. +adduser_need_email2 = We send you an email with an activation link adduser_submit = Add user register_user_submit = Register adduser_err_login_empty = Provide a login please. @@ -298,6 +312,13 @@ adduser_err_user_exists = We are sorry, but that user is already registered, che adduser_err_passwords_different = Passwords are different! adduser_err_password_too_small = A password should consist of at least adduser_err_password_too_small2 = characters. +adduser_err_login_too_big = Login cannot be longer than +adduser_err_login_too_big2 = characters +adduser_err_password_too_big = Password cannot be longer than +adduser_err_password_too_big2 = characters +adduser_err_email_too_big = Email cannot be longer than +adduser_err_email_too_big2 = characters +adduser_auto_activate = Automatically activate this account mount_header = Mount points @@ -336,6 +357,7 @@ cp_follow_symlinks = Follow symlinks slog_warning = Warning slog_error = Error +slog_info = Info unknown_filesystem = Unknown filesystem no_such_dir = There is not such a directory unknown_mount_type = There is not such a mount type @@ -380,6 +402,7 @@ uname_plugin_unknown = Plugin has not set its name notify_new = News notify_change = Changes notify_reply = Reply +notify_confirm_account = Confirm your account notify_from_name = winix notifications notify_from_email = dontreply@winix.org notify_content_type = text/plain; charset="UTF-8" @@ -396,6 +419,9 @@ notify_msg7b = a ticket has been modified: notify_msg8 = a page has been deleted: notify_msg9 = We invite you to read. notify_msg9b = Have a good day. Bye. +notify_msg10 = This email is sent to you because you are in the process of creating a new account in our service. +notify_msg11 = In order to activate your account click on the link below: +notify_msg12 = If you did not request an account in our service just ignore the email. notify_footer1 = http://www.winix.org notify_footer2 = This message has been sent automatically - do not answer please. notify_footer3 = If you do not want to receive such messages you can switch them off diff --git a/locale/pl b/locale/pl index f8efacc..2a5b6d6 100755 --- a/locale/pl +++ b/locale/pl @@ -1,9 +1,21 @@ language = pl charset = UTF-8 -logged_as = zalogowany jako +logged_as = zalogowany jako logged_as_long = Aktualnie jesteś zalogowany jako +account_not_activated = To konto nie jest jeszcze aktywowane +account_suspended = To konto jest tymczasowo zablokowane +account_banned = To konto zostało wyłączone +account_activated = Twoje konto zostało aktywowane +incorrect_activation_code = Nieprawidłowy kod aktywacyjny +account_already_activated = To konto jest już aktywowane +account_cannot_be_activated = To konto nie może być aktywowane, proszę skontaktować się z administratorem +account_email_sent = Wysłaliśmy Tobie email z linkiem aktywacyjnym + + +service_unavailable = Przepraszamy, serwis tymczasowo niedostępny + logout = wyloguj form_login_legend = Logowanie @@ -310,6 +322,8 @@ adduser_login = Login adduser_password = Hasło adduser_confirm_password = Potwierdź hasło adduser_email = Możesz także podać swój email. Jeśli zapomnisz kiedyś hasła to hasło zostanie wysłane na podany email +adduser_need_email = Wymagamy abyś podał nam swój adres email, +adduser_need_email2 = na ten adres wyślemy wiadomość z linkiem aktywacyjnym adduser_submit = Dodaj użytkownika register_user_submit = Rejestruj adduser_err_login_empty = Proszę podać login. @@ -318,6 +332,13 @@ adduser_err_user_exists = Przykro nam, podany identyfikator użytkownika jest ju adduser_err_passwords_different = Podane hasła różnią się od siebie! adduser_err_password_too_small = Zbyt krótkie hasło (Musi być conajmniej adduser_err_password_too_small2 = znaków) +adduser_err_login_too_big = Login nie może być większy niż +adduser_err_login_too_big2 = znaków +adduser_err_password_too_big = Hasło nie może być większe niż +adduser_err_password_too_big2 = znaków +adduser_err_email_too_big = Adres email nie może być większy niż +adduser_err_email_too_big2 = znaków +adduser_auto_activate = Automatically activate this account mount_header = Punkty montowania @@ -355,6 +376,7 @@ cp_follow_symlinks = Podążaj za linkami symbolicznymi slog_warning = Ostrzeżenie slog_error = Błąd +slog_error = Informacja unknown_filesystem = Nieznany system plików no_such_dir = Nie ma takiego katalogu unknown_mount_type = Nieprawidłowy rodzaj punktu montowania @@ -401,6 +423,7 @@ uname_plugin_unknown = Plugin nie ustawił swojej nazwy notify_new = Coś nowego notify_change = Zmiany notify_reply = Odpowiedź +notify_confirm_account = Potwierdź swoje konto notify_from_name = winix notifications notify_from_email = dontreply@winix.org notify_content_type = text/plain; charset="UTF-8" @@ -417,6 +440,9 @@ notify_msg7b = zmieniony został ticket: notify_msg8 = skasowano następującą pozycję: notify_msg9 = Życzymy miłego dnia i zapraszamy do lektury. notify_msg9b = "" +notify_msg10 = Otrzymujesz ten email dlatego że jesteś w trakcie procesu zakładania konta w naszym serwisie. +notify_msg11 = W celu aktywowania konta prosimy o odwiedzenie poniższego linku: +notify_msg12 = Jeśli jednak otrzymałeś ten email przez przypadek prosimy o zignorowanie go. notify_footer1 = http://www.winix.org notify_footer2 = Ta wiadomość została wysłana automatycznie - prosimy na nią nie odpowiadać. notify_footer3 = Jeśli nie chcesz dostawać więcej takich wiadomości możesz je wyłączyć diff --git a/main/Makefile.dep b/main/Makefile.dep index 86ec244..53a829f 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -19,8 +19,7 @@ main.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h main.o: ../../ezc/src/stringconv.h ../notify/notifythread.h main.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h main.o: ../core/config.h ../core/users.h ../core/ugcontainer.h -main.o: ../core/lastcontainer.h ../templates/misc.h -main.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h +main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h main.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h main.o: ../core/group.h ../core/loadavg.h ../core/image.h main.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h @@ -35,14 +34,15 @@ main.o: ../functions/last.h ../functions/login.h ../functions/logout.h main.o: ../functions/ln.h ../functions/ls.h ../functions/man.h main.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h main.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -main.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -main.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h -main.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h -main.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h -main.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h -main.o: ../templates/templates.h ../templates/patterncacher.h -main.o: ../templates/indexpatterns.h ../templates/patterns.h -main.o: ../templates/changepatterns.h ../core/sessionmanager.h +main.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +main.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h +main.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +main.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +main.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h +main.o: ../core/htmlfilter.h ../templates/templates.h +main.o: ../templates/patterncacher.h ../templates/indexpatterns.h +main.o: ../templates/patterns.h ../templates/changepatterns.h +main.o: ../templates/htmltextstream.h ../core/sessionmanager.h main.o: ../core/compress.h ../core/postparser.h ../core/httpsimpleparser.h main.o: ../core/cookieparser.h ../core/postmultiparser.h main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h diff --git a/notify/Makefile.dep b/notify/Makefile.dep index c7647b4..e4b60ba 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -18,7 +18,7 @@ notify.o: ../core/mount.h ../core/lastcontainer.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/user.h ../core/group.h ../core/dircontainer.h -notify.o: ../core/ugcontainer.h ../templates/misc.h ../templates/templates.h +notify.o: ../core/ugcontainer.h ../templates/templates.h notify.o: ../templates/patterncacher.h ../templates/indexpatterns.h notify.o: ../templates/patterns.h ../templates/changepatterns.h ../core/cur.h notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h @@ -39,9 +39,10 @@ notify.o: ../functions/env.h ../functions/last.h ../functions/login.h notify.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h notify.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h notify.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -notify.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -notify.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h -notify.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +notify.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +notify.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h +notify.o: ../functions/specialdefault.h ../functions/stat.h +notify.o: ../functions/subject.h ../functions/template.h notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h notifypool.o: notifypool.h ../templates/locale.h @@ -104,7 +105,7 @@ templatesnotify.o: ../functions/ln.h ../functions/ls.h ../functions/man.h templatesnotify.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h templatesnotify.o: ../functions/nicedit.h ../functions/node.h templatesnotify.o: ../functions/passwd.h ../functions/priv.h -templatesnotify.o: ../functions/reload.h ../functions/rm.h +templatesnotify.o: ../functions/pw.h ../functions/reload.h ../functions/rm.h templatesnotify.o: ../functions/sort.h ../functions/specialdefault.h templatesnotify.o: ../functions/stat.h ../functions/subject.h templatesnotify.o: ../functions/template.h ../functions/tinymce.h diff --git a/notify/notify.cpp b/notify/notify.cpp index 6f7de1a..d1dd864 100755 --- a/notify/notify.cpp +++ b/notify/notify.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2012, Tomasz Sowa * All rights reserved. * */ @@ -68,7 +68,8 @@ void Notify::Init() patterns.SetLocale(&TemplatesFunctions::locale); patterns.SetLocaleFilter(&TemplatesFunctions::locale_filter); - notify_template_cms = AddTemplate(L"notify_email_cms.txt"); + notify_template_cms = AddTemplate(L"notify_email_cms.txt"); + notify_template_activate_account = AddTemplate(L"notify_confirm_account.txt"); plugin.Call(WINIX_NOTIFY_ADD_TEMPLATE); } @@ -89,6 +90,7 @@ void Notify::ItemChanged(int notify_code, const Item & item) if( notify_code == 0 ) return; + msg.Clear(); msg.code = notify_code; msg.template_index = notify_template_cms; CreateItemLink(item, msg.item_link, msg.dir_link); @@ -106,6 +108,22 @@ void Notify::ItemChanged(const NotifyMsg & msg) } +void Notify::ActivateAccount(const std::wstring & name, const std::wstring & email, long code) +{ + msg.Clear(); + msg.code = WINIX_NOTIFY_CODE_CONFIRM_ACCOUNT; + msg.name = name; + msg.email = email; + msg.lang = 0; + msg.activate_code = code; + msg.template_index = notify_template_activate_account; + CreateActivateLink(name, code, msg.item_link); + + notify_pool.Add(msg); + notify_thread.WakeUpThread(); // we are in the first locked thread +} + + size_t Notify::AddTemplate(const std::wstring & file_name) { @@ -118,7 +136,7 @@ size_t Notify::AddTemplate(const std::wstring & file_name) void Notify::CreateItemLink(const Item & item, std::wstring & item_link, std::wstring & dir_link) { -static std::wstring tmp_path; + tmp_path.clear(); if( item.type == Item::dir ) { @@ -141,3 +159,15 @@ static std::wstring tmp_path; +void Notify::CreateActivateLink(const std::wstring & name, long code, std::wstring & link) +{ +wchar_t buff[50]; + + link = config->url_proto; + link += config->base_url; + link += L"/pw/activate/login:"; + UrlEncode(name, link, false); + link += L"/code:"; + Toa(code, buff, sizeof(buff)/sizeof(wchar_t)); + link += buff; +} diff --git a/notify/notify.h b/notify/notify.h index 3dcf53e..20c69f8 100755 --- a/notify/notify.h +++ b/notify/notify.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2012, Tomasz Sowa * All rights reserved. * */ @@ -16,9 +16,6 @@ #include "templates/patterns.h" #include "notifythread.h" -// !! skasowac? -#include "templates/misc.h" - class Request; class Config; @@ -47,6 +44,7 @@ public: void ItemChanged(int notify_code, const Item & item); void ItemChanged(const NotifyMsg & msg); + void ActivateAccount(const std::wstring & name, const std::wstring & email, long code); private: @@ -60,12 +58,15 @@ private: NotifyThread notify_thread; NotifyMsg msg; NotifyPool notify_pool; + std::wstring tmp_path; size_t notify_template_cms; + size_t notify_template_activate_account; Patterns patterns; void CreateItemLink(const Item & item, std::wstring & link, std::wstring & dir_link); + void CreateActivateLink(const std::wstring & name, long code, std::wstring & link); }; diff --git a/notify/notifypool.h b/notify/notifypool.h index 38e28b6..a28cbd0 100755 --- a/notify/notifypool.h +++ b/notify/notifypool.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-2012, Tomasz Sowa * All rights reserved. * */ @@ -15,33 +15,47 @@ #include "templates/locale.h" -#define WINIX_NOTIFY_CODE_ADD 1 -#define WINIX_NOTIFY_CODE_EDIT 2 -#define WINIX_NOTIFY_CODE_DELETE 4 -#define WINIX_NOTIFY_CODE_REPLY 8 +#define WINIX_NOTIFY_CODE_ADD 1 +#define WINIX_NOTIFY_CODE_EDIT 2 +#define WINIX_NOTIFY_CODE_DELETE 4 +#define WINIX_NOTIFY_CODE_REPLY 8 +#define WINIX_NOTIFY_CODE_CONFIRM_ACCOUNT 16 -// additional codes, use it of your own -// you should prepare NotifyMsg structure and use it with ItemChanged method of notify object -/* temporarily not used -#define WINIX_NOTIFY_CODE_USER1 1024 -#define WINIX_NOTIFY_CODE_USER2 2048 -#define WINIX_NOTIFY_CODE_USER3 4096 -#define WINIX_NOTIFY_CODE_USER4 8192 -#define WINIX_NOTIFY_CODE_USER5 16384 -#define WINIX_NOTIFY_CODE_USER6 32768 -#define WINIX_NOTIFY_CODE_USER7 65536 -#define WINIX_NOTIFY_CODE_USER8 131072 -*/ - - +// !! IMPROVE ME +// may now we can use PT::Space instead of NotifyMsg? struct NotifyMsg { int code; std::wstring item_link; // link to a file or a dir (can be the same as dir_link if the item is a directory) std::wstring dir_link; // link to a dir size_t template_index; + + // used in account activations + // we send one email directly to one user + std::wstring email; + std::wstring name; + size_t lang; + long activate_code; + + + NotifyMsg() + { + Clear(); + } + + void Clear() + { + code = -1; + item_link.clear(); + dir_link.clear(); + template_index = 0; + email.clear(); + name.clear(); + lang = 0; + activate_code = 0; + } }; diff --git a/notify/notifythread.cpp b/notify/notifythread.cpp index d2a46b5..85a3bf2 100755 --- a/notify/notifythread.cpp +++ b/notify/notifythread.cpp @@ -94,16 +94,28 @@ bool res = false; TemplatesNotifyFunctions::notify_msg = notify_pool->GetFirst(); notify_pool->DeleteFirst(); - for(i=users->Begin() ; i != users->End() ; ++i) + if( TemplatesNotifyFunctions::notify_msg.code == WINIX_NOTIFY_CODE_CONFIRM_ACCOUNT ) { - if( ((*i)->notify & TemplatesNotifyFunctions::notify_msg.code) != 0 ) - { - msg.name = (*i)->name; - msg.email = (*i)->email; - msg.lang = config->locale_default_index; // !! bedzie osobno dla kazdego uzytkownika + msg.email = TemplatesNotifyFunctions::notify_msg.email; + msg.name = TemplatesNotifyFunctions::notify_msg.name; + msg.lang = TemplatesNotifyFunctions::notify_msg.lang; - notify_user.insert(notify_user.end(), msg); - res = true; + notify_user.push_back(msg); + res = true; + } + else + { + for(i=users->Begin() ; i != users->End() ; ++i) + { + if( ((*i)->notify & TemplatesNotifyFunctions::notify_msg.code) != 0 ) + { + msg.name = (*i)->name; + msg.email = (*i)->email; + msg.lang = config->locale_default_index; // !! bedzie osobno dla kazdego uzytkownika + + notify_user.push_back(msg); + res = true; + } } } } diff --git a/notify/templatesnotify.cpp b/notify/templatesnotify.cpp index b9d28d4..b0e5693 100755 --- a/notify/templatesnotify.cpp +++ b/notify/templatesnotify.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2012, Tomasz Sowa * All rights reserved. * */ diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep index 6babb48..25417f7 100755 --- a/plugins/export/Makefile.dep +++ b/plugins/export/Makefile.dep @@ -21,8 +21,7 @@ edb.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h edb.o: ../../notify/notifythread.h ../../core/basethread.h edb.o: ../../core/synchro.h ../../notify/templatesnotify.h edb.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h -edb.o: ../../core/lastcontainer.h ../../templates/misc.h -edb.o: ../../templates/htmltextstream.h ../../core/log.h +edb.o: ../../core/lastcontainer.h ../../core/log.h exportinfo.o: ../../core/log.h exportinfo.h ../../core/system.h exportinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h exportinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h @@ -45,8 +44,7 @@ exportinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h exportinfo.o: ../../notify/notifythread.h ../../core/basethread.h exportinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h exportinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h -exportinfo.o: ../../core/lastcontainer.h ../../templates/misc.h -exportinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h +exportinfo.o: ../../core/lastcontainer.h ../../core/mounts.h exportinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h exportinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h exportinfo.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -77,8 +75,7 @@ init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../templates/misc.h -init.o: ../../templates/htmltextstream.h ../../core/mounts.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -96,7 +93,7 @@ init.o: ../../functions/env.h ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/man.h ../../functions/meta.h ../../functions/mkdir.h init.o: ../../functions/mv.h ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/passwd.h ../../functions/priv.h ../../functions/pw.h init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h @@ -105,7 +102,7 @@ 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/indexpatterns.h ../../templates/patterns.h -init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h -init.o: exportthread.h message.h exportinfo.h export.h edb.h -init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h -init.o: ../../core/error.h ../../core/dirs.h +init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h +init.o: ../../core/sessionmanager.h exportthread.h message.h exportinfo.h +init.o: export.h edb.h ../../db/dbbase.h ../../db/dbconn.h +init.o: ../../db/dbtextstream.h ../../core/error.h ../../core/dirs.h diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index 80b84cd..183f4d2 100755 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -22,8 +22,7 @@ gallery.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h gallery.o: ../../notify/notifythread.h ../../core/basethread.h gallery.o: ../../core/synchro.h ../../notify/templatesnotify.h gallery.o: ../../core/users.h ../../core/ugcontainer.h -gallery.o: ../../core/lastcontainer.h ../../templates/misc.h -gallery.o: ../../templates/htmltextstream.h ../../core/mounts.h +gallery.o: ../../core/lastcontainer.h ../../core/mounts.h gallery.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h gallery.o: ../../core/users.h ../../core/groups.h ../../core/group.h gallery.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -51,8 +50,7 @@ init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../templates/misc.h -init.o: ../../templates/htmltextstream.h ../../core/mounts.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -70,7 +68,7 @@ init.o: ../../functions/env.h ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/man.h ../../functions/meta.h ../../functions/mkdir.h init.o: ../../functions/mv.h ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/passwd.h ../../functions/priv.h ../../functions/pw.h init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h @@ -79,7 +77,8 @@ 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/indexpatterns.h ../../templates/patterns.h -init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h +init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h +init.o: ../../core/sessionmanager.h templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h templates.o: ../../db/dbtextstream.h ../../core/textstream.h @@ -104,7 +103,6 @@ templates.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -templates.o: ../../templates/misc.h ../../templates/htmltextstream.h templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h templates.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h @@ -125,14 +123,15 @@ templates.o: ../../functions/ln.h ../../functions/ls.h ../../functions/man.h templates.o: ../../functions/meta.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/node.h ../../functions/passwd.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/sort.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.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/indexpatterns.h -templates.o: ../../templates/patterns.h ../../templates/changepatterns.h -templates.o: ../../core/sessionmanager.h +templates.o: ../../functions/priv.h ../../functions/pw.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/sort.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.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/indexpatterns.h ../../templates/patterns.h +templates.o: ../../templates/changepatterns.h +templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h diff --git a/plugins/group/Makefile.dep b/plugins/group/Makefile.dep index 3ee3dfe..3da29f3 100755 --- a/plugins/group/Makefile.dep +++ b/plugins/group/Makefile.dep @@ -23,8 +23,7 @@ groupinfo.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h groupinfo.o: ../../core/basethread.h ../../core/synchro.h groupinfo.o: ../../notify/templatesnotify.h ../../core/config.h groupinfo.o: ../../core/users.h ../../core/ugcontainer.h -groupinfo.o: ../../core/lastcontainer.h ../../templates/misc.h -groupinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h +groupinfo.o: ../../core/lastcontainer.h ../../core/mounts.h groupinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h groupinfo.o: ../../core/users.h ../../core/loadavg.h ../../core/image.h groupinfo.o: ../../core/basethread.h ../../core/threadmanager.h @@ -52,8 +51,7 @@ init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../templates/misc.h -init.o: ../../templates/htmltextstream.h ../../core/mounts.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h groups.h ../../core/loadavg.h ../../core/image.h init.o: ../../core/basethread.h ../../core/threadmanager.h @@ -70,7 +68,7 @@ init.o: ../../functions/env.h ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/man.h ../../functions/meta.h ../../functions/mkdir.h init.o: ../../functions/mv.h ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/passwd.h ../../functions/priv.h ../../functions/pw.h init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h @@ -79,8 +77,8 @@ 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/indexpatterns.h ../../templates/patterns.h -init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h -init.o: groupinfo.h +init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h +init.o: ../../core/sessionmanager.h groupinfo.h templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h templates.o: ../../core/item.h ../../../ezc/src/functions.h @@ -108,10 +106,9 @@ templates.o: ../../templates/patterns.h ../../notify/notifythread.h templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -templates.o: ../../templates/misc.h ../../core/mounts.h -templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -templates.o: ../../core/users.h groups.h ../../core/loadavg.h -templates.o: ../../core/image.h ../../core/basethread.h +templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h +templates.o: ../../core/run.h ../../core/users.h groups.h +templates.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h templates.o: ../../core/htmlfilter.h ../../core/plugin.h templates.o: ../../core/pluginmsg.h ../../core/system.h @@ -130,11 +127,11 @@ templates.o: ../../functions/ls.h ../../functions/man.h templates.o: ../../functions/meta.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/node.h ../../functions/passwd.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/sort.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.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 groupinfo.h -templates.o: ../../core/misc.h +templates.o: ../../functions/priv.h ../../functions/pw.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/sort.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.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 groupinfo.h ../../core/misc.h diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep index 7f884c0..ca50f1d 100755 --- a/plugins/menu/Makefile.dep +++ b/plugins/menu/Makefile.dep @@ -21,8 +21,7 @@ cache.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h cache.o: ../../core/basethread.h ../../core/synchro.h cache.o: ../../notify/templatesnotify.h ../../core/config.h cache.o: ../../core/users.h ../../core/ugcontainer.h -cache.o: ../../core/lastcontainer.h ../../templates/misc.h -cache.o: ../../templates/htmltextstream.h ../../core/misc.h +cache.o: ../../core/lastcontainer.h ../../core/misc.h init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h @@ -45,8 +44,7 @@ init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../templates/misc.h -init.o: ../../templates/htmltextstream.h ../../core/mounts.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -64,7 +62,7 @@ init.o: ../../functions/env.h ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/man.h ../../functions/meta.h ../../functions/mkdir.h init.o: ../../functions/mv.h ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/passwd.h ../../functions/priv.h ../../functions/pw.h init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h @@ -73,8 +71,8 @@ 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/indexpatterns.h ../../templates/patterns.h -init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h cache.h -init.o: ../../core/dirs.h +init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h +init.o: ../../core/sessionmanager.h cache.h ../../core/dirs.h templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h templates.o: ../../core/item.h ../../../ezc/src/functions.h @@ -104,30 +102,31 @@ templates.o: ../../templates/patterns.h ../../notify/notifythread.h templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -templates.o: ../../templates/misc.h ../../core/mounts.h -templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h -templates.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h -templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../core/request.h -templates.o: ../../core/synchro.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/default.h -templates.o: ../../functions/download.h ../../functions/emacs.h -templates.o: ../../functions/env.h ../../functions/last.h -templates.o: ../../functions/login.h ../../functions/logout.h -templates.o: ../../functions/ln.h ../../functions/ls.h ../../functions/man.h +templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h +templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h +templates.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h +templates.o: ../../core/basethread.h ../../core/threadmanager.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../core/request.h ../../core/synchro.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/default.h ../../functions/download.h +templates.o: ../../functions/emacs.h ../../functions/env.h +templates.o: ../../functions/last.h ../../functions/login.h +templates.o: ../../functions/logout.h ../../functions/ln.h +templates.o: ../../functions/ls.h ../../functions/man.h templates.o: ../../functions/meta.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/node.h ../../functions/passwd.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/sort.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.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 ../../core/log.h -templates.o: ../../core/misc.h cache.h ../../core/dirs.h +templates.o: ../../functions/priv.h ../../functions/pw.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/sort.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.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/log.h ../../core/misc.h cache.h +templates.o: ../../core/dirs.h diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index 03dea43..c171979 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -24,8 +24,7 @@ init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../templates/misc.h -init.o: ../../templates/htmltextstream.h ../../core/mounts.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -42,7 +41,7 @@ init.o: ../../functions/env.h ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/man.h ../../functions/meta.h ../../functions/mkdir.h init.o: ../../functions/mv.h ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/passwd.h ../../functions/priv.h ../../functions/pw.h init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h @@ -51,8 +50,8 @@ 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/indexpatterns.h ../../templates/patterns.h -init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h -init.o: statssession.h ../../core/plugindata.h +init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h +init.o: ../../core/sessionmanager.h 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 ../../core/requesttypes.h stats.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h @@ -84,11 +83,10 @@ templates.o: ../../core/synchro.h ../../notify/templatesnotify.h templates.o: ../../core/config.h ../../core/users.h ../../core/user.h templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h templates.o: ../../core/cur.h ../../core/session.h ../../core/rebus.h -templates.o: ../../core/mount.h ../../templates/misc.h -templates.o: ../../templates/htmltextstream.h ../../core/mounts.h -templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h -templates.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h +templates.o: ../../core/mount.h ../../core/mounts.h ../../core/mountparser.h +templates.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +templates.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +templates.o: ../../core/image.h ../../core/basethread.h templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h templates.o: ../../core/sessioncontainer.h ../../functions/functions.h templates.o: ../../functions/functionbase.h ../../core/request.h @@ -105,14 +103,16 @@ templates.o: ../../functions/ln.h ../../functions/ls.h ../../functions/man.h templates.o: ../../functions/meta.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/node.h ../../functions/passwd.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/sort.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.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/indexpatterns.h -templates.o: ../../templates/patterns.h ../../templates/changepatterns.h -templates.o: ../../core/sessionmanager.h ../../core/misc.h stats.h +templates.o: ../../functions/priv.h ../../functions/pw.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/sort.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.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/indexpatterns.h ../../templates/patterns.h +templates.o: ../../templates/changepatterns.h +templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h +templates.o: ../../core/misc.h stats.h ../../templates/misc.h diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index 6f71f55..b73b8cb 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -26,7 +26,6 @@ createthread.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h createthread.o: ../../core/basethread.h ../../core/synchro.h createthread.o: ../../notify/templatesnotify.h ../../core/users.h createthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -createthread.o: ../../templates/misc.h ../../templates/htmltextstream.h createthread.o: ../../core/mounts.h ../../core/mountparser.h createthread.o: ../../core/crypt.h ../../core/run.h ../../core/users.h createthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h @@ -47,13 +46,14 @@ createthread.o: ../../functions/man.h ../../functions/meta.h createthread.o: ../../functions/mkdir.h ../../functions/mv.h createthread.o: ../../functions/nicedit.h ../../functions/node.h createthread.o: ../../functions/passwd.h ../../functions/priv.h -createthread.o: ../../functions/reload.h ../../functions/rm.h -createthread.o: ../../functions/sort.h ../../functions/specialdefault.h -createthread.o: ../../functions/stat.h ../../functions/subject.h -createthread.o: ../../functions/template.h ../../functions/tinymce.h -createthread.o: ../../functions/uname.h ../../functions/upload.h -createthread.o: ../../functions/uptime.h ../../functions/who.h -createthread.o: ../../functions/vim.h ../../core/htmlfilter.h +createthread.o: ../../functions/pw.h ../../functions/reload.h +createthread.o: ../../functions/rm.h ../../functions/sort.h +createthread.o: ../../functions/specialdefault.h ../../functions/stat.h +createthread.o: ../../functions/subject.h ../../functions/template.h +createthread.o: ../../functions/tinymce.h ../../functions/uname.h +createthread.o: ../../functions/upload.h ../../functions/uptime.h +createthread.o: ../../functions/who.h ../../functions/vim.h +createthread.o: ../../core/htmlfilter.h funthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h funthread.o: funthread.h ../../functions/functionbase.h ../../core/item.h funthread.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h @@ -78,7 +78,6 @@ funthread.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h funthread.o: ../../core/basethread.h ../../core/synchro.h funthread.o: ../../notify/templatesnotify.h ../../core/users.h funthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -funthread.o: ../../templates/misc.h ../../templates/htmltextstream.h funthread.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h funthread.o: ../../core/run.h ../../core/users.h ../../core/groups.h funthread.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h @@ -108,8 +107,7 @@ init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../templates/misc.h -init.o: ../../templates/htmltextstream.h ../../core/mounts.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -128,7 +126,7 @@ init.o: ../../functions/env.h ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/man.h ../../functions/meta.h ../../functions/mkdir.h init.o: ../../functions/mv.h ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/passwd.h ../../functions/priv.h ../../functions/pw.h init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h @@ -137,8 +135,8 @@ 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/indexpatterns.h ../../templates/patterns.h -init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h -init.o: templates.h +init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h +init.o: ../../core/sessionmanager.h templates.h reply.o: reply.h ../../functions/functionbase.h ../../core/item.h reply.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h reply.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h @@ -161,8 +159,7 @@ reply.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h reply.o: ../../notify/notifythread.h ../../core/basethread.h reply.o: ../../core/synchro.h ../../notify/templatesnotify.h reply.o: ../../core/users.h ../../core/ugcontainer.h -reply.o: ../../core/lastcontainer.h ../../templates/misc.h -reply.o: ../../templates/htmltextstream.h ../../core/mounts.h +reply.o: ../../core/lastcontainer.h ../../core/mounts.h reply.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h reply.o: ../../core/users.h ../../core/groups.h ../../core/group.h reply.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -179,18 +176,19 @@ reply.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h reply.o: ../../functions/man.h ../../functions/meta.h ../../functions/mkdir.h reply.o: ../../functions/mv.h ../../functions/nicedit.h reply.o: ../../functions/node.h ../../functions/passwd.h -reply.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h -reply.o: ../../functions/sort.h ../../functions/specialdefault.h -reply.o: ../../functions/stat.h ../../functions/subject.h -reply.o: ../../functions/template.h ../../functions/tinymce.h -reply.o: ../../functions/uname.h ../../functions/upload.h -reply.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h -reply.o: ../../core/htmlfilter.h ../../core/misc.h ../../core/plugin.h -reply.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h +reply.o: ../../functions/priv.h ../../functions/pw.h ../../functions/reload.h +reply.o: ../../functions/rm.h ../../functions/sort.h +reply.o: ../../functions/specialdefault.h ../../functions/stat.h +reply.o: ../../functions/subject.h ../../functions/template.h +reply.o: ../../functions/tinymce.h ../../functions/uname.h +reply.o: ../../functions/upload.h ../../functions/uptime.h +reply.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +reply.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h +reply.o: ../../core/system.h ../../core/sessionmanager.h reply.o: ../../core/sessioncontainer.h ../../templates/templates.h reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h reply.o: ../../templates/patterns.h ../../templates/changepatterns.h -reply.o: ../../core/sessionmanager.h +reply.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.h showthreads.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h showthreads.o: ../../db/dbtextstream.h ../../core/textstream.h @@ -216,7 +214,6 @@ showthreads.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h showthreads.o: ../../core/basethread.h ../../core/synchro.h showthreads.o: ../../notify/templatesnotify.h ../../core/users.h showthreads.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -showthreads.o: ../../templates/misc.h ../../templates/htmltextstream.h showthreads.o: ../../core/mounts.h ../../core/mountparser.h showthreads.o: ../../core/crypt.h ../../core/run.h ../../core/users.h showthreads.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h @@ -247,8 +244,7 @@ templates.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/config.h templates.o: ../../core/users.h ../../core/ugcontainer.h -templates.o: ../../core/lastcontainer.h ../../templates/misc.h -templates.o: ../../templates/htmltextstream.h ../../core/mounts.h +templates.o: ../../core/lastcontainer.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -270,17 +266,18 @@ templates.o: ../../functions/ln.h ../../functions/ls.h ../../functions/man.h templates.o: ../../functions/meta.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/node.h ../../functions/passwd.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/sort.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.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/indexpatterns.h -templates.o: ../../templates/patterns.h ../../templates/changepatterns.h -templates.o: ../../core/sessionmanager.h +templates.o: ../../functions/priv.h ../../functions/pw.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/sort.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.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/indexpatterns.h ../../templates/patterns.h +templates.o: ../../templates/changepatterns.h +templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.h threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h threadinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h @@ -304,8 +301,7 @@ threadinfo.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h threadinfo.o: ../../core/basethread.h ../../core/synchro.h threadinfo.o: ../../notify/templatesnotify.h ../../core/config.h threadinfo.o: ../../core/users.h ../../core/ugcontainer.h -threadinfo.o: ../../core/lastcontainer.h ../../templates/misc.h -threadinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h +threadinfo.o: ../../core/lastcontainer.h ../../core/mounts.h threadinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h threadinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h threadinfo.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index 70c5329..85faad2 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -26,7 +26,6 @@ createticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h createticket.o: ../../core/basethread.h ../../core/synchro.h createticket.o: ../../notify/templatesnotify.h ../../core/users.h createticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -createticket.o: ../../templates/misc.h ../../templates/htmltextstream.h createticket.o: ../../core/mounts.h ../../core/mountparser.h createticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h @@ -46,14 +45,15 @@ createticket.o: ../../functions/man.h ../../functions/meta.h createticket.o: ../../functions/mkdir.h ../../functions/mv.h createticket.o: ../../functions/nicedit.h ../../functions/node.h createticket.o: ../../functions/passwd.h ../../functions/priv.h -createticket.o: ../../functions/reload.h ../../functions/rm.h -createticket.o: ../../functions/sort.h ../../functions/specialdefault.h -createticket.o: ../../functions/stat.h ../../functions/subject.h -createticket.o: ../../functions/template.h ../../functions/tinymce.h -createticket.o: ../../functions/uname.h ../../functions/upload.h -createticket.o: ../../functions/uptime.h ../../functions/who.h -createticket.o: ../../functions/vim.h ../../core/htmlfilter.h sessiondata.h -createticket.o: ../../core/plugindata.h ../../functions/rm.h +createticket.o: ../../functions/pw.h ../../functions/reload.h +createticket.o: ../../functions/rm.h ../../functions/sort.h +createticket.o: ../../functions/specialdefault.h ../../functions/stat.h +createticket.o: ../../functions/subject.h ../../functions/template.h +createticket.o: ../../functions/tinymce.h ../../functions/uname.h +createticket.o: ../../functions/upload.h ../../functions/uptime.h +createticket.o: ../../functions/who.h ../../functions/vim.h +createticket.o: ../../core/htmlfilter.h sessiondata.h ../../core/plugindata.h +createticket.o: ../../functions/rm.h editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h editticket.o: ../../db/dbtextstream.h ../../core/textstream.h editticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h @@ -77,8 +77,7 @@ editticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h editticket.o: ../../core/basethread.h ../../core/synchro.h editticket.o: ../../notify/templatesnotify.h ../../core/config.h editticket.o: ../../core/users.h ../../core/ugcontainer.h -editticket.o: ../../core/lastcontainer.h ../../templates/misc.h -editticket.o: ../../templates/htmltextstream.h ../../core/mounts.h +editticket.o: ../../core/lastcontainer.h ../../core/mounts.h editticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h editticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h editticket.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -96,16 +95,16 @@ editticket.o: ../../functions/ln.h ../../functions/ls.h ../../functions/man.h editticket.o: ../../functions/meta.h ../../functions/mkdir.h editticket.o: ../../functions/mv.h ../../functions/nicedit.h editticket.o: ../../functions/node.h ../../functions/passwd.h -editticket.o: ../../functions/priv.h ../../functions/reload.h -editticket.o: ../../functions/rm.h ../../functions/sort.h -editticket.o: ../../functions/specialdefault.h ../../functions/stat.h -editticket.o: ../../functions/subject.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 ../../functions/functionbase.h -editticket.o: ../../core/synchro.h sessiondata.h ../../core/plugindata.h -editticket.o: ../../functions/rm.h +editticket.o: ../../functions/priv.h ../../functions/pw.h +editticket.o: ../../functions/reload.h ../../functions/rm.h +editticket.o: ../../functions/sort.h ../../functions/specialdefault.h +editticket.o: ../../functions/stat.h ../../functions/subject.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 +editticket.o: ../../functions/functionbase.h ../../core/synchro.h +editticket.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.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/requesttypes.h @@ -129,8 +128,7 @@ funticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h funticket.o: ../../core/basethread.h ../../core/synchro.h funticket.o: ../../notify/templatesnotify.h ../../core/config.h funticket.o: ../../core/users.h ../../core/ugcontainer.h -funticket.o: ../../core/lastcontainer.h ../../templates/misc.h -funticket.o: ../../templates/htmltextstream.h ../../core/mounts.h +funticket.o: ../../core/lastcontainer.h ../../core/mounts.h funticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h funticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h funticket.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -148,20 +146,22 @@ funticket.o: ../../functions/ls.h ../../functions/man.h funticket.o: ../../functions/meta.h ../../functions/mkdir.h funticket.o: ../../functions/mv.h ../../functions/nicedit.h funticket.o: ../../functions/node.h ../../functions/passwd.h -funticket.o: ../../functions/priv.h ../../functions/reload.h -funticket.o: ../../functions/rm.h ../../functions/sort.h -funticket.o: ../../functions/specialdefault.h ../../functions/stat.h -funticket.o: ../../functions/subject.h ../../functions/template.h -funticket.o: ../../functions/tinymce.h ../../functions/uname.h -funticket.o: ../../functions/upload.h ../../functions/uptime.h -funticket.o: ../../functions/who.h ../../functions/vim.h -funticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h -funticket.o: ../../core/synchro.h ../../core/plugin.h pluginmsg.h -funticket.o: ../../core/system.h ../../core/sessionmanager.h -funticket.o: ../../core/sessioncontainer.h ../../templates/templates.h -funticket.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h -funticket.o: ../../templates/patterns.h ../../templates/changepatterns.h -funticket.o: ../../core/sessionmanager.h ../../plugins/thread/pluginmsg.h +funticket.o: ../../functions/priv.h ../../functions/pw.h +funticket.o: ../../functions/reload.h ../../functions/rm.h +funticket.o: ../../functions/sort.h ../../functions/specialdefault.h +funticket.o: ../../functions/stat.h ../../functions/subject.h +funticket.o: ../../functions/template.h ../../functions/tinymce.h +funticket.o: ../../functions/uname.h ../../functions/upload.h +funticket.o: ../../functions/uptime.h ../../functions/who.h +funticket.o: ../../functions/vim.h ../../core/htmlfilter.h +funticket.o: ../../functions/functionbase.h ../../core/synchro.h +funticket.o: ../../core/plugin.h pluginmsg.h ../../core/system.h +funticket.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +funticket.o: ../../templates/templates.h ../../templates/patterncacher.h +funticket.o: ../../templates/indexpatterns.h ../../templates/patterns.h +funticket.o: ../../templates/changepatterns.h +funticket.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h +funticket.o: ../../plugins/thread/pluginmsg.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/requesttypes.h ../../core/error.h @@ -184,7 +184,6 @@ init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h init.o: ../../core/basethread.h ../../core/synchro.h init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -init.o: ../../templates/misc.h ../../templates/htmltextstream.h init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h init.o: ../../core/run.h ../../core/users.h ../../core/groups.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h @@ -201,7 +200,7 @@ init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ln.h init.o: ../../functions/ls.h ../../functions/man.h ../../functions/meta.h init.o: ../../functions/mkdir.h ../../functions/mv.h init.o: ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/passwd.h ../../functions/priv.h ../../functions/pw.h init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h @@ -214,10 +213,10 @@ init.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h init.o: ../../core/sessioncontainer.h ../../templates/templates.h init.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h init.o: ../../templates/patterns.h ../../templates/changepatterns.h -init.o: ../../core/sessionmanager.h sessiondata.h ../../core/plugindata.h -init.o: ../../functions/rm.h ../../plugins/thread/showthreads.h -init.o: ../../plugins/thread/threadinfo.h ../../plugins/thread/thread.h -init.o: ../../plugins/thread/pluginmsg.h +init.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h +init.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h +init.o: ../../plugins/thread/showthreads.h ../../plugins/thread/threadinfo.h +init.o: ../../plugins/thread/thread.h ../../plugins/thread/pluginmsg.h sessiondata.o: sessiondata.h ../../core/plugindata.h ticket.h sessiondata.o: ../../functions/rm.h showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h @@ -244,8 +243,7 @@ showtickets.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h showtickets.o: ../../core/basethread.h ../../core/synchro.h showtickets.o: ../../notify/templatesnotify.h ../../core/config.h showtickets.o: ../../core/users.h ../../core/ugcontainer.h -showtickets.o: ../../core/lastcontainer.h ../../templates/misc.h -showtickets.o: ../../templates/htmltextstream.h ../../core/mounts.h +showtickets.o: ../../core/lastcontainer.h ../../core/mounts.h showtickets.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h showtickets.o: ../../core/users.h ../../core/groups.h ../../core/group.h showtickets.o: ../../core/loadavg.h ../../core/image.h @@ -264,21 +262,22 @@ showtickets.o: ../../functions/ls.h ../../functions/man.h showtickets.o: ../../functions/meta.h ../../functions/mkdir.h showtickets.o: ../../functions/mv.h ../../functions/nicedit.h showtickets.o: ../../functions/node.h ../../functions/passwd.h -showtickets.o: ../../functions/priv.h ../../functions/reload.h -showtickets.o: ../../functions/rm.h ../../functions/sort.h -showtickets.o: ../../functions/specialdefault.h ../../functions/stat.h -showtickets.o: ../../functions/subject.h ../../functions/template.h -showtickets.o: ../../functions/tinymce.h ../../functions/uname.h -showtickets.o: ../../functions/upload.h ../../functions/uptime.h -showtickets.o: ../../functions/who.h ../../functions/vim.h -showtickets.o: ../../core/htmlfilter.h ../../functions/functionbase.h -showtickets.o: ../../core/synchro.h pluginmsg.h -showtickets.o: ../../plugins/thread/pluginmsg.h ../../core/plugin.h -showtickets.o: ../../core/system.h ../../core/sessionmanager.h -showtickets.o: ../../core/sessioncontainer.h ../../templates/templates.h -showtickets.o: ../../templates/patterncacher.h +showtickets.o: ../../functions/priv.h ../../functions/pw.h +showtickets.o: ../../functions/reload.h ../../functions/rm.h +showtickets.o: ../../functions/sort.h ../../functions/specialdefault.h +showtickets.o: ../../functions/stat.h ../../functions/subject.h +showtickets.o: ../../functions/template.h ../../functions/tinymce.h +showtickets.o: ../../functions/uname.h ../../functions/upload.h +showtickets.o: ../../functions/uptime.h ../../functions/who.h +showtickets.o: ../../functions/vim.h ../../core/htmlfilter.h +showtickets.o: ../../functions/functionbase.h ../../core/synchro.h +showtickets.o: pluginmsg.h ../../plugins/thread/pluginmsg.h +showtickets.o: ../../core/plugin.h ../../core/system.h +showtickets.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +showtickets.o: ../../templates/templates.h ../../templates/patterncacher.h showtickets.o: ../../templates/indexpatterns.h ../../templates/patterns.h -showtickets.o: ../../templates/changepatterns.h ../../core/sessionmanager.h +showtickets.o: ../../templates/changepatterns.h +showtickets.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h tdb.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h @@ -305,8 +304,7 @@ templates.o: ../../templates/localefilter.h ../../notify/notifythread.h templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/config.h templates.o: ../../core/users.h ../../core/ugcontainer.h -templates.o: ../../core/lastcontainer.h ../../templates/misc.h -templates.o: ../../templates/htmltextstream.h ../../core/mounts.h +templates.o: ../../core/lastcontainer.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -324,23 +322,24 @@ templates.o: ../../functions/ls.h ../../functions/man.h templates.o: ../../functions/meta.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/node.h ../../functions/passwd.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/sort.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.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 tdb.h ../../db/dbbase.h -templates.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h -templates.o: editticket.h ../../functions/functionbase.h ../../core/synchro.h -templates.o: createticket.h ../../core/misc.h ../../core/plugin.h pluginmsg.h -templates.o: ../../core/system.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../templates/templates.h -templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h -templates.o: ../../templates/patterns.h ../../templates/changepatterns.h -templates.o: ../../core/sessionmanager.h sessiondata.h -templates.o: ../../core/plugindata.h ../../functions/rm.h +templates.o: ../../functions/priv.h ../../functions/pw.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/sort.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.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 tdb.h +templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h +templates.o: ../../core/error.h editticket.h ../../functions/functionbase.h +templates.o: ../../core/synchro.h createticket.h ../../core/misc.h +templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +templates.o: ../../templates/templates.h ../../templates/patterncacher.h +templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h +templates.o: ../../templates/changepatterns.h +templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h +templates.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h templates.o: ../../plugins/thread/pluginmsg.h ../../templates/miscspace.h templates.o: ../../templates/templates.h ticketinfo.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h @@ -364,8 +363,7 @@ ticketinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h ticketinfo.o: ../../notify/notifythread.h ../../core/basethread.h ticketinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h ticketinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h -ticketinfo.o: ../../core/lastcontainer.h ../../templates/misc.h -ticketinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h +ticketinfo.o: ../../core/lastcontainer.h ../../core/mounts.h ticketinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h ticketinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h ticketinfo.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h @@ -383,14 +381,14 @@ ticketinfo.o: ../../functions/ln.h ../../functions/ls.h ../../functions/man.h ticketinfo.o: ../../functions/meta.h ../../functions/mkdir.h ticketinfo.o: ../../functions/mv.h ../../functions/nicedit.h ticketinfo.o: ../../functions/node.h ../../functions/passwd.h -ticketinfo.o: ../../functions/priv.h ../../functions/reload.h -ticketinfo.o: ../../functions/rm.h ../../functions/sort.h -ticketinfo.o: ../../functions/specialdefault.h ../../functions/stat.h -ticketinfo.o: ../../functions/subject.h ../../functions/template.h -ticketinfo.o: ../../functions/tinymce.h ../../functions/uname.h -ticketinfo.o: ../../functions/upload.h ../../functions/uptime.h -ticketinfo.o: ../../functions/who.h ../../functions/vim.h -ticketinfo.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h -ticketinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h -ticketinfo.o: ../../core/log.h ../../core/misc.h sessiondata.h -ticketinfo.o: ../../core/plugindata.h ../../functions/rm.h +ticketinfo.o: ../../functions/priv.h ../../functions/pw.h +ticketinfo.o: ../../functions/reload.h ../../functions/rm.h +ticketinfo.o: ../../functions/sort.h ../../functions/specialdefault.h +ticketinfo.o: ../../functions/stat.h ../../functions/subject.h +ticketinfo.o: ../../functions/template.h ../../functions/tinymce.h +ticketinfo.o: ../../functions/uname.h ../../functions/upload.h +ticketinfo.o: ../../functions/uptime.h ../../functions/who.h +ticketinfo.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h +ticketinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h +ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h +ticketinfo.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h diff --git a/static/basic/winix.css b/static/basic/winix.css index 2f14f53..b362d79 100755 --- a/static/basic/winix.css +++ b/static/basic/winix.css @@ -580,6 +580,16 @@ background: red; color: white; } +td.slogwarning { +background: #7373FF; +color: white; +} + +td.sloginfo { +background: #F0F0F0; +color: black; +} + ul#sortable li{ list-style-type: none; display: block; diff --git a/static/layout1/winix.css b/static/layout1/winix.css index 0f3fe51..1fb83e2 100755 --- a/static/layout1/winix.css +++ b/static/layout1/winix.css @@ -919,6 +919,16 @@ background: red; color: white; } +td.slogwarning { +background: #7373FF; +color: white; +} + +td.sloginfo { +background: #F0F0F0; +color: black; +} + ul#sortable li{ list-style-type: none; display: block; diff --git a/templates/Makefile.dep b/templates/Makefile.dep index ae14d6a..dc78ad0 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -20,10 +20,10 @@ adduser.o: ../core/cur.h ../templates/locale.h ../notify/notify.h adduser.o: ../notify/notifypool.h ../templates/patterns.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 ../templates/misc.h ../core/mounts.h -adduser.o: ../core/mountparser.h ../core/crypt.h ../core/run.h -adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -adduser.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +adduser.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +adduser.o: ../core/group.h ../core/loadavg.h ../core/image.h +adduser.o: ../core/basethread.h ../core/threadmanager.h adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h adduser.o: ../core/system.h ../core/htmlfilter.h ../core/request.h changepatterns.o: changepatterns.h patterns.h locale.h localefilter.h @@ -52,12 +52,11 @@ config.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h config.o: ../templates/patterns.h ../notify/notifythread.h config.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h config.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -config.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -config.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -config.o: ../core/group.h ../core/loadavg.h ../core/image.h -config.o: ../core/basethread.h ../core/threadmanager.h -config.o: ../core/sessionmanager.h ../core/sessioncontainer.h -config.o: ../core/system.h ../core/htmlfilter.h +config.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +config.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h +config.o: ../core/loadavg.h ../core/image.h ../core/basethread.h +config.o: ../core/threadmanager.h ../core/sessionmanager.h +config.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h dir.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h dir.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -76,10 +75,10 @@ dir.o: ../core/slog.h ../core/cur.h ../templates/locale.h ../notify/notify.h dir.o: ../notify/notifypool.h ../templates/patterns.h dir.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h dir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -dir.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -dir.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -dir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -dir.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +dir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +dir.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +dir.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h +dir.o: ../core/threadmanager.h ../core/sessionmanager.h dir.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h dir.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h @@ -91,11 +90,11 @@ dir.o: ../functions/last.h ../functions/login.h ../functions/logout.h dir.o: ../functions/ln.h ../functions/ls.h ../functions/man.h dir.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h dir.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -dir.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -dir.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h -dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h -dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h -dir.o: ../functions/who.h ../functions/vim.h +dir.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +dir.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h +dir.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +dir.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h doc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h doc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -114,10 +113,10 @@ doc.o: ../core/slog.h ../core/cur.h ../templates/locale.h ../notify/notify.h doc.o: ../notify/notifypool.h ../templates/patterns.h doc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h doc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -doc.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -doc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -doc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -doc.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +doc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +doc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +doc.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h +doc.o: ../core/threadmanager.h ../core/sessionmanager.h doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h doc.o: ../core/request.h ../core/misc.h env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h @@ -138,10 +137,10 @@ env.o: ../core/slog.h ../core/cur.h ../templates/locale.h ../notify/notify.h env.o: ../notify/notifypool.h ../templates/patterns.h env.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h env.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -env.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -env.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -env.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -env.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +env.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +env.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +env.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h +env.o: ../core/threadmanager.h ../core/sessionmanager.h env.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h env.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h env.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h @@ -153,11 +152,11 @@ env.o: ../functions/last.h ../functions/login.h ../functions/logout.h env.o: ../functions/ln.h ../functions/ls.h ../functions/man.h env.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h env.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -env.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -env.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h -env.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h -env.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h -env.o: ../functions/who.h ../functions/vim.h +env.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +env.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h +env.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +env.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +env.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h filters.o: ../../ezc/src/pattern.h ../../ezc/src/item.h filters.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h @@ -178,10 +177,10 @@ filters.o: ../core/cur.h ../templates/locale.h ../notify/notify.h filters.o: ../notify/notifypool.h ../templates/patterns.h filters.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h filters.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -filters.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -filters.o: ../core/mountparser.h ../core/crypt.h ../core/run.h -filters.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -filters.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +filters.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +filters.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +filters.o: ../core/group.h ../core/loadavg.h ../core/image.h +filters.o: ../core/basethread.h ../core/threadmanager.h filters.o: ../core/sessionmanager.h ../core/sessioncontainer.h filters.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h @@ -217,13 +216,12 @@ insert.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h insert.o: ../templates/patterns.h ../notify/notifythread.h insert.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h insert.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -insert.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -insert.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -insert.o: ../core/group.h ../core/loadavg.h ../core/image.h -insert.o: ../core/basethread.h ../core/threadmanager.h -insert.o: ../core/sessionmanager.h ../core/sessioncontainer.h -insert.o: ../core/system.h ../core/htmlfilter.h ../core/request.h -insert.o: ../core/misc.h +insert.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +insert.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h +insert.o: ../core/loadavg.h ../core/image.h ../core/basethread.h +insert.o: ../core/threadmanager.h ../core/sessionmanager.h +insert.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +insert.o: ../core/request.h ../core/misc.h item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h item.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -242,13 +240,12 @@ item.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h item.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h item.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h item.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h -item.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h -item.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -item.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h -item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -item.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h -item.o: ../core/bbcodeparser.h miscspace.h +item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +item.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +item.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +item.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h miscspace.h last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h last.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -267,13 +264,12 @@ last.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h last.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h last.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h last.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h -last.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h -last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -last.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h -last.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -last.o: ../core/htmlfilter.h ../core/lastcontainer.h ../core/request.h -last.o: ../core/misc.h +last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +last.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +last.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h locale.o: locale.h ../core/log.h ../core/textstream.h locale.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h locale.o: ../templates/locale.h @@ -301,10 +297,9 @@ login.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h login.o: ../templates/patterns.h ../notify/notifythread.h login.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h login.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -login.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -login.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -login.o: ../core/group.h ../core/loadavg.h ../core/image.h -login.o: ../core/basethread.h ../core/threadmanager.h +login.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h +login.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +login.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h login.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h login.o: ../core/htmlfilter.h ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h @@ -325,12 +320,11 @@ ls.o: ../core/slog.h ../core/cur.h ../templates/locale.h ../notify/notify.h ls.o: ../notify/notifypool.h ../templates/patterns.h ../notify/notifythread.h ls.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h ls.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -ls.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -ls.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -ls.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h -ls.o: ../core/threadmanager.h ../core/sessionmanager.h -ls.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -ls.o: ../core/request.h +ls.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h +ls.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +ls.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h +ls.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +ls.o: ../core/htmlfilter.h ../core/request.h man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h man.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h man.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -349,10 +343,10 @@ man.o: ../core/slog.h ../core/cur.h ../templates/locale.h ../notify/notify.h man.o: ../notify/notifypool.h ../templates/patterns.h man.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h man.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -man.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -man.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -man.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -man.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +man.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +man.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +man.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h +man.o: ../core/threadmanager.h ../core/sessionmanager.h man.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h man.o: ../core/request.h ../core/misc.h ../functions/functions.h man.o: ../functions/functionbase.h ../core/synchro.h @@ -364,11 +358,12 @@ man.o: ../functions/env.h ../functions/last.h ../functions/login.h man.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h man.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h man.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -man.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -man.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h -man.o: ../functions/stat.h ../functions/subject.h ../functions/template.h -man.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h -man.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h +man.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +man.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h +man.o: ../functions/specialdefault.h ../functions/stat.h +man.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h +man.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +man.o: ../functions/who.h ../functions/vim.h misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h misc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -387,12 +382,12 @@ misc.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h misc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h misc.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h misc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h -misc.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h -misc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -misc.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h -misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -misc.o: ../core/htmlfilter.h ../core/misc.h ../core/request.h +misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +misc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +misc.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +misc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +misc.o: ../core/misc.h ../core/request.h miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h miscspace.o: ../../ezc/src/pattern.h ../../ezc/src/item.h miscspace.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h @@ -414,13 +409,12 @@ miscspace.o: ../notify/notify.h ../notify/notifypool.h miscspace.o: ../templates/patterns.h ../notify/notifythread.h miscspace.o: ../core/basethread.h ../core/synchro.h miscspace.o: ../notify/templatesnotify.h ../core/users.h -miscspace.o: ../core/ugcontainer.h ../core/lastcontainer.h -miscspace.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -miscspace.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -miscspace.o: ../core/group.h ../core/loadavg.h ../core/image.h -miscspace.o: ../core/basethread.h ../core/threadmanager.h -miscspace.o: ../core/sessionmanager.h ../core/sessioncontainer.h -miscspace.o: ../core/system.h ../core/htmlfilter.h +miscspace.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +miscspace.o: ../core/mountparser.h ../core/crypt.h ../core/run.h +miscspace.o: ../core/users.h ../core/groups.h ../core/group.h +miscspace.o: ../core/loadavg.h ../core/image.h ../core/basethread.h +miscspace.o: ../core/threadmanager.h ../core/sessionmanager.h +miscspace.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h mount.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -440,10 +434,9 @@ mount.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h mount.o: ../templates/patterns.h ../notify/notifythread.h mount.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -mount.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -mount.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -mount.o: ../core/group.h ../core/loadavg.h ../core/image.h -mount.o: ../core/basethread.h ../core/threadmanager.h +mount.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h +mount.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +mount.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h mount.o: ../core/htmlfilter.h ../core/misc.h ../core/mounts.h patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h @@ -479,24 +472,24 @@ priv.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h priv.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h priv.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h priv.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h -priv.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h -priv.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -priv.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h -priv.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -priv.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h -priv.o: ../functions/functions.h ../functions/functionbase.h -priv.o: ../core/synchro.h ../functions/functionparser.h -priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -priv.o: ../functions/privchanger.h ../functions/chown.h -priv.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -priv.o: ../functions/download.h ../functions/emacs.h ../functions/env.h -priv.o: ../functions/last.h ../functions/login.h ../functions/logout.h -priv.o: ../functions/ln.h ../functions/ls.h ../functions/man.h -priv.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h -priv.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -priv.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -priv.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h +priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +priv.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +priv.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +priv.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +priv.o: ../core/request.h ../core/misc.h ../functions/functions.h +priv.o: ../functions/functionbase.h ../core/synchro.h +priv.o: ../functions/functionparser.h ../functions/adduser.h +priv.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +priv.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +priv.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +priv.o: ../functions/env.h ../functions/last.h ../functions/login.h +priv.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h +priv.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h +priv.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h +priv.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +priv.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h +priv.o: ../functions/specialdefault.h ../functions/stat.h priv.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h priv.o: ../functions/who.h ../functions/vim.h @@ -520,10 +513,9 @@ rebus.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h rebus.o: ../templates/patterns.h ../notify/notifythread.h rebus.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h rebus.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -rebus.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -rebus.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -rebus.o: ../core/group.h ../core/loadavg.h ../core/image.h -rebus.o: ../core/basethread.h ../core/threadmanager.h +rebus.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h +rebus.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +rebus.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h rebus.o: ../core/htmlfilter.h slog.o: ../core/slog.h ../core/cur.h ../core/logmanipulators.h @@ -545,12 +537,11 @@ slog.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h slog.o: ../core/slog.h ../notify/notify.h ../notify/notifypool.h slog.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h slog.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -slog.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h -slog.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h -slog.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -slog.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h -slog.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -slog.o: ../core/htmlfilter.h +slog.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +slog.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +slog.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +slog.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +slog.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h stat.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -569,12 +560,12 @@ stat.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h stat.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h stat.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h stat.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -stat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h -stat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h -stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -stat.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h -stat.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -stat.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h +stat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +stat.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +stat.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +stat.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +stat.o: ../core/request.h ../core/misc.h sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h sys.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h sys.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -593,10 +584,10 @@ sys.o: ../core/slog.h ../core/cur.h ../templates/locale.h ../notify/notify.h sys.o: ../notify/notifypool.h ../templates/patterns.h sys.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h sys.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -sys.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -sys.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -sys.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -sys.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +sys.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +sys.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +sys.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h +sys.o: ../core/threadmanager.h ../core/sessionmanager.h sys.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h sys.o: ../core/request.h ../core/version.h ../core/plugin.h sys.o: ../core/pluginmsg.h ../core/sessionmanager.h ../functions/functions.h @@ -609,12 +600,12 @@ sys.o: ../functions/env.h ../functions/last.h ../functions/login.h sys.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h sys.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h sys.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -sys.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -sys.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h -sys.o: ../functions/stat.h ../functions/subject.h ../functions/template.h -sys.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h -sys.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h -sys.o: ../templates/templates.h +sys.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +sys.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h +sys.o: ../functions/specialdefault.h ../functions/stat.h +sys.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h +sys.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +sys.o: ../functions/who.h ../functions/vim.h ../templates/templates.h template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h template.o: ../../ezc/src/pattern.h ../../ezc/src/item.h template.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h @@ -635,13 +626,12 @@ template.o: ../core/slog.h ../core/cur.h ../templates/locale.h template.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -template.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -template.o: ../core/mountparser.h ../core/crypt.h ../core/run.h -template.o: ../core/users.h ../core/groups.h ../core/group.h -template.o: ../core/loadavg.h ../core/image.h ../core/basethread.h -template.o: ../core/threadmanager.h ../core/sessionmanager.h -template.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -template.o: ../core/misc.h +template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +template.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +template.o: ../core/group.h ../core/loadavg.h ../core/image.h +template.o: ../core/basethread.h ../core/threadmanager.h +template.o: ../core/sessionmanager.h ../core/sessioncontainer.h +template.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h templates.o: ../../ezc/src/pattern.h ../../ezc/src/item.h templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h @@ -663,16 +653,15 @@ templates.o: ../notify/notify.h ../notify/notifypool.h templates.o: ../templates/patterns.h ../notify/notifythread.h templates.o: ../core/basethread.h ../core/synchro.h templates.o: ../notify/templatesnotify.h ../core/users.h -templates.o: ../core/ugcontainer.h ../core/lastcontainer.h -templates.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -templates.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -templates.o: ../core/group.h ../core/loadavg.h ../core/image.h -templates.o: ../core/basethread.h ../core/threadmanager.h -templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h -templates.o: ../core/system.h ../core/htmlfilter.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/request.h ../core/synchro.h +templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +templates.o: ../core/mountparser.h ../core/crypt.h ../core/run.h +templates.o: ../core/users.h ../core/groups.h ../core/group.h +templates.o: ../core/loadavg.h ../core/image.h ../core/basethread.h +templates.o: ../core/threadmanager.h ../core/sessionmanager.h +templates.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +templates.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h +templates.o: ../core/sessionmanager.h ../functions/functions.h +templates.o: ../functions/functionbase.h ../core/request.h ../core/synchro.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 @@ -682,12 +671,13 @@ templates.o: ../functions/last.h ../functions/login.h ../functions/logout.h templates.o: ../functions/ln.h ../functions/ls.h ../functions/man.h templates.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h templates.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -templates.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -templates.o: ../functions/sort.h ../functions/specialdefault.h -templates.o: ../functions/stat.h ../functions/subject.h -templates.o: ../functions/template.h ../functions/tinymce.h -templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h -templates.o: ../functions/who.h ../functions/vim.h ../templates/templates.h +templates.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +templates.o: ../functions/rm.h ../functions/sort.h +templates.o: ../functions/specialdefault.h ../functions/stat.h +templates.o: ../functions/subject.h ../functions/template.h +templates.o: ../functions/tinymce.h ../functions/uname.h +templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h +templates.o: ../functions/vim.h ../templates/templates.h upload.o: ../core/request.h templates.h ../../ezc/src/ezc.h upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -708,9 +698,9 @@ upload.o: ../core/cur.h ../templates/locale.h ../notify/notify.h upload.o: ../notify/notifypool.h ../templates/patterns.h upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -upload.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h -upload.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +upload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +upload.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +upload.o: ../core/group.h ../core/loadavg.h ../core/image.h upload.o: ../core/basethread.h ../core/threadmanager.h upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h upload.o: ../core/system.h ../core/htmlfilter.h @@ -734,12 +724,11 @@ uptime.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h uptime.o: ../templates/patterns.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: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -uptime.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -uptime.o: ../core/group.h ../core/loadavg.h ../core/image.h -uptime.o: ../core/basethread.h ../core/threadmanager.h -uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h -uptime.o: ../core/system.h ../core/htmlfilter.h +uptime.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +uptime.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h +uptime.o: ../core/loadavg.h ../core/image.h ../core/basethread.h +uptime.o: ../core/threadmanager.h ../core/sessionmanager.h +uptime.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h user.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -758,12 +747,12 @@ user.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h user.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h user.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h user.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h -user.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h -user.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -user.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h -user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -user.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h +user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +user.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h +user.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +user.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +user.o: ../core/request.h ../core/misc.h who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h who.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h who.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h @@ -782,10 +771,10 @@ who.o: ../core/slog.h ../core/cur.h ../templates/locale.h ../notify/notify.h who.o: ../notify/notifypool.h ../templates/patterns.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 ../templates/misc.h ../core/mounts.h -who.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h -who.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +who.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +who.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h +who.o: ../core/threadmanager.h ../core/sessionmanager.h who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h who.o: ../core/request.h ../core/misc.h winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h @@ -807,10 +796,9 @@ winix.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h winix.o: ../templates/patterns.h ../notify/notifythread.h winix.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h winix.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -winix.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h -winix.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -winix.o: ../core/group.h ../core/loadavg.h ../core/image.h -winix.o: ../core/basethread.h ../core/threadmanager.h +winix.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h +winix.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +winix.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h winix.o: ../core/htmlfilter.h ../core/request.h ../core/plugin.h winix.o: ../core/pluginmsg.h ../core/sessionmanager.h @@ -824,8 +812,8 @@ winix.o: ../functions/last.h ../functions/login.h ../functions/logout.h winix.o: ../functions/ln.h ../functions/ls.h ../functions/man.h winix.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h winix.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -winix.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -winix.o: ../functions/sort.h ../functions/specialdefault.h +winix.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +winix.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h winix.o: ../functions/stat.h ../functions/subject.h ../functions/template.h winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h winix.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h diff --git a/templates/templates.cpp b/templates/templates.cpp index f6a7583..e0accef 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -522,36 +522,37 @@ void Templates::CreateFunctions() /* winix */ - ezc_functions.Insert("winix_cur_time", winix_cur_time); - ezc_functions.Insert("winix_how_many_sessions", winix_how_many_sessions); - ezc_functions.Insert("winix_users_logged", winix_users_logged); - ezc_functions.Insert("winix_function", winix_function); - ezc_functions.Insert("winix_function_is", winix_function_is); - ezc_functions.Insert("winix_function_param_is", winix_function_param_is); - ezc_functions.Insert("winix_function_param_is_not", winix_function_param_is_not); - ezc_functions.Insert("winix_function_param_value", winix_function_param_value); - ezc_functions.Insert("winix_function_param_value_is", winix_function_param_value_is); - ezc_functions.Insert("winix_function_param_value_is_not", winix_function_param_value_is_not); - ezc_functions.Insert("winix_has_plugin", winix_has_plugin); - ezc_functions.Insert("winix_loadavg_now", winix_loadavg_now); - ezc_functions.Insert("winix_loadavg_1", winix_loadavg_1); - ezc_functions.Insert("winix_loadavg_5", winix_loadavg_5); - ezc_functions.Insert("winix_loadavg_15", winix_loadavg_15); - ezc_functions.Insert("winix_req_per_sec_now", winix_req_per_sec_now); - ezc_functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1); - ezc_functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5); - ezc_functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15); - ezc_functions.Insert("winix_err_is", winix_err_is); - ezc_functions.Insert("winix_err_code", winix_err_code); - ezc_functions.Insert("winix_is_err_in_locales", winix_is_err_in_locales); - ezc_functions.Insert("winix_err_msg_from_locales", winix_err_msg_from_locales); - ezc_functions.Insert("winix_show_content_in_full_window", winix_show_content_in_full_window); - ezc_functions.Insert("false", winix_false); - ezc_functions.Insert("true", winix_true); - ezc_functions.Insert("winix_has_postvar", winix_has_postvar); - ezc_functions.Insert("winix_postvar", winix_postvar); - ezc_functions.Insert("str", str); - ezc_functions.Insert("strnc", strnc); + ezc_functions.Insert("winix_account_need_email_verification", winix_account_need_email_verification); + ezc_functions.Insert("winix_cur_time", winix_cur_time); + ezc_functions.Insert("winix_how_many_sessions", winix_how_many_sessions); + ezc_functions.Insert("winix_users_logged", winix_users_logged); + ezc_functions.Insert("winix_function", winix_function); + ezc_functions.Insert("winix_function_is", winix_function_is); + ezc_functions.Insert("winix_function_param_is", winix_function_param_is); + ezc_functions.Insert("winix_function_param_is_not", winix_function_param_is_not); + ezc_functions.Insert("winix_function_param_value", winix_function_param_value); + ezc_functions.Insert("winix_function_param_value_is", winix_function_param_value_is); + ezc_functions.Insert("winix_function_param_value_is_not", winix_function_param_value_is_not); + ezc_functions.Insert("winix_has_plugin", winix_has_plugin); + ezc_functions.Insert("winix_loadavg_now", winix_loadavg_now); + ezc_functions.Insert("winix_loadavg_1", winix_loadavg_1); + ezc_functions.Insert("winix_loadavg_5", winix_loadavg_5); + ezc_functions.Insert("winix_loadavg_15", winix_loadavg_15); + ezc_functions.Insert("winix_req_per_sec_now", winix_req_per_sec_now); + ezc_functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1); + ezc_functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5); + ezc_functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15); + ezc_functions.Insert("winix_err_is", winix_err_is); + ezc_functions.Insert("winix_err_code", winix_err_code); + ezc_functions.Insert("winix_is_err_in_locales", winix_is_err_in_locales); + ezc_functions.Insert("winix_err_msg_from_locales", winix_err_msg_from_locales); + ezc_functions.Insert("winix_show_content_in_full_window", winix_show_content_in_full_window); + ezc_functions.Insert("false", winix_false); + ezc_functions.Insert("true", winix_true); + ezc_functions.Insert("winix_has_postvar", winix_has_postvar); + ezc_functions.Insert("winix_postvar", winix_postvar); + ezc_functions.Insert("str", str); + ezc_functions.Insert("strnc", strnc); /* diff --git a/templates/templates.h b/templates/templates.h index 13501d1..8143546 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -440,6 +440,7 @@ namespace TemplatesFunctions /* winix */ + void winix_account_need_email_verification(Info & i); void winix_cur_time(Info & i); void winix_how_many_sessions(Info & i); void winix_users_logged(Info & i); diff --git a/templates/winix.cpp b/templates/winix.cpp index fd77ff6..e5a2c91 100755 --- a/templates/winix.cpp +++ b/templates/winix.cpp @@ -20,6 +20,11 @@ namespace TemplatesFunctions { +void winix_account_need_email_verification(Info & i) +{ + i.res = config->account_need_email_verification; +} + void winix_cur_time(Info & i) { diff --git a/txt/notify_confirm_account.txt b/txt/notify_confirm_account.txt new file mode 100755 index 0000000..f715047 --- /dev/null +++ b/txt/notify_confirm_account.txt @@ -0,0 +1,25 @@ +Subject: [filter fil_qencode]{notify_confirm_account}[end]\n +From: [filter fil_qencode]{notify_from_name}[end] <{notify_from_email}>\n +To: [filter fil_qencode][notify_to_name][end] <[notify_to_email]>\n +Content-Transfer-Encoding: 8bit\n +Content-Type: {notify_content_type} +\n\n + +{notify_header} +\n\n + +{notify_msg10}\n +{notify_msg11}\n +[notify_item_link]\n + +\n +\n +{notify_msg12}\n +\n +{notify_msg9b}\n +\n +-- \n +{notify_footer1}\n +{notify_footer2}\n +{notify_footer3}\n +{notify_footer4}\n