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

fixed: UGContainer<Type> used a std::vector<Type> and when a new item was inserted

Browse Source 
then current iterators (and pointers) were invalidated
         now we are using std::vector<Type*>
         this caused some crashes when a new user was added by 'adduser' winix function
added:   plugin 'export' is able to upload files on a remote server now
         (not finished yet)
changed: Thumb class is now called: Image
         and we are able to resize images too
         (some new options in the config and in mount points)
added:   some new plugin messages



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@764 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2011-09-13 06:08:34 +00:00
parent 72be443414
commit 39923d6617
58 changed files with 2258 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
functions/Makefile.dep
View File

@@ -27,7 +27,7 @@ adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
adduser.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
adduser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
adduser.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
adduser.o: ../core/slog.h
cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
@@ -56,7 +56,7 @@ cat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
cat.o: ../core/lastcontainer.h ../templates/misc.h
cat.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
cat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
cat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
cat.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
cat.o: ../core/threadmanager.h ../core/synchro.h
chmod.o: chmod.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -84,7 +84,7 @@ chmod.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
chmod.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
chmod.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
chmod.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
chmod.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
chmod.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
chmod.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -112,7 +112,7 @@ chown.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
chown.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
chown.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
chown.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
chown.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
chown.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
chown.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h
ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
@@ -144,7 +144,7 @@ ckeditor.o: ../core/lastcontainer.h ../templates/misc.h
ckeditor.o: ../templates/htmltextstream.h ../core/mounts.h
ckeditor.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
ckeditor.o: ../core/groups.h ../core/group.h ../core/loadavg.h
ckeditor.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
ckeditor.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
ckeditor.o: ../core/synchro.h
cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
@@ -172,8 +172,14 @@ cp.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
cp.o: ../core/lastcontainer.h ../templates/misc.h
cp.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
cp.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
cp.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
cp.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
cp.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h
cp.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h
cp.o: ../core/sessionmanager.h ../core/sessioncontainer.h
cp.o: ../functions/functions.h ../templates/templates.h
cp.o: ../templates/patterncacher.h ../templates/indexpatterns.h
cp.o: ../templates/patterns.h ../templates/changepatterns.h
cp.o: ../core/sessionmanager.h
default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
default.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -201,7 +207,7 @@ default.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
default.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
default.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
default.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
default.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
default.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
download.o: download.h functionbase.h ../core/item.h ../db/db.h
download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
@@ -233,7 +239,7 @@ download.o: ../core/lastcontainer.h ../templates/misc.h
download.o: ../templates/htmltextstream.h ../core/mounts.h
download.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
download.o: ../core/groups.h ../core/group.h ../core/loadavg.h
download.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
download.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
download.o: ../core/synchro.h
emacs.o: emacs.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -261,12 +267,11 @@ emacs.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
emacs.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
emacs.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
emacs.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
emacs.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
emacs.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
emacs.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
emacs.o: ../templates/templates.h ../templates/patterncacher.h
emacs.o: ../templates/indexpatterns.h ../templates/patterns.h
emacs.o: ../templates/changepatterns.h ../core/sessionmanager.h
emacs.o: ../core/sessioncontainer.h ../core/system.h
functionbase.o: functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
functionbase.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -298,7 +303,7 @@ functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h
functionbase.o: ../templates/misc.h ../templates/htmltextstream.h
functionbase.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
functionbase.o: ../core/users.h ../core/groups.h ../core/group.h
functionbase.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
functionbase.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
functionbase.o: ../core/threadmanager.h ../core/synchro.h
functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
@@ -331,7 +336,7 @@ functionparser.o: ../core/ugcontainer.h ../core/lastcontainer.h
functionparser.o: ../templates/misc.h ../templates/htmltextstream.h
functionparser.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
functionparser.o: ../core/users.h ../core/groups.h ../core/group.h
functionparser.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
functionparser.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
functionparser.o: ../core/threadmanager.h ../core/synchro.h ../core/cur.h
functionparser.o: ../core/log.h
functions.o: functions.h functionbase.h ../core/item.h ../db/db.h
@@ -358,7 +363,7 @@ functions.o: ../core/ugcontainer.h ../core/lastcontainer.h
functions.o: ../templates/misc.h ../templates/htmltextstream.h
functions.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h run.h
functions.o: ../core/users.h ../core/groups.h ../core/group.h
functions.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
functions.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
functions.o: ../core/threadmanager.h ../core/synchro.h functionparser.h
functions.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h
functions.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h
@@ -398,7 +403,7 @@ last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
last.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
last.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
last.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
ln.o: ln.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
ln.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
@@ -426,7 +431,7 @@ ln.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
ln.o: ../core/lastcontainer.h ../templates/misc.h
ln.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
ln.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
ln.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
ln.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
ln.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h
ln.o: ../functions/functions.h
login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
@@ -455,7 +460,7 @@ login.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
login.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
login.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
login.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
login.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -484,7 +489,7 @@ logout.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
logout.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
logout.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
logout.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
logout.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
logout.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
logout.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
@@ -512,7 +517,7 @@ ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
ls.o: ../core/lastcontainer.h ../templates/misc.h
ls.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
ls.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
ls.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
ls.o: ../core/threadmanager.h ../core/synchro.h
mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -540,7 +545,7 @@ mkdir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
mkdir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
mkdir.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
mkdir.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
mkdir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
mkdir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
mkdir.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
mount.o: mount.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -568,7 +573,7 @@ mount.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
mount.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
mount.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
mount.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
@@ -596,8 +601,13 @@ mv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
mv.o: ../core/lastcontainer.h ../templates/misc.h
mv.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
mv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
mv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
mv.o: ../core/threadmanager.h ../core/synchro.h
mv.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
mv.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h
mv.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h
mv.o: ../core/sessioncontainer.h ../functions/functions.h
mv.o: ../templates/templates.h ../templates/patterncacher.h
mv.o: ../templates/indexpatterns.h ../templates/patterns.h
mv.o: ../templates/changepatterns.h ../core/sessionmanager.h
nicedit.o: nicedit.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
nicedit.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
nicedit.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -625,7 +635,7 @@ nicedit.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
nicedit.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
nicedit.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
nicedit.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
nicedit.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
nicedit.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
nicedit.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
node.o: node.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -653,7 +663,7 @@ node.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
node.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
node.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
node.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
node.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
node.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
passwd.o: passwd.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
passwd.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -682,7 +692,7 @@ passwd.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
passwd.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
passwd.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
passwd.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
passwd.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
passwd.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
passwd.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
passwd.o: ../core/slog.h ../functions/functions.h
priv.o: priv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
@@ -711,7 +721,7 @@ priv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
priv.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
priv.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
priv.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
privchanger.o: privchanger.h ../core/request.h ../core/system.h
privchanger.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
@@ -743,7 +753,7 @@ privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h
privchanger.o: ../templates/misc.h ../templates/htmltextstream.h
privchanger.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
privchanger.o: ../core/users.h ../core/groups.h ../core/group.h
privchanger.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
privchanger.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
privchanger.o: ../core/threadmanager.h
reload.o: reload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -772,12 +782,11 @@ reload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
reload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
reload.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
reload.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
reload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
reload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
reload.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
reload.o: ../templates/templates.h ../templates/patterncacher.h
reload.o: ../templates/indexpatterns.h ../templates/patterns.h
reload.o: ../templates/changepatterns.h ../core/sessionmanager.h
reload.o: ../core/sessioncontainer.h ../core/system.h
rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
rm.o: ../core/item.h ../core/requesttypes.h ../core/error.h
@@ -804,7 +813,7 @@ rm.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
rm.o: ../core/lastcontainer.h ../templates/misc.h
rm.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
rm.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
rm.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
rm.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
rm.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h
rm.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h
rm.o: ../core/sessioncontainer.h ../functions/functions.h
@@ -837,7 +846,7 @@ run.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
run.o: ../core/lastcontainer.h ../templates/misc.h
run.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
run.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
run.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
run.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
run.o: ../core/threadmanager.h ../core/synchro.h
sort.o: sort.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
sort.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -865,8 +874,14 @@ sort.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
sort.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
sort.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
sort.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
sort.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
sort.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
sort.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
sort.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h
sort.o: ../core/sessionmanager.h ../core/sessioncontainer.h
sort.o: ../functions/functions.h ../templates/templates.h
sort.o: ../templates/patterncacher.h ../templates/indexpatterns.h
sort.o: ../templates/patterns.h ../templates/changepatterns.h
sort.o: ../core/sessionmanager.h
specialdefault.o: specialdefault.h functionbase.h ../core/item.h ../db/db.h
specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
specialdefault.o: ../core/textstream.h ../core/misc.h ../core/item.h
@@ -899,7 +914,7 @@ specialdefault.o: ../core/lastcontainer.h ../templates/misc.h
specialdefault.o: ../templates/htmltextstream.h ../core/mounts.h
specialdefault.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
specialdefault.o: ../core/groups.h ../core/group.h ../core/loadavg.h
specialdefault.o: ../core/thumb.h ../core/basethread.h
specialdefault.o: ../core/image.h ../core/basethread.h
specialdefault.o: ../core/threadmanager.h ../core/synchro.h
stat.o: stat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -927,7 +942,7 @@ stat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
stat.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
stat.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
stat.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -956,7 +971,7 @@ subject.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
subject.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
subject.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
subject.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
subject.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
template.o: template.h functionbase.h ../core/item.h ../db/db.h
template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
@@ -988,7 +1003,7 @@ template.o: ../core/lastcontainer.h ../templates/misc.h
template.o: ../templates/htmltextstream.h ../core/mounts.h
template.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
template.o: ../core/groups.h ../core/group.h ../core/loadavg.h
template.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
template.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
template.o: ../core/synchro.h ../core/misc.h
tinymce.o: tinymce.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -1017,7 +1032,7 @@ tinymce.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
tinymce.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
tinymce.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
tinymce.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
tinymce.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
uname.o: uname.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -1045,7 +1060,7 @@ uname.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
uname.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
uname.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
uname.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
uname.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
uname.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
uname.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -1074,13 +1089,14 @@ upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
upload.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
upload.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
upload.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
upload.o: ../core/misc.h ../functions/functions.h ../templates/templates.h
upload.o: ../templates/patterncacher.h ../templates/indexpatterns.h
upload.o: ../templates/patterns.h ../templates/changepatterns.h
upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
upload.o: ../core/system.h
upload.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h
upload.o: ../core/system.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../functions/functions.h
upload.o: ../templates/templates.h ../templates/patterncacher.h
upload.o: ../templates/indexpatterns.h ../templates/patterns.h
upload.o: ../templates/changepatterns.h ../core/sessionmanager.h
uptime.o: uptime.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
uptime.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -1108,7 +1124,7 @@ uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
uptime.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
uptime.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
uptime.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
vim.o: vim.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
vim.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -1136,7 +1152,7 @@ vim.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
vim.o: ../core/lastcontainer.h ../templates/misc.h
vim.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
vim.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
vim.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
vim.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
vim.o: ../core/threadmanager.h ../core/synchro.h
who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
@@ -1164,5 +1180,5 @@ who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
who.o: ../core/lastcontainer.h ../templates/misc.h
who.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
who.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
who.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
who.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
who.o: ../core/threadmanager.h ../core/synchro.h

8
functions/cp.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2010, Tomasz Sowa
* Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved.
*
*/
@@ -10,6 +10,8 @@
#include "cp.h"
#include "core/misc.h"
#include "functions.h"
#include "core/plugin.h"
namespace Fun
@@ -141,13 +143,15 @@ void Cp::CopyFile(Item & item, long dst_dir_id)
if( !preserve_attr )
SetNewAttributes(item);
item.parent_id = dst_dir_id;
item.parent_id = dst_dir_id;
cur->request->status = db->AddItem(item);
if( cur->request->status == WINIX_ERR_OK )
{
if( item.file_type != WINIX_ITEM_FILETYPE_NONE )
CopyStaticFile(item);
plugin.Call(WINIX_FILE_COPIED, &item);
}
}

66
functions/mv.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2010, Tomasz Sowa
* Copyright (c) 2008-2011, Tomasz Sowa
* All rights reserved.
*
*/
@@ -10,6 +10,8 @@
#include <errno.h>
#include "mv.h"
#include "functions.h"
#include "core/plugin.h"
namespace Fun
@@ -179,6 +181,8 @@ bool res1, res2, res3, res4, res5;
void Mv::MoveFileOrSymlink(Item & item)
{
plugin.Call(WINIX_FILE_PREPARE_TO_MOVE, &item);
old_url = item.url;
if( !file.empty() )
@@ -204,6 +208,8 @@ void Mv::MoveFileOrSymlink(Item & item)
if( item.file_type != WINIX_ITEM_FILETYPE_NONE )
MoveStaticFile(item);
plugin.Call(WINIX_FILE_MOVED, &item);
}
}
@@ -235,39 +241,63 @@ void Mv::Prepare()
content_dir_iq.sel_url = true;
content_dir_iq.sel_file = true;
static_iq.SetAll(false, false);
static_iq.sel_parent_id = true;
static_iq.sel_type = true;
static_iq.sel_url = true;
static_iq.sel_file = true;
static_iq.WhereType(Item::file);
static_iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE, false);
files_iq.SetAll(false, false);
files_iq.sel_parent_id = true;
files_iq.sel_type = true;
files_iq.sel_url = true;
files_iq.sel_file = true;
files_iq.WhereType(Item::dir, false);
}
void Mv::Clear()
{
dir_tab.clear();
static_item_tab.clear();
files_item_tab.clear();
item_tab.clear();
}
void Mv::MoveFilesPrepareTree(const Item & dir)
{
// we only calling plugins here
// so if there is no WINIX_FILE_PREPARE_TO_MOVE message
// we can immediately return and the database will not be bothered
if( !plugin.HasMessage(WINIX_FILE_PREPARE_TO_MOVE) )
return;
void Mv::MoveStaticFilesTree(const Item & dir)
DirContainer::ParentIterator i = system->dirs.FindFirstChild(dir.id);
// go through all directories
for( ; i != system->dirs.ParentEnd() ; i = system->dirs.NextChild(i) )
MoveFilesPrepareTree(*(i->second));
files_iq.WhereParentId(dir.id);
db->GetItems(files_item_tab, files_iq);
for(size_t i=0 ; i<files_item_tab.size() ; ++i)
plugin.Call(WINIX_FILE_PREPARE_TO_MOVE, &files_item_tab[i]);
}
void Mv::MoveFilesTree(const Item & dir)
{
DirContainer::ParentIterator i = system->dirs.FindFirstChild(dir.id);
// go through all directories
for( ; i != system->dirs.ParentEnd() ; i = system->dirs.NextChild(i) )
MoveStaticFilesTree(*(i->second));
MoveFilesTree(*(i->second));
static_iq.WhereParentId(dir.id);
db->GetItems(static_item_tab, static_iq);
files_iq.WhereParentId(dir.id);
db->GetItems(files_item_tab, files_iq);
for(size_t i=0 ; i<static_item_tab.size() ; ++i)
MoveStaticFile(static_item_tab[i]);
for(size_t i=0 ; i<files_item_tab.size() ; ++i)
{
if( files_item_tab[i].file_type != WINIX_ITEM_FILETYPE_NONE )
MoveStaticFile(files_item_tab[i]);
plugin.Call(WINIX_FILE_MOVED, &files_item_tab[i]);
}
}
@@ -284,6 +314,8 @@ void Mv::MoveDir(Item & dir)
return;
}
MoveFilesPrepareTree(dir);
if( !system->dirs.ChangeParent(dir.id, dst_dir_id) )
{
cur->request->status = WINIX_ERR_INCORRECT_DIR;
@@ -307,7 +339,7 @@ void Mv::MoveDir(Item & dir)
system->dirs.LogDir(dir_tab);
log << dir.url << logend;
MoveStaticFilesTree(dir);
MoveFilesTree(dir);
}
}

9
functions/mv.h
View File

@@ -40,9 +40,9 @@ private:
std::wstring new_path, new_path_thumb;
std::wstring old_path, old_path_thumb;
// for static files
std::vector<Item> static_item_tab;
DbItemQuery static_iq;
// for files in a directory
std::vector<Item> files_item_tab;
DbItemQuery files_iq;
// for moving content of a directory
DbItemQuery content_dir_iq;
@@ -61,7 +61,8 @@ private:
void MoveDirContent(const Item & dir);
void Prepare();
void Clear();
void MoveStaticFilesTree(const Item & dir);
void MoveFilesPrepareTree(const Item & dir);
void MoveFilesTree(const Item & dir);
void MoveDir(Item & dir);
bool IsTheSameFile(const Item & item);
void PostMoveFile();

2
functions/rm.cpp
View File

@@ -141,6 +141,8 @@ void Rm::RemoveStaticFile(Item & item)
void Rm::RemoveFileOrSymlink(Item & item)
{
plugin.Call(5000, &item); // !! dodac do pluginmsg.h
if( db->DelItem(item) == WINIX_ERR_OK )
{
if( item.type == Item::file )

3
functions/sort.cpp
View File

@@ -8,6 +8,7 @@
*/
#include "sort.h"
#include "core/plugin.h"
@@ -157,6 +158,8 @@ void Sort::MakePost()
UpdateSortIndexes();
}
plugin.Call(WINIX_DIR_CONTENT_SORTED, cur->request->dir_tab.back());
system->RedirectToLastItem();
}

74
functions/upload.cpp
View File

@@ -13,6 +13,7 @@
#include <errno.h>
#include "upload.h"
#include "core/misc.h"
#include "core/plugin.h"
#include "functions/functions.h"
#include "templates/templates.h"
#include "utf8.h"
@@ -89,16 +90,17 @@ bool Upload::UploadSaveStaticFile(const Item & item, const std::wstring & tmp_fi
}
void Upload::CreateThumb(Item & item)
void Upload::ResizeImage(Item & item)
{
::Mount & m = *system->mounts.pmount;
size_t cx = config->thumb_cx;
size_t cy = config->thumb_cy;
int mode = config->thumb_mode;
int index;
::Mount & m = *cur->mount;
size_t cx = config->image_cx;
size_t cy = config->image_cy;
int mode = config->image_mode;
int quality = config->image_quality;
// reading width and height from the mount point (if exists)
index = system->mounts.MountParThumbSize();
int index = system->mounts.MountParImageSize();
if( m.param[index].defined && m.param[index].arg.size() == 2 )
{
@@ -106,11 +108,39 @@ void Upload::CreateThumb(Item & item)
cy = Tol(m.param[index].arg[1]);
}
if( cx > 2000 )
cx = 2000;
// reading image mode from the mount point (if exists)
index = system->mounts.MountParImageMode();
if( cy > 2000 )
cy = 2000;
if( m.param[index].defined && m.param[index].arg.size() == 1 )
mode = Toi(m.param[index].arg[0]);
// reading image quality from the mount point (if exists)
index = system->mounts.MountParImageQuality();
if( m.param[index].defined && m.param[index].arg.size() == 1 )
quality = Toi(m.param[index].arg[0]);
system->image.Resize(item, cx, cy, mode, quality);
}
void Upload::CreateThumb(Item & item)
{
::Mount & m = *cur->mount;
size_t cx = config->thumb_cx;
size_t cy = config->thumb_cy;
int mode = config->thumb_mode;
int quality = config->thumb_quality;
// reading width and height from the mount point (if exists)
int index = system->mounts.MountParThumbSize();
if( m.param[index].defined && m.param[index].arg.size() == 2 )
{
cx = Tol(m.param[index].arg[0]);
cy = Tol(m.param[index].arg[1]);
}
// reading thumb mode from the mount point (if exists)
index = system->mounts.MountParThumbMode();
@@ -118,7 +148,13 @@ void Upload::CreateThumb(Item & item)
if( m.param[index].defined && m.param[index].arg.size() == 1 )
mode = Toi(m.param[index].arg[0]);
system->thumb.CreateThumb(item, cx, cy, mode);
// reading image quality from the mount point (if exists)
index = system->mounts.MountParThumbQuality();
if( m.param[index].defined && m.param[index].arg.size() == 1 )
quality = Toi(m.param[index].arg[0]);
system->image.CreateThumb(item, cx, cy, mode, quality);
}
@@ -126,7 +162,7 @@ void Upload::CreateThumb(Item & item)
void Upload::UploadFile(Item & item, const std::wstring & tmp_filename)
{
// we should add the file beforehand to get the proper item.id
cur->request->status = system->AddFile(item);
cur->request->status = system->AddFile(item, 0, false);
if( cur->request->status == WINIX_ERR_OK )
{
@@ -136,8 +172,16 @@ void Upload::UploadFile(Item & item, const std::wstring & tmp_filename)
{
cur->request->status = db->EditFileById(item, item.id);
if( item.file_type == WINIX_ITEM_FILETYPE_IMAGE && config->create_thumb )
CreateThumb(item);
plugin.Call(WINIX_FILE_ADDED, &item);
if( item.file_type == WINIX_ITEM_FILETYPE_IMAGE )
{
if( config->image_resize )
ResizeImage(item);
if( config->create_thumb )
CreateThumb(item);
}
if( is_jquery_upload )
cur->request->item_tab.push_back(item);

1
functions/upload.h
View File

@@ -40,6 +40,7 @@ private:
bool FunUploadCheckAbuse();
void UploadMulti();
void UploadSingle();
void ResizeImage(Item & item);
void CreateThumb(Item & item);
void CreateJSON();
};