From eaf10c70b718d477a5105957b71594c9070d2c6a Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 27 Jun 2011 21:38:19 +0000 Subject: [PATCH] added: a new winix function: passwd for changing your password or if you are a super user you can change a password for anyone added: uname prints available plugins now git-svn-id: svn://ttmath.org/publicrep/winix/trunk@748 e52654a7-88a9-db11-a3e9-0013d4bc506e --- core/Makefile.dep | 63 ++--- core/error.h | 8 +- core/plugin.cpp | 8 +- core/plugin.h | 20 +- db/db.cpp | 35 ++- db/db.h | 11 +- functions/Makefile.dep | 473 ++++++++++++++++++--------------- functions/Makefile.o.dep | 2 +- functions/adduser.cpp | 70 +++-- functions/adduser.h | 7 +- functions/functions.cpp | 1 + functions/functions.h | 2 + functions/passwd.cpp | 89 +++++++ functions/passwd.h | 38 +++ html/fun_adduser.html | 4 - html/fun_passwd.html | 27 ++ html/fun_uname.html | 18 +- html/slog.html | 4 +- locale/en | 22 +- locale/pl | 21 +- main/Makefile.dep | 22 +- notify/Makefile.dep | 18 +- plugins/gallery/Makefile.dep | 21 +- plugins/groupitem/Makefile.dep | 17 +- plugins/stats/Makefile.dep | 21 +- plugins/thread/Makefile.dep | 40 +-- plugins/ticket/Makefile.dep | 136 +++++----- static/layout1/winix.css | 11 +- templates/Makefile.dep | 30 ++- templates/sys.cpp | 62 ++++- templates/templates.cpp | 12 +- templates/templates.h | 6 + 32 files changed, 871 insertions(+), 448 deletions(-) create mode 100755 functions/passwd.cpp create mode 100755 functions/passwd.h create mode 100755 html/fun_passwd.html diff --git a/core/Makefile.dep b/core/Makefile.dep index ab35dfe..670a603 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -28,17 +28,18 @@ app.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h app.o: ../functions/download.h ../functions/emacs.h ../functions/last.h app.o: ../functions/login.h ../functions/logout.h ../functions/ln.h app.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -app.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h -app.o: ../functions/reload.h ../functions/rm.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/ckeditorgetparser.h -app.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -app.o: ../core/sessionmanager.h compress.h getparser.h httpsimpleparser.h -app.o: postparser.h cookieparser.h postmultiparser.h acceptencodingparser.h -app.o: acceptbaseparser.h plugin.h pluginmsg.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/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/ckeditorgetparser.h ../core/httpsimpleparser.h +app.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +app.o: compress.h getparser.h httpsimpleparser.h postparser.h cookieparser.h +app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h plugin.h +app.o: pluginmsg.h basethread.o: basethread.h log.h textstream.h logmanipulators.h slog.h cur.h basethread.o: request.h requesttypes.h item.h error.h config.h confparser.h basethread.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h @@ -78,8 +79,8 @@ config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h config.o: ../functions/last.h ../functions/login.h ../functions/logout.h config.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h config.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -config.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -config.o: ../functions/specialdefault.h ../functions/stat.h +config.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h +config.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h config.o: ../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 @@ -207,8 +208,8 @@ mounts.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h mounts.o: ../functions/download.h ../functions/emacs.h ../functions/last.h mounts.o: ../functions/login.h ../functions/logout.h ../functions/ln.h mounts.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -mounts.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h -mounts.o: ../functions/reload.h ../functions/rm.h +mounts.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +mounts.o: ../functions/priv.h ../functions/reload.h ../functions/rm.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 @@ -245,8 +246,8 @@ plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h plugin.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h plugin.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -plugin.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -plugin.o: ../functions/specialdefault.h ../functions/stat.h +plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h +plugin.o: ../functions/rm.h ../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 @@ -284,16 +285,17 @@ plugindata.o: ../functions/default.h ../functions/download.h plugindata.o: ../functions/emacs.h ../functions/last.h ../functions/login.h plugindata.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h plugindata.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h -plugindata.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -plugindata.o: ../functions/rm.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/ckeditorgetparser.h -plugindata.o: ../core/httpsimpleparser.h ../core/log.h -plugindata.o: ../templates/indexpatterns.h ../core/sessionmanager.h +plugindata.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h +plugindata.o: ../functions/reload.h ../functions/rm.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/ckeditorgetparser.h ../core/httpsimpleparser.h +plugindata.o: ../core/log.h ../templates/indexpatterns.h +plugindata.o: ../core/sessionmanager.h postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h postmultiparser.o: confparser.h htmlfilter.h misc.h item.h log.h textstream.h postmultiparser.o: logmanipulators.h slog.h cur.h request.h @@ -334,8 +336,8 @@ request.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h request.o: ../functions/download.h ../functions/emacs.h ../functions/last.h request.o: ../functions/login.h ../functions/logout.h ../functions/ln.h request.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -request.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h -request.o: ../functions/reload.h ../functions/rm.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/specialdefault.h ../functions/stat.h request.o: ../functions/subject.h ../functions/template.h request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h @@ -392,7 +394,8 @@ sessionmanager.o: ../functions/last.h ../functions/login.h sessionmanager.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h sessionmanager.o: ../functions/mkdir.h ../functions/mv.h sessionmanager.o: ../functions/nicedit.h ../functions/node.h -sessionmanager.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +sessionmanager.o: ../functions/passwd.h ../functions/priv.h +sessionmanager.o: ../functions/reload.h ../functions/rm.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 diff --git a/core/error.h b/core/error.h index 9c4b97d..9989f2b 100755 --- a/core/error.h +++ b/core/error.h @@ -48,10 +48,10 @@ #define WINIX_ERR_NO_TICKET 24 -#define WINIX_ERR_PASSWORDS_DIFFERENT 25 -#define WINIX_ERR_PASSWORD_TOO_SHORT 26 -#define WINIX_ERR_USER_EXISTS 27 -#define WINIX_ERR_LOGIN_EMPTY 28 +//#define WINIX_ERR_PASSWORDS_DIFFERENT 25 +//#define WINIX_ERR_PASSWORD_TOO_SHORT 26 +//#define WINIX_ERR_USER_EXISTS 27 +//#define WINIX_ERR_LOGIN_EMPTY 28 #define WINIX_DIFFERENT_MOUNT_POINTS 29 diff --git a/core/plugin.cpp b/core/plugin.cpp index 0e932bc..31e27e5 100755 --- a/core/plugin.cpp +++ b/core/plugin.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-2011, Tomasz Sowa * All rights reserved. * */ @@ -420,3 +420,9 @@ Slot s; log << log3 << "Plugin: added function for message: " << message << ", plugin index: " << s.index << logend; } + +const Plugin::Plugins * Plugin::GetPlugins() +{ + return &plugins; +} + diff --git a/core/plugin.h b/core/plugin.h index f5b5b49..e423a6c 100755 --- a/core/plugin.h +++ b/core/plugin.h @@ -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-2011, Tomasz Sowa * All rights reserved. * */ @@ -124,6 +124,14 @@ public: } }; + struct PluginsItem + { + void * handle; + const wchar_t * plugin_name; // plugin name (can be null if was not set by the plugin) + }; + + typedef std::vector Plugins; + Plugin(); ~Plugin(); @@ -174,6 +182,9 @@ public: void Assign(int message, Fun1); void Assign(int message, Fun2); + // return a const pointer to the plugin tab + const Plugins * GetPlugins(); + private: Db * db; @@ -190,13 +201,6 @@ private: std::wstring temp_path; - struct PluginsItem - { - void * handle; - const wchar_t * plugin_name; // plugin name (can be null if was not set by the plugin) - }; - - typedef std::vector Plugins; Plugins plugins; typedef std::multimap Slots; diff --git a/db/db.cpp b/db/db.cpp index cdc4a78..f59c3fc 100755 --- a/db/db.cpp +++ b/db/db.cpp @@ -114,6 +114,31 @@ 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) +{ + query.Clear(); + query << R("update core.user set(password, pass_encrypted," + "pass_type, pass_hash_salted) = ("); + + // for safety + if( password_encrypted.empty() ) + query << password; + else + query << ""; + + query.EPutBin(password_encrypted); + + query << pass_type + << pass_hash_salted + << R(") where login=") + << login + << R(";"); + +return DoCommand(query); +} + @@ -633,7 +658,7 @@ Error Db::EditSortIndexItemById(long id, int sort_index) -PGresult * Db::GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) +void Db::GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) { query << R("select item.id, content_id"); @@ -659,7 +684,7 @@ PGresult * Db::GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, } -PGresult * Db::GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query) +void Db::GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query) { if( iq.sel_content || iq.sel_file || iq.where_file_type ) query << R(" left join core.content on item.content_id = content.id"); @@ -667,7 +692,7 @@ PGresult * Db::GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query) -PGresult * Db::GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query) +void Db::GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query) { if( iq.where_id || iq.where_parent_id || iq.where_type || iq.where_file_type ) { @@ -716,7 +741,7 @@ PGresult * Db::GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query) } -PGresult * Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query) +void Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query) { if( iq.sel_sort_index || iq.sel_date ) { @@ -741,7 +766,7 @@ PGresult * Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query) } -PGresult * Db::GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query) +void Db::GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query) { if( iq.limit != 0 ) query << R(" limit ") << iq.limit; diff --git a/db/db.h b/db/db.h index d07cf4a..adacf28 100755 --- a/db/db.h +++ b/db/db.h @@ -43,6 +43,7 @@ public: bool GetUserPass(const std::wstring & login, long & user_id, UserPass & up); Error AddUser(User & user, const std::wstring & password, const std::string & password_encrypted, int pass_type, bool pass_hash_salted); + Error ChangePass(const std::wstring & login, const std::wstring & password, const std::string & password_encrypted, int pass_type, bool pass_hash_salted); Error AddItem(Item & item); Error EditItemById(Item & item, bool with_url = true); @@ -114,11 +115,11 @@ protected: Error IncrementContentRef(long content_id); Error DecrementContentRef(long content_id); - PGresult * GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel); - PGresult * GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query); - PGresult * GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query); - PGresult * GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query); - PGresult * GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query); + void GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel); + void GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query); + void GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query); + void GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query); + void GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query); PGresult * GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel = false); PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false); diff --git a/functions/Makefile.dep b/functions/Makefile.dep index ab1b188..375c797 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -19,15 +19,16 @@ adduser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h adduser.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h adduser.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h adduser.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -adduser.o: nicedit.h node.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h -adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -adduser.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -adduser.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +adduser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h +adduser.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +adduser.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +adduser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +adduser.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +adduser.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +adduser.o: ../core/synchro.h ../core/slog.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 @@ -45,16 +46,16 @@ cat.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h cat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h cat.o: functions.h functionparser.h ../core/cur.h adduser.h chmod.h cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -cat.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -cat.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -cat.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -cat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -cat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -cat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -cat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -cat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -cat.o: ../core/synchro.h +cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h +cat.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +cat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +cat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +cat.o: ../templates/htmltextstream.h ../notify/notifythread.h +cat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +cat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +cat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +cat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +cat.o: ../core/basethread.h ../core/synchro.h chmod.o: chmod.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h chmod.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -73,15 +74,16 @@ chmod.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h chmod.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h chmod.o: adduser.h cat.h chown.h privchanger.h ckeditor.h cp.h default.h chmod.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -chmod.o: nicedit.h node.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h -chmod.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -chmod.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -chmod.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -chmod.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -chmod.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +chmod.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h +chmod.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +chmod.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +chmod.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +chmod.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +chmod.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +chmod.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +chmod.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +chmod.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +chmod.o: ../core/synchro.h chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h chown.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -100,15 +102,16 @@ chown.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h chown.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h chown.o: adduser.h cat.h chmod.h privchanger.h ckeditor.h cp.h default.h chown.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -chown.o: nicedit.h node.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h -chown.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -chown.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -chown.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -chown.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -chown.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +chown.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h +chown.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +chown.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +chown.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +chown.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +chown.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +chown.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +chown.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +chown.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +chown.o: ../core/synchro.h ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -128,9 +131,9 @@ ckeditor.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h ckeditor.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h ckeditor.o: privchanger.h chown.h cp.h default.h download.h emacs.h last.h -ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -ckeditor.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -ckeditor.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h +ckeditor.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +ckeditor.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h ckeditor.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ckeditor.o: ../templates/htmltextstream.h ../notify/notifythread.h ckeditor.o: ../core/basethread.h ../core/synchro.h @@ -156,8 +159,8 @@ cp.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h cp.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h cp.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h cp.o: privchanger.h chown.h ckeditor.h default.h download.h emacs.h last.h -cp.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -cp.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +cp.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h +cp.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h cp.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h cp.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h cp.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h @@ -185,15 +188,16 @@ default.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h default.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h default.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -default.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h -default.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -default.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -default.o: ../templates/htmltextstream.h ../notify/notifythread.h -default.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -default.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -default.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -default.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +default.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.h +default.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +default.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +default.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +default.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +default.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +default.o: ../core/synchro.h 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 @@ -213,9 +217,9 @@ download.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h download.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h download.o: privchanger.h chown.h ckeditor.h cp.h default.h emacs.h last.h -download.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -download.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -download.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +download.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h +download.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +download.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h download.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h download.o: ../templates/htmltextstream.h ../notify/notifythread.h download.o: ../core/basethread.h ../core/synchro.h @@ -242,18 +246,19 @@ emacs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h emacs.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h emacs.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h emacs.o: default.h download.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -emacs.o: nicedit.h node.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h -emacs.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -emacs.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -emacs.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -emacs.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -emacs.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -emacs.o: ../templates/templates.h ../templates/patterncacher.h -emacs.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -emacs.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +emacs.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h +emacs.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +emacs.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +emacs.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +emacs.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +emacs.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +emacs.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +emacs.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +emacs.o: ../core/synchro.h ../templates/templates.h +emacs.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h +emacs.o: ../core/httpsimpleparser.h ../core/log.h +emacs.o: ../templates/indexpatterns.h ../core/sessionmanager.h emacs.o: ../core/sessioncontainer.h ../core/system.h functionbase.o: functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -276,9 +281,9 @@ functionbase.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h functionbase.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h functionbase.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h functionbase.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -functionbase.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h -functionbase.o: stat.h subject.h template.h tinymce.h uname.h upload.h -functionbase.o: uptime.h who.h vim.h ../core/htmlfilter.h +functionbase.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h +functionbase.o: specialdefault.h stat.h subject.h template.h tinymce.h +functionbase.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h functionbase.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h functionbase.o: ../notify/notifythread.h ../core/basethread.h functionbase.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h @@ -308,7 +313,7 @@ functionparser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h functionparser.o: ../../ezc/src/pattern.h functions.h adduser.h cat.h chmod.h functionparser.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h functionparser.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -functionparser.o: nicedit.h node.h priv.h reload.h rm.h run.h +functionparser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.h @@ -347,9 +352,9 @@ functions.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h functions.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h functions.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h functions.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h -functions.o: node.h priv.h reload.h rm.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: node.h passwd.h priv.h reload.h rm.h specialdefault.h stat.h +functions.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +functions.o: vim.h ../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 @@ -374,9 +379,9 @@ last.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h last.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h last.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h last.o: default.h download.h emacs.h login.h logout.h ln.h ls.h mkdir.h mv.h -last.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -last.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -last.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +last.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h @@ -400,8 +405,8 @@ ln.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h ln.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h ln.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h ln.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -ln.o: last.h login.h logout.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -ln.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +ln.o: last.h login.h logout.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h +ln.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h ln.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h ln.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ln.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h @@ -428,15 +433,16 @@ login.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h login.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h login.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h login.o: default.h download.h emacs.h last.h logout.h ln.h ls.h mkdir.h mv.h -login.o: nicedit.h node.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.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: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -login.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -login.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +login.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h +login.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +login.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +login.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +login.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +login.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +login.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +login.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +login.o: ../core/synchro.h logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h logout.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -456,15 +462,16 @@ logout.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h logout.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h logout.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h logout.o: default.h download.h emacs.h last.h login.h ln.h ls.h mkdir.h mv.h -logout.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -logout.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -logout.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -logout.o: ../templates/htmltextstream.h ../notify/notifythread.h -logout.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -logout.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -logout.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -logout.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -logout.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +logout.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.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 ../core/mounts.h ../core/mountparser.h +logout.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +logout.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +logout.o: ../core/synchro.h ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ls.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -482,8 +489,8 @@ ls.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h ls.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h ls.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h ls.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -ls.o: last.h login.h logout.h ln.h mkdir.h mv.h nicedit.h node.h priv.h -ls.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +ls.o: last.h login.h logout.h ln.h mkdir.h mv.h nicedit.h node.h passwd.h +ls.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h ls.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h ls.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h @@ -510,15 +517,16 @@ mkdir.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h mkdir.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h mkdir.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h mkdir.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h mv.h -mkdir.o: nicedit.h node.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h -mkdir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -mkdir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -mkdir.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -mkdir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -mkdir.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +mkdir.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h +mkdir.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +mkdir.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +mkdir.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +mkdir.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +mkdir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +mkdir.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +mkdir.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +mkdir.o: ../core/synchro.h mount.o: mount.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h mount.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -537,7 +545,7 @@ mount.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h mount.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h mount.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h mount.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -mount.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +mount.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.h @@ -564,8 +572,8 @@ mv.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h mv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h mv.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h mv.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -mv.o: last.h login.h logout.h ln.h ls.h mkdir.h nicedit.h node.h priv.h -mv.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +mv.o: last.h login.h logout.h ln.h ls.h mkdir.h nicedit.h node.h passwd.h +mv.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h mv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h mv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h @@ -593,15 +601,16 @@ nicedit.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h nicedit.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h nicedit.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h nicedit.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -nicedit.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h -nicedit.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -nicedit.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -nicedit.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -nicedit.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -nicedit.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +nicedit.o: mkdir.h mv.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.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 ../core/mounts.h ../core/mountparser.h +nicedit.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +nicedit.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +nicedit.o: ../core/synchro.h 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 @@ -620,15 +629,45 @@ node.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h node.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h node.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h node.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -node.o: mkdir.h mv.h nicedit.h priv.h reload.h rm.h run.h specialdefault.h -node.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -node.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -node.o: ../templates/htmltextstream.h ../notify/notifythread.h -node.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -node.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -node.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -node.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +node.o: mkdir.h mv.h nicedit.h passwd.h priv.h reload.h rm.h run.h +node.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +node.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +node.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +node.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +node.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +node.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +node.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +node.o: ../core/synchro.h +passwd.o: passwd.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h +passwd.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h +passwd.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +passwd.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +passwd.o: ../core/user.h ../core/group.h ../core/dircontainer.h +passwd.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +passwd.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +passwd.o: ../core/request.h ../core/error.h ../core/config.h +passwd.o: ../core/confparser.h ../core/htmlfilter.h +passwd.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +passwd.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +passwd.o: ../core/confparser.h ../core/request.h ../core/config.h +passwd.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +passwd.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +passwd.o: ../templates/localefilter.h ../templates/locale.h +passwd.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +passwd.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +passwd.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +passwd.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +passwd.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.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 ../core/mounts.h ../core/mountparser.h +passwd.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +passwd.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.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 @@ -647,15 +686,16 @@ priv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h priv.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h priv.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h priv.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -priv.o: mkdir.h mv.h nicedit.h node.h reload.h rm.h run.h specialdefault.h -priv.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -priv.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -priv.o: ../templates/htmltextstream.h ../notify/notifythread.h -priv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -priv.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -priv.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -priv.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +priv.o: mkdir.h mv.h nicedit.h node.h passwd.h reload.h rm.h run.h +priv.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +priv.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +priv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +priv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +priv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +priv.o: ../core/synchro.h privchanger.o: privchanger.h ../core/request.h ../core/system.h privchanger.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h privchanger.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h @@ -676,8 +716,8 @@ privchanger.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h 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 last.h login.h -privchanger.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -privchanger.o: reload.h rm.h run.h specialdefault.h stat.h subject.h +privchanger.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h +privchanger.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h privchanger.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h privchanger.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h privchanger.o: ../templates/htmltextstream.h ../notify/notifythread.h @@ -706,18 +746,19 @@ reload.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h reload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h reload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h reload.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -reload.o: mkdir.h mv.h nicedit.h node.h priv.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h -reload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -reload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -reload.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -reload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -reload.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -reload.o: ../templates/templates.h ../templates/patterncacher.h -reload.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -reload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +reload.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h rm.h run.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 ../templates/htmltextstream.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 ../core/mounts.h ../core/mountparser.h +reload.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +reload.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +reload.o: ../core/synchro.h ../templates/templates.h +reload.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h +reload.o: ../core/httpsimpleparser.h ../core/log.h +reload.o: ../templates/indexpatterns.h ../core/sessionmanager.h reload.o: ../core/sessioncontainer.h ../core/system.h rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h @@ -736,21 +777,22 @@ rm.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h rm.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h rm.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h rm.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -rm.o: reload.h run.h specialdefault.h stat.h subject.h template.h tinymce.h -rm.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -rm.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -rm.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -rm.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -rm.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -rm.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -rm.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -rm.o: ../core/synchro.h ../core/plugin.h ../core/pluginmsg.h ../core/system.h -rm.o: ../core/sessionmanager.h ../core/sessioncontainer.h -rm.o: ../functions/functions.h ../templates/templates.h -rm.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -rm.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -rm.o: ../core/sessionmanager.h ../core/misc.h +rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h +rm.o: passwd.h priv.h reload.h run.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: ../core/htmlfilter.h ../../ezc/src/stringconv.h +rm.o: ../templates/htmltextstream.h ../notify/notifythread.h +rm.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +rm.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +rm.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +rm.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +rm.o: ../core/basethread.h ../core/synchro.h ../core/plugin.h +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/ckeditorgetparser.h ../core/httpsimpleparser.h +rm.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +rm.o: ../core/misc.h run.o: run.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h run.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h run.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -768,16 +810,16 @@ run.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h run.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h run.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h run.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -run.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -run.o: reload.h rm.h specialdefault.h stat.h subject.h template.h tinymce.h -run.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -run.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -run.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -run.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -run.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -run.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -run.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -run.o: ../core/synchro.h +run.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h +run.o: passwd.h priv.h reload.h rm.h specialdefault.h stat.h subject.h +run.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +run.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +run.o: ../templates/htmltextstream.h ../notify/notifythread.h +run.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +run.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +run.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +run.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +run.o: ../core/basethread.h ../core/synchro.h specialdefault.o: specialdefault.h functionbase.h ../core/item.h ../db/db.h specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h specialdefault.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -799,17 +841,18 @@ specialdefault.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h specialdefault.o: ../../ezc/src/pattern.h functions.h functionparser.h specialdefault.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h specialdefault.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h -specialdefault.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -specialdefault.o: reload.h rm.h run.h stat.h subject.h template.h tinymce.h -specialdefault.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -specialdefault.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -specialdefault.o: ../notify/notifythread.h ../core/basethread.h -specialdefault.o: ../core/synchro.h ../notify/templatesnotify.h -specialdefault.o: ../core/users.h ../core/ugcontainer.h -specialdefault.o: ../core/lastcontainer.h ../core/mounts.h -specialdefault.o: ../core/mountparser.h ../core/crypt.h ../core/users.h -specialdefault.o: ../core/groups.h ../core/group.h ../core/loadavg.h -specialdefault.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +specialdefault.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h +specialdefault.o: priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h +specialdefault.o: ../core/basethread.h ../core/synchro.h +specialdefault.o: ../notify/templatesnotify.h ../core/users.h +specialdefault.o: ../core/ugcontainer.h ../core/lastcontainer.h +specialdefault.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +specialdefault.o: ../core/users.h ../core/groups.h ../core/group.h +specialdefault.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +specialdefault.o: ../core/synchro.h stat.o: stat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h stat.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -828,7 +871,7 @@ stat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h stat.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h stat.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h stat.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -stat.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +stat.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h stat.o: specialdefault.h subject.h template.h tinymce.h uname.h upload.h stat.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h stat.o: ../templates/htmltextstream.h ../notify/notifythread.h @@ -856,7 +899,7 @@ subject.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h subject.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h subject.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h subject.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -subject.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +subject.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.h @@ -886,8 +929,8 @@ template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h template.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h template.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h template.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h -template.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -template.o: subject.h tinymce.h uname.h upload.h uptime.h who.h vim.h +template.o: node.h passwd.h priv.h reload.h rm.h run.h specialdefault.h +template.o: stat.h subject.h tinymce.h uname.h upload.h uptime.h who.h vim.h template.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h template.o: ../templates/htmltextstream.h ../notify/notifythread.h template.o: ../core/basethread.h ../core/synchro.h @@ -915,7 +958,7 @@ tinymce.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h tinymce.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h tinymce.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h tinymce.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -tinymce.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +tinymce.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.h @@ -943,7 +986,7 @@ uname.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h uname.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h uname.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h uname.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -uname.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +uname.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.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: ../templates/htmltextstream.h ../notify/notifythread.h @@ -971,7 +1014,7 @@ upload.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h upload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h upload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h upload.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -upload.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +upload.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.h @@ -1004,7 +1047,7 @@ uptime.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h uptime.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h uptime.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h uptime.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -uptime.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +uptime.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.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 ../templates/htmltextstream.h @@ -1031,16 +1074,16 @@ vim.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h vim.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h vim.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h vim.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -vim.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -vim.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -vim.o: tinymce.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h -vim.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -vim.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -vim.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -vim.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -vim.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -vim.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -vim.o: ../core/synchro.h +vim.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h +vim.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +vim.o: template.h tinymce.h uname.h upload.h uptime.h who.h +vim.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +vim.o: ../templates/htmltextstream.h ../notify/notifythread.h +vim.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +vim.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +vim.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +vim.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +vim.o: ../core/basethread.h ../core/synchro.h who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h who.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -1058,13 +1101,13 @@ who.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h who.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h who.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h who.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -who.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h -who.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -who.o: tinymce.h uname.h upload.h uptime.h vim.h ../core/htmlfilter.h -who.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -who.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -who.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -who.o: ../core/synchro.h +who.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h +who.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +who.o: template.h tinymce.h uname.h upload.h uptime.h vim.h +who.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +who.o: ../templates/htmltextstream.h ../notify/notifythread.h +who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +who.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h +who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +who.o: ../core/basethread.h ../core/synchro.h diff --git a/functions/Makefile.o.dep b/functions/Makefile.o.dep index 13148e3..2813efe 100755 --- a/functions/Makefile.o.dep +++ b/functions/Makefile.o.dep @@ -1 +1 @@ -o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o mkdir.o mount.o mv.o nicedit.o node.o priv.o privchanger.o reload.o rm.o run.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o +o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o reload.o rm.o run.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o diff --git a/functions/adduser.cpp b/functions/adduser.cpp index 5440a75..1c0da65 100755 --- a/functions/adduser.cpp +++ b/functions/adduser.cpp @@ -8,6 +8,7 @@ */ #include "adduser.h" +#include "core/slog.h" @@ -21,29 +22,65 @@ AddUser::AddUser() } -bool AddUser::CheckAddUserVars(const std::wstring & login, const std::wstring & pass, const std::wstring & conf_pass) +/* + checking whether login consists of allowed characters + currently all characters above 32 (space) are available + + 160 - unbreakable space +*/ +bool AddUser::HasLoginCorrectChars(const std::wstring & login) +{ + for(size_t i=0 ; irequest->status = WINIX_ERR_LOGIN_EMPTY; + log << log3 << "AddUser: login can't be empty" << logend; + slog << logerror << T("adduser_err_login_empty") << logend; return false; } - if( pass != conf_pass ) + if( !HasLoginCorrectChars(login) ) { - cur->request->status = WINIX_ERR_PASSWORDS_DIFFERENT; - return false; - } - - if( pass.size() < config->pass_min_size ) - { - cur->request->status = WINIX_ERR_PASSWORD_TOO_SHORT; + log << log3 << "AddUser: incorrect login characters" << logend; + slog << logerror << T("adduser_err_login_incorrect_chars") << logend; return false; } if( system->users.IsUser(login) ) { - cur->request->status = WINIX_ERR_USER_EXISTS; + log << log3 << "AddUser: such user already exists" << logend; + slog << logerror << T("adduser_err_user_exists") << logend; + return false; + } + +return true; +} + + + +bool AddUser::IsPasswordCorrect(const std::wstring & pass, const std::wstring & conf_pass) +{ + if( pass != conf_pass ) + { + log << log3 << "AddUser: passwords are different" << logend; + 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; return false; } @@ -53,17 +90,14 @@ return true; - - void AddUser::MakePost() { -User user; - + user.Clear(); 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"); - if( !CheckAddUserVars(login, pass, conf_pass) ) + if( !IsLoginCorrect(login) || !IsPasswordCorrect(pass, conf_pass) ) return; user.name = login; @@ -81,11 +115,11 @@ User user; if( !cur->session->puser ) system->users.LoginUser(user.id, false); - log << log2 << "Adduser: added a new user: " << user.name << logend; + log << log2 << "AddUser: added a new user: " << user.name << logend; } else { - log << log1 << "Adduser: I can't add to system->users: " << user.name + log << log1 << "AddUser: I can't add to system->users: " << user.name << " but the user was added to the db correctly" << logend; } diff --git a/functions/adduser.h b/functions/adduser.h index af7851a..99c1a3e 100755 --- a/functions/adduser.h +++ b/functions/adduser.h @@ -26,10 +26,15 @@ public: void MakePost(); void MakeGet(); + bool IsLoginCorrect(const std::wstring & login); + bool IsPasswordCorrect(const std::wstring & pass, const std::wstring & conf_pass); + bool HasLoginCorrectChars(const std::wstring & login); + private: - bool CheckAddUserVars(const std::wstring & login, const std::wstring & pass, const std::wstring & conf_pass); UserPass up; + User user; + }; diff --git a/functions/functions.cpp b/functions/functions.cpp index 2c28875..f5503d2 100755 --- a/functions/functions.cpp +++ b/functions/functions.cpp @@ -190,6 +190,7 @@ void Functions::CreateFunctions() Add(fun_mv); Add(fun_nicedit); Add(fun_node); + Add(fun_passwd); Add(fun_priv); Add(fun_reload); Add(fun_rm); diff --git a/functions/functions.h b/functions/functions.h index 1681ed0..7bdd2c6 100755 --- a/functions/functions.h +++ b/functions/functions.h @@ -32,6 +32,7 @@ #include "mv.h" #include "nicedit.h" #include "node.h" +#include "passwd.h" #include "priv.h" #include "reload.h" #include "rm.h" @@ -76,6 +77,7 @@ public: Fun::Mv fun_mv; Fun::Nicedit fun_nicedit; Fun::Node fun_node; + Fun::Passwd fun_passwd; Fun::Priv fun_priv; Fun::Reload fun_reload; Fun::Rm fun_rm; diff --git a/functions/passwd.cpp b/functions/passwd.cpp new file mode 100755 index 0000000..7c49ba2 --- /dev/null +++ b/functions/passwd.cpp @@ -0,0 +1,89 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#include "passwd.h" +#include "core/slog.h" +#include "functions/functions.h" + + +namespace Fun +{ + + +Passwd::Passwd() +{ + fun.url = L"passwd"; +} + + + +bool Passwd::HasAccess() +{ + return cur->session->puser != 0; +} + + + +bool Passwd::ChangePassword(const std::wstring & login, const std::wstring & new_password) +{ + 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); + +return res == WINIX_ERR_OK; +} + + +/* + if you are a root (super_user) you can change a password for everyone + (the html form has a select option) + + but if you are not a root you can change only your password + and you should provide your current password as well +*/ +void Passwd::MakePost() +{ +long user_id; +const std::wstring * plogin; + + if( !cur->session->puser ) + return; + + bool is_root = cur->session->puser->super_user; + + if( is_root ) + plogin = &cur->request->PostVar(L"login"); + else + plogin = &cur->session->puser->name; + + const std::wstring & pass_cur = cur->request->PostVar(L"passwordcur"); + const std::wstring & pass_new = cur->request->PostVar(L"passwordnew"); + const std::wstring & pass_conf = cur->request->PostVar(L"passwordconfirm"); + + if( !is_root && !functions->fun_login.CheckUserPass(*plogin, pass_cur, user_id) ) + { + log << log3 << "Passwd: incorrect current password" << logend; + slog << logerror << T("passwd_err_bad_current_password") << logend; + return; + } + + if( !functions->fun_adduser.IsPasswordCorrect(pass_new, pass_conf) ) + return; + + if( ChangePassword(*plogin, pass_new) ) + { + log << log2 << "Passwd: password for " << plogin << " has been changed" << logend; + slog << loginfo << T("passwd_password_changed") << logend; + system->RedirectToLastItem(); + } +} + + + +} // namespace diff --git a/functions/passwd.h b/functions/passwd.h new file mode 100755 index 0000000..08e87ac --- /dev/null +++ b/functions/passwd.h @@ -0,0 +1,38 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_functions_passwd +#define headerfile_winix_functions_passwd + +#include "functionbase.h" +#include "core/user.h" + + +namespace Fun +{ + + +class Passwd : public FunctionBase +{ +public: + + Passwd(); + bool HasAccess(); + void MakePost(); + bool ChangePassword(const std::wstring & login, const std::wstring & new_password); + +private: + + UserPass up; +}; + + +} // namespace + +#endif diff --git a/html/fun_adduser.html b/html/fun_adduser.html index 89c1a96..18f3f2d 100755 --- a/html/fun_adduser.html +++ b/html/fun_adduser.html @@ -1,9 +1,5 @@

[if-one user_logged]{adduser_header_add}[else]{adduser_header_register}[end]

- -[include "error.html"] - -
{adduser_form_legend} diff --git a/html/fun_passwd.html b/html/fun_passwd.html new file mode 100755 index 0000000..0a1beec --- /dev/null +++ b/html/fun_passwd.html @@ -0,0 +1,27 @@ +

{passwd_header}

+ + +
+ {passwd_form_legend} + + [if user_super_user] +

{passwd_login}:

+ + [else] +

{passwd_current_password}:

+ + [end] + +

{passwd_new_password}:

+ + +

{passwd_confirm_new_password}:

+ + + +
+ diff --git a/html/fun_uname.html b/html/fun_uname.html index 71a9f2d..4c570e2 100755 --- a/html/fun_uname.html +++ b/html/fun_uname.html @@ -1,6 +1,18 @@

{uname_header}

-[include "error.html"] - -

Winix [sys_ver_major].[sys_ver_minor].[sys_ver_revision]

+ +[if sys_plugin_tab] + + {uname_available_plugins}: +
    + + [for sys_plugin_tab] +
  • [if sys_plugin_tab_has_name][sys_plugin_tab_name][else]<{uname_plugin_unknown}>[end]
    • + [end] + +
+ +[end] + + diff --git a/html/slog.html b/html/slog.html index 94c266e..61a1637 100755 --- a/html/slog.html +++ b/html/slog.html @@ -1,11 +1,11 @@ [if slog_tab] - +
[for slog_tab] -
+ [if slog_tab_is_info] diff --git a/locale/en b/locale/en index 127f8f6..a68e730 100755 --- a/locale/en +++ b/locale/en @@ -128,6 +128,18 @@ mkdir_form_legend = Make directory form html_lang_attr_value = "en" language_orphans = () + +passwd_header = Passwd +passwd_form_legend = Changing password form +passwd_login = Select a user +passwd_current_password = Current password +passwd_new_password = New password +passwd_confirm_new_password = Confirm new password +passwd_submit = Change +passwd_err_bad_current_password = Incorrect current password. +passwd_password_changed = The password has been changed + + priv_header = Permissions priv_form_legend = Permissions priv_change_in_dir = Change permissions for all items in the following directory @@ -249,6 +261,12 @@ 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_submit = Add user register_user_submit = Register +adduser_err_login_empty = Provide a login please. +adduser_err_login_incorrect_chars = We are sorry but the login consists of prohibited letters. +adduser_err_user_exists = We are sorry, but that user is already registered, check other login! +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. mount_header = Mount points @@ -309,8 +327,8 @@ subject_form_legend = Edit subject form uname_header = Uname - - +uname_available_plugins = Available plugins +uname_plugin_unknown = Plugin has not set its name diff --git a/locale/pl b/locale/pl index c28894d..52eb6bb 100755 --- a/locale/pl +++ b/locale/pl @@ -136,7 +136,17 @@ language_orphans = ( "(np.", "a", "ale", "bo", "by", "co", "czy", # orphans for SK i CZ (winix for those languages are not translated yet) # ("a", "i", "k", "o", "s", "u", "v", "z") - + + +passwd_header = Zmień swoje hasło +passwd_form_legend = Formularz zmiany hasła +passwd_login = Wybierz użytkownika +passwd_current_password = Podaj obecne hasło +passwd_new_password = Podaj nowe hasło +passwd_confirm_new_password = Potwierdź nowe hasło +passwd_submit = Zmień +passwd_err_bad_current_password = Podałeś nieprawidłowe bieżące hasło. +passwd_password_changed = Hasło zostało zmienione priv_header = Zmień uprawnienia dostępu @@ -260,6 +270,12 @@ 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_submit = Dodaj użytkownika register_user_submit = Rejestruj +adduser_err_login_empty = Proszę podać login. +adduser_err_login_incorrect_chars = Niestety ale podany login składa się z nieprawidłowych znaków! +adduser_err_user_exists = Przykro nam, podany identyfikator użytkownika jest już zajęty, proszę podać inny login! +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) mount_header = Punkty montowania @@ -317,7 +333,8 @@ subject_header = Zmień tytuł subject_form_legend = Formularz zmiany tytułu uname_header = Nazwa systemu - +uname_available_plugins = Dostępne pluginy +uname_plugin_unknown = Plugin nie ustawił swojej nazwy diff --git a/main/Makefile.dep b/main/Makefile.dep index 1c6b116..a87f683 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -33,16 +33,16 @@ main.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h main.o: ../functions/download.h ../functions/emacs.h ../functions/last.h main.o: ../functions/login.h ../functions/logout.h ../functions/ln.h main.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -main.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h -main.o: ../functions/reload.h ../functions/rm.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/ckeditorgetparser.h -main.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h -main.o: ../core/sessionmanager.h ../core/compress.h ../core/getparser.h -main.o: ../core/httpsimpleparser.h ../core/postparser.h -main.o: ../core/cookieparser.h ../core/postmultiparser.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/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/ckeditorgetparser.h ../core/httpsimpleparser.h +main.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +main.o: ../core/compress.h ../core/getparser.h ../core/httpsimpleparser.h +main.o: ../core/postparser.h ../core/cookieparser.h ../core/postmultiparser.h main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h main.o: ../core/plugin.h ../core/pluginmsg.h diff --git a/notify/Makefile.dep b/notify/Makefile.dep index 42d9771..9b2ad62 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -38,8 +38,8 @@ notify.o: ../functions/default.h ../functions/download.h ../functions/emacs.h notify.o: ../functions/last.h ../functions/login.h ../functions/logout.h notify.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h notify.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -notify.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -notify.o: ../functions/specialdefault.h ../functions/stat.h +notify.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h +notify.o: ../functions/rm.h ../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 @@ -99,13 +99,13 @@ templatesnotify.o: ../functions/last.h ../functions/login.h templatesnotify.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h templatesnotify.o: ../functions/mkdir.h ../functions/mv.h templatesnotify.o: ../functions/nicedit.h ../functions/node.h -templatesnotify.o: ../functions/priv.h ../functions/reload.h -templatesnotify.o: ../functions/rm.h ../functions/specialdefault.h -templatesnotify.o: ../functions/stat.h ../functions/subject.h -templatesnotify.o: ../functions/template.h ../functions/tinymce.h -templatesnotify.o: ../functions/uname.h ../functions/upload.h -templatesnotify.o: ../functions/uptime.h ../functions/who.h -templatesnotify.o: ../functions/vim.h ../core/htmlfilter.h +templatesnotify.o: ../functions/passwd.h ../functions/priv.h +templatesnotify.o: ../functions/reload.h ../functions/rm.h +templatesnotify.o: ../functions/specialdefault.h ../functions/stat.h +templatesnotify.o: ../functions/subject.h ../functions/template.h +templatesnotify.o: ../functions/tinymce.h ../functions/uname.h +templatesnotify.o: ../functions/upload.h ../functions/uptime.h +templatesnotify.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h templatesnotify.o: ../templates/templates.h ../templates/patterncacher.h templatesnotify.o: ../templates/ckeditorgetparser.h templatesnotify.o: ../core/httpsimpleparser.h ../core/log.h diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index 36cedc6..868f10b 100755 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -71,7 +71,8 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h init.o: ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h +init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/reload.h ../../functions/rm.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h init.o: ../../functions/tinymce.h ../../functions/uname.h @@ -124,15 +125,15 @@ templates.o: ../../functions/last.h ../../functions/login.h templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h -templates.o: ../../functions/node.h ../../functions/priv.h -templates.o: ../../functions/reload.h ../../functions/rm.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.o: ../../functions/node.h ../../functions/passwd.h +templates.o: ../../functions/priv.h ../../functions/reload.h +templates.o: ../../functions/rm.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/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/plugins/groupitem/Makefile.dep b/plugins/groupitem/Makefile.dep index 6a5c253..881db03 100755 --- a/plugins/groupitem/Makefile.dep +++ b/plugins/groupitem/Makefile.dep @@ -41,7 +41,8 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h init.o: ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h +init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/reload.h ../../functions/rm.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h init.o: ../../functions/tinymce.h ../../functions/uname.h @@ -98,10 +99,10 @@ templates.o: ../../functions/login.h ../../functions/logout.h templates.o: ../../functions/ln.h ../../functions/ls.h templates.o: ../../functions/mkdir.h ../../functions/mv.h templates.o: ../../functions/nicedit.h ../../functions/node.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.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 +templates.o: ../../functions/passwd.h ../../functions/priv.h +templates.o: ../../functions/reload.h ../../functions/rm.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 diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index a6d677c..4985d73 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -43,7 +43,8 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h init.o: ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h +init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/reload.h ../../functions/rm.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h init.o: ../../functions/tinymce.h ../../functions/uname.h @@ -103,15 +104,15 @@ templates.o: ../../functions/last.h ../../functions/login.h templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h -templates.o: ../../functions/node.h ../../functions/priv.h -templates.o: ../../functions/reload.h ../../functions/rm.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.o: ../../functions/node.h ../../functions/passwd.h +templates.o: ../../functions/priv.h ../../functions/reload.h +templates.o: ../../functions/rm.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/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index 4b108f7..22f719a 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -45,14 +45,14 @@ createthread.o: ../../functions/last.h ../../functions/login.h createthread.o: ../../functions/logout.h ../../functions/ln.h createthread.o: ../../functions/ls.h ../../functions/mkdir.h createthread.o: ../../functions/mv.h ../../functions/nicedit.h -createthread.o: ../../functions/node.h ../../functions/priv.h -createthread.o: ../../functions/reload.h ../../functions/rm.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 +createthread.o: ../../functions/node.h ../../functions/passwd.h +createthread.o: ../../functions/priv.h ../../functions/reload.h +createthread.o: ../../functions/rm.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 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 @@ -126,7 +126,8 @@ init.o: ../../functions/last.h ../../functions/login.h init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h init.o: ../../functions/mkdir.h ../../functions/mv.h init.o: ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h +init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/reload.h ../../functions/rm.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h init.o: ../../functions/tinymce.h ../../functions/uname.h @@ -176,7 +177,8 @@ reply.o: ../../functions/last.h ../../functions/login.h reply.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h reply.o: ../../functions/mkdir.h ../../functions/mv.h reply.o: ../../functions/nicedit.h ../../functions/node.h -reply.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h +reply.o: ../../functions/passwd.h ../../functions/priv.h +reply.o: ../../functions/reload.h ../../functions/rm.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 @@ -265,15 +267,15 @@ templates.o: ../../functions/last.h ../../functions/login.h templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/mv.h ../../functions/nicedit.h -templates.o: ../../functions/node.h ../../functions/priv.h -templates.o: ../../functions/reload.h ../../functions/rm.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.o: ../../functions/node.h ../../functions/passwd.h +templates.o: ../../functions/priv.h ../../functions/reload.h +templates.o: ../../functions/rm.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/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index c3e78d5..b76a0b5 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -44,15 +44,15 @@ createticket.o: ../../functions/last.h ../../functions/login.h createticket.o: ../../functions/logout.h ../../functions/ln.h createticket.o: ../../functions/ls.h ../../functions/mkdir.h createticket.o: ../../functions/mv.h ../../functions/nicedit.h -createticket.o: ../../functions/node.h ../../functions/priv.h -createticket.o: ../../functions/reload.h ../../functions/rm.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 +createticket.o: ../../functions/node.h ../../functions/passwd.h +createticket.o: ../../functions/priv.h ../../functions/reload.h +createticket.o: ../../functions/rm.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 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 @@ -94,15 +94,16 @@ editticket.o: ../../functions/login.h ../../functions/logout.h editticket.o: ../../functions/ln.h ../../functions/ls.h editticket.o: ../../functions/mkdir.h ../../functions/mv.h editticket.o: ../../functions/nicedit.h ../../functions/node.h -editticket.o: ../../functions/priv.h ../../functions/reload.h -editticket.o: ../../functions/rm.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 +editticket.o: ../../functions/passwd.h ../../functions/priv.h +editticket.o: ../../functions/reload.h ../../functions/rm.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 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 @@ -144,17 +145,18 @@ funticket.o: ../../functions/login.h ../../functions/logout.h funticket.o: ../../functions/ln.h ../../functions/ls.h funticket.o: ../../functions/mkdir.h ../../functions/mv.h funticket.o: ../../functions/nicedit.h ../../functions/node.h -funticket.o: ../../functions/priv.h ../../functions/reload.h -funticket.o: ../../functions/rm.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: ../../functions/passwd.h ../../functions/priv.h +funticket.o: ../../functions/reload.h ../../functions/rm.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 funticket.o: ../../templates/ckeditorgetparser.h funticket.o: ../../core/httpsimpleparser.h ../../core/log.h funticket.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h @@ -198,7 +200,8 @@ init.o: ../../functions/emacs.h ../../functions/last.h init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ln.h init.o: ../../functions/ls.h ../../functions/mkdir.h ../../functions/mv.h init.o: ../../functions/nicedit.h ../../functions/node.h -init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h +init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/reload.h ../../functions/rm.h init.o: ../../functions/specialdefault.h ../../functions/stat.h init.o: ../../functions/subject.h ../../functions/template.h init.o: ../../functions/tinymce.h ../../functions/uname.h @@ -259,18 +262,19 @@ showtickets.o: ../../functions/login.h ../../functions/logout.h showtickets.o: ../../functions/ln.h ../../functions/ls.h showtickets.o: ../../functions/mkdir.h ../../functions/mv.h showtickets.o: ../../functions/nicedit.h ../../functions/node.h -showtickets.o: ../../functions/priv.h ../../functions/reload.h -showtickets.o: ../../functions/rm.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: ../../functions/passwd.h ../../functions/priv.h +showtickets.o: ../../functions/reload.h ../../functions/rm.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: ../../templates/ckeditorgetparser.h showtickets.o: ../../core/httpsimpleparser.h ../../core/log.h showtickets.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h @@ -318,19 +322,20 @@ templates.o: ../../functions/login.h ../../functions/logout.h templates.o: ../../functions/ln.h ../../functions/ls.h templates.o: ../../functions/mkdir.h ../../functions/mv.h templates.o: ../../functions/nicedit.h ../../functions/node.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.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: ../../functions/passwd.h ../../functions/priv.h +templates.o: ../../functions/reload.h ../../functions/rm.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.o: ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h @@ -377,15 +382,16 @@ ticketinfo.o: ../../functions/login.h ../../functions/logout.h ticketinfo.o: ../../functions/ln.h ../../functions/ls.h ticketinfo.o: ../../functions/mkdir.h ../../functions/mv.h ticketinfo.o: ../../functions/nicedit.h ../../functions/node.h -ticketinfo.o: ../../functions/priv.h ../../functions/reload.h -ticketinfo.o: ../../functions/rm.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 +ticketinfo.o: ../../functions/passwd.h ../../functions/priv.h +ticketinfo.o: ../../functions/reload.h ../../functions/rm.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 ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h ticketparser.o: ../../core/misc.h diff --git a/static/layout1/winix.css b/static/layout1/winix.css index b1b8589..05009ce 100755 --- a/static/layout1/winix.css +++ b/static/layout1/winix.css @@ -416,7 +416,7 @@ margin: 0 0 1em 0; } -form legend { +#additem legend { display: none; } @@ -832,3 +832,12 @@ font-weight: bold; white-space: normal; text-align: center; } + +table.slog th, table.slog td { +border: 0; +} + +td.slogerror { +background: red; +color: white; +} diff --git a/templates/Makefile.dep b/templates/Makefile.dep index 83e4389..139bba7 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -60,8 +60,8 @@ dir.o: ../functions/default.h ../functions/download.h ../functions/emacs.h dir.o: ../functions/last.h ../functions/login.h ../functions/logout.h dir.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h dir.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -dir.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -dir.o: ../functions/specialdefault.h ../functions/stat.h +dir.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h +dir.o: ../functions/rm.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 @@ -327,8 +327,8 @@ priv.o: ../functions/default.h ../functions/download.h ../functions/emacs.h priv.o: ../functions/last.h ../functions/login.h ../functions/logout.h priv.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h priv.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -priv.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -priv.o: ../functions/specialdefault.h ../functions/stat.h +priv.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h +priv.o: ../functions/rm.h ../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 @@ -433,6 +433,20 @@ sys.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h sys.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h sys.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h sys.o: ../core/htmlfilter.h ../core/request.h ../core/version.h +sys.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h +sys.o: ../functions/functions.h ../functions/functionbase.h ../core/synchro.h +sys.o: ../functions/functionparser.h ../functions/adduser.h +sys.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +sys.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +sys.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +sys.o: ../functions/last.h ../functions/login.h ../functions/logout.h +sys.o: ../functions/ln.h ../functions/ls.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/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/utf8.h template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -499,8 +513,8 @@ templates.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h templates.o: ../functions/download.h ../functions/emacs.h ../functions/last.h templates.o: ../functions/login.h ../functions/logout.h ../functions/ln.h templates.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -templates.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h -templates.o: ../functions/reload.h ../functions/rm.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/specialdefault.h ../functions/stat.h templates.o: ../functions/subject.h ../functions/template.h templates.o: ../functions/tinymce.h ../functions/uname.h @@ -645,8 +659,8 @@ winix.o: ../functions/default.h ../functions/download.h ../functions/emacs.h winix.o: ../functions/last.h ../functions/login.h ../functions/logout.h winix.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h winix.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -winix.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h -winix.o: ../functions/specialdefault.h ../functions/stat.h +winix.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h +winix.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h winix.o: ../functions/subject.h ../functions/template.h winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h winix.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h diff --git a/templates/sys.cpp b/templates/sys.cpp index 0db9888..cf3002b 100755 --- a/templates/sys.cpp +++ b/templates/sys.cpp @@ -2,14 +2,15 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ #include "templates.h" -#include "../core/request.h" -#include "../core/version.h" +#include "core/request.h" +#include "core/version.h" +#include "core/plugin.h" @@ -38,6 +39,61 @@ void sys_ver_revision(Info & i) +static size_t sys_plugin_index = 0; + + +void sys_plugin_tab(Info & i) +{ + sys_plugin_index = i.iter; + i.res = sys_plugin_index < plugin.GetPlugins()->size(); +} + +void sys_plugin_tab_has_name(Info & i) +{ + if( sys_plugin_index < plugin.GetPlugins()->size() ) + i.res = (*plugin.GetPlugins())[sys_plugin_index].plugin_name != 0; +} + +void sys_plugin_tab_name(Info & i) +{ + if( sys_plugin_index < plugin.GetPlugins()->size() ) + { + const wchar_t * name = (*plugin.GetPlugins())[sys_plugin_index].plugin_name; + + if( name ) + i.out << name; + } +} + + + +static size_t sys_user_index = 0; + +void sys_user_tab(Info & i) +{ + sys_user_index = i.iter; + i.res = sys_user_index < system->users.Size(); +} + + +void sys_user_tab_is_current(Info & i) +{ + if( !cur->session->puser ) + return; + + if( sys_user_index < system->users.Size() ) + i.res = (cur->session->puser->id == system->users[sys_user_index].id); +} + + +void sys_user_tab_name(Info & i) +{ + if( sys_user_index < system->users.Size() ) + i.out << system->users[sys_user_index].name; +} + + + } // namespace TemplatesFunctions diff --git a/templates/templates.cpp b/templates/templates.cpp index 98485fd..95ae6ef 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -388,9 +388,15 @@ void Templates::CreateFunctions() /* sys */ - ezc_functions.Insert("sys_ver_major", sys_ver_major); - ezc_functions.Insert("sys_ver_minor", sys_ver_minor); - ezc_functions.Insert("sys_ver_revision", sys_ver_revision); + ezc_functions.Insert("sys_ver_major", sys_ver_major); + ezc_functions.Insert("sys_ver_minor", sys_ver_minor); + ezc_functions.Insert("sys_ver_revision", sys_ver_revision); + ezc_functions.Insert("sys_plugin_tab", sys_plugin_tab); + ezc_functions.Insert("sys_plugin_tab_has_name", sys_plugin_tab_has_name); + ezc_functions.Insert("sys_plugin_tab_name", sys_plugin_tab_name); + ezc_functions.Insert("sys_user_tab", sys_user_tab); + ezc_functions.Insert("sys_user_tab_is_current", sys_user_tab_is_current); + ezc_functions.Insert("sys_user_tab_name", sys_user_tab_name); /* diff --git a/templates/templates.h b/templates/templates.h index af5065b..e8aa2c3 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -322,6 +322,12 @@ namespace TemplatesFunctions void sys_ver_major(Info & i); void sys_ver_minor(Info & i); void sys_ver_revision(Info & i); + void sys_plugin_tab(Info & i); + void sys_plugin_tab_has_name(Info & i); + void sys_plugin_tab_name(Info & i); + void sys_user_tab(Info & i); + void sys_user_tab_is_current(Info & i); + void sys_user_tab_name(Info & i); /*