From ebd868fa3377ad38f32ae30bd888df2611b243fe Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sun, 28 Feb 2010 21:33:06 +0000 Subject: [PATCH] removed: Done class (core/done.h, core/done.cpp) removed: from Session: done, done_status, timers git-svn-id: svn://ttmath.org/publicrep/winix/trunk@594 e52654a7-88a9-db11-a3e9-0013d4bc506e --- confparser/confparser.cpp | 2 +- confparser/confparser.h | 2 +- content/Makefile.dep | 254 +++++++++++++--------------- content/cat.cpp | 2 +- content/content.cpp | 4 +- content/content.h | 5 +- content/createthread.cpp | 22 +-- content/createticket.cpp | 26 +-- content/default.cpp | 15 +- content/download.cpp | 2 +- content/editticket.cpp | 28 ++- content/emacs.cpp | 23 +-- content/last.cpp | 2 +- content/login.cpp | 2 +- content/logout.cpp | 4 +- content/ls.cpp | 2 +- content/misc_item.cpp | 2 +- content/misc_specialfile.cpp | 6 +- content/mkdir.cpp | 11 +- content/node.cpp | 2 +- content/priv.cpp | 2 +- content/reload.cpp | 5 +- content/rm.cpp | 13 +- content/run.cpp | 2 +- content/thread.cpp | 2 +- content/ticket.cpp | 2 +- content/upload.cpp | 14 +- content/who.cpp | 2 +- core/Makefile.dep | 72 ++++---- core/Makefile.o.dep | 2 +- core/acceptbaseparser.cpp | 2 +- core/acceptbaseparser.h | 2 +- core/acceptencodingparser.h | 2 +- core/compress.cpp | 2 +- core/compress.h | 2 +- core/config.cpp | 2 +- core/config.h | 2 +- core/cookieparser.h | 2 +- core/data.cpp | 2 +- core/db.cpp | 2 +- core/db.h | 2 +- core/db_itemcolumns.cpp | 2 +- core/dircontainer.cpp | 2 +- core/dircontainer.h | 2 +- core/dirs.cpp | 2 +- core/dirs.h | 2 +- core/done.cpp | 47 ----- core/done.h | 55 ------ core/function.cpp | 2 +- core/function.h | 2 +- core/functioncodeparser.cpp | 2 +- core/functioncodeparser.h | 2 +- core/functionparser.cpp | 2 +- core/functionparser.h | 2 +- core/functions.cpp | 2 +- core/functions.h | 2 +- core/getparser.h | 2 +- core/group.h | 2 +- core/groups.cpp | 2 +- core/groups.h | 2 +- core/htmlfilter.cpp | 7 +- core/htmlfilter.h | 2 +- core/httpsimpleparser.cpp | 2 +- core/httpsimpleparser.h | 2 +- core/item.h | 2 +- core/log.cpp | 2 +- core/log.h | 2 +- core/misc.cpp | 2 +- core/misc.h | 2 +- core/notify.h | 2 +- core/plugin.cpp | 2 +- core/plugin.h | 2 +- core/pluginmsg.h | 2 +- core/postmultiparser.cpp | 2 +- core/postmultiparser.h | 2 +- core/postparser.h | 2 +- core/rebus.cpp | 2 +- core/rebus.h | 2 +- core/request.cpp | 2 +- core/request.h | 2 +- core/requestcontroller.cpp | 1 - core/requestcontroller.h | 2 +- core/requesttypes.h | 2 +- core/session.cpp | 61 +------ core/session.h | 14 +- core/sessioncontainer.cpp | 2 +- core/sessioncontainer.h | 2 +- core/sessionmanager.cpp | 2 +- core/sessionmanager.h | 2 +- core/sessionparser.cpp | 2 +- core/sessionparser.h | 2 +- core/ticket.h | 2 +- core/ugcontainer.h | 2 +- core/user.h | 2 +- core/users.cpp | 2 +- core/users.h | 2 +- html/fun_default.html | 16 +- html/fun_login.html | 4 +- html/fun_mkdir.html | 5 +- html/fun_priv.html | 5 +- html/fun_reload.html | 14 +- locale/en | 7 - locale/pl | 7 - main/Makefile.dep | 18 +- main/main.cpp | 2 +- static/layout1/winix.css | 16 ++ templates/Makefile.dep | 106 +++++------- templates/Makefile.o.dep | 2 +- templates/dir.cpp | 2 +- templates/doc.cpp | 2 +- templates/done.cpp | 106 ------------ templates/item.cpp | 64 +------ templates/last.cpp | 2 +- templates/mount.cpp | 2 +- templates/patterncacher.cpp | 2 +- templates/patterncacher.h | 2 +- templates/priv.cpp | 2 +- templates/rebus.cpp | 2 +- templates/sys.cpp | 2 +- templates/templates.cpp | 29 ---- templates/templates.h | 30 ---- templates/thread.cpp | 2 +- templates/ticket.cpp | 2 +- templates/user.cpp | 4 +- templates/who.cpp | 2 +- templatesnotify/notify.cpp | 2 +- templatesnotify/templatesnotify.cpp | 2 +- templatesnotify/templatesnotify.h | 2 +- 128 files changed, 387 insertions(+), 915 deletions(-) delete mode 100755 core/done.cpp delete mode 100755 core/done.h delete mode 100755 templates/done.cpp diff --git a/confparser/confparser.cpp b/confparser/confparser.cpp index bc1458c..e0d04e5 100755 --- a/confparser/confparser.cpp +++ b/confparser/confparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/confparser/confparser.h b/confparser/confparser.h index e2b70a3..9e5b02b 100755 --- a/confparser/confparser.h +++ b/confparser/confparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/Makefile.dep b/content/Makefile.dep index b38123d..2598aef 100755 --- a/content/Makefile.dep +++ b/content/Makefile.dep @@ -5,10 +5,9 @@ adduser.o: ../templates/patterncacher.h ../templates/misc.h adduser.o: ../templates/localefilter.h ../core/locale.h adduser.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h adduser.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -adduser.o: ../core/ticket.h ../core/done.h ../core/request.h -adduser.o: ../core/requesttypes.h ../core/session.h ../core/done.h -adduser.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -adduser.o: ../core/rebus.h ../core/function.h ../core/thread.h +adduser.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +adduser.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +adduser.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h adduser.o: ../core/compress.h ../core/acceptencodingparser.h adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h adduser.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h @@ -21,14 +20,14 @@ cat.o: ../templates/patterncacher.h ../templates/misc.h cat.o: ../templates/localefilter.h ../core/locale.h cat.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h cat.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -cat.o: ../core/ticket.h ../core/done.h ../core/request.h -cat.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h -cat.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h -cat.o: ../core/function.h ../core/thread.h ../core/compress.h -cat.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -cat.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -cat.o: ../core/error.h ../core/data.h ../core/dirs.h ../core/dircontainer.h -cat.o: ../core/users.h ../core/ugcontainer.h ../core/groups.h ../core/group.h +cat.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +cat.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +cat.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h +cat.o: ../core/compress.h ../core/acceptencodingparser.h +cat.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +cat.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h +cat.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h ../core/users.h +cat.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h cat.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h cat.o: ../core/mount.h ../core/loadavg.h content.o: content.h ../core/item.h ../templates/templates.h @@ -36,10 +35,9 @@ content.o: ../templates/patterncacher.h ../templates/misc.h content.o: ../templates/localefilter.h ../core/locale.h content.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h content.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -content.o: ../core/ticket.h ../core/done.h ../core/request.h -content.o: ../core/requesttypes.h ../core/session.h ../core/done.h -content.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -content.o: ../core/rebus.h ../core/function.h ../core/thread.h +content.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +content.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +content.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h content.o: ../core/compress.h ../core/acceptencodingparser.h content.o: ../core/acceptbaseparser.h ../core/htmlfilter.h content.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h @@ -54,44 +52,41 @@ createthread.o: ../templates/patterncacher.h ../templates/misc.h createthread.o: ../templates/localefilter.h ../core/locale.h createthread.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h createthread.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -createthread.o: ../core/ticket.h ../core/done.h ../core/request.h -createthread.o: ../core/requesttypes.h ../core/session.h ../core/done.h -createthread.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -createthread.o: ../core/rebus.h ../core/function.h ../core/thread.h -createthread.o: ../core/compress.h ../core/acceptencodingparser.h -createthread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -createthread.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h -createthread.o: ../core/db.h ../core/group.h ../core/dircontainer.h -createthread.o: ../core/ugcontainer.h ../core/mount.h ../core/data.h -createthread.o: ../core/dirs.h ../core/users.h ../core/groups.h -createthread.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -createthread.o: ../core/mount.h ../core/loadavg.h +createthread.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +createthread.o: ../core/session.h ../core/item.h ../core/error.h +createthread.o: ../core/log.h ../core/user.h ../core/rebus.h +createthread.o: ../core/function.h ../core/thread.h ../core/compress.h +createthread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +createthread.o: ../core/htmlfilter.h ../core/postmultiparser.h +createthread.o: ../core/ticket.h ../core/error.h ../core/db.h ../core/group.h +createthread.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/mount.h +createthread.o: ../core/data.h ../core/dirs.h ../core/users.h +createthread.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h +createthread.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h createticket.o: content.h ../core/item.h ../templates/templates.h createticket.o: ../templates/patterncacher.h ../templates/misc.h createticket.o: ../templates/localefilter.h ../core/locale.h createticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h createticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -createticket.o: ../core/ticket.h ../core/done.h ../core/request.h -createticket.o: ../core/requesttypes.h ../core/session.h ../core/done.h -createticket.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -createticket.o: ../core/rebus.h ../core/function.h ../core/thread.h -createticket.o: ../core/compress.h ../core/acceptencodingparser.h -createticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -createticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h -createticket.o: ../core/db.h ../core/group.h ../core/dircontainer.h -createticket.o: ../core/ugcontainer.h ../core/mount.h ../core/data.h -createticket.o: ../core/dirs.h ../core/users.h ../core/groups.h -createticket.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -createticket.o: ../core/mount.h ../core/loadavg.h +createticket.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +createticket.o: ../core/session.h ../core/item.h ../core/error.h +createticket.o: ../core/log.h ../core/user.h ../core/rebus.h +createticket.o: ../core/function.h ../core/thread.h ../core/compress.h +createticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +createticket.o: ../core/htmlfilter.h ../core/postmultiparser.h +createticket.o: ../core/ticket.h ../core/error.h ../core/db.h ../core/group.h +createticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/mount.h +createticket.o: ../core/data.h ../core/dirs.h ../core/users.h +createticket.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h +createticket.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h default.o: content.h ../core/item.h ../templates/templates.h default.o: ../templates/patterncacher.h ../templates/misc.h default.o: ../templates/localefilter.h ../core/locale.h default.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h default.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -default.o: ../core/ticket.h ../core/done.h ../core/request.h -default.o: ../core/requesttypes.h ../core/session.h ../core/done.h -default.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -default.o: ../core/rebus.h ../core/function.h ../core/thread.h +default.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +default.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +default.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h default.o: ../core/compress.h ../core/acceptencodingparser.h default.o: ../core/acceptbaseparser.h ../core/htmlfilter.h default.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h @@ -105,32 +100,30 @@ download.o: ../templates/patterncacher.h ../templates/misc.h download.o: ../templates/localefilter.h ../core/locale.h download.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h download.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -download.o: ../core/ticket.h ../core/done.h ../core/request.h -download.o: ../core/requesttypes.h ../core/session.h ../core/done.h -download.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -download.o: ../core/rebus.h ../core/function.h ../core/thread.h -download.o: ../core/compress.h ../core/acceptencodingparser.h -download.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -download.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h -download.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h -download.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h -download.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -download.o: ../core/mount.h ../core/loadavg.h +download.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +download.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +download.o: ../core/user.h ../core/rebus.h ../core/function.h +download.o: ../core/thread.h ../core/compress.h +download.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +download.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +download.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h +download.o: ../core/users.h ../core/ugcontainer.h ../core/groups.h +download.o: ../core/group.h ../core/functions.h ../core/lastcontainer.h +download.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h editticket.o: content.h ../core/item.h ../templates/templates.h editticket.o: ../templates/patterncacher.h ../templates/misc.h editticket.o: ../templates/localefilter.h ../core/locale.h editticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h editticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -editticket.o: ../core/ticket.h ../core/done.h ../core/request.h -editticket.o: ../core/requesttypes.h ../core/session.h ../core/done.h -editticket.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -editticket.o: ../core/rebus.h ../core/function.h ../core/thread.h -editticket.o: ../core/compress.h ../core/acceptencodingparser.h -editticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -editticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h -editticket.o: ../core/db.h ../core/group.h ../core/dircontainer.h -editticket.o: ../core/ugcontainer.h ../core/mount.h ../core/data.h -editticket.o: ../core/dirs.h ../core/users.h ../core/groups.h +editticket.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +editticket.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +editticket.o: ../core/user.h ../core/rebus.h ../core/function.h +editticket.o: ../core/thread.h ../core/compress.h +editticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +editticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +editticket.o: ../core/error.h ../core/db.h ../core/group.h +editticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/mount.h +editticket.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h editticket.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h editticket.o: ../core/mount.h ../core/loadavg.h emacs.o: content.h ../core/item.h ../templates/templates.h @@ -138,10 +131,9 @@ emacs.o: ../templates/patterncacher.h ../templates/misc.h emacs.o: ../templates/localefilter.h ../core/locale.h emacs.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h emacs.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -emacs.o: ../core/ticket.h ../core/done.h ../core/request.h -emacs.o: ../core/requesttypes.h ../core/session.h ../core/done.h -emacs.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -emacs.o: ../core/rebus.h ../core/function.h ../core/thread.h +emacs.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +emacs.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +emacs.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h emacs.o: ../core/compress.h ../core/acceptencodingparser.h emacs.o: ../core/acceptbaseparser.h ../core/htmlfilter.h emacs.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h @@ -156,16 +148,15 @@ last.o: ../templates/patterncacher.h ../templates/misc.h last.o: ../templates/localefilter.h ../core/locale.h last.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h last.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -last.o: ../core/ticket.h ../core/done.h +last.o: ../core/ticket.h login.o: content.h ../core/item.h ../templates/templates.h login.o: ../templates/patterncacher.h ../templates/misc.h login.o: ../templates/localefilter.h ../core/locale.h login.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h login.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -login.o: ../core/ticket.h ../core/done.h ../core/request.h -login.o: ../core/requesttypes.h ../core/session.h ../core/done.h -login.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -login.o: ../core/rebus.h ../core/function.h ../core/thread.h +login.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +login.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +login.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h login.o: ../core/compress.h ../core/acceptencodingparser.h login.o: ../core/acceptbaseparser.h ../core/htmlfilter.h login.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h @@ -178,10 +169,9 @@ logout.o: ../templates/patterncacher.h ../templates/misc.h logout.o: ../templates/localefilter.h ../core/locale.h logout.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h logout.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -logout.o: ../core/ticket.h ../core/done.h ../core/request.h -logout.o: ../core/requesttypes.h ../core/session.h ../core/done.h -logout.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -logout.o: ../core/rebus.h ../core/function.h ../core/thread.h +logout.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +logout.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +logout.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h logout.o: ../core/compress.h ../core/acceptencodingparser.h logout.o: ../core/acceptbaseparser.h ../core/htmlfilter.h logout.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h @@ -193,11 +183,10 @@ ls.o: content.h ../core/item.h ../templates/templates.h ls.o: ../templates/patterncacher.h ../templates/misc.h ls.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h ls.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -ls.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/done.h -ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h -ls.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h -ls.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h -ls.o: ../core/compress.h ../core/acceptencodingparser.h +ls.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/request.h +ls.o: ../core/requesttypes.h ../core/session.h ../core/item.h ../core/error.h +ls.o: ../core/log.h ../core/user.h ../core/rebus.h ../core/function.h +ls.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h ls.o: ../core/postmultiparser.h ../core/ticket.h ../core/db.h ../core/group.h ls.o: ../core/dircontainer.h ../core/ugcontainer.h @@ -206,26 +195,24 @@ misc_item.o: ../templates/patterncacher.h ../templates/misc.h misc_item.o: ../templates/localefilter.h ../core/locale.h misc_item.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h misc_item.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -misc_item.o: ../core/ticket.h ../core/done.h ../core/request.h -misc_item.o: ../core/requesttypes.h ../core/session.h ../core/done.h -misc_item.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -misc_item.o: ../core/rebus.h ../core/function.h ../core/thread.h -misc_item.o: ../core/compress.h ../core/acceptencodingparser.h -misc_item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -misc_item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h -misc_item.o: ../core/db.h ../core/group.h ../core/dircontainer.h -misc_item.o: ../core/ugcontainer.h +misc_item.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +misc_item.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +misc_item.o: ../core/user.h ../core/rebus.h ../core/function.h +misc_item.o: ../core/thread.h ../core/compress.h +misc_item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +misc_item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +misc_item.o: ../core/misc.h ../core/db.h ../core/group.h +misc_item.o: ../core/dircontainer.h ../core/ugcontainer.h misc_specialfile.o: content.h ../core/item.h ../templates/templates.h misc_specialfile.o: ../templates/patterncacher.h ../templates/misc.h misc_specialfile.o: ../templates/localefilter.h ../core/locale.h misc_specialfile.o: ../confparser/confparser.h misc_specialfile.o: ../templates/ckeditorgetparser.h misc_specialfile.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -misc_specialfile.o: ../core/ticket.h ../core/done.h ../core/request.h -misc_specialfile.o: ../core/requesttypes.h ../core/session.h ../core/done.h -misc_specialfile.o: ../core/item.h ../core/error.h ../core/log.h -misc_specialfile.o: ../core/user.h ../core/rebus.h ../core/function.h -misc_specialfile.o: ../core/thread.h ../core/compress.h +misc_specialfile.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +misc_specialfile.o: ../core/session.h ../core/item.h ../core/error.h +misc_specialfile.o: ../core/log.h ../core/user.h ../core/rebus.h +misc_specialfile.o: ../core/function.h ../core/thread.h ../core/compress.h misc_specialfile.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h misc_specialfile.o: ../core/htmlfilter.h ../core/postmultiparser.h misc_specialfile.o: ../core/ticket.h ../core/data.h ../core/dirs.h @@ -238,10 +225,9 @@ mkdir.o: ../templates/patterncacher.h ../templates/misc.h mkdir.o: ../templates/localefilter.h ../core/locale.h mkdir.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h mkdir.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -mkdir.o: ../core/ticket.h ../core/done.h ../core/request.h -mkdir.o: ../core/requesttypes.h ../core/session.h ../core/done.h -mkdir.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -mkdir.o: ../core/rebus.h ../core/function.h ../core/thread.h +mkdir.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +mkdir.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +mkdir.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h mkdir.o: ../core/compress.h ../core/acceptencodingparser.h mkdir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h mkdir.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h @@ -256,10 +242,9 @@ node.o: ../templates/patterncacher.h ../templates/misc.h node.o: ../templates/localefilter.h ../core/locale.h node.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h node.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -node.o: ../core/ticket.h ../core/done.h ../core/request.h -node.o: ../core/requesttypes.h ../core/session.h ../core/done.h -node.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -node.o: ../core/rebus.h ../core/function.h ../core/thread.h +node.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +node.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +node.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h node.o: ../core/compress.h ../core/acceptencodingparser.h node.o: ../core/acceptbaseparser.h ../core/htmlfilter.h node.o: ../core/postmultiparser.h ../core/ticket.h @@ -268,10 +253,9 @@ priv.o: ../templates/patterncacher.h ../templates/misc.h priv.o: ../templates/localefilter.h ../core/locale.h priv.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h priv.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -priv.o: ../core/ticket.h ../core/done.h ../core/request.h -priv.o: ../core/requesttypes.h ../core/session.h ../core/done.h -priv.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -priv.o: ../core/rebus.h ../core/function.h ../core/thread.h +priv.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +priv.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +priv.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h priv.o: ../core/compress.h ../core/acceptencodingparser.h priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h @@ -284,10 +268,9 @@ reload.o: ../templates/patterncacher.h ../templates/misc.h reload.o: ../templates/localefilter.h ../core/locale.h reload.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h reload.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -reload.o: ../core/ticket.h ../core/done.h ../core/request.h -reload.o: ../core/requesttypes.h ../core/session.h ../core/done.h -reload.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -reload.o: ../core/rebus.h ../core/function.h ../core/thread.h +reload.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +reload.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +reload.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h reload.o: ../core/compress.h ../core/acceptencodingparser.h reload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h reload.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h @@ -297,11 +280,10 @@ rm.o: content.h ../core/item.h ../templates/templates.h rm.o: ../templates/patterncacher.h ../templates/misc.h rm.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -rm.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/done.h -rm.o: ../core/request.h ../core/requesttypes.h ../core/session.h -rm.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h -rm.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h -rm.o: ../core/compress.h ../core/acceptencodingparser.h +rm.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/request.h +rm.o: ../core/requesttypes.h ../core/session.h ../core/item.h ../core/error.h +rm.o: ../core/log.h ../core/user.h ../core/rebus.h ../core/function.h +rm.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h rm.o: ../core/acceptbaseparser.h ../core/htmlfilter.h rm.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h ../core/db.h rm.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h @@ -313,22 +295,20 @@ run.o: ../templates/patterncacher.h ../templates/misc.h run.o: ../templates/localefilter.h ../core/locale.h run.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h run.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -run.o: ../core/ticket.h ../core/done.h ../core/request.h -run.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h -run.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h -run.o: ../core/function.h ../core/thread.h ../core/compress.h -run.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -run.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -run.o: ../core/error.h +run.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +run.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +run.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h +run.o: ../core/compress.h ../core/acceptencodingparser.h +run.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +run.o: ../core/postmultiparser.h ../core/ticket.h ../core/error.h thread.o: content.h ../core/item.h ../templates/templates.h thread.o: ../templates/patterncacher.h ../templates/misc.h thread.o: ../templates/localefilter.h ../core/locale.h thread.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h thread.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -thread.o: ../core/ticket.h ../core/done.h ../core/request.h -thread.o: ../core/requesttypes.h ../core/session.h ../core/done.h -thread.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -thread.o: ../core/rebus.h ../core/function.h ../core/thread.h +thread.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +thread.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +thread.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h thread.o: ../core/compress.h ../core/acceptencodingparser.h thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/db.h @@ -341,10 +321,9 @@ ticket.o: ../templates/patterncacher.h ../templates/misc.h ticket.o: ../templates/localefilter.h ../core/locale.h ticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h ticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -ticket.o: ../core/ticket.h ../core/done.h ../core/request.h -ticket.o: ../core/requesttypes.h ../core/session.h ../core/done.h -ticket.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -ticket.o: ../core/rebus.h ../core/function.h ../core/thread.h +ticket.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +ticket.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +ticket.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h ticket.o: ../core/compress.h ../core/acceptencodingparser.h ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/db.h @@ -357,10 +336,9 @@ upload.o: ../templates/patterncacher.h ../templates/misc.h upload.o: ../templates/localefilter.h ../core/locale.h upload.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h upload.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -upload.o: ../core/ticket.h ../core/done.h ../core/request.h -upload.o: ../core/requesttypes.h ../core/session.h ../core/done.h -upload.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -upload.o: ../core/rebus.h ../core/function.h ../core/thread.h +upload.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h +upload.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +upload.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h upload.o: ../core/compress.h ../core/acceptencodingparser.h upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h upload.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h @@ -373,4 +351,4 @@ who.o: ../templates/patterncacher.h ../templates/misc.h who.o: ../templates/localefilter.h ../core/locale.h who.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h who.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -who.o: ../core/ticket.h ../core/done.h +who.o: ../core/ticket.h diff --git a/content/cat.cpp b/content/cat.cpp index 47c7e73..e89dbda 100755 --- a/content/cat.cpp +++ b/content/cat.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/content.cpp b/content/content.cpp index 104d4c6..eb8a5f3 100755 --- a/content/content.cpp +++ b/content/content.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -67,8 +67,6 @@ void Content::SetDefaultFunctionForDir() if( default_item != -1 ) { - request.session->IncrementTimersIfExist(); - log << log3 << "Content: Default item: id: " << default_item << logend; RedirectTo(default_item); return; diff --git a/content/content.h b/content/content.h index ac689cf..1d79929 100755 --- a/content/content.h +++ b/content/content.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -18,7 +18,6 @@ #include "../templates/templates.h" #include "../core/thread.h" #include "../core/ticket.h" -#include "../core/done.h" @@ -154,7 +153,7 @@ class Content bool FunCreateTicketCheckAccess(); void FunCreateTicket(); - bool FunCreateTicketCheckAbuse(const Done & done); + bool FunCreateTicketCheckAbuse(); void PostFunCreateTicketLogAndRedirect(); void PostFunCreateTicket(); void FunTicket(); diff --git a/content/createthread.cpp b/content/createthread.cpp index a5a99a9..8337655 100755 --- a/content/createthread.cpp +++ b/content/createthread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -36,9 +36,6 @@ bool Content::FunCreateThreadCheckAbuse() if( !CheckRebus() ) { request.status = WINIX_ERR_INCORRECT_REBUS; - request.session->done = Done::added_thread; - request.session->done_status = WINIX_ERR_INCORRECT_REBUS; - return false; } @@ -47,9 +44,6 @@ bool Content::FunCreateThreadCheckAbuse() if( request.session->spam_score > 0 ) { request.status = WINIX_ERR_SPAM; - request.session->done = Done::added_thread; - request.session->done_status = WINIX_ERR_SPAM; - log << log1 << "Content: ignoring due to suspected spamming" << logend; return false; } @@ -73,24 +67,22 @@ void Content::AddThread() request.thread.items = 1; request.thread.last_item = request.item; // set by PostFunEmacsAdd() - request.session->done_status = db.AddThread(request.thread); + request.status = db.AddThread(request.thread); } void Content::PostFunCreateThreadLogAndRedirect() { - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { - request.session->done = Done::added_thread; - log << log2 << "Content: added a new thread" << logend; RedirectToLastDir(); } else { - log << log1 << "Content: problem with adding a new thread, error code:" - << request.session->done_status << logend; + log << log1 << "Content: problem with adding a new thread, error code: " + << request.status << logend; } } @@ -113,7 +105,7 @@ void Content::PostFunCreateThread() Mkdir(request.item, true); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { ReadItemContentWithType(request.item); request.item.type = Item::file; @@ -121,7 +113,7 @@ void Content::PostFunCreateThread() request.item.parent_id = request.dir_table.back()->id; PostFunEmacsAdd(); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) AddThread(); } diff --git a/content/createticket.cpp b/content/createticket.cpp index 8136b00..2e24bc4 100755 --- a/content/createticket.cpp +++ b/content/createticket.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -32,14 +32,11 @@ return true; -bool Content::FunCreateTicketCheckAbuse(const Done & done) +bool Content::FunCreateTicketCheckAbuse() { if( !CheckRebus() ) { request.status = WINIX_ERR_INCORRECT_REBUS; - request.session->done = done; - request.session->done_status = WINIX_ERR_INCORRECT_REBUS; - return false; } @@ -48,9 +45,6 @@ bool Content::FunCreateTicketCheckAbuse(const Done & done) if( request.session->spam_score > 0 ) { request.status = WINIX_ERR_SPAM; - request.session->done = done; - request.session->done_status = WINIX_ERR_SPAM; - log << log1 << "Content: ignoring due to suspected spamming" << logend; return false; } @@ -162,23 +156,21 @@ void Content::AddTicket() request.ticket.dir_id = request.dir_table.back()->id; // a new directory created by Mkdir() request.ticket.item_id = request.item.id; // this id is set by PostFunEmacsAdd() - request.session->done_status = db.AddTicket(request.ticket); + request.status = db.AddTicket(request.ticket); } void Content::PostFunCreateTicketLogAndRedirect() { - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { - request.session->done = Done::added_ticket; - log << log2 << "Content: added a new ticket" << logend; RedirectToLastDir(); } else { - log << log1 << "Content: problem with adding a new ticket, error code:" - << request.session->done_status << logend; + log << log1 << "Content: problem with adding a new ticket, error code: " + << request.status << logend; } } @@ -193,7 +185,7 @@ void Content::PostFunCreateTicket() ReadTicket(request.ticket); request.item.privileges = 0777; // !! tymczasowo 777 aby wszyscy mogli wysylac posty - if( !FunCreateTicketCheckAbuse(Done::added_ticket) ) + if( !FunCreateTicketCheckAbuse() ) { ReadItemContentWithType(request.item); // for correctly displaying the form return; @@ -201,7 +193,7 @@ void Content::PostFunCreateTicket() Mkdir(request.item, true); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { ReadItemContentWithType(request.item); request.item.type = Item::file; @@ -209,7 +201,7 @@ void Content::PostFunCreateTicket() request.item.parent_id = request.dir_table.back()->id; PostFunEmacsAdd(); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) AddTicket(); } diff --git a/content/default.cpp b/content/default.cpp index 69c1b51..7480898 100755 --- a/content/default.cpp +++ b/content/default.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -67,9 +67,6 @@ return defaultid; void Content::PostFunDefault() { - request.session->done = Done::defaulted_dir; - - if( !request.HasWriteAccess(*request.dir_table.back()) ) { request.status = WINIX_ERR_PERMISSION_DENIED; @@ -80,21 +77,21 @@ void Content::PostFunDefault() try { long defaultid = PostFunDefaultParsePath(); - request.session->done_status = db.EditDefaultItem(request.dir_table.back()->id, defaultid); + request.status = db.EditDefaultItem(request.dir_table.back()->id, defaultid); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) request.dir_table.back()->default_item = defaultid; } catch(const Error & e) { - request.session->done_status = e; + request.status = e; } - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) RedirectTo(*request.dir_table.back()); else - log << log1 << "Content: PostFunDefaultItem: Error: " << request.session->done_status << logend; + log << log1 << "Content: PostFunDefaultItem: Error: " << request.status << logend; } diff --git a/content/download.cpp b/content/download.cpp index 22bf257..cd17b47 100755 --- a/content/download.cpp +++ b/content/download.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/editticket.cpp b/content/editticket.cpp index 799dbeb..bc45ca8 100755 --- a/content/editticket.cpp +++ b/content/editticket.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -31,7 +31,7 @@ return true; void Content::EditTicketCheckFirstItem() { - if( request.session->done_status != WINIX_ERR_OK ) + if( request.status != WINIX_ERR_OK ) return; @@ -47,9 +47,9 @@ void Content::EditTicketCheckFirstItem() SetUser(item); PrepareUrl(item); - request.session->done_status = db.AddItem(item); + request.status = db.AddItem(item); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { log << log2 << "Content: added the first item with content for the ticket, item.id: " << item.id << logend; request.ticket.item_id = item.id; @@ -61,7 +61,7 @@ void Content::EditTicketCheckFirstItem() void Content::EditTicketModTicket() { - if( request.session->done_status != WINIX_ERR_OK ) + if( request.status != WINIX_ERR_OK ) return; Ticket ticket; @@ -74,14 +74,14 @@ void Content::EditTicketModTicket() request.ticket.expected = ticket.expected; request.ticket.progress = ticket.progress; - request.session->done_status = db.EditTicketById(request.ticket); + request.status = db.EditTicketById(request.ticket); } void Content::EditTicketModDir() { - if( request.session->done_status != WINIX_ERR_OK ) + if( request.status != WINIX_ERR_OK ) return; // we don't modify the url @@ -92,14 +92,14 @@ void Content::EditTicketModDir() if( edit_dir_subject ) { dir.subject = request.item.subject; - request.session->done_status = db.EditItemById(dir, false); + request.status = db.EditItemById(dir, false); } } void Content::EditTicketModFirstItem() { - if( request.session->done_status != WINIX_ERR_OK ) + if( request.status != WINIX_ERR_OK ) return; // modyfing the first item (the one with content) @@ -119,17 +119,15 @@ void Content::EditTicketModFirstItem() void Content::PostFunEditTicketLogAndRedirect() { - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { - request.session->done = Done::edited_ticket; - log << log2 << "Content: edited a ticket" << logend; RedirectToLastDir(); } else { - log << log1 << "Content: problem with editing a ticket, error code:" - << request.session->done_status << logend; + log << log1 << "Content: problem with editing a ticket, error code: " + << request.status << logend; } } @@ -143,7 +141,7 @@ void Content::PostFunEditTicket() ReadItem(request.item, Item::dir); - if( !FunCreateTicketCheckAbuse(Done::edited_ticket) ) + if( !FunCreateTicketCheckAbuse() ) { ReadItemContentWithType(request.item); // for correctly displaying the form return; diff --git a/content/emacs.cpp b/content/emacs.cpp index f2551cf..f40fc89 100755 --- a/content/emacs.cpp +++ b/content/emacs.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -41,10 +41,9 @@ return true; void Content::PostFunEmacsAdd() { - request.session->done = Done::added_item; - request.session->done_status = db.AddItem(request.item); + request.status = db.AddItem(request.item); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { log << log2 << "Content: added a new item" << logend; request.notify_code |= WINIX_NOTIFY_ITEM_ADD; @@ -56,10 +55,9 @@ void Content::PostFunEmacsAdd() void Content::PostFunEmacsEdit(bool with_url) { request.item.SetDateModifyToNow(); - request.session->done = Done::edited_item; - request.session->done_status = db.EditItemById(request.item, with_url); + request.status = db.EditItemById(request.item, with_url); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { TemplatesFunctions::pattern_cacher.UpdatePattern(request.item); log << log2 << "Content: modified an item" << logend; @@ -74,9 +72,6 @@ bool Content::PostEmacsCheckAbuse(bool adding) if( !CheckRebus() ) { request.status = WINIX_ERR_INCORRECT_REBUS; - request.session->done = (adding)? Done::added_item : Done::edited_item; - request.session->done_status = WINIX_ERR_INCORRECT_REBUS; - return false; } @@ -86,9 +81,6 @@ bool Content::PostEmacsCheckAbuse(bool adding) if( request.session->spam_score > 0 ) { request.status = WINIX_ERR_SPAM; - request.session->done = (adding)? Done::added_item : Done::edited_item; - request.session->done_status = WINIX_ERR_SPAM; - log << log1 << "Content: ignoring due to suspected spamming" << logend; return false; } @@ -128,7 +120,6 @@ void Content::PostFunEmacs() bool adding = !request.is_item; bool edit_with_url = ReadItem(request.item, Item::file); - request.session->done_status = WINIX_ERR_OK; if( !PostEmacsCheckAbuse(adding) ) return; @@ -146,7 +137,7 @@ void Content::PostFunEmacs() } - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { PostFunEmacsModifyMountPoint(adding); CheckSpecialFile(); @@ -154,7 +145,7 @@ void Content::PostFunEmacs() else { log << log1 << "Content: PostFunEmacs: Error: " - << request.session->done_status << logend; + << request.status << logend; } } diff --git a/content/last.cpp b/content/last.cpp index 491d927..c25dd9f 100755 --- a/content/last.cpp +++ b/content/last.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/login.cpp b/content/login.cpp index 1069c86..cb68ef0 100755 --- a/content/login.cpp +++ b/content/login.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/logout.cpp b/content/logout.cpp index ff6c07f..c5df11a 100755 --- a/content/logout.cpp +++ b/content/logout.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -44,8 +44,6 @@ void Content::FunLogout() if( request.is_item ) request.redirect_to += request.item.url; - request.session->done = Done::loggedout; - request.session->done_timer = 2; } diff --git a/content/ls.cpp b/content/ls.cpp index 5888f53..92a02cd 100755 --- a/content/ls.cpp +++ b/content/ls.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/misc_item.cpp b/content/misc_item.cpp index e9b3514..12bb5b7 100755 --- a/content/misc_item.cpp +++ b/content/misc_item.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/misc_specialfile.cpp b/content/misc_specialfile.cpp index 166c430..b91d76a 100755 --- a/content/misc_specialfile.cpp +++ b/content/misc_specialfile.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -29,9 +29,7 @@ void Content::CheckSpecialFile() { log << log3 << "Content: reloading mount points" << logend; - request.session->done = Done::edited_fstab; - request.session->done_status = data.mounts.ReadMounts(request.item.content); - request.session->done_timer = 2; + request.status = data.mounts.ReadMounts(request.item.content); } } diff --git a/content/mkdir.cpp b/content/mkdir.cpp index f6da017..d9f2143 100755 --- a/content/mkdir.cpp +++ b/content/mkdir.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -32,9 +32,9 @@ return true; void Content::Mkdir(Item & item, bool add_to_dir_table) { - request.session->done_status = db.AddItem(item); + request.status = db.AddItem(item); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { Item * pdir = data.dirs.AddDir(item); @@ -52,18 +52,17 @@ void Content::PostFunMkdir(bool add_to_dir_table, int privileges) ReadItem(request.item, Item::dir); request.item.privileges = privileges; - request.session->done = Done::added_dir; Mkdir(request.item, add_to_dir_table); - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { request.notify_code |= WINIX_NOTIFY_DIR_ADD; RedirectTo(request.item); } else { - log << log1 << "Content: PostFunMkdir: Error: " << request.session->done_status << logend; + log << log1 << "Content: PostFunMkdir: Error: " << request.status << logend; } } diff --git a/content/node.cpp b/content/node.cpp index ef450a1..cf8f9b1 100755 --- a/content/node.cpp +++ b/content/node.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/priv.cpp b/content/priv.cpp index f763feb..1fc2e2c 100755 --- a/content/priv.cpp +++ b/content/priv.cpp @@ -93,7 +93,7 @@ void Content::ChangePriv(Item & item, long user_id, long group_id, int privilege return; } - request.session->done_status = db.EditPrivById(item, item.id); + request.status = db.EditPrivById(item, item.id); } diff --git a/content/reload.cpp b/content/reload.cpp index b3d1ebc..608a57a 100755 --- a/content/reload.cpp +++ b/content/reload.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -20,9 +20,6 @@ void Content::FunReloadTemplates() templates.ReadTemplates(); notify.ReadTemplates(); // make sure that ReadTemplates() is using some kind of locking - - request.session->done = Done::reloaded_templates; - request.session->done_status = WINIX_ERR_OK; } diff --git a/content/rm.cpp b/content/rm.cpp index a4aef03..e7bda91 100755 --- a/content/rm.cpp +++ b/content/rm.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -63,10 +63,6 @@ void Content::FunRmDirRecursive() } - request.session->done = Done::deleted_dir; - request.session->done_status = WINIX_ERR_OK; - request.session->done_timer = 2; - // redirect to the last valid directory RedirectTo(**(--request.dir_table.end())); } @@ -100,7 +96,6 @@ void Content::FunRm() { if( db.DelItem( request.item ) ) { - request.session->done_status = WINIX_ERR_OK; log << log2 << "Content: deleted item: subject: " << request.item.subject << ", id: " << request.item.id << logend; TemplatesFunctions::pattern_cacher.DeletePattern(request.item); @@ -113,18 +108,14 @@ void Content::FunRm() } else { - request.session->done_status = WINIX_ERR_NO_ITEM; + request.status = WINIX_ERR_NO_ITEM; } - request.session->done = Done::deleted_item; - RedirectTo(*request.dir_table.back()); - request.session->done_timer = 2; } else { if( !request.IsParam("confirm") ) - //request.result = Request::err404; request.status = WINIX_ERR_UNKNOWN_PARAM; } } diff --git a/content/run.cpp b/content/run.cpp index cd247af..1ba9a0a 100755 --- a/content/run.cpp +++ b/content/run.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/thread.cpp b/content/thread.cpp index 5459c56..7392806 100755 --- a/content/thread.cpp +++ b/content/thread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/ticket.cpp b/content/ticket.cpp index 05b436e..1ed7e15 100755 --- a/content/ticket.cpp +++ b/content/ticket.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/content/upload.cpp b/content/upload.cpp index b0c2c60..b49003f 100755 --- a/content/upload.cpp +++ b/content/upload.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -73,9 +73,6 @@ bool Content::FunUploadCheckAbuse() if( !CheckRebus() ) { request.status = WINIX_ERR_INCORRECT_REBUS; - request.session->done = Done::added_thread; - request.session->done_status = WINIX_ERR_INCORRECT_REBUS; - return false; } @@ -84,9 +81,6 @@ bool Content::FunUploadCheckAbuse() if( request.session->spam_score > 0 ) { request.status = WINIX_ERR_SPAM; - request.session->done = Done::added_thread; - request.session->done_status = WINIX_ERR_SPAM; - log << log1 << "Content: ignoring due to suspected spamming" << logend; return false; } @@ -123,7 +117,7 @@ void Content::UploadMulti() if( !UploadCreatePath(tmp_path) ) return; - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) UploadSaveFile(i->second.tmp_filename, tmp_path); } @@ -156,7 +150,7 @@ void Content::UploadSingle() PostFunEmacsAdd(); // always adding a new item - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { const std::string & tmp_filename = request.post_file_table.begin()->second.tmp_filename; @@ -167,7 +161,7 @@ void Content::UploadSingle() } - if( request.session->done_status == WINIX_ERR_OK ) + if( request.status == WINIX_ERR_OK ) { if( !request.IsParam("ckeditor_upload") ) RedirectTo(request.item); diff --git a/content/who.cpp b/content/who.cpp index 023783d..c884b60 100755 --- a/content/who.cpp +++ b/content/who.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/Makefile.dep b/core/Makefile.dep index a8e09ef..8dbf3ff 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -6,9 +6,8 @@ config.o: config.h ../confparser/confparser.h log.h data.h dirs.h item.h config.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h config.o: functions.h function.h lastcontainer.h mounts.h mount.h error.h config.o: rebus.h loadavg.h plugin.h request.h requesttypes.h session.h -config.o: done.h thread.h compress.h acceptencodingparser.h -config.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h -config.o: pluginmsg.h misc.h +config.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h +config.o: htmlfilter.h postmultiparser.h ticket.h pluginmsg.h misc.h data.o: data.h dirs.h item.h dircontainer.h users.h user.h ugcontainer.h data.o: log.h groups.h group.h functions.h function.h lastcontainer.h data.o: mounts.h mount.h error.h rebus.h loadavg.h @@ -20,17 +19,15 @@ dircontainer.o: dircontainer.h item.h log.h dirs.o: dirs.h item.h dircontainer.h error.h log.h db.h user.h group.h dirs.o: thread.h ugcontainer.h ticket.h data.h users.h groups.h functions.h dirs.o: function.h lastcontainer.h mounts.h mount.h rebus.h loadavg.h -dirs.o: request.h requesttypes.h session.h done.h compress.h -dirs.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h -dirs.o: postmultiparser.h -done.o: done.h +dirs.o: request.h requesttypes.h session.h compress.h acceptencodingparser.h +dirs.o: acceptbaseparser.h htmlfilter.h postmultiparser.h function.o: function.h item.h functioncodeparser.o: functioncodeparser.h item.h function.h log.h functionparser.o: functionparser.h requesttypes.h log.h item.h error.h data.h functionparser.o: dirs.h dircontainer.h users.h user.h ugcontainer.h groups.h functionparser.o: group.h functions.h function.h lastcontainer.h mounts.h functionparser.o: mount.h rebus.h loadavg.h db.h thread.h ticket.h request.h -functionparser.o: session.h done.h compress.h acceptencodingparser.h +functionparser.o: session.h compress.h acceptencodingparser.h functionparser.o: acceptbaseparser.h htmlfilter.h postmultiparser.h functions.o: functions.h function.h item.h groups.o: groups.h group.h ugcontainer.h log.h db.h item.h user.h thread.h @@ -52,19 +49,19 @@ mountparser.o: loadavg.h misc.h mounts.o: mounts.h mount.h error.h log.h data.h dirs.h item.h dircontainer.h mounts.o: users.h user.h ugcontainer.h groups.h group.h functions.h mounts.o: function.h lastcontainer.h rebus.h loadavg.h request.h -mounts.o: requesttypes.h session.h done.h thread.h compress.h -mounts.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h -mounts.o: postmultiparser.h ticket.h mountparser.h db.h +mounts.o: requesttypes.h session.h thread.h compress.h acceptencodingparser.h +mounts.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h +mounts.o: mountparser.h db.h notify.o: log.h notify.h ../templatesnotify/templatesnotify.h ../core/mount.h notify.o: ../core/locale.h ../confparser/confparser.h ../templates/misc.h notify.o: ../templates/localefilter.h data.h dirs.h item.h dircontainer.h notify.o: users.h user.h ugcontainer.h groups.h group.h functions.h notify.o: function.h lastcontainer.h mounts.h mount.h error.h rebus.h -notify.o: loadavg.h misc.h request.h requesttypes.h session.h done.h thread.h +notify.o: loadavg.h misc.h request.h requesttypes.h session.h thread.h notify.o: compress.h acceptencodingparser.h acceptbaseparser.h htmlfilter.h notify.o: postmultiparser.h ticket.h -plugin.o: plugin.h request.h requesttypes.h session.h done.h item.h error.h -plugin.o: log.h user.h rebus.h function.h thread.h compress.h +plugin.o: plugin.h request.h requesttypes.h session.h item.h error.h log.h +plugin.o: user.h rebus.h function.h thread.h compress.h plugin.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h plugin.o: postmultiparser.h ticket.h data.h dirs.h dircontainer.h users.h plugin.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h mounts.h @@ -74,43 +71,42 @@ postmultiparser.o: dirs.h item.h dircontainer.h users.h user.h ugcontainer.h postmultiparser.o: groups.h group.h functions.h function.h lastcontainer.h postmultiparser.o: mounts.h mount.h rebus.h loadavg.h rebus.o: log.h rebus.h misc.h item.h -request.o: request.h requesttypes.h session.h done.h item.h error.h log.h -request.o: user.h rebus.h function.h thread.h compress.h -request.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h -request.o: postmultiparser.h ticket.h getparser.h httpsimpleparser.h -request.o: postparser.h cookieparser.h data.h dirs.h dircontainer.h users.h -request.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h -request.o: mounts.h mount.h loadavg.h plugin.h pluginmsg.h misc.h db.h +request.o: request.h requesttypes.h session.h item.h error.h log.h user.h +request.o: rebus.h function.h thread.h compress.h acceptencodingparser.h +request.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h +request.o: getparser.h httpsimpleparser.h postparser.h cookieparser.h data.h +request.o: dirs.h dircontainer.h users.h ugcontainer.h groups.h group.h +request.o: functions.h lastcontainer.h mounts.h mount.h loadavg.h plugin.h +request.o: pluginmsg.h misc.h db.h requestcontroller.o: requestcontroller.h ../content/content.h ../core/item.h requestcontroller.o: ../templates/templates.h ../templates/patterncacher.h requestcontroller.o: misc.h item.h ../templates/ckeditorgetparser.h requestcontroller.o: ../core/httpsimpleparser.h ../core/log.h requestcontroller.o: ../core/locale.h ../confparser/confparser.h -requestcontroller.o: ../core/thread.h ../core/ticket.h ../core/done.h -requestcontroller.o: sessionmanager.h sessioncontainer.h session.h done.h -requestcontroller.o: error.h log.h user.h rebus.h functionparser.h -requestcontroller.o: requesttypes.h data.h dirs.h dircontainer.h users.h -requestcontroller.o: ugcontainer.h groups.h group.h functions.h function.h -requestcontroller.o: lastcontainer.h mounts.h mount.h loadavg.h request.h -requestcontroller.o: thread.h compress.h acceptencodingparser.h -requestcontroller.o: acceptbaseparser.h htmlfilter.h postmultiparser.h -requestcontroller.o: ticket.h postparser.h httpsimpleparser.h cookieparser.h -requestcontroller.o: notify.h ../templatesnotify/templatesnotify.h -requestcontroller.o: ../core/mount.h ../templates/misc.h -requestcontroller.o: ../templates/localefilter.h -session.o: session.h done.h item.h error.h log.h user.h rebus.h -sessioncontainer.o: sessioncontainer.h session.h done.h item.h error.h log.h -sessioncontainer.o: user.h rebus.h data.h dirs.h dircontainer.h users.h +requestcontroller.o: ../core/thread.h ../core/ticket.h sessionmanager.h +requestcontroller.o: sessioncontainer.h session.h error.h log.h user.h +requestcontroller.o: rebus.h functionparser.h requesttypes.h data.h dirs.h +requestcontroller.o: dircontainer.h users.h ugcontainer.h groups.h group.h +requestcontroller.o: functions.h function.h lastcontainer.h mounts.h mount.h +requestcontroller.o: loadavg.h request.h thread.h compress.h +requestcontroller.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h +requestcontroller.o: postmultiparser.h ticket.h postparser.h +requestcontroller.o: httpsimpleparser.h cookieparser.h notify.h +requestcontroller.o: ../templatesnotify/templatesnotify.h ../core/mount.h +requestcontroller.o: ../templates/misc.h ../templates/localefilter.h +session.o: session.h item.h error.h log.h user.h rebus.h +sessioncontainer.o: sessioncontainer.h session.h item.h error.h log.h user.h +sessioncontainer.o: rebus.h data.h dirs.h dircontainer.h users.h sessioncontainer.o: ugcontainer.h groups.h group.h functions.h function.h sessioncontainer.o: lastcontainer.h mounts.h mount.h loadavg.h -sessionmanager.o: sessionmanager.h sessioncontainer.h session.h done.h item.h +sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h sessionmanager.o: error.h log.h user.h rebus.h request.h requesttypes.h sessionmanager.o: function.h thread.h compress.h acceptencodingparser.h sessionmanager.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h sessionmanager.o: data.h dirs.h dircontainer.h users.h ugcontainer.h groups.h sessionmanager.o: group.h functions.h lastcontainer.h mounts.h mount.h sessionmanager.o: loadavg.h sessionparser.h -sessionparser.o: sessionparser.h session.h done.h item.h error.h log.h user.h +sessionparser.o: sessionparser.h session.h item.h error.h log.h user.h sessionparser.o: rebus.h sessioncontainer.h data.h dirs.h dircontainer.h sessionparser.o: users.h ugcontainer.h groups.h group.h functions.h sessionparser.o: function.h lastcontainer.h mounts.h mount.h loadavg.h diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep index 113b2a1..a190e80 100755 --- a/core/Makefile.o.dep +++ b/core/Makefile.o.dep @@ -1 +1 @@ -o = acceptbaseparser.o compress.o config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o done.o function.o functioncodeparser.o functionparser.o functions.o groups.o htmlfilter.o httpsimpleparser.o lastcontainer.o loadavg.o locale.o log.o misc.o mount.o mountparser.o mounts.o notify.o plugin.o postmultiparser.o rebus.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o sessionparser.o users.o +o = acceptbaseparser.o compress.o config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o function.o functioncodeparser.o functionparser.o functions.o groups.o htmlfilter.o httpsimpleparser.o lastcontainer.o loadavg.o locale.o log.o misc.o mount.o mountparser.o mounts.o notify.o plugin.o postmultiparser.o rebus.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o sessionparser.o users.o diff --git a/core/acceptbaseparser.cpp b/core/acceptbaseparser.cpp index 5792ac9..83d3a84 100755 --- a/core/acceptbaseparser.cpp +++ b/core/acceptbaseparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/acceptbaseparser.h b/core/acceptbaseparser.h index 3e7dbd1..adecdff 100755 --- a/core/acceptbaseparser.h +++ b/core/acceptbaseparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/acceptencodingparser.h b/core/acceptencodingparser.h index 8841ee9..9dcad6a 100755 --- a/core/acceptencodingparser.h +++ b/core/acceptencodingparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/compress.cpp b/core/compress.cpp index 827b224..bb237f5 100755 --- a/core/compress.cpp +++ b/core/compress.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/compress.h b/core/compress.h index 33631c3..cd6e745 100755 --- a/core/compress.h +++ b/core/compress.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/config.cpp b/core/config.cpp index 7359906..9069e5f 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/config.h b/core/config.h index cbe5369..5c9085b 100755 --- a/core/config.h +++ b/core/config.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/cookieparser.h b/core/cookieparser.h index fba6937..ba5871e 100755 --- a/core/cookieparser.h +++ b/core/cookieparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/data.cpp b/core/data.cpp index 0c3cc0e..9306972 100755 --- a/core/data.cpp +++ b/core/data.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/db.cpp b/core/db.cpp index 8cf9dd5..4ee26b8 100755 --- a/core/db.cpp +++ b/core/db.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/db.h b/core/db.h index 6bef7d1..c8a03d1 100755 --- a/core/db.h +++ b/core/db.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/db_itemcolumns.cpp b/core/db_itemcolumns.cpp index 87c30d1..7809bb8 100755 --- a/core/db_itemcolumns.cpp +++ b/core/db_itemcolumns.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/dircontainer.cpp b/core/dircontainer.cpp index 3546097..2d4642b 100755 --- a/core/dircontainer.cpp +++ b/core/dircontainer.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/dircontainer.h b/core/dircontainer.h index c4df5aa..54cb9f9 100755 --- a/core/dircontainer.h +++ b/core/dircontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/dirs.cpp b/core/dirs.cpp index 9b743cf..49373a5 100755 --- a/core/dirs.cpp +++ b/core/dirs.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/dirs.h b/core/dirs.h index 5fe095f..b24b98d 100755 --- a/core/dirs.h +++ b/core/dirs.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/done.cpp b/core/done.cpp deleted file mode 100755 index 1920d01..0000000 --- a/core/done.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is a part of Winix - * and is not publicly distributed - * - * Copyright (c) 2008-2009, Tomasz Sowa - * All rights reserved. - * - */ - -#include "done.h" - - -Done::Done() -{ -} - - -Done::Done(Code c) : code(c) -{ -} - - -Done & Done::operator=(Code c) -{ - code = c; - -return *this; -} - - -bool Done::operator==(Code c) const -{ - return code == c; -} - - - -bool Done::operator!=(Code c) const -{ - return code != c; -} - - -Done::operator int() -{ - return static_cast( code ); -} diff --git a/core/done.h b/core/done.h deleted file mode 100755 index 76645b1..0000000 --- a/core/done.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is a part of Winix - * and is not publicly distributed - * - * Copyright (c) 2008-2009, Tomasz Sowa - * All rights reserved. - * - */ - -#ifndef headerfilecmslucoredone -#define headerfilecmslucoredone - - - -// what has been done -class Done -{ -public: - - enum Code - { - none = 0, - added_item, - edited_item, - deleted_item, - deleted_dir, - privileged_item, - added_dir, - added_thread, - added_ticket, - edited_ticket, - defaulted_dir, - reloaded_templates, - edited_fstab, - loggedout - }; - - - Done(); - Done(Code c); - Done & operator=(Code c); - bool operator==(Code c) const; - bool operator!=(Code c) const; - - operator int(); - -private: - - Code code; - -}; - - - -#endif diff --git a/core/function.cpp b/core/function.cpp index 31139ce..c3107ea 100755 --- a/core/function.cpp +++ b/core/function.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/function.h b/core/function.h index 6cc71bb..0f0e101 100755 --- a/core/function.h +++ b/core/function.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/functioncodeparser.cpp b/core/functioncodeparser.cpp index 469a3a5..eeabf1e 100755 --- a/core/functioncodeparser.cpp +++ b/core/functioncodeparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/functioncodeparser.h b/core/functioncodeparser.h index e4442fb..a335b3f 100755 --- a/core/functioncodeparser.h +++ b/core/functioncodeparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/functionparser.cpp b/core/functionparser.cpp index 88ca3db..4389841 100755 --- a/core/functionparser.cpp +++ b/core/functionparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/functionparser.h b/core/functionparser.h index e92b24f..09d9c69 100755 --- a/core/functionparser.h +++ b/core/functionparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/functions.cpp b/core/functions.cpp index e2ac9fc..5dde96b 100755 --- a/core/functions.cpp +++ b/core/functions.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/functions.h b/core/functions.h index 0f5c8ba..7a06e25 100755 --- a/core/functions.h +++ b/core/functions.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/getparser.h b/core/getparser.h index 8b6e5d0..09a2b78 100755 --- a/core/getparser.h +++ b/core/getparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/group.h b/core/group.h index 60643f9..f8f82b7 100755 --- a/core/group.h +++ b/core/group.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/groups.cpp b/core/groups.cpp index 2a998c8..d084ada 100755 --- a/core/groups.cpp +++ b/core/groups.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/groups.h b/core/groups.h index 9474b30..b2badfe 100755 --- a/core/groups.h +++ b/core/groups.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/htmlfilter.cpp b/core/htmlfilter.cpp index 05c6523..6466a06 100755 --- a/core/htmlfilter.cpp +++ b/core/htmlfilter.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -640,8 +640,9 @@ void HTMLFilter::CheckExceptions() if( IsLastTag("meta") || IsLastTag("input") || IsLastTag("br") || - IsLastTag("img") || - IsLastTag("link") ) + IsLastTag("hr") || + IsLastTag("img") || + IsLastTag("link") ) { LastItem().type = Item::simple; PopStack(); diff --git a/core/htmlfilter.h b/core/htmlfilter.h index 5bbb743..ec38cb8 100755 --- a/core/htmlfilter.h +++ b/core/htmlfilter.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/httpsimpleparser.cpp b/core/httpsimpleparser.cpp index 3d9eff6..eb803f9 100755 --- a/core/httpsimpleparser.cpp +++ b/core/httpsimpleparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/httpsimpleparser.h b/core/httpsimpleparser.h index 28cd3fd..c411ce3 100755 --- a/core/httpsimpleparser.h +++ b/core/httpsimpleparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/item.h b/core/item.h index 1e8e95e..a22ccc1 100755 --- a/core/item.h +++ b/core/item.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/log.cpp b/core/log.cpp index 60d868c..15a4c57 100755 --- a/core/log.cpp +++ b/core/log.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/log.h b/core/log.h index 4269b7f..bc786b2 100755 --- a/core/log.h +++ b/core/log.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/misc.cpp b/core/misc.cpp index aae9d04..15df72a 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/misc.h b/core/misc.h index eb95a2f..5eb562f 100755 --- a/core/misc.h +++ b/core/misc.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/notify.h b/core/notify.h index 623ff56..f23d12a 100755 --- a/core/notify.h +++ b/core/notify.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/plugin.cpp b/core/plugin.cpp index dc5bdcf..32dce63 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-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/plugin.h b/core/plugin.h index 3358394..c5ec685 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-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/pluginmsg.h b/core/pluginmsg.h index 0387330..ace00a7 100755 --- a/core/pluginmsg.h +++ b/core/pluginmsg.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/postmultiparser.cpp b/core/postmultiparser.cpp index d20e902..8adb14c 100755 --- a/core/postmultiparser.cpp +++ b/core/postmultiparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/postmultiparser.h b/core/postmultiparser.h index dd2db37..3eec242 100755 --- a/core/postmultiparser.h +++ b/core/postmultiparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/postparser.h b/core/postparser.h index b4c29c0..ceeb671 100755 --- a/core/postparser.h +++ b/core/postparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/rebus.cpp b/core/rebus.cpp index e3f17e7..b5e8101 100755 --- a/core/rebus.cpp +++ b/core/rebus.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/rebus.h b/core/rebus.h index c68ece2..4910a35 100755 --- a/core/rebus.h +++ b/core/rebus.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/request.cpp b/core/request.cpp index 4a3a7db..e31adf9 100755 --- a/core/request.cpp +++ b/core/request.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/request.h b/core/request.h index 2a9eb18..15fff25 100755 --- a/core/request.h +++ b/core/request.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/requestcontroller.cpp b/core/requestcontroller.cpp index 6162149..b3d062c 100755 --- a/core/requestcontroller.cpp +++ b/core/requestcontroller.cpp @@ -196,7 +196,6 @@ void RequestController::Loop() { session_manager.DeleteOldSessions(); session_manager.SetSession(); // set request.session as well - request.session->CheckTimers(); function_parser.Parse(); data.mounts.CalcCurMount(); diff --git a/core/requestcontroller.h b/core/requestcontroller.h index f4317e9..ef18f43 100755 --- a/core/requestcontroller.h +++ b/core/requestcontroller.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/requesttypes.h b/core/requesttypes.h index c2d9da6..c083caf 100755 --- a/core/requesttypes.h +++ b/core/requesttypes.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/session.cpp b/core/session.cpp index ef7d7b2..1d74aa5 100755 --- a/core/session.cpp +++ b/core/session.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -31,10 +31,6 @@ void Session::Clear() id = 0; time = 0; puser = 0; - done = Done::none; - done_status = WINIX_ERR_OK; - item.Clear(); - done_timer = 0; rebus_item = 0; rebus_checked = false; remember_me = false; @@ -56,58 +52,3 @@ bool Session::operator<(const Session & s) const return id < s.id; } - - -/* -bool Session::DecTimer(int & timer) -{ - if( timer == 0 ) - return false; - - --timer; - - if( timer == 0 ) - return true; // we must clear our variables - -return false; -} - - - -void Session::CheckTimers() -{ - if( DecTimer(done_timer) ) - { - done = Done::none; - done_status = WINIX_ERR_OK; - } -} -*/ - -void Session::DecTimer(int & timer) -{ - if( timer == 0 ) - return; - - --timer; -} - - - -void Session::CheckTimers() -{ - DecTimer(done_timer); - - if( done_timer == 0 ) - { - done = Done::none; - done_status = WINIX_ERR_OK; - } -} - - -void Session::IncrementTimersIfExist() -{ - if( done_timer != 0 ) - ++done_timer; -} diff --git a/core/session.h b/core/session.h index 97f8b22..c6f2875 100755 --- a/core/session.h +++ b/core/session.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -11,7 +11,6 @@ #define headerfilecmslucoresession #include -#include "done.h" #include "item.h" #include "error.h" #include "user.h" @@ -46,15 +45,6 @@ struct Session // if false the session will end when the user browser is shutdown bool remember_me; - // what is done - Done done; - Error done_status; - - int done_timer; - - - // used for many purposes, depending on 'done' - Item item; // rebus - set by rebus_question(Info & i) from templates Rebus::Item * rebus_item; @@ -72,8 +62,6 @@ struct Session bool operator==(const Session & s) const; bool operator<(const Session & s) const; void DecTimer(int & timer); - void CheckTimers(); - void IncrementTimersIfExist(); }; diff --git a/core/sessioncontainer.cpp b/core/sessioncontainer.cpp index 60cb55d..8096bb7 100755 --- a/core/sessioncontainer.cpp +++ b/core/sessioncontainer.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/sessioncontainer.h b/core/sessioncontainer.h index dace299..aaeb308 100755 --- a/core/sessioncontainer.h +++ b/core/sessioncontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp index dcf9cc3..3800122 100755 --- a/core/sessionmanager.cpp +++ b/core/sessionmanager.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/sessionmanager.h b/core/sessionmanager.h index 4569c55..7ee59b7 100755 --- a/core/sessionmanager.h +++ b/core/sessionmanager.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/sessionparser.cpp b/core/sessionparser.cpp index 7831fdb..d9f863f 100755 --- a/core/sessionparser.cpp +++ b/core/sessionparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/sessionparser.h b/core/sessionparser.h index 40138ab..6c0a95e 100755 --- a/core/sessionparser.h +++ b/core/sessionparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/ticket.h b/core/ticket.h index 7a5c5d2..38cb210 100755 --- a/core/ticket.h +++ b/core/ticket.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/ugcontainer.h b/core/ugcontainer.h index ff37cae..bb7183f 100755 --- a/core/ugcontainer.h +++ b/core/ugcontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/user.h b/core/user.h index 7691626..e75c03d 100755 --- a/core/user.h +++ b/core/user.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/users.cpp b/core/users.cpp index 746eff1..a2bf339 100755 --- a/core/users.cpp +++ b/core/users.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/core/users.h b/core/users.h index 24c4829..fadace6 100755 --- a/core/users.h +++ b/core/users.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/html/fun_default.html b/html/fun_default.html index 073c18e..59bdf5d 100755 --- a/html/fun_default.html +++ b/html/fun_default.html @@ -1,20 +1,6 @@

{default_header}

- -[if-any done_defaulted_dir done_is_error] -

{default_was_error}
- - [if-any done_status_incorrect_dir] -

{default_error_no_dir}

- [else] - [if-any done_status_no_item] -

default_error_no_file

- [else] - {error_code}: [done_status]

- [end] - [end] -[end] - +[include "error.html"]
diff --git a/html/fun_login.html b/html/fun_login.html index 9f3db61..0abafe1 100755 --- a/html/fun_login.html +++ b/html/fun_login.html @@ -7,8 +7,8 @@
{form_login_legend}: - - + +
diff --git a/html/fun_mkdir.html b/html/fun_mkdir.html index cad7b93..e3bec7f 100755 --- a/html/fun_mkdir.html +++ b/html/fun_mkdir.html @@ -1,9 +1,6 @@

{mkdir_header}

-[if-any done_added_dir done_is_error] -

{mkdir_was_error}
- {error_code}: [done_status]

-[end] +[include "error.html"] diff --git a/html/fun_priv.html b/html/fun_priv.html index 5e0d484..35e32e4 100755 --- a/html/fun_priv.html +++ b/html/fun_priv.html @@ -3,11 +3,8 @@

{priv_header}

+[include "error.html"] -[if-any done_privileged_item done_is_error] -

{priv_was_error}
- {error_code}: [done_status]

-[end] [is-no winix_function_param_is "r"] diff --git a/html/fun_reload.html b/html/fun_reload.html index 0e8a3b4..bfdfb9e 100755 --- a/html/fun_reload.html +++ b/html/fun_reload.html @@ -1,18 +1,6 @@

{reload_header}

- -[if-any done_reloaded_templates] - [if-any done_is_error] -

{reload_was_error}
- {error_code}: [done_status]

- [end] - - [if-no done_is_error] - [if-any done_reloaded_templates] -

{templates_reloaded_successfully}

- [end] - [end] -[end] +[include "error.html"]

{reload_select}:

diff --git a/locale/en b/locale/en index a4ad264..cf277a7 100755 --- a/locale/en +++ b/locale/en @@ -74,9 +74,6 @@ form_ticket_create_submit = Create a new ticket form_ticket_edit_submit = Edit a ticket default_header = Default item in a directory -default_was_error = We are sory but there was an error during changing the default item. -default_error_no_dir = There is no such a directory. -default_error_no_file = There is no such a file. form_default_legend = Default item form @@ -106,11 +103,9 @@ last_none = There is no anything information. ls_header = Directory listing mkdir_header = Make directory -mkdir_was_error = We are sorry but there were errors during creating the directory mkdir_form_legend = Make directory form priv_header = Permissions -priv_was_error = We are sorry but there were errors while changing permissions. priv_form_legend = Permissions priv_change_in_dir = Change permissions for all items in the following directory priv_for_all_files = For all files to @@ -119,8 +114,6 @@ priv_change_all = Change subdirectories as well priv_change_current_dir = Change also the current directory reload_header = Reload -reload_was_error = We are sorry but there were errors while reloading. -templates_reloaded_successfully = Templates reloaded successfully. reload_select = What to reload: reload_templates = templates diff --git a/locale/pl b/locale/pl index 53d8aa2..2122eaa 100755 --- a/locale/pl +++ b/locale/pl @@ -73,9 +73,6 @@ form_ticket_create_submit = Za form_ticket_edit_submit = Edytuj zgłoszenie default_header = Domyślna pozycja w katalogu -default_was_error = Przykro nam ale wystąpiły błędy podczas zmiany domyślnej pozycji. -default_error_no_dir = Podano nie istniejący katalog. -default_error_no_file = Podano nie istniejący post. form_default_legend = Formularz zmiany pozycji domyślnej @@ -105,11 +102,9 @@ last_none = Nie ma dost ls_header = Zawartość katalogu mkdir_header = Stwórz katalog -mkdir_was_error = Przykro nam ale wystąpiły błędy podczas tworzenia tego katalogu. mkdir_form_legend = Wypełnij wszystkie pozycje formularza priv_header = Zmień uprawnienia dostępu -priv_was_error = Przykro nam ale wystąpiły błędy podczas zmiany uprawnień. priv_form_legend = Uprawnienia priv_change_in_dir = Zmień hurtowo uprawnienia w katalogu priv_for_all_files = Dla wszystkich plików na @@ -119,8 +114,6 @@ priv_change_current_dir = Zmie reload_header = Przeładuj -reload_was_error = Przykro nam ale wystąpiły błędy podczas ponownego wczytywania. -templates_reloaded_successfully = Szablony zostały pomyślnie wczytane. reload_select = Wybierz pozycję reload_templates = templates diff --git a/main/Makefile.dep b/main/Makefile.dep index 97f4087..22a42d2 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -5,15 +5,15 @@ main.o: ../templates/templates.h ../templates/patterncacher.h main.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h main.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h main.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h -main.o: ../core/ticket.h ../core/done.h ../core/sessionmanager.h -main.o: ../core/sessioncontainer.h ../core/session.h ../core/done.h -main.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -main.o: ../core/rebus.h ../core/functionparser.h ../core/requesttypes.h -main.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h ../core/users.h -main.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h -main.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h -main.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h ../core/request.h -main.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +main.o: ../core/ticket.h ../core/sessionmanager.h ../core/sessioncontainer.h +main.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +main.o: ../core/user.h ../core/rebus.h ../core/functionparser.h +main.o: ../core/requesttypes.h ../core/data.h ../core/dirs.h +main.o: ../core/dircontainer.h ../core/users.h ../core/ugcontainer.h +main.o: ../core/groups.h ../core/group.h ../core/functions.h +main.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h +main.o: ../core/mount.h ../core/loadavg.h ../core/request.h ../core/thread.h +main.o: ../core/compress.h ../core/acceptencodingparser.h main.o: ../core/acceptbaseparser.h ../core/htmlfilter.h main.o: ../core/postmultiparser.h ../core/ticket.h ../core/db.h main.o: ../core/config.h ../core/notify.h diff --git a/main/main.cpp b/main/main.cpp index 48897d0..60356ab 100755 --- a/main/main.cpp +++ b/main/main.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/static/layout1/winix.css b/static/layout1/winix.css index 9946f1d..41d9601 100755 --- a/static/layout1/winix.css +++ b/static/layout1/winix.css @@ -321,6 +321,14 @@ margin: 1.2em 0 0.2em 0; } +h3 { +font-size: 1.1em; +margin: 1.2em 0 0.8em 0; +color: #FF8700; +font-weight: normal; +} + + a { color: #065A8B; text-decoration: none; @@ -420,6 +428,14 @@ display: block; width: 530px; } +#additem .editshort { +margin: 0.3em 0 0.3em 0; +padding: 0.2em; +border: 1px solid #dedede; +display: block; +width: 250px; +} + #additem .check { vertical-align: middle; } diff --git a/templates/Makefile.dep b/templates/Makefile.dep index ebbba9b..61955f6 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -3,16 +3,15 @@ adduser.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h adduser.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h adduser.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h -adduser.o: ../core/requesttypes.h ../core/session.h ../core/done.h -adduser.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -adduser.o: ../core/rebus.h ../core/function.h ../core/thread.h -adduser.o: ../core/compress.h ../core/acceptencodingparser.h -adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -adduser.o: ../core/postmultiparser.h ../core/ticket.h +adduser.o: ../core/requesttypes.h ../core/session.h ../core/item.h +adduser.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h +adduser.o: ../core/function.h ../core/thread.h ../core/compress.h +adduser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +adduser.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h dir.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h dir.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h dir.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h -dir.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h +dir.o: ../core/requesttypes.h ../core/session.h ../core/item.h dir.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h dir.o: ../core/function.h ../core/thread.h ../core/compress.h dir.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h @@ -29,19 +28,10 @@ doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h doc.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h doc.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h -doc.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h +doc.o: ../core/session.h ../core/thread.h ../core/compress.h doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h doc.o: ../core/misc.h -done.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -done.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -done.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h -done.o: ../core/requesttypes.h ../core/session.h ../core/done.h -done.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -done.o: ../core/rebus.h ../core/function.h ../core/thread.h -done.o: ../core/compress.h ../core/acceptencodingparser.h -done.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -done.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h item.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h item.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h item.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h @@ -50,8 +40,8 @@ item.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h item.o: ../core/group.h ../core/functions.h ../core/function.h item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h item.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h -item.o: ../core/requesttypes.h ../core/session.h ../core/done.h -item.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +item.o: ../core/requesttypes.h ../core/session.h ../core/thread.h +item.o: ../core/compress.h ../core/acceptencodingparser.h item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h last.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h @@ -63,20 +53,19 @@ last.o: ../core/groups.h ../core/group.h ../core/functions.h last.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h last.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h last.o: ../core/request.h ../core/requesttypes.h ../core/session.h -last.o: ../core/done.h ../core/thread.h ../core/compress.h -last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -last.o: ../core/misc.h +last.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +last.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h localefilter.o: localefilter.h ../core/locale.h ../confparser/confparser.h localefilter.o: ../core/misc.h ../core/item.h ls.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h ls.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h ls.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h -ls.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h -ls.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h -ls.o: ../core/function.h ../core/thread.h ../core/compress.h -ls.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -ls.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +ls.o: ../core/requesttypes.h ../core/session.h ../core/item.h ../core/error.h +ls.o: ../core/log.h ../core/user.h ../core/rebus.h ../core/function.h +ls.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +ls.o: ../core/postmultiparser.h ../core/ticket.h misc.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h misc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h misc.o: ../core/groups.h ../core/group.h ../core/functions.h @@ -107,13 +96,13 @@ priv.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h priv.o: ../core/group.h ../core/functions.h ../core/function.h priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h priv.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h -priv.o: ../core/requesttypes.h ../core/session.h ../core/done.h -priv.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +priv.o: ../core/requesttypes.h ../core/session.h ../core/thread.h +priv.o: ../core/compress.h ../core/acceptencodingparser.h priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h -rebus.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h -rebus.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h +rebus.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h +rebus.o: ../core/rebus.h ../core/function.h ../core/thread.h rebus.o: ../core/compress.h ../core/acceptencodingparser.h rebus.o: ../core/acceptbaseparser.h ../core/htmlfilter.h rebus.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h @@ -132,7 +121,7 @@ sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h sys.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h sys.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h -sys.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h +sys.o: ../core/session.h ../core/thread.h ../core/compress.h sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h sys.o: ../core/misc.h @@ -145,11 +134,10 @@ templates.o: ../core/log.h ../core/groups.h ../core/group.h templates.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h templates.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h templates.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h -templates.o: ../core/session.h ../core/done.h ../core/thread.h -templates.o: ../core/compress.h ../core/acceptencodingparser.h -templates.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -templates.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h -templates.o: ../core/plugin.h ../core/request.h ../core/data.h +templates.o: ../core/session.h ../core/thread.h ../core/compress.h +templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +templates.o: ../core/misc.h ../core/plugin.h ../core/request.h ../core/data.h templates.o: ../core/pluginmsg.h thread.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h thread.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h @@ -160,10 +148,9 @@ thread.o: ../core/groups.h ../core/group.h ../core/functions.h thread.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h thread.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h -thread.o: ../core/done.h ../core/thread.h ../core/compress.h -thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -thread.o: ../core/misc.h +thread.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h ticket.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h ticket.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h ticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h @@ -173,19 +160,17 @@ ticket.o: ../core/groups.h ../core/group.h ../core/functions.h ticket.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h ticket.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h ticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h -ticket.o: ../core/done.h ../core/thread.h ../core/compress.h -ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -ticket.o: ../core/misc.h +ticket.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h upload.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h upload.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h upload.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h -upload.o: ../core/requesttypes.h ../core/session.h ../core/done.h -upload.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -upload.o: ../core/rebus.h ../core/function.h ../core/thread.h -upload.o: ../core/compress.h ../core/acceptencodingparser.h -upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -upload.o: ../core/postmultiparser.h ../core/ticket.h +upload.o: ../core/requesttypes.h ../core/session.h ../core/item.h +upload.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h +upload.o: ../core/function.h ../core/thread.h ../core/compress.h +upload.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +upload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h uptime.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h uptime.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h uptime.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h @@ -202,18 +187,17 @@ user.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h user.o: ../core/group.h ../core/functions.h ../core/function.h user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h user.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h -user.o: ../core/requesttypes.h ../core/session.h ../core/done.h -user.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +user.o: ../core/requesttypes.h ../core/session.h ../core/thread.h +user.o: ../core/compress.h ../core/acceptencodingparser.h user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h user.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h who.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h who.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h who.o: ../core/httpsimpleparser.h ../core/log.h ../core/sessioncontainer.h -who.o: ../core/session.h ../core/done.h ../core/item.h ../core/error.h -who.o: ../core/log.h ../core/user.h ../core/rebus.h -who.o: ../core/requestcontroller.h ../content/content.h -who.o: ../templates/templates.h ../core/thread.h ../core/ticket.h -who.o: ../core/done.h ../core/sessionmanager.h ../core/sessioncontainer.h +who.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +who.o: ../core/user.h ../core/rebus.h ../core/requestcontroller.h +who.o: ../content/content.h ../templates/templates.h ../core/thread.h +who.o: ../core/ticket.h ../core/sessionmanager.h ../core/sessioncontainer.h who.o: ../core/functionparser.h ../core/requesttypes.h ../core/data.h who.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h who.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h @@ -230,7 +214,7 @@ winix.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h winix.o: ../core/group.h ../core/functions.h ../core/function.h winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h winix.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h -winix.o: ../core/requesttypes.h ../core/session.h ../core/done.h -winix.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +winix.o: ../core/requesttypes.h ../core/session.h ../core/thread.h +winix.o: ../core/compress.h ../core/acceptencodingparser.h winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h winix.o: ../core/postmultiparser.h ../core/ticket.h diff --git a/templates/Makefile.o.dep b/templates/Makefile.o.dep index a87e7e3..bd6cb5d 100755 --- a/templates/Makefile.o.dep +++ b/templates/Makefile.o.dep @@ -1 +1 @@ -o = adduser.o dir.o doc.o done.o item.o last.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o sys.o templates.o thread.o ticket.o upload.o uptime.o user.o who.o winix.o +o = adduser.o dir.o doc.o item.o last.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o sys.o templates.o thread.o ticket.o upload.o uptime.o user.o who.o winix.o diff --git a/templates/dir.cpp b/templates/dir.cpp index 12ac791..7778fa8 100755 --- a/templates/dir.cpp +++ b/templates/dir.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/doc.cpp b/templates/doc.cpp index c4bf562..76f37a6 100755 --- a/templates/doc.cpp +++ b/templates/doc.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/done.cpp b/templates/done.cpp deleted file mode 100755 index 53b8442..0000000 --- a/templates/done.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/* - * This file is a part of Winix - * and is not publicly distributed - * - * Copyright (c) 2008-2009, Tomasz Sowa - * All rights reserved. - * - */ - -#include "templates.h" -#include "../core/request.h" -#include "../core/misc.h" - - - -namespace TemplatesFunctions -{ - - - -void done_is_error(Info & i) -{ - i.result = request.session->done_status != WINIX_ERR_OK; -} - - -void done_status(Info & i) -{ - i.out << static_cast( request.session->done_status ); -} - - -void done_status_no_item(Info & i) -{ - i.result = request.session->done_status == WINIX_ERR_NO_ITEM; -} - - -void done_status_incorrect_dir(Info & i) -{ - i.result = request.session->done_status == WINIX_ERR_INCORRECT_DIR; -} - - -void done_added_item(Info & i) -{ - i.result = request.session->done == Done::added_item; -} - - -void done_edited_item(Info & i) -{ - i.result = request.session->done == Done::edited_item; -} - - -void done_deleted_item(Info & i) -{ - i.result = request.session->done == Done::deleted_item; -} - - -void done_privileged_item(Info & i) -{ - i.result = request.session->done == Done::privileged_item; -} - - -void done_loggedout(Info & i) -{ - i.result = request.session->done == Done::loggedout; -} - - - - - -void done_added_dir(Info & i) -{ - i.result = request.session->done == Done::added_dir; -} - - -void done_deleted_dir(Info & i) -{ - i.result = request.session->done == Done::deleted_dir; -} - - - -void done_defaulted_dir(Info & i) -{ - i.result = request.session->done == Done::defaulted_dir; -} - - -void done_reloaded_templates(Info & i) -{ - i.result = request.session->done == Done::reloaded_templates; -} - - -} // namespace TemplatesFunctions - - - diff --git a/templates/item.cpp b/templates/item.cpp index 3c3e31a..225b6f6 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -303,68 +303,6 @@ void item_guest_name(Info & i) -void item_old_id(Info & i) -{ - i.out << request.session->item.id; -} - - -void item_old_subject(Info & i) -{ - HtmlEscape(i.out, request.session->item.subject); -} - - -void item_old_subject_noescape(Info & i) -{ - i.out << request.session->item.subject; -} - - -void item_old_content(Info & i) -{ - HtmlEscape(i.out, request.session->item.content); -} - - -void item_old_content_noescape(Info & i) -{ - i.out << request.session->item.content; -} - - -void item_old_privileges(Info & i) -{ - i.out << std::setbase(8) << request.session->item.privileges << std::setbase(10); -} - - -void item_old_dir(Info & i) -{ -std::string path; - - if( data.dirs.MakePath(request.session->item.parent_id, path) ) - HtmlEscape(i.out, path); - else - i.out << "/the path does not exist/"; -} - - -void item_old_url(Info & i) -{ - HtmlEscape(i.out, request.session->item.url); -} - - -void item_old_link(Info & i) -{ - HtmlEscape(i.out, data.base_url); - item_old_dir(i); - item_old_url(i); -} - - - diff --git a/templates/last.cpp b/templates/last.cpp index 4229c50..eea3955 100755 --- a/templates/last.cpp +++ b/templates/last.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/mount.cpp b/templates/mount.cpp index 6b40d41..0e586d2 100755 --- a/templates/mount.cpp +++ b/templates/mount.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index 25fb39d..24675b3 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/patterncacher.h b/templates/patterncacher.h index df2fb57..eca5f01 100755 --- a/templates/patterncacher.h +++ b/templates/patterncacher.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/priv.cpp b/templates/priv.cpp index d849a2a..ab7fa33 100755 --- a/templates/priv.cpp +++ b/templates/priv.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/rebus.cpp b/templates/rebus.cpp index 2683b2c..975d840 100755 --- a/templates/rebus.cpp +++ b/templates/rebus.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/sys.cpp b/templates/sys.cpp index cea1014..d442f31 100755 --- a/templates/sys.cpp +++ b/templates/sys.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/templates.cpp b/templates/templates.cpp index cf78c79..eab7172 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -219,16 +219,6 @@ void Templates::CreateFunctions() functions.Insert("item_run", item_run); functions.Insert("item_guest_name", item_guest_name); - functions.Insert("item_old_id", item_old_id); - functions.Insert("item_old_subject", item_old_subject); - functions.Insert("item_old_subject_noescape", item_old_subject_noescape); - functions.Insert("item_old_content", item_old_content); - functions.Insert("item_old_content_noescape", item_old_content_noescape); - functions.Insert("item_old_privileges", item_old_privileges); - functions.Insert("item_old_dir", item_old_dir); - functions.Insert("item_old_url", item_old_url); - functions.Insert("item_old_link", item_old_link); - functions.Insert("item_tab", item_tab); functions.Insert("item_tab_id", item_tab_id); functions.Insert("item_tab_subject", item_tab_subject); @@ -322,25 +312,6 @@ void Templates::CreateFunctions() functions.Insert("priv_show_form_chmod", priv_show_form_chmod); - - /* - done - */ - functions.Insert("done_is_error", done_is_error); - functions.Insert("done_status", done_status); - functions.Insert("done_status_no_item", done_status_no_item); - functions.Insert("done_status_incorrect_dir", done_status_incorrect_dir); - functions.Insert("done_added_item", done_added_item); - functions.Insert("done_edited_item", done_edited_item); - functions.Insert("done_deleted_item", done_deleted_item); - functions.Insert("done_privileged_item", done_privileged_item); - functions.Insert("done_loggedout", done_loggedout); - functions.Insert("done_added_dir", done_added_dir); - functions.Insert("done_deleted_dir", done_deleted_dir); - functions.Insert("done_defaulted_dir", done_defaulted_dir); - functions.Insert("done_reloaded_templates", done_reloaded_templates); - - /* others */ diff --git a/templates/templates.h b/templates/templates.h index 9d9d256..b5b4805 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -130,16 +130,6 @@ namespace TemplatesFunctions void item_run(Info & i); void item_guest_name(Info & i); - void item_old_id(Info & i); - void item_old_subject(Info & i); - void item_old_subject_noescape(Info & i); - void item_old_content(Info & i); - void item_old_content_noescape(Info & i); - void item_old_privileges(Info & i); - void item_old_dir(Info & i); - void item_old_url(Info & i); - void item_old_link(Info & i); - void item_tab(Info & i); void item_tab_id(Info & i); void item_tab_subject(Info & i); @@ -232,26 +222,6 @@ namespace TemplatesFunctions void priv_show_form_chmod(Info & i); - /* - done - */ - void done_is_error(Info & i); - void done_status(Info & i); - void done_status_no_item(Info & i); - void done_status_incorrect_dir(Info & i); - - void done_added_item(Info & i); - void done_edited_item(Info & i); - void done_deleted_item(Info & i); - void done_privileged_item(Info & i); - - void done_added_dir(Info & i); - void done_deleted_dir(Info & i); - void done_defaulted_dir(Info & i); - - void done_loggedout(Info & i); - void done_reloaded_templates(Info & i); - /* who */ diff --git a/templates/thread.cpp b/templates/thread.cpp index 52ddec0..7183d35 100755 --- a/templates/thread.cpp +++ b/templates/thread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/ticket.cpp b/templates/ticket.cpp index a4a30dd..9853ec7 100755 --- a/templates/ticket.cpp +++ b/templates/ticket.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templates/user.cpp b/templates/user.cpp index 36ff02f..d36d910 100755 --- a/templates/user.cpp +++ b/templates/user.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ @@ -31,7 +31,7 @@ void user_name(Info & i) if( !request.session->puser ) return; - i.out << request.session->puser->name; + HtmlEscape(i.out, request.session->puser->name); } diff --git a/templates/who.cpp b/templates/who.cpp index 6cb1ae3..b255785 100755 --- a/templates/who.cpp +++ b/templates/who.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templatesnotify/notify.cpp b/templatesnotify/notify.cpp index 6fdb3fe..ca1b341 100755 --- a/templatesnotify/notify.cpp +++ b/templatesnotify/notify.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templatesnotify/templatesnotify.cpp b/templatesnotify/templatesnotify.cpp index 13b9ade..32aef77 100755 --- a/templatesnotify/templatesnotify.cpp +++ b/templatesnotify/templatesnotify.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */ diff --git a/templatesnotify/templatesnotify.h b/templatesnotify/templatesnotify.h index 5e241f2..2cc09da 100755 --- a/templatesnotify/templatesnotify.h +++ b/templatesnotify/templatesnotify.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2009, Tomasz Sowa + * Copyright (c) 2008-2010, Tomasz Sowa * All rights reserved. * */