From 6367af34d0a9c2895dce6a1397a3cd510059b4db Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Wed, 18 Nov 2015 00:18:14 +0100
Subject: [PATCH] remove wrong output of tail item

---
 webcit/static/t/vcard/list/item.html |  9 +++++++--
 webcit/vcard_edit.c                  | 15 +--------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/webcit/static/t/vcard/list/item.html b/webcit/static/t/vcard/list/item.html
index 07d9f3304..864dbe294 100644
--- a/webcit/static/t/vcard/list/item.html
+++ b/webcit/static/t/vcard/list/item.html
@@ -1,5 +1,10 @@
-<??("COND:ITERATE:FIRSTN", 5)><?!("COND:ITERATE:ISMOD", 7, #"NAMESPERPAGE", 0)><?=("vcard_list_section_end")><??("X", 7)><??("X",5)>
+<??("COND:ITERATE:FIRSTN", 40)><?!("COND:ITERATE:ISMOD", 45, #"NAMESPERPAGE", 0)><!--y=<?ITERATE:N()>--><?=("vcard_list_section_end")><??("X", 40)><??("X", 45)>
 <?!("COND:ITERATE:ISMOD", 10, #"NAMESPERPAGE", 0)><?=("vcard_list_section_start")><??("X", 10)>
 <?!("COND:ITERATE:ISMOD", 20, 4, 0)> <?=("vcard_list_row_start")><??("X", 20)>
-<td><a href='readfwd?startmsg=<?VC:MSGNO()>?is_singlecard=1?maxmsgs=1?is_summary=0?alpha=<?BSTR("alpha")>'><?VC:ITEM(#"VC:.n.last", "X")> <?VC:ITEM(#"VC:.n.first", "X")><?VC:ITEM(#"VC:.n.middle", "X")>;<?VC:ITEM(#"VC:.n.prefix", "X")>;<?VC:ITEM(#"VC:.n.suffix", "X")></a></td>
+<td><!--X=<?ITERATE:N()>--><a href='readfwd?startmsg=<?VC:MSGNO()>?is_singlecard=1?maxmsgs=1?is_summary=0?alpha=<?BSTR("alpha")>'><?VC:ITEM(#"VC:.n.last", "X")> <?VC:ITEM(#"VC:.n.first", "X")><?VC:ITEM(#"VC:.n.middle", "X")>;<?VC:ITEM(#"VC:.n.prefix", "X")>;<?VC:ITEM(#"VC:.n.suffix", "X")></a></td>
+
 <??("COND:ITERATE:FIRSTN", 30)><?!("COND:ITERATE:ISMOD", 35, 4, 3)> <?=("vcard_list_row_end")><??("X", 35)><?!("X", 30)>
+<?!("COND:ITERATE:LASTN",  40)><??("COND:ITERATE:ISMOD", 45, 4, 3)> <?=("vcard_list_row_end")><??("X", 45)><?!("X", 40)>
+
+
+<?!("COND:ITERATE:LASTN",  40)><??("COND:ITERATE:ISMOD", 45, #"NAMESPERPAGE", 0)><!--z=<?ITERATE:N()>--><?=("vcard_list_section_end")><??("X", 45)><?!("X", 40)>
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 0807f4862..636992f22 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -1028,22 +1028,9 @@ void do_addrbook_view(vcardview_struct* VS) {
 
 	DoTemplate(HKEY("vcard_list"), WCC->WBuf, &SubTP);
 	UnStackContext(&SubTP);
-	/* Placeholders for empty columns at end */
-	if ((num_ab % 4) != 0) {
-		for (i=0; i<(4-(num_ab % 4)); ++i) {
-			do_template("vcard_list_cell_end");
-		}
-	}
-	
-	do_template("vcard_list_section_end");
-	end_tab((num_pages-1), num_pages);
-
-	begin_tab(num_pages, num_pages);
-	/* FIXME there ought to be something here */
-	end_tab(num_pages, num_pages);
-
 	DeleteHash(&headlines);
 	free(tablabels);
+	StrBufAppendBufPlain(WCC->WBuf, HKEY("</div>"), 0);/* closes: id=global */
 	wDumpContent(1);
 }
 
-- 
2.30.2