From 68fe4fd301d2a7181da01ebc685ed11c2862bf1c Mon Sep 17 00:00:00 2001
From: kanoi <gitkanoi@k1k2.com>
Date: Tue, 22 Mar 2016 08:01:46 +1100
Subject: [PATCH] ckdb/ckp - add the idname to the web events list

---
 pool/page_events.php | 10 ++++++----
 src/ckdb.h           |  2 +-
 src/ckdb_cmd.c       |  5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pool/page_events.php b/pool/page_events.php
index 8f15bc18..b03a2b42 100644
--- a/pool/page_events.php
+++ b/pool/page_events.php
@@ -108,7 +108,8 @@ What: <input type=text name=what size=10 value='$wh'>
 	$pg .= '<td class=dr>#</td>';
 	$pg .= '<td class=dl>List</td>';
 	$pg .= '<td class=dr>ID</td>';
-	$pg .= '<td class=dr>User</td>';
+	$pg .= '<td class=dl>IDName</td>';
+	$pg .= '<td class=dl>User</td>';
 	$pg .= '<td class=dr>IP</td>';
 	$pg .= '<td class=dr>IPc</td>';
 	$pg .= '<td class=dr>Hash</td>';
@@ -131,7 +132,8 @@ What: <input type=text name=what size=10 value='$wh'>
 			$pg .= "<td class=dr>$j</td>";
 			$pg .= '<td class=dl>'.$ans['list:'.$i].'</td>';
 			$pg .= '<td class=dr>'.$ans['id:'.$i].'</td>';
-			$pg .= '<td class=dr>'.$ans['user:'.$i].'</td>';
+			$pg .= '<td class=dl>'.$ans['idname:'.$i].'</td>';
+			$pg .= '<td class=dl>'.$ans['user:'.$i].'</td>';
 			$pg .= '<td class=dr>'.isans($ans, 'ip:'.$i).'</td>';
 			$pg .= '<td class=dr>'.isans($ans, 'ipc:'.$i).'</td>';
 			$pg .= '<td class=dr>'.isans($ans, 'hash:'.$i).'</td>';
@@ -151,7 +153,7 @@ What: <input type=text name=what size=10 value='$wh'>
 	$pg .= '<td class=dr>#</td>';
 	$pg .= '<td class=dl>Key</td>';
 	$pg .= '<td class=dr>ID</td>';
-	$pg .= '<td class=dr>IDName</td>';
+	$pg .= '<td class=dl>IDName</td>';
 	$pg .= '<td class=dr>Hour UTC</td>';
 	$pg .= '<td class=dl>Count</td>';
 	$pg .= "</tr></thead>\n";
@@ -172,7 +174,7 @@ What: <input type=text name=what size=10 value='$wh'>
 			$pg .= "<td class=dr>$j</td>";
 			$pg .= '<td class=dl>'.$ans['key:'.$i].'</td>';
 			$pg .= '<td class=dr>'.$ans['id:'.$i].'</td>';
-			$pg .= '<td class=dr>'.$ans['idname:'.$i].'</td>';
+			$pg .= '<td class=dl>'.$ans['idname:'.$i].'</td>';
 			$pg .= '<td class=dr>'.gmdate('j/M H:i:s',$ans['hour:'.$i]*3600).'</td>';
 			$co = '';
 			for ($k = 0; $k < 60; $k++)
diff --git a/src/ckdb.h b/src/ckdb.h
index c3ababa0..9f1579a4 100644
--- a/src/ckdb.h
+++ b/src/ckdb.h
@@ -51,7 +51,7 @@
 
 #define DB_VLOCK "1"
 #define DB_VERSION "1.0.5"
-#define CKDB_VERSION DB_VERSION"-1.989"
+#define CKDB_VERSION DB_VERSION"-1.990"
 
 #define WHERE_FFL " - from %s %s() line %d"
 #define WHERE_FFL_HERE __FILE__, __func__, __LINE__
diff --git a/src/ckdb_cmd.c b/src/ckdb_cmd.c
index 45120afe..3c451657 100644
--- a/src/ckdb_cmd.c
+++ b/src/ckdb_cmd.c
@@ -7570,11 +7570,12 @@ static void event_tree(K_TREE *the_tree, char *list, char *reply, size_t siz,
 			snprintf(reply, siz, "list:%d=%s%c",
 				 *rows, list, FLDSEP);
 			APPEND_REALLOC(*buf, *off, *len, reply);
-
 			snprintf(reply, siz, "id:%d=%d%c",
 				 *rows, e->id, FLDSEP);
 			APPEND_REALLOC(*buf, *off, *len, reply);
-
+			snprintf(reply, siz, "idname:%d=%s%c",
+				 *rows, e_limits[e->id].name, FLDSEP);
+			APPEND_REALLOC(*buf, *off, *len, reply);
 			snprintf(reply, siz, "user:%d=%s%c",
 				 *rows, e->createby, FLDSEP);
 			APPEND_REALLOC(*buf, *off, *len, reply);