From f35840e7de39aeda010d8feed289689d11a57377 Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Sun, 20 Jun 2021 18:12:43 +0200
Subject: [PATCH] some work in html templates: changed some functions from
 item_* to item.*

---
 winixd/html/fun_ckeditor.html       |  8 ++++----
 winixd/html/fun_cp.html             |  8 ++++----
 winixd/html/fun_createthread.html   |  4 ++--
 winixd/html/fun_createticket.html   | 20 ++++++++++----------
 winixd/html/fun_emacs.html          | 12 ++++++------
 winixd/html/fun_emacs_post.html     | 12 ++++++------
 winixd/html/fun_env.html            |  4 ++--
 winixd/html/fun_export.html         |  4 ++--
 winixd/html/fun_imgcrop.html        |  8 ++++----
 winixd/html/fun_ipban.html          |  4 ++--
 winixd/html/fun_ln.html             |  2 +-
 winixd/html/fun_locale.html         |  2 +-
 winixd/html/fun_login.html          |  2 +-
 winixd/html/fun_ls.html             |  2 +-
 winixd/html/fun_meta.html           | 10 +++++-----
 winixd/html/fun_mv.html             |  8 ++++----
 winixd/html/fun_nicedit.html        | 12 ++++++------
 winixd/html/fun_priv.html           |  2 +-
 winixd/html/fun_reply.html          | 12 ++++++------
 winixd/html/fun_rm.html             | 10 +++++-----
 winixd/html/fun_rmuser.html         |  2 +-
 winixd/html/fun_run.html            |  6 +++---
 winixd/html/fun_seo.html            |  4 ++--
 winixd/html/fun_sort.html           |  6 +++---
 winixd/html/fun_subject.html        |  4 ++--
 winixd/html/fun_template.html       |  4 ++--
 winixd/html/fun_thread.html         | 18 +++++++++---------
 winixd/html/fun_ticket.html         |  6 +++---
 winixd/html/fun_timezone.html       |  2 +-
 winixd/html/fun_tinymce.html        |  8 ++++----
 winixd/html/fun_upload.html         |  2 +-
 winixd/html/fun_vim.html            | 12 ++++++------
 winixd/html/index_bottom_adder.html |  6 +++---
 winixd/html/index_head_adder.html   |  2 +-
 winixd/html/item_info.html          |  2 +-
 35 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/winixd/html/fun_ckeditor.html b/winixd/html/fun_ckeditor.html
index 1b81443..8e90c2b 100644
--- a/winixd/html/fun_ckeditor.html
+++ b/winixd/html/fun_ckeditor.html
@@ -1,6 +1,6 @@
 <div class="winix">
 
-[if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
+[if request.is_item]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 <form class="uk-form-stacked">
 	
@@ -8,14 +8,14 @@
 	<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]>
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]" [if not request.is_item]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]">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item.url]">
 		</div>
 	</div>
 	[end]
@@ -61,7 +61,7 @@
 		<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]ckeditor"
+				data-winix-function-path="[doc_base_url][dir][if request.is_item][item.url]/[end]ckeditor"
 				data-winix-content-ckeditor-instances="winix-editor-content"
 				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
 				data-winix-progressbar-id="winix-editor-progressbar"
diff --git a/winixd/html/fun_cp.html b/winixd/html/fun_cp.html
index 57ceffc..e502aca 100644
--- a/winixd/html/fun_cp.html
+++ b/winixd/html/fun_cp.html
@@ -3,17 +3,17 @@
 <h1>{cp_header}</h1>
 
 <p>
-	[if item_is]{cp_page} [item_url] [else]{cp_dir} [dir_without_slash][end]
+	[if request.is_item]{cp_page} [item.url] [else]{cp_dir} [dir_without_slash][end]
 </p>
 
 
-<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]cp[if not item_is]/r[end]">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]cp[if not request.is_item]/r[end]">
 
 	<div class="uk-margin">
 		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
 
 		<div class="uk-form-controls">
-			<input class="uk-input" id="winix_url" type="text" name="to" value="[dir_without_slash][if item_is]/[item_url][end]">
+			<input class="uk-input" id="winix_url" type="text" name="to" value="[dir_without_slash][if request.is_item]/[item.url][end]">
 		</div>
 	</div>
 
@@ -22,7 +22,7 @@
 			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="preserveattr">{cp_preserve_attr}</label>
 		</div>
 
-		[if not item_is]
+		[if not request.is_item]
 
 			<div class="uk-margin-small-top">
 				<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="onlycontent">{cp_only_content}</label>
diff --git a/winixd/html/fun_createthread.html b/winixd/html/fun_createthread.html
index 63da5b6..e82fceb 100644
--- a/winixd/html/fun_createthread.html
+++ b/winixd/html/fun_createthread.html
@@ -8,7 +8,7 @@
 	<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]">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]">
 		</div>
 	</div>
 	
@@ -16,7 +16,7 @@
 		<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]">
+				<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item.url]">
 			</div>
 		</div>
 	[end]
diff --git a/winixd/html/fun_createticket.html b/winixd/html/fun_createticket.html
index c1bd887..0fa9fc8 100644
--- a/winixd/html/fun_createticket.html
+++ b/winixd/html/fun_createticket.html
@@ -2,19 +2,19 @@
 
 [# this template is used in fun_editticket.html as well]
 
-[if item_is]<h1>{edit_ticket_header}</h1>[else]<h1>{create_ticket_header}</h1>[end]
+[if request.is_item]<h1>{edit_ticket_header}</h1>[else]<h1>{create_ticket_header}</h1>[end]
 
 
 
 
 
-<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/editticket[else]createticket[end]" enctype="multipart/form-data">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/editticket[else]createticket[end]" enctype="multipart/form-data">
 
 
 <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]">
+		<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]">
 	</div>
 </div>
 
@@ -148,7 +148,7 @@
 	<label for="winix_content_id">{form_emacs_content_ticket}</label>
 
 	<div class="uk-form-controls">
-		<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent">[item_content]</textarea>
+		<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent">[item.content.content_raw]</textarea>
 	</div>
 </div>
 
@@ -158,11 +158,11 @@
 
 	<div class="uk-form-controls">
 		<select class="uk-select" id="winix_content_type_id" name="contenttype">
-			<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]
-			[if user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
-			[if user_can_use_other]<option[if item_content_type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
+			<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]
+			[if user_can_use_bbcode]<option[if item.content.type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
+			[if user_can_use_other]<option[if item.content.type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
 		</select>
 	</div>
 </div>
@@ -193,7 +193,7 @@
 [end]
 
 <div class="uk-margin">
-	<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
+	<input class="uk-button uk-button-primary" type="submit" value="[if request.is_item]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
 </div>
 
 
diff --git a/winixd/html/fun_emacs.html b/winixd/html/fun_emacs.html
index 9cc60f0..9bd6ca7 100644
--- a/winixd/html/fun_emacs.html
+++ b/winixd/html/fun_emacs.html
@@ -1,22 +1,22 @@
 <div class="winix">
 
-[if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
+[if request.is_item]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
 
-<form class="uk-form-stacked" 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 request.is_item][item.url]/[end]emacs">
 
 	<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]>
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]" [if not request.is_item]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]">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item.url]">
 		</div>
 	</div>
 	
@@ -26,7 +26,7 @@
 		<div class="uk-margin">
 			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
 			<div class="uk-form-controls">
-				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item.guest_name]">
 			</div>
 		</div>
 		
@@ -47,7 +47,7 @@
 	[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]">
+		<input class="uk-button uk-button-primary" type="submit" value="[if request.is_item]{change}[else]{add}[end]">
 	</div>
 
 </form>
diff --git a/winixd/html/fun_emacs_post.html b/winixd/html/fun_emacs_post.html
index ea682d6..9f598e3 100644
--- a/winixd/html/fun_emacs_post.html
+++ b/winixd/html/fun_emacs_post.html
@@ -11,7 +11,7 @@
 
 <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>
+	<textarea class="uk-textarea" [if request.is_item]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.content_raw]</textarea>
 </div>
 </div>
 
@@ -19,11 +19,11 @@
 <div class="uk-margin">
 <label class="uk-form-label" for="winix_contenttype_id">{form_emacs_content_type}</label>
 <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]
-	[if user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
-	[if user_can_use_other]<option[if item_content_type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
+	<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]
+	[if user_can_use_bbcode]<option[if item.content.type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
+	[if user_can_use_other]<option[if item.content.type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
 </select>
 </div>
 
diff --git a/winixd/html/fun_env.html b/winixd/html/fun_env.html
index 090ec35..d95cd22 100644
--- a/winixd/html/fun_env.html
+++ b/winixd/html/fun_env.html
@@ -5,7 +5,7 @@
 
 [if user_super_user]
 
-	<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
+	<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]env[if winix_function_param_is "a"]/a[end]">
 
 		<div class="uk-margin">
 			<label class="uk-form-label" for="winix_env_user_select">
@@ -42,7 +42,7 @@
 
 
 
-<form class="uk-margin-medium uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
+<form class="uk-margin-medium uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]env[if winix_function_param_is "a"]/a[end]">
 
 	<div class="uk-margin">
 		<div class="uk-form-controls">
diff --git a/winixd/html/fun_export.html b/winixd/html/fun_export.html
index 19db9f4..d5372eb 100644
--- a/winixd/html/fun_export.html
+++ b/winixd/html/fun_export.html
@@ -3,7 +3,7 @@
 <h1>{export_header}</h1>
 
 
-[if item_is]
+[if request.is_item]
 	<p>{export_transer_file_info}</p>
 [else]
 	<p>{export_transer_dir_info}</p>
@@ -11,7 +11,7 @@
 
 
 
-<form class="uk-form-stacked" action="[doc_base_url][dir][if item_is][item_url]/[end]export" method="post">
+<form class="uk-form-stacked" action="[doc_base_url][dir][if request.is_item][item.url]/[end]export" method="post">
 
 	<div class="uk-margin">
 		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="staticfilestoo">{export_checkbox_static_file_too}</label>
diff --git a/winixd/html/fun_imgcrop.html b/winixd/html/fun_imgcrop.html
index 83363ef..e68f30c 100644
--- a/winixd/html/fun_imgcrop.html
+++ b/winixd/html/fun_imgcrop.html
@@ -3,9 +3,9 @@
 
 <h1>{imgcrop_header}</h1>
 
-[if item_is]
+[if request.is_item]
 
-	[if any item_is item_filetype_is_image]
+	[if any request.is_item item_filetype_is_image]
 
 		[if winix_function_param_is "thumb"]
 			<p>{imgcrop_crop_only_thumb_info}</p>
@@ -21,9 +21,9 @@
 		var winix_jcrop;
 		</script>
 
-		<img src="[item_link][if winix_function_param_is "thumb"]/-/thumb[end]" alt="" id="winix_imgcropper">
+		<img src="[item.link][if winix_function_param_is "thumb"]/-/thumb[end]" alt="" id="winix_imgcropper">
 
-		<form id="winix_cropform" action="[item_link]/imgcrop[if winix_function_param_is "thumb"]/thumb[end][if winix_function_param_is "newthumb"]/newthumb[end]" method="post">
+		<form id="winix_cropform" action="[item.link]/imgcrop[if winix_function_param_is "thumb"]/thumb[end][if winix_function_param_is "newthumb"]/newthumb[end]" method="post">
 			<input type="hidden" name="cropxtop" value="" id="winix_idcropxtop">
 			<input type="hidden" name="cropytop" value="" id="winix_idcropytop">
 			<input type="hidden" name="cropwidth" value="" id="winix_idcropwidth">
diff --git a/winixd/html/fun_ipban.html b/winixd/html/fun_ipban.html
index fb2cbae..7405b0b 100644
--- a/winixd/html/fun_ipban.html
+++ b/winixd/html/fun_ipban.html
@@ -35,14 +35,14 @@
 		<td>[if ipban_tab_has_active_flag]{ipban_has_active_flag}[end]</td>
 		<td>[ipban_tab_last_used]</td>
 		<td>[ipban_tab_expires]</td>
-		<td><a class="uk-button uk-button-default uk-button-small" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
+		<td><a class="uk-button uk-button-default uk-button-small" href="[doc_base_url][dir][if request.is_item][item.url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
 	</tr>
 
 	[end]
 	</table>
 
 	<div class="uk-margin">
-		<a class="uk-button uk-button-default" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
+		<a class="uk-button uk-button-default" href="[doc_base_url][dir][if request.is_item][item.url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
 	</div>
 
 [else]
diff --git a/winixd/html/fun_ln.html b/winixd/html/fun_ln.html
index 885d1de..f0990ba 100644
--- a/winixd/html/fun_ln.html
+++ b/winixd/html/fun_ln.html
@@ -21,7 +21,7 @@
 		<label class="uk-form-label" for="winix_link_to">{ln_to}</label>
 
 		<div class="uk-form-controls">
-			<input class="uk-input" id="winix_link_to" type="text" name="linkto" value="[dir][if item_is][item_url][end]">
+			<input class="uk-input" id="winix_link_to" type="text" name="linkto" value="[dir][if request.is_item][item.url][end]">
 		</div>
 	</div>
 
diff --git a/winixd/html/fun_locale.html b/winixd/html/fun_locale.html
index 70d6325..2bba8be 100644
--- a/winixd/html/fun_locale.html
+++ b/winixd/html/fun_locale.html
@@ -9,7 +9,7 @@
 [end]
 
 
-<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]locale">
 	<div class="uk-margin">
 		<label class="uk-form-label" for="winix_locale_select">{locale_select}:</label>
 
diff --git a/winixd/html/fun_login.html b/winixd/html/fun_login.html
index 74d516d..0820d4c 100644
--- a/winixd/html/fun_login.html
+++ b/winixd/html/fun_login.html
@@ -9,7 +9,7 @@
 		</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-width-small">{login_logout_button}</a>
+			<a href="[doc_base_url][if dir_can_read_exec][dir][if any request.is_item item_can_read][item.url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-width-small">{login_logout_button}</a>
 		</div>
 	</div>
 [else]
diff --git a/winixd/html/fun_ls.html b/winixd/html/fun_ls.html
index 2f28e35..bc00405 100644
--- a/winixd/html/fun_ls.html
+++ b/winixd/html/fun_ls.html
@@ -142,7 +142,7 @@
 	
 		[#!! improve me: may it would be better to not use a list here?]
 		<ul class="uk-list uk-list-disc uk-list-collapse">
-			<li><a href="[doc_base_url][dir][item_url]">[item_url]</a></li>
+			<li><a href="[doc_base_url][dir][item.url]">[item.url]</a></li>
 		</ul>
 
 	[end]
diff --git a/winixd/html/fun_meta.html b/winixd/html/fun_meta.html
index e94a4fa..9ac3d50 100644
--- a/winixd/html/fun_meta.html
+++ b/winixd/html/fun_meta.html
@@ -9,18 +9,18 @@
 </h1>
 
 
-<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]meta[if winix_function_param_is "a"]/a[end]">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]meta[if winix_function_param_is "a"]/a[end]">
 
 	<div class="uk-margin">
 		<label class="uk-form-label" for="winix_meta_textarea">
 		[if winix_function_param_is "a"]
-			[if item_is]
+			[if request.is_item]
 				{meta_admin_for_page}:
 			[else]
 				{meta_admin_for_dir}:
 			[end]
 		[else]
-			[if item_is]
+			[if request.is_item]
 				{meta_for_page}:
 			[else]
 				{meta_for_dir}:
@@ -28,12 +28,12 @@
 		[end]
 
 		[# !! IMPROVE ME give some message if there is a root directory]
-		[item_url]
+		[item.url]
 
 		</label>
 
 		<div class="uk-form-controls">
-			<textarea class="uk-textarea" id="winix_meta_textarea" rows="20" name="itemmeta">[if winix_function_param_is "a"][if item_is][item_admin_meta_str][else][dir_last_admin_meta_str][end][else][if item_is][item_meta_str][else][dir_last_meta_str][end][end]</textarea>
+			<textarea class="uk-textarea" id="winix_meta_textarea" rows="20" name="itemmeta">[if winix_function_param_is "a"][if request.is_item][item_admin_meta_str][else][dir_last_admin_meta_str][end][else][if request.is_item][item_meta_str][else][dir_last_meta_str][end][end]</textarea>
 		</div>
 	</div>
 
diff --git a/winixd/html/fun_mv.html b/winixd/html/fun_mv.html
index b05f5a1..b60ab73 100644
--- a/winixd/html/fun_mv.html
+++ b/winixd/html/fun_mv.html
@@ -3,22 +3,22 @@
 <h1>{mv_header}</h1>
 
 <p>
-	[if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir_without_slash][end]
+	[if request.is_item]{mv_page} [item.url]:[else]{mv_dir} [dir_without_slash][end]
 </p>
 
 
-<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]mv">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]mv">
 
 	<div class="uk-margin">
 		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
 
 		<div class="uk-form-controls">
-			<input class="uk-input" id="winix_url" type="text" name="dst_path" value="[dir_without_slash][if item_is]/[item_url][end]">
+			<input class="uk-input" id="winix_url" type="text" name="dst_path" value="[dir_without_slash][if request.is_item]/[item.url][end]">
 		</div>
 	</div>
 	
 	
-	[if not item_is]
+	[if not request.is_item]
 	<div class="uk-margin">
 		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="c"[if winix_function_param_is "c"] checked="checked"[end]>{mv_only_content}</label>
 	</div>
diff --git a/winixd/html/fun_nicedit.html b/winixd/html/fun_nicedit.html
index 5f22870..fb734bd 100644
--- a/winixd/html/fun_nicedit.html
+++ b/winixd/html/fun_nicedit.html
@@ -1,22 +1,22 @@
 <div class="winix">
 
-[if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
+[if request.is_item]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
-<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]nicedit">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]nicedit">
 
 	[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]>
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]" [if not request.is_item]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]">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item.url]">
 		</div>
 	</div>
 	[end]
@@ -27,7 +27,7 @@
 		[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
 		<div class="uk-form-controls">
-			<textarea class="uk-textarea" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent" id="winix_nicedit">[item_content]</textarea>
+			<textarea class="uk-textarea" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent" id="winix_nicedit">[item.content.content_raw]</textarea>
 		</div>
 	</div>
 	
@@ -63,7 +63,7 @@
 	[end]
 	
 	<div class="uk-margin">
-		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+		<input class="uk-button uk-button-primary" type="submit" value="[if request.is_item]{change}[else]{add}[end]">
 	</div>
 
 </form>
diff --git a/winixd/html/fun_priv.html b/winixd/html/fun_priv.html
index 2dfd171..dc7468d 100644
--- a/winixd/html/fun_priv.html
+++ b/winixd/html/fun_priv.html
@@ -11,7 +11,7 @@
 
 [if not [winix_function_param_is "r"]]
 
-<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end][winix_function]">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end][winix_function]">
 	
 	[if priv_show_form_chown]
 
diff --git a/winixd/html/fun_reply.html b/winixd/html/fun_reply.html
index 63fec65..94d07a9 100644
--- a/winixd/html/fun_reply.html
+++ b/winixd/html/fun_reply.html
@@ -3,22 +3,22 @@
 <h1>{thread_header_reply}</h1>
 
 
-[# it would be better to have to 'item' objects: one for item_url and the other for item_content]
+[# it would be better to have two 'item' objects: one for item.url and the other for item_content]
 [# this will be added when ezc will have its own objects templates]
-<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][item_url]/reply" [if winix_has_htmx]hx-post="[doc_base_url][dir][item_url]/reply/scrolldown"[end]>
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][item.url]/reply" [if winix_has_htmx]hx-post="[doc_base_url][dir][item.url]/reply/scrolldown"[end]>
 
 	[if 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]>
+				<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]" [if not request.is_item]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]">
+				<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item.url]">
 			</div>
 		</div>
 	[end]
@@ -28,7 +28,7 @@
 		[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
 
 		<div class="uk-form-controls">
-			<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent">[item_content]</textarea>
+			<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent">[item.content.content_raw]</textarea>
 		</div>
 	</div>
 
@@ -50,7 +50,7 @@
 		<div class="uk-margin">
 			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
 			<div class="uk-form-controls">
-				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item.content.guest_name]">
 			</div>
 		</div>
 
diff --git a/winixd/html/fun_rm.html b/winixd/html/fun_rm.html
index d11f818..af7fee3 100644
--- a/winixd/html/fun_rm.html
+++ b/winixd/html/fun_rm.html
@@ -3,12 +3,12 @@
 <h1>{rm_header}</h1>
 
 <p>
-[if item_is]
+[if request.is_item]
 
 	[if item_type_is_symlink]
-		{rm_symlink}: [dir][item_url]
+		{rm_symlink}: [dir][item.url]
 	[else]
-		{rm_file}: [dir][item_url]
+		{rm_file}: [dir][item.url]
 	[end]
 	
 [else]
@@ -25,9 +25,9 @@
 
 
 
-<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rm[if not item_is]/r[end]">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]rm[if not request.is_item]/r[end]">
 	
-	[if not item_is]
+	[if not request.is_item]
 		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="c" [if winix_function_param_is "c"]checked="checked"[end]>{rm_only_content}</label>
 	[end]
 
diff --git a/winixd/html/fun_rmuser.html b/winixd/html/fun_rmuser.html
index a15d859..9651c7f 100644
--- a/winixd/html/fun_rmuser.html
+++ b/winixd/html/fun_rmuser.html
@@ -4,7 +4,7 @@
 
 [if user_logged]
 
-	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rmuser">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]rmuser">
 
 		[if user_super_user]
 
diff --git a/winixd/html/fun_run.html b/winixd/html/fun_run.html
index 1c00cf1..4449bcb 100644
--- a/winixd/html/fun_run.html
+++ b/winixd/html/fun_run.html
@@ -1,10 +1,10 @@
-[if item_content_type_is "other"][item_run][else]
+[if item.content.type_is "other"][item.run][else]
 
 	<div>
 
 		[if false]
 		[if mount_page_arg_is "subject"]
-			<h1>[item_subject]</h1>
+			<h1>[item.subject]</h1>
 		[end]
 		
 		[if mount_page_arg_is "info"]
@@ -12,7 +12,7 @@
 		[end]
 		[end]
 		
-		[item_run]
+		[item.execute]
 		
 	</div>
 	
diff --git a/winixd/html/fun_seo.html b/winixd/html/fun_seo.html
index 3b07eb6..4fa9934 100644
--- a/winixd/html/fun_seo.html
+++ b/winixd/html/fun_seo.html
@@ -3,12 +3,12 @@
 <h1>{seo_title}</h1>
 
 
-<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]seo">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]seo">
 	
 	<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]" autofocus>
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]" autofocus>
 		</div>
 	</div>
 
diff --git a/winixd/html/fun_sort.html b/winixd/html/fun_sort.html
index e17c22c..3d8f38d 100644
--- a/winixd/html/fun_sort.html
+++ b/winixd/html/fun_sort.html
@@ -3,9 +3,9 @@
 <h1>{sort_header}</h1>
 
 
-[if item_is]
+[if request.is_item]
 
-	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir][item_url]/sort" method="post">
+	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir][item.url]/sort" method="post">
 
 		<div class="uk-margin">
 			<label class="uk-form-label" for="winix_sort_index">{sort_current_sortindex}</label>
@@ -44,7 +44,7 @@
 				[# is it correct? may give this 'if' only to /-/thumb param? ]
 				[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
 
-				[item_tab_url][if item_tab_type_is_dir]/[end] [if not [is item_tab_subject ""]]<span class="uk-text-meta">({sort_item_subject}: [item_tab_subject])</span>[end]
+				[item_tab_url][if item_tab_type_is_dir]/[end] [if not [is item_tab_subject ""]]<span class="uk-text-meta">({sort_item.subject}: [item_tab_subject])</span>[end]
 			</li>
 		[end]
 		</ul>
diff --git a/winixd/html/fun_subject.html b/winixd/html/fun_subject.html
index 3325521..af976e5 100644
--- a/winixd/html/fun_subject.html
+++ b/winixd/html/fun_subject.html
@@ -3,12 +3,12 @@
 <h1>{subject_header}</h1>
 
 
-<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]subject">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]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="[if item_is][item_subject][else][dir_last_subject][end]">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[if request.is_item][item.subject][else][dir_last_subject][end]">
 		</div>
 	</div>
 
diff --git a/winixd/html/fun_template.html b/winixd/html/fun_template.html
index 578598a..43ed106 100644
--- a/winixd/html/fun_template.html
+++ b/winixd/html/fun_template.html
@@ -5,7 +5,7 @@
 
 <p>
 
-[if item_is]
+[if request.is_item]
 
 	{template_info_file}:
 	
@@ -44,7 +44,7 @@
 
 
 
-<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if request.is_item][item.url]/[end]template">
 
 
 	<div class="uk-margin">
diff --git a/winixd/html/fun_thread.html b/winixd/html/fun_thread.html
index c327edd..5643c11 100644
--- a/winixd/html/fun_thread.html
+++ b/winixd/html/fun_thread.html
@@ -1,23 +1,23 @@
 <div class="winix winix-thread">
 
-[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h1>[end]
+[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h1>[end]
 [if false]
 [if mount_page_arg_is "info"][include "item_info.html"][end]
 [end]
 
 [if not [thread_mount_arg_is "sort_desc"]]
 	<div class="uk-margin">
-		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
-		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
+		[if item.has_write_access]<a class="uk-button uk-button-default uk-button-small" href="[item.link]/emacs" rel="nofollow">{edit}</a>[end]
+		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]
-		[item_print_content]
+		[item.content.print_content]
 	</div>
 [end]
 
 [if thread_mount_arg_is "sort_desc"]
 	[if thread_can_reply]
 		<div class="uk-margin">
-			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow" [if winix_has_htmx]hx-get="[doc_base_url][dir][item_url]/reply" hx-swap="outerHTML" hx-target="this"[end]>{thread_reply_in_this_thread}</a>
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item.url]/reply" rel="nofollow" [if winix_has_htmx]hx-get="[doc_base_url][dir][item.url]/reply" hx-swap="outerHTML" hx-target="this"[end]>{thread_reply_in_this_thread}</a>
 		</div>
 	[end]
 [end]
@@ -37,17 +37,17 @@
 
 [if thread_mount_arg_is "sort_desc"]
 	<div class="uk-margin">
-		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
-		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
+		[if item.has_write_access]<a class="uk-button uk-button-default uk-button-small" href="[item.link]/emacs" rel="nofollow">{edit}</a>[end]
+		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item.subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]
-		[item_print_content]
+		[item.content.print_content]
 	</div>
 [end]
 
 [if not [thread_mount_arg_is "sort_desc"]]
 	[if thread_can_reply]
 		<div class="uk-margin">
-			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow" [if winix_has_htmx]hx-get="[doc_base_url][dir][item_url]/reply" hx-swap="outerHTML" hx-target="this"[end]>{thread_reply_in_this_thread}</a>
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item.url]/reply" rel="nofollow" [if winix_has_htmx]hx-get="[doc_base_url][dir][item.url]/reply" hx-swap="outerHTML" hx-target="this"[end]>{thread_reply_in_this_thread}</a>
 		</div>
 	[end]
 [end]
diff --git a/winixd/html/fun_ticket.html b/winixd/html/fun_ticket.html
index cb51e34..9382944 100644
--- a/winixd/html/fun_ticket.html
+++ b/winixd/html/fun_ticket.html
@@ -1,12 +1,12 @@
 <div class="winix">
 
-[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="withinfo"[end]>[item_subject]</h1>[end]
+[if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="withinfo"[end]>[item.subject]</h1>[end]
 [if mount_page_arg_is "info"][include "item_info.html"][end]
 
 
 
 <div class="uk-section uk-section-muted uk-padding">
-	[if ticket_can_edit]<p class="winix_ticket_edit"><a href="[doc_base_url][dir][item_url]/editticket" rel="nofollow">\[{edit}\]</a></p>[end]
+	[if ticket_can_edit]<p class="winix_ticket_edit"><a href="[doc_base_url][dir][item.url]/editticket" rel="nofollow">\[{edit}\]</a></p>[end]
 	<table class="uk-table uk-table-small">
 		[for ticket_tab]
 		[if ticket_tab_has_value]
@@ -61,7 +61,7 @@
 
 	[if thread_can_reply]
 		<div class="uk-margin">
-			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item.url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
 		</div>
 	[end]
 
diff --git a/winixd/html/fun_timezone.html b/winixd/html/fun_timezone.html
index 303ade8..98ba8d5 100644
--- a/winixd/html/fun_timezone.html
+++ b/winixd/html/fun_timezone.html
@@ -9,7 +9,7 @@
 [end]
 
 
-<form class="uk-form-stacked" 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 request.is_item][item.url]/[end]timezone">
 	<div class="uk-margin">
 		<label class="uk-form-label" for="winix_timezone_select">{timezone_select}:</label>
 
diff --git a/winixd/html/fun_tinymce.html b/winixd/html/fun_tinymce.html
index d6abd0f..e01c59f 100644
--- a/winixd/html/fun_tinymce.html
+++ b/winixd/html/fun_tinymce.html
@@ -1,6 +1,6 @@
 <div class="winix">
 
-[if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
+[if request.is_item]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 <form class="uk-form-stacked">
 
@@ -8,14 +8,14 @@
 	<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]>
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]" [if not request.is_item]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]">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item.url]">
 		</div>
 	</div>
 	[end]
@@ -60,7 +60,7 @@
 		<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-function-path="[doc_base_url][dir][if request.is_item][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"
diff --git a/winixd/html/fun_upload.html b/winixd/html/fun_upload.html
index c7293ac..69d20ef 100644
--- a/winixd/html/fun_upload.html
+++ b/winixd/html/fun_upload.html
@@ -1,7 +1,7 @@
 
 
 [if winix_function_param_is "ckeditor_upload"]
-	<script type="text/javascript">window.parent.CKEDITOR.tools.callFunction([upload_ckeditor_funnum], '[item_link]');</script>
+	<script type="text/javascript">window.parent.CKEDITOR.tools.callFunction([upload_ckeditor_funnum], '[item.link]');</script>
 [end]
 
 
diff --git a/winixd/html/fun_vim.html b/winixd/html/fun_vim.html
index 96ad5b8..3ad211c 100644
--- a/winixd/html/fun_vim.html
+++ b/winixd/html/fun_vim.html
@@ -1,23 +1,23 @@
 <div class="winix">
 
-[if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
+[if request.is_item]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
-<form class="uk-form-stacked" 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 request.is_item][item.url]/[end]vim">
 
 
 	[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]>
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item.subject]" [if not request.is_item]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]">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item.url]">
 		</div>
 	</div>
 	[end]
@@ -29,7 +29,7 @@
 
 	
 		<div class="uk-form-controls">
-			<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
+			<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item.content.content_raw]</textarea>
 		</div>
 
 	</div>
@@ -61,7 +61,7 @@
 	[end]
 	
 	<div class="uk-form-controls">
-		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+		<input class="uk-button uk-button-primary" type="submit" value="[if request.is_item]{change}[else]{add}[end]">
 	</div>
 
 </form>
diff --git a/winixd/html/index_bottom_adder.html b/winixd/html/index_bottom_adder.html
index 72a6e76..4407bc4 100644
--- a/winixd/html/index_bottom_adder.html
+++ b/winixd/html/index_bottom_adder.html
@@ -6,7 +6,7 @@
 	[if winix_is_htmx_request]
 
 	
-	[out "content"]
+	[frame "content"]
 		<script>
 				
 		function winix_css_download_by_index(css_files, index, callback)
@@ -74,7 +74,7 @@
 	
 	
 	[if winix_function_is "emacs"]
-	[out "content"]
+	[frame "content"]
 
 		<style>
 		.CodeMirror-matchingtag \{
@@ -148,7 +148,7 @@
 
 
 	[if winix_function_is "ckeditor"]
-	[out "content"]
+	[frame "content"]
 
 		[# what about winix_has_jquery?]
 		
diff --git a/winixd/html/index_head_adder.html b/winixd/html/index_head_adder.html
index 84ad593..388df94 100644
--- a/winixd/html/index_head_adder.html
+++ b/winixd/html/index_head_adder.html
@@ -293,7 +293,7 @@ cm.save()
 
 
 [if winix_function_is "sort"]
-	[if not item_is]
+	[if not request.is_item]
 	<script type="text/javascript" src="[doc_base_url_common]/winix/winix_sort.js"></script>
 	[end]
 [end]
diff --git a/winixd/html/item_info.html b/winixd/html/item_info.html
index 6498def..e84500c 100644
--- a/winixd/html/item_info.html
+++ b/winixd/html/item_info.html
@@ -1,5 +1,5 @@
 <p class="uk-text-meta">
-	{added_by}: [item_user], [item_date_creation_nice][if not item_dates_equal], 
+	{added_by}: [item.content.display_user_name], [item_date_creation_nice][if not item_dates_equal], 
 		{last_modified}[if item_users_different] {by}: [item_modification_user],[else]:[end]
 		[item_date_modification_nice][end]
 </p>