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

part II of rewriting

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@635 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-12 19:10:12 +00:00
parent c3fac2e83f
commit 9a199cd834
38 changed files with 1159 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

324
functions/Makefile.dep
View File

@@ -5,24 +5,20 @@ adduser.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
adduser.o: ../core/error.h ../core/log.h ../core/dircontainer.h
adduser.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
adduser.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
adduser.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
adduser.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
adduser.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
adduser.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
adduser.o: ../core/notify.h ../templatesnotify/templatesnotify.h
adduser.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
adduser.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
adduser.o: ../core/system.h
adduser.o: ../core/rebus.h ../core/config.h ../core/confparser.h
adduser.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
adduser.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
adduser.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
adduser.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
adduser.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
adduser.o: ../core/mount.h ../core/locale.h ../templates/misc.h
adduser.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
cat.o: cat.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
cat.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
cat.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
cat.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
cat.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
cat.o: ../core/compress.h ../core/acceptencodingparser.h
cat.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
cat.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
cat.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
cat.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
cat.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
cat.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -35,9 +31,7 @@ chmod.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
chmod.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
chmod.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
chmod.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
chmod.o: ../core/compress.h ../core/acceptencodingparser.h
chmod.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
chmod.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
chmod.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
chmod.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
chmod.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
chmod.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -50,9 +44,7 @@ chown.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
chown.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
chown.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
chown.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
chown.o: ../core/compress.h ../core/acceptencodingparser.h
chown.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
chown.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
chown.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
chown.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
chown.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
chown.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -65,13 +57,11 @@ ckeditor.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
ckeditor.o: ../core/error.h ../core/log.h ../core/dircontainer.h
ckeditor.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
ckeditor.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
ckeditor.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
ckeditor.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
ckeditor.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
ckeditor.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
ckeditor.o: ../core/request.h ../core/mounts.h ../core/mount.h
ckeditor.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
ckeditor.o: ../core/loadavg.h ../core/notify.h
ckeditor.o: ../core/rebus.h ../core/config.h ../core/confparser.h
ckeditor.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
ckeditor.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
ckeditor.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
ckeditor.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
ckeditor.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
ckeditor.o: ../core/mount.h ../core/locale.h ../templates/misc.h
ckeditor.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@@ -85,26 +75,27 @@ cp.o: cp.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
cp.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
cp.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
cp.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
cp.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
cp.o: ../core/compress.h ../core/acceptencodingparser.h
cp.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
cp.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
cp.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
cp.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
cp.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
cp.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
cp.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
cp.o: ../core/mounts.h ../core/mount.h ../core/users.h
cp.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
cp.o: ../core/notify.h ../templatesnotify/templatesnotify.h
cp.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
cp.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
cp.o: ../core/system.h ../core/misc.h
cp.o: ../core/system.h ../core/misc.h functions.h functionparser.h adduser.h
cp.o: cat.h chmod.h privchanger.h chown.h ckeditor.h createthread.h
cp.o: createticket.h default.h download.h editticket.h emacs.h last.h login.h
cp.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
cp.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h tinymce.h
cp.o: uname.h upload.h uptime.h who.h
createthread.o: createthread.h functionbase.h ../core/item.h ../core/db.h
createthread.o: ../core/item.h ../core/user.h ../core/group.h
createthread.o: ../core/thread.h ../core/error.h ../core/log.h
createthread.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
createthread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
createthread.o: ../core/plugindata.h ../core/rebus.h ../core/compress.h
createthread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
createthread.o: ../core/htmlfilter.h ../core/postmultiparser.h
createthread.o: ../core/config.h ../core/confparser.h ../core/config.h
createthread.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
createthread.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
createthread.o: ../core/system.h ../core/dirs.h ../core/db.h
createthread.o: ../core/request.h ../core/mounts.h ../core/mount.h
createthread.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
@@ -123,10 +114,8 @@ createticket.o: ../core/item.h ../core/user.h ../core/group.h
createticket.o: ../core/thread.h ../core/error.h ../core/log.h
createticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
createticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h
createticket.o: ../core/plugindata.h ../core/rebus.h ../core/compress.h
createticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
createticket.o: ../core/htmlfilter.h ../core/postmultiparser.h
createticket.o: ../core/config.h ../core/confparser.h ../core/config.h
createticket.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
createticket.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
createticket.o: ../core/system.h ../core/dirs.h ../core/db.h
createticket.o: ../core/request.h ../core/mounts.h ../core/mount.h
createticket.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
@@ -145,28 +134,24 @@ default.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
default.o: ../core/error.h ../core/log.h ../core/dircontainer.h
default.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
default.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
default.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
default.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
default.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
default.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
default.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
default.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
default.o: ../core/notify.h ../templatesnotify/templatesnotify.h
default.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
default.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
default.o: ../core/system.h
default.o: ../core/rebus.h ../core/config.h ../core/confparser.h
default.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
default.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
default.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
default.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
default.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
default.o: ../core/mount.h ../core/locale.h ../templates/misc.h
default.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
download.o: download.h functionbase.h ../core/item.h ../core/db.h
download.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
download.o: ../core/error.h ../core/log.h ../core/dircontainer.h
download.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
download.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
download.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
download.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
download.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
download.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
download.o: ../core/request.h ../core/mounts.h ../core/mount.h
download.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
download.o: ../core/loadavg.h ../core/notify.h
download.o: ../core/rebus.h ../core/config.h ../core/confparser.h
download.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
download.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
download.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
download.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
download.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
download.o: ../core/mount.h ../core/locale.h ../templates/misc.h
download.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@@ -175,10 +160,8 @@ editticket.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
editticket.o: ../core/error.h ../core/log.h ../core/dircontainer.h
editticket.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
editticket.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
editticket.o: ../core/rebus.h ../core/compress.h
editticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
editticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
editticket.o: ../core/confparser.h ../core/config.h ../core/system.h
editticket.o: ../core/rebus.h ../core/config.h ../core/confparser.h
editticket.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
editticket.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
editticket.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
editticket.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
@@ -197,9 +180,7 @@ emacs.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
emacs.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
emacs.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
emacs.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
emacs.o: ../core/compress.h ../core/acceptencodingparser.h
emacs.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
emacs.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
emacs.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
emacs.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
emacs.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
emacs.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -221,32 +202,27 @@ functionbase.o: ../core/user.h ../core/group.h ../core/thread.h
functionbase.o: ../core/error.h ../core/log.h ../core/dircontainer.h
functionbase.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
functionbase.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
functionbase.o: ../core/rebus.h ../core/compress.h
functionbase.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
functionbase.o: ../core/htmlfilter.h ../core/postmultiparser.h
functionbase.o: ../core/config.h ../core/confparser.h ../core/config.h
functionbase.o: ../core/system.h ../core/dirs.h ../core/db.h
functionbase.o: ../core/request.h ../core/mounts.h ../core/mount.h
functionbase.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
functionbase.o: ../core/loadavg.h ../core/notify.h
functionbase.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
functionbase.o: ../core/mount.h ../core/locale.h ../templates/misc.h
functionbase.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
functionbase.o: functions.h functionparser.h adduser.h cat.h chmod.h
functionbase.o: privchanger.h chown.h ckeditor.h cp.h createthread.h
functionbase.o: createticket.h default.h download.h editticket.h emacs.h
functionbase.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h
functionbase.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h
functionbase.o: funticket.h ../core/ticket.h tinymce.h uname.h upload.h
functionbase.o: uptime.h who.h
functionbase.o: ../core/rebus.h ../core/config.h ../core/confparser.h
functionbase.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
functionbase.o: ../core/dirs.h ../core/db.h ../core/request.h
functionbase.o: ../core/mounts.h ../core/mount.h ../core/users.h
functionbase.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
functionbase.o: ../core/notify.h ../templatesnotify/templatesnotify.h
functionbase.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
functionbase.o: ../templates/misc.h ../templates/localefilter.h
functionbase.o: ../core/locale.h ../core/system.h functions.h
functionbase.o: functionparser.h adduser.h cat.h chmod.h privchanger.h
functionbase.o: chown.h ckeditor.h cp.h createthread.h createticket.h
functionbase.o: default.h download.h editticket.h emacs.h last.h login.h
functionbase.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h
functionbase.o: subject.h funthread.h ../core/thread.h funticket.h
functionbase.o: ../core/ticket.h tinymce.h uname.h upload.h uptime.h who.h
functionparser.o: functionparser.h ../core/request.h ../core/requesttypes.h
functionparser.o: ../core/session.h ../core/item.h ../core/error.h
functionparser.o: ../core/log.h ../core/user.h ../core/plugindata.h
functionparser.o: ../core/rebus.h ../core/compress.h
functionparser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
functionparser.o: ../core/htmlfilter.h ../core/postmultiparser.h
functionparser.o: ../core/config.h ../core/confparser.h ../core/db.h
functionparser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
functionparser.o: ../core/rebus.h ../core/config.h ../core/confparser.h
functionparser.o: ../core/htmlfilter.h ../core/db.h ../core/group.h
functionparser.o: ../core/thread.h ../core/dircontainer.h
functionparser.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
functionparser.o: ../core/dirs.h ../core/db.h ../core/request.h
functionparser.o: ../core/mounts.h ../core/mount.h ../core/users.h
@@ -267,10 +243,8 @@ functions.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
functions.o: ../core/error.h ../core/log.h ../core/dircontainer.h
functions.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
functions.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
functions.o: ../core/rebus.h ../core/compress.h
functions.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
functions.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
functions.o: ../core/confparser.h ../core/config.h ../core/system.h
functions.o: ../core/rebus.h ../core/config.h ../core/confparser.h
functions.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
functions.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
functions.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
functions.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
@@ -293,10 +267,8 @@ funthread.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
funthread.o: ../core/error.h ../core/log.h ../core/dircontainer.h
funthread.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
funthread.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
funthread.o: ../core/rebus.h ../core/compress.h
funthread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
funthread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
funthread.o: ../core/confparser.h ../core/config.h ../core/system.h
funthread.o: ../core/rebus.h ../core/config.h ../core/confparser.h
funthread.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
funthread.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
funthread.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
funthread.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
@@ -309,10 +281,8 @@ funticket.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
funticket.o: ../core/error.h ../core/log.h ../core/dircontainer.h
funticket.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
funticket.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
funticket.o: ../core/rebus.h ../core/compress.h
funticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
funticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
funticket.o: ../core/confparser.h ../core/config.h ../core/system.h
funticket.o: ../core/rebus.h ../core/config.h ../core/confparser.h
funticket.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
funticket.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
funticket.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
funticket.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
@@ -325,9 +295,7 @@ last.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
last.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
last.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
last.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
last.o: ../core/compress.h ../core/acceptencodingparser.h
last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
last.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
last.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
last.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
last.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
last.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -340,9 +308,7 @@ login.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
login.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
login.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
login.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
login.o: ../core/compress.h ../core/acceptencodingparser.h
login.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
login.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
login.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
login.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
login.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
login.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -355,9 +321,7 @@ logout.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
logout.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
logout.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
logout.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
logout.o: ../core/compress.h ../core/acceptencodingparser.h
logout.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
logout.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
logout.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
logout.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
logout.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
logout.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -369,12 +333,10 @@ ls.o: ls.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
ls.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
ls.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
ls.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
ls.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
ls.o: ../core/compress.h ../core/acceptencodingparser.h
ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
ls.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
ls.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
ls.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
ls.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
ls.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
ls.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
ls.o: ../core/mounts.h ../core/mount.h ../core/users.h
ls.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
ls.o: ../core/notify.h ../templatesnotify/templatesnotify.h
ls.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
@@ -385,9 +347,7 @@ mkdir.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
mkdir.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
mkdir.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
mkdir.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
mkdir.o: ../core/compress.h ../core/acceptencodingparser.h
mkdir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
mkdir.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
mkdir.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
mkdir.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
mkdir.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
mkdir.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -404,25 +364,26 @@ mv.o: mv.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
mv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
mv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
mv.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
mv.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
mv.o: ../core/compress.h ../core/acceptencodingparser.h
mv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
mv.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
mv.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
mv.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
mv.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
mv.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
mv.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
mv.o: ../core/mounts.h ../core/mount.h ../core/users.h
mv.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
mv.o: ../core/notify.h ../templatesnotify/templatesnotify.h
mv.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
mv.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
mv.o: ../core/system.h
mv.o: ../core/system.h functions.h functionparser.h adduser.h cat.h chmod.h
mv.o: privchanger.h chown.h ckeditor.h cp.h createthread.h createticket.h
mv.o: default.h download.h editticket.h emacs.h last.h login.h logout.h ls.h
mv.o: mkdir.h node.h priv.h reload.h rm.h run.h subject.h funthread.h
mv.o: ../core/thread.h funticket.h ../core/ticket.h tinymce.h uname.h
mv.o: upload.h uptime.h who.h
node.o: node.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
node.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
node.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
node.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
node.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
node.o: ../core/compress.h ../core/acceptencodingparser.h
node.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
node.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
node.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
node.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
node.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
node.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -435,9 +396,7 @@ priv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
priv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
priv.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
priv.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
priv.o: ../core/compress.h ../core/acceptencodingparser.h
priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
priv.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
priv.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
priv.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
priv.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
priv.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -448,21 +407,17 @@ priv.o: ../core/system.h privchanger.h
privchanger.o: privchanger.h ../core/request.h ../core/requesttypes.h
privchanger.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
privchanger.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
privchanger.o: ../core/compress.h ../core/acceptencodingparser.h
privchanger.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
privchanger.o: ../core/postmultiparser.h ../core/config.h
privchanger.o: ../core/confparser.h ../core/system.h ../core/dirs.h
privchanger.o: ../core/dircontainer.h ../core/db.h ../core/request.h
privchanger.o: ../core/mounts.h ../core/mount.h ../core/users.h
privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
privchanger.o: ../core/group.h ../core/loadavg.h ../core/db.h
privchanger.o: ../core/thread.h ../core/ticket.h
privchanger.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
privchanger.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
privchanger.o: ../core/db.h ../core/request.h ../core/mounts.h
privchanger.o: ../core/mount.h ../core/users.h ../core/ugcontainer.h
privchanger.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
privchanger.o: ../core/loadavg.h ../core/db.h ../core/thread.h
privchanger.o: ../core/ticket.h
readticket.o: readticket.h ../core/request.h ../core/requesttypes.h
readticket.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
readticket.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
readticket.o: ../core/compress.h ../core/acceptencodingparser.h
readticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
readticket.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
readticket.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
readticket.o: ../core/ticket.h ../core/system.h ../core/dirs.h
readticket.o: ../core/dircontainer.h ../core/db.h ../core/request.h
readticket.o: ../core/mounts.h ../core/mount.h ../core/users.h
@@ -473,9 +428,7 @@ reload.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
reload.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
reload.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
reload.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
reload.o: ../core/compress.h ../core/acceptencodingparser.h
reload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
reload.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
reload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
reload.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
reload.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
reload.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -491,12 +444,10 @@ rm.o: rm.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
rm.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
rm.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
rm.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
rm.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
rm.o: ../core/compress.h ../core/acceptencodingparser.h
rm.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
rm.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
rm.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
rm.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
rm.o: ../core/session.h ../core/plugindata.h ../core/rebus.h ../core/config.h
rm.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
rm.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
rm.o: ../core/mounts.h ../core/mount.h ../core/users.h
rm.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
rm.o: ../core/notify.h ../templatesnotify/templatesnotify.h
rm.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
@@ -517,9 +468,7 @@ run.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
run.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
run.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
run.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
run.o: ../core/compress.h ../core/acceptencodingparser.h
run.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
run.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
run.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
run.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
run.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
run.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -532,44 +481,39 @@ subject.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
subject.o: ../core/error.h ../core/log.h ../core/dircontainer.h
subject.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
subject.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
subject.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
subject.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
subject.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
subject.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
subject.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
subject.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
subject.o: ../core/notify.h ../templatesnotify/templatesnotify.h
subject.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
subject.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
subject.o: ../core/system.h
subject.o: ../core/rebus.h ../core/config.h ../core/confparser.h
subject.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
subject.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
subject.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
subject.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
subject.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
subject.o: ../core/mount.h ../core/locale.h ../templates/misc.h
subject.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
tinymce.o: tinymce.h functionbase.h ../core/item.h ../core/db.h
tinymce.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
tinymce.o: ../core/error.h ../core/log.h ../core/dircontainer.h
tinymce.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
tinymce.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
tinymce.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
tinymce.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
tinymce.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
tinymce.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
tinymce.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
tinymce.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
tinymce.o: ../core/notify.h ../templatesnotify/templatesnotify.h
tinymce.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
tinymce.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
tinymce.o: ../core/system.h functions.h functionparser.h adduser.h cat.h
tinymce.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h
tinymce.o: createticket.h default.h download.h editticket.h emacs.h last.h
tinymce.o: login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h
tinymce.o: run.h subject.h funthread.h ../core/thread.h funticket.h
tinymce.o: ../core/ticket.h uname.h upload.h uptime.h who.h
tinymce.o: ../core/rebus.h ../core/config.h ../core/confparser.h
tinymce.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
tinymce.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
tinymce.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
tinymce.o: ../core/groups.h ../core/loadavg.h ../core/notify.h
tinymce.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
tinymce.o: ../core/mount.h ../core/locale.h ../templates/misc.h
tinymce.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
tinymce.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h
tinymce.o: chown.h ckeditor.h cp.h createthread.h createticket.h default.h
tinymce.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h
tinymce.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
tinymce.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h uname.h
tinymce.o: upload.h uptime.h who.h
uname.o: uname.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
uname.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
uname.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
uname.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
uname.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
uname.o: ../core/compress.h ../core/acceptencodingparser.h
uname.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
uname.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
uname.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
uname.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
uname.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
uname.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -582,9 +526,7 @@ upload.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
upload.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
upload.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
upload.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/compress.h ../core/acceptencodingparser.h
upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
upload.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
upload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
upload.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
upload.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
upload.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -598,14 +540,12 @@ upload.o: editticket.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h
upload.o: node.h priv.h reload.h rm.h run.h subject.h funthread.h
upload.o: ../core/thread.h funticket.h ../core/ticket.h tinymce.h uname.h
upload.o: uptime.h who.h
uptime.o: uname.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
uptime.o: uptime.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
uptime.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
uptime.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
uptime.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
uptime.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/compress.h ../core/acceptencodingparser.h
uptime.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
uptime.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
uptime.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
uptime.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
uptime.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
uptime.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
@@ -618,9 +558,7 @@ who.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
who.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
who.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
who.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
who.o: ../core/compress.h ../core/acceptencodingparser.h
who.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
who.o: ../core/postmultiparser.h ../core/config.h ../core/confparser.h
who.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
who.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/db.h
who.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
who.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h

35
functions/adduser.cpp
View File

@@ -21,33 +21,27 @@ AddUser::AddUser()
}
bool AddUser::CheckAddUserVars(const std::string * login, const std::string * pass, const std::string * conf_pass)
bool AddUser::CheckAddUserVars(const std::string & login, const std::string & pass, const std::string & conf_pass)
{
if( !login || !pass || !conf_pass )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return false;
}
if( login->empty() )
if( login.empty() )
{
request->status = WINIX_ERR_LOGIN_EMPTY;
return false;
}
if( *pass != *conf_pass )
if( pass != conf_pass )
{
request->status = WINIX_ERR_PASSWORDS_DIFFERENT;
return false;
}
if( pass->size() < 5 )
if( pass.size() < config->password_min_size )
{
request->status = WINIX_ERR_PASSWORD_TOO_SHORT;
return false;
}
if( system->users.IsUser(*login) )
if( system->users.IsUser(login) )
{
request->status = WINIX_ERR_USER_EXISTS;
return false;
@@ -65,20 +59,17 @@ void AddUser::MakePost()
{
User user;
std::string * login = request->PostVar("login");
std::string * pass = request->PostVar("password");
std::string * conf_pass = request->PostVar("confirmpassword");
std::string * email = request->PostVar("email");
const std::string & login = request->PostVar("login");
const std::string & pass = request->PostVar("password");
const std::string & conf_pass = request->PostVar("confirmpassword");
if( !CheckAddUserVars(login, pass, conf_pass) )
return;
user.name = *login;
user.name = login;
user.email = request->PostVar("email");
if( email )
user.email = *email;
request->status = db->AddUser(user, *pass);
request->status = db->AddUser(user, pass);
if( request->status == WINIX_ERR_OK )
{
@@ -87,11 +78,11 @@ User user;
if( !request->session->puser )
system->users.LoginUser(user.id, false);
log << log2 << "Content: added a new user: " << user.name << logend;
log << log2 << "Adduser: added a new user: " << user.name << logend;
}
else
{
log << log1 << "Content: I can't add to system->users: " << user.name
log << log1 << "Adduser: I can't add to system->users: " << user.name
<< " but the user was added to the db correctly" << logend;
}

2
functions/adduser.h
View File

@@ -27,7 +27,7 @@ public:
private:
bool CheckAddUserVars(const std::string * login, const std::string * pass, const std::string * conf_pass);
bool CheckAddUserVars(const std::string & login, const std::string & pass, const std::string & conf_pass);
};

16
functions/cp.cpp
View File

@@ -10,7 +10,7 @@
#include <errno.h>
#include "cp.h"
#include "core/misc.h"
#include "functions.h"
namespace Fun
@@ -67,15 +67,7 @@ return true;
bool Cp::ParseDir(long & dir_id, std::string & dir, std::string & file)
{
std::string * move_to = request->PostVar("to");
if( !move_to )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return false;
}
int res = system->dirs.AnalyzePath(*move_to, dir_id, dir, file);
int res = system->dirs.AnalyzePath(request->PostVar("to"), dir_id, dir, file);
if( res == 1 )
request->status = WINIX_ERR_NO_ROOT_DIR;
@@ -193,7 +185,7 @@ long Cp::CpDir(const Item & item, long dst_dir_id)
{
cp_temp.url = mv_file;
mv_file.clear();
system->PrepareUrl(cp_temp);
functions->PrepareUrl(cp_temp);
}
if( !cp_preserve_attr )
@@ -240,7 +232,7 @@ void Cp::CpItemCheck(Item & item, bool redirect)
if( !mv_file.empty() )
{
item.url = mv_file;
system->PrepareUrl(item);
functions->PrepareUrl(item);
}
CpItem(item, mv_dir_id);

6
functions/default.cpp
View File

@@ -25,13 +25,13 @@ long Default::PostFunDefaultParsePath()
Item * pdir, * pdir2;
long defaultid = -1;
std::string * path = request->PostVar("defaultitem");
const std::string & path = request->PostVar("defaultitem");
if( path && !path->empty() )
if( !path.empty() )
{
std::string dir, file;
Dirs::SplitPath(*path, dir, file);
Dirs::SplitPath(path, dir, file);
pdir = system->dirs.GetDir(dir);

2
functions/editticket.cpp
View File

@@ -72,7 +72,7 @@ void EditTicket::EditTicketCheckFirstItem()
item.type = Item::file;
item.privileges = 0644; // !! tymczasowo
functions->SetUser(item);
system->PrepareUrl(item);
functions->PrepareUrl(item);
request->status = db->AddItem(item);

7
functions/emacs.cpp
View File

@@ -123,14 +123,17 @@ void Emacs::MakePost()
}
else
{
system->EditFile(request->item, edit_with_url);
// !! moze dodac metode EditFile w klasie functions?
// i ona wywola system->EditFile i poniszego updatera
if( system->EditFile(request->item, edit_with_url) == WINIX_ERR_OK )
TemplatesFunctions::pattern_cacher.UpdatePattern(request->item);
}
if( request->status == WINIX_ERR_OK )
{
PostFunEmacsModifyMountPoint(adding);
system->CheckSpecialFile(request->item);
functions->CheckSpecialFile(request->item);
}
else
{

67
functions/functions.cpp
View File

@@ -58,6 +58,56 @@ return i->second;
}
void Functions::PrepareUrl(Item & item)
{
TrimWhite(item.url);
if( item.url.empty() )
item.url = item.subject; // if the subject is empty then the url will be corrected by CorrectUrlOnlyAllowedChar()
CorrectUrlOnlyAllowedChar(item.url);
if( Find(item.url) )
{
// the name provided by an user is the same as a name of a function
// we add one underscore character at the beginning
// names of functions should not begin with an underscore '_'
// and we can simply add one '_' at the beginning
// and the name will be unique
item.url.insert(item.url.begin(), '_');
}
}
Error Functions::CheckSpecialFile(const Item & item)
{
static std::string fstab = "fstab";
Item * etc = system->dirs.GetEtcDir();
if( !etc )
return WINIX_NOTHING_TO_DO;
if( item.parent_id != etc->id )
return WINIX_NOTHING_TO_DO;
if( item.url == fstab )
{
log << log3 << "Functions: reloading mount points" << logend;
Error status = system->mounts.ReadMounts(item.content);
templates->ReadNewIndexTemplates();
return status;
}
return WINIX_NOTHING_TO_DO;
}
void Functions::SetObjects(FunctionBase * fun)
{
fun->SetConfig(config);
@@ -299,25 +349,26 @@ bool Functions::ReadItemUrlSubject(Item & item, Item::Type item_type)
{
bool with_url = false;
std::string * new_url = request->PostVar("url");
std::string * new_subject = request->PostVar("subject");
const std::string & new_url = request->PostVar("url");
const std::string & new_subject = request->PostVar("subject");
if( item_type == Item::file )
{
if( !request->is_item || (new_url && *new_url != item.url) )
if( !request->is_item || new_url != item.url )
with_url = true;
}
else
{
// !! dla katalogow zawsze ma modyfikowac url?
with_url = true;
}
if( new_url )
item.url = *new_url;
if( !new_url.empty() )
item.url = new_url;
if( new_subject )
item.subject = *new_subject;
if( !new_subject.empty() )
item.subject = new_subject;
if( item.subject.empty() )
@@ -328,7 +379,7 @@ bool Functions::ReadItemUrlSubject(Item & item, Item::Type item_type)
}
// if item.url is empty then it will be set from item.subject
system->PrepareUrl(item);
PrepareUrl(item);
return with_url;
}

2
functions/functions.h
View File

@@ -102,6 +102,8 @@ public:
void SetNotify(Notify * pnotify);
FunctionBase * Find(const std::string & function_name);
Error CheckSpecialFile(const Item & item);
void PrepareUrl(Item & item);
void SetDefaultFunction();
void CheckGetPostTimes(time_t difference = 10);

10
functions/login.cpp
View File

@@ -22,13 +22,13 @@ Login::Login()
void Login::MakePost()
{
std::string * login = request->PostVar("login");
std::string * pass = request->PostVar("password");
std::string * remem = request->PostVar("rememberme");
const std::string & login = request->PostVar("login");
const std::string & pass = request->PostVar("password");
const std::string & remem = request->PostVar("rememberme");
long user_id;
if( login && pass && db->CheckUser(*login, *pass, user_id) )
system->users.LoginUser(user_id, remem != 0);
if( db->CheckUser(login, pass, user_id) )
system->users.LoginUser(user_id, !remem.empty());
// !! moze zglosic komunikat o nie poprawnym logowaniu

19
functions/mv.cpp
View File

@@ -7,10 +7,9 @@
*
*/
// !! potrzebne errno?
#include <errno.h>
#include "mv.h"
#include "functions.h"
namespace Fun
@@ -34,7 +33,7 @@ Item * last_but_one = 0;
if( request->method != Request::post )
{
// used in GET (HEAD in the future?)
// used in GET or HEAD
if( !system->HasWriteAccess(*last) &&
(!last_but_one || !system->HasWriteAccess(*last_but_one)) )
@@ -134,15 +133,7 @@ return true;
bool Mv::MoveParseDir(long & dir_id, std::string & dir, std::string & file)
{
std::string * move_to = request->PostVar("to");
if( !move_to )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return false;
}
int res = system->dirs.AnalyzePath(*move_to, dir_id, dir, file);
int res = system->dirs.AnalyzePath(request->PostVar("to"), dir_id, dir, file);
if( res == 1 )
request->status = WINIX_ERR_NO_ROOT_DIR;
@@ -209,7 +200,7 @@ void Mv::MoveFile(Item & item, bool redirect)
if( !mv_file.empty() )
{
item.url = mv_file;
system->PrepareUrl(item);
functions->PrepareUrl(item);
}
item.parent_id = mv_dir_id;
@@ -313,7 +304,7 @@ void Mv::MoveDir(Item & item, bool redirect)
if( !mv_file.empty() )
{
item.url = mv_file;
system->PrepareUrl(item);
functions->PrepareUrl(item);
}
request->status = db->EditParentUrlById(item, item.id);

38
functions/privchanger.cpp
View File

@@ -207,45 +207,28 @@ void PrivChanger::PrivDir(long parent_id)
}
bool PrivChanger::ReadPriv(const char * user_in, const char * group_in, const char * priv_in,
void PrivChanger::ReadPriv(const char * user_in, const char * group_in, const char * priv_in,
long & user_id, long & group_id, int & priv)
{
std::string * user_str = request->PostVar(user_in);
std::string * group_str = request->PostVar(group_in);
std::string * priv_str = request->PostVar(priv_in);
if( change_owner && (!user_str || !group_str) )
{
log << log1 << "Content: PostFunPriv: there is no some post variables for changing the owner" << logend;
return false;
}
if( change_priv && !priv_str )
{
log << log1 << "Content: PostFunPriv: there is no some post variables for changing privileges" << logend;
return false;
}
const std::string & user_str = request->PostVar(user_in);
const std::string & group_str = request->PostVar(group_in);
const std::string & priv_str = request->PostVar(priv_in);
if( change_owner )
{
user_id = system->users.GetUserId( *user_str );
group_id = system->groups.GetGroupId( *group_str );
user_id = system->users.GetUserId( user_str );
group_id = system->groups.GetGroupId( group_str );
}
if( change_priv )
priv = strtol( priv_str->c_str() , 0, 8);
return true;
priv = strtol(priv_str.c_str(), 0, 8);
}
void PrivChanger::PrivDir()
{
if( !ReadPriv("userfile", "groupfile", "privilegesfile", user_id_file, group_id_file, priv_file) )
return;
if( !ReadPriv("userdir", "groupdir", "privilegesdir", user_id_dir, group_id_dir, priv_dir) )
return;
ReadPriv("userfile", "groupfile", "privilegesfile", user_id_file, group_id_file, priv_file);
ReadPriv("userdir", "groupdir", "privilegesdir", user_id_dir, group_id_dir, priv_dir);
PrivLogStart("Content: changes for files: ", user_id_file, group_id_file, priv_file);
PrivLogStart("Content: changes for dirs: ", user_id_dir, group_id_dir, priv_dir);
@@ -272,8 +255,7 @@ void PrivChanger::PrivDir()
// changing only one item (either a dir or file)
void PrivChanger::PrivOneItem()
{
if( !ReadPriv("user", "group", "privileges", user_id_file, group_id_file, priv_file) )
return;
ReadPriv("user", "group", "privileges", user_id_file, group_id_file, priv_file);
PrivLogStart("Content: changes: ", user_id_file, group_id_file, priv_file);

2
functions/privchanger.h
View File

@@ -46,7 +46,7 @@ private:
void PrivLog(const char * what, long id, const std::string & url);
void PrivFilesInDir(long parent_id);
void PrivDir(long parent_id);
bool ReadPriv(const char * user_in, const char * group_in, const char * priv_in,
void ReadPriv(const char * user_in, const char * group_in, const char * priv_in,
long & user_id, long & group_id, int & priv);
void PrivDir();
void PrivOneItem();

12
functions/upload.cpp
View File

@@ -155,7 +155,7 @@ void Upload::UploadMulti()
request->item.url = file_name;
request->item.auth = SelectFileType(file_name);
system->PrepareUrl(request->item);
functions->PrepareUrl(request->item);
request->status = system->AddFile(request->item);
if( !UploadCreatePath() )
@@ -174,10 +174,10 @@ void Upload::UploadMulti()
void Upload::UploadSingle()
{
std::string * new_subject = request->PostVar("subject");
std::string * new_url = request->PostVar("url");
bool has_subject = (new_subject && (*new_subject)[0] != 0 );
bool has_url = (new_url && (*new_url)[0] != 0 );
const std::string & new_subject = request->PostVar("subject");
const std::string & new_url = request->PostVar("url");
bool has_subject = !new_subject.empty();
bool has_url = !new_url.empty(); //(new_url && (*new_url)[0] != 0 );
functions->ReadItem(request->item, Item::file); // ReadItem() changes the url if it is empty
functions->SetUser(request->item);
@@ -192,7 +192,7 @@ void Upload::UploadSingle()
if( !has_url )
{
request->item.url = file_name;
system->PrepareUrl(request->item);
functions->PrepareUrl(request->item);
}
request->status = system->AddFile(request->item);