tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

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
This commit is contained in:
Tomasz Sowa 2010-02-28 21:33:06 +00:00
parent 71a63cc70e
commit ebd868fa33
128 changed files with 387 additions and 915 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confparser/confparser.cpp
View File

@ -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.
*
*/

2
confparser/confparser.h
View File

@ -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.
*
*/

254
content/Makefile.dep
View File

@ -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

2
content/cat.cpp
View File

@ -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.
*
*/

4
content/content.cpp
View File

@ -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;

5
content/content.h
View File

@ -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();

22
content/createthread.cpp
View File

@ -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();
}

26
content/createticket.cpp
View File

@ -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();
}

15
content/default.cpp
View File

@ -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;
}

2
content/download.cpp
View File

@ -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.
*
*/

28
content/editticket.cpp
View File

@ -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;

23
content/emacs.cpp
View File

@ -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;
}
}

2
content/last.cpp
View File

@ -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.
*
*/

2
content/login.cpp
View File

@ -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.
*
*/

4
content/logout.cpp
View File

@ -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;
}

2
content/ls.cpp
View File

@ -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.
*
*/

2
content/misc_item.cpp
View File

@ -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.
*
*/

6
content/misc_specialfile.cpp
View File

@ -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);
}
}

11
content/mkdir.cpp
View File

@ -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;
}
}

2
content/node.cpp
View File

@ -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.
*
*/

2
content/priv.cpp
View File

@ -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);
}

5
content/reload.cpp
View File

@ -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;
}

13
content/rm.cpp
View File

@ -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;
}
}

2
content/run.cpp
View File

@ -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.
*
*/

2
content/thread.cpp
View File

@ -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.
*
*/

2
content/ticket.cpp
View File

@ -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.
*
*/

14
content/upload.cpp
View File

@ -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);

2
content/who.cpp
View File

@ -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.
*
*/

72
core/Makefile.dep
View File

@ -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

2
core/Makefile.o.dep
View File

@ -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

2
core/acceptbaseparser.cpp
View File

@ -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.
*
*/

2
core/acceptbaseparser.h
View File

@ -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.
*
*/

2
core/acceptencodingparser.h
View File

@ -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.
*
*/

2
core/compress.cpp
View File

@ -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.
*
*/

2
core/compress.h
View File

@ -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.
*
*/

2
core/config.cpp
View File

@ -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.
*
*/

2
core/config.h
View File

@ -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.
*
*/

2
core/cookieparser.h
View File

@ -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.
*
*/

2
core/data.cpp
View File

@ -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.
*
*/

2
core/db.cpp
View File

@ -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.
*
*/

2
core/db.h
View File

@ -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.
*
*/

2
core/db_itemcolumns.cpp
View File

@ -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.
*
*/

2
core/dircontainer.cpp
View File

@ -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.
*
*/

2
core/dircontainer.h
View File

@ -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.
*
*/

2
core/dirs.cpp
View File

@ -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.
*
*/

2
core/dirs.h
View File

@ -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.
*
*/

47
core/done.cpp
View File

@ -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<int>( code );
}

55
core/done.h
View File

@ -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

2
core/function.cpp
View File

@ -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.
*
*/

2
core/function.h
View File

@ -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.
*
*/

2
core/functioncodeparser.cpp
View File

@ -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.
*
*/

2
core/functioncodeparser.h
View File

@ -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.
*
*/

2
core/functionparser.cpp
View File

@ -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.
*
*/

2
core/functionparser.h
View File

@ -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.
*
*/

2
core/functions.cpp
View File

@ -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.
*
*/

2
core/functions.h
View File

@ -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.
*
*/

2
core/getparser.h
View File

@ -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.
*
*/

2
core/group.h
View File

@ -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.
*
*/

2
core/groups.cpp
View File

@ -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.
*
*/

2
core/groups.h
View File

@ -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.
*
*/

3
core/htmlfilter.cpp
View File

@ -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,6 +640,7 @@ void HTMLFilter::CheckExceptions()
if( IsLastTag("meta") ||
IsLastTag("input") ||
IsLastTag("br") ||
IsLastTag("hr") ||
IsLastTag("img") ||
IsLastTag("link") )
{

2
core/htmlfilter.h
View File

@ -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.
*
*/

2
core/httpsimpleparser.cpp
View File

@ -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.
*
*/

2
core/httpsimpleparser.h
View File

@ -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.
*
*/

2
core/item.h
View File

@ -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.
*
*/

2
core/log.cpp
View File

@ -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.
*
*/

2
core/log.h
View File

@ -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.
*
*/

2
core/misc.cpp
View File

@ -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.
*
*/

2
core/misc.h
View File

@ -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.
*
*/

2
core/notify.h
View File

@ -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.
*
*/

2
core/plugin.cpp
View File

@ -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.
*
*/

2
core/plugin.h
View File

@ -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.
*
*/

2
core/pluginmsg.h
View File

@ -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.
*
*/

2
core/postmultiparser.cpp
View File

@ -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.
*
*/

2
core/postmultiparser.h
View File

@ -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.
*
*/

2
core/postparser.h
View File

@ -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.
*
*/

2
core/rebus.cpp
View File

@ -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.
*
*/

2
core/rebus.h
View File

@ -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.
*
*/

2
core/request.cpp
View File

@ -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.
*
*/

2
core/request.h
View File

@ -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.
*
*/

1
core/requestcontroller.cpp
View File

@ -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();

2
core/requestcontroller.h
View File

@ -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.
*
*/

2
core/requesttypes.h
View File

@ -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.
*
*/

61
core/session.cpp
View File

@ -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;
}

14
core/session.h
View File

@ -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 <ctime>
#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();
};

2
core/sessioncontainer.cpp
View File

@ -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.
*
*/

2
core/sessioncontainer.h
View File

@ -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.
*
*/

2
core/sessionmanager.cpp
View File

@ -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.
*
*/

2
core/sessionmanager.h
View File

@ -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.
*
*/

2
core/sessionparser.cpp
View File

@ -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.
*
*/

2
core/sessionparser.h
View File

@ -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.
*
*/

2
core/ticket.h
View File

@ -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.
*
*/

2
core/ugcontainer.h
View File

@ -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.
*
*/

2
core/user.h
View File

@ -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.
*
*/

2
core/users.cpp
View File

@ -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.
*
*/

2
core/users.h
View File

@ -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.
*
*/

16
html/fun_default.html
View File

@ -1,20 +1,6 @@
<h1>{default_header}</h1>
[if-any done_defaulted_dir done_is_error]
<p>{default_was_error}<br>
[if-any done_status_incorrect_dir]
<p>{default_error_no_dir}</p>
[else]
[if-any done_status_no_item]
<p>default_error_no_file</p>
[else]
{error_code}: [done_status]</p>
[end]
[end]
[end]
[include "error.html"]
<form id="additem" method="post" action="[doc_base_url][dir]default">
<fieldset>

4
html/fun_login.html
View File

@ -7,8 +7,8 @@
<form id="additem" method="post" action="[doc_base_url][if-one dir_can_read_exec][dir][if-any item_is item_can_read][item_url]/[end][else]/[end]login">
<fieldset>
<legend>{form_login_legend}:</legend>
<input class="edit" type="text" name="login">
<input class="edit" type="password" name="password">
<input class="editshort" type="text" name="login">
<input class="editshort" type="password" name="password">
<label><input class="remember" type="checkbox" name="rememberme">{remember_me}</label>
<input class="submit" type="submit" value="{button_login}">
</fieldset>

5
html/fun_mkdir.html
View File

@ -1,9 +1,6 @@
<h1>{mkdir_header}</h1>
[if-any done_added_dir done_is_error]
<p>{mkdir_was_error}<br>
{error_code}: [done_status]</p>
[end]
[include "error.html"]
<form id="additem" method="post" action="[doc_base_url][dir]mkdir">

5
html/fun_priv.html
View File

@ -3,11 +3,8 @@
<h1>{priv_header}</h1>
[include "error.html"]
[if-any done_privileged_item done_is_error]
<p>{priv_was_error}<br>
{error_code}: [done_status]</p>
[end]
[is-no winix_function_param_is "r"]

Some files were not shown because too many files have changed in this diff Show More