remove Request::post_tab and add Request::http_status

Instead of Reqest::post_tab we use now Request::post_in (pt::Space). Request::http_status will be used instead Request::status, but at the moment is not changed in all places. Request::status has been marked as depracated. While here: - Check for root dir in App and not in FunctionParser, let FunctionParser only log the root dir. - Read post variables after parsing url parameters, this allows winix functions to set limits for post input. - Set limits when parsing input json format, new options added to config: post_max_object_items, post_max_table_items, post_max_all_items, post_max_nested_objects. There are similar options in each winix function (they are in FunctionBase). - Some refactoring in App. - Add config option: log_whole_http_post if true then the whole parsed post input is logged. - Add config option: post_json_max - max length of input stream for parsing json. - Add config option: templates_request_status, default request_status.html this is an ezc template used as [content] when the request status is not 200_ok. - Fix: Sort winix function didn't show items to sort (fix and do some refactoring as well) - Properly sort items in: ImgCrop, Ls, Sort, Upload - Remove ezc templates: err_404.html, err_per_denied.html - now request_status.html is used.
2022-05-30 01:29:18 +02:00
parent 9e222f5b80
commit 7d1fb3c04e
46 changed files with 1224 additions and 835 deletions
--- a/winixd/templates/Makefile.dep
+++ b/winixd/templates/Makefile.dep
@@ -48,7 +48,7 @@ adduser.o: ../../../morm/src/postgresqlexpression.h
 adduser.o: ../../../morm/src/jsonconnector.h
 adduser.o: ../../../morm/src/postgresqlconnector.h
 adduser.o: ../../../morm/src/postgresqlqueryresult.h
-adduser.o: ../../../winix/winixd/core/log.h
+adduser.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 adduser.o: ../../../winix/winixd/core/synchro.h
 adduser.o: ../../../winix/winixd/core/filelog.h
 adduser.o: ../../../winix/winixd/core/lock.h
@@ -177,7 +177,7 @@ antispam.o: ../../../morm/src/postgresqlexpression.h
 antispam.o: ../../../morm/src/jsonconnector.h
 antispam.o: ../../../morm/src/postgresqlconnector.h
 antispam.o: ../../../morm/src/postgresqlqueryresult.h
-antispam.o: ../../../winix/winixd/core/log.h
+antispam.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 antispam.o: ../../../winix/winixd/core/synchro.h
 antispam.o: ../../../winix/winixd/core/filelog.h
 antispam.o: ../../../winix/winixd/core/lock.h
@@ -311,6 +311,7 @@ changepatterns.o: ../../../morm/src/postgresqlexpression.h
 changepatterns.o: ../../../morm/src/jsonconnector.h
 changepatterns.o: ../../../morm/src/postgresqlconnector.h
 changepatterns.o: ../../../morm/src/postgresqlqueryresult.h
+changepatterns.o: ../../../morm/src/transaction.h
 changepatterns.o: ../../../winix/winixd/core/log.h
 changepatterns.o: ../../../winix/winixd/core/synchro.h
 changepatterns.o: ../../../winix/winixd/core/filelog.h
@@ -375,7 +376,7 @@ config.o: ../../../morm/src/postgresqlexpression.h
 config.o: ../../../morm/src/jsonconnector.h
 config.o: ../../../morm/src/postgresqlconnector.h
 config.o: ../../../morm/src/postgresqlqueryresult.h
-config.o: ../../../winix/winixd/core/log.h
+config.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 config.o: ../../../winix/winixd/core/synchro.h
 config.o: ../../../winix/winixd/core/filelog.h
 config.o: ../../../winix/winixd/core/lock.h
@@ -505,6 +506,7 @@ currentdate.o: ../../../morm/src/postgresqlexpression.h
 currentdate.o: ../../../morm/src/jsonconnector.h
 currentdate.o: ../../../morm/src/postgresqlconnector.h
 currentdate.o: ../../../morm/src/postgresqlqueryresult.h
+currentdate.o: ../../../morm/src/transaction.h
 currentdate.o: ../../../winix/winixd/core/log.h
 currentdate.o: ../../../winix/winixd/core/synchro.h
 currentdate.o: ../../../winix/winixd/core/filelog.h
@@ -682,7 +684,8 @@ dir.o: ../../../morm/src/postgresqlexpression.h
 dir.o: ../../../morm/src/jsonconnector.h
 dir.o: ../../../morm/src/postgresqlconnector.h
 dir.o: ../../../morm/src/postgresqlqueryresult.h
-dir.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+dir.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+dir.o: ../../../winix/winixd/core/synchro.h
 dir.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
 dir.o: ../../../winix/winixd/core/synchro.h
 dir.o: ../../../pikotools/src/convert/patternreplacer.h
@@ -850,7 +853,8 @@ doc.o: ../../../morm/src/postgresqlexpression.h
 doc.o: ../../../morm/src/jsonconnector.h
 doc.o: ../../../morm/src/postgresqlconnector.h
 doc.o: ../../../morm/src/postgresqlqueryresult.h
-doc.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+doc.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+doc.o: ../../../winix/winixd/core/synchro.h
 doc.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
 doc.o: ../../../winix/winixd/core/synchro.h
 doc.o: ../../../pikotools/src/convert/patternreplacer.h
@@ -976,7 +980,7 @@ filters.o: ../../../morm/src/postgresqlexpression.h
 filters.o: ../../../morm/src/jsonconnector.h
 filters.o: ../../../morm/src/postgresqlconnector.h
 filters.o: ../../../morm/src/postgresqlqueryresult.h
-filters.o: ../../../winix/winixd/core/log.h
+filters.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 filters.o: ../../../winix/winixd/core/synchro.h
 filters.o: ../../../winix/winixd/core/filelog.h
 filters.o: ../../../winix/winixd/core/lock.h
@@ -1110,7 +1114,7 @@ generic.o: ../../../morm/src/postgresqlexpression.h
 generic.o: ../../../morm/src/jsonconnector.h
 generic.o: ../../../morm/src/postgresqlconnector.h
 generic.o: ../../../morm/src/postgresqlqueryresult.h
-generic.o: ../../../winix/winixd/core/log.h
+generic.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 generic.o: ../../../winix/winixd/core/synchro.h
 generic.o: ../../../winix/winixd/core/filelog.h
 generic.o: ../../../winix/winixd/core/lock.h
@@ -1237,6 +1241,7 @@ htmltextstream.o: ../../../morm/src/postgresqlexpression.h
 htmltextstream.o: ../../../morm/src/jsonconnector.h
 htmltextstream.o: ../../../morm/src/postgresqlconnector.h
 htmltextstream.o: ../../../morm/src/postgresqlqueryresult.h
+htmltextstream.o: ../../../morm/src/transaction.h
 indexpatterns.o: indexpatterns.h ../../../ezc/src/ezc.h
 indexpatterns.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
 indexpatterns.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
@@ -1290,6 +1295,7 @@ indexpatterns.o: ../../../morm/src/postgresqlexpression.h
 indexpatterns.o: ../../../morm/src/jsonconnector.h
 indexpatterns.o: ../../../morm/src/postgresqlconnector.h
 indexpatterns.o: ../../../morm/src/postgresqlqueryresult.h
+indexpatterns.o: ../../../morm/src/transaction.h
 indexpatterns.o: ../../../winix/winixd/core/log.h
 indexpatterns.o: ../../../winix/winixd/core/synchro.h
 indexpatterns.o: ../../../winix/winixd/core/filelog.h
@@ -1347,7 +1353,7 @@ insert.o: ../../../morm/src/postgresqlexpression.h
 insert.o: ../../../morm/src/jsonconnector.h
 insert.o: ../../../morm/src/postgresqlconnector.h
 insert.o: ../../../morm/src/postgresqlqueryresult.h
-insert.o: ../../../winix/winixd/core/log.h
+insert.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 insert.o: ../../../winix/winixd/core/synchro.h
 insert.o: ../../../winix/winixd/core/filelog.h
 insert.o: ../../../winix/winixd/core/lock.h
@@ -1479,7 +1485,7 @@ ipban.o: ../../../morm/src/postgresqlexpression.h
 ipban.o: ../../../morm/src/jsonconnector.h
 ipban.o: ../../../morm/src/postgresqlconnector.h
 ipban.o: ../../../morm/src/postgresqlqueryresult.h
-ipban.o: ../../../winix/winixd/core/log.h
+ipban.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 ipban.o: ../../../winix/winixd/core/synchro.h
 ipban.o: ../../../winix/winixd/core/filelog.h
 ipban.o: ../../../winix/winixd/core/lock.h
@@ -1653,7 +1659,8 @@ last.o: ../../../morm/src/postgresqlexpression.h
 last.o: ../../../morm/src/jsonconnector.h
 last.o: ../../../morm/src/postgresqlconnector.h
 last.o: ../../../morm/src/postgresqlqueryresult.h
-last.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+last.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+last.o: ../../../winix/winixd/core/synchro.h
 last.o: ../../../winix/winixd/core/filelog.h
 last.o: ../../../winix/winixd/core/lock.h
 last.o: ../../../winix/winixd/core/synchro.h
@@ -1773,7 +1780,7 @@ locale.o: ../../../morm/src/postgresqlexpression.h
 locale.o: ../../../morm/src/jsonconnector.h
 locale.o: ../../../morm/src/postgresqlconnector.h
 locale.o: ../../../morm/src/postgresqlqueryresult.h
-locale.o: ../../../winix/winixd/core/log.h
+locale.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 locale.o: ../../../winix/winixd/core/synchro.h
 locale.o: ../../../winix/winixd/core/filelog.h
 locale.o: ../../../winix/winixd/core/lock.h
@@ -1840,6 +1847,7 @@ localefilter.o: ../../../morm/src/postgresqlexpression.h
 localefilter.o: ../../../morm/src/jsonconnector.h
 localefilter.o: ../../../morm/src/postgresqlconnector.h
 localefilter.o: ../../../morm/src/postgresqlqueryresult.h
+localefilter.o: ../../../morm/src/transaction.h
 localefilter.o: ../../../winix/winixd/core/log.h
 localefilter.o: ../../../winix/winixd/core/synchro.h
 localefilter.o: ../../../winix/winixd/core/filelog.h
@@ -1909,7 +1917,7 @@ login.o: ../../../morm/src/postgresqlexpression.h
 login.o: ../../../morm/src/jsonconnector.h
 login.o: ../../../morm/src/postgresqlconnector.h
 login.o: ../../../morm/src/postgresqlqueryresult.h
-login.o: ../../../winix/winixd/core/log.h
+login.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 login.o: ../../../winix/winixd/core/synchro.h
 login.o: ../../../winix/winixd/core/filelog.h
 login.o: ../../../winix/winixd/core/lock.h
@@ -2076,7 +2084,8 @@ ls.o: ../../../morm/src/postgresqlexpression.h
 ls.o: ../../../morm/src/jsonconnector.h
 ls.o: ../../../morm/src/postgresqlconnector.h
 ls.o: ../../../morm/src/postgresqlqueryresult.h
-ls.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+ls.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+ls.o: ../../../winix/winixd/core/synchro.h
 ls.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
 ls.o: ../../../winix/winixd/core/synchro.h
 ls.o: ../../../pikotools/src/convert/patternreplacer.h
@@ -2189,7 +2198,8 @@ man.o: ../../../morm/src/postgresqlexpression.h
 man.o: ../../../morm/src/jsonconnector.h
 man.o: ../../../morm/src/postgresqlconnector.h
 man.o: ../../../morm/src/postgresqlqueryresult.h
-man.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+man.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+man.o: ../../../winix/winixd/core/synchro.h
 man.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
 man.o: ../../../winix/winixd/core/synchro.h
 man.o: ../../../pikotools/src/convert/patternreplacer.h
@@ -2358,7 +2368,8 @@ misc.o: ../../../morm/src/postgresqlexpression.h
 misc.o: ../../../morm/src/jsonconnector.h
 misc.o: ../../../morm/src/postgresqlconnector.h
 misc.o: ../../../morm/src/postgresqlqueryresult.h
-misc.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+misc.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+misc.o: ../../../winix/winixd/core/synchro.h
 misc.o: ../../../winix/winixd/core/filelog.h
 misc.o: ../../../winix/winixd/core/lock.h
 misc.o: ../../../winix/winixd/core/synchro.h
@@ -2485,7 +2496,7 @@ mount.o: ../../../morm/src/postgresqlexpression.h
 mount.o: ../../../morm/src/jsonconnector.h
 mount.o: ../../../morm/src/postgresqlconnector.h
 mount.o: ../../../morm/src/postgresqlqueryresult.h
-mount.o: ../../../winix/winixd/core/log.h
+mount.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 mount.o: ../../../winix/winixd/core/synchro.h
 mount.o: ../../../winix/winixd/core/filelog.h
 mount.o: ../../../winix/winixd/core/lock.h
@@ -2616,7 +2627,7 @@ passwd.o: ../../../morm/src/postgresqlexpression.h
 passwd.o: ../../../morm/src/jsonconnector.h
 passwd.o: ../../../morm/src/postgresqlconnector.h
 passwd.o: ../../../morm/src/postgresqlqueryresult.h
-passwd.o: ../../../winix/winixd/core/log.h
+passwd.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 passwd.o: ../../../winix/winixd/core/synchro.h
 passwd.o: ../../../winix/winixd/core/filelog.h
 passwd.o: ../../../winix/winixd/core/lock.h
@@ -2740,6 +2751,7 @@ patterncacher.o: ../../../morm/src/postgresqlexpression.h
 patterncacher.o: ../../../morm/src/jsonconnector.h
 patterncacher.o: ../../../morm/src/postgresqlconnector.h
 patterncacher.o: ../../../morm/src/postgresqlqueryresult.h
+patterncacher.o: ../../../morm/src/transaction.h
 patterncacher.o: ../../../winix/winixd/core/log.h
 patterncacher.o: ../../../winix/winixd/core/synchro.h
 patterncacher.o: ../../../winix/winixd/core/filelog.h
@@ -2802,7 +2814,7 @@ patterns.o: ../../../morm/src/postgresqlexpression.h
 patterns.o: ../../../morm/src/jsonconnector.h
 patterns.o: ../../../morm/src/postgresqlconnector.h
 patterns.o: ../../../morm/src/postgresqlqueryresult.h
-patterns.o: ../../../winix/winixd/core/log.h
+patterns.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 patterns.o: ../../../winix/winixd/core/synchro.h
 patterns.o: ../../../winix/winixd/core/filelog.h
 patterns.o: ../../../winix/winixd/core/lock.h
@@ -2862,7 +2874,8 @@ priv.o: ../../../morm/src/postgresqlexpression.h
 priv.o: ../../../morm/src/jsonconnector.h
 priv.o: ../../../morm/src/postgresqlconnector.h
 priv.o: ../../../morm/src/postgresqlqueryresult.h
-priv.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+priv.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+priv.o: ../../../winix/winixd/core/synchro.h
 priv.o: ../../../winix/winixd/core/filelog.h
 priv.o: ../../../winix/winixd/core/lock.h
 priv.o: ../../../winix/winixd/core/synchro.h
@@ -3037,7 +3050,7 @@ rebus.o: ../../../morm/src/postgresqlexpression.h
 rebus.o: ../../../morm/src/jsonconnector.h
 rebus.o: ../../../morm/src/postgresqlconnector.h
 rebus.o: ../../../morm/src/postgresqlqueryresult.h
-rebus.o: ../../../winix/winixd/core/log.h
+rebus.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 rebus.o: ../../../winix/winixd/core/synchro.h
 rebus.o: ../../../winix/winixd/core/filelog.h
 rebus.o: ../../../winix/winixd/core/lock.h
@@ -3161,7 +3174,7 @@ server.o: ../../../morm/src/postgresqlexpression.h
 server.o: ../../../morm/src/jsonconnector.h
 server.o: ../../../morm/src/postgresqlconnector.h
 server.o: ../../../morm/src/postgresqlqueryresult.h
-server.o: ../../../winix/winixd/core/log.h
+server.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 server.o: ../../../winix/winixd/core/synchro.h
 server.o: ../../../winix/winixd/core/filelog.h
 server.o: ../../../winix/winixd/core/lock.h
@@ -3334,7 +3347,8 @@ slog.o: ../../../morm/src/postgresqlexpression.h
 slog.o: ../../../morm/src/jsonconnector.h
 slog.o: ../../../morm/src/postgresqlconnector.h
 slog.o: ../../../morm/src/postgresqlqueryresult.h
-slog.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+slog.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+slog.o: ../../../winix/winixd/core/synchro.h
 slog.o: ../../../winix/winixd/core/filelog.h
 slog.o: ../../../winix/winixd/core/lock.h
 slog.o: ../../../winix/winixd/core/synchro.h
@@ -3451,7 +3465,8 @@ stat.o: ../../../morm/src/postgresqlexpression.h
 stat.o: ../../../morm/src/jsonconnector.h
 stat.o: ../../../morm/src/postgresqlconnector.h
 stat.o: ../../../morm/src/postgresqlqueryresult.h
-stat.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+stat.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+stat.o: ../../../winix/winixd/core/synchro.h
 stat.o: ../../../winix/winixd/core/filelog.h
 stat.o: ../../../winix/winixd/core/lock.h
 stat.o: ../../../winix/winixd/core/synchro.h
@@ -3576,7 +3591,8 @@ sys.o: ../../../morm/src/postgresqlexpression.h
 sys.o: ../../../morm/src/jsonconnector.h
 sys.o: ../../../morm/src/postgresqlconnector.h
 sys.o: ../../../morm/src/postgresqlqueryresult.h
-sys.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+sys.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+sys.o: ../../../winix/winixd/core/synchro.h
 sys.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
 sys.o: ../../../winix/winixd/core/synchro.h
 sys.o: ../../../pikotools/src/convert/patternreplacer.h
@@ -3698,7 +3714,7 @@ template.o: ../../../morm/src/postgresqlexpression.h
 template.o: ../../../morm/src/jsonconnector.h
 template.o: ../../../morm/src/postgresqlconnector.h
 template.o: ../../../morm/src/postgresqlqueryresult.h
-template.o: ../../../winix/winixd/core/log.h
+template.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 template.o: ../../../winix/winixd/core/synchro.h
 template.o: ../../../winix/winixd/core/filelog.h
 template.o: ../../../winix/winixd/core/lock.h
@@ -3832,7 +3848,7 @@ templates.o: ../../../morm/src/postgresqlexpression.h
 templates.o: ../../../morm/src/jsonconnector.h
 templates.o: ../../../morm/src/postgresqlconnector.h
 templates.o: ../../../morm/src/postgresqlqueryresult.h
-templates.o: ../../../winix/winixd/core/log.h
+templates.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 templates.o: ../../../winix/winixd/core/synchro.h
 templates.o: ../../../winix/winixd/core/filelog.h
 templates.o: ../../../winix/winixd/core/lock.h
@@ -4028,7 +4044,7 @@ upload.o: ../../../morm/src/postgresqlexpression.h
 upload.o: ../../../morm/src/jsonconnector.h
 upload.o: ../../../morm/src/postgresqlconnector.h
 upload.o: ../../../morm/src/postgresqlqueryresult.h
-upload.o: ../../../winix/winixd/core/log.h
+upload.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 upload.o: ../../../winix/winixd/core/synchro.h
 upload.o: ../../../winix/winixd/core/filelog.h
 upload.o: ../../../winix/winixd/core/lock.h
@@ -4154,7 +4170,7 @@ uptime.o: ../../../morm/src/postgresqlexpression.h
 uptime.o: ../../../morm/src/jsonconnector.h
 uptime.o: ../../../morm/src/postgresqlconnector.h
 uptime.o: ../../../morm/src/postgresqlqueryresult.h
-uptime.o: ../../../winix/winixd/core/log.h
+uptime.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 uptime.o: ../../../winix/winixd/core/synchro.h
 uptime.o: ../../../winix/winixd/core/filelog.h
 uptime.o: ../../../winix/winixd/core/lock.h
@@ -4277,7 +4293,8 @@ user.o: ../../../morm/src/postgresqlexpression.h
 user.o: ../../../morm/src/jsonconnector.h
 user.o: ../../../morm/src/postgresqlconnector.h
 user.o: ../../../morm/src/postgresqlqueryresult.h
-user.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+user.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+user.o: ../../../winix/winixd/core/synchro.h
 user.o: ../../../winix/winixd/core/filelog.h
 user.o: ../../../winix/winixd/core/lock.h
 user.o: ../../../winix/winixd/core/synchro.h
@@ -4402,7 +4419,8 @@ who.o: ../../../morm/src/postgresqlexpression.h
 who.o: ../../../morm/src/jsonconnector.h
 who.o: ../../../morm/src/postgresqlconnector.h
 who.o: ../../../morm/src/postgresqlqueryresult.h
-who.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/synchro.h
+who.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
+who.o: ../../../winix/winixd/core/synchro.h
 who.o: ../../../winix/winixd/core/filelog.h ../../../winix/winixd/core/lock.h
 who.o: ../../../winix/winixd/core/synchro.h
 who.o: ../../../pikotools/src/convert/patternreplacer.h
@@ -4527,7 +4545,7 @@ winix.o: ../../../morm/src/postgresqlexpression.h
 winix.o: ../../../morm/src/jsonconnector.h
 winix.o: ../../../morm/src/postgresqlconnector.h
 winix.o: ../../../morm/src/postgresqlqueryresult.h
-winix.o: ../../../winix/winixd/core/log.h
+winix.o: ../../../morm/src/transaction.h ../../../winix/winixd/core/log.h
 winix.o: ../../../winix/winixd/core/synchro.h
 winix.o: ../../../winix/winixd/core/filelog.h
 winix.o: ../../../winix/winixd/core/lock.h
--- a/winixd/templates/templates.cpp
+++ b/winixd/templates/templates.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2008-2021, Tomasz Sowa
+ * Copyright (c) 2008-2022, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -41,15 +41,14 @@
 namespace Winix
 {

-// !! IMPROVE ME moze zamienic na EzcFunctions
+// !! IMPROVE ME may change to EzcFunctions?
 namespace TemplatesFunctions
 {

 size_t pat_index;					// main index pattern
 size_t pat_index_generic;			// generic index pattern, without any css-site styles, only main css (uikit)
 size_t pat_index_raw;				// pattern for a raw content (raw content without html, body markup)
-size_t pat_err_404;					// 404 error
-size_t pat_err_per_denied;			// permission denied error
+size_t pat_request_status;			// error.html

 Patterns          patterns;			// all html patterns
 IndexPatterns     index_patterns;	// patterns for main index templates (those from mountpoint)
@@ -106,7 +105,7 @@ Ezc::Pattern * p;

 	if( !cur->request->function )
 	{
-		log << log1 << "Templates: cannot get a template for a function (there is not a function)" << logend;
+		log << log1 << "Templates: cannot get a template for a function (there is no a function)" << logend;
 		return 0;
 	}

@@ -134,60 +133,30 @@ return p;



-void content(Info & i)
+void content(EzcEnv & env)
 {
-Ezc::Pattern * p = 0;
+Ezc::Pattern * pattern = 0;

-	switch( cur->request->status )
+	switch( cur->request->http_status )
 	{
-		//case WINIX_ERR_NO_ITEM: !! we need something like 'error::item_required'
-		//p = &pat_err_item_required;
-		//break;
-	
-		case WINIX_ERR_INCORRECT_URI: // !!temporarily
-		case WINIX_ERR_INTERNAL_ERROR: // !! temprarily
-		case WINIX_ERR_PERMISSION_DENIED:
-		case WINIX_ERR_CANT_CHANGE_USER:
-		case WINIX_ERR_CANT_CHANGE_GROUP:
-		case WINIX_ERR_CANT_CHANGE_PRIVILEGES:
-		// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
-		p = patterns.Get(pat_err_per_denied, locale.GetCurLang());
+		case Header::status_200_ok:
+			pattern = GetPatternForFunction();
+			break;

-		if( p )
-			log << log3 << "Templates: error pattern taken from: " << patterns.GetFileName(pat_err_per_denied) << logend;
-
-		break;
-
-		case WINIX_ERR_NO_ITEM:
-		case WINIX_ERR_NO_FUNCTION:
-		case WINIX_ERR_UNKNOWN_PARAM:
-		// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
-		p = patterns.Get(pat_err_404, locale.GetCurLang());
-
-		if( p )
-			log << log3 << "Templates: error pattern taken from: " << patterns.GetFileName(pat_err_404) << logend;
-
-		break;
-
-		//default:
-		// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
-		//p = &patterns[locale.GetLang()][pat_err_others];
-		//break;
-
-		//case WINIX_ERR_OK:
-		//case WINIX_ERR_SPAM:
-		//case WINIX_ERR_INCORRECT_REBUS:
 		default:
-		p = GetPatternForFunction();
-		break;		
-	}
+			pattern = patterns.Get(pat_request_status, locale.GetCurLang());

+			if( pattern )
+				log << log3 << "Templates: error pattern taken from: " << patterns.GetFileName(pat_request_status) << logend;
+
+			break;
+	}
 	
-	if( p )
+	if( pattern )
 	{
 		InitGenerator(content_gen, cur->request->models);
-		content_gen.SetPattern(*p);
-		content_gen.Generate(i.out, cur->request->out_streams);
+		content_gen.SetPattern(*pattern);
+		content_gen.Generate(env.out, cur->request->out_streams);
 	}
 	else
 	{
@@ -853,8 +822,7 @@ using namespace TemplatesFunctions;
 	pat_index				= patterns.Add(config->templates_index);
 	pat_index_generic		= patterns.Add(config->templates_index_generic);
 	pat_index_raw			= patterns.Add(config->templates_index_raw);
-	pat_err_404				= patterns.Add(L"err_404.html");			// !! IMPROVE ME name to the config
-	pat_err_per_denied		= patterns.Add(L"err_per_denied.html");		// !! IMPROVE ME name to the config
+	pat_request_status		= patterns.Add(config->templates_request_status);

 	ReadTemplatesForFunctions();
 	ReadIndexTemplates();
--- a/winixd/templates/templates.h
+++ b/winixd/templates/templates.h
@@ -69,8 +69,7 @@ namespace TemplatesFunctions
 	extern size_t pat_index;
 	extern size_t pat_index_generic;
 	extern size_t pat_index_raw;
-	extern size_t pat_err_404;
-	extern size_t pat_err_per_denied;
+	extern size_t pat_request_status;

 	extern Patterns          patterns;
 	extern IndexPatterns     index_patterns;