Merge branch 'master' into uikit

but this is a temporary fix, the session logger will be moved to Session class

.gitignore

@@ -0,0 +1,6 @@
+.cproject
+.project
+.settings/
+*.o
+*.so
+winixd/winix

winixd/Makefile

@@ -87,6 +87,7 @@ plugins: FORCE
 	@cd plugins/menu      		; $(MAKE) -e
 	@cd plugins/export    		; $(MAKE) -e
 	@cd plugins/mailregister	; $(MAKE) -e
+	@cd plugins/seo	            ; $(MAKE) -e
 
 
 FORCE:
@@ -106,6 +107,7 @@ clean:
 	@cd plugins/menu         ; $(MAKE) -e clean
 	@cd plugins/export       ; $(MAKE) -e clean
 	@cd plugins/mailregister ; $(MAKE) -e clean
+	@cd plugins/seo          ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/ezc/src           ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/tito/src          ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/pikotools         ; $(MAKE) -e clean
@@ -132,6 +134,7 @@ depend:
 	@cd plugins/menu         ; $(MAKE) -e depend
 	@cd plugins/export       ; $(MAKE) -e depend
 	@cd plugins/mailregister ; $(MAKE) -e depend
+	@cd plugins/seo          ; $(MAKE) -e depend
 	@cd $(GLOBAL_WORKING_DIR)/ezc/src           ; $(MAKE) -e depend
 	@cd $(GLOBAL_WORKING_DIR)/tito/src          ; $(MAKE) -e depend
 	@cd $(GLOBAL_WORKING_DIR)/pikotools         ; $(MAKE) -e depend

winixd/core/Makefile.dep

@@ -49,15 +49,16 @@ app.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 app.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 app.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 app.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+app.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+app.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+app.o: ../../../morm/src/fieldvaluehelper.h
 app.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 app.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 app.o: ../../../morm/src/postgresqlexpression.h
-app.o: ../../../morm/src/dochtmlexpression.h
 app.o: ../../../morm/src/jsonconnector.h
 app.o: ../../../morm/src/postgresqlconnector.h
-app.o: ../../../morm/src/postgresqlqueryresult.h
+app.o: ../../../morm/src/postgresqlqueryresult.h ipbancontainer.h
-app.o: ../../../morm/src/dochtmlconnector.h ipbancontainer.h lastcontainer.h
+app.o: lastcontainer.h system.h job.h basethread.h dirs.h dircontainer.h
-app.o: system.h job.h basethread.h dirs.h dircontainer.h
 app.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 app.o: ../../../winix/winixd/db/dbconn.h
 app.o: ../../../winix/winixd/db/dbtextstream.h
@@ -170,15 +171,17 @@ basethread.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 basethread.o: ../../../morm/src/queryresult.h
 basethread.o: ../../../morm/src/flatconnector.h
 basethread.o: ../../../morm/src/dbexpression.h
-basethread.o: ../../../morm/src/baseexpression.h
+basethread.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+basethread.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+basethread.o: ../../../morm/src/finderhelper.h
+basethread.o: ../../../morm/src/fieldvaluehelper.h
 basethread.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-basethread.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+basethread.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+basethread.o: ../../../morm/src/jsonexpression.h
 basethread.o: ../../../morm/src/postgresqlexpression.h
-basethread.o: ../../../morm/src/dochtmlexpression.h
 basethread.o: ../../../morm/src/jsonconnector.h
 basethread.o: ../../../morm/src/postgresqlconnector.h
 basethread.o: ../../../morm/src/postgresqlqueryresult.h
-basethread.o: ../../../morm/src/dochtmlconnector.h
 bbcodeparser.o: bbcodeparser.h htmlfilter.h
 bbcodeparser.o: ../../../winix/winixd/core/winixbase.h
 compress.o: compress.h requesttypes.h
@@ -285,14 +288,15 @@ dirs.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 dirs.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 dirs.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 dirs.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+dirs.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+dirs.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+dirs.o: ../../../morm/src/fieldvaluehelper.h
 dirs.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 dirs.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 dirs.o: ../../../morm/src/postgresqlexpression.h
-dirs.o: ../../../morm/src/dochtmlexpression.h
 dirs.o: ../../../morm/src/jsonconnector.h
 dirs.o: ../../../morm/src/postgresqlconnector.h
 dirs.o: ../../../morm/src/postgresqlqueryresult.h
-dirs.o: ../../../morm/src/dochtmlconnector.h
 dirs.o: ../../../winix/winixd/notify/notify.h
 dirs.o: ../../../winix/winixd/notify/notifypool.h
 dirs.o: ../../../winix/winixd/templates/locale.h
@@ -355,15 +359,17 @@ groups.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 groups.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 groups.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 groups.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-groups.o: ../../../morm/src/baseexpression.h
+groups.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+groups.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+groups.o: ../../../morm/src/finderhelper.h
+groups.o: ../../../morm/src/fieldvaluehelper.h
 groups.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-groups.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+groups.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+groups.o: ../../../morm/src/jsonexpression.h
 groups.o: ../../../morm/src/postgresqlexpression.h
-groups.o: ../../../morm/src/dochtmlexpression.h
 groups.o: ../../../morm/src/jsonconnector.h
 groups.o: ../../../morm/src/postgresqlconnector.h
 groups.o: ../../../morm/src/postgresqlqueryresult.h
-groups.o: ../../../morm/src/dochtmlconnector.h
 htmlfilter.o: htmlfilter.h ../../../winix/winixd/core/winixbase.h
 httpsimpleparser.o: httpsimpleparser.h winixmodel.h
 httpsimpleparser.o: ../../../winix/winixd/core/winixbase.h plugin.h
@@ -391,17 +397,21 @@ httpsimpleparser.o: ../../../morm/src/queryresult.h
 httpsimpleparser.o: ../../../morm/src/flatconnector.h
 httpsimpleparser.o: ../../../morm/src/dbexpression.h
 httpsimpleparser.o: ../../../morm/src/baseexpression.h
+httpsimpleparser.o: ../../../morm/src/modelenv.h
+httpsimpleparser.o: ../../../morm/src/modeldata.h
+httpsimpleparser.o: ../../../morm/src/cursorhelper.h
+httpsimpleparser.o: ../../../morm/src/finderhelper.h
+httpsimpleparser.o: ../../../morm/src/fieldvaluehelper.h
 httpsimpleparser.o: ../../../morm/src/flatexpression.h
-httpsimpleparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+httpsimpleparser.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+httpsimpleparser.o: ../../../morm/src/cursor.h
 httpsimpleparser.o: ../../../morm/src/jsonexpression.h
 httpsimpleparser.o: ../../../morm/src/postgresqlexpression.h
-httpsimpleparser.o: ../../../morm/src/dochtmlexpression.h
 httpsimpleparser.o: ../../../morm/src/jsonconnector.h
 httpsimpleparser.o: ../../../morm/src/postgresqlconnector.h
-httpsimpleparser.o: ../../../morm/src/postgresqlqueryresult.h
+httpsimpleparser.o: ../../../morm/src/postgresqlqueryresult.h misc.h item.h
-httpsimpleparser.o: ../../../morm/src/dochtmlconnector.h misc.h item.h
+httpsimpleparser.o: requesttypes.h winix_const.h
-httpsimpleparser.o: requesttypes.h ../../../pikotools/utf8/utf8.h
+httpsimpleparser.o: ../../../pikotools/convert/convert.h
-httpsimpleparser.o: winix_const.h ../../../pikotools/convert/convert.h
 httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
 httpsimpleparser.o: ../../../pikotools/convert/patternreplacer.h
 httpsimpleparser.o: ../../../pikotools/convert/strtoint.h
@@ -425,17 +435,18 @@ image.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 image.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 image.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 image.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-image.o: ../../../morm/src/baseexpression.h
+image.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+image.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+image.o: ../../../morm/src/finderhelper.h
+image.o: ../../../morm/src/fieldvaluehelper.h
 image.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-image.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+image.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+image.o: ../../../morm/src/jsonexpression.h
 image.o: ../../../morm/src/postgresqlexpression.h
-image.o: ../../../morm/src/dochtmlexpression.h
 image.o: ../../../morm/src/jsonconnector.h
 image.o: ../../../morm/src/postgresqlconnector.h
-image.o: ../../../morm/src/postgresqlqueryresult.h
+image.o: ../../../morm/src/postgresqlqueryresult.h textstream.h misc.h item.h
-image.o: ../../../morm/src/dochtmlconnector.h textstream.h misc.h item.h
+image.o: requesttypes.h winix_const.h ../../../pikotools/convert/convert.h
-image.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
-image.o: ../../../pikotools/convert/convert.h
 image.o: ../../../pikotools/convert/inttostr.h
 image.o: ../../../pikotools/convert/patternreplacer.h
 image.o: ../../../pikotools/convert/strtoint.h
@@ -498,15 +509,18 @@ ipbancontainer.o: ../../../morm/src/queryresult.h
 ipbancontainer.o: ../../../morm/src/flatconnector.h
 ipbancontainer.o: ../../../morm/src/dbexpression.h
 ipbancontainer.o: ../../../morm/src/baseexpression.h
+ipbancontainer.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+ipbancontainer.o: ../../../morm/src/cursorhelper.h
+ipbancontainer.o: ../../../morm/src/finderhelper.h
+ipbancontainer.o: ../../../morm/src/fieldvaluehelper.h
 ipbancontainer.o: ../../../morm/src/flatexpression.h
-ipbancontainer.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+ipbancontainer.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+ipbancontainer.o: ../../../morm/src/cursor.h
 ipbancontainer.o: ../../../morm/src/jsonexpression.h
 ipbancontainer.o: ../../../morm/src/postgresqlexpression.h
-ipbancontainer.o: ../../../morm/src/dochtmlexpression.h
 ipbancontainer.o: ../../../morm/src/jsonconnector.h
 ipbancontainer.o: ../../../morm/src/postgresqlconnector.h
 ipbancontainer.o: ../../../morm/src/postgresqlqueryresult.h
-ipbancontainer.o: ../../../morm/src/dochtmlconnector.h
 item.o: item.h ../../../pikotools/space/space.h
 item.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h
 item.o: misc.h requesttypes.h ../../../pikotools/textstream/textstream.h
@@ -541,15 +555,16 @@ job.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 job.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 job.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 job.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-job.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+job.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-job.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+job.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+job.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+job.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+job.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
 job.o: ../../../morm/src/jsonexpression.h
 job.o: ../../../morm/src/postgresqlexpression.h
-job.o: ../../../morm/src/dochtmlexpression.h
 job.o: ../../../morm/src/jsonconnector.h
 job.o: ../../../morm/src/postgresqlconnector.h
 job.o: ../../../morm/src/postgresqlqueryresult.h
-job.o: ../../../morm/src/dochtmlconnector.h
 lastcontainer.o: lastcontainer.h ../../../pikotools/date/date.h
 lastcontainer.o: ../../../pikotools/convert/inttostr.h winixbase.h
 lastcontainer.o: ../../../winix/winixd/core/config.h
@@ -705,14 +720,16 @@ mountparser.o: ../../../morm/src/queryresult.h
 mountparser.o: ../../../morm/src/flatconnector.h
 mountparser.o: ../../../morm/src/dbexpression.h
 mountparser.o: ../../../morm/src/baseexpression.h
+mountparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+mountparser.o: ../../../morm/src/cursorhelper.h
+mountparser.o: ../../../morm/src/finderhelper.h
+mountparser.o: ../../../morm/src/fieldvaluehelper.h
 mountparser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mountparser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mountparser.o: ../../../morm/src/postgresqlexpression.h
-mountparser.o: ../../../morm/src/dochtmlexpression.h
 mountparser.o: ../../../morm/src/jsonconnector.h
 mountparser.o: ../../../morm/src/postgresqlconnector.h
 mountparser.o: ../../../morm/src/postgresqlqueryresult.h
-mountparser.o: ../../../morm/src/dochtmlconnector.h
 mounts.o: mounts.h mount.h error.h dirs.h item.h
 mounts.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
 mounts.o: ../../../pikotools/convert/inttostr.h dircontainer.h winixbase.h
@@ -754,16 +771,17 @@ mounts.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mounts.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mounts.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mounts.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mounts.o: ../../../morm/src/baseexpression.h
+mounts.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mounts.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mounts.o: ../../../morm/src/finderhelper.h
+mounts.o: ../../../morm/src/fieldvaluehelper.h
 mounts.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mounts.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mounts.o: ../../../morm/src/postgresqlexpression.h
-mounts.o: ../../../morm/src/dochtmlexpression.h
 mounts.o: ../../../morm/src/jsonconnector.h
 mounts.o: ../../../morm/src/postgresqlconnector.h
-mounts.o: ../../../morm/src/postgresqlqueryresult.h
+mounts.o: ../../../morm/src/postgresqlqueryresult.h mountparser.h cur.h
-mounts.o: ../../../morm/src/dochtmlconnector.h mountparser.h cur.h session.h
+mounts.o: session.h user.h rebus.h ipban.h
-mounts.o: user.h rebus.h ipban.h
 plugin.o: plugin.h pluginmsg.h plugindata.h winixbase.h
 plugin.o: ../../../winix/winixd/core/config.h
 plugin.o: ../../../pikotools/space/spaceparser.h
@@ -790,14 +808,15 @@ plugin.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 plugin.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 plugin.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 plugin.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+plugin.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+plugin.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+plugin.o: ../../../morm/src/fieldvaluehelper.h
 plugin.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 plugin.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 plugin.o: ../../../morm/src/postgresqlexpression.h
-plugin.o: ../../../morm/src/dochtmlexpression.h
 plugin.o: ../../../morm/src/jsonconnector.h
 plugin.o: ../../../morm/src/postgresqlconnector.h
-plugin.o: ../../../morm/src/postgresqlqueryresult.h
+plugin.o: ../../../morm/src/postgresqlqueryresult.h dirs.h dircontainer.h
-plugin.o: ../../../morm/src/dochtmlconnector.h dirs.h dircontainer.h
 plugin.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 plugin.o: ../../../winix/winixd/db/dbconn.h
 plugin.o: ../../../winix/winixd/db/dbtextstream.h
@@ -1044,15 +1063,18 @@ sessioncontainer.o: ../../../morm/src/queryresult.h
 sessioncontainer.o: ../../../morm/src/flatconnector.h
 sessioncontainer.o: ../../../morm/src/dbexpression.h
 sessioncontainer.o: ../../../morm/src/baseexpression.h
+sessioncontainer.o: ../../../morm/src/modelenv.h
+sessioncontainer.o: ../../../morm/src/modeldata.h
+sessioncontainer.o: ../../../morm/src/cursorhelper.h
+sessioncontainer.o: ../../../morm/src/finderhelper.h
+sessioncontainer.o: ../../../morm/src/fieldvaluehelper.h
 sessioncontainer.o: ../../../morm/src/flatexpression.h
 sessioncontainer.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 sessioncontainer.o: ../../../morm/src/jsonexpression.h
 sessioncontainer.o: ../../../morm/src/postgresqlexpression.h
-sessioncontainer.o: ../../../morm/src/dochtmlexpression.h
 sessioncontainer.o: ../../../morm/src/jsonconnector.h
 sessioncontainer.o: ../../../morm/src/postgresqlconnector.h
 sessioncontainer.o: ../../../morm/src/postgresqlqueryresult.h
-sessioncontainer.o: ../../../morm/src/dochtmlconnector.h
 sessionidmanager.o: sessionidmanager.h ../../../tito/src/base64.h
 sessionidmanager.o: ../../../pikotools/space/space.h ../../../tito/src/aes.h
 sessionidmanager.o: winixbase.h ../../../winix/winixd/core/config.h
@@ -1111,15 +1133,17 @@ sessionmanager.o: ../../../morm/src/queryresult.h
 sessionmanager.o: ../../../morm/src/flatconnector.h
 sessionmanager.o: ../../../morm/src/dbexpression.h
 sessionmanager.o: ../../../morm/src/baseexpression.h
+sessionmanager.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+sessionmanager.o: ../../../morm/src/cursorhelper.h
+sessionmanager.o: ../../../morm/src/finderhelper.h
+sessionmanager.o: ../../../morm/src/fieldvaluehelper.h
 sessionmanager.o: ../../../morm/src/flatexpression.h
 sessionmanager.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 sessionmanager.o: ../../../morm/src/jsonexpression.h
 sessionmanager.o: ../../../morm/src/postgresqlexpression.h
-sessionmanager.o: ../../../morm/src/dochtmlexpression.h
 sessionmanager.o: ../../../morm/src/jsonconnector.h
 sessionmanager.o: ../../../morm/src/postgresqlconnector.h
-sessionmanager.o: ../../../morm/src/postgresqlqueryresult.h
+sessionmanager.o: ../../../morm/src/postgresqlqueryresult.h ipbancontainer.h
-sessionmanager.o: ../../../morm/src/dochtmlconnector.h ipbancontainer.h
 sessionmanager.o: lastcontainer.h system.h job.h basethread.h dirs.h
 sessionmanager.o: dircontainer.h ../../../winix/winixd/db/db.h
 sessionmanager.o: ../../../winix/winixd/db/dbbase.h
@@ -1199,16 +1223,18 @@ sessionparser.o: ../../../morm/src/queryresult.h
 sessionparser.o: ../../../morm/src/flatconnector.h
 sessionparser.o: ../../../morm/src/dbexpression.h
 sessionparser.o: ../../../morm/src/baseexpression.h
+sessionparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+sessionparser.o: ../../../morm/src/cursorhelper.h
+sessionparser.o: ../../../morm/src/finderhelper.h
+sessionparser.o: ../../../morm/src/fieldvaluehelper.h
 sessionparser.o: ../../../morm/src/flatexpression.h
 sessionparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 sessionparser.o: ../../../morm/src/jsonexpression.h
 sessionparser.o: ../../../morm/src/postgresqlexpression.h
-sessionparser.o: ../../../morm/src/dochtmlexpression.h
 sessionparser.o: ../../../morm/src/jsonconnector.h
 sessionparser.o: ../../../morm/src/postgresqlconnector.h
-sessionparser.o: ../../../morm/src/postgresqlqueryresult.h
+sessionparser.o: ../../../morm/src/postgresqlqueryresult.h users.h
-sessionparser.o: ../../../morm/src/dochtmlconnector.h users.h ugcontainer.h
+sessionparser.o: ugcontainer.h lastcontainer.h ../../../winix/winixd/db/db.h
-sessionparser.o: lastcontainer.h ../../../winix/winixd/db/db.h
 sessionparser.o: ../../../winix/winixd/db/dbbase.h
 sessionparser.o: ../../../winix/winixd/db/dbconn.h
 sessionparser.o: ../../../winix/winixd/db/dbtextstream.h
@@ -1267,16 +1293,18 @@ system.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 system.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 system.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 system.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+system.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+system.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+system.o: ../../../morm/src/fieldvaluehelper.h
 system.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-system.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+system.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+system.o: ../../../morm/src/jsonexpression.h
 system.o: ../../../morm/src/postgresqlexpression.h
-system.o: ../../../morm/src/dochtmlexpression.h
 system.o: ../../../morm/src/jsonconnector.h
 system.o: ../../../morm/src/postgresqlconnector.h
-system.o: ../../../morm/src/postgresqlqueryresult.h
+system.o: ../../../morm/src/postgresqlqueryresult.h dirs.h item.h
-system.o: ../../../morm/src/dochtmlconnector.h dirs.h item.h dircontainer.h
+system.o: dircontainer.h ../../../winix/winixd/db/db.h
-system.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
+system.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
-system.o: ../../../winix/winixd/db/dbconn.h
 system.o: ../../../winix/winixd/db/dbtextstream.h
 system.o: ../../../winix/winixd/core/textstream.h
 system.o: ../../../winix/winixd/core/error.h
@@ -1287,8 +1315,8 @@ system.o: ../../../winix/winixd/core/user.h
 system.o: ../../../winix/winixd/core/group.h
 system.o: ../../../winix/winixd/core/dircontainer.h
 system.o: ../../../winix/winixd/core/ugcontainer.h request.h requesttypes.h
-system.o: error.h config.h textstream.h misc.h ../../../pikotools/utf8/utf8.h
+system.o: error.h config.h textstream.h misc.h winix_const.h
-system.o: winix_const.h ../../../pikotools/convert/convert.h
+system.o: ../../../pikotools/convert/convert.h
 system.o: ../../../pikotools/convert/inttostr.h
 system.o: ../../../pikotools/convert/patternreplacer.h
 system.o: ../../../pikotools/convert/strtoint.h
@@ -1397,15 +1425,18 @@ threadmanager.o: ../../../morm/src/queryresult.h
 threadmanager.o: ../../../morm/src/flatconnector.h
 threadmanager.o: ../../../morm/src/dbexpression.h
 threadmanager.o: ../../../morm/src/baseexpression.h
+threadmanager.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+threadmanager.o: ../../../morm/src/cursorhelper.h
+threadmanager.o: ../../../morm/src/finderhelper.h
+threadmanager.o: ../../../morm/src/fieldvaluehelper.h
 threadmanager.o: ../../../morm/src/flatexpression.h
-threadmanager.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+threadmanager.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+threadmanager.o: ../../../morm/src/cursor.h
 threadmanager.o: ../../../morm/src/jsonexpression.h
 threadmanager.o: ../../../morm/src/postgresqlexpression.h
-threadmanager.o: ../../../morm/src/dochtmlexpression.h
 threadmanager.o: ../../../morm/src/jsonconnector.h
 threadmanager.o: ../../../morm/src/postgresqlconnector.h
 threadmanager.o: ../../../morm/src/postgresqlqueryresult.h
-threadmanager.o: ../../../morm/src/dochtmlconnector.h
 timezone.o: timezone.h ../../../pikotools/date/date.h
 timezone.o: ../../../pikotools/convert/inttostr.h
 timezone.o: ../../../pikotools/space/space.h misc.h item.h requesttypes.h
@@ -1481,14 +1512,15 @@ users.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 users.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 users.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 users.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+users.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+users.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+users.o: ../../../morm/src/fieldvaluehelper.h
 users.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 users.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 users.o: ../../../morm/src/postgresqlexpression.h
-users.o: ../../../morm/src/dochtmlexpression.h
 users.o: ../../../morm/src/jsonconnector.h
 users.o: ../../../morm/src/postgresqlconnector.h
-users.o: ../../../morm/src/postgresqlqueryresult.h
+users.o: ../../../morm/src/postgresqlqueryresult.h sessionmanager.h
-users.o: ../../../morm/src/dochtmlconnector.h sessionmanager.h
 users.o: sessioncontainer.h ipbancontainer.h system.h job.h basethread.h
 users.o: dirs.h dircontainer.h mounts.h mountparser.h crypt.h run.h groups.h
 users.o: group.h loadavg.h image.h threadmanager.h
@@ -1545,15 +1577,17 @@ winixmodel.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 winixmodel.o: ../../../morm/src/queryresult.h
 winixmodel.o: ../../../morm/src/flatconnector.h
 winixmodel.o: ../../../morm/src/dbexpression.h
-winixmodel.o: ../../../morm/src/baseexpression.h
+winixmodel.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+winixmodel.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+winixmodel.o: ../../../morm/src/finderhelper.h
+winixmodel.o: ../../../morm/src/fieldvaluehelper.h
 winixmodel.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-winixmodel.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+winixmodel.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+winixmodel.o: ../../../morm/src/jsonexpression.h
 winixmodel.o: ../../../morm/src/postgresqlexpression.h
-winixmodel.o: ../../../morm/src/dochtmlexpression.h
 winixmodel.o: ../../../morm/src/jsonconnector.h
 winixmodel.o: ../../../morm/src/postgresqlconnector.h
 winixmodel.o: ../../../morm/src/postgresqlqueryresult.h
-winixmodel.o: ../../../morm/src/dochtmlconnector.h
 winixrequest.o: winixrequest.h
 winixsystem.o: winixsystem.h ../../../winix/winixd/core/winixmodel.h
 winixsystem.o: ../../../winix/winixd/core/system.h

winixd/core/app.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -151,10 +151,8 @@ App::App()
 
 	session_manager.set_dependency(&winix_model); // zobaczyc czy wskoczy do przeciazonej metody w session manager
 	session_manager.SetLastContainer(&system.users.last);
-	session_manager.SetConfig(&config);
 	session_manager.SetCur(&cur);
 	session_manager.SetSystem(&system);
-	session_manager.SetSynchro(&synchro);
 
 	post_multi_parser.set_dependency(&winix_base);
 	post_multi_parser.SetConfig(&config);
@@ -500,10 +498,10 @@ void App::ProcessRequestThrow()
 			if( !cur.request->dir_tab.empty() )
 			{
 				cur.mount = system.mounts.CalcCurMount();
-				functions.CheckFunctionAndSymlink();
 
-				session_manager.PrepareSession();
+				cur.session = session_manager.PrepareSession();
-				cur.session = session_manager.GetCurSession();
+				functions.CheckFunctionAndSymlink(); // here a function can be changed
+				cur.session = session_manager.CheckIfFunctionRequireSession();
 				SetLocale();
 
 				if( cur.session->new_session )
@@ -567,7 +565,7 @@ void App::ProcessRequest()
 		log << log2 << config.log_delimiter << logend;
 
 		ProcessRequestThrow();
-		SaveSessionsIfNeeded(); // !! IMPROVE ME move to the session's thread
+		SaveSessionsIfNeeded();
 
 		system.load_avg.StopRequest();
 	}
@@ -1097,14 +1095,21 @@ void App::ReadPostJson()
 	}
 	while( read_len == buffer_len );
 
-	PT::JSONToSpaceParser::Status status = post_json_parser.ParseString(post_buffer.c_str());
+	if( !post_buffer.empty() )
-	post_buffer.clear();
-
-	if( status != PT::JSONToSpaceParser::ok )
 	{
-		log << log1 << "App: cannot parse the input stream as a JSON object, status: " << (int)status << logend;
+		PT::JSONToSpaceParser::Status status = post_json_parser.ParseString(post_buffer.c_str());
-		cur.request->post_in.Clear();
+		post_buffer.clear();
-		// return an error (http error of some kind?)
+
+		if( status != PT::JSONToSpaceParser::ok )
+		{
+			log << log1 << "App: cannot parse the input stream as a JSON object, status: " << (int)status << logend;
+			cur.request->post_in.Clear();
+			// return an error (http error of some kind?)
+		}
+	}
+	else
+	{
+		log << log3 << "App: input body empty (skipping parsing)" << logend;
 	}
 }
 

winixd/core/basethread.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -54,13 +54,17 @@ BaseThread::~BaseThread()
 }
 
 
-
+void BaseThread::set_main_log_buffer(PT::WTextStream * log_buffer)
-void BaseThread::SetSynchro(Synchro * psynchro)
 {
-	synchro = psynchro;
+	main_log.SetLogBuffer(log_buffer);
 }
 
 
+void BaseThread::set_main_file_log(PT::FileLog * file_log)
+{
+	main_log.SetFileLog(file_log);
+}
+
 
 void BaseThread::Mode(int mode)
 {

winixd/core/basethread.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -54,8 +54,9 @@ public:
 	BaseThread();
 	virtual ~BaseThread();
 
-	// synchro object (must be set)
+	void set_main_log_buffer(PT::WTextStream * log_buffer);
-	void SetSynchro(Synchro * psynchro);
+	void set_main_file_log(PT::FileLog * file_log);
+
 
 	// work mode
 	// we have two modes:
@@ -100,6 +101,13 @@ public:
 	pthread_t ThreadId();
 
 
+protected:
+
+	// logger for the main thread
+	Log main_log;
+
+	// log from WinixBase is meant to be used by the other thread
+
 
 protected:
 
@@ -126,7 +134,6 @@ protected:
 
 protected:
 
-	Synchro * synchro;
 	pthread_t thread_id; // thread id - set by StartThread()
 	pthread_cond_t thread_signal;
 	int work_mode;

winixd/core/filelog.cpp

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2019, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ PT::Date FileLog::get_local_date(const PT::Date & date)
 {
 	if( time_zones )
 	{
+		Lock lock(synchro);
 		TimeZone * tz = time_zones->GetZone(log_time_zone_id);
 
 		if( tz )

winixd/core/job.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2012-2014, Tomasz Sowa
+ * Copyright (c) 2012-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -183,9 +183,7 @@ void Job::DoJob(PT::Space & job)
 // second thread (objects not locked)
 void Job::DoWinixJob(PT::Space & job)
 {
-	Lock();
 	//log << log1 << "standard winix job: " << job.Text(L"type") << logend;
-	Unlock();
 }
 
 

winixd/core/log.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ void Log::PrintDate(const PT::Date & date)
 	FileLog * winix_file_log = dynamic_cast<FileLog*>(file_log);
 
 	if( winix_file_log )
-		(*this) << winix_file_log->get_local_date(date);
+		(*this) << winix_file_log->get_local_date(date); // synchronization is made in get_local_date
 	else
 		(*this) << date;
 }
@@ -250,17 +250,18 @@ return *this;
 }
 
 
-Log & Log::SystemErr(int err)
+//Log & Log::SystemErr(int err)
-{
+//{
-	(*this) << "errno: " << err;
+//	(*this) << "errno: " << err;
-
+//
-	const char * err_msg = strerror(err);
+//  // strerror is not thread safe and we now use Log in each thread
-
+//	const char * err_msg = strerror(err);
-	if( err_msg )
+//
-		(*this) << " (" << err_msg << ")";
+//	if( err_msg )
-
+//		(*this) << " (" << err_msg << ")";
-	return *this;
+//
-}
+//	return *this;
+//}
 
 
 

winixd/core/log.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@ public:
 	virtual Log & LogBinary(const char * blob, size_t blob_len);
 	virtual Log & LogBinary(const std::string & blob);
 
-	virtual Log & SystemErr(int err);
+	//virtual Log & SystemErr(int err);
 
 
 private:

winixd/core/sessionmanager.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -77,13 +77,6 @@ void SessionManager::SetCur(Cur * pcur)
 }
 
 
-void SessionManager::SetConfig(Config * pconfig)
-{
-	config = pconfig;
-	session_tab.SetConfig(pconfig);
-}
-
-
 void SessionManager::SetSystem(System * psystem)
 {
 	system = psystem;
@@ -195,7 +188,7 @@ SessionContainer::Iterator i = session_tab.End();
 	}
 	else
 	{
-		log << log2 << "SM: sessions limit exceeded (" << config->session_max << ")" << logend;
+		main_log << log2 << "SM: sessions limit exceeded (" << config->session_max << ")" << logend;
 	}
 
 	if( i != session_tab.End() )
@@ -206,12 +199,12 @@ SessionContainer::Iterator i = session_tab.End();
 		session->id_index = (unsigned int)session->id;
 		session->id_index += std::rand();
 
-		log << log2 << "SM: created a new session: " << session->id << logend;
+		main_log << log2 << "SM: created a new session: " << session->id << logend;
 	}
 	else
 	{
 		// there is a problem with generating a new session id
-		log << log1 << "SM: cannot create a session id" << logend;
+		main_log << log1 << "SM: cannot create a session id" << logend;
 	}
 }
 
@@ -223,7 +216,7 @@ void SessionManager::SetTemporarySession()
 	session->SetTimesTo(cur->request->start_time);
 	session->new_session = false; // temporary session was initialized at the beginning
 
-	log << log2 << "SM: using temporary session" << logend;
+	main_log << log2 << "SM: using temporary session" << logend;
 }
 
 
@@ -242,15 +235,15 @@ return difference;
 
 void SessionManager::SetSessionPutLogInfo(Session & ses, bool has_index, unsigned int difference)
 {
-	log << log2 << "SM: session: " << ses.id;
+	main_log << log2 << "SM: session: " << ses.id;
 
 	if( has_index )
-		log << ", index difference: " << (size_t)difference;
+		main_log << ", index difference: " << (size_t)difference;
 
 	if( ses.puser )
-		log << log2 << ", user: " << ses.puser->name << ", id: " << ses.puser->id;
+		main_log << log2 << ", user: " << ses.puser->name << ", id: " << ses.puser->id;
 
-	log << log2 << logend;
+	main_log << log2 << logend;
 }
 
 
@@ -264,7 +257,7 @@ void SessionManager::IncrementBanLevel(IPBan * ip_ban)
 							  cur->request->start_time + (time_t)config->ban_level_3_delay);
 
 	PT::Date date(ip_ban->expires);
-	log << log2 << "SM: this IP address has been banned to: " << date << " UTC" << logend;
+	main_log << log2 << "SM: this IP address has been banned to: " << date << " UTC" << logend;
 }
 
 
@@ -290,7 +283,7 @@ void SessionManager::BrokenCookieCheckBan()
 	}
 	else
 	{
-		log << log2 << "SM: too many incorrect encoded cookies were sent from this IP" << logend;
+		main_log << log2 << "SM: too many incorrect encoded cookies were sent from this IP" << logend;
 		IncrementBanLevel(current_ip_ban);
 	}
 }
@@ -308,14 +301,14 @@ void SessionManager::IncorrectSessionCheckBan()
 	}
 	else
 	{
-		log << log2 << "SM: too many incorrect sessions identifiers were sent from this IP" << logend;
+		main_log << log2 << "SM: too many incorrect sessions identifiers were sent from this IP" << logend;
 		IncrementBanLevel(current_ip_ban);
 	}
 }
 
 
 
-bool SessionManager::ShouldNoSessionCookieGenerateTmpSession()
+void SessionManager::NoSessionCookieWasSent()
 {
 	if( !current_ip_ban )
 		current_ip_ban = &AddIPToBanList(cur->request->ip, cur->request->start_time);
@@ -324,16 +317,13 @@ bool SessionManager::ShouldNoSessionCookieGenerateTmpSession()
 	{
 		current_ip_ban->no_session_cookie_events += 1;
 		SetFirstExpirationTime(current_ip_ban);
-		return false;
 	}
 	else
 	{
-		log << log2 << "SM: too many times you have not sent a session cookie" << logend;
+		main_log << log2 << "SM: too many times you have not sent a session cookie" << logend;
 
 		if( config->no_session_cookie_ban_mode == 1 )
 			IncrementBanLevel(current_ip_ban);
-
-		return true;
 	}
 }
 
@@ -346,21 +336,21 @@ bool SessionManager::IsSessionCorrect(long id, bool has_index, unsigned int inde
 
 	if( id == 0 )
 	{
-		log << log3 << "SM: id 0 is reserved for the temporary session" << logend;
+		main_log << log3 << "SM: id 0 is reserved for the temporary session" << logend;
 		IncorrectSessionCheckBan();
 		return false;
 	}
 
 	if( s == session_tab.End() )
 	{
-		log << log3 << "SM: there is no a session with id: " << id << logend;
+		main_log << log3 << "SM: there is no a session with id: " << id << logend;
 		IncorrectSessionCheckBan();
 		return false;
 	}
 
 	if( s->remove_me )
 	{
-		log << log3 << "SM: session: " << id << " is marked for removing" << logend;
+		main_log << log3 << "SM: session: " << id << " is marked for removing" << logend;
 		return false;
 	}
 	
@@ -370,7 +360,7 @@ bool SessionManager::IsSessionCorrect(long id, bool has_index, unsigned int inde
 
 		if( (size_t)difference > config->session_allow_index_difference )
 		{
-			log << log2 << "SM: an incorrect session index for session: " << id
+			main_log << log2 << "SM: an incorrect session index for session: " << id
 				<< ", index difference: " << (size_t)difference << logend;
 
 			IncorrectSessionCheckBan();
@@ -423,7 +413,7 @@ bool SessionManager::SetSessionFromCookie(const std::wstring & cookie)
 
 		if( !session_id_manager.DecodeToken(cookie, id, index) )
 		{
-			log << log2 << "SM: an incorrect cookie string was sent" << logend;
+			main_log << log2 << "SM: an incorrect cookie string was sent" << logend;
 			BrokenCookieCheckBan();
 			return false;
 		}
@@ -448,14 +438,14 @@ bool SessionManager::IsIPBanned()
 
 		if( current_ip_ban->expires != 0 && cur->request->start_time >= current_ip_ban->expires )
 		{
-			log << log2 << "SM: resetting events counters for this IP" << logend;
+			main_log << log2 << "SM: resetting events counters for this IP" << logend;
 			current_ip_ban->ResetEventsCounters();
 		}
 		else
 		if( current_ip_ban->IsIPBanned() )
 		{
 			PT::Date date = current_ip_ban->expires;
-			log << log2 << "SM: this ip is bannned to: " << date << " UTC" << logend;
+			main_log << log2 << "SM: this ip is bannned to: " << date << " UTC" << logend;
 			return true;
 		}
 	}
@@ -480,11 +470,11 @@ return false;
  * so we always have a session
  *
  */
-void SessionManager::PrepareSession()
+Session * SessionManager::PrepareSession()
 {
 	session = nullptr;
 
-	if( !IsIPBanned() && cur->request->function )
+	if( !IsIPBanned() )
 	{
 		CookieTab::iterator i = cur->request->cookie_tab.find(config->http_session_id_name);
 
@@ -493,39 +483,54 @@ void SessionManager::PrepareSession()
 			if( !SetSessionFromCookie(i->second) )
 			{
 				cur->request->cookie_tab.erase(i);
-
-				if( cur->request->function->need_session )
-				{
-					// IP could be banned in SetSessionFromCookie() when the cookie string was incorrect
-					if( !current_ip_ban || !current_ip_ban->IsIPBanned() )
-					{
-						CreateSession();
-					}
-				}
 			}
 		}
 		else
 		{
-			if( cur->request->function->need_session )
+			if( cur->request->function && cur->request->function->need_session )
 			{
-				if( !ShouldNoSessionCookieGenerateTmpSession() )
+				NoSessionCookieWasSent();
-				{
-					CreateSession();
-				}
 			}
 		}
 	}
 
+	if( !session && cur->request->function && cur->request->function->need_session )
+	{
+		if( !current_ip_ban || !current_ip_ban->IsIPBanned() )
+		{
+			CreateSession();
+		}
+	}
+
 	if( !session )
 	{
 		SetTemporarySession();
 	}
 
 	session->ip_ban = current_ip_ban;
+	return session;
 }
 
 
 
+Session * SessionManager::CheckIfFunctionRequireSession()
+{
+	if( cur->request->function && cur->request->function->need_session )
+	{
+		if( session == &temporary_session )
+		{
+			if( !current_ip_ban || !current_ip_ban->IsIPBanned() )
+			{
+				CreateSession();
+				session->ip_ban = current_ip_ban;
+			}
+		}
+	}
+
+	return session;
+}
+
+
 Session * SessionManager::FindSession(long id)
 {
 	SessionContainer::Iterator i = session_tab.FindById(id);
@@ -596,11 +601,11 @@ SessionContainer::Iterator i = session_tab.FindById(old_id);
 		if( changed )
 			plugin->Call(&(*i), WINIX_SESSION_CHANGED_ID, old_id, new_id);
 		else
-			log << log1 << "SM: I cannot create a new session id (still uses old one)" << logend;
+			main_log << log1 << "SM: I cannot create a new session id (still uses old one)" << logend;
 	}
 	else
 	{
-		log << log2 << "SM: there is no a session with id: " << old_id << logend;
+		main_log << log2 << "SM: there is no a session with id: " << old_id << logend;
 	}
 
 return changed;
@@ -611,7 +616,7 @@ void SessionManager::InitTmpSession()
 {
 	Session * old_session = cur->session;
 
-	log << log4 << "SM: initializing temporary session" << logend;
+	main_log << log4 << "SM: initializing temporary session" << logend;
 	cur->session = &temporary_session;
 	plugin->Call(WINIX_SESSION_CREATED);
 
@@ -624,7 +629,7 @@ void SessionManager::UninitTmpSession()
 {
 	Session * old_session = cur->session;
 
-	log << log4 << "SM: uninitializing temporary session" << logend;
+	main_log << log4 << "SM: uninitializing temporary session" << logend;
 	cur->session = &temporary_session;
 
 
@@ -690,11 +695,11 @@ char file_path[WINIX_OS_PATH_SIZE];
 
 	if( !file )
 	{
-		log << log1 << "SM: cannot open the session file for writing - sessions lost" << logend;
+		main_log << log1 << "SM: cannot open the session file for writing - sessions lost" << logend;
 		return;
 	}
 
-	log << log2 << "SM: saving sessions" << logend;
+	main_log << log2 << "SM: saving sessions" << logend;
 	long len = 0;
 
 	SessionContainer::Iterator i = session_tab.Begin();
@@ -714,7 +719,7 @@ char file_path[WINIX_OS_PATH_SIZE];
 	file.close();
 	chmod(file_path, 0600);
 
-	log << log2 << "SM: saved " << len << " session(s)" << logend;
+	main_log << log2 << "SM: saved " << len << " session(s)" << logend;
 }
 
 

winixd/core/sessionmanager.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,6 @@ public:
 	SessionManager();
 
 	void SetCur(Cur * pcur);
-	void SetConfig(Config * pconfig);
 	void SetSystem(System * psystem);
 	void SetLastContainer(LastContainer * plast_container);
 
@@ -71,7 +70,12 @@ public:
 	// can return a null pointer
 	Session * FindSession(long id);
 
-	void PrepareSession();
+	Session * PrepareSession();
+
+	// some functions require a session (need_session flag) so if there was
+	// a temporary session and a function requires a session then we create a new session
+	Session * CheckIfFunctionRequireSession();
+
 	void DeleteSessions(); // deleting all sessions
 	bool ChangeSessionId(long old_id);
 
@@ -108,7 +112,6 @@ public:
 
 private:
 
-	Config  * config;
 	Cur     * cur;
 	System  * system;
 	LastContainer * last_container;
@@ -133,7 +136,7 @@ private:
 	void SetFirstExpirationTime(IPBan * ip_ban);
 	void BrokenCookieCheckBan();
 	void IncorrectSessionCheckBan();
-	bool ShouldNoSessionCookieGenerateTmpSession();
+	void NoSessionCookieWasSent();
 
 
 	/*

winixd/core/threadmanager.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2018, Tomasz Sowa
+ * Copyright (c) 2011-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -72,27 +72,31 @@ sigset_t set;
 
 void ThreadManager::Add(BaseThread * pbase, const wchar_t * thread_name)
 {
-ThreadItem item;
+	thread_tab.emplace_back();
+	ThreadItem & item = thread_tab.back();
+	item.thread_item_data = new ThreadItemData();
+	ThreadItemData & data = *item.thread_item_data;
 
 	item.object = pbase;
 	item.name   = thread_name;
+	item.object->set_dependency(this);
 
-	thread_tab.push_back(item);
+	// main log buffer (from the main thread)
-	thread_tab.back().thread_item_data = new ThreadItemData();
+	item.object->set_main_log_buffer(log.GetLogBuffer());
-	thread_tab.back().object->set_dependency(this);
+	item.object->set_main_file_log(log.GetFileLog());
 
 	// the logger buffer and model_connector are different
-	ThreadItemData & data = *thread_tab.back().thread_item_data;
+	item.object->set_log_buffer(&data.log_buffer);
-	thread_tab.back().object->set_log_buffer(&data.log_buffer);
 
 	//data.postgresql_connector.set_logger(logger);
 	data.postgresql_connector.set_conn_param(config->db_database, config->db_user, config->db_pass);
-	data.postgresql_connector.set_logger(thread_tab.back().object->get_logger());
+	data.postgresql_connector.set_logger(item.object->get_logger());
 	data.postgresql_connector.set_log_queries(config->log_db_query);
 	data.postgresql_connector.wait_for_connection();
 	data.model_connector.set_db_connector(data.postgresql_connector);
 	data.model_connector.set_flat_connector(data.json_connector);
-	thread_tab.back().object->set_model_connector(&data.model_connector);
+
+	item.object->set_model_connector(&data.model_connector);
 
 	if( were_started )
 	{
@@ -144,8 +148,6 @@ void ThreadManager::StartAll()
 
 void ThreadManager::Start(int id, ThreadItem * item)
 {
-	item->object->SetSynchro(synchro);
-
 	if( item->object->StartThread() )
 	{
 		log << log4 << "TM: thread " << id << " (" << item->object->ThreadId() << ", name: "

winixd/core/version.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@ namespace Winix
 
 #define WINIX_VER_MAJOR		0
 #define WINIX_VER_MINOR		7
-#define WINIX_VER_REVISION	0
+#define WINIX_VER_REVISION	1
 
 
 

winixd/functions/Makefile.dep

@@ -58,15 +58,16 @@ account.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 account.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 account.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 account.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-account.o: ../../../morm/src/baseexpression.h
+account.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+account.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+account.o: ../../../morm/src/finderhelper.h
+account.o: ../../../morm/src/fieldvaluehelper.h
 account.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 account.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 account.o: ../../../morm/src/postgresqlexpression.h
-account.o: ../../../morm/src/dochtmlexpression.h
 account.o: ../../../morm/src/jsonconnector.h
 account.o: ../../../morm/src/postgresqlconnector.h
 account.o: ../../../morm/src/postgresqlqueryresult.h
-account.o: ../../../morm/src/dochtmlconnector.h
 account.o: ../../../winix/winixd/core/dirs.h
 account.o: ../../../winix/winixd/core/dircontainer.h
 account.o: ../../../winix/winixd/core/request.h
@@ -177,15 +178,16 @@ adduser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 adduser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 adduser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 adduser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-adduser.o: ../../../morm/src/baseexpression.h
+adduser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+adduser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+adduser.o: ../../../morm/src/finderhelper.h
+adduser.o: ../../../morm/src/fieldvaluehelper.h
 adduser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 adduser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 adduser.o: ../../../morm/src/postgresqlexpression.h
-adduser.o: ../../../morm/src/dochtmlexpression.h
 adduser.o: ../../../morm/src/jsonconnector.h
 adduser.o: ../../../morm/src/postgresqlconnector.h
 adduser.o: ../../../morm/src/postgresqlqueryresult.h
-adduser.o: ../../../morm/src/dochtmlconnector.h
 adduser.o: ../../../winix/winixd/core/dirs.h
 adduser.o: ../../../winix/winixd/core/dircontainer.h
 adduser.o: ../../../winix/winixd/core/request.h
@@ -287,15 +289,16 @@ cat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 cat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 cat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 cat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-cat.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+cat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-cat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+cat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-cat.o: ../../../morm/src/jsonexpression.h
+cat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+cat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+cat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 cat.o: ../../../morm/src/postgresqlexpression.h
-cat.o: ../../../morm/src/dochtmlexpression.h
 cat.o: ../../../morm/src/jsonconnector.h
 cat.o: ../../../morm/src/postgresqlconnector.h
 cat.o: ../../../morm/src/postgresqlqueryresult.h
-cat.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+cat.o: ../../../winix/winixd/core/dirs.h
 cat.o: ../../../winix/winixd/core/dircontainer.h
 cat.o: ../../../winix/winixd/core/request.h
 cat.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -394,15 +397,16 @@ chmod.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 chmod.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 chmod.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 chmod.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-chmod.o: ../../../morm/src/baseexpression.h
+chmod.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+chmod.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+chmod.o: ../../../morm/src/finderhelper.h
+chmod.o: ../../../morm/src/fieldvaluehelper.h
 chmod.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 chmod.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 chmod.o: ../../../morm/src/postgresqlexpression.h
-chmod.o: ../../../morm/src/dochtmlexpression.h
 chmod.o: ../../../morm/src/jsonconnector.h
 chmod.o: ../../../morm/src/postgresqlconnector.h
 chmod.o: ../../../morm/src/postgresqlqueryresult.h
-chmod.o: ../../../morm/src/dochtmlconnector.h
 chmod.o: ../../../winix/winixd/core/dirs.h
 chmod.o: ../../../winix/winixd/core/dircontainer.h
 chmod.o: ../../../winix/winixd/core/request.h
@@ -504,15 +508,16 @@ chown.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 chown.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 chown.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 chown.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-chown.o: ../../../morm/src/baseexpression.h
+chown.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+chown.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+chown.o: ../../../morm/src/finderhelper.h
+chown.o: ../../../morm/src/fieldvaluehelper.h
 chown.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 chown.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 chown.o: ../../../morm/src/postgresqlexpression.h
-chown.o: ../../../morm/src/dochtmlexpression.h
 chown.o: ../../../morm/src/jsonconnector.h
 chown.o: ../../../morm/src/postgresqlconnector.h
 chown.o: ../../../morm/src/postgresqlqueryresult.h
-chown.o: ../../../morm/src/dochtmlconnector.h
 chown.o: ../../../winix/winixd/core/dirs.h
 chown.o: ../../../winix/winixd/core/dircontainer.h
 chown.o: ../../../winix/winixd/core/request.h
@@ -621,15 +626,16 @@ ckeditor.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ckeditor.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ckeditor.o: ../../../morm/src/flatconnector.h
 ckeditor.o: ../../../morm/src/dbexpression.h
-ckeditor.o: ../../../morm/src/baseexpression.h
+ckeditor.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+ckeditor.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+ckeditor.o: ../../../morm/src/finderhelper.h
+ckeditor.o: ../../../morm/src/fieldvaluehelper.h
 ckeditor.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 ckeditor.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ckeditor.o: ../../../morm/src/postgresqlexpression.h
-ckeditor.o: ../../../morm/src/dochtmlexpression.h
 ckeditor.o: ../../../morm/src/jsonconnector.h
 ckeditor.o: ../../../morm/src/postgresqlconnector.h
 ckeditor.o: ../../../morm/src/postgresqlqueryresult.h
-ckeditor.o: ../../../morm/src/dochtmlconnector.h
 ckeditor.o: ../../../winix/winixd/core/dirs.h
 ckeditor.o: ../../../winix/winixd/core/dircontainer.h
 ckeditor.o: ../../../winix/winixd/core/request.h
@@ -727,14 +733,16 @@ cp.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 cp.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 cp.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 cp.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-cp.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+cp.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-cp.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+cp.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-cp.o: ../../../morm/src/jsonexpression.h
+cp.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+cp.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+cp.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 cp.o: ../../../morm/src/postgresqlexpression.h
-cp.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+cp.o: ../../../morm/src/jsonconnector.h
 cp.o: ../../../morm/src/postgresqlconnector.h
 cp.o: ../../../morm/src/postgresqlqueryresult.h
-cp.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+cp.o: ../../../winix/winixd/core/dirs.h
 cp.o: ../../../winix/winixd/core/dircontainer.h
 cp.o: ../../../winix/winixd/core/request.h
 cp.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -839,15 +847,16 @@ default.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 default.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 default.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 default.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-default.o: ../../../morm/src/baseexpression.h
+default.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+default.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+default.o: ../../../morm/src/finderhelper.h
+default.o: ../../../morm/src/fieldvaluehelper.h
 default.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 default.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 default.o: ../../../morm/src/postgresqlexpression.h
-default.o: ../../../morm/src/dochtmlexpression.h
 default.o: ../../../morm/src/jsonconnector.h
 default.o: ../../../morm/src/postgresqlconnector.h
 default.o: ../../../morm/src/postgresqlqueryresult.h
-default.o: ../../../morm/src/dochtmlconnector.h
 default.o: ../../../winix/winixd/core/dirs.h
 default.o: ../../../winix/winixd/core/dircontainer.h
 default.o: ../../../winix/winixd/core/request.h
@@ -957,15 +966,16 @@ download.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 download.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 download.o: ../../../morm/src/flatconnector.h
 download.o: ../../../morm/src/dbexpression.h
-download.o: ../../../morm/src/baseexpression.h
+download.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+download.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+download.o: ../../../morm/src/finderhelper.h
+download.o: ../../../morm/src/fieldvaluehelper.h
 download.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 download.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 download.o: ../../../morm/src/postgresqlexpression.h
-download.o: ../../../morm/src/dochtmlexpression.h
 download.o: ../../../morm/src/jsonconnector.h
 download.o: ../../../morm/src/postgresqlconnector.h
 download.o: ../../../morm/src/postgresqlqueryresult.h
-download.o: ../../../morm/src/dochtmlconnector.h
 download.o: ../../../winix/winixd/core/dirs.h
 download.o: ../../../winix/winixd/core/dircontainer.h
 download.o: ../../../winix/winixd/core/request.h
@@ -1068,15 +1078,16 @@ emacs.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 emacs.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 emacs.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 emacs.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-emacs.o: ../../../morm/src/baseexpression.h
+emacs.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+emacs.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+emacs.o: ../../../morm/src/finderhelper.h
+emacs.o: ../../../morm/src/fieldvaluehelper.h
 emacs.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 emacs.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 emacs.o: ../../../morm/src/postgresqlexpression.h
-emacs.o: ../../../morm/src/dochtmlexpression.h
 emacs.o: ../../../morm/src/jsonconnector.h
 emacs.o: ../../../morm/src/postgresqlconnector.h
 emacs.o: ../../../morm/src/postgresqlqueryresult.h
-emacs.o: ../../../morm/src/dochtmlconnector.h
 emacs.o: ../../../winix/winixd/core/dirs.h
 emacs.o: ../../../winix/winixd/core/dircontainer.h
 emacs.o: ../../../winix/winixd/core/request.h
@@ -1181,15 +1192,16 @@ env.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 env.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 env.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 env.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-env.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+env.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-env.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+env.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-env.o: ../../../morm/src/jsonexpression.h
+env.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+env.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+env.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 env.o: ../../../morm/src/postgresqlexpression.h
-env.o: ../../../morm/src/dochtmlexpression.h
 env.o: ../../../morm/src/jsonconnector.h
 env.o: ../../../morm/src/postgresqlconnector.h
 env.o: ../../../morm/src/postgresqlqueryresult.h
-env.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+env.o: ../../../winix/winixd/core/dirs.h
 env.o: ../../../winix/winixd/core/dircontainer.h
 env.o: ../../../winix/winixd/core/request.h
 env.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -1300,14 +1312,16 @@ functionbase.o: ../../../morm/src/queryresult.h
 functionbase.o: ../../../morm/src/flatconnector.h
 functionbase.o: ../../../morm/src/dbexpression.h
 functionbase.o: ../../../morm/src/baseexpression.h
+functionbase.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+functionbase.o: ../../../morm/src/cursorhelper.h
+functionbase.o: ../../../morm/src/finderhelper.h
+functionbase.o: ../../../morm/src/fieldvaluehelper.h
 functionbase.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 functionbase.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 functionbase.o: ../../../morm/src/postgresqlexpression.h
-functionbase.o: ../../../morm/src/dochtmlexpression.h
 functionbase.o: ../../../morm/src/jsonconnector.h
 functionbase.o: ../../../morm/src/postgresqlconnector.h
 functionbase.o: ../../../morm/src/postgresqlqueryresult.h
-functionbase.o: ../../../morm/src/dochtmlconnector.h
 functionbase.o: ../../../winix/winixd/core/dirs.h
 functionbase.o: ../../../winix/winixd/core/dircontainer.h
 functionbase.o: ../../../winix/winixd/core/request.h
@@ -1420,15 +1434,17 @@ functionparser.o: ../../../morm/src/queryresult.h
 functionparser.o: ../../../morm/src/flatconnector.h
 functionparser.o: ../../../morm/src/dbexpression.h
 functionparser.o: ../../../morm/src/baseexpression.h
+functionparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+functionparser.o: ../../../morm/src/cursorhelper.h
+functionparser.o: ../../../morm/src/finderhelper.h
+functionparser.o: ../../../morm/src/fieldvaluehelper.h
 functionparser.o: ../../../morm/src/flatexpression.h
 functionparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 functionparser.o: ../../../morm/src/jsonexpression.h
 functionparser.o: ../../../morm/src/postgresqlexpression.h
-functionparser.o: ../../../morm/src/dochtmlexpression.h
 functionparser.o: ../../../morm/src/jsonconnector.h
 functionparser.o: ../../../morm/src/postgresqlconnector.h
 functionparser.o: ../../../morm/src/postgresqlqueryresult.h
-functionparser.o: ../../../morm/src/dochtmlconnector.h
 functionparser.o: ../../../winix/winixd/core/dirs.h
 functionparser.o: ../../../winix/winixd/core/dircontainer.h
 functionparser.o: ../../../winix/winixd/core/request.h
@@ -1548,15 +1564,16 @@ functions.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 functions.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 functions.o: ../../../morm/src/flatconnector.h
 functions.o: ../../../morm/src/dbexpression.h
-functions.o: ../../../morm/src/baseexpression.h
+functions.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+functions.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+functions.o: ../../../morm/src/finderhelper.h
+functions.o: ../../../morm/src/fieldvaluehelper.h
 functions.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 functions.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 functions.o: ../../../morm/src/postgresqlexpression.h
-functions.o: ../../../morm/src/dochtmlexpression.h
 functions.o: ../../../morm/src/jsonconnector.h
 functions.o: ../../../morm/src/postgresqlconnector.h
 functions.o: ../../../morm/src/postgresqlqueryresult.h
-functions.o: ../../../morm/src/dochtmlconnector.h
 functions.o: ../../../winix/winixd/core/dirs.h
 functions.o: ../../../winix/winixd/core/dircontainer.h
 functions.o: ../../../winix/winixd/core/request.h
@@ -1674,15 +1691,16 @@ imgcrop.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 imgcrop.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 imgcrop.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 imgcrop.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-imgcrop.o: ../../../morm/src/baseexpression.h
+imgcrop.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+imgcrop.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+imgcrop.o: ../../../morm/src/finderhelper.h
+imgcrop.o: ../../../morm/src/fieldvaluehelper.h
 imgcrop.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 imgcrop.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 imgcrop.o: ../../../morm/src/postgresqlexpression.h
-imgcrop.o: ../../../morm/src/dochtmlexpression.h
 imgcrop.o: ../../../morm/src/jsonconnector.h
 imgcrop.o: ../../../morm/src/postgresqlconnector.h
 imgcrop.o: ../../../morm/src/postgresqlqueryresult.h
-imgcrop.o: ../../../morm/src/dochtmlconnector.h
 imgcrop.o: ../../../winix/winixd/core/dirs.h
 imgcrop.o: ../../../winix/winixd/core/dircontainer.h
 imgcrop.o: ../../../winix/winixd/core/request.h
@@ -1785,15 +1803,16 @@ ipban.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ipban.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ipban.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ipban.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ipban.o: ../../../morm/src/baseexpression.h
+ipban.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+ipban.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+ipban.o: ../../../morm/src/finderhelper.h
+ipban.o: ../../../morm/src/fieldvaluehelper.h
 ipban.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 ipban.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ipban.o: ../../../morm/src/postgresqlexpression.h
-ipban.o: ../../../morm/src/dochtmlexpression.h
 ipban.o: ../../../morm/src/jsonconnector.h
 ipban.o: ../../../morm/src/postgresqlconnector.h
 ipban.o: ../../../morm/src/postgresqlqueryresult.h
-ipban.o: ../../../morm/src/dochtmlconnector.h
 ipban.o: ../../../winix/winixd/core/dirs.h
 ipban.o: ../../../winix/winixd/core/dircontainer.h
 ipban.o: ../../../winix/winixd/core/request.h
@@ -1894,15 +1913,15 @@ last.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 last.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 last.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 last.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-last.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+last.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-last.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+last.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-last.o: ../../../morm/src/jsonexpression.h
+last.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+last.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+last.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 last.o: ../../../morm/src/postgresqlexpression.h
-last.o: ../../../morm/src/dochtmlexpression.h
 last.o: ../../../morm/src/jsonconnector.h
 last.o: ../../../morm/src/postgresqlconnector.h
 last.o: ../../../morm/src/postgresqlqueryresult.h
-last.o: ../../../morm/src/dochtmlconnector.h
 last.o: ../../../winix/winixd/core/dirs.h
 last.o: ../../../winix/winixd/core/dircontainer.h
 last.o: ../../../winix/winixd/core/request.h
@@ -1998,14 +2017,16 @@ ln.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ln.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ln.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ln.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ln.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+ln.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-ln.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+ln.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-ln.o: ../../../morm/src/jsonexpression.h
+ln.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+ln.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+ln.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ln.o: ../../../morm/src/postgresqlexpression.h
-ln.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+ln.o: ../../../morm/src/jsonconnector.h
 ln.o: ../../../morm/src/postgresqlconnector.h
 ln.o: ../../../morm/src/postgresqlqueryresult.h
-ln.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+ln.o: ../../../winix/winixd/core/dirs.h
 ln.o: ../../../winix/winixd/core/dircontainer.h
 ln.o: ../../../winix/winixd/core/request.h
 ln.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -2109,15 +2130,16 @@ locale.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 locale.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 locale.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 locale.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-locale.o: ../../../morm/src/baseexpression.h
+locale.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+locale.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+locale.o: ../../../morm/src/finderhelper.h
+locale.o: ../../../morm/src/fieldvaluehelper.h
 locale.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 locale.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 locale.o: ../../../morm/src/postgresqlexpression.h
-locale.o: ../../../morm/src/dochtmlexpression.h
 locale.o: ../../../morm/src/jsonconnector.h
 locale.o: ../../../morm/src/postgresqlconnector.h
 locale.o: ../../../morm/src/postgresqlqueryresult.h
-locale.o: ../../../morm/src/dochtmlconnector.h
 locale.o: ../../../winix/winixd/core/dirs.h
 locale.o: ../../../winix/winixd/core/dircontainer.h
 locale.o: ../../../winix/winixd/core/request.h
@@ -2231,15 +2253,16 @@ login.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 login.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 login.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 login.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-login.o: ../../../morm/src/baseexpression.h
+login.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+login.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+login.o: ../../../morm/src/finderhelper.h
+login.o: ../../../morm/src/fieldvaluehelper.h
 login.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 login.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 login.o: ../../../morm/src/postgresqlexpression.h
-login.o: ../../../morm/src/dochtmlexpression.h
 login.o: ../../../morm/src/jsonconnector.h
 login.o: ../../../morm/src/postgresqlconnector.h
 login.o: ../../../morm/src/postgresqlqueryresult.h
-login.o: ../../../morm/src/dochtmlconnector.h
 login.o: ../../../winix/winixd/core/dirs.h
 login.o: ../../../winix/winixd/core/dircontainer.h
 login.o: ../../../winix/winixd/core/request.h
@@ -2340,15 +2363,16 @@ logout.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 logout.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 logout.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 logout.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-logout.o: ../../../morm/src/baseexpression.h
+logout.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+logout.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+logout.o: ../../../morm/src/finderhelper.h
+logout.o: ../../../morm/src/fieldvaluehelper.h
 logout.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 logout.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 logout.o: ../../../morm/src/postgresqlexpression.h
-logout.o: ../../../morm/src/dochtmlexpression.h
 logout.o: ../../../morm/src/jsonconnector.h
 logout.o: ../../../morm/src/postgresqlconnector.h
 logout.o: ../../../morm/src/postgresqlqueryresult.h
-logout.o: ../../../morm/src/dochtmlconnector.h
 logout.o: ../../../winix/winixd/core/dirs.h
 logout.o: ../../../winix/winixd/core/dircontainer.h
 logout.o: ../../../winix/winixd/core/request.h
@@ -2446,14 +2470,16 @@ ls.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ls.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ls.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ls.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-ls.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+ls.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-ls.o: ../../../morm/src/jsonexpression.h
+ls.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+ls.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+ls.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ls.o: ../../../morm/src/postgresqlexpression.h
-ls.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+ls.o: ../../../morm/src/jsonconnector.h
 ls.o: ../../../morm/src/postgresqlconnector.h
 ls.o: ../../../morm/src/postgresqlqueryresult.h
-ls.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+ls.o: ../../../winix/winixd/core/dirs.h
 ls.o: ../../../winix/winixd/core/dircontainer.h
 ls.o: ../../../winix/winixd/core/request.h
 ls.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -2548,15 +2574,16 @@ man.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 man.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 man.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 man.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-man.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+man.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-man.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+man.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-man.o: ../../../morm/src/jsonexpression.h
+man.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+man.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+man.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 man.o: ../../../morm/src/postgresqlexpression.h
-man.o: ../../../morm/src/dochtmlexpression.h
 man.o: ../../../morm/src/jsonconnector.h
 man.o: ../../../morm/src/postgresqlconnector.h
 man.o: ../../../morm/src/postgresqlqueryresult.h
-man.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+man.o: ../../../winix/winixd/core/dirs.h
 man.o: ../../../winix/winixd/core/dircontainer.h
 man.o: ../../../winix/winixd/core/request.h
 man.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -2654,15 +2681,15 @@ meta.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 meta.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 meta.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 meta.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-meta.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+meta.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-meta.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+meta.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-meta.o: ../../../morm/src/jsonexpression.h
+meta.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+meta.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+meta.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 meta.o: ../../../morm/src/postgresqlexpression.h
-meta.o: ../../../morm/src/dochtmlexpression.h
 meta.o: ../../../morm/src/jsonconnector.h
 meta.o: ../../../morm/src/postgresqlconnector.h
 meta.o: ../../../morm/src/postgresqlqueryresult.h
-meta.o: ../../../morm/src/dochtmlconnector.h
 meta.o: ../../../winix/winixd/core/dirs.h
 meta.o: ../../../winix/winixd/core/dircontainer.h
 meta.o: ../../../winix/winixd/core/request.h
@@ -2763,15 +2790,16 @@ mkdir.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mkdir.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mkdir.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mkdir.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mkdir.o: ../../../morm/src/baseexpression.h
+mkdir.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mkdir.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mkdir.o: ../../../morm/src/finderhelper.h
+mkdir.o: ../../../morm/src/fieldvaluehelper.h
 mkdir.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mkdir.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mkdir.o: ../../../morm/src/postgresqlexpression.h
-mkdir.o: ../../../morm/src/dochtmlexpression.h
 mkdir.o: ../../../morm/src/jsonconnector.h
 mkdir.o: ../../../morm/src/postgresqlconnector.h
 mkdir.o: ../../../morm/src/postgresqlqueryresult.h
-mkdir.o: ../../../morm/src/dochtmlconnector.h
 mkdir.o: ../../../winix/winixd/core/dirs.h
 mkdir.o: ../../../winix/winixd/core/dircontainer.h
 mkdir.o: ../../../winix/winixd/core/request.h
@@ -2873,15 +2901,16 @@ mount.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mount.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mount.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mount.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mount.o: ../../../morm/src/baseexpression.h
+mount.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mount.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mount.o: ../../../morm/src/finderhelper.h
+mount.o: ../../../morm/src/fieldvaluehelper.h
 mount.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mount.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mount.o: ../../../morm/src/postgresqlexpression.h
-mount.o: ../../../morm/src/dochtmlexpression.h
 mount.o: ../../../morm/src/jsonconnector.h
 mount.o: ../../../morm/src/postgresqlconnector.h
 mount.o: ../../../morm/src/postgresqlqueryresult.h
-mount.o: ../../../morm/src/dochtmlconnector.h
 mount.o: ../../../winix/winixd/core/dirs.h
 mount.o: ../../../winix/winixd/core/dircontainer.h
 mount.o: ../../../winix/winixd/core/request.h
@@ -2978,14 +3007,16 @@ mv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mv.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+mv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-mv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+mv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-mv.o: ../../../morm/src/jsonexpression.h
+mv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+mv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+mv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mv.o: ../../../morm/src/postgresqlexpression.h
-mv.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+mv.o: ../../../morm/src/jsonconnector.h
 mv.o: ../../../morm/src/postgresqlconnector.h
 mv.o: ../../../morm/src/postgresqlqueryresult.h
-mv.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+mv.o: ../../../winix/winixd/core/dirs.h
 mv.o: ../../../winix/winixd/core/dircontainer.h
 mv.o: ../../../winix/winixd/core/request.h
 mv.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -3089,15 +3120,16 @@ nicedit.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 nicedit.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 nicedit.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 nicedit.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-nicedit.o: ../../../morm/src/baseexpression.h
+nicedit.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+nicedit.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+nicedit.o: ../../../morm/src/finderhelper.h
+nicedit.o: ../../../morm/src/fieldvaluehelper.h
 nicedit.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 nicedit.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 nicedit.o: ../../../morm/src/postgresqlexpression.h
-nicedit.o: ../../../morm/src/dochtmlexpression.h
 nicedit.o: ../../../morm/src/jsonconnector.h
 nicedit.o: ../../../morm/src/postgresqlconnector.h
 nicedit.o: ../../../morm/src/postgresqlqueryresult.h
-nicedit.o: ../../../morm/src/dochtmlconnector.h
 nicedit.o: ../../../winix/winixd/core/dirs.h
 nicedit.o: ../../../winix/winixd/core/dircontainer.h
 nicedit.o: ../../../winix/winixd/core/request.h
@@ -3199,15 +3231,15 @@ node.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 node.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 node.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 node.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-node.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+node.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-node.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+node.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-node.o: ../../../morm/src/jsonexpression.h
+node.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+node.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+node.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 node.o: ../../../morm/src/postgresqlexpression.h
-node.o: ../../../morm/src/dochtmlexpression.h
 node.o: ../../../morm/src/jsonconnector.h
 node.o: ../../../morm/src/postgresqlconnector.h
 node.o: ../../../morm/src/postgresqlqueryresult.h
-node.o: ../../../morm/src/dochtmlconnector.h
 node.o: ../../../winix/winixd/core/dirs.h
 node.o: ../../../winix/winixd/core/dircontainer.h
 node.o: ../../../winix/winixd/core/request.h
@@ -3312,15 +3344,16 @@ passwd.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 passwd.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 passwd.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 passwd.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-passwd.o: ../../../morm/src/baseexpression.h
+passwd.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+passwd.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+passwd.o: ../../../morm/src/finderhelper.h
+passwd.o: ../../../morm/src/fieldvaluehelper.h
 passwd.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 passwd.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 passwd.o: ../../../morm/src/postgresqlexpression.h
-passwd.o: ../../../morm/src/dochtmlexpression.h
 passwd.o: ../../../morm/src/jsonconnector.h
 passwd.o: ../../../morm/src/postgresqlconnector.h
 passwd.o: ../../../morm/src/postgresqlqueryresult.h
-passwd.o: ../../../morm/src/dochtmlconnector.h
 passwd.o: ../../../winix/winixd/core/dirs.h
 passwd.o: ../../../winix/winixd/core/dircontainer.h
 passwd.o: ../../../winix/winixd/core/request.h
@@ -3423,15 +3456,15 @@ priv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 priv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 priv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 priv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-priv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+priv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-priv.o: ../../../morm/src/jsonexpression.h
+priv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+priv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+priv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 priv.o: ../../../morm/src/postgresqlexpression.h
-priv.o: ../../../morm/src/dochtmlexpression.h
 priv.o: ../../../morm/src/jsonconnector.h
 priv.o: ../../../morm/src/postgresqlconnector.h
 priv.o: ../../../morm/src/postgresqlqueryresult.h
-priv.o: ../../../morm/src/dochtmlconnector.h
 priv.o: ../../../winix/winixd/core/dirs.h
 priv.o: ../../../winix/winixd/core/dircontainer.h
 priv.o: ../../../winix/winixd/core/request.h
@@ -3531,14 +3564,16 @@ privchanger.o: ../../../morm/src/queryresult.h
 privchanger.o: ../../../morm/src/flatconnector.h
 privchanger.o: ../../../morm/src/dbexpression.h
 privchanger.o: ../../../morm/src/baseexpression.h
+privchanger.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+privchanger.o: ../../../morm/src/cursorhelper.h
+privchanger.o: ../../../morm/src/finderhelper.h
+privchanger.o: ../../../morm/src/fieldvaluehelper.h
 privchanger.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 privchanger.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 privchanger.o: ../../../morm/src/postgresqlexpression.h
-privchanger.o: ../../../morm/src/dochtmlexpression.h
 privchanger.o: ../../../morm/src/jsonconnector.h
 privchanger.o: ../../../morm/src/postgresqlconnector.h
 privchanger.o: ../../../morm/src/postgresqlqueryresult.h
-privchanger.o: ../../../morm/src/dochtmlconnector.h
 privchanger.o: ../../../winix/winixd/core/dirs.h
 privchanger.o: ../../../winix/winixd/core/dircontainer.h
 privchanger.o: ../../../winix/winixd/db/db.h
@@ -3649,14 +3684,16 @@ pw.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 pw.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 pw.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 pw.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-pw.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+pw.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-pw.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+pw.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-pw.o: ../../../morm/src/jsonexpression.h
+pw.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+pw.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+pw.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 pw.o: ../../../morm/src/postgresqlexpression.h
-pw.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+pw.o: ../../../morm/src/jsonconnector.h
 pw.o: ../../../morm/src/postgresqlconnector.h
 pw.o: ../../../morm/src/postgresqlqueryresult.h
-pw.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+pw.o: ../../../winix/winixd/core/dirs.h
 pw.o: ../../../winix/winixd/core/dircontainer.h
 pw.o: ../../../winix/winixd/core/request.h
 pw.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -3759,15 +3796,16 @@ reload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 reload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 reload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 reload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-reload.o: ../../../morm/src/baseexpression.h
+reload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+reload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+reload.o: ../../../morm/src/finderhelper.h
+reload.o: ../../../morm/src/fieldvaluehelper.h
 reload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 reload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 reload.o: ../../../morm/src/postgresqlexpression.h
-reload.o: ../../../morm/src/dochtmlexpression.h
 reload.o: ../../../morm/src/jsonconnector.h
 reload.o: ../../../morm/src/postgresqlconnector.h
 reload.o: ../../../morm/src/postgresqlqueryresult.h
-reload.o: ../../../morm/src/dochtmlconnector.h
 reload.o: ../../../winix/winixd/core/dirs.h
 reload.o: ../../../winix/winixd/core/dircontainer.h
 reload.o: ../../../winix/winixd/core/request.h
@@ -3871,14 +3909,16 @@ rm.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 rm.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 rm.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 rm.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-rm.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+rm.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-rm.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+rm.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-rm.o: ../../../morm/src/jsonexpression.h
+rm.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+rm.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+rm.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 rm.o: ../../../morm/src/postgresqlexpression.h
-rm.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+rm.o: ../../../morm/src/jsonconnector.h
 rm.o: ../../../morm/src/postgresqlconnector.h
 rm.o: ../../../morm/src/postgresqlqueryresult.h
-rm.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+rm.o: ../../../winix/winixd/core/dirs.h
 rm.o: ../../../winix/winixd/core/dircontainer.h
 rm.o: ../../../winix/winixd/core/request.h
 rm.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -3987,15 +4027,16 @@ rmuser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 rmuser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 rmuser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 rmuser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-rmuser.o: ../../../morm/src/baseexpression.h
+rmuser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+rmuser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+rmuser.o: ../../../morm/src/finderhelper.h
+rmuser.o: ../../../morm/src/fieldvaluehelper.h
 rmuser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 rmuser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 rmuser.o: ../../../morm/src/postgresqlexpression.h
-rmuser.o: ../../../morm/src/dochtmlexpression.h
 rmuser.o: ../../../morm/src/jsonconnector.h
 rmuser.o: ../../../morm/src/postgresqlconnector.h
 rmuser.o: ../../../morm/src/postgresqlqueryresult.h
-rmuser.o: ../../../morm/src/dochtmlconnector.h
 rmuser.o: ../../../winix/winixd/core/dirs.h
 rmuser.o: ../../../winix/winixd/core/dircontainer.h
 rmuser.o: ../../../winix/winixd/core/request.h
@@ -4098,15 +4139,16 @@ run.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 run.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 run.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 run.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-run.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+run.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-run.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+run.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-run.o: ../../../morm/src/jsonexpression.h
+run.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+run.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+run.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 run.o: ../../../morm/src/postgresqlexpression.h
-run.o: ../../../morm/src/dochtmlexpression.h
 run.o: ../../../morm/src/jsonconnector.h
 run.o: ../../../morm/src/postgresqlconnector.h
 run.o: ../../../morm/src/postgresqlqueryresult.h
-run.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+run.o: ../../../winix/winixd/core/dirs.h
 run.o: ../../../winix/winixd/core/dircontainer.h
 run.o: ../../../winix/winixd/core/request.h
 run.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -4204,15 +4246,15 @@ sort.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 sort.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 sort.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 sort.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-sort.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+sort.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-sort.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+sort.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-sort.o: ../../../morm/src/jsonexpression.h
+sort.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+sort.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+sort.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 sort.o: ../../../morm/src/postgresqlexpression.h
-sort.o: ../../../morm/src/dochtmlexpression.h
 sort.o: ../../../morm/src/jsonconnector.h
 sort.o: ../../../morm/src/postgresqlconnector.h
 sort.o: ../../../morm/src/postgresqlqueryresult.h
-sort.o: ../../../morm/src/dochtmlconnector.h
 sort.o: ../../../winix/winixd/core/dirs.h
 sort.o: ../../../winix/winixd/core/dircontainer.h
 sort.o: ../../../winix/winixd/core/request.h
@@ -4329,15 +4371,17 @@ specialdefault.o: ../../../morm/src/queryresult.h
 specialdefault.o: ../../../morm/src/flatconnector.h
 specialdefault.o: ../../../morm/src/dbexpression.h
 specialdefault.o: ../../../morm/src/baseexpression.h
+specialdefault.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+specialdefault.o: ../../../morm/src/cursorhelper.h
+specialdefault.o: ../../../morm/src/finderhelper.h
+specialdefault.o: ../../../morm/src/fieldvaluehelper.h
 specialdefault.o: ../../../morm/src/flatexpression.h
 specialdefault.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 specialdefault.o: ../../../morm/src/jsonexpression.h
 specialdefault.o: ../../../morm/src/postgresqlexpression.h
-specialdefault.o: ../../../morm/src/dochtmlexpression.h
 specialdefault.o: ../../../morm/src/jsonconnector.h
 specialdefault.o: ../../../morm/src/postgresqlconnector.h
 specialdefault.o: ../../../morm/src/postgresqlqueryresult.h
-specialdefault.o: ../../../morm/src/dochtmlconnector.h
 specialdefault.o: ../../../winix/winixd/core/dirs.h
 specialdefault.o: ../../../winix/winixd/core/dircontainer.h
 specialdefault.o: ../../../winix/winixd/core/request.h
@@ -4442,15 +4486,15 @@ stat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 stat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 stat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 stat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-stat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+stat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-stat.o: ../../../morm/src/jsonexpression.h
+stat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+stat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+stat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 stat.o: ../../../morm/src/postgresqlexpression.h
-stat.o: ../../../morm/src/dochtmlexpression.h
 stat.o: ../../../morm/src/jsonconnector.h
 stat.o: ../../../morm/src/postgresqlconnector.h
 stat.o: ../../../morm/src/postgresqlqueryresult.h
-stat.o: ../../../morm/src/dochtmlconnector.h
 stat.o: ../../../winix/winixd/core/dirs.h
 stat.o: ../../../winix/winixd/core/dircontainer.h
 stat.o: ../../../winix/winixd/core/request.h
@@ -4557,15 +4601,16 @@ subject.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 subject.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 subject.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 subject.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-subject.o: ../../../morm/src/baseexpression.h
+subject.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+subject.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+subject.o: ../../../morm/src/finderhelper.h
+subject.o: ../../../morm/src/fieldvaluehelper.h
 subject.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 subject.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 subject.o: ../../../morm/src/postgresqlexpression.h
-subject.o: ../../../morm/src/dochtmlexpression.h
 subject.o: ../../../morm/src/jsonconnector.h
 subject.o: ../../../morm/src/postgresqlconnector.h
 subject.o: ../../../morm/src/postgresqlqueryresult.h
-subject.o: ../../../morm/src/dochtmlconnector.h
 subject.o: ../../../winix/winixd/core/dirs.h
 subject.o: ../../../winix/winixd/core/dircontainer.h
 subject.o: ../../../winix/winixd/core/request.h
@@ -4675,15 +4720,16 @@ template.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 template.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 template.o: ../../../morm/src/flatconnector.h
 template.o: ../../../morm/src/dbexpression.h
-template.o: ../../../morm/src/baseexpression.h
+template.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+template.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+template.o: ../../../morm/src/finderhelper.h
+template.o: ../../../morm/src/fieldvaluehelper.h
 template.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 template.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 template.o: ../../../morm/src/postgresqlexpression.h
-template.o: ../../../morm/src/dochtmlexpression.h
 template.o: ../../../morm/src/jsonconnector.h
 template.o: ../../../morm/src/postgresqlconnector.h
 template.o: ../../../morm/src/postgresqlqueryresult.h
-template.o: ../../../morm/src/dochtmlconnector.h
 template.o: ../../../winix/winixd/core/dirs.h
 template.o: ../../../winix/winixd/core/dircontainer.h
 template.o: ../../../winix/winixd/core/request.h
@@ -4794,15 +4840,16 @@ timezone.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 timezone.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 timezone.o: ../../../morm/src/flatconnector.h
 timezone.o: ../../../morm/src/dbexpression.h
-timezone.o: ../../../morm/src/baseexpression.h
+timezone.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+timezone.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+timezone.o: ../../../morm/src/finderhelper.h
+timezone.o: ../../../morm/src/fieldvaluehelper.h
 timezone.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 timezone.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 timezone.o: ../../../morm/src/postgresqlexpression.h
-timezone.o: ../../../morm/src/dochtmlexpression.h
 timezone.o: ../../../morm/src/jsonconnector.h
 timezone.o: ../../../morm/src/postgresqlconnector.h
 timezone.o: ../../../morm/src/postgresqlqueryresult.h
-timezone.o: ../../../morm/src/dochtmlconnector.h
 timezone.o: ../../../winix/winixd/core/dirs.h
 timezone.o: ../../../winix/winixd/core/dircontainer.h
 timezone.o: ../../../winix/winixd/core/request.h
@@ -4911,15 +4958,16 @@ tinymce.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 tinymce.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 tinymce.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 tinymce.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-tinymce.o: ../../../morm/src/baseexpression.h
+tinymce.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+tinymce.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+tinymce.o: ../../../morm/src/finderhelper.h
+tinymce.o: ../../../morm/src/fieldvaluehelper.h
 tinymce.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 tinymce.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 tinymce.o: ../../../morm/src/postgresqlexpression.h
-tinymce.o: ../../../morm/src/dochtmlexpression.h
 tinymce.o: ../../../morm/src/jsonconnector.h
 tinymce.o: ../../../morm/src/postgresqlconnector.h
 tinymce.o: ../../../morm/src/postgresqlqueryresult.h
-tinymce.o: ../../../morm/src/dochtmlconnector.h
 tinymce.o: ../../../winix/winixd/core/dirs.h
 tinymce.o: ../../../winix/winixd/core/dircontainer.h
 tinymce.o: ../../../winix/winixd/core/request.h
@@ -5022,15 +5070,16 @@ uname.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 uname.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 uname.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 uname.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-uname.o: ../../../morm/src/baseexpression.h
+uname.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+uname.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+uname.o: ../../../morm/src/finderhelper.h
+uname.o: ../../../morm/src/fieldvaluehelper.h
 uname.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 uname.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 uname.o: ../../../morm/src/postgresqlexpression.h
-uname.o: ../../../morm/src/dochtmlexpression.h
 uname.o: ../../../morm/src/jsonconnector.h
 uname.o: ../../../morm/src/postgresqlconnector.h
 uname.o: ../../../morm/src/postgresqlqueryresult.h
-uname.o: ../../../morm/src/dochtmlconnector.h
 uname.o: ../../../winix/winixd/core/dirs.h
 uname.o: ../../../winix/winixd/core/dircontainer.h
 uname.o: ../../../winix/winixd/core/request.h
@@ -5136,15 +5185,16 @@ upload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 upload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 upload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 upload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-upload.o: ../../../morm/src/baseexpression.h
+upload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+upload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+upload.o: ../../../morm/src/finderhelper.h
+upload.o: ../../../morm/src/fieldvaluehelper.h
 upload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 upload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 upload.o: ../../../morm/src/postgresqlexpression.h
-upload.o: ../../../morm/src/dochtmlexpression.h
 upload.o: ../../../morm/src/jsonconnector.h
 upload.o: ../../../morm/src/postgresqlconnector.h
 upload.o: ../../../morm/src/postgresqlqueryresult.h
-upload.o: ../../../morm/src/dochtmlconnector.h
 upload.o: ../../../winix/winixd/core/dirs.h
 upload.o: ../../../winix/winixd/core/dircontainer.h
 upload.o: ../../../winix/winixd/core/request.h
@@ -5259,15 +5309,16 @@ uptime.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 uptime.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 uptime.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 uptime.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-uptime.o: ../../../morm/src/baseexpression.h
+uptime.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+uptime.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+uptime.o: ../../../morm/src/finderhelper.h
+uptime.o: ../../../morm/src/fieldvaluehelper.h
 uptime.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 uptime.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 uptime.o: ../../../morm/src/postgresqlexpression.h
-uptime.o: ../../../morm/src/dochtmlexpression.h
 uptime.o: ../../../morm/src/jsonconnector.h
 uptime.o: ../../../morm/src/postgresqlconnector.h
 uptime.o: ../../../morm/src/postgresqlqueryresult.h
-uptime.o: ../../../morm/src/dochtmlconnector.h
 uptime.o: ../../../winix/winixd/core/dirs.h
 uptime.o: ../../../winix/winixd/core/dircontainer.h
 uptime.o: ../../../winix/winixd/core/request.h
@@ -5367,15 +5418,16 @@ vim.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 vim.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 vim.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 vim.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-vim.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+vim.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-vim.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+vim.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-vim.o: ../../../morm/src/jsonexpression.h
+vim.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+vim.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+vim.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 vim.o: ../../../morm/src/postgresqlexpression.h
-vim.o: ../../../morm/src/dochtmlexpression.h
 vim.o: ../../../morm/src/jsonconnector.h
 vim.o: ../../../morm/src/postgresqlconnector.h
 vim.o: ../../../morm/src/postgresqlqueryresult.h
-vim.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+vim.o: ../../../winix/winixd/core/dirs.h
 vim.o: ../../../winix/winixd/core/dircontainer.h
 vim.o: ../../../winix/winixd/core/request.h
 vim.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -5471,15 +5523,16 @@ who.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 who.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 who.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 who.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-who.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+who.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-who.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+who.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-who.o: ../../../morm/src/jsonexpression.h
+who.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+who.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+who.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 who.o: ../../../morm/src/postgresqlexpression.h
-who.o: ../../../morm/src/dochtmlexpression.h
 who.o: ../../../morm/src/jsonconnector.h
 who.o: ../../../morm/src/postgresqlconnector.h
 who.o: ../../../morm/src/postgresqlqueryresult.h
-who.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+who.o: ../../../winix/winixd/core/dirs.h
 who.o: ../../../winix/winixd/core/dircontainer.h
 who.o: ../../../winix/winixd/core/request.h
 who.o: ../../../winix/winixd/core/mounts.h mount.h

winixd/functions/functions.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -118,6 +118,13 @@ FunctionBase * Functions::Find(const std::wstring & function_name)
 	if( i == table.end() )
 		return 0;
 
+	FunctionBase * fun = i->second;
+
+	// this is to set 'cur' and 'locale' for slog, but in the future slog will be moved to Session
+	fun->set_cur(cur);
+	fun->set_locale(locale);
+	//
+
 return i->second;
 }
 

winixd/html/fun_account.html

@@ -1,20 +1,56 @@
 <div class="winix">
 
-<h1>Account</h1>
+<h1>{account_header}</h1>
 
 [if user_logged]
-	<p>You are logged as: [user_name]<br>
+
-	[if user_super_user]
+	<table class="uk-table uk-table-divider uk-table-small uk-table-justify">
-	You are the root
+		<tbody>
-	[end]
+			<tr>
-	[# !! IMPROVE ME add info about groups, may other parameters like time zone, language?]
+				<td class="uk-width-1-4">{account_logged_as}</td>
-	</p>
+				<td>[user_name]</td>
+				<td></td>
+			</tr>
+
+			[if user_super_user]
+			<tr>
+				<td>{account_admin}</td>
+				<td>{account_admin_yes}</td>
+				<td></td>
+			</tr>
+			[end]
+
+			[if false]
+			[# improve me]
+			<tr>
+				<td>{account_groups}</td>
+				<td>html, www, foo</td>
+				<td></td>
+			</tr>
+			[end]
+
+			<tr>
+				<td>{account_timezone}</td>
+				<td>[user_time_zone_name]</td>
+				<td>
+				<a href="[dir]timezone" class="uk-button uk-button-default uk-button-small">{change}</a>
+				</td>
+			</tr>
+
+			<tr>
+				<td>{account_language}</td>
+				<td>[user_locale_name]</td>
+				<td>
+				<a href="[dir]locale" class="uk-button uk-button-default uk-button-small">{change}</a>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+
 [else]
-	<p>You are not logged in.</p>
+	<p>{account_not_logged}</p>
 [end]
 
 
-
-
-
 </div>

winixd/html/fun_adduser.html

@@ -2,39 +2,62 @@
 
 <h1>[if user_logged]{adduser_header_add}[else]{adduser_header_register}[end]</h1>
 
-<form id="additem" method="post" action="[doc_base_url][dir]adduser">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]adduser">
-<fieldset>
-	<legend>{adduser_form_legend}</legend>
-	
-	<p class="withnext">{adduser_login}:</p>
-	<input class="edit" type="text" name="login" value="[adduser_last_login]">
-	
-	<p class="withnext">{adduser_password}:</p>
-	<input class="edit" type="password" name="password" value="">
 
-	<p class="withnext">{adduser_confirm_password}:</p>
+	<div class="uk-margin">
-	<input class="edit" type="password" name="passwordconfirm" value="">
+		<label class="uk-form-label" for="winix_adduser_login">{adduser_login}</label>
 
-	[if winix_account_need_email_verification]	
+		<div class="uk-form-controls">
-		<p class="withnext">{adduser_need_email}<br>{adduser_need_email2}:</p>
+			<input class="uk-input" id="winix_adduser_login" type="text" name="login" value="[adduser_last_login]">
-	[else]
+		</div>
-		<p class="withnext">{adduser_email}:</p>
+	</div>
-	[end]
+
-	<input class="edit" type="text" name="email" value="[adduser_last_email]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_adduser_password">{adduser_password}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_password" type="password" name="password" value="">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_adduser_confirm_password">{adduser_confirm_password}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_confirm_password" type="password" name="passwordconfirm" value="">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		[if winix_account_need_email_verification]
+			<label class="uk-form-label" for="winix_adduser_email">{adduser_need_email}</label>
+		[else]
+			<label class="uk-form-label" for="winix_adduser_email">{adduser_email}</label>
+		[end]
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_email" type="text" name="email" value="[adduser_last_email]">
+		</div>
+	</div>
 
 	[if user_super_user]
-	<p>
+	<div class="uk-margin">
-		<input type="checkbox" name="autoactivate" id="autoactivate"><label style="display: inline;" for="autoactivate">{adduser_auto_activate}</label>
+		<div class="uk-form-controls">
-	</p>
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="autoactivate" id="autoactivate">{adduser_auto_activate}</label>
+		</div>
+	</div>
 	[end]
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	
+	<div class="uk-margin">
-	<input class="submit" type="submit" value="[if user_logged]{adduser_submit}[else]{register_user_submit}[end]">
+		<div class="uk-form-controls">
-</fieldset>
+			<input class="uk-button uk-button-primary" type="submit" value="[if user_logged]{adduser_submit}[else]{register_user_submit}[end]">
+		</div>
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_ckeditor.html

@@ -1,75 +1,80 @@
 <div class="winix">
 
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
-	
-	[if mount_type_is "cms"]
-		<div class="winix_input_a">
-		<label for="winix_title_id">{title}:</label>
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
-		</div>
 
-		<div class="winix_input_a">
+<form class="uk-form-stacked">
-		<label for="winix_url_id">{suggested_url}:</label>
+	
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
 		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
-		<div class="winix_input_a">
-		<label for="winix_title_id">{title}:</label>
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
-		</div>
-		
-		<div class="winix_input_a">
-		<label for="winix_url_id">{suggested_url}:</label>
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
-		</div>
-	[end]
 	
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	[if mount_type_is "cms"]<label for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	[if mount_type_is "ticket"]<label for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
 	[# template fun_ls.html uses the name: itemcontent to refer to this textarea item]
 
-
+	<div class="uk-form-controls">
-	<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
+		<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
-
+	</div>
 	
 	</div>
 
-	<input id="contenttype" type="hidden" name="contenttype" value="2">
+	<div class="uk-form-controls">
-	
+		<input id="contenttype" type="hidden" name="contenttype" value="2">
+	</div>
 
 	[if not user_logged]
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_nick_id">{nick}:</label>
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
-		<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
 
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</p>
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
-		<input id="winix_rebus_id" type="text" name="rebus">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
 		
 		[include "antispam.html"]
 	[end]
 	
 
-	<div class="winix-update-button-container">
+	<div class="uk-margin">
-		<button class="winix_update_button" data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
+		<div class="uk-form-controls uk-inline">
-											data-winix-content-ckeditor-instances="winix-editor-content"
+
-											data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
+			<button class="uk-button uk-button-primary winix_update_button"
-											data-winix-progressbar-id="winix-editor-progressbar"
+				data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
-											data-winix-messages-status-success-id="winix-editor-messages-status-success"
+				data-winix-content-ckeditor-instances="winix-editor-content"
-											data-winix-messages-status-error-id="winix-editor-messages-status-error"
+				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
-											>
+				data-winix-progressbar-id="winix-editor-progressbar"
-			Aktualizuj
+				data-winix-messages-status-success-id="winix-editor-messages-status-success"
-		</button>
+				data-winix-messages-status-error-id="winix-editor-messages-status-error"
+				>
+				{ckeditor_update_button}
+			</button>
+
+			<div id="winix-editor-progressbar" class="uk-invisible uk-position-center-right-out uk-margin-small-left">
+				<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="{ckeditor_update_progressbar_img_alt}">
+			</div>
 
-		<div id="winix-editor-progressbar" class="winix-progressbar">
-			<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="progress bar">
 		</div>
 
 		<div id="winix-editor-messages-status-success" class="winix-editor-messages-status-success">
@@ -88,4 +93,6 @@
 	[ckeditor_old_browsers_support]
 	[ckeditor "winix-editor-content"]
 
+</form>
+
 </div>

winixd/html/fun_emacs.html

@@ -4,39 +4,51 @@
 
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]emacs">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]emacs">
-	
+
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="winix_title_id">{title}:</label>
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
-	<input id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
 	</div>
 
-	<div class="winix_input_a">
+	<div class="uk-margin">
-	<label for="winix_url_id">{suggested_url}:</label>
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
-	<input id="winix_url_id" type="text" name="url" value="[item_url]">
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
 	</div>
 	
 	[include "fun_emacs_post.html"]
 	
 	[if not user_logged]
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_nick_id">{nick}:</label>
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
-		<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
 		
-		<div class="winix_input_a">
+		<div class="uk-margin">
-		<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
-		<input id="winix_rebus_id" type="text" name="rebus">
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
 
 		[include "antispam.html"]
 	[end]
 
 	[if winix_function_param_is "postredirect"]
+	<div class="uk-form-controls">
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+	</div>
 	[end]
 	
-	<input type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-margin uk-form-controls">
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
 
 </form>
 

winixd/html/fun_emacs_post.html

@@ -1,21 +1,24 @@
 
-<div class="winix_input_a">
+<div class="uk-margin">
 
 [if winix_function_is "upload"]
-	<label for="winix_content_id">{upload_content}</label>
+	<label class="uk-form-label" for="winix_content_id">{upload_content}</label>
 [else]
-	[if mount_type_is "cms"]<label for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	[if mount_type_is "ticket"]<label for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 [end]
 
-<textarea [if item_is]autofocus [end]id="winix_content_id" rows="[if winix_function_is "upload"]7[else][if mount_type_is "cms"]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
+<div class="uk-form-controls">
+	[# CodeMirror doesn't work correctly inside fieldset tag -- horizontal scroll is broken]
+	<textarea class="uk-textarea" [if item_is]autofocus [end]id="winix_content_id" rows="[if winix_function_is "upload"]7[else][if mount_type_is "cms"]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
+</div>
 </div>
 
 
-<div class="winix_input_a">
+<div class="uk-margin">
-<label for="winix_contenttype_id">{form_emacs_content_type}</label>
+<label class="uk-form-label" for="winix_contenttype_id">{form_emacs_content_type}</label>
-<select name="contenttype" id="winix_contenttype_id">
+<select class="uk-select" name="contenttype" id="winix_contenttype_id">
 	<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
 	<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
 	[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]

winixd/html/fun_locale.html

@@ -9,26 +9,27 @@
 [end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
-<fieldset>
+	<div class="uk-margin">
-	<legend>{locale_form_legend}</legend>
+		<label class="uk-form-label" for="winix_locale_select">{locale_select}:</label>
-	
-	<p class="withnext">{locale_select}:</p>
-	
-	[# add to styles]
-	<select name="localeid" style="width: 250px;">
-	[for winix_locale_tab]
-		<option value="[winix_locale_tab_id]" [if cmp user_locale_id winix_locale_tab_id]selected="selected"[end]>[winix_locale_tab_name]</option>
-	[end]
-	</select>
 
-	[if winix_function_param_is "postredirect"]
+		<div class="uk-form-controls">
-		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+			<select id="winix_locale_select" name="localeid" class="uk-select">
-	[end]
+			[for winix_locale_tab]
+				<option value="[winix_locale_tab_id]" [if cmp user_locale_id winix_locale_tab_id]selected="selected"[end]>[winix_locale_tab_name]</option>
+			[end]
+			</select>
+		</div>
 
+		[if winix_function_param_is "postredirect"]
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+		[end]
 	
-	<input class="submit" type="submit" value="{change}">
+		<div class="uk-margin uk-form-controls">
-</fieldset>
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+
+	</div>
 </form>
 
 

winixd/html/fun_login.html

@@ -1,47 +1,92 @@
 <div class="winix">
 
-<h1>{login_header}</h1>
-
 [if user_logged]
-	<p>{logged_as_long}: [user_name]<br>
+	<div class="uk-width-large uk-padding-small">
-	<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout">{logout}</a></p>
+		<h1>{login_header}</h1>
+
+		<p class="uk-margin-top">
+		{login_currently_logged_as} <strong>[user_name]</strong>
+		</p>
+
+		<div class="uk-margin-top">
+			<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-border-pill uk-width-small">{login_logout_button}</a>
+		</div>
+	</div>
 [else]
 
 	[if not ipban_is_login_allowed_from_this_ip]
-		<p>{login_cannot_login_from_this_ip}<br>
+		<div class="uk-width-1-1 uk-padding-small uk-alert-danger">
-		{login_cannot_login_available} [ipban_current_ip_expires_time]</p>
+			<p>{login_cannot_login_from_this_ip}<br>
+			{login_cannot_login_available} [ipban_current_ip_expires_time]</p>
+		</div>
 	[else]
 
-		<form method="post" action="[login_path]login">
 
-		<div class="winix_input_b">
+		<div class="uk-width-medium uk-padding-small">
-			<input type="text" name="login">
+			<!-- login -->
-		</div>
+			<form class="toggle-class" action="[login_path]login" method="POST">
+				<fieldset class="uk-fieldset">
+					<div class="uk-margin-small">
+						<div class="uk-inline uk-width-1-1">
+							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: user"></span>
+							<input class="uk-input uk-border-pill" required placeholder="{login_username}" type="text" name="login">
+						</div>
+					</div>
+					<div class="uk-margin-small">
+						<div class="uk-inline uk-width-1-1">
+							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lock"></span>
+							<input class="uk-input uk-border-pill" required placeholder="{login_password}" type="password" name="password">
+						</div>
+					</div>
 
-		<div class="winix_input_b">
+					[if login_should_use_captcha]
-			<input type="password" name="password">
+					<div class="uk-margin-small">
-		</div>
+						<div class="uk-inline uk-width-1-1">
+							<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lifesaver"></span>
+							<input class="uk-input uk-border-pill" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
+						</div>
+					</div>
+					[end]
 
-		<div class="winix_input_b">
+					<div class="uk-margin-small">
-			<input id="winix_login_rememberme_id" type="checkbox" name="rememberme">
+						<label><input class="uk-checkbox" type="checkbox" name="rememberme"> {login_remember_me}</label>
-			<label for="winix_login_rememberme_id">{remember_me}</label>
+					</div>
-		</div>
+					<div class="uk-margin-bottom">
+						<button type="submit" class="uk-button uk-button-primary uk-border-pill uk-width-1-1">{login_button}</button>
+					</div>
 
-		[if login_should_use_captcha]
+					[if winix_function_param_is "postredirect"]
-			<div class="winix_input_a">
+						<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+					[end]
-			<input id="winix_rebus_id" type="text" name="rebus">
+
+				</fieldset>
+			</form>
+			<!-- /login -->
+
+
+			<!-- recover password -->
+			<form class="toggle-class" action="#[# not implemented yet]" hidden>
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: mail"></span>
+						<input class="uk-input uk-border-pill" placeholder="{login_forgot_password_email}" required type="text">
+					</div>
+				</div>
+				<div class="uk-margin-bottom">
+					<button type="submit" class="uk-button uk-button-primary uk-border-pill uk-width-1-1">{login_forgot_password_button}</button>
+				</div>
+			</form>
+			<!-- /recover password -->
+
+			<!-- action buttons -->
+			<div>
+				<div class="uk-text-center">
+					<a class="uk-link-reset uk-text-small toggle-class" data-uk-toggle="target: .toggle-class ;animation: uk-animation-fade">{login_forgot_password_question}</a>
+					<a class="uk-link-reset uk-text-small toggle-class" data-uk-toggle="target: .toggle-class ;animation: uk-animation-fade" hidden><span data-uk-icon="arrow-left"></span> {login_back_to_login_form}</a>
+				</div>
 			</div>
-		[end]
+			<!-- action buttons -->
-
+		</div>
-		<input type="submit" value="{button_login}">
-
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
-
-
-		</form>
 
 	[end]
 

winixd/html/fun_seo.html

@@ -0,0 +1,32 @@
+<div class="winix">
+
+<h1>{seo_title}</h1>
+
+
+<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]seo">
+	
+	<div class="winix_input_a">
+	<label for="winix_title_id">{title}:</label>
+	<input id="winix_title_id" type="text" name="subject" value="[item_subject]" autofocus>
+	</div>
+	
+	<div class="winix_input_a">
+	<label for="winix_description_id">{seo_description}:</label>
+	<input id="winix_description_id" type="text" name="description" value="[item_meta "seo" "description"]">
+	</div>
+
+	<div class="winix_input_a">
+	<label for="winix_keywords_id">{seo_keywords}:</label>
+	<input id="winix_keywords_id" type="text" name="keywords" value="[item_meta "seo" "keywords"]">
+	</div>
+
+	[if winix_function_param_is "postredirect"]
+		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+	[end]
+	
+	<input type="submit" value="{change}">
+
+</form>
+
+
+</div>

winixd/html/fun_timezone.html

@@ -9,25 +9,26 @@
 [end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]timezone">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]timezone">
-<fieldset>
+	<div class="uk-margin">
-	<legend>{timezone_form_legend}</legend>
+		<label class="uk-form-label" for="winix_timezone_select">{timezone_select}:</label>
-	
-	<p class="withnext">{timezone_select}:</p>
-	
-	[# add to styles]
-	<select name="timezoneid" style="width: 250px;">
-	[for winix_tz_tab]
-		<option value="[winix_tz_tab_id]" [if cmp user_time_zone_id winix_tz_tab_id]selected="selected"[end]>UTC[winix_tz_tab_offset_hour_min] [winix_tz_tab_name]</option>
-	[end]
-	</select>
 
-	[if winix_function_param_is "postredirect"]
+		<div class="uk-form-controls">
-		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+			<select id="winix_timezone_select" name="timezoneid" class="uk-select">
-	[end]
+			[for winix_tz_tab]
+				<option value="[winix_tz_tab_id]" [if cmp user_time_zone_id winix_tz_tab_id]selected="selected"[end]>UTC[winix_tz_tab_offset_hour_min] [winix_tz_tab_name]</option>
+			[end]
+			</select>
+		</div>
+
+		[if winix_function_param_is "postredirect"]
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+		[end]
 	
-	<input class="submit" type="submit" value="{change}">
+		<div class="uk-margin uk-form-controls">
-</fieldset>
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+	</div>
 </form>
 
 

winixd/html/fun_tinymce.html

@@ -2,43 +2,52 @@
 
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
+<form class="uk-form-stacked">
 
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
+	</div>
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]tinymce">
+	<div class="uk-margin">
-<fieldset>
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
-	<legend>{form_emacs_legend}</legend>
+		<div class="uk-form-controls">
-	
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
-	[if mount_type_is "cms"]
+		</div>
-		<p class="withnext">{title}:</p>
+	</div>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
 	[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
+	<div class="uk-margin">
-		<p class="withnext">{title}:</p>
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
-		<input class="edit" type="text" name="subject" value="[item_subject]">
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
-		
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
-	[end]
 	
-
+	<div class="uk-form-controls">
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
+		<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
+	</div>
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
+	</div>
 	
-	<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
+	<div class="uk-form-controls">
-	
+		<input id="contenttype" type="hidden" name="contenttype" value="2">
-	<input type="hidden" name="contenttype" value="2">
+	</div>
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
-		
+			<div class="uk-form-controls">
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
-		<input class="edit" type="text" name="rebus">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 	
 		[include "antispam.html"]
 	[end]
@@ -47,8 +56,35 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-margin">
-</fieldset>
+		<div class="uk-form-controls uk-inline">
+
+			<button class="uk-button uk-button-primary winix_update_button"
+				data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]tinymce"
+				data-winix-content-tinymce-instances="winix-editor-content"
+				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
+				data-winix-progressbar-id="winix-editor-progressbar"
+				data-winix-messages-status-success-id="winix-editor-messages-status-success"
+				data-winix-messages-status-error-id="winix-editor-messages-status-error"
+				>
+				{tinymce_update_button}
+			</button>
+
+			<div id="winix-editor-progressbar" class="uk-invisible uk-position-center-right-out uk-margin-small-left">
+				<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="{tinymce_update_progressbar_img_alt}">
+			</div>
+
+		</div>
+
+		<div id="winix-editor-messages-status-success" class="winix-editor-messages-status-success">
+		</div>
+
+		<div id="winix-editor-messages-status-error" class="winix-editor-messages-status-error">
+		</div>
+
+	</div>
+
+
 </form>
 
 

winixd/html/fun_upload.html

@@ -19,98 +19,188 @@
     <noscript><input type="hidden" name="redirect" value="https://blueimp.github.io/jQuery-File-Upload/"></noscript>
     [end]
 
-	[# The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload]
+        <div class="row fileupload-buttonbar">
-    <div class="fileupload-buttonbar">
+          <div class="col-lg-7">
-        <div class="fileupload-buttons">
+            <!-- The fileinput-button span is used to style the file input field as button -->
-            [# The fileinput-button span is used to style the file input field as button]
+            <span class="btn btn-success fileinput-button">
-            <span class="fileinput-button">
+              <i class="glyphicon glyphicon-plus"></i>
-                <span>{upload_button_add_files}</span>
+              <span>{upload_button_add_files}</span>
-                <input type="file" name="files\[\]" multiple>
+              <input type="file" name="files\[\]" multiple />
             </span>
-            <button type="submit" class="start">{upload_button_start_upload}</button>
+            <button type="submit" class="btn btn-primary start">
-            <button type="reset" class="cancel">{upload_button_cancel_upload}</button>
+              <i class="glyphicon glyphicon-upload"></i>
-            <button type="button" class="delete">{upload_button_delete}</button>
+              <span>{upload_button_start_upload}</span>
-            <input type="checkbox" class="toggle">
+            </button>
-            [# The global file processing state]
+            <button type="reset" class="btn btn-warning cancel">
+              <i class="glyphicon glyphicon-ban-circle"></i>
+              <span>{upload_button_cancel_upload}</span>
+            </button>
+            <button type="button" class="btn btn-danger delete">
+              <i class="glyphicon glyphicon-trash"></i>
+              <span>{upload_button_delete}</span>
+            </button>
+
+            [# to the checkbox added form-check-input class and style element]
+            <input type="checkbox" class="toggle form-check-input" style="transform: none;">
+
+            <!-- The global file processing state -->
             <span class="fileupload-process"></span>
-        </div>
+          </div>
-        [# The global progress state]
+          <!-- The global progress state -->
-        <div class="fileupload-progress fade" style="display:none">
+          <div class="col-lg-5 fileupload-progress fade">
-            [# The global progress bar]
+            <!-- The global progress bar -->
-            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100"></div>
+            <div
-            [# The extended global progress state]
+              class="progress progress-striped active"
+              role="progressbar"
+              aria-valuemin="0"
+              aria-valuemax="100"
+            >
+              <div
+                class="progress-bar progress-bar-success"
+                style="width: 0%;"
+              ></div>
+            </div>
+            <!-- The extended global progress state -->
             <div class="progress-extended">&nbsp;</div>
+          </div>
         </div>
-    </div>
+
-    [# The table listing the files available for upload/download]
+        <!-- The table listing the files available for upload/download -->
-    <table role="presentation"><tbody class="files"></tbody></table>
+        <table role="presentation" class="table table-striped">
+          <tbody class="files"></tbody>
+        </table>
 </form>
 
+
 [# The blueimp Gallery widget]
-<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
+<div
-    <div class="slides"></div>
+  id="blueimp-gallery"
-    <h3 class="title"></h3>
+  class="blueimp-gallery blueimp-gallery-controls"
-    <a class="prev">‹</a>
+  aria-label="image gallery"
-    <a class="next">›</a>
+  aria-modal="true"
-    <a class="close">×</a>
+  role="dialog"
-    <a class="play-pause"></a>
+  data-filter=":even"
-    <ol class="indicator"></ol>
+>
+  <div class="slides" aria-live="polite"></div>
+  <h3 class="title"></h3>
+  <a
+	class="prev"
+	aria-controls="blueimp-gallery"
+	aria-label="previous slide"
+	aria-keyshortcuts="ArrowLeft"
+  ></a>
+  <a
+	class="next"
+	aria-controls="blueimp-gallery"
+	aria-label="next slide"
+	aria-keyshortcuts="ArrowRight"
+  ></a>
+  <a
+	class="close"
+	aria-controls="blueimp-gallery"
+	aria-label="close"
+	aria-keyshortcuts="Escape"
+  ></a>
+  <a
+	class="play-pause"
+	aria-controls="blueimp-gallery"
+	aria-label="play slideshow"
+	aria-keyshortcuts="Space"
+	aria-pressed="false"
+	role="button"
+  ></a>
+  <ol class="indicator"></ol>
 </div>
 
+
 [# The template to display files available for upload]
 <script id="template-upload" type="text/x-tmpl">
-			\{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
+      \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-upload fade">
+          <tr class="template-upload fade\{%=o.options.loadImageFileTypes.test(file.type)?' image':''%\}">
-					<td>
+              <td>
-						<span class="preview"></span>
+                  <span class="preview"></span>
-					</td>
+              </td>
-					<td>
+              <td>
-						<p class="name">\{%=file.name%\}</p>
+                  <p class="name">\{%=file.name%\}</p>
-						<strong class="error"></strong>
+                  <strong class="error text-danger"></strong>
-					</td>
+              </td>
-					<td>
+              <td>
-						<p class="size">Processing...</p>
+                  <p class="size">{upload_processing}</p>
-						<div class="progress"></div>
+                  <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
-					</td>
+              </td>
-					<td>
+              <td>
-						\{% if (!i && !o.options.autoUpload) \{ %\}
+                  \{% if (!o.options.autoUpload && o.options.edit && o.options.loadImageFileTypes.test(file.type)) \{ %\}
-							<button class="start" disabled>Start</button>
+                    <button class="btn btn-success edit" data-index="\{%=i%\}" disabled>
-						\{% \} %\}
+                        <i class="glyphicon glyphicon-edit"></i>
-						\{% if (!i) \{ %\}
+                        <span>{upload_button_edit}</span>
-							<button class="cancel">Cancel</button>
+                    </button>
-						\{% \} %\}
+                  \{% \} %\}
-					</td>
+                  \{% if (!i && !o.options.autoUpload) \{ %\}
-				</tr>
+                      <button class="btn btn-primary start" disabled>
-			\{% \} %\}</script>
+                          <i class="glyphicon glyphicon-upload"></i>
+                          <span>{upload_button_start_upload}</span>
+                      </button>
+                  \{% \} %\}
+                  \{% if (!i) \{ %\}
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel_upload}</span>
+                      </button>
+                  \{% \} %\}
+              </td>
+          </tr>
+      \{% \} %\}</script>
 
 [# The template to display files available for download]
 <script id="template-download" type="text/x-tmpl">
-			\{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
+      \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-download fade">
+          <tr class="template-download fade\{%=file.thumbnailUrl?' image':''%\}">
-					<td>
+              <td>
-						<span class="preview">
+                  <span class="preview">
-							\{% if (file.thumbnailUrl) \{ %\}
+                      \{% if (file.thumbnailUrl) \{ %\}
-								<a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" data-gallery><img src="\{%=file.thumbnailUrl%\}"></a>
+                          <a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" data-gallery><img src="\{%=file.thumbnailUrl%\}"></a>
-							\{% \} %\}
+                      \{% \} %\}
-						</span>
+                  </span>
-					</td>
+              </td>
-					<td>
+              <td>
-						<p class="name">
+                  <p class="name">
-							<a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" \{%=file.thumbnailUrl?'data-gallery':''%\}>\{%=file.name%\}</a>
+                      \{% if (file.url) \{ %\}
-						</p>
+                          <a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" \{%=file.thumbnailUrl?'data-gallery':''%\}>\{%=file.name%\}</a>
-						\{% if (file.error) \{ %\}
+                      \{% \} else \{ %\}
-							<div><span class="error">Error</span> \{%=file.error%\}</div>
+                          <span>\{%=file.name%\}</span>
-						\{% \} %\}
+                      \{% \} %\}
-					</td>
+                  </p>
-					<td>
+                  \{% if (file.error) \{ %\}
-						<span class="size">\{%=o.formatFileSize(file.size)%\}</span>
+                      <div><span class="label label-danger">{upload_error}</span> \{%=file.error%\}</div>
-					</td>
+                  \{% \} %\}
-					<td>
+              </td>
-						<button class="delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>Delete</button>
+              <td>
-						<input type="checkbox" name="delete" value="1" class="toggle">
+                  <span class="size">\{%=o.formatFileSize(file.size)%\}</span>
-					</td>
+              </td>
-				</tr>
+              <td>
-			\{% \} %\}</script>
+                  \{% if (file.deleteUrl) \{ %\}
+
+					[# added one div to inline the button with the checkbox]
+					[# to the checkbox added form-check-input class and style element]
+
+					<div class="form-inline" style="white-space: nowrap;">
+                      <button class="btn btn-danger delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>
+                          <i class="glyphicon glyphicon-trash"></i>
+                          <span>{upload_button_delete}</span>
+                      </button>
+                      <input type="checkbox" name="delete" value="1" class="toggle form-check-input" style="transform: none;">
+                    </div>
+
+
+                  \{% \} else \{ %\}
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel}</span>
+                      </button>
+                  \{% \} %\}
+              </td>
+          </tr>
+      \{% \} %\}</script>
 
 
 <script type="text/javascript">
@@ -129,8 +219,6 @@
 			    '/cors/result.html?%s'
             ));
 
-			$("div.winix #fileupload button.cancel").css('display','inline');
-
             [# loading existing files]
             [# copied from common/fileupload/js/main.js]
             $('#fileupload').addClass('fileupload-processing');

winixd/html/fun_vim.html

@@ -3,44 +3,55 @@
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]vim">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]vim">
-<fieldset>
+
-	<legend>{form_emacs_legend}</legend>
+
-	
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
-	[if mount_type_is "cms"]
+	<div class="uk-margin">
-		<p class="withnext">{title}:</p>
+		<label class="uk-form-label" for="winix_title_id">{title}:</label>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
+		<div class="uk-form-controls">
-		
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
-		<p class="withnext">{suggested_url}:</p>
+		</div>
-		<input class="edit" type="text" name="url" value="[item_url]">
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}:</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
+
+	<div class="uk-margin">
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
+		<div class="uk-form-controls">
-		<p class="withnext">{title}:</p>
+			<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
+		</div>
-		
+
-		<p class="withnext">{suggested_url}:</p>
+	</div>
-		<input class="edit" type="text" name="url" value="[item_url]">
-	[end]
 	
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
+	<div class="uk-form-controls">
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
+		<input type="hidden" name="contenttype" value="2">
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
+	</div>
-	
-	<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
-	
-	<input type="hidden" name="contenttype" value="2">
-	
-	[if winix_function_param_is "full"]
-	[else]
-	[end]
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
+		<div class="uk-margin">
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
+			<label class="uk-form-label" for="winix_nick_id">{nick}:</label>
-		
+			<div class="uk-form-controls">
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
-		<input class="edit" type="text" name="rebus">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 		
 		[include "antispam.html"]
 	[end]
@@ -49,8 +60,10 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-form-controls">
-</fieldset>
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
+
 </form>
 
 

winixd/html/index.html

@@ -4,20 +4,35 @@
 <html lang="{language}">
 
 <head>
+	[include "index_head_functions_add.html"]
 	<meta charset="UTF-8">
 	<title>[doc_title]</title>
-	[include "index_head_functions_add.html"]
 </head>
 
-<body>
+[if winix_function_is "login"]
-
+[# login template: https://zzseba78.github.io/Kick-Off/login.html ]
+<body class="uk-flex uk-flex-center uk-flex-middle uk-background-muted uk-height-viewport" data-uk-height-viewport>
 <div>
-[include "slog.html"]
+[else]
+<body class="uk-flex uk-flex-center">
+<div class="uk-width-2xlarge">
+[end]
 
-[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix]
+
-[# so you can easly use 'content' with your own template]
+
-[# and when using other winix functions you automatically get proper styling]
+	<div class="uk-position-fixed uk-position-bottom-center uk-position-small uk-visible@m uk-position-z-index">
-[content]
+		<span class="uk-text-small uk-text-muted">
+			© [current_year] [doc_base_url] - <a href="https://gitea.ttmath.org/tomasz.sowa/winix" title="Winix - a web framework" target="_blank" data-uk-tooltip>Powered by winix [sys_ver_major].[sys_ver_minor].[sys_ver_revision]</a>
+			| Built with <a href="http://getuikit.com" title="Visit UIkit 3 site" target="_blank" data-uk-tooltip><span data-uk-icon="uikit"></span></a>
+		</span>
+	</div>
+
+	[include "slog.html"]
+
+	[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix]
+	[# so you can easly use 'content' with your own template]
+	[# and when using other winix functions you automatically get proper styling]
+	[content]
 </div>
 
 </body>

winixd/html/index_bottom_adder.html

@@ -0,0 +1,2 @@
+
+

winixd/html/index_head_functions_add.html

@@ -1,73 +1,42 @@
-[# other stuff needed by a specific function]
+[# rename me to index_head_adder.html]
+
+
+[def winix_has_uikit "true"]
+[def winix_has_jquery "false"]
+
+[# UIkit CSS]
+<link rel="stylesheet" href="[doc_base_url_common]/uikit/uikit-3.6.13/css/uikit.min.css">
+
+[# UIkit JS]
+<script src="[doc_base_url_common]/uikit/uikit-3.6.13/js/uikit.min.js"></script>
+<script src="[doc_base_url_common]/uikit/uikit-3.6.13/js/uikit-icons.min.js"></script>
+
 
-[if one [winix_function_is "adduser"]
-	[winix_function_is "chmod"]
-	[winix_function_is "chown"]
-	[winix_function_is "ckeditor"]
-	[winix_function_is "cp"]
-	[winix_function_is "default"]
-	[winix_function_is "download"]
-	[winix_function_is "emacs"]
-	[winix_function_is "env"]
-	[winix_function_is "imgcrop"]
-	[winix_function_is "ipban"]
-	[winix_function_is "last"]
-	[winix_function_is "ln"]
-	[winix_function_is "locale"]
-	[winix_function_is "login"]
-	[winix_function_is "logout"]
-	[winix_function_is "ls"]
-	[winix_function_is "man"]
-	[winix_function_is "meta"]
-	[winix_function_is "mkdir"]
-	[winix_function_is "mount"]
-	[winix_function_is "mv"]
-	[winix_function_is "nicedit"]
-	[winix_function_is "node"]
-	[winix_function_is "passwd"]
-	[winix_function_is "priv"]
-	[winix_function_is "pw"]
-	[winix_function_is "reload"]
-	[winix_function_is "rm"]
-	[winix_function_is "rmuser"]
-	[winix_function_is "sort"]
-	[winix_function_is "stat"]
-	[winix_function_is "subject"]
-	[winix_function_is "template"]
-	[winix_function_is "timezone"]
-	[winix_function_is "tinymce"]
-	[winix_function_is "uname"]
-	[winix_function_is "upload"]
-	[winix_function_is "uptime"]
-	[winix_function_is "vim"]
-	[winix_function_is "who"]]
-	<link rel="stylesheet" href="[doc_base_url_common]/winix/winix.css" type="text/css">
-[end]
 
 
 [if winix_function_is "emacs"]
-	<script type="text/javascript" src="[doc_base_url_common]/codemirror-5.1/lib/codemirror.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/lib/codemirror.css" type="text/css">
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.css" type="text/css">
 
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/css/css.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/css/css.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/javascript/javascript.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/javascript/javascript.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/xml/xml.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/xml/xml.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/htmlmixed/htmlmixed.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/htmlmixed/htmlmixed.js"></script>
 
-	<!--<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/theme/base16-light.css" type="text/css">-->
+	<!--<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/theme/base16-light.css" type="text/css">-->
 
-	<script src="[doc_base_url_common]/codemirror-5.1/addon/display/fullscreen.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/addon/display/fullscreen.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/addon/display/fullscreen.css" type="text/css">
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/addon/display/fullscreen.css" type="text/css">
 
 [if false]
-	<script src="[doc_base_url_common]/codemirror-5.1/addon/search/search.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/addon/search/search.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/addon/search/matchesonscrollbar.css" type="text/css">
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/addon/search/matchesonscrollbar.css" type="text/css">
 [end]
 
-<script src="[doc_base_url_common]/codemirror-5.1/addon/fold/xml-fold.js"></script>
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/fold/xml-fold.js"></script>
-<script src="[doc_base_url_common]/codemirror-5.1/addon/edit/matchtags.js"></script>
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/edit/matchtags.js"></script>
 
-<script src="[doc_base_url_common]/codemirror-5.1/addon/selection/active-line.js"></script>
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/selection/active-line.js"></script>
 
 <style>
 
@@ -135,16 +104,22 @@ cm.save()
 
 
 [if winix_function_is "ckeditor"]
+	[def winix_has_jquery "true"]
 	<script type="text/javascript" src="[doc_base_url_common]/ckeditor_4.9.2/ckeditor.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/winix/update_button.js"></script>
 [end]
 
 
 [if winix_function_is "tinymce"]
-	<!--<script type="text/javascript">document.domain = "www.slimaczek.pl";</script>-->
+	<script type="text/javascript" src="[doc_base_url]/common/tiny_mce/5.6.2/tinymce.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url]/common/tiny_mce/tiny_mce.js"></script>
+
-	<script type="text/javascript" src="[doc_base_url]/var/tinymce.js"></script>
+	[# tinymce can use a special theme called 'mobile' - it is used when /mobile param is provided]
+	<script type="text/javascript" src="[doc_base_url]/var/tinymce.js[if winix_function_param_is "mobile"]/-/mobile[end]"></script>
+
+	[def winix_has_jquery "true"]
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/winix/update_button.js"></script>
 [end]
 
 
@@ -155,14 +130,14 @@ cm.save()
 
 
 [if winix_function_is "vim"]
-[# this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ]
-[# you should add one file to winix: wymiframe.html ]
 
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.2.min.js"></script>
+	[# info from version 0.5-rc1: this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ]
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/jquery.wymeditor.min.js"></script>
+	[# you should add one file to winix: wymiframe.html ]
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/lang/en.js"></script>
+
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/skins/default/skin.js"></script>
+	[def winix_has_jquery "true"]
-	<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/skins/default/skin.css">
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/1.1.1/wymeditor/jquery.wymeditor.min.js"></script>
+	<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/1.1.1/wymeditor/skins/default/skin.css">
 	<script type="text/javascript">jQuery(function() \{ jQuery("textarea").wymeditor(\{ basePath: "[doc_base_url_common]/wymeditor/", iframeBasePath: "[doc_base_url]/var/", updateSelector : "form", updateEvent: 'submit' \}); \});</script>
 	
 [end]
@@ -191,11 +166,13 @@ cm.save()
 	[end]
 
 	[if one [gallery_mount_type_arg_is "galleria"] [gallery_mount_type_arg_is "galleriathumb"]]
+		[def winix_has_jquery "true"]
 		<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.4.min.js"></script>
 		<script src="[doc_base_url_common]/aino-galleria/galleria-1.2.2.min.js" type="text/javascript"></script>
 	[end]
 
 	[if one [gallery_mount_type_arg_is "galleria1.2.9"] [gallery_mount_type_arg_is "galleriathumb1.2.9"]]
+		[def winix_has_jquery "true"]
 		<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
 		<script src="[doc_base_url_common]/galleria/galleria-1.2.9.min.js" type="text/javascript"></script>
 	[end]
@@ -205,9 +182,8 @@ cm.save()
 
 
 [if winix_function_is "upload"]
-	[# http://blueimp.github.io/jQuery-File-Upload/jquery-ui.html]
+	[# https://blueimp.github.io/jQuery-File-Upload/]
 	[# https://github.com/blueimp/jQuery-File-Upload]
-	[# we are using the *jQuery UI version* of the plugin]
 
 	[# Force latest IE rendering engine or ChromeFrame if installed]
 	<!--\[if IE\]>
@@ -215,79 +191,68 @@ cm.save()
 	<!\[endif\]-->
 
 
-	<!-- jQuery UI styles -->
+    <link rel="stylesheet" href="[doc_base_url_common]/bootstrap/3.3.7/css/bootstrap.min.css">
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.css">
 
-	<!-- Generic page styles -->
+	[# in doc_base_url_common/jquery-file-upload/10.31.0_extra/blueimp-gallery/ is download_all_files.sh script in order to download all necessary files]
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/style.css">
+    <!-- blueimp Gallery styles -->
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/blueimp-gallery/blueimp-gallery.min.css">
 
-	[if false]
+    [# CSS to style the file input field as button and adjust the Bootstrap progress bars]
-	<style>
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload.css">
-	/* Adjust the jQuery UI widget font-size: */
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui.css">
-	.ui-widgetREMOVEME \{
+
-		font-size: 0.95em;
+    [# CSS adjustments for browsers with JavaScript disabled]
-	\}
+    <noscript>
-	</style>
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-noscript.css">
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui-noscript.css">
+	</noscript>
+
+
+	[def winix_has_jquery "true"]
+    <script src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+
+
+    <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/vendor/jquery.ui.widget.js"></script>
+
+    <!-- The Templates plugin is included to render the upload/download listings -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/tmpl.min.js"></script>
+    <!-- The Load Image plugin is included for the preview images and image resizing functionality -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/load-image.all.min.js"></script>
+    <!-- The Canvas to Blob plugin is included for image resizing functionality -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/canvas-to-blob.min.js"></script>
+    <!-- blueimp Gallery script -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/jquery.blueimp-gallery.min.js"></script>
+
+    <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.iframe-transport.js"></script>
+    <!-- The basic File Upload plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload.js"></script>
+    <!-- The File Upload processing plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-process.js"></script>
+    <!-- The File Upload image preview & resize plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-image.js"></script>
+    <!-- The File Upload audio preview plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-audio.js"></script>
+    <!-- The File Upload video preview plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-video.js"></script>
+    <!-- The File Upload validation plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-validate.js"></script>
+    <!-- The File Upload user interface plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-ui.js"></script>
+
+    [if false]
+    [# the code to run the plugin we have in fun_upload.html]
+    <!-- The main application script -->
+	<!--
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/demo.js"></script>
+	-->
 	[end]
 
-	<!-- blueimp Gallery styles -->
+    <!-- The XDomainRequest Transport is included for cross-domain file deletion for IE 8 and IE 9 -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/blueimp-gallery.min.css">
+    <!--\[if (gte IE 8)&(lt IE 10)\]>
-
+      <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/cors/jquery.xdr-transport.js"></script>
-	<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
+    <!\[endif\]-->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload.css">
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui.css">
-
-	<!-- CSS adjustments for browsers with JavaScript disabled -->
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-noscript.css"></noscript>
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui-noscript.css"></noscript>
-
-
-	<!--
-	[# it doesn't work with this jquery]
-	<script src="[doc_base_url_common]/jquery/jquery-3.2.1.slim.min.js"></script>
-	-->
-
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.min.js"></script>
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.min.js"></script>
-
-	<!-- The Templates plugin is included to render the upload/download listings -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/tmpl.min.js"></script>
-
-	<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/load-image.all.min.js"></script>
-
-	<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/canvas-to-blob.min.js"></script>
-
-	<!-- blueimp Gallery script -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.blueimp-gallery.min.js"></script>
-
-	<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.iframe-transport.js"></script>
-
-	<!-- The basic File Upload plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload.js"></script>
-
-	<!-- The File Upload processing plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-process.js"></script>
-
-	<!-- The File Upload image preview & resize plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-image.js"></script>
-
-	<!-- The File Upload audio preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-audio.js"></script>
-
-	<!-- The File Upload video preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-video.js"></script>
-
-	<!-- The File Upload validation plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-validate.js"></script>
-
-	<!-- The File Upload user interface plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-ui.js"></script>
-
-	<!-- The File Upload jQuery UI plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-jquery-ui.js"></script>
 
 [end]
 
@@ -295,6 +260,7 @@ cm.save()
 
 [if winix_function_is "sort"]
 	[if not item_is]
+	[def winix_has_jquery "true"]
 	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.6.1.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/jquery-ui-1.8.13/js/jquery-ui-1.8.13.custom.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/sort.js"></script>
@@ -303,6 +269,7 @@ cm.save()
 
 
 [if winix_function_is "imgcrop"]
+	[def winix_has_jquery "true"]
 	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="[doc_base_url_common]/jcrop-0.9.12/js/jquery.Jcrop.js"></script>
 	<link type="text/css" rel="stylesheet" href="[doc_base_url_common]/jcrop-0.9.12/css/jquery.Jcrop.css">

winixd/locale/en

@@ -5,7 +5,6 @@ language = en
 charset = UTF-8
 
 logged_as = logged as
-logged_as_long = You are logged as
 
 display_guest_name = guest
 unknown = unknown
@@ -24,6 +23,16 @@ account_already_activated = This account is already activated
 account_cannot_be_activated = This account cannot be activated, please contact with the system administrator
 account_email_sent = An email with an activation link has been sent to you
 
+account_header = My Account
+account_logged_as = You are logged as:
+account_not_logged = You are not logged in.
+account_admin = Root
+account_admin_yes = yes
+account_groups = Groups
+account_timezone = Time zone
+account_language = Language
+
+
 export_header = Export
 export_transer_file_info = Press Export to transfer the file to an external ftp server
 export_transer_dir_info = Press Export to transfer the directory to an external ftp server
@@ -40,7 +49,6 @@ email_sent_to = An email has been sent to:
 logout = logout
 
 
-remember_me = Remember me
 
 home_page = Home page   
 
@@ -104,6 +112,12 @@ create_ticket_header = Create a new ticket
 
 
 
+
+ckeditor_update_button = Update
+ckeditor_update_progressbar_img_alt = Progressbar
+
+
+
 form_ticket_type = Ticket type
 form_ticket_status = Status
 form_ticket_priority = Priority
@@ -304,7 +318,10 @@ upload_button_cancel_upload = Cancel upload
 upload_button_delete = Delete
 upload_button_processing = Processing...
 upload_button_download = Download
+upload_button_edit = Edit
 upload_error = Error:
+upload_processing = Processing...
+
 
 who_header = Sessions
 who_tab_index = Ind.
@@ -331,7 +348,6 @@ admin_sort = "Sort items (sort)"
 locale_header = Locale
 locale_your_locale = Current language
 locale_has_incorrect_id = You don't have a correct language set
-locale_form_legend = Locale form
 locale_select = Select language
 
 
@@ -340,7 +356,16 @@ login_cannot_login_from_this_ip = We are sorry but you cannot login from this IP
 #We are sorry but there were too many incorrect login attempts from your IP address.
 
 login_cannot_login_available = The login process will be available since:
-
+login_currently_logged_as = You are logged as:
+login_username = Username
+login_password = Password
+login_remember_me = Remember me
+login_button = Log in
+login_forgot_password_question = Forgot your password?
+login_back_to_login_form = Back to Login
+login_forgot_password_email = E-mail
+login_forgot_password_button = Change password
+login_logout_button = Logout
 
 uptime_header = Uptime
 uptime_current_time = current time
@@ -352,13 +377,11 @@ uptime_days = days
 
 adduser_header_add = Add a user
 adduser_header_register = Register
-adduser_form_legend = Register user form
 adduser_login = Login
 adduser_password = Password
 adduser_confirm_password = Confirm password
 adduser_email = You can also provide your email address. If you ever forget your password we will be able send you the password back.
-adduser_need_email = You have to provide your email address.
+adduser_need_email = You have to provide your email address. We send you an email with an activation link
-adduser_need_email2 = We send you an email with an activation link
 adduser_submit = Add user
 register_user_submit = Register
 adduser_err_login_empty = Provide a login please.
@@ -402,7 +425,6 @@ mv_incorrect_dir = Incorrect directory
 
 
 timezone_header = Time Zone
-timezone_form_legend = Time Zone form
 timezone_select = Select your time zone
 timezone_your_zone = Your current time zone is
 timezone_has_incorrect_id = You don't have a correct time zone set
@@ -453,6 +475,8 @@ stat_template_from_mount_point = from the mount point
 subject_header = Edit subject
 
 
+tinymce_update_button = Update
+tinymce_update_progressbar_img_alt = Progressbar
 
 uname_header = Uname
 uname_available_plugins = Available plugins
@@ -617,6 +641,10 @@ tz_+13:00 =  Nuku'alofa
 tz_+13:00b =  Samoa
 
 
+seo_title = Seo
+seo_description = Description
+seo_keywords = Keywords
+
 
 
 

winixd/locale/pl

@@ -6,7 +6,6 @@ language = pl
 charset = UTF-8
 
 logged_as = zalogowany jako    
-logged_as_long = Aktualnie jesteś zalogowany jako
 
 display_guest_name = gość
 unknown = nie znany
@@ -26,6 +25,15 @@ account_already_activated = To konto jest już aktywowane
 account_cannot_be_activated = To konto nie może być aktywowane, proszę skontaktować się z administratorem
 account_email_sent = Wysłaliśmy Tobie email z linkiem aktywacyjnym
 
+account_header = Moje konto
+account_logged_as = Jesteś zalogowany jako:
+account_not_logged = Nie jesteś zalogowany.
+account_admin = Administrator
+account_admin_yes = tak
+account_groups = Grupy
+account_timezone = Strefa czasowa
+account_language = Język
+
 
 export_header = Export
 export_transer_file_info = Wciśnij przycisk Export aby wysłać ten plik na zewnętrzny serwer ftp
@@ -45,7 +53,6 @@ email_sent_to = Wiadomość została wysłana do:
 logout = wyloguj
 
 
-remember_me = Zapamiętaj mnie
 
 home_page = Strona główna   
 
@@ -110,6 +117,13 @@ create_ticket_header = Nowe zgłoszenie
 
 
 
+
+
+ckeditor_update_button = Aktualizuj
+ckeditor_update_progressbar_img_alt = Progressbar
+
+
+
 form_ticket_type = Rodzaj zgłoszenia
 form_ticket_status = Status
 form_ticket_priority = Priorytet
@@ -326,7 +340,9 @@ upload_button_cancel_upload = Przerwij wysyłanie
 upload_button_delete = Usuń
 upload_button_processing = Wysyłanie...
 upload_button_download = Ściągnij
+upload_button_edit = Edytuj
 upload_error = Błąd:
+upload_processing = Przygotowywanie...
 
 who_header = Lista sesji
 who_tab_index = L.p.
@@ -352,7 +368,6 @@ admin_sort = "Sortuj elementy (sort)"
 locale_header = Ustawienia językowe
 locale_your_locale = Bieżący język
 locale_has_incorrect_id = Nie masz prawidłowo ustawionego bieżącego języka
-locale_form_legend = Formularz ustawienia języka
 locale_select = Wybierz język
 
 
@@ -361,6 +376,16 @@ login_cannot_login_from_this_ip = Przepraszamy ale nie możesz się zalogować z
 #Przepraszamy ale z twojego adresu IP było zbyt wiele prób nieprawidłowego logowania. 
 
 login_cannot_login_available = Ponowne logowanie będzie możliwe dopiero od:
+login_currently_logged_as = Aktualnie jesteś zalogowany jako:
+login_username = Użytkownik
+login_password = Hasło
+login_remember_me = Zapamiętaj mnie
+login_button = Zaloguj
+login_forgot_password_question = Zapomniałeś hasła?
+login_back_to_login_form = Powrót do logowania
+login_forgot_password_email = E-mail
+login_forgot_password_button = Zmień hasło
+login_logout_button = Wyloguj
 
 uptime_header = Czas pracy systemu
 uptime_current_time = aktualna godzina
@@ -372,13 +397,11 @@ uptime_days = dni
 
 adduser_header_add = Dodaj użytkownika
 adduser_header_register = Zarejestruj się
-adduser_form_legend = Formularz rejestracji nowego użytkownika
 adduser_login = Login
 adduser_password = Hasło
 adduser_confirm_password = Potwierdź hasło
 adduser_email = Możesz także podać swój email. Jeśli zapomnisz kiedyś hasła to hasło zostanie wysłane na podany email
-adduser_need_email = Wymagamy abyś podał nam swój adres email,
+adduser_need_email = Wymagamy abyś podał nam swój adres email, na ten adres wyślemy wiadomość z linkiem aktywacyjnym.
-adduser_need_email2 = na ten adres wyślemy wiadomość z linkiem aktywacyjnym
 adduser_submit = Dodaj użytkownika
 register_user_submit = Rejestruj
 adduser_err_login_empty = Proszę podać login.
@@ -393,7 +416,7 @@ adduser_err_password_too_big = Hasło nie może być większe niż
 adduser_err_password_too_big2 = znaków
 adduser_err_email_too_big = Adres email nie może być większy niż
 adduser_err_email_too_big2 = znaków
-adduser_auto_activate = Automatically activate this account
+adduser_auto_activate = Aktywuj automatycznie to konto
 adduser_err_email_incorrect = Podany email jest nieprawidłowy
 
 
@@ -422,7 +445,6 @@ mv_incorrect_dir = Nieprawidłowy katalog
 
 
 timezone_header = Strefa czasowa
-timezone_form_legend = Formularz wyboru strefy czasowej
 timezone_select = Wybierz swoją strefę czasową
 timezone_your_zone = Twoja aktualna strefa czasowa to
 timezone_has_incorrect_id = Nie masz prawidłowo ustawionej strefy czasowej
@@ -473,6 +495,9 @@ stat_template_from_mount_point = z punktu montowania
 subject_header = Zmień tytuł
 
 
+tinymce_update_button = Aktualizuj
+tinymce_update_progressbar_img_alt = Progressbar
+
 uname_header = Nazwa systemu
 uname_available_plugins = Dostępne pluginy
 uname_plugin_unknown = Plugin nie ustawił swojej nazwy
@@ -635,6 +660,11 @@ tz_+13:00 =  Nuku'alofa
 tz_+13:00b =  Samoa
 
 
+seo_title = Seo
+seo_description = "Opis (tag meta description)"
+seo_keywords = "Słowa kluczowe (tag meta keywords)"
+
+
 
 
 

winixd/main/Makefile.dep

@@ -48,15 +48,15 @@ main.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 main.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 main.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 main.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-main.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+main.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-main.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+main.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-main.o: ../../../morm/src/jsonexpression.h
+main.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+main.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+main.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 main.o: ../../../morm/src/postgresqlexpression.h
-main.o: ../../../morm/src/dochtmlexpression.h
 main.o: ../../../morm/src/jsonconnector.h
 main.o: ../../../morm/src/postgresqlconnector.h
 main.o: ../../../morm/src/postgresqlqueryresult.h
-main.o: ../../../morm/src/dochtmlconnector.h
 main.o: ../../../winix/winixd/core/ipbancontainer.h
 main.o: ../../../winix/winixd/core/lastcontainer.h
 main.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h

winixd/notify/Makefile.dep

@@ -42,15 +42,16 @@ notify.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 notify.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 notify.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 notify.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-notify.o: ../../../morm/src/baseexpression.h
+notify.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+notify.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+notify.o: ../../../morm/src/finderhelper.h
+notify.o: ../../../morm/src/fieldvaluehelper.h
 notify.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 notify.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 notify.o: ../../../morm/src/postgresqlexpression.h
-notify.o: ../../../morm/src/dochtmlexpression.h
 notify.o: ../../../morm/src/jsonconnector.h
 notify.o: ../../../morm/src/postgresqlconnector.h
-notify.o: ../../../morm/src/postgresqlqueryresult.h
+notify.o: ../../../morm/src/postgresqlqueryresult.h templatesnotify.h
-notify.o: ../../../morm/src/dochtmlconnector.h templatesnotify.h
 notify.o: ../../../winix/winixd/core/textstream.h
 notify.o: ../../../winix/winixd/core/users.h
 notify.o: ../../../winix/winixd/core/user.h
@@ -172,20 +173,22 @@ notifythread.o: ../../../morm/src/queryresult.h
 notifythread.o: ../../../morm/src/flatconnector.h
 notifythread.o: ../../../morm/src/dbexpression.h
 notifythread.o: ../../../morm/src/baseexpression.h
+notifythread.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+notifythread.o: ../../../morm/src/cursorhelper.h
+notifythread.o: ../../../morm/src/finderhelper.h
+notifythread.o: ../../../morm/src/fieldvaluehelper.h
 notifythread.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-notifythread.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+notifythread.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+notifythread.o: ../../../morm/src/jsonexpression.h
 notifythread.o: ../../../morm/src/postgresqlexpression.h
-notifythread.o: ../../../morm/src/dochtmlexpression.h
 notifythread.o: ../../../morm/src/jsonconnector.h
 notifythread.o: ../../../morm/src/postgresqlconnector.h
-notifythread.o: ../../../morm/src/postgresqlqueryresult.h
+notifythread.o: ../../../morm/src/postgresqlqueryresult.h templatesnotify.h
-notifythread.o: ../../../morm/src/dochtmlconnector.h templatesnotify.h
 notifythread.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 notifythread.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 notifythread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
-notifythread.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
+notifythread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
-notifythread.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
+notifythread.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
-notifythread.o: ../../../ezc/src/outstreams.h
 notifythread.o: ../../../ezc/src/expressionparser.h
 notifythread.o: ../../../ezc/src/patternparser.h
 notifythread.o: ../../../winix/winixd/core/textstream.h

winixd/plugins/export/Makefile.dep

@@ -61,15 +61,16 @@ edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 edb.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 edb.o: ../../../../morm/src/flatconnector.h
 edb.o: ../../../../morm/src/dbexpression.h
-edb.o: ../../../../morm/src/baseexpression.h
+edb.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+edb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+edb.o: ../../../../morm/src/finderhelper.h
+edb.o: ../../../../morm/src/fieldvaluehelper.h
 edb.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 edb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 edb.o: ../../../../morm/src/postgresqlexpression.h
-edb.o: ../../../../morm/src/dochtmlexpression.h
 edb.o: ../../../../morm/src/jsonconnector.h
 edb.o: ../../../../morm/src/postgresqlconnector.h
 edb.o: ../../../../morm/src/postgresqlqueryresult.h
-edb.o: ../../../../morm/src/dochtmlconnector.h
 exportinfo.o: ../../../../winix/winixd/core/log.h exportinfo.h
 exportinfo.o: ../../../../winix/winixd/core/system.h
 exportinfo.o: ../../../../winix/winixd/core/job.h
@@ -107,15 +108,19 @@ exportinfo.o: ../../../../morm/src/queryresult.h
 exportinfo.o: ../../../../morm/src/flatconnector.h
 exportinfo.o: ../../../../morm/src/dbexpression.h
 exportinfo.o: ../../../../morm/src/baseexpression.h
+exportinfo.o: ../../../../morm/src/modelenv.h
+exportinfo.o: ../../../../morm/src/modeldata.h
+exportinfo.o: ../../../../morm/src/cursorhelper.h
+exportinfo.o: ../../../../morm/src/finderhelper.h
+exportinfo.o: ../../../../morm/src/fieldvaluehelper.h
 exportinfo.o: ../../../../morm/src/flatexpression.h
-exportinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
+exportinfo.o: ../../../../morm/src/finder.h ../../../../pikotools/utf8/utf8.h
+exportinfo.o: ../../../../morm/src/cursor.h
 exportinfo.o: ../../../../morm/src/jsonexpression.h
 exportinfo.o: ../../../../morm/src/postgresqlexpression.h
-exportinfo.o: ../../../../morm/src/dochtmlexpression.h
 exportinfo.o: ../../../../morm/src/jsonconnector.h
 exportinfo.o: ../../../../morm/src/postgresqlconnector.h
 exportinfo.o: ../../../../morm/src/postgresqlqueryresult.h
-exportinfo.o: ../../../../morm/src/dochtmlconnector.h
 exportinfo.o: ../../../../winix/winixd/core/dirs.h
 exportinfo.o: ../../../../winix/winixd/core/item.h
 exportinfo.o: ../../../../winix/winixd/core/dircontainer.h
@@ -136,7 +141,6 @@ exportinfo.o: ../../../../winix/winixd/core/textstream.h
 exportinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
 exportinfo.o: ../../../../winix/winixd/core/textstream.h
 exportinfo.o: ../../../../winix/winixd/core/misc.h
-exportinfo.o: ../../../../pikotools/utf8/utf8.h
 exportinfo.o: ../../../../winix/winixd/core/winix_const.h
 exportinfo.o: ../../../../pikotools/convert/convert.h
 exportinfo.o: ../../../../pikotools/convert/inttostr.h
@@ -275,15 +279,17 @@ funexport.o: ../../../../morm/src/queryresult.h
 funexport.o: ../../../../morm/src/flatconnector.h
 funexport.o: ../../../../morm/src/dbexpression.h
 funexport.o: ../../../../morm/src/baseexpression.h
+funexport.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+funexport.o: ../../../../morm/src/cursorhelper.h
+funexport.o: ../../../../morm/src/finderhelper.h
+funexport.o: ../../../../morm/src/fieldvaluehelper.h
 funexport.o: ../../../../morm/src/flatexpression.h
 funexport.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 funexport.o: ../../../../morm/src/jsonexpression.h
 funexport.o: ../../../../morm/src/postgresqlexpression.h
-funexport.o: ../../../../morm/src/dochtmlexpression.h
 funexport.o: ../../../../morm/src/jsonconnector.h
 funexport.o: ../../../../morm/src/postgresqlconnector.h
 funexport.o: ../../../../morm/src/postgresqlqueryresult.h
-funexport.o: ../../../../morm/src/dochtmlconnector.h
 funexport.o: ../../../../winix/winixd/core/dirs.h
 funexport.o: ../../../../winix/winixd/core/dircontainer.h
 funexport.o: ../../../../winix/winixd/core/request.h
@@ -375,15 +381,17 @@ init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
-init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
+init.o: ../../../../pikotools/utf8/utf8.h ../../../../morm/src/cursor.h
+init.o: ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/core/dirs.h
 init.o: ../../../../winix/winixd/core/item.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
@@ -403,7 +411,6 @@ init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/templates/htmltextstream.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/misc.h
-init.o: ../../../../pikotools/utf8/utf8.h
 init.o: ../../../../winix/winixd/core/winix_const.h
 init.o: ../../../../pikotools/convert/convert.h
 init.o: ../../../../pikotools/convert/inttostr.h

winixd/plugins/export/exportthread.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2018, Tomasz Sowa
+ * Copyright (c) 2011-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -183,10 +183,7 @@ void ExportThread::DoMessage()
 		if( message_work.errors > conn_max_errors )
 		{
 			message_work.can_remove = true;
-
-			Lock();
 			log << log1 << "Export: too many errors for uploading " << message_work.path << " (skipping)" << logend << logsave;
-			Unlock();
 		}
 	}
 }
@@ -206,9 +203,7 @@ bool ExportThread::Fetch(const char * url)
 
 	if( !curl )
 	{
-		Lock();
 		log << log1 << "Export: I can't use curl" << logend;
-		Unlock();
 		return false;
 	}
 
@@ -232,9 +227,7 @@ bool ExportThread::Fetch(const char * url)
 
 	if( res != 0 )
 	{
-		Lock();
 		log << log1 << "Export: download failed: " << error_buf << logend << logsave;
-		Unlock();
 		return false;
 	}
 	
@@ -288,9 +281,7 @@ FILE * file = 0;
 
 		if( !file )
 		{
-			Lock();
 			log << log1 << "Export: I cannot open the file: " << local_path << logend;
-			Unlock();
 			return false;
 		}
 		else
@@ -307,9 +298,7 @@ FILE * file = 0;
 
 	if( !curl )
 	{
-		Lock();
 		log << log1 << "Export: I can't use curl (sending)" << logend;
-		Unlock();
 
 		if( file )
 			fclose(file);
@@ -355,16 +344,12 @@ FILE * file = 0;
 
 	if( res != 0 )
 	{
-		Lock();
 		log << log1 << "Export: upload failed: " << error_buf << " (" << ftp_server << ")" << logend << logsave;
-		Unlock();
 		return false;
 	}
 	else
 	{
-		Lock();
 		log << log2 << "Export: uploaded: " << ftp_server << logend << logsave;
-		Unlock();
 	}
 	
 return true;

winixd/plugins/gallery/Makefile.dep

@@ -66,15 +66,17 @@ gallery.o: ../../../../morm/src/queryresult.h
 gallery.o: ../../../../morm/src/flatconnector.h
 gallery.o: ../../../../morm/src/dbexpression.h
 gallery.o: ../../../../morm/src/baseexpression.h
+gallery.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+gallery.o: ../../../../morm/src/cursorhelper.h
+gallery.o: ../../../../morm/src/finderhelper.h
+gallery.o: ../../../../morm/src/fieldvaluehelper.h
 gallery.o: ../../../../morm/src/flatexpression.h
 gallery.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 gallery.o: ../../../../morm/src/jsonexpression.h
 gallery.o: ../../../../morm/src/postgresqlexpression.h
-gallery.o: ../../../../morm/src/dochtmlexpression.h
 gallery.o: ../../../../morm/src/jsonconnector.h
 gallery.o: ../../../../morm/src/postgresqlconnector.h
 gallery.o: ../../../../morm/src/postgresqlqueryresult.h
-gallery.o: ../../../../morm/src/dochtmlconnector.h
 gallery.o: ../../../../winix/winixd/core/dirs.h
 gallery.o: ../../../../winix/winixd/core/dircontainer.h
 gallery.o: ../../../../winix/winixd/core/request.h
@@ -194,15 +196,16 @@ init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
 init.o: ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/core/dirs.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/core/request.h
@@ -368,15 +371,17 @@ templates.o: ../../../../morm/src/queryresult.h
 templates.o: ../../../../morm/src/flatconnector.h
 templates.o: ../../../../morm/src/dbexpression.h
 templates.o: ../../../../morm/src/baseexpression.h
+templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+templates.o: ../../../../morm/src/cursorhelper.h
+templates.o: ../../../../morm/src/finderhelper.h
+templates.o: ../../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../../morm/src/flatexpression.h
 templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 templates.o: ../../../../morm/src/jsonexpression.h
 templates.o: ../../../../morm/src/postgresqlexpression.h
-templates.o: ../../../../morm/src/dochtmlexpression.h
 templates.o: ../../../../morm/src/jsonconnector.h
 templates.o: ../../../../morm/src/postgresqlconnector.h
 templates.o: ../../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../../morm/src/dochtmlconnector.h
 templates.o: ../../../../winix/winixd/core/dirs.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
 templates.o: ../../../../winix/winixd/core/request.h

winixd/plugins/group/Makefile.dep

@@ -36,15 +36,18 @@ groupinfo.o: ../../../../morm/src/queryresult.h
 groupinfo.o: ../../../../morm/src/flatconnector.h
 groupinfo.o: ../../../../morm/src/dbexpression.h
 groupinfo.o: ../../../../morm/src/baseexpression.h
+groupinfo.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+groupinfo.o: ../../../../morm/src/cursorhelper.h
+groupinfo.o: ../../../../morm/src/finderhelper.h
+groupinfo.o: ../../../../morm/src/fieldvaluehelper.h
 groupinfo.o: ../../../../morm/src/flatexpression.h
-groupinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
+groupinfo.o: ../../../../morm/src/finder.h ../../../../pikotools/utf8/utf8.h
+groupinfo.o: ../../../../morm/src/cursor.h
 groupinfo.o: ../../../../morm/src/jsonexpression.h
 groupinfo.o: ../../../../morm/src/postgresqlexpression.h
-groupinfo.o: ../../../../morm/src/dochtmlexpression.h
 groupinfo.o: ../../../../morm/src/jsonconnector.h
 groupinfo.o: ../../../../morm/src/postgresqlconnector.h
 groupinfo.o: ../../../../morm/src/postgresqlqueryresult.h
-groupinfo.o: ../../../../morm/src/dochtmlconnector.h
 groupinfo.o: ../../../../winix/winixd/core/system.h
 groupinfo.o: ../../../../winix/winixd/core/job.h
 groupinfo.o: ../../../../winix/winixd/core/basethread.h
@@ -59,7 +62,6 @@ groupinfo.o: ../../../../winix/winixd/db/dbtextstream.h
 groupinfo.o: ../../../../winix/winixd/core/textstream.h
 groupinfo.o: ../../../../winix/winixd/core/misc.h
 groupinfo.o: ../../../../winix/winixd/core/requesttypes.h
-groupinfo.o: ../../../../pikotools/utf8/utf8.h
 groupinfo.o: ../../../../winix/winixd/core/winix_const.h
 groupinfo.o: ../../../../pikotools/convert/convert.h
 groupinfo.o: ../../../../pikotools/convert/inttostr.h
@@ -158,14 +160,17 @@ groups.o: ../../../../morm/src/queryresult.h
 groups.o: ../../../../morm/src/flatconnector.h
 groups.o: ../../../../morm/src/dbexpression.h
 groups.o: ../../../../morm/src/baseexpression.h
+groups.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+groups.o: ../../../../morm/src/cursorhelper.h
+groups.o: ../../../../morm/src/finderhelper.h
+groups.o: ../../../../morm/src/fieldvaluehelper.h
 groups.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
-groups.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
+groups.o: ../../../../pikotools/utf8/utf8.h ../../../../morm/src/cursor.h
+groups.o: ../../../../morm/src/jsonexpression.h
 groups.o: ../../../../morm/src/postgresqlexpression.h
-groups.o: ../../../../morm/src/dochtmlexpression.h
 groups.o: ../../../../morm/src/jsonconnector.h
 groups.o: ../../../../morm/src/postgresqlconnector.h
 groups.o: ../../../../morm/src/postgresqlqueryresult.h
-groups.o: ../../../../morm/src/dochtmlconnector.h
 groups.o: ../../../../winix/winixd/core/system.h
 groups.o: ../../../../winix/winixd/core/job.h
 groups.o: ../../../../winix/winixd/core/basethread.h
@@ -180,7 +185,6 @@ groups.o: ../../../../winix/winixd/db/dbtextstream.h
 groups.o: ../../../../winix/winixd/core/textstream.h
 groups.o: ../../../../winix/winixd/core/misc.h
 groups.o: ../../../../winix/winixd/core/requesttypes.h
-groups.o: ../../../../pikotools/utf8/utf8.h
 groups.o: ../../../../winix/winixd/core/winix_const.h
 groups.o: ../../../../pikotools/convert/convert.h
 groups.o: ../../../../pikotools/convert/inttostr.h
@@ -277,15 +281,17 @@ init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
-init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
+init.o: ../../../../pikotools/utf8/utf8.h ../../../../morm/src/cursor.h
+init.o: ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/core/system.h
 init.o: ../../../../winix/winixd/core/job.h
 init.o: ../../../../winix/winixd/core/basethread.h
@@ -299,7 +305,6 @@ init.o: ../../../../winix/winixd/db/dbtextstream.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/misc.h
 init.o: ../../../../winix/winixd/core/requesttypes.h
-init.o: ../../../../pikotools/utf8/utf8.h
 init.o: ../../../../winix/winixd/core/winix_const.h
 init.o: ../../../../pikotools/convert/convert.h
 init.o: ../../../../pikotools/convert/inttostr.h
@@ -510,15 +515,17 @@ templates.o: ../../../../morm/src/queryresult.h
 templates.o: ../../../../morm/src/flatconnector.h
 templates.o: ../../../../morm/src/dbexpression.h
 templates.o: ../../../../morm/src/baseexpression.h
+templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+templates.o: ../../../../morm/src/cursorhelper.h
+templates.o: ../../../../morm/src/finderhelper.h
+templates.o: ../../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../../morm/src/flatexpression.h
 templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 templates.o: ../../../../morm/src/jsonexpression.h
 templates.o: ../../../../morm/src/postgresqlexpression.h
-templates.o: ../../../../morm/src/dochtmlexpression.h
 templates.o: ../../../../morm/src/jsonconnector.h
 templates.o: ../../../../morm/src/postgresqlconnector.h
 templates.o: ../../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../../morm/src/dochtmlconnector.h
 templates.o: ../../../../winix/winixd/core/sessionmanager.h
 templates.o: ../../../../winix/winixd/core/sessioncontainer.h
 templates.o: ../../../../winix/winixd/core/ipbancontainer.h

winixd/plugins/mailregister/Makefile.dep

@@ -70,16 +70,19 @@ funregistermail_showusers.o: ../../../../morm/src/queryresult.h
 funregistermail_showusers.o: ../../../../morm/src/flatconnector.h
 funregistermail_showusers.o: ../../../../morm/src/dbexpression.h
 funregistermail_showusers.o: ../../../../morm/src/baseexpression.h
+funregistermail_showusers.o: ../../../../morm/src/modelenv.h
+funregistermail_showusers.o: ../../../../morm/src/modeldata.h
+funregistermail_showusers.o: ../../../../morm/src/cursorhelper.h
+funregistermail_showusers.o: ../../../../morm/src/finderhelper.h
+funregistermail_showusers.o: ../../../../morm/src/fieldvaluehelper.h
 funregistermail_showusers.o: ../../../../morm/src/flatexpression.h
 funregistermail_showusers.o: ../../../../morm/src/finder.h
 funregistermail_showusers.o: ../../../../morm/src/cursor.h
 funregistermail_showusers.o: ../../../../morm/src/jsonexpression.h
 funregistermail_showusers.o: ../../../../morm/src/postgresqlexpression.h
-funregistermail_showusers.o: ../../../../morm/src/dochtmlexpression.h
 funregistermail_showusers.o: ../../../../morm/src/jsonconnector.h
 funregistermail_showusers.o: ../../../../morm/src/postgresqlconnector.h
 funregistermail_showusers.o: ../../../../morm/src/postgresqlqueryresult.h
-funregistermail_showusers.o: ../../../../morm/src/dochtmlconnector.h
 funregistermail_showusers.o: ../../../../winix/winixd/core/dirs.h
 funregistermail_showusers.o: ../../../../winix/winixd/core/dircontainer.h
 funregistermail_showusers.o: ../../../../winix/winixd/core/request.h
@@ -209,16 +212,19 @@ funregistermail.o: ../../../../morm/src/queryresult.h
 funregistermail.o: ../../../../morm/src/flatconnector.h
 funregistermail.o: ../../../../morm/src/dbexpression.h
 funregistermail.o: ../../../../morm/src/baseexpression.h
+funregistermail.o: ../../../../morm/src/modelenv.h
+funregistermail.o: ../../../../morm/src/modeldata.h
+funregistermail.o: ../../../../morm/src/cursorhelper.h
+funregistermail.o: ../../../../morm/src/finderhelper.h
+funregistermail.o: ../../../../morm/src/fieldvaluehelper.h
 funregistermail.o: ../../../../morm/src/flatexpression.h
 funregistermail.o: ../../../../morm/src/finder.h
 funregistermail.o: ../../../../morm/src/cursor.h
 funregistermail.o: ../../../../morm/src/jsonexpression.h
 funregistermail.o: ../../../../morm/src/postgresqlexpression.h
-funregistermail.o: ../../../../morm/src/dochtmlexpression.h
 funregistermail.o: ../../../../morm/src/jsonconnector.h
 funregistermail.o: ../../../../morm/src/postgresqlconnector.h
 funregistermail.o: ../../../../morm/src/postgresqlqueryresult.h
-funregistermail.o: ../../../../morm/src/dochtmlconnector.h
 funregistermail.o: ../../../../winix/winixd/core/dirs.h
 funregistermail.o: ../../../../winix/winixd/core/dircontainer.h
 funregistermail.o: ../../../../winix/winixd/core/request.h
@@ -339,15 +345,16 @@ init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/core/dirs.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/core/request.h
@@ -514,15 +521,17 @@ templates.o: ../../../../morm/src/queryresult.h
 templates.o: ../../../../morm/src/flatconnector.h
 templates.o: ../../../../morm/src/dbexpression.h
 templates.o: ../../../../morm/src/baseexpression.h
+templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+templates.o: ../../../../morm/src/cursorhelper.h
+templates.o: ../../../../morm/src/finderhelper.h
+templates.o: ../../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../../morm/src/flatexpression.h
 templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 templates.o: ../../../../morm/src/jsonexpression.h
 templates.o: ../../../../morm/src/postgresqlexpression.h
-templates.o: ../../../../morm/src/dochtmlexpression.h
 templates.o: ../../../../morm/src/jsonconnector.h
 templates.o: ../../../../morm/src/postgresqlconnector.h
 templates.o: ../../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../../morm/src/dochtmlconnector.h
 templates.o: ../../../../winix/winixd/core/dirs.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
 templates.o: ../../../../winix/winixd/db/db.h

winixd/plugins/menu/Makefile.dep

@@ -64,14 +64,16 @@ cache.o: ../../../../morm/src/queryresult.h
 cache.o: ../../../../morm/src/flatconnector.h
 cache.o: ../../../../morm/src/dbexpression.h
 cache.o: ../../../../morm/src/baseexpression.h
+cache.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+cache.o: ../../../../morm/src/cursorhelper.h
+cache.o: ../../../../morm/src/finderhelper.h
+cache.o: ../../../../morm/src/fieldvaluehelper.h
 cache.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 cache.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 cache.o: ../../../../morm/src/postgresqlexpression.h
-cache.o: ../../../../morm/src/dochtmlexpression.h
 cache.o: ../../../../morm/src/jsonconnector.h
 cache.o: ../../../../morm/src/postgresqlconnector.h
 cache.o: ../../../../morm/src/postgresqlqueryresult.h
-cache.o: ../../../../morm/src/dochtmlconnector.h
 cache.o: ../../../../winix/winixd/core/misc.h
 init.o: ../../../../winix/winixd/core/log.h
 init.o: ../../../../winix/winixd/core/plugin.h
@@ -135,15 +137,16 @@ init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/templates/templates.h
 init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
 init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/pattern.h
@@ -316,15 +319,17 @@ templates.o: ../../../../morm/src/queryresult.h
 templates.o: ../../../../morm/src/flatconnector.h
 templates.o: ../../../../morm/src/dbexpression.h
 templates.o: ../../../../morm/src/baseexpression.h
+templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+templates.o: ../../../../morm/src/cursorhelper.h
+templates.o: ../../../../morm/src/finderhelper.h
+templates.o: ../../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../../morm/src/flatexpression.h
 templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 templates.o: ../../../../morm/src/jsonexpression.h
 templates.o: ../../../../morm/src/postgresqlexpression.h
-templates.o: ../../../../morm/src/dochtmlexpression.h
 templates.o: ../../../../morm/src/jsonconnector.h
 templates.o: ../../../../morm/src/postgresqlconnector.h
 templates.o: ../../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../../morm/src/dochtmlconnector.h
 templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/functions.h
 templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
 templates.o: ../../../../ezc/src/expressionparser.h

winixd/plugins/seo/Makefile

@@ -0,0 +1,33 @@
+include Makefile.o.dep
+
+current_path := $(shell pwd)
+global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR))
+
+winix_include_paths = -I$(global_relative_working_dir)/winix/winixd -I$(global_relative_working_dir)/ezc/src -I$(global_relative_working_dir)/tito/src -I$(global_relative_working_dir)/morm/src -I$(global_relative_working_dir)/pikotools
+
+name = seo.so
+
+
+all: $(name)
+
+$(name): $(o)
+	$(CXX) -shared -Wl,-soname,$(name) -o $(name) $(CXXFLAGS) $(winix_include_paths) $(LDFLAGS) *.o
+
+
+
+%.o: %.cpp
+	$(CXX) -c $(CXXFLAGS) $(winix_include_paths) $<
+
+
+
+depend:
+	makedepend -Y. $(winix_include_paths) -f- *.cpp > Makefile.dep
+	echo -n "o = " > Makefile.o.dep
+	ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep
+
+clean:
+	rm -f *.o
+	rm -f *.so
+	rm -f $(name)
+	
+include Makefile.dep

winixd/plugins/seo/Makefile.dep

@@ -0,0 +1,339 @@
+# DO NOT DELETE
+
+init.o: seo.h ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/core/item.h
+init.o: ../../../../pikotools/space/space.h
+init.o: ../../../../pikotools/textstream/types.h
+init.o: ../../../../pikotools/date/date.h
+init.o: ../../../../pikotools/convert/inttostr.h
+init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
+init.o: ../../../../winix/winixd/db/dbconn.h
+init.o: ../../../../winix/winixd/db/dbtextstream.h
+init.o: ../../../../winix/winixd/core/textstream.h
+init.o: ../../../../winix/winixd/core/misc.h
+init.o: ../../../../winix/winixd/core/item.h
+init.o: ../../../../winix/winixd/core/requesttypes.h
+init.o: ../../../../pikotools/textstream/textstream.h
+init.o: ../../../../pikotools/membuffer/membuffer.h
+init.o: ../../../../pikotools/textstream/types.h
+init.o: ../../../../pikotools/utf8/utf8.h
+init.o: ../../../../winix/winixd/core/winix_const.h
+init.o: ../../../../pikotools/convert/convert.h
+init.o: ../../../../pikotools/convert/inttostr.h
+init.o: ../../../../pikotools/convert/patternreplacer.h
+init.o: ../../../../pikotools/convert/strtoint.h
+init.o: ../../../../pikotools/convert/text.h
+init.o: ../../../../winix/winixd/core/winixbase.h
+init.o: ../../../../winix/winixd/core/config.h
+init.o: ../../../../pikotools/space/spaceparser.h
+init.o: ../../../../pikotools/space/space.h
+init.o: ../../../../winix/winixd/core/log.h
+init.o: ../../../../winix/winixd/core/logmanipulators.h
+init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h
+init.o: ../../../../winix/winixd/core/log.h
+init.o: ../../../../winix/winixd/core/synchro.h
+init.o: ../../../../winix/winixd/core/filelog.h
+init.o: ../../../../winix/winixd/core/lock.h
+init.o: ../../../../winix/winixd/core/synchro.h
+init.o: ../../../../winix/winixd/core/error.h
+init.o: ../../../../winix/winixd/db/dbitemquery.h
+init.o: ../../../../winix/winixd/db/dbitemcolumns.h
+init.o: ../../../../winix/winixd/core/user.h
+init.o: ../../../../winix/winixd/core/group.h
+init.o: ../../../../winix/winixd/core/dircontainer.h
+init.o: ../../../../winix/winixd/core/winixbase.h
+init.o: ../../../../winix/winixd/core/ugcontainer.h
+init.o: ../../../../winix/winixd/core/request.h
+init.o: ../../../../winix/winixd/core/error.h
+init.o: ../../../../winix/winixd/core/config.h
+init.o: ../../../../winix/winixd/core/textstream.h
+init.o: ../../../../winix/winixd/templates/htmltextstream.h
+init.o: ../../../../pikotools/space/spacetojson.h
+init.o: ../../../../ezc/src/outstreams.h
+init.o: ../../../../winix/winixd/core/system.h
+init.o: ../../../../winix/winixd/core/job.h
+init.o: ../../../../winix/winixd/core/basethread.h
+init.o: ../../../../winix/winixd/core/winixmodel.h
+init.o: ../../../../winix/winixd/core/plugin.h
+init.o: ../../../../winix/winixd/core/pluginmsg.h
+init.o: ../../../../winix/winixd/core/plugindata.h
+init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
+init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
+init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
+init.o: ../../../../morm/src/queryresult.h
+init.o: ../../../../morm/src/flatconnector.h
+init.o: ../../../../morm/src/dbexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
+init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
+init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
+init.o: ../../../../morm/src/postgresqlexpression.h
+init.o: ../../../../morm/src/jsonconnector.h
+init.o: ../../../../morm/src/postgresqlconnector.h
+init.o: ../../../../morm/src/postgresqlqueryresult.h
+init.o: ../../../../winix/winixd/core/dirs.h
+init.o: ../../../../winix/winixd/core/dircontainer.h
+init.o: ../../../../winix/winixd/core/request.h
+init.o: ../../../../winix/winixd/core/mounts.h
+init.o: ../../../../winix/winixd/core/mount.h
+init.o: ../../../../winix/winixd/core/mountparser.h
+init.o: ../../../../winix/winixd/core/crypt.h
+init.o: ../../../../winix/winixd/core/run.h
+init.o: ../../../../winix/winixd/core/user.h
+init.o: ../../../../winix/winixd/core/users.h
+init.o: ../../../../winix/winixd/core/ugcontainer.h
+init.o: ../../../../winix/winixd/core/lastcontainer.h
+init.o: ../../../../winix/winixd/core/cur.h
+init.o: ../../../../winix/winixd/core/session.h
+init.o: ../../../../winix/winixd/core/rebus.h
+init.o: ../../../../winix/winixd/core/ipban.h
+init.o: ../../../../winix/winixd/core/groups.h
+init.o: ../../../../winix/winixd/core/group.h
+init.o: ../../../../winix/winixd/core/loadavg.h
+init.o: ../../../../winix/winixd/core/image.h
+init.o: ../../../../winix/winixd/core/threadmanager.h
+init.o: ../../../../winix/winixd/notify/notify.h
+init.o: ../../../../winix/winixd/notify/notifypool.h
+init.o: ../../../../winix/winixd/templates/locale.h
+init.o: ../../../../pikotools/convert/patternreplacer.h
+init.o: ../../../../winix/winixd/templates/patterns.h
+init.o: ../../../../winix/winixd/templates/locale.h
+init.o: ../../../../winix/winixd/templates/localefilter.h
+init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
+init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
+init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
+init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
+init.o: ../../../../ezc/src/expressionparser.h
+init.o: ../../../../ezc/src/patternparser.h
+init.o: ../../../../winix/winixd/notify/notifythread.h
+init.o: ../../../../winix/winixd/core/basethread.h
+init.o: ../../../../winix/winixd/notify/templatesnotify.h
+init.o: ../../../../winix/winixd/core/users.h
+init.o: ../../../../winix/winixd/core/winixmodel.h
+init.o: ../../../../winix/winixd/core/timezones.h
+init.o: ../../../../winix/winixd/core/timezone.h
+init.o: ../../../../winix/winixd/core/winixrequest.h
+init.o: ../../../../winix/winixd/core/winixsystem.h
+init.o: ../../../../winix/winixd/core/cur.h
+init.o: ../../../../winix/winixd/core/sessionmanager.h
+init.o: ../../../../winix/winixd/core/sessioncontainer.h
+init.o: ../../../../winix/winixd/core/ipbancontainer.h
+init.o: ../../../../winix/winixd/core/system.h
+init.o: ../../../../winix/winixd/core/sessionidmanager.h
+init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
+init.o: ../../../../winix/winixd/core/slog.h
+init.o: ../../../../winix/winixd/functions/functions.h
+init.o: ../../../../winix/winixd/functions/functionbase.h
+init.o: ../../../../winix/winixd/functions/functionparser.h
+init.o: ../../../../winix/winixd/functions/account.h
+init.o: ../../../../winix/winixd/functions/adduser.h
+init.o: ../../../../winix/winixd/functions/cat.h
+init.o: ../../../../winix/winixd/functions/chmod.h
+init.o: ../../../../winix/winixd/functions/privchanger.h
+init.o: ../../../../winix/winixd/functions/chown.h
+init.o: ../../../../winix/winixd/functions/ckeditor.h
+init.o: ../../../../winix/winixd/functions/cp.h
+init.o: ../../../../winix/winixd/functions/default.h
+init.o: ../../../../winix/winixd/functions/download.h
+init.o: ../../../../winix/winixd/functions/emacs.h
+init.o: ../../../../winix/winixd/functions/env.h
+init.o: ../../../../winix/winixd/functions/imgcrop.h
+init.o: ../../../../winix/winixd/functions/last.h
+init.o: ../../../../winix/winixd/functions/login.h
+init.o: ../../../../winix/winixd/functions/logout.h
+init.o: ../../../../winix/winixd/functions/ln.h
+init.o: ../../../../winix/winixd/functions/ls.h
+init.o: ../../../../winix/winixd/functions/man.h
+init.o: ../../../../winix/winixd/functions/meta.h
+init.o: ../../../../winix/winixd/functions/mkdir.h
+init.o: ../../../../winix/winixd/functions/mv.h
+init.o: ../../../../winix/winixd/functions/nicedit.h
+init.o: ../../../../winix/winixd/functions/node.h
+init.o: ../../../../winix/winixd/functions/passwd.h
+init.o: ../../../../winix/winixd/functions/priv.h
+init.o: ../../../../winix/winixd/functions/pw.h
+init.o: ../../../../winix/winixd/functions/reload.h
+init.o: ../../../../winix/winixd/functions/rm.h
+init.o: ../../../../winix/winixd/functions/rmuser.h
+init.o: ../../../../winix/winixd/functions/sort.h
+init.o: ../../../../winix/winixd/functions/specialdefault.h
+init.o: ../../../../winix/winixd/functions/stat.h
+init.o: ../../../../winix/winixd/functions/subject.h
+init.o: ../../../../winix/winixd/functions/template.h
+init.o: ../../../../winix/winixd/functions/tinymce.h
+init.o: ../../../../winix/winixd/functions/uname.h
+init.o: ../../../../winix/winixd/functions/upload.h
+init.o: ../../../../winix/winixd/functions/uptime.h
+init.o: ../../../../winix/winixd/functions/who.h
+init.o: ../../../../winix/winixd/functions/vim.h
+init.o: ../../../../winix/winixd/core/htmlfilter.h
+seo.o: seo.h ../../../../winix/winixd/functions/functionbase.h
+seo.o: ../../../../winix/winixd/core/item.h
+seo.o: ../../../../pikotools/space/space.h
+seo.o: ../../../../pikotools/textstream/types.h
+seo.o: ../../../../pikotools/date/date.h
+seo.o: ../../../../pikotools/convert/inttostr.h
+seo.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
+seo.o: ../../../../winix/winixd/db/dbconn.h
+seo.o: ../../../../winix/winixd/db/dbtextstream.h
+seo.o: ../../../../winix/winixd/core/textstream.h
+seo.o: ../../../../winix/winixd/core/misc.h
+seo.o: ../../../../winix/winixd/core/item.h
+seo.o: ../../../../winix/winixd/core/requesttypes.h
+seo.o: ../../../../pikotools/textstream/textstream.h
+seo.o: ../../../../pikotools/membuffer/membuffer.h
+seo.o: ../../../../pikotools/textstream/types.h
+seo.o: ../../../../pikotools/utf8/utf8.h
+seo.o: ../../../../winix/winixd/core/winix_const.h
+seo.o: ../../../../pikotools/convert/convert.h
+seo.o: ../../../../pikotools/convert/inttostr.h
+seo.o: ../../../../pikotools/convert/patternreplacer.h
+seo.o: ../../../../pikotools/convert/strtoint.h
+seo.o: ../../../../pikotools/convert/text.h
+seo.o: ../../../../winix/winixd/core/winixbase.h
+seo.o: ../../../../winix/winixd/core/config.h
+seo.o: ../../../../pikotools/space/spaceparser.h
+seo.o: ../../../../pikotools/space/space.h
+seo.o: ../../../../winix/winixd/core/log.h
+seo.o: ../../../../winix/winixd/core/logmanipulators.h
+seo.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h
+seo.o: ../../../../winix/winixd/core/log.h
+seo.o: ../../../../winix/winixd/core/synchro.h
+seo.o: ../../../../winix/winixd/core/filelog.h
+seo.o: ../../../../winix/winixd/core/lock.h
+seo.o: ../../../../winix/winixd/core/synchro.h
+seo.o: ../../../../winix/winixd/core/error.h
+seo.o: ../../../../winix/winixd/db/dbitemquery.h
+seo.o: ../../../../winix/winixd/db/dbitemcolumns.h
+seo.o: ../../../../winix/winixd/core/user.h
+seo.o: ../../../../winix/winixd/core/group.h
+seo.o: ../../../../winix/winixd/core/dircontainer.h
+seo.o: ../../../../winix/winixd/core/winixbase.h
+seo.o: ../../../../winix/winixd/core/ugcontainer.h
+seo.o: ../../../../winix/winixd/core/request.h
+seo.o: ../../../../winix/winixd/core/error.h
+seo.o: ../../../../winix/winixd/core/config.h
+seo.o: ../../../../winix/winixd/core/textstream.h
+seo.o: ../../../../winix/winixd/templates/htmltextstream.h
+seo.o: ../../../../pikotools/space/spacetojson.h
+seo.o: ../../../../ezc/src/outstreams.h
+seo.o: ../../../../winix/winixd/core/system.h
+seo.o: ../../../../winix/winixd/core/job.h
+seo.o: ../../../../winix/winixd/core/basethread.h
+seo.o: ../../../../winix/winixd/core/winixmodel.h
+seo.o: ../../../../winix/winixd/core/plugin.h
+seo.o: ../../../../winix/winixd/core/pluginmsg.h
+seo.o: ../../../../winix/winixd/core/plugindata.h ../../../../morm/src/morm.h
+seo.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
+seo.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
+seo.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
+seo.o: ../../../../morm/src/flatconnector.h
+seo.o: ../../../../morm/src/dbexpression.h
+seo.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+seo.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+seo.o: ../../../../morm/src/finderhelper.h
+seo.o: ../../../../morm/src/fieldvaluehelper.h
+seo.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
+seo.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
+seo.o: ../../../../morm/src/postgresqlexpression.h
+seo.o: ../../../../morm/src/jsonconnector.h
+seo.o: ../../../../morm/src/postgresqlconnector.h
+seo.o: ../../../../morm/src/postgresqlqueryresult.h
+seo.o: ../../../../winix/winixd/core/dirs.h
+seo.o: ../../../../winix/winixd/core/dircontainer.h
+seo.o: ../../../../winix/winixd/core/request.h
+seo.o: ../../../../winix/winixd/core/mounts.h
+seo.o: ../../../../winix/winixd/core/mount.h
+seo.o: ../../../../winix/winixd/core/mountparser.h
+seo.o: ../../../../winix/winixd/core/crypt.h
+seo.o: ../../../../winix/winixd/core/run.h
+seo.o: ../../../../winix/winixd/core/user.h
+seo.o: ../../../../winix/winixd/core/users.h
+seo.o: ../../../../winix/winixd/core/ugcontainer.h
+seo.o: ../../../../winix/winixd/core/lastcontainer.h
+seo.o: ../../../../winix/winixd/core/cur.h
+seo.o: ../../../../winix/winixd/core/session.h
+seo.o: ../../../../winix/winixd/core/rebus.h
+seo.o: ../../../../winix/winixd/core/ipban.h
+seo.o: ../../../../winix/winixd/core/groups.h
+seo.o: ../../../../winix/winixd/core/group.h
+seo.o: ../../../../winix/winixd/core/loadavg.h
+seo.o: ../../../../winix/winixd/core/image.h
+seo.o: ../../../../winix/winixd/core/threadmanager.h
+seo.o: ../../../../winix/winixd/notify/notify.h
+seo.o: ../../../../winix/winixd/notify/notifypool.h
+seo.o: ../../../../winix/winixd/templates/locale.h
+seo.o: ../../../../pikotools/convert/patternreplacer.h
+seo.o: ../../../../winix/winixd/templates/patterns.h
+seo.o: ../../../../winix/winixd/templates/locale.h
+seo.o: ../../../../winix/winixd/templates/localefilter.h
+seo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
+seo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
+seo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
+seo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
+seo.o: ../../../../ezc/src/expressionparser.h
+seo.o: ../../../../ezc/src/patternparser.h
+seo.o: ../../../../winix/winixd/notify/notifythread.h
+seo.o: ../../../../winix/winixd/core/basethread.h
+seo.o: ../../../../winix/winixd/notify/templatesnotify.h
+seo.o: ../../../../winix/winixd/core/users.h
+seo.o: ../../../../winix/winixd/core/winixmodel.h
+seo.o: ../../../../winix/winixd/core/timezones.h
+seo.o: ../../../../winix/winixd/core/timezone.h
+seo.o: ../../../../winix/winixd/core/winixrequest.h
+seo.o: ../../../../winix/winixd/core/winixsystem.h
+seo.o: ../../../../winix/winixd/core/cur.h
+seo.o: ../../../../winix/winixd/core/sessionmanager.h
+seo.o: ../../../../winix/winixd/core/sessioncontainer.h
+seo.o: ../../../../winix/winixd/core/ipbancontainer.h
+seo.o: ../../../../winix/winixd/core/system.h
+seo.o: ../../../../winix/winixd/core/sessionidmanager.h
+seo.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
+seo.o: ../../../../winix/winixd/core/slog.h
+seo.o: ../../../../winix/winixd/functions/functions.h
+seo.o: ../../../../winix/winixd/functions/functionbase.h
+seo.o: ../../../../winix/winixd/functions/functionparser.h
+seo.o: ../../../../winix/winixd/functions/account.h
+seo.o: ../../../../winix/winixd/functions/adduser.h
+seo.o: ../../../../winix/winixd/functions/cat.h
+seo.o: ../../../../winix/winixd/functions/chmod.h
+seo.o: ../../../../winix/winixd/functions/privchanger.h
+seo.o: ../../../../winix/winixd/functions/chown.h
+seo.o: ../../../../winix/winixd/functions/ckeditor.h
+seo.o: ../../../../winix/winixd/functions/cp.h
+seo.o: ../../../../winix/winixd/functions/default.h
+seo.o: ../../../../winix/winixd/functions/download.h
+seo.o: ../../../../winix/winixd/functions/emacs.h
+seo.o: ../../../../winix/winixd/functions/env.h
+seo.o: ../../../../winix/winixd/functions/imgcrop.h
+seo.o: ../../../../winix/winixd/functions/last.h
+seo.o: ../../../../winix/winixd/functions/login.h
+seo.o: ../../../../winix/winixd/functions/logout.h
+seo.o: ../../../../winix/winixd/functions/ln.h
+seo.o: ../../../../winix/winixd/functions/ls.h
+seo.o: ../../../../winix/winixd/functions/man.h
+seo.o: ../../../../winix/winixd/functions/meta.h
+seo.o: ../../../../winix/winixd/functions/mkdir.h
+seo.o: ../../../../winix/winixd/functions/mv.h
+seo.o: ../../../../winix/winixd/functions/nicedit.h
+seo.o: ../../../../winix/winixd/functions/node.h
+seo.o: ../../../../winix/winixd/functions/passwd.h
+seo.o: ../../../../winix/winixd/functions/priv.h
+seo.o: ../../../../winix/winixd/functions/pw.h
+seo.o: ../../../../winix/winixd/functions/reload.h
+seo.o: ../../../../winix/winixd/functions/rm.h
+seo.o: ../../../../winix/winixd/functions/rmuser.h
+seo.o: ../../../../winix/winixd/functions/sort.h
+seo.o: ../../../../winix/winixd/functions/specialdefault.h
+seo.o: ../../../../winix/winixd/functions/stat.h
+seo.o: ../../../../winix/winixd/functions/subject.h
+seo.o: ../../../../winix/winixd/functions/template.h
+seo.o: ../../../../winix/winixd/functions/tinymce.h
+seo.o: ../../../../winix/winixd/functions/uname.h
+seo.o: ../../../../winix/winixd/functions/upload.h
+seo.o: ../../../../winix/winixd/functions/uptime.h
+seo.o: ../../../../winix/winixd/functions/who.h
+seo.o: ../../../../winix/winixd/functions/vim.h
+seo.o: ../../../../winix/winixd/core/htmlfilter.h

winixd/plugins/seo/Makefile.o.dep

@@ -0,0 +1 @@
+o = init.o seo.o 

winixd/plugins/seo/init.cpp

@@ -0,0 +1,76 @@
+/*
+ * This file is a part of Winix
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2019, Tomasz Sowa
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+ 
+#include "seo.h"
+#include "functions/functions.h"
+
+
+namespace Winix
+{
+
+
+
+extern "C" void Init(PluginInfo &);
+
+
+namespace Seo
+{
+const wchar_t plugin_name[] = L"seo";
+
+Seo fun_seo;
+
+
+void AddFunctions(PluginInfo & info)
+{
+	info.functions->Add(fun_seo);
+}
+
+
+} // namespace Ticket
+
+
+
+void Init(PluginInfo & info)
+{
+using namespace Seo;
+
+	info.plugin->Assign(WINIX_CREATE_FUNCTIONS,				AddFunctions);
+
+	info.p1 = (void*)(plugin_name);
+}
+
+
+
+} // namespace Winix
+

winixd/plugins/seo/seo.cpp

@@ -0,0 +1,98 @@
+/*
+ * This file is a part of Winix
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2019, Tomasz Sowa
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+ 
+#include "seo.h"
+#include "functions/functions.h"
+
+
+
+namespace Winix
+{
+
+
+
+namespace Seo
+{
+
+
+
+Seo::Seo()
+{
+	fun.url = L"seo";
+}
+
+
+bool Seo::HasAccess()
+{
+	if( cur->session->puser && cur->session->puser->super_user )
+		return true;
+
+	return system->HasWriteAccess(*cur->request->last_item);
+}
+
+
+void Seo::MakeGet()
+{
+}
+
+
+void Seo::MakePost()
+{
+	Item & item = *cur->request->last_item;
+
+	const std::wstring & subject = cur->request->PostVar(L"subject");
+	const std::wstring & description = cur->request->PostVar(L"description");
+	const std::wstring & keywords = cur->request->PostVar(L"keywords");
+
+	item.subject = subject;
+
+	PT::Space & seo = item.meta.FindAddSpace(L"seo");
+	seo.Add(L"description", description);
+	seo.Add(L"keywords", keywords);
+
+	db->EditSubjectById(item, item.id);
+	db->EditMetaById(item.meta, item.id);
+
+	if( item.type == Item::file )
+		plugin->Call(WINIX_FILE_CHANGED, &item);
+
+}
+
+
+
+
+} // namespace
+
+} // namespace Winix
+

winixd/plugins/seo/seo.h

@@ -0,0 +1,70 @@
+/*
+ * This file is a part of Winix
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2019, Tomasz Sowa
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+ 
+#ifndef headerfile_winix_plugins_seo_seo
+#define headerfile_winix_plugins_seo_seo
+
+#include "functions/functionbase.h"
+
+
+
+namespace Winix
+{
+
+
+namespace Seo
+{
+
+
+class Seo : public FunctionBase
+{
+public:
+
+	Seo();
+
+	bool HasAccess();
+	void MakePost();
+	void MakeGet();
+
+private:
+
+
+};
+
+
+} // namespace
+
+} // namespace Winix
+
+#endif

winixd/plugins/stats/Makefile.dep

@@ -67,15 +67,16 @@ init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
-init.o: ../../../../morm/src/postgresqlqueryresult.h
+init.o: ../../../../morm/src/postgresqlqueryresult.h templates.h
-init.o: ../../../../morm/src/dochtmlconnector.h templates.h
 init.o: ../../../../winix/winixd/core/plugin.h statssession.h
 init.o: ../../../../winix/winixd/core/plugindata.h
 stats.o: stats.h ../../../../winix/winixd/core/config.h
@@ -107,15 +108,17 @@ stats.o: ../../../../morm/src/queryresult.h
 stats.o: ../../../../morm/src/flatconnector.h
 stats.o: ../../../../morm/src/dbexpression.h
 stats.o: ../../../../morm/src/baseexpression.h
+stats.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+stats.o: ../../../../morm/src/cursorhelper.h
+stats.o: ../../../../morm/src/finderhelper.h
+stats.o: ../../../../morm/src/fieldvaluehelper.h
 stats.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
-stats.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
+stats.o: ../../../../pikotools/utf8/utf8.h ../../../../morm/src/cursor.h
+stats.o: ../../../../morm/src/jsonexpression.h
 stats.o: ../../../../morm/src/postgresqlexpression.h
-stats.o: ../../../../morm/src/dochtmlexpression.h
 stats.o: ../../../../morm/src/jsonconnector.h
 stats.o: ../../../../morm/src/postgresqlconnector.h
 stats.o: ../../../../morm/src/postgresqlqueryresult.h
-stats.o: ../../../../morm/src/dochtmlconnector.h
-stats.o: ../../../../pikotools/utf8/utf8.h
 templates.o: templates.h ../../../../winix/winixd/core/plugin.h
 templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
 templates.o: ../../../../ezc/src/blocks.h
@@ -166,15 +169,17 @@ templates.o: ../../../../morm/src/queryresult.h
 templates.o: ../../../../morm/src/flatconnector.h
 templates.o: ../../../../morm/src/dbexpression.h
 templates.o: ../../../../morm/src/baseexpression.h
+templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+templates.o: ../../../../morm/src/cursorhelper.h
+templates.o: ../../../../morm/src/finderhelper.h
+templates.o: ../../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../../morm/src/flatexpression.h
 templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 templates.o: ../../../../morm/src/jsonexpression.h
 templates.o: ../../../../morm/src/postgresqlexpression.h
-templates.o: ../../../../morm/src/dochtmlexpression.h
 templates.o: ../../../../morm/src/jsonconnector.h
 templates.o: ../../../../morm/src/postgresqlconnector.h
 templates.o: ../../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../../morm/src/dochtmlconnector.h
 templates.o: ../../../../winix/winixd/templates/misc.h
 templates.o: ../../../../winix/winixd/templates/localefilter.h
 templates.o: ../../../../winix/winixd/templates/locale.h

winixd/plugins/thread/Makefile.dep

@@ -68,15 +68,18 @@ createthread.o: ../../../../morm/src/queryresult.h
 createthread.o: ../../../../morm/src/flatconnector.h
 createthread.o: ../../../../morm/src/dbexpression.h
 createthread.o: ../../../../morm/src/baseexpression.h
+createthread.o: ../../../../morm/src/modelenv.h
+createthread.o: ../../../../morm/src/modeldata.h
+createthread.o: ../../../../morm/src/cursorhelper.h
+createthread.o: ../../../../morm/src/finderhelper.h
+createthread.o: ../../../../morm/src/fieldvaluehelper.h
 createthread.o: ../../../../morm/src/flatexpression.h
 createthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 createthread.o: ../../../../morm/src/jsonexpression.h
 createthread.o: ../../../../morm/src/postgresqlexpression.h
-createthread.o: ../../../../morm/src/dochtmlexpression.h
 createthread.o: ../../../../morm/src/jsonconnector.h
 createthread.o: ../../../../morm/src/postgresqlconnector.h
 createthread.o: ../../../../morm/src/postgresqlqueryresult.h
-createthread.o: ../../../../morm/src/dochtmlconnector.h
 createthread.o: ../../../../winix/winixd/core/dirs.h
 createthread.o: ../../../../winix/winixd/core/dircontainer.h
 createthread.o: ../../../../winix/winixd/core/request.h
@@ -242,15 +245,17 @@ funthread.o: ../../../../morm/src/queryresult.h
 funthread.o: ../../../../morm/src/flatconnector.h
 funthread.o: ../../../../morm/src/dbexpression.h
 funthread.o: ../../../../morm/src/baseexpression.h
+funthread.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+funthread.o: ../../../../morm/src/cursorhelper.h
+funthread.o: ../../../../morm/src/finderhelper.h
+funthread.o: ../../../../morm/src/fieldvaluehelper.h
 funthread.o: ../../../../morm/src/flatexpression.h
 funthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 funthread.o: ../../../../morm/src/jsonexpression.h
 funthread.o: ../../../../morm/src/postgresqlexpression.h
-funthread.o: ../../../../morm/src/dochtmlexpression.h
 funthread.o: ../../../../morm/src/jsonconnector.h
 funthread.o: ../../../../morm/src/postgresqlconnector.h
 funthread.o: ../../../../morm/src/postgresqlqueryresult.h
-funthread.o: ../../../../morm/src/dochtmlconnector.h
 funthread.o: ../../../../winix/winixd/core/dirs.h
 funthread.o: ../../../../winix/winixd/core/dircontainer.h
 funthread.o: ../../../../winix/winixd/core/request.h
@@ -366,15 +371,16 @@ init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
 init.o: ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/core/dirs.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/core/request.h
@@ -537,14 +543,16 @@ reply.o: ../../../../morm/src/queryresult.h
 reply.o: ../../../../morm/src/flatconnector.h
 reply.o: ../../../../morm/src/dbexpression.h
 reply.o: ../../../../morm/src/baseexpression.h
+reply.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+reply.o: ../../../../morm/src/cursorhelper.h
+reply.o: ../../../../morm/src/finderhelper.h
+reply.o: ../../../../morm/src/fieldvaluehelper.h
 reply.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 reply.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 reply.o: ../../../../morm/src/postgresqlexpression.h
-reply.o: ../../../../morm/src/dochtmlexpression.h
 reply.o: ../../../../morm/src/jsonconnector.h
 reply.o: ../../../../morm/src/postgresqlconnector.h
 reply.o: ../../../../morm/src/postgresqlqueryresult.h
-reply.o: ../../../../morm/src/dochtmlconnector.h
 reply.o: ../../../../winix/winixd/core/dirs.h
 reply.o: ../../../../winix/winixd/core/dircontainer.h
 reply.o: ../../../../winix/winixd/core/request.h
@@ -711,15 +719,18 @@ showthreads.o: ../../../../morm/src/queryresult.h
 showthreads.o: ../../../../morm/src/flatconnector.h
 showthreads.o: ../../../../morm/src/dbexpression.h
 showthreads.o: ../../../../morm/src/baseexpression.h
+showthreads.o: ../../../../morm/src/modelenv.h
+showthreads.o: ../../../../morm/src/modeldata.h
+showthreads.o: ../../../../morm/src/cursorhelper.h
+showthreads.o: ../../../../morm/src/finderhelper.h
+showthreads.o: ../../../../morm/src/fieldvaluehelper.h
 showthreads.o: ../../../../morm/src/flatexpression.h
 showthreads.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 showthreads.o: ../../../../morm/src/jsonexpression.h
 showthreads.o: ../../../../morm/src/postgresqlexpression.h
-showthreads.o: ../../../../morm/src/dochtmlexpression.h
 showthreads.o: ../../../../morm/src/jsonconnector.h
 showthreads.o: ../../../../morm/src/postgresqlconnector.h
 showthreads.o: ../../../../morm/src/postgresqlqueryresult.h
-showthreads.o: ../../../../morm/src/dochtmlconnector.h
 showthreads.o: ../../../../winix/winixd/core/dirs.h
 showthreads.o: ../../../../winix/winixd/core/dircontainer.h
 showthreads.o: ../../../../winix/winixd/core/request.h
@@ -814,15 +825,18 @@ templates.o: ../../../../morm/src/queryresult.h
 templates.o: ../../../../morm/src/flatconnector.h
 templates.o: ../../../../morm/src/dbexpression.h
 templates.o: ../../../../morm/src/baseexpression.h
+templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+templates.o: ../../../../morm/src/cursorhelper.h
+templates.o: ../../../../morm/src/finderhelper.h
+templates.o: ../../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../../morm/src/flatexpression.h
-templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
+templates.o: ../../../../morm/src/finder.h ../../../../pikotools/utf8/utf8.h
+templates.o: ../../../../morm/src/cursor.h
 templates.o: ../../../../morm/src/jsonexpression.h
 templates.o: ../../../../morm/src/postgresqlexpression.h
-templates.o: ../../../../morm/src/dochtmlexpression.h
 templates.o: ../../../../morm/src/jsonconnector.h
 templates.o: ../../../../morm/src/postgresqlconnector.h
 templates.o: ../../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../../morm/src/dochtmlconnector.h
 templates.o: ../../../../winix/winixd/core/dirs.h
 templates.o: ../../../../winix/winixd/core/item.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
@@ -833,7 +847,6 @@ templates.o: ../../../../winix/winixd/db/dbtextstream.h
 templates.o: ../../../../winix/winixd/core/textstream.h
 templates.o: ../../../../winix/winixd/core/misc.h
 templates.o: ../../../../winix/winixd/core/requesttypes.h
-templates.o: ../../../../pikotools/utf8/utf8.h
 templates.o: ../../../../winix/winixd/core/winix_const.h
 templates.o: ../../../../pikotools/convert/convert.h
 templates.o: ../../../../pikotools/convert/inttostr.h
@@ -995,15 +1008,19 @@ threadinfo.o: ../../../../morm/src/queryresult.h
 threadinfo.o: ../../../../morm/src/flatconnector.h
 threadinfo.o: ../../../../morm/src/dbexpression.h
 threadinfo.o: ../../../../morm/src/baseexpression.h
+threadinfo.o: ../../../../morm/src/modelenv.h
+threadinfo.o: ../../../../morm/src/modeldata.h
+threadinfo.o: ../../../../morm/src/cursorhelper.h
+threadinfo.o: ../../../../morm/src/finderhelper.h
+threadinfo.o: ../../../../morm/src/fieldvaluehelper.h
 threadinfo.o: ../../../../morm/src/flatexpression.h
-threadinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
+threadinfo.o: ../../../../morm/src/finder.h ../../../../pikotools/utf8/utf8.h
+threadinfo.o: ../../../../morm/src/cursor.h
 threadinfo.o: ../../../../morm/src/jsonexpression.h
 threadinfo.o: ../../../../morm/src/postgresqlexpression.h
-threadinfo.o: ../../../../morm/src/dochtmlexpression.h
 threadinfo.o: ../../../../morm/src/jsonconnector.h
 threadinfo.o: ../../../../morm/src/postgresqlconnector.h
 threadinfo.o: ../../../../morm/src/postgresqlqueryresult.h
-threadinfo.o: ../../../../morm/src/dochtmlconnector.h
 threadinfo.o: ../../../../winix/winixd/core/dirs.h
 threadinfo.o: ../../../../winix/winixd/core/item.h
 threadinfo.o: ../../../../winix/winixd/core/dircontainer.h
@@ -1014,7 +1031,6 @@ threadinfo.o: ../../../../winix/winixd/db/dbtextstream.h
 threadinfo.o: ../../../../winix/winixd/core/textstream.h
 threadinfo.o: ../../../../winix/winixd/core/misc.h
 threadinfo.o: ../../../../winix/winixd/core/requesttypes.h
-threadinfo.o: ../../../../pikotools/utf8/utf8.h
 threadinfo.o: ../../../../winix/winixd/core/winix_const.h
 threadinfo.o: ../../../../pikotools/convert/convert.h
 threadinfo.o: ../../../../pikotools/convert/inttostr.h

winixd/plugins/ticket/Makefile.dep

@@ -69,15 +69,18 @@ createticket.o: ../../../../morm/src/queryresult.h
 createticket.o: ../../../../morm/src/flatconnector.h
 createticket.o: ../../../../morm/src/dbexpression.h
 createticket.o: ../../../../morm/src/baseexpression.h
+createticket.o: ../../../../morm/src/modelenv.h
+createticket.o: ../../../../morm/src/modeldata.h
+createticket.o: ../../../../morm/src/cursorhelper.h
+createticket.o: ../../../../morm/src/finderhelper.h
+createticket.o: ../../../../morm/src/fieldvaluehelper.h
 createticket.o: ../../../../morm/src/flatexpression.h
 createticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 createticket.o: ../../../../morm/src/jsonexpression.h
 createticket.o: ../../../../morm/src/postgresqlexpression.h
-createticket.o: ../../../../morm/src/dochtmlexpression.h
 createticket.o: ../../../../morm/src/jsonconnector.h
 createticket.o: ../../../../morm/src/postgresqlconnector.h
 createticket.o: ../../../../morm/src/postgresqlqueryresult.h
-createticket.o: ../../../../morm/src/dochtmlconnector.h
 createticket.o: ../../../../winix/winixd/core/dirs.h
 createticket.o: ../../../../winix/winixd/core/dircontainer.h
 createticket.o: ../../../../winix/winixd/core/request.h
@@ -229,15 +232,18 @@ editticket.o: ../../../../morm/src/queryresult.h
 editticket.o: ../../../../morm/src/flatconnector.h
 editticket.o: ../../../../morm/src/dbexpression.h
 editticket.o: ../../../../morm/src/baseexpression.h
+editticket.o: ../../../../morm/src/modelenv.h
+editticket.o: ../../../../morm/src/modeldata.h
+editticket.o: ../../../../morm/src/cursorhelper.h
+editticket.o: ../../../../morm/src/finderhelper.h
+editticket.o: ../../../../morm/src/fieldvaluehelper.h
 editticket.o: ../../../../morm/src/flatexpression.h
 editticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 editticket.o: ../../../../morm/src/jsonexpression.h
 editticket.o: ../../../../morm/src/postgresqlexpression.h
-editticket.o: ../../../../morm/src/dochtmlexpression.h
 editticket.o: ../../../../morm/src/jsonconnector.h
 editticket.o: ../../../../morm/src/postgresqlconnector.h
 editticket.o: ../../../../morm/src/postgresqlqueryresult.h
-editticket.o: ../../../../morm/src/dochtmlconnector.h
 editticket.o: ../../../../winix/winixd/core/dirs.h
 editticket.o: ../../../../winix/winixd/core/dircontainer.h
 editticket.o: ../../../../winix/winixd/db/db.h
@@ -404,15 +410,17 @@ funticket.o: ../../../../morm/src/queryresult.h
 funticket.o: ../../../../morm/src/flatconnector.h
 funticket.o: ../../../../morm/src/dbexpression.h
 funticket.o: ../../../../morm/src/baseexpression.h
+funticket.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+funticket.o: ../../../../morm/src/cursorhelper.h
+funticket.o: ../../../../morm/src/finderhelper.h
+funticket.o: ../../../../morm/src/fieldvaluehelper.h
 funticket.o: ../../../../morm/src/flatexpression.h
 funticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 funticket.o: ../../../../morm/src/jsonexpression.h
 funticket.o: ../../../../morm/src/postgresqlexpression.h
-funticket.o: ../../../../morm/src/dochtmlexpression.h
 funticket.o: ../../../../morm/src/jsonconnector.h
 funticket.o: ../../../../morm/src/postgresqlconnector.h
 funticket.o: ../../../../morm/src/postgresqlqueryresult.h
-funticket.o: ../../../../morm/src/dochtmlconnector.h
 funticket.o: ../../../../winix/winixd/core/dirs.h
 funticket.o: ../../../../winix/winixd/core/dircontainer.h
 funticket.o: ../../../../winix/winixd/db/db.h
@@ -573,15 +581,16 @@ init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/core/dirs.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
 init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
@@ -757,15 +766,18 @@ showtickets.o: ../../../../morm/src/queryresult.h
 showtickets.o: ../../../../morm/src/flatconnector.h
 showtickets.o: ../../../../morm/src/dbexpression.h
 showtickets.o: ../../../../morm/src/baseexpression.h
+showtickets.o: ../../../../morm/src/modelenv.h
+showtickets.o: ../../../../morm/src/modeldata.h
+showtickets.o: ../../../../morm/src/cursorhelper.h
+showtickets.o: ../../../../morm/src/finderhelper.h
+showtickets.o: ../../../../morm/src/fieldvaluehelper.h
 showtickets.o: ../../../../morm/src/flatexpression.h
 showtickets.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 showtickets.o: ../../../../morm/src/jsonexpression.h
 showtickets.o: ../../../../morm/src/postgresqlexpression.h
-showtickets.o: ../../../../morm/src/dochtmlexpression.h
 showtickets.o: ../../../../morm/src/jsonconnector.h
 showtickets.o: ../../../../morm/src/postgresqlconnector.h
 showtickets.o: ../../../../morm/src/postgresqlqueryresult.h
-showtickets.o: ../../../../morm/src/dochtmlconnector.h
 showtickets.o: ../../../../winix/winixd/core/dirs.h
 showtickets.o: ../../../../winix/winixd/core/dircontainer.h
 showtickets.o: ../../../../winix/winixd/db/db.h
@@ -959,15 +971,17 @@ templates.o: ../../../../morm/src/queryresult.h
 templates.o: ../../../../morm/src/flatconnector.h
 templates.o: ../../../../morm/src/dbexpression.h
 templates.o: ../../../../morm/src/baseexpression.h
+templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+templates.o: ../../../../morm/src/cursorhelper.h
+templates.o: ../../../../morm/src/finderhelper.h
+templates.o: ../../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../../morm/src/flatexpression.h
 templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 templates.o: ../../../../morm/src/jsonexpression.h
 templates.o: ../../../../morm/src/postgresqlexpression.h
-templates.o: ../../../../morm/src/dochtmlexpression.h
 templates.o: ../../../../morm/src/jsonconnector.h
 templates.o: ../../../../morm/src/postgresqlconnector.h
 templates.o: ../../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../../morm/src/dochtmlconnector.h
 templates.o: ../../../../winix/winixd/core/dirs.h
 templates.o: ../../../../winix/winixd/core/dircontainer.h
 templates.o: ../../../../winix/winixd/db/db.h
@@ -1136,15 +1150,19 @@ ticketinfo.o: ../../../../morm/src/queryresult.h
 ticketinfo.o: ../../../../morm/src/flatconnector.h
 ticketinfo.o: ../../../../morm/src/dbexpression.h
 ticketinfo.o: ../../../../morm/src/baseexpression.h
+ticketinfo.o: ../../../../morm/src/modelenv.h
+ticketinfo.o: ../../../../morm/src/modeldata.h
+ticketinfo.o: ../../../../morm/src/cursorhelper.h
+ticketinfo.o: ../../../../morm/src/finderhelper.h
+ticketinfo.o: ../../../../morm/src/fieldvaluehelper.h
 ticketinfo.o: ../../../../morm/src/flatexpression.h
-ticketinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
+ticketinfo.o: ../../../../morm/src/finder.h ../../../../pikotools/utf8/utf8.h
+ticketinfo.o: ../../../../morm/src/cursor.h
 ticketinfo.o: ../../../../morm/src/jsonexpression.h
 ticketinfo.o: ../../../../morm/src/postgresqlexpression.h
-ticketinfo.o: ../../../../morm/src/dochtmlexpression.h
 ticketinfo.o: ../../../../morm/src/jsonconnector.h
 ticketinfo.o: ../../../../morm/src/postgresqlconnector.h
 ticketinfo.o: ../../../../morm/src/postgresqlqueryresult.h
-ticketinfo.o: ../../../../morm/src/dochtmlconnector.h
 ticketinfo.o: ../../../../winix/winixd/core/dirs.h
 ticketinfo.o: ../../../../winix/winixd/core/item.h
 ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
@@ -1187,8 +1205,7 @@ ticketinfo.o: ../../../../winix/winixd/templates/locale.h
 ticketinfo.o: ../../../../winix/winixd/templates/localefilter.h
 ticketinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
 ticketinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
-ticketinfo.o: ../../../../ezc/src/functions.h
+ticketinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
-ticketinfo.o: ../../../../pikotools/utf8/utf8.h ../../../../ezc/src/funinfo.h
 ticketinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
 ticketinfo.o: ../../../../ezc/src/outstreams.h
 ticketinfo.o: ../../../../ezc/src/expressionparser.h

winixd/templates/Makefile.dep

@@ -56,15 +56,16 @@ adduser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 adduser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 adduser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 adduser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-adduser.o: ../../../morm/src/baseexpression.h
+adduser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+adduser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+adduser.o: ../../../morm/src/finderhelper.h
+adduser.o: ../../../morm/src/fieldvaluehelper.h
 adduser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 adduser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 adduser.o: ../../../morm/src/postgresqlexpression.h
-adduser.o: ../../../morm/src/dochtmlexpression.h
 adduser.o: ../../../morm/src/jsonconnector.h
 adduser.o: ../../../morm/src/postgresqlconnector.h
 adduser.o: ../../../morm/src/postgresqlqueryresult.h
-adduser.o: ../../../morm/src/dochtmlconnector.h
 adduser.o: ../../../winix/winixd/core/dirs.h
 adduser.o: ../../../winix/winixd/core/dircontainer.h
 adduser.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -169,15 +170,16 @@ antispam.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 antispam.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 antispam.o: ../../../morm/src/flatconnector.h
 antispam.o: ../../../morm/src/dbexpression.h
-antispam.o: ../../../morm/src/baseexpression.h
+antispam.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+antispam.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+antispam.o: ../../../morm/src/finderhelper.h
+antispam.o: ../../../morm/src/fieldvaluehelper.h
 antispam.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 antispam.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 antispam.o: ../../../morm/src/postgresqlexpression.h
-antispam.o: ../../../morm/src/dochtmlexpression.h
 antispam.o: ../../../morm/src/jsonconnector.h
 antispam.o: ../../../morm/src/postgresqlconnector.h
 antispam.o: ../../../morm/src/postgresqlqueryresult.h
-antispam.o: ../../../morm/src/dochtmlconnector.h
 antispam.o: ../../../winix/winixd/core/dirs.h
 antispam.o: ../../../winix/winixd/core/dircontainer.h
 antispam.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -319,15 +321,16 @@ config.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 config.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 config.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 config.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-config.o: ../../../morm/src/baseexpression.h
+config.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+config.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+config.o: ../../../morm/src/finderhelper.h
+config.o: ../../../morm/src/fieldvaluehelper.h
 config.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 config.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 config.o: ../../../morm/src/postgresqlexpression.h
-config.o: ../../../morm/src/dochtmlexpression.h
 config.o: ../../../morm/src/jsonconnector.h
 config.o: ../../../morm/src/postgresqlconnector.h
 config.o: ../../../morm/src/postgresqlqueryresult.h
-config.o: ../../../morm/src/dochtmlconnector.h
 config.o: ../../../winix/winixd/core/dirs.h
 config.o: ../../../winix/winixd/core/dircontainer.h
 config.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -433,14 +436,16 @@ currentdate.o: ../../../morm/src/queryresult.h
 currentdate.o: ../../../morm/src/flatconnector.h
 currentdate.o: ../../../morm/src/dbexpression.h
 currentdate.o: ../../../morm/src/baseexpression.h
+currentdate.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+currentdate.o: ../../../morm/src/cursorhelper.h
+currentdate.o: ../../../morm/src/finderhelper.h
+currentdate.o: ../../../morm/src/fieldvaluehelper.h
 currentdate.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 currentdate.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 currentdate.o: ../../../morm/src/postgresqlexpression.h
-currentdate.o: ../../../morm/src/dochtmlexpression.h
 currentdate.o: ../../../morm/src/jsonconnector.h
 currentdate.o: ../../../morm/src/postgresqlconnector.h
 currentdate.o: ../../../morm/src/postgresqlqueryresult.h
-currentdate.o: ../../../morm/src/dochtmlconnector.h
 currentdate.o: ../../../winix/winixd/core/dirs.h
 currentdate.o: ../../../winix/winixd/core/dircontainer.h
 currentdate.o: ../../../winix/winixd/db/db.h
@@ -585,15 +590,16 @@ dir.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 dir.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 dir.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 dir.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-dir.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+dir.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-dir.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+dir.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-dir.o: ../../../morm/src/jsonexpression.h
+dir.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+dir.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+dir.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 dir.o: ../../../morm/src/postgresqlexpression.h
-dir.o: ../../../morm/src/dochtmlexpression.h
 dir.o: ../../../morm/src/jsonconnector.h
 dir.o: ../../../morm/src/postgresqlconnector.h
 dir.o: ../../../morm/src/postgresqlqueryresult.h
-dir.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+dir.o: ../../../winix/winixd/core/dirs.h
 dir.o: ../../../winix/winixd/core/dircontainer.h
 dir.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 dir.o: ../../../winix/winixd/db/dbconn.h
@@ -732,15 +738,16 @@ doc.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 doc.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 doc.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 doc.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-doc.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+doc.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-doc.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+doc.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-doc.o: ../../../morm/src/jsonexpression.h
+doc.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+doc.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+doc.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 doc.o: ../../../morm/src/postgresqlexpression.h
-doc.o: ../../../morm/src/dochtmlexpression.h
 doc.o: ../../../morm/src/jsonconnector.h
 doc.o: ../../../morm/src/postgresqlconnector.h
 doc.o: ../../../morm/src/postgresqlqueryresult.h
-doc.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+doc.o: ../../../winix/winixd/core/dirs.h
 doc.o: ../../../winix/winixd/core/dircontainer.h
 doc.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 doc.o: ../../../winix/winixd/db/dbconn.h
@@ -835,15 +842,16 @@ env.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 env.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 env.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 env.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-env.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+env.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-env.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+env.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-env.o: ../../../morm/src/jsonexpression.h
+env.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+env.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+env.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 env.o: ../../../morm/src/postgresqlexpression.h
-env.o: ../../../morm/src/dochtmlexpression.h
 env.o: ../../../morm/src/jsonconnector.h
 env.o: ../../../morm/src/postgresqlconnector.h
 env.o: ../../../morm/src/postgresqlqueryresult.h
-env.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+env.o: ../../../winix/winixd/core/dirs.h
 env.o: ../../../winix/winixd/core/dircontainer.h
 env.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 env.o: ../../../winix/winixd/db/dbconn.h
@@ -991,15 +999,16 @@ filters.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 filters.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 filters.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 filters.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-filters.o: ../../../morm/src/baseexpression.h
+filters.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+filters.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+filters.o: ../../../morm/src/finderhelper.h
+filters.o: ../../../morm/src/fieldvaluehelper.h
 filters.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 filters.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 filters.o: ../../../morm/src/postgresqlexpression.h
-filters.o: ../../../morm/src/dochtmlexpression.h
 filters.o: ../../../morm/src/jsonconnector.h
 filters.o: ../../../morm/src/postgresqlconnector.h
 filters.o: ../../../morm/src/postgresqlqueryresult.h
-filters.o: ../../../morm/src/dochtmlconnector.h
 filters.o: ../../../winix/winixd/core/dirs.h
 filters.o: ../../../winix/winixd/core/dircontainer.h
 filters.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1107,15 +1116,16 @@ generic.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 generic.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 generic.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 generic.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-generic.o: ../../../morm/src/baseexpression.h
+generic.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+generic.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+generic.o: ../../../morm/src/finderhelper.h
+generic.o: ../../../morm/src/fieldvaluehelper.h
 generic.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 generic.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 generic.o: ../../../morm/src/postgresqlexpression.h
-generic.o: ../../../morm/src/dochtmlexpression.h
 generic.o: ../../../morm/src/jsonconnector.h
 generic.o: ../../../morm/src/postgresqlconnector.h
 generic.o: ../../../morm/src/postgresqlqueryresult.h
-generic.o: ../../../morm/src/dochtmlconnector.h
 generic.o: ../../../winix/winixd/core/dirs.h
 generic.o: ../../../winix/winixd/core/dircontainer.h
 generic.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1288,15 +1298,16 @@ insert.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 insert.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 insert.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 insert.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-insert.o: ../../../morm/src/baseexpression.h
+insert.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+insert.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+insert.o: ../../../morm/src/finderhelper.h
+insert.o: ../../../morm/src/fieldvaluehelper.h
 insert.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 insert.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 insert.o: ../../../morm/src/postgresqlexpression.h
-insert.o: ../../../morm/src/dochtmlexpression.h
 insert.o: ../../../morm/src/jsonconnector.h
 insert.o: ../../../morm/src/postgresqlconnector.h
 insert.o: ../../../morm/src/postgresqlqueryresult.h
-insert.o: ../../../morm/src/dochtmlconnector.h
 insert.o: ../../../winix/winixd/core/dirs.h
 insert.o: ../../../winix/winixd/core/dircontainer.h
 insert.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1401,15 +1412,16 @@ ipban.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ipban.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ipban.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ipban.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ipban.o: ../../../morm/src/baseexpression.h
+ipban.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+ipban.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+ipban.o: ../../../morm/src/finderhelper.h
+ipban.o: ../../../morm/src/fieldvaluehelper.h
 ipban.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 ipban.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ipban.o: ../../../morm/src/postgresqlexpression.h
-ipban.o: ../../../morm/src/dochtmlexpression.h
 ipban.o: ../../../morm/src/jsonconnector.h
 ipban.o: ../../../morm/src/postgresqlconnector.h
 ipban.o: ../../../morm/src/postgresqlqueryresult.h
-ipban.o: ../../../morm/src/dochtmlconnector.h
 ipban.o: ../../../winix/winixd/core/dirs.h
 ipban.o: ../../../winix/winixd/core/dircontainer.h
 ipban.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1554,15 +1566,15 @@ item.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 item.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 item.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 item.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-item.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+item.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-item.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+item.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-item.o: ../../../morm/src/jsonexpression.h
+item.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+item.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+item.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 item.o: ../../../morm/src/postgresqlexpression.h
-item.o: ../../../morm/src/dochtmlexpression.h
 item.o: ../../../morm/src/jsonconnector.h
 item.o: ../../../morm/src/postgresqlconnector.h
 item.o: ../../../morm/src/postgresqlqueryresult.h
-item.o: ../../../morm/src/dochtmlconnector.h
 item.o: ../../../winix/winixd/core/dirs.h
 item.o: ../../../winix/winixd/core/dircontainer.h
 item.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1665,15 +1677,15 @@ last.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 last.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 last.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 last.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-last.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+last.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-last.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+last.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-last.o: ../../../morm/src/jsonexpression.h
+last.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+last.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+last.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 last.o: ../../../morm/src/postgresqlexpression.h
-last.o: ../../../morm/src/dochtmlexpression.h
 last.o: ../../../morm/src/jsonconnector.h
 last.o: ../../../morm/src/postgresqlconnector.h
 last.o: ../../../morm/src/postgresqlqueryresult.h
-last.o: ../../../morm/src/dochtmlconnector.h
 last.o: ../../../winix/winixd/core/dirs.h
 last.o: ../../../winix/winixd/core/dircontainer.h
 last.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1849,15 +1861,16 @@ login.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 login.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 login.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 login.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-login.o: ../../../morm/src/baseexpression.h
+login.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+login.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+login.o: ../../../morm/src/finderhelper.h
+login.o: ../../../morm/src/fieldvaluehelper.h
 login.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 login.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 login.o: ../../../morm/src/postgresqlexpression.h
-login.o: ../../../morm/src/dochtmlexpression.h
 login.o: ../../../morm/src/jsonconnector.h
 login.o: ../../../morm/src/postgresqlconnector.h
 login.o: ../../../morm/src/postgresqlqueryresult.h
-login.o: ../../../morm/src/dochtmlconnector.h
 login.o: ../../../winix/winixd/core/dirs.h
 login.o: ../../../winix/winixd/core/dircontainer.h
 login.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -1991,14 +2004,16 @@ ls.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ls.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ls.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ls.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-ls.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+ls.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-ls.o: ../../../morm/src/jsonexpression.h
+ls.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+ls.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+ls.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ls.o: ../../../morm/src/postgresqlexpression.h
-ls.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+ls.o: ../../../morm/src/jsonconnector.h
 ls.o: ../../../morm/src/postgresqlconnector.h
 ls.o: ../../../morm/src/postgresqlqueryresult.h
-ls.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+ls.o: ../../../winix/winixd/core/dirs.h
 ls.o: ../../../winix/winixd/core/dircontainer.h ../../../winix/winixd/db/db.h
 ls.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
 ls.o: ../../../winix/winixd/db/dbtextstream.h
@@ -2086,15 +2101,16 @@ man.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 man.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 man.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 man.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-man.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+man.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-man.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+man.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-man.o: ../../../morm/src/jsonexpression.h
+man.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+man.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+man.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 man.o: ../../../morm/src/postgresqlexpression.h
-man.o: ../../../morm/src/dochtmlexpression.h
 man.o: ../../../morm/src/jsonconnector.h
 man.o: ../../../morm/src/postgresqlconnector.h
 man.o: ../../../morm/src/postgresqlqueryresult.h
-man.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+man.o: ../../../winix/winixd/core/dirs.h
 man.o: ../../../winix/winixd/core/dircontainer.h
 man.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 man.o: ../../../winix/winixd/db/dbconn.h
@@ -2237,15 +2253,15 @@ misc.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 misc.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 misc.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 misc.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-misc.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+misc.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-misc.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+misc.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-misc.o: ../../../morm/src/jsonexpression.h
+misc.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+misc.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+misc.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 misc.o: ../../../morm/src/postgresqlexpression.h
-misc.o: ../../../morm/src/dochtmlexpression.h
 misc.o: ../../../morm/src/jsonconnector.h
 misc.o: ../../../morm/src/postgresqlconnector.h
 misc.o: ../../../morm/src/postgresqlqueryresult.h
-misc.o: ../../../morm/src/dochtmlconnector.h
 misc.o: ../../../winix/winixd/core/dirs.h
 misc.o: ../../../winix/winixd/core/dircontainer.h
 misc.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -2352,15 +2368,16 @@ miscspace.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 miscspace.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 miscspace.o: ../../../morm/src/flatconnector.h
 miscspace.o: ../../../morm/src/dbexpression.h
-miscspace.o: ../../../morm/src/baseexpression.h
+miscspace.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+miscspace.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+miscspace.o: ../../../morm/src/finderhelper.h
+miscspace.o: ../../../morm/src/fieldvaluehelper.h
 miscspace.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 miscspace.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 miscspace.o: ../../../morm/src/postgresqlexpression.h
-miscspace.o: ../../../morm/src/dochtmlexpression.h
 miscspace.o: ../../../morm/src/jsonconnector.h
 miscspace.o: ../../../morm/src/postgresqlconnector.h
 miscspace.o: ../../../morm/src/postgresqlqueryresult.h
-miscspace.o: ../../../morm/src/dochtmlconnector.h
 miscspace.o: ../../../winix/winixd/core/dirs.h
 miscspace.o: ../../../winix/winixd/core/dircontainer.h
 miscspace.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -2460,15 +2477,16 @@ mount.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mount.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mount.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mount.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mount.o: ../../../morm/src/baseexpression.h
+mount.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mount.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mount.o: ../../../morm/src/finderhelper.h
+mount.o: ../../../morm/src/fieldvaluehelper.h
 mount.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mount.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mount.o: ../../../morm/src/postgresqlexpression.h
-mount.o: ../../../morm/src/dochtmlexpression.h
 mount.o: ../../../morm/src/jsonconnector.h
 mount.o: ../../../morm/src/postgresqlconnector.h
 mount.o: ../../../morm/src/postgresqlqueryresult.h
-mount.o: ../../../morm/src/dochtmlconnector.h
 mount.o: ../../../winix/winixd/core/dirs.h
 mount.o: ../../../winix/winixd/core/dircontainer.h
 mount.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -2574,15 +2592,16 @@ passwd.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 passwd.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 passwd.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 passwd.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-passwd.o: ../../../morm/src/baseexpression.h
+passwd.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+passwd.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+passwd.o: ../../../morm/src/finderhelper.h
+passwd.o: ../../../morm/src/fieldvaluehelper.h
 passwd.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 passwd.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 passwd.o: ../../../morm/src/postgresqlexpression.h
-passwd.o: ../../../morm/src/dochtmlexpression.h
 passwd.o: ../../../morm/src/jsonconnector.h
 passwd.o: ../../../morm/src/postgresqlconnector.h
 passwd.o: ../../../morm/src/postgresqlqueryresult.h
-passwd.o: ../../../morm/src/dochtmlconnector.h
 passwd.o: ../../../winix/winixd/core/dirs.h
 passwd.o: ../../../winix/winixd/core/dircontainer.h
 passwd.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -2741,15 +2760,15 @@ priv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 priv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 priv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 priv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-priv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+priv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-priv.o: ../../../morm/src/jsonexpression.h
+priv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+priv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+priv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 priv.o: ../../../morm/src/postgresqlexpression.h
-priv.o: ../../../morm/src/dochtmlexpression.h
 priv.o: ../../../morm/src/jsonconnector.h
 priv.o: ../../../morm/src/postgresqlconnector.h
 priv.o: ../../../morm/src/postgresqlqueryresult.h
-priv.o: ../../../morm/src/dochtmlconnector.h
 priv.o: ../../../winix/winixd/core/dirs.h
 priv.o: ../../../winix/winixd/core/dircontainer.h
 priv.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -2897,15 +2916,16 @@ rebus.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 rebus.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 rebus.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 rebus.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-rebus.o: ../../../morm/src/baseexpression.h
+rebus.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+rebus.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+rebus.o: ../../../morm/src/finderhelper.h
+rebus.o: ../../../morm/src/fieldvaluehelper.h
 rebus.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 rebus.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 rebus.o: ../../../morm/src/postgresqlexpression.h
-rebus.o: ../../../morm/src/dochtmlexpression.h
 rebus.o: ../../../morm/src/jsonconnector.h
 rebus.o: ../../../morm/src/postgresqlconnector.h
 rebus.o: ../../../morm/src/postgresqlqueryresult.h
-rebus.o: ../../../morm/src/dochtmlconnector.h
 rebus.o: ../../../winix/winixd/core/dirs.h
 rebus.o: ../../../winix/winixd/core/dircontainer.h
 rebus.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -3005,15 +3025,16 @@ server.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 server.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 server.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 server.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-server.o: ../../../morm/src/baseexpression.h
+server.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+server.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+server.o: ../../../morm/src/finderhelper.h
+server.o: ../../../morm/src/fieldvaluehelper.h
 server.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 server.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 server.o: ../../../morm/src/postgresqlexpression.h
-server.o: ../../../morm/src/dochtmlexpression.h
 server.o: ../../../morm/src/jsonconnector.h
 server.o: ../../../morm/src/postgresqlconnector.h
 server.o: ../../../morm/src/postgresqlqueryresult.h
-server.o: ../../../morm/src/dochtmlconnector.h
 server.o: ../../../winix/winixd/core/dirs.h
 server.o: ../../../winix/winixd/core/dircontainer.h
 server.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -3158,15 +3179,15 @@ slog.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 slog.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 slog.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 slog.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-slog.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+slog.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-slog.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+slog.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-slog.o: ../../../morm/src/jsonexpression.h
+slog.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+slog.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+slog.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 slog.o: ../../../morm/src/postgresqlexpression.h
-slog.o: ../../../morm/src/dochtmlexpression.h
 slog.o: ../../../morm/src/jsonconnector.h
 slog.o: ../../../morm/src/postgresqlconnector.h
 slog.o: ../../../morm/src/postgresqlqueryresult.h
-slog.o: ../../../morm/src/dochtmlconnector.h
 slog.o: ../../../winix/winixd/core/dirs.h
 slog.o: ../../../winix/winixd/core/dircontainer.h
 slog.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -3259,15 +3280,15 @@ stat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 stat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 stat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 stat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-stat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+stat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-stat.o: ../../../morm/src/jsonexpression.h
+stat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+stat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+stat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 stat.o: ../../../morm/src/postgresqlexpression.h
-stat.o: ../../../morm/src/dochtmlexpression.h
 stat.o: ../../../morm/src/jsonconnector.h
 stat.o: ../../../morm/src/postgresqlconnector.h
 stat.o: ../../../morm/src/postgresqlqueryresult.h
-stat.o: ../../../morm/src/dochtmlconnector.h
 stat.o: ../../../winix/winixd/core/dirs.h
 stat.o: ../../../winix/winixd/core/dircontainer.h
 stat.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -3364,15 +3385,16 @@ sys.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 sys.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 sys.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 sys.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-sys.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+sys.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-sys.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+sys.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-sys.o: ../../../morm/src/jsonexpression.h
+sys.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+sys.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+sys.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 sys.o: ../../../morm/src/postgresqlexpression.h
-sys.o: ../../../morm/src/dochtmlexpression.h
 sys.o: ../../../morm/src/jsonconnector.h
 sys.o: ../../../morm/src/postgresqlconnector.h
 sys.o: ../../../morm/src/postgresqlqueryresult.h
-sys.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+sys.o: ../../../winix/winixd/core/dirs.h
 sys.o: ../../../winix/winixd/core/dircontainer.h
 sys.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 sys.o: ../../../winix/winixd/db/dbconn.h
@@ -3473,15 +3495,16 @@ template.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 template.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 template.o: ../../../morm/src/flatconnector.h
 template.o: ../../../morm/src/dbexpression.h
-template.o: ../../../morm/src/baseexpression.h
+template.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+template.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+template.o: ../../../morm/src/finderhelper.h
+template.o: ../../../morm/src/fieldvaluehelper.h
 template.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 template.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 template.o: ../../../morm/src/postgresqlexpression.h
-template.o: ../../../morm/src/dochtmlexpression.h
 template.o: ../../../morm/src/jsonconnector.h
 template.o: ../../../morm/src/postgresqlconnector.h
 template.o: ../../../morm/src/postgresqlqueryresult.h
-template.o: ../../../morm/src/dochtmlconnector.h
 template.o: ../../../winix/winixd/core/dirs.h
 template.o: ../../../winix/winixd/core/dircontainer.h
 template.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -3591,15 +3614,16 @@ templates.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 templates.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 templates.o: ../../../morm/src/flatconnector.h
 templates.o: ../../../morm/src/dbexpression.h
-templates.o: ../../../morm/src/baseexpression.h
+templates.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+templates.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+templates.o: ../../../morm/src/finderhelper.h
+templates.o: ../../../morm/src/fieldvaluehelper.h
 templates.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 templates.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 templates.o: ../../../morm/src/postgresqlexpression.h
-templates.o: ../../../morm/src/dochtmlexpression.h
 templates.o: ../../../morm/src/jsonconnector.h
 templates.o: ../../../morm/src/postgresqlconnector.h
 templates.o: ../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../morm/src/dochtmlconnector.h
 templates.o: ../../../winix/winixd/core/dirs.h
 templates.o: ../../../winix/winixd/core/dircontainer.h
 templates.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -3786,15 +3810,16 @@ upload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 upload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 upload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 upload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-upload.o: ../../../morm/src/baseexpression.h
+upload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+upload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+upload.o: ../../../morm/src/finderhelper.h
+upload.o: ../../../morm/src/fieldvaluehelper.h
 upload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 upload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 upload.o: ../../../morm/src/postgresqlexpression.h
-upload.o: ../../../morm/src/dochtmlexpression.h
 upload.o: ../../../morm/src/jsonconnector.h
 upload.o: ../../../morm/src/postgresqlconnector.h
 upload.o: ../../../morm/src/postgresqlqueryresult.h
-upload.o: ../../../morm/src/dochtmlconnector.h
 upload.o: ../../../winix/winixd/core/dirs.h
 upload.o: ../../../winix/winixd/core/dircontainer.h
 upload.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -3896,15 +3921,16 @@ uptime.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 uptime.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 uptime.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 uptime.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-uptime.o: ../../../morm/src/baseexpression.h
+uptime.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+uptime.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+uptime.o: ../../../morm/src/finderhelper.h
+uptime.o: ../../../morm/src/fieldvaluehelper.h
 uptime.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 uptime.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 uptime.o: ../../../morm/src/postgresqlexpression.h
-uptime.o: ../../../morm/src/dochtmlexpression.h
 uptime.o: ../../../morm/src/jsonconnector.h
 uptime.o: ../../../morm/src/postgresqlconnector.h
 uptime.o: ../../../morm/src/postgresqlqueryresult.h
-uptime.o: ../../../morm/src/dochtmlconnector.h
 uptime.o: ../../../winix/winixd/core/dirs.h
 uptime.o: ../../../winix/winixd/core/dircontainer.h
 uptime.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -4001,15 +4027,15 @@ user.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 user.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 user.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 user.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-user.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+user.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-user.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+user.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-user.o: ../../../morm/src/jsonexpression.h
+user.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+user.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+user.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 user.o: ../../../morm/src/postgresqlexpression.h
-user.o: ../../../morm/src/dochtmlexpression.h
 user.o: ../../../morm/src/jsonconnector.h
 user.o: ../../../morm/src/postgresqlconnector.h
 user.o: ../../../morm/src/postgresqlqueryresult.h
-user.o: ../../../morm/src/dochtmlconnector.h
 user.o: ../../../winix/winixd/core/dirs.h
 user.o: ../../../winix/winixd/core/dircontainer.h
 user.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -4106,15 +4132,16 @@ who.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 who.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 who.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 who.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-who.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
+who.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
-who.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+who.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
-who.o: ../../../morm/src/jsonexpression.h
+who.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+who.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+who.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 who.o: ../../../morm/src/postgresqlexpression.h
-who.o: ../../../morm/src/dochtmlexpression.h
 who.o: ../../../morm/src/jsonconnector.h
 who.o: ../../../morm/src/postgresqlconnector.h
 who.o: ../../../morm/src/postgresqlqueryresult.h
-who.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+who.o: ../../../winix/winixd/core/dirs.h
 who.o: ../../../winix/winixd/core/dircontainer.h
 who.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 who.o: ../../../winix/winixd/db/dbconn.h
@@ -4215,15 +4242,16 @@ winix.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 winix.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 winix.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 winix.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-winix.o: ../../../morm/src/baseexpression.h
+winix.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+winix.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+winix.o: ../../../morm/src/finderhelper.h
+winix.o: ../../../morm/src/fieldvaluehelper.h
 winix.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 winix.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 winix.o: ../../../morm/src/postgresqlexpression.h
-winix.o: ../../../morm/src/dochtmlexpression.h
 winix.o: ../../../morm/src/jsonconnector.h
 winix.o: ../../../morm/src/postgresqlconnector.h
 winix.o: ../../../morm/src/postgresqlqueryresult.h
-winix.o: ../../../morm/src/dochtmlconnector.h
 winix.o: ../../../winix/winixd/core/dirs.h
 winix.o: ../../../winix/winixd/core/dircontainer.h
 winix.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h

winixd/templates/item.cpp

@@ -68,34 +68,34 @@ void item_no_is(Info & i)
 
 void item_id(Info & i)
 {
-	i.out << cur->request->item.id;	
+	i.out << cur->request->last_item->id;
 }
 
 
 
 void item_subject(Info & i)
 {
-	i.out << cur->request->item.subject;
+	i.out << cur->request->last_item->subject;
 }
 
 
 void item_subject_noescape(Info & i)
 {
-	i.out << R(cur->request->item.subject);
+	i.out << R(cur->request->last_item->subject);
 }
 
 
 
 void item_content(Info & i)
 {
-	i.out << cur->request->item.content;
+	i.out << cur->request->last_item->content;
 }
 
 
 
 void item_content_noescape(Info & i)
 {
-	i.out << R(cur->request->item.content);
+	i.out << R(cur->request->last_item->content);
 }
 
 
@@ -122,7 +122,7 @@ void item_content_type_is(Item & item, Info & i)
 
 void item_content_type_is(Info & i)
 {
-	item_content_type_is(cur->request->item, i);
+	item_content_type_is(*cur->request->last_item, i);
 }
 
 
@@ -163,19 +163,19 @@ void item_print_content(HtmlTextStream & out, const std::wstring & content, Item
 
 void item_content_is_empty(Info & i)
 {
-	i.res = cur->request->item.content.empty();
+	i.res = cur->request->last_item->content.empty();
 }
 
 void item_print_content(Info & i)
 {
-	item_print_content(i.out, cur->request->item.content, cur->request->item.content_type);
+	item_print_content(i.out, cur->request->last_item->content, cur->request->last_item->content_type);
 }
 
 
 
 void item_privileges(Info & i)
 {
-	i.out << Toa(cur->request->item.privileges, 8);
+	i.out << Toa(cur->request->last_item->privileges, 8);
 }
 
 
@@ -187,7 +187,7 @@ void item_dir(Info & i)
 
 void item_url(Info & i)
 {
-	i.out << cur->request->item.url;
+	i.out << cur->request->last_item->url;
 }
 
 
@@ -196,7 +196,7 @@ void item_url_is(Info & i)
 	if( !cur->request->is_item )
 		return; // default false
 
-    i.res = (cur->request->item.url == i.par);
+    i.res = (cur->request->last_item->url == i.par);
 }
 
 
@@ -205,7 +205,7 @@ void item_url_is_no(Info & i)
 	if( !cur->request->is_item )
 		i.res = true;
 	else
-		i.res = (cur->request->item.url != i.par);
+		i.res = (cur->request->last_item->url != i.par);
 }
 
 
@@ -226,37 +226,37 @@ void item_link(Info & i)
 
 void item_filetype_is_none(Info & i)
 {
-	i.res = cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE;
+	i.res = cur->request->last_item->file_type == WINIX_ITEM_FILETYPE_NONE;
 }
 
 
 void item_filetype_is_image(Info & i)
 {
-	i.res = cur->request->item.file_type == WINIX_ITEM_FILETYPE_IMAGE;
+	i.res = cur->request->last_item->file_type == WINIX_ITEM_FILETYPE_IMAGE;
 }
 
 
 void item_has_static_file(Info & i)
 {
-	i.res = cur->request->item.file_type != WINIX_ITEM_FILETYPE_NONE && !cur->request->item.file_path.empty();
+	i.res = cur->request->last_item->file_type != WINIX_ITEM_FILETYPE_NONE && !cur->request->last_item->file_path.empty();
 }
 
 
 void item_has_thumb(Info & i)
 {
-	i.res = cur->request->item.has_thumb;
+	i.res = cur->request->last_item->has_thumb;
 }
 
 
 void item_can_read(Info & i)
 {
-	i.res = system->HasReadAccess(cur->request->item);
+	i.res = system->HasReadAccess(*cur->request->last_item);
 }
 
 
 void item_can_write(Info & i)
 {
-	i.res = system->HasWriteAccess(cur->request->item);
+	i.res = system->HasWriteAccess(*cur->request->last_item);
 }
 
 
@@ -270,55 +270,55 @@ void item_can_remove(Info & i)
 
 void item_user(Info & i)
 {
-	User * puser = system->users.GetUser(cur->request->item.user_id);
+	User * puser = system->users.GetUser(cur->request->last_item->user_id);
-	print_user_name(i, puser, cur->request->item.guest_name);
+	print_user_name(i, puser, cur->request->last_item->guest_name);
 }
 
 
 
 void item_modification_user(Info & i)
 {
-	User * puser = system->users.GetUser(cur->request->item.modification_user_id);
+	User * puser = system->users.GetUser(cur->request->last_item->modification_user_id);
-	print_user_name(i, puser, cur->request->item.guest_name);
+	print_user_name(i, puser, cur->request->last_item->guest_name);
 }
 
 
 void item_users_different(Info & i)
 {
-	i.res = (cur->request->item.user_id != cur->request->item.modification_user_id);
+	i.res = (cur->request->last_item->user_id != cur->request->last_item->modification_user_id);
 }
 
 
 void item_date_creation(Info & i)
 {
-	PT::Date date = system->ToLocal(cur->request->item.date_creation);
+	PT::Date date = system->ToLocal(cur->request->last_item->date_creation);
 	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
 void item_date_modification(Info & i)
 {
-	PT::Date date = system->ToLocal(cur->request->item.date_modification);
+	PT::Date date = system->ToLocal(cur->request->last_item->date_modification);
 	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
 void item_date_creation_nice(Info & i)
 {
-	print_date_nice(i, cur->request->item.date_creation);
+	print_date_nice(i, cur->request->last_item->date_creation);
 }
 
 
 void item_date_modification_nice(Info & i)
 {
-	print_date_nice(i, cur->request->item.date_modification);
+	print_date_nice(i, cur->request->last_item->date_modification);
 }
 
 
 void item_dates_equal(Info & i)
 {
-	PT::Date & date1 = cur->request->item.date_creation;
+	PT::Date & date1 = cur->request->last_item->date_creation;
-	PT::Date & date2 = cur->request->item.date_modification;
+	PT::Date & date2 = cur->request->last_item->date_modification;
 	
 	i.res = date1 == date2;
 }
@@ -333,9 +333,9 @@ void item_run(Info & i)
 		return;
 	}
 
-	if( system->HasReadExecAccess(cur->request->item) )
+	if( system->HasReadExecAccess(*cur->request->last_item) )
 	{
-		Ezc::Pattern * p = pattern_cacher.GetPattern(cur->request->item);
+		Ezc::Pattern * p = pattern_cacher.GetPattern(*cur->request->last_item);
 
 		item_run_content.Clear();
 		InitGenerator(ezc_generator);
@@ -346,7 +346,7 @@ void item_run(Info & i)
 		else
 			ezc_generator.Generate(item_run_content);
 
-		item_print_content(i.out, item_run_content.Str(), cur->request->item.content_type);
+		item_print_content(i.out, item_run_content.Str(), cur->request->last_item->content_type);
 	}
 	else
 	{
@@ -357,72 +357,72 @@ void item_run(Info & i)
 
 void item_guest_name(Info & i)
 {
-	i.out << cur->request->item.guest_name;
+	i.out << cur->request->last_item->guest_name;
 }
 
 
 void item_html_template(Info & i)
 {
-	i.out << cur->request->item.html_template;
+	i.out << cur->request->last_item->html_template;
 }
 
 
 void item_has_html_template(Info & i)
 {
-	i.res = !cur->request->item.html_template.empty();
+	i.res = !cur->request->last_item->html_template.empty();
 }
 
 
 void item_type_is_dir(Info & i)
 {
-	i.res = cur->request->item.type == Item::dir;
+	i.res = cur->request->last_item->type == Item::dir;
 }
 
 
 void item_type_is_file(Info & i)
 {
-	i.res = cur->request->item.type == Item::file;
+	i.res = cur->request->last_item->type == Item::file;
 }
 
 
 void item_type_is_symlink(Info & i)
 {
-	i.res = cur->request->item.type == Item::symlink;
+	i.res = cur->request->last_item->type == Item::symlink;
 }
 
 
 void item_is_link_to(Info & i)
 {
-	i.res = !cur->request->item.link_to.empty();
+	i.res = !cur->request->last_item->link_to.empty();
 }
 
 
 void item_link_to(Info & i)
 {
-	i.out << cur->request->item.link_to;
+	i.out << cur->request->last_item->link_to;
 }
 
 
 void item_is_link_redirect(Info & i)
 {
-	i.res = cur->request->item.link_redirect == 1;
+	i.res = cur->request->last_item->link_redirect == 1;
 }
 
 void item_file_size(Info & i)
 {
-	i.res = cur->request->item.file_size;
+	i.res = cur->request->last_item->file_size;
 }
 
 void item_sort(Info & i)
 {
-	i.out << cur->request->item.sort_index;
+	i.out << cur->request->last_item->sort_index;
 }
 
 
 
 void item_meta_str(Info & i)
 {
-	cur->request->item.meta.Serialize(i.out, true, false);
+	cur->request->last_item->meta.Serialize(i.out, true, false);
 }
 
 
@@ -462,7 +462,7 @@ void item_meta_tab_has_next(Info & i)
 
 void item_admin_meta_str(Info & i)
 {
-	cur->request->item.ameta.Serialize(i.out, true, false);
+	cur->request->last_item->ameta.Serialize(i.out, true, false);
 }
 
 
@@ -492,7 +492,7 @@ void item_admin_meta_tab_has_next(Info & i)
 
 void item_can_content_be_html_filtered(Info & i)
 {
-	i.res = cur->request->item.CanContentBeHtmlFiltered();
+	i.res = cur->request->last_item->CanContentBeHtmlFiltered();
 }