changed: templates/item.cpp to use last_item instead of item

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1178 e52654a7-88a9-db11-a3e9-0013d4bc506e

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();
 }