updated: to the new Pikotools API

ConfParser is now SpaceParser
added:   to SessionManager
         Session * SessionManager::FindSession(long id)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@831 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2012-04-30 22:53:54 +00:00
parent fc33b4f882
commit c94b0311b6
38 changed files with 946 additions and 1009 deletions

View File

@ -26,7 +26,7 @@ winix.so: FORCE
@cd ../ezc/src ; $(MAKE) -e
@cd ../tito/src ; $(MAKE) -e
@cd ../pikotools ; $(MAKE) -e
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/confparser/confparser.a ../pikotools/mainparser/mainparser.a -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/space/space.a ../pikotools/mainparser/mainparser.a -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
winix: FORCE

View File

@ -1,17 +1,16 @@
# DO NOT DELETE
acceptbaseparser.o: acceptbaseparser.h
app.o: app.h config.h ../../pikotools/confparser/confparser.h
app.o: ../../pikotools/confparser/space.h htmlfilter.h system.h job.h
app.o: basethread.h synchro.h ../../pikotools/confparser/space.h dirs.h
app.o: item.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
app.o: ../db/dbtextstream.h ../core/textstream.h misc.h requesttypes.h
app.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
app.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
app.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
app.o: logmanipulators.h slog.h cur.h request.h error.h
app.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
app.o: mount.h ../templates/locale.h ../notify/notify.h
app.o: app.h config.h ../../pikotools/space/spaceparser.h
app.o: ../../pikotools/space/space.h htmlfilter.h system.h job.h basethread.h
app.o: synchro.h ../../pikotools/space/space.h dirs.h item.h dircontainer.h
app.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
app.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
app.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
app.o: ../core/user.h ../core/group.h ../core/dircontainer.h
app.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
app.o: cur.h request.h error.h ../templates/htmltextstream.h session.h user.h
app.o: plugindata.h rebus.h mount.h ../templates/locale.h ../notify/notify.h
app.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
app.o: ../templates/localefilter.h ../../ezc/src/ezc.h
app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@ -47,79 +46,78 @@ app.o: acceptbaseparser.h plugin.h pluginmsg.h
basethread.o: basethread.h synchro.h
bbcodeparser.o: bbcodeparser.h htmlfilter.h
compress.o: compress.h log.h textstream.h logmanipulators.h slog.h cur.h
compress.o: request.h requesttypes.h item.h
compress.o: ../../pikotools/confparser/space.h error.h config.h
compress.o: ../../pikotools/confparser/confparser.h
compress.o: ../../pikotools/confparser/space.h htmlfilter.h
compress.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
compress.o: error.h config.h ../../pikotools/space/spaceparser.h
compress.o: ../../pikotools/space/space.h htmlfilter.h
compress.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
compress.o: session.h user.h plugindata.h rebus.h mount.h
compress.o: ../templates/locale.h
config.o: config.h ../../pikotools/confparser/confparser.h
config.o: ../../pikotools/confparser/space.h htmlfilter.h log.h textstream.h
config.o: config.h ../../pikotools/space/spaceparser.h
config.o: ../../pikotools/space/space.h htmlfilter.h log.h textstream.h
config.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
config.o: ../../pikotools/confparser/space.h error.h
config.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
config.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h plugin.h
config.o: pluginmsg.h system.h job.h basethread.h synchro.h dirs.h
config.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
config.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
config.o: ../notify/notifypool.h ../templates/patterns.h
config.o: ../templates/locale.h ../templates/localefilter.h
config.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
config.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
config.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h
config.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
config.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h
config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
config.o: image.h threadmanager.h sessionmanager.h sessioncontainer.h
config.o: ../functions/functions.h ../functions/functionbase.h
config.o: ../core/request.h ../core/system.h ../core/synchro.h
config.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
config.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
config.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
config.o: ../functions/env.h ../functions/last.h ../functions/login.h
config.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
config.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h
config.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
config.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h
config.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h
config.o: ../functions/sort.h ../functions/specialdefault.h
config.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
config.o: ../../pikotools/space/space.h error.h ../templates/htmltextstream.h
config.o: ../core/textstream.h misc.h session.h user.h plugindata.h rebus.h
config.o: mount.h ../templates/locale.h plugin.h pluginmsg.h system.h job.h
config.o: basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
config.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
config.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
config.o: ../core/user.h ../core/group.h ../core/dircontainer.h
config.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
config.o: ../templates/patterns.h ../templates/locale.h
config.o: ../templates/localefilter.h ../../ezc/src/ezc.h
config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
config.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
config.o: ../notify/notifythread.h ../core/basethread.h
config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
config.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h
config.o: users.h groups.h group.h loadavg.h image.h threadmanager.h
config.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
config.o: ../functions/functionbase.h ../core/request.h ../core/system.h
config.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
config.o: ../functions/privchanger.h ../functions/chown.h
config.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
config.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
config.o: ../functions/last.h ../functions/login.h ../functions/logout.h
config.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
config.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
config.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
config.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h
config.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h
config.o: ../functions/specialdefault.h ../functions/stat.h
config.o: ../functions/subject.h ../functions/template.h
config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
config.o: ../core/htmlfilter.h ../templates/templates.h
config.o: ../templates/patterncacher.h ../templates/indexpatterns.h
config.o: ../templates/patterns.h ../templates/changepatterns.h
config.o: ../templates/htmltextstream.h ../core/sessionmanager.h
crypt.o: crypt.h run.h config.h ../../pikotools/confparser/confparser.h
crypt.o: ../../pikotools/confparser/space.h htmlfilter.h user.h
crypt.o: crypt.h run.h config.h ../../pikotools/space/spaceparser.h
crypt.o: ../../pikotools/space/space.h htmlfilter.h user.h
crypt.o: ../../pikotools/utf8/utf8.h misc.h item.h
crypt.o: ../../pikotools/confparser/space.h requesttypes.h log.h textstream.h
crypt.o: ../../pikotools/space/space.h requesttypes.h log.h textstream.h
crypt.o: logmanipulators.h slog.h cur.h request.h error.h
crypt.o: ../templates/htmltextstream.h ../core/textstream.h session.h
crypt.o: plugindata.h rebus.h mount.h ../templates/locale.h
dircontainer.o: dircontainer.h item.h ../../pikotools/confparser/space.h
dircontainer.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
dircontainer.o: dircontainer.h item.h ../../pikotools/space/space.h log.h
dircontainer.o: textstream.h logmanipulators.h slog.h cur.h request.h
dircontainer.o: requesttypes.h error.h config.h
dircontainer.o: ../../pikotools/confparser/confparser.h
dircontainer.o: ../../pikotools/confparser/space.h htmlfilter.h
dircontainer.o: ../../pikotools/space/spaceparser.h
dircontainer.o: ../../pikotools/space/space.h htmlfilter.h
dircontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
dircontainer.o: session.h user.h plugindata.h rebus.h mount.h
dircontainer.o: ../templates/locale.h
dirs.o: dirs.h item.h ../../pikotools/confparser/space.h dircontainer.h
dirs.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
dirs.o: dirs.h item.h ../../pikotools/space/space.h dircontainer.h ../db/db.h
dirs.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
dirs.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
dirs.o: ../../pikotools/confparser/confparser.h
dirs.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h ../core/item.h
dirs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
dirs.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
dirs.o: logmanipulators.h slog.h cur.h request.h error.h config.h
dirs.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
dirs.o: plugindata.h rebus.h mount.h ../templates/locale.h ../notify/notify.h
dirs.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
dirs.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
dirs.o: ../core/user.h ../core/group.h ../core/dircontainer.h
dirs.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
dirs.o: cur.h request.h error.h config.h htmlfilter.h
dirs.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
dirs.o: mount.h ../templates/locale.h ../notify/notify.h
dirs.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h
dirs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@ -130,23 +128,22 @@ dirs.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
dirs.o: ugcontainer.h lastcontainer.h
groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h
groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
groups.o: item.h ../../pikotools/confparser/space.h requesttypes.h
groups.o: ../core/error.h ../../pikotools/confparser/confparser.h
groups.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
groups.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
groups.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
groups.o: logmanipulators.h slog.h cur.h request.h error.h config.h
groups.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
groups.o: plugindata.h rebus.h mount.h ../templates/locale.h
groups.o: item.h ../../pikotools/space/space.h requesttypes.h ../core/error.h
groups.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
groups.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
groups.o: ../core/user.h ../core/group.h ../core/dircontainer.h
groups.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
groups.o: cur.h request.h error.h config.h htmlfilter.h
groups.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
groups.o: mount.h ../templates/locale.h
htmlfilter.o: htmlfilter.h
httpsimpleparser.o: httpsimpleparser.h
image.o: image.h basethread.h synchro.h textstream.h ../db/db.h
image.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
image.o: ../core/textstream.h misc.h item.h
image.o: ../../pikotools/confparser/space.h requesttypes.h ../core/error.h
image.o: ../../pikotools/confparser/confparser.h
image.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
image.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
image.o: ../core/textstream.h misc.h item.h ../../pikotools/space/space.h
image.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h
image.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h
image.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
image.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h
image.o: slog.h cur.h request.h error.h config.h htmlfilter.h
image.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
@ -182,21 +179,21 @@ image.o: ../core/htmlfilter.h ../templates/templates.h
image.o: ../templates/patterncacher.h ../templates/indexpatterns.h
image.o: ../templates/patterns.h ../templates/changepatterns.h
image.o: ../templates/htmltextstream.h ../core/sessionmanager.h
item.o: item.h ../../pikotools/confparser/space.h misc.h requesttypes.h
item.o: crypt.h run.h config.h ../../pikotools/confparser/confparser.h
item.o: ../../pikotools/confparser/space.h htmlfilter.h user.h
job.o: job.h basethread.h synchro.h ../../pikotools/confparser/space.h
job.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h cur.h
item.o: item.h ../../pikotools/space/space.h misc.h requesttypes.h crypt.h
item.o: run.h config.h ../../pikotools/space/spaceparser.h
item.o: ../../pikotools/space/space.h htmlfilter.h user.h
job.o: job.h basethread.h synchro.h ../../pikotools/space/space.h plugin.h
job.o: pluginmsg.h log.h textstream.h logmanipulators.h slog.h cur.h
job.o: request.h requesttypes.h item.h error.h config.h
job.o: ../../pikotools/confparser/confparser.h
job.o: ../../pikotools/confparser/space.h htmlfilter.h
job.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
job.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h system.h
job.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
job.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
job.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
job.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
job.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
job.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
job.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
job.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
job.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
job.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
job.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
job.o: ../core/user.h ../core/group.h ../core/dircontainer.h
job.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
job.o: ../templates/patterns.h ../templates/locale.h
job.o: ../templates/localefilter.h ../../ezc/src/ezc.h
job.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
job.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
@ -228,30 +225,29 @@ job.o: ../templates/changepatterns.h ../templates/htmltextstream.h
job.o: ../core/sessionmanager.h
lastcontainer.o: lastcontainer.h log.h textstream.h logmanipulators.h slog.h
lastcontainer.o: cur.h request.h requesttypes.h item.h
lastcontainer.o: ../../pikotools/confparser/space.h error.h config.h
lastcontainer.o: ../../pikotools/confparser/confparser.h
lastcontainer.o: ../../pikotools/confparser/space.h htmlfilter.h
lastcontainer.o: ../../pikotools/space/space.h error.h config.h
lastcontainer.o: ../../pikotools/space/spaceparser.h
lastcontainer.o: ../../pikotools/space/space.h htmlfilter.h
lastcontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
lastcontainer.o: session.h user.h plugindata.h rebus.h mount.h
lastcontainer.o: ../templates/locale.h
loadavg.o: loadavg.h log.h textstream.h logmanipulators.h slog.h cur.h
loadavg.o: request.h requesttypes.h item.h ../../pikotools/confparser/space.h
loadavg.o: error.h config.h ../../pikotools/confparser/confparser.h
loadavg.o: ../../pikotools/confparser/space.h htmlfilter.h
loadavg.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
loadavg.o: error.h config.h ../../pikotools/space/spaceparser.h
loadavg.o: ../../pikotools/space/space.h htmlfilter.h
loadavg.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
loadavg.o: session.h user.h plugindata.h rebus.h mount.h
loadavg.o: ../templates/locale.h
log.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
log.o: requesttypes.h item.h ../../pikotools/confparser/space.h error.h
log.o: config.h ../../pikotools/confparser/confparser.h
log.o: ../../pikotools/confparser/space.h htmlfilter.h
log.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
log.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h
log.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
log.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
log.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
log.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
log.o: ../../pikotools/utf8/utf8.h
misc.o: misc.h item.h ../../pikotools/confparser/space.h requesttypes.h log.h
misc.o: misc.h item.h ../../pikotools/space/space.h requesttypes.h log.h
misc.o: textstream.h logmanipulators.h slog.h cur.h request.h error.h
misc.o: config.h ../../pikotools/confparser/confparser.h
misc.o: ../../pikotools/confparser/space.h htmlfilter.h
misc.o: config.h ../../pikotools/space/spaceparser.h
misc.o: ../../pikotools/space/space.h htmlfilter.h
misc.o: ../templates/htmltextstream.h ../core/textstream.h session.h user.h
misc.o: plugindata.h rebus.h mount.h ../templates/locale.h
misc.o: ../templates/templates.h ../../ezc/src/ezc.h
@ -267,14 +263,13 @@ misc.o: ../core/sessionmanager.h ../core/htmlfilter.h ../db/db.h
misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
misc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
mount.o: mount.h misc.h item.h ../../pikotools/confparser/space.h
mount.o: requesttypes.h
mountparser.o: mountparser.h mount.h item.h
mountparser.o: ../../pikotools/confparser/space.h dirs.h dircontainer.h
mountparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
mountparser.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
mountparser.o: ../../pikotools/confparser/confparser.h
mountparser.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
mount.o: mount.h misc.h item.h ../../pikotools/space/space.h requesttypes.h
mountparser.o: mountparser.h mount.h item.h ../../pikotools/space/space.h
mountparser.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
mountparser.o: ../db/dbtextstream.h ../core/textstream.h misc.h
mountparser.o: requesttypes.h ../core/error.h
mountparser.o: ../../pikotools/space/spaceparser.h
mountparser.o: ../../pikotools/space/space.h ../db/dbitemquery.h
mountparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
mountparser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
mountparser.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
@ -290,27 +285,26 @@ mountparser.o: ../notify/notifythread.h ../core/basethread.h
mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
mountparser.o: ugcontainer.h lastcontainer.h
mounts.o: mounts.h mount.h error.h dirs.h item.h
mounts.o: ../../pikotools/confparser/space.h dircontainer.h ../db/db.h
mounts.o: ../../pikotools/space/space.h dircontainer.h ../db/db.h
mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
mounts.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
mounts.o: ../../pikotools/confparser/confparser.h
mounts.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
mounts.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
mounts.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
mounts.o: logmanipulators.h slog.h cur.h request.h config.h htmlfilter.h
mounts.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
mounts.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
mounts.o: ../templates/patterns.h ../templates/locale.h
mounts.o: ../templates/localefilter.h ../../ezc/src/ezc.h
mounts.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
mounts.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
mounts.o: ../notify/notifythread.h ../core/basethread.h
mounts.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
mounts.o: ugcontainer.h lastcontainer.h mountparser.h plugin.h pluginmsg.h
mounts.o: system.h job.h basethread.h synchro.h crypt.h run.h users.h
mounts.o: groups.h group.h loadavg.h image.h threadmanager.h sessionmanager.h
mounts.o: sessioncontainer.h ../functions/functions.h
mounts.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
mounts.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
mounts.o: ../core/user.h ../core/group.h ../core/dircontainer.h
mounts.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
mounts.o: cur.h request.h config.h htmlfilter.h ../templates/htmltextstream.h
mounts.o: session.h user.h plugindata.h rebus.h ../templates/locale.h
mounts.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
mounts.o: ../templates/locale.h ../templates/localefilter.h
mounts.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
mounts.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
mounts.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h
mounts.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
mounts.o: ../core/users.h ugcontainer.h lastcontainer.h mountparser.h
mounts.o: plugin.h pluginmsg.h system.h job.h basethread.h synchro.h crypt.h
mounts.o: run.h users.h groups.h group.h loadavg.h image.h threadmanager.h
mounts.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h
mounts.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@ -332,10 +326,9 @@ mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h
mounts.o: ../templates/patterns.h ../templates/changepatterns.h
mounts.o: ../templates/htmltextstream.h ../core/sessionmanager.h
plugin.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h
plugin.o: cur.h request.h requesttypes.h item.h
plugin.o: ../../pikotools/confparser/space.h error.h config.h
plugin.o: ../../pikotools/confparser/confparser.h
plugin.o: ../../pikotools/confparser/space.h htmlfilter.h
plugin.o: cur.h request.h requesttypes.h item.h ../../pikotools/space/space.h
plugin.o: error.h config.h ../../pikotools/space/spaceparser.h
plugin.o: ../../pikotools/space/space.h htmlfilter.h
plugin.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
plugin.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h system.h
plugin.o: job.h basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
@ -375,9 +368,9 @@ plugin.o: ../templates/patterns.h ../templates/changepatterns.h
plugin.o: ../templates/htmltextstream.h ../core/sessionmanager.h
plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h
plugindata.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
plugindata.o: ../../pikotools/confparser/space.h error.h config.h
plugindata.o: ../../pikotools/confparser/confparser.h
plugindata.o: ../../pikotools/confparser/space.h htmlfilter.h
plugindata.o: ../../pikotools/space/space.h error.h config.h
plugindata.o: ../../pikotools/space/spaceparser.h
plugindata.o: ../../pikotools/space/space.h htmlfilter.h
plugindata.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
plugindata.o: session.h user.h rebus.h mount.h ../templates/locale.h system.h
plugindata.o: job.h basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
@ -419,22 +412,22 @@ plugindata.o: ../templates/indexpatterns.h ../templates/patterns.h
plugindata.o: ../templates/changepatterns.h ../templates/htmltextstream.h
plugindata.o: ../core/sessionmanager.h
postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h
postmultiparser.o: ../../pikotools/confparser/confparser.h
postmultiparser.o: ../../pikotools/confparser/space.h htmlfilter.h misc.h
postmultiparser.o: item.h ../../pikotools/confparser/space.h log.h
postmultiparser.o: textstream.h logmanipulators.h slog.h cur.h request.h
postmultiparser.o: ../../pikotools/space/spaceparser.h
postmultiparser.o: ../../pikotools/space/space.h htmlfilter.h misc.h item.h
postmultiparser.o: ../../pikotools/space/space.h log.h textstream.h
postmultiparser.o: logmanipulators.h slog.h cur.h request.h
postmultiparser.o: ../templates/htmltextstream.h ../core/textstream.h
postmultiparser.o: session.h user.h plugindata.h rebus.h mount.h
postmultiparser.o: ../templates/locale.h ../../pikotools/utf8/utf8.h
rebus.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
rebus.o: requesttypes.h item.h ../../pikotools/confparser/space.h error.h
rebus.o: config.h ../../pikotools/confparser/confparser.h
rebus.o: ../../pikotools/confparser/space.h htmlfilter.h
rebus.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
rebus.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h
request.o: request.h requesttypes.h item.h ../../pikotools/confparser/space.h
request.o: error.h config.h ../../pikotools/confparser/confparser.h
request.o: ../../pikotools/confparser/space.h htmlfilter.h textstream.h
rebus.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
rebus.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
rebus.o: misc.h session.h user.h plugindata.h rebus.h mount.h
rebus.o: ../templates/locale.h
request.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
request.o: error.h config.h ../../pikotools/space/spaceparser.h
request.o: ../../pikotools/space/space.h htmlfilter.h textstream.h
request.o: ../templates/htmltextstream.h ../core/textstream.h misc.h log.h
request.o: logmanipulators.h slog.h cur.h session.h user.h plugindata.h
request.o: rebus.h mount.h ../templates/locale.h plugin.h pluginmsg.h
@ -475,28 +468,25 @@ request.o: ../templates/patterncacher.h ../templates/indexpatterns.h
request.o: ../templates/patterns.h ../templates/changepatterns.h
request.o: ../templates/htmltextstream.h ../core/sessionmanager.h
run.o: run.h log.h textstream.h logmanipulators.h slog.h cur.h request.h
run.o: requesttypes.h item.h ../../pikotools/confparser/space.h error.h
run.o: config.h ../../pikotools/confparser/confparser.h
run.o: ../../pikotools/confparser/space.h htmlfilter.h
run.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
run.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h
session.o: session.h item.h ../../pikotools/confparser/space.h error.h user.h
run.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
run.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
run.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
session.o: session.h item.h ../../pikotools/space/space.h error.h user.h
session.o: plugindata.h rebus.h textstream.h misc.h requesttypes.h
sessioncontainer.o: sessioncontainer.h session.h item.h
sessioncontainer.o: ../../pikotools/confparser/space.h error.h user.h
sessioncontainer.o: plugindata.h rebus.h textstream.h cur.h request.h
sessioncontainer.o: requesttypes.h config.h
sessioncontainer.o: ../../pikotools/confparser/confparser.h
sessioncontainer.o: ../../pikotools/confparser/space.h htmlfilter.h
sessioncontainer.o: ../../pikotools/space/space.h error.h user.h plugindata.h
sessioncontainer.o: rebus.h textstream.h cur.h request.h requesttypes.h
sessioncontainer.o: config.h ../../pikotools/space/spaceparser.h
sessioncontainer.o: ../../pikotools/space/space.h htmlfilter.h
sessioncontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
sessioncontainer.o: mount.h log.h logmanipulators.h slog.h
sessioncontainer.o: ../templates/locale.h
sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
sessionmanager.o: ../../pikotools/confparser/space.h error.h user.h
sessionmanager.o: plugindata.h rebus.h textstream.h cur.h request.h
sessionmanager.o: requesttypes.h config.h
sessionmanager.o: ../../pikotools/confparser/confparser.h
sessionmanager.o: ../../pikotools/confparser/space.h htmlfilter.h
sessionmanager.o: ../../pikotools/space/space.h error.h user.h plugindata.h
sessionmanager.o: rebus.h textstream.h cur.h request.h requesttypes.h
sessionmanager.o: config.h ../../pikotools/space/spaceparser.h
sessionmanager.o: ../../pikotools/space/space.h htmlfilter.h
sessionmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
sessionmanager.o: mount.h lastcontainer.h system.h job.h basethread.h
sessionmanager.o: synchro.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
@ -541,29 +531,26 @@ sessionmanager.o: ../templates/indexpatterns.h ../templates/patterns.h
sessionmanager.o: ../templates/changepatterns.h ../templates/htmltextstream.h
sessionmanager.o: ../core/sessionmanager.h
sessionparser.o: sessionparser.h session.h item.h
sessionparser.o: ../../pikotools/confparser/space.h error.h user.h
sessionparser.o: plugindata.h rebus.h textstream.h sessioncontainer.h cur.h
sessionparser.o: request.h requesttypes.h config.h
sessionparser.o: ../../pikotools/confparser/confparser.h
sessionparser.o: ../../pikotools/confparser/space.h htmlfilter.h
sessionparser.o: ../../pikotools/space/space.h error.h user.h plugindata.h
sessionparser.o: rebus.h textstream.h sessioncontainer.h cur.h request.h
sessionparser.o: requesttypes.h config.h ../../pikotools/space/spaceparser.h
sessionparser.o: ../../pikotools/space/space.h htmlfilter.h
sessionparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
sessionparser.o: mount.h users.h log.h logmanipulators.h slog.h
sessionparser.o: ../templates/locale.h
slog.o: slog.h cur.h request.h requesttypes.h item.h
slog.o: ../../pikotools/confparser/space.h error.h config.h
slog.o: ../../pikotools/confparser/confparser.h
slog.o: ../../pikotools/confparser/space.h htmlfilter.h textstream.h
slog.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
slog.o: user.h plugindata.h rebus.h mount.h logmanipulators.h
slog.o: ../templates/locale.h
slog.o: ../../pikotools/space/space.h error.h config.h
slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
slog.o: htmlfilter.h textstream.h ../templates/htmltextstream.h
slog.o: ../core/textstream.h misc.h session.h user.h plugindata.h rebus.h
slog.o: mount.h logmanipulators.h ../templates/locale.h
synchro.o: synchro.h
system.o: system.h job.h basethread.h synchro.h
system.o: ../../pikotools/confparser/space.h dirs.h item.h dircontainer.h
system.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
system.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
system.o: ../../pikotools/confparser/confparser.h
system.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
system.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
system.o: system.h job.h basethread.h synchro.h ../../pikotools/space/space.h
system.o: dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h
system.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
system.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h
system.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h
system.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
system.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
system.o: logmanipulators.h slog.h cur.h request.h error.h config.h
system.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
@ -599,24 +586,23 @@ system.o: ../functions/subject.h ../functions/template.h
system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
system.o: plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h
textstream.o: textstream.h misc.h item.h ../../pikotools/confparser/space.h
textstream.o: textstream.h misc.h item.h ../../pikotools/space/space.h
textstream.o: requesttypes.h
threadmanager.o: threadmanager.h basethread.h synchro.h log.h textstream.h
threadmanager.o: logmanipulators.h slog.h cur.h request.h requesttypes.h
threadmanager.o: item.h ../../pikotools/confparser/space.h error.h config.h
threadmanager.o: ../../pikotools/confparser/confparser.h
threadmanager.o: ../../pikotools/confparser/space.h htmlfilter.h
threadmanager.o: item.h ../../pikotools/space/space.h error.h config.h
threadmanager.o: ../../pikotools/space/spaceparser.h
threadmanager.o: ../../pikotools/space/space.h htmlfilter.h
threadmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
threadmanager.o: session.h user.h plugindata.h rebus.h mount.h
threadmanager.o: ../templates/locale.h
users.o: users.h sessionmanager.h sessioncontainer.h session.h item.h
users.o: ../../pikotools/confparser/space.h error.h user.h plugindata.h
users.o: rebus.h textstream.h cur.h request.h requesttypes.h config.h
users.o: ../../pikotools/confparser/confparser.h
users.o: ../../pikotools/confparser/space.h htmlfilter.h
users.o: ../templates/htmltextstream.h ../core/textstream.h misc.h mount.h
users.o: lastcontainer.h system.h job.h basethread.h synchro.h dirs.h
users.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
users.o: ../../pikotools/space/space.h error.h user.h plugindata.h rebus.h
users.o: textstream.h cur.h request.h requesttypes.h config.h
users.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
users.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
users.o: misc.h mount.h lastcontainer.h system.h job.h basethread.h synchro.h
users.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
users.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
users.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
users.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h

View File

@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010-2011, Tomasz Sowa
* Copyright (c) 2010-2012, Tomasz Sowa
* All rights reserved.
*
*/
@ -36,20 +36,19 @@ public:
// starting the second thread
bool StartThread();
// virtual methods which should/can be inherited by your class
// the methods will be called from the other thread
// wake up the second thread
// (if it waits for the signal)
// you should use it with: synchro->Lock() and Unlock()
// if the thread doesn't wait on a signal then nothing is done
void WakeUpThread();
virtual void WakeUpThread();
// waiting until the thread exits
// you should call WakeUpThread() before
void WaitForThread();
// virtual methods which should/can be inherited by your class
// the methods will be called from the other thread
virtual void WaitForThread();
// initialize the thread
// (global objects are locked)

View File

@ -31,22 +31,22 @@ void Config::ShowError()
switch( parser.status )
{
case PT::ConfParser::no_space:
case PT::SpaceParser::no_space:
log << log2 << "Config: space not set" << logend;
break;
case PT::ConfParser::ok:
case PT::SpaceParser::ok:
log << log2 << "Config: syntax ok" << logend;
break;
case PT::ConfParser::cant_open_file:
case PT::SpaceParser::cant_open_file:
if( errors_to_stdout )
std::cout << "Config: cant open a config file: " << config_file << std::endl;
log << log1 << "Config: cant open a config file: " << config_file << logend;
break;
case PT::ConfParser::syntax_error:
case PT::SpaceParser::syntax_error:
if( errors_to_stdout )
std::cout << "Config: syntax error, line: " << parser.line << std::endl;
@ -76,9 +76,9 @@ bool Config::ReadConfig(bool errors_to_stdout_, bool stdout_is_closed)
parser.UTF8(true); // config is always read in UTF-8
parser.SetSpace(space);
PT::ConfParser::Status status = parser.Parse(config_file);
PT::SpaceParser::Status status = parser.Parse(config_file);
if( status == PT::ConfParser::ok )
if( status == PT::SpaceParser::ok )
{
AssignValues(stdout_is_closed);
SetAdditionalVariables();

View File

@ -11,7 +11,7 @@
#define headerfile_winix_core_config
#include <string>
#include "confparser/confparser.h"
#include "space/spaceparser.h"
#include "htmlfilter.h"
@ -515,7 +515,7 @@ private:
void CheckPasswd();
PT::Space space;
PT::ConfParser parser;
PT::SpaceParser parser;
std::string default_str;
int default_int;

View File

@ -11,7 +11,7 @@
#define headerfile_winix_core_item
#include <string>
#include "confparser/space.h"
#include "space/space.h"
#define WINIX_ITEM_FILETYPE_NONE 0

View File

@ -13,7 +13,7 @@
#include <vector>
#include <queue>
#include "basethread.h"
#include "confparser/space.h"
#include "space/space.h"

View File

@ -199,6 +199,16 @@ void SessionManager::SetSession()
}
Session * SessionManager::FindSession(long id)
{
SessionContainer::Iterator i = session_tab.FindById(id);
if( i != session_tab.End() )
return &*i;
return 0;
}
SessionContainer::Iterator SessionManager::SessionBegin()
{

View File

@ -34,6 +34,9 @@ public:
void SetSystem(System * psystem);
void SetLastContainer(LastContainer * plast_container);
// can return a null pointer
Session * FindSession(long id);
void SetSession();
void DeleteSessions(); // deleting all sessions
bool ChangeSessionId(long old_id);

View File

@ -13,7 +13,7 @@
#include <string>
#include <ctime>
#include "misc.h"
#include "confparser/space.h"
#include "space/space.h"
/*

View File

@ -12,7 +12,7 @@
#include <string>
#include <vector>
#include "confparser/space.h"
#include "space/space.h"
#define WINIX_ACCOUNT_MAX_LOGIN_SIZE 250

View File

@ -1,33 +1,31 @@
# DO NOT DELETE
db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
db.o: ../core/misc.h ../core/item.h ../../pikotools/confparser/space.h
db.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
db.o: ../core/requesttypes.h ../core/error.h
db.o: ../../pikotools/confparser/confparser.h
db.o: ../../pikotools/confparser/space.h dbitemquery.h ../core/item.h
db.o: dbitemcolumns.h ../core/user.h ../core/group.h ../core/dircontainer.h
db.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
db.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
db.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
db.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
db.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
db.o: ../templates/locale.h ../core/log.h ../core/misc.h
db.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
db.o: dbitemquery.h ../core/item.h dbitemcolumns.h ../core/user.h
db.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
db.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
db.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
db.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
db.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
db.o: ../core/mount.h ../templates/locale.h ../core/log.h ../core/misc.h
dbbase.o: dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
dbbase.o: ../core/misc.h ../core/item.h ../../pikotools/confparser/space.h
dbbase.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
dbbase.o: ../core/requesttypes.h ../core/error.h
dbbase.o: ../../pikotools/confparser/confparser.h
dbbase.o: ../../pikotools/confparser/space.h ../core/log.h ../core/misc.h
dbbase.o: ../../pikotools/utf8/utf8.h
dbbase.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
dbbase.o: ../core/log.h ../core/misc.h ../../pikotools/utf8/utf8.h
dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.h
dbconn.o: ../core/item.h ../../pikotools/confparser/space.h
dbconn.o: ../core/requesttypes.h ../core/log.h ../core/error.h
dbconn.o: ../core/item.h ../../pikotools/space/space.h ../core/requesttypes.h
dbconn.o: ../core/log.h ../core/error.h
dbitemcolumns.o: dbitemcolumns.h ../core/item.h dbbase.h dbconn.h
dbitemcolumns.o: dbtextstream.h ../core/textstream.h ../core/misc.h
dbitemcolumns.o: ../core/item.h ../../pikotools/confparser/space.h
dbitemcolumns.o: ../core/item.h ../../pikotools/space/space.h
dbitemcolumns.o: ../core/requesttypes.h ../core/error.h
dbitemcolumns.o: ../../pikotools/confparser/confparser.h
dbitemcolumns.o: ../../pikotools/confparser/space.h ../core/log.h
dbitemcolumns.o: ../../pikotools/space/spaceparser.h
dbitemcolumns.o: ../../pikotools/space/space.h ../core/log.h
dbitemquery.o: dbitemquery.h ../core/item.h
dbtextstream.o: dbtextstream.h ../core/textstream.h ../core/misc.h
dbtextstream.o: ../core/item.h ../../pikotools/confparser/space.h
dbtextstream.o: ../core/item.h ../../pikotools/space/space.h
dbtextstream.o: ../core/requesttypes.h ../../pikotools/utf8/utf8.h

View File

@ -232,13 +232,13 @@ bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space,
conf_parser.SetSpace(space);
space.Clear();
PT::ConfParser::Status status = conf_parser.ParseString(res);
PT::SpaceParser::Status status = conf_parser.ParseString(res);
if( status != PT::ConfParser::ok )
if( status != PT::SpaceParser::ok )
{
log << log1 << "Db: a problem with parsing a PT::Space";
if( status == PT::ConfParser::syntax_error )
if( status == PT::SpaceParser::syntax_error )
log << ", syntax error at line: " << conf_parser.line;
log << logend;

View File

@ -16,7 +16,7 @@
#include <vector>
#include <string>
#include "core/error.h"
#include "confparser/confparser.h"
#include "space/spaceparser.h"
class DbBase
@ -95,7 +95,7 @@ private:
static int UnescapeBin(const char * str, size_t & i, size_t len);
DbTextStream bquery;
PT::ConfParser conf_parser;
PT::SpaceParser conf_parser;
};

File diff suppressed because it is too large Load Diff

View File

@ -50,7 +50,7 @@ bool Env::Parse(const std::wstring & env_str)
conf_parser.UTF8(config->utf8);
conf_parser.SplitSingle(true);
return (conf_parser.ParseString(env_str) == PT::ConfParser::ok);
return (conf_parser.ParseString(env_str) == PT::SpaceParser::ok);
}

View File

@ -11,7 +11,7 @@
#define headerfile_winix_functions_env
#include "functionbase.h"
#include "confparser/confparser.h"
#include "space/spaceparser.h"
namespace Fun
@ -36,7 +36,7 @@ public:
private:
PT::ConfParser conf_parser;
PT::SpaceParser conf_parser;
PT::Space space;
User * puser;
size_t req_id;

View File

@ -34,7 +34,7 @@ bool Meta::AddMetaInfo(Item & item, const std::wstring & meta_str)
conf_parser.UTF8(config->utf8);
conf_parser.SplitSingle(true);
if( conf_parser.ParseString(meta_str) == PT::ConfParser::ok )
if( conf_parser.ParseString(meta_str) == PT::SpaceParser::ok )
{
if( db->EditMetaById(space, item.id) == WINIX_ERR_OK )
{

View File

@ -11,7 +11,7 @@
#define headerfile_winix_functions_meta
#include "functionbase.h"
#include "confparser/confparser.h"
#include "space/spaceparser.h"
namespace Fun
@ -30,7 +30,7 @@ public:
private:
PT::ConfParser conf_parser;
PT::SpaceParser conf_parser;
PT::Space space;
};

View File

@ -1,13 +1,13 @@
# DO NOT DELETE
main.o: ../core/log.h ../core/textstream.h ../core/misc.h ../core/item.h
main.o: ../../pikotools/confparser/space.h ../core/requesttypes.h
main.o: ../../pikotools/space/space.h ../core/requesttypes.h
main.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
main.o: ../core/request.h ../core/error.h ../core/config.h
main.o: ../../pikotools/confparser/confparser.h
main.o: ../../pikotools/confparser/space.h ../core/htmlfilter.h
main.o: ../templates/htmltextstream.h ../core/textstream.h ../core/session.h
main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
main.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
main.o: ../core/htmlfilter.h ../templates/htmltextstream.h
main.o: ../core/textstream.h ../core/session.h ../core/user.h
main.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
main.o: ../templates/locale.h ../core/slog.h ../core/app.h ../core/system.h
main.o: ../core/job.h ../core/basethread.h ../core/synchro.h ../core/dirs.h
main.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h

View File

@ -1,30 +1,30 @@
# DO NOT DELETE
notify.o: notify.h notifypool.h ../templates/locale.h
notify.o: ../../pikotools/confparser/confparser.h
notify.o: ../../pikotools/confparser/space.h ../templates/patterns.h
notify.o: ../templates/locale.h ../templates/localefilter.h
notify.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
notify.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
notify.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
notify.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
notify.o: ../templates/misc.h ../templates/htmltextstream.h
notify.o: ../core/textstream.h ../../pikotools/confparser/space.h
notify.o: notifythread.h ../core/basethread.h ../core/synchro.h
notify.o: templatesnotify.h ../core/config.h ../core/htmlfilter.h
notify.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
notify.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
notify.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
notify.o: ../core/error.h ../core/config.h ../templates/htmltextstream.h
notify.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
notify.o: ../core/mount.h ../core/lastcontainer.h ../db/db.h ../db/dbbase.h
notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
notify.o: ../core/user.h ../core/group.h ../core/dircontainer.h
notify.o: ../core/ugcontainer.h ../templates/templates.h
notify.o: ../templates/patterncacher.h ../templates/indexpatterns.h
notify.o: ../templates/patterns.h ../templates/changepatterns.h ../core/cur.h
notify.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/dirs.h
notify.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
notify.o: ../templates/patterns.h ../templates/locale.h
notify.o: ../templates/localefilter.h ../../ezc/src/ezc.h
notify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
notify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
notify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
notify.o: ../../pikotools/utf8/utf8.h ../templates/misc.h
notify.o: ../templates/htmltextstream.h ../core/textstream.h
notify.o: ../../pikotools/space/space.h notifythread.h ../core/basethread.h
notify.o: ../core/synchro.h templatesnotify.h ../core/config.h
notify.o: ../core/htmlfilter.h ../core/users.h ../core/user.h
notify.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
notify.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
notify.o: ../core/request.h ../core/requesttypes.h ../core/error.h
notify.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
notify.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
notify.o: ../core/lastcontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
notify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
notify.o: ../core/dircontainer.h ../core/ugcontainer.h
notify.o: ../templates/templates.h ../templates/patterncacher.h
notify.o: ../templates/indexpatterns.h ../templates/patterns.h
notify.o: ../templates/changepatterns.h ../core/cur.h ../core/system.h
notify.o: ../core/job.h ../core/basethread.h ../core/dirs.h
notify.o: ../core/dircontainer.h ../notify/notify.h ../core/mounts.h
notify.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
notify.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
@ -49,8 +49,8 @@ notify.o: ../functions/subject.h ../functions/template.h
notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
notifypool.o: notifypool.h ../templates/locale.h
notifypool.o: ../../pikotools/confparser/confparser.h
notifypool.o: ../../pikotools/confparser/space.h
notifypool.o: ../../pikotools/space/spaceparser.h
notifypool.o: ../../pikotools/space/space.h
notifythread.o: notifythread.h ../core/basethread.h ../core/synchro.h
notifythread.o: templatesnotify.h ../../ezc/src/ezc.h
notifythread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@ -59,9 +59,9 @@ notifythread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
notifythread.o: ../../pikotools/utf8/utf8.h ../core/textstream.h
notifythread.o: ../templates/misc.h ../templates/localefilter.h
notifythread.o: ../templates/locale.h ../templates/htmltextstream.h
notifythread.o: ../../pikotools/confparser/space.h notifypool.h
notifythread.o: ../templates/locale.h ../../pikotools/confparser/confparser.h
notifythread.o: ../../pikotools/confparser/space.h ../core/config.h
notifythread.o: ../../pikotools/space/space.h notifypool.h
notifythread.o: ../templates/locale.h ../../pikotools/space/spaceparser.h
notifythread.o: ../../pikotools/space/space.h ../core/config.h
notifythread.o: ../core/htmlfilter.h ../core/users.h ../core/user.h
notifythread.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
notifythread.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
@ -81,10 +81,9 @@ templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
templatesnotify.o: ../../pikotools/utf8/utf8.h ../core/textstream.h
templatesnotify.o: ../templates/misc.h ../templates/localefilter.h
templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h
templatesnotify.o: ../../pikotools/confparser/space.h notifypool.h
templatesnotify.o: ../templates/locale.h
templatesnotify.o: ../../pikotools/confparser/confparser.h
templatesnotify.o: ../../pikotools/confparser/space.h ../core/plugin.h
templatesnotify.o: ../../pikotools/space/space.h notifypool.h
templatesnotify.o: ../templates/locale.h ../../pikotools/space/spaceparser.h
templatesnotify.o: ../../pikotools/space/space.h ../core/plugin.h
templatesnotify.o: ../core/pluginmsg.h ../core/log.h ../core/textstream.h
templatesnotify.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
templatesnotify.o: ../core/request.h ../core/requesttypes.h ../core/error.h

View File

@ -2,9 +2,9 @@
edb.o: edb.h ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
edb.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
edb.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
edb.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
edb.o: ../../../pikotools/confparser/space.h export.h ../../core/dirs.h
edb.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
edb.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
edb.o: ../../../pikotools/space/space.h export.h ../../core/dirs.h
edb.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
edb.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
edb.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
@ -26,7 +26,7 @@ edb.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
edb.o: ../../core/lastcontainer.h ../../core/log.h
exportinfo.o: ../../core/log.h exportinfo.h ../../core/system.h
exportinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
exportinfo.o: ../../../pikotools/confparser/space.h ../../core/dirs.h
exportinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
exportinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
exportinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
exportinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@ -35,8 +35,8 @@ exportinfo.o: ../../core/log.h ../../core/textstream.h
exportinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
exportinfo.o: ../../core/request.h ../../core/requesttypes.h
exportinfo.o: ../../core/error.h ../../core/config.h
exportinfo.o: ../../../pikotools/confparser/confparser.h
exportinfo.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
exportinfo.o: ../../../pikotools/space/spaceparser.h
exportinfo.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
exportinfo.o: ../../templates/htmltextstream.h ../../core/textstream.h
exportinfo.o: ../../core/misc.h ../../core/session.h ../../core/user.h
exportinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
@ -58,15 +58,15 @@ exportinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
exportinfo.o: ../../core/dirs.h message.h exportthread.h
exportthread.o: exportthread.h ../../core/basethread.h ../../core/synchro.h
exportthread.o: message.h ../../core/log.h ../../core/misc.h
exportthread.o: ../../core/item.h ../../../pikotools/confparser/space.h
exportthread.o: ../../core/item.h ../../../pikotools/space/space.h
exportthread.o: ../../core/requesttypes.h ../../../pikotools/utf8/utf8.h
init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h
init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
init.o: ../../core/requesttypes.h ../../core/item.h
init.o: ../../../pikotools/confparser/space.h ../../core/error.h
init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
init.o: ../../../pikotools/space/space.h ../../core/error.h
init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
init.o: ../../templates/htmltextstream.h ../../core/textstream.h
init.o: ../../core/misc.h ../../core/session.h ../../core/user.h
init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h

View File

@ -1,12 +1,11 @@
# DO NOT DELETE
gallery.o: gallery.h ../../functions/functionbase.h ../../core/item.h
gallery.o: ../../../pikotools/confparser/space.h ../../db/db.h
gallery.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
gallery.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
gallery.o: ../../core/requesttypes.h ../../core/error.h
gallery.o: ../../../pikotools/confparser/confparser.h
gallery.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
gallery.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
gallery.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
gallery.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
gallery.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
gallery.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
gallery.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
gallery.o: ../../core/dircontainer.h ../../core/ugcontainer.h
gallery.o: ../../core/log.h ../../core/textstream.h
@ -32,13 +31,13 @@ gallery.o: ../../core/users.h ../../core/groups.h ../../core/group.h
gallery.o: ../../core/loadavg.h ../../core/image.h ../../core/threadmanager.h
gallery.o: ../../core/synchro.h galleryinfo.h
galleryinfo.o: galleryinfo.h ../../core/item.h
galleryinfo.o: ../../../pikotools/confparser/space.h
galleryinfo.o: ../../../pikotools/space/space.h
init.o: gallery.h ../../functions/functionbase.h ../../core/item.h
init.o: ../../../pikotools/confparser/space.h ../../db/db.h ../../db/dbbase.h
init.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
init.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
init.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
init.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
init.o: ../../core/textstream.h ../../core/logmanipulators.h
@ -89,12 +88,12 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
init.o: ../../core/sessionmanager.h
templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h
templates.o: ../../../pikotools/confparser/space.h ../../db/db.h
templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
templates.o: ../../core/requesttypes.h ../../core/error.h
templates.o: ../../../pikotools/confparser/confparser.h
templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/log.h ../../core/textstream.h

View File

@ -1,8 +1,8 @@
# DO NOT DELETE
groupinfo.o: groupinfo.h groups.h ../../../pikotools/confparser/confparser.h
groupinfo.o: ../../../pikotools/confparser/space.h ../../core/item.h
groupinfo.o: ../../../pikotools/confparser/space.h ../../core/system.h
groupinfo.o: groupinfo.h groups.h ../../../pikotools/space/spaceparser.h
groupinfo.o: ../../../pikotools/space/space.h ../../core/item.h
groupinfo.o: ../../../pikotools/space/space.h ../../core/system.h
groupinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
groupinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
groupinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
@ -30,16 +30,16 @@ groupinfo.o: ../../core/lastcontainer.h ../../core/mounts.h
groupinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
groupinfo.o: ../../core/users.h ../../core/loadavg.h ../../core/image.h
groupinfo.o: ../../core/threadmanager.h ../../core/log.h
groups.o: groups.h ../../../pikotools/confparser/confparser.h
groups.o: ../../../pikotools/confparser/space.h ../../core/log.h
groups.o: groups.h ../../../pikotools/space/spaceparser.h
groups.o: ../../../pikotools/space/space.h ../../core/log.h
init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h
init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h
init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
init.o: ../../templates/htmltextstream.h ../../core/textstream.h
init.o: ../../core/misc.h ../../../pikotools/confparser/space.h
init.o: ../../core/misc.h ../../../pikotools/space/space.h
init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
init.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
@ -91,7 +91,7 @@ templates.o: ../../core/item.h ../../../ezc/src/functions.h
templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
templates.o: ../../../pikotools/utf8/utf8.h ../../core/misc.h
templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
templates.o: ../../core/item.h ../../../pikotools/confparser/space.h
templates.o: ../../core/item.h ../../../pikotools/space/space.h
templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
templates.o: ../../templates/locale.h ../../templates/changepatterns.h
templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
@ -100,8 +100,8 @@ templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h