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: $pg .= '#'; $pg .= 'List'; $pg .= 'ID'; - $pg .= 'User'; + $pg .= 'IDName'; + $pg .= 'User'; $pg .= 'IP'; $pg .= 'IPc'; $pg .= 'Hash'; @@ -131,7 +132,8 @@ What: $pg .= "$j"; $pg .= ''.$ans['list:'.$i].''; $pg .= ''.$ans['id:'.$i].''; - $pg .= ''.$ans['user:'.$i].''; + $pg .= ''.$ans['idname:'.$i].''; + $pg .= ''.$ans['user:'.$i].''; $pg .= ''.isans($ans, 'ip:'.$i).''; $pg .= ''.isans($ans, 'ipc:'.$i).''; $pg .= ''.isans($ans, 'hash:'.$i).''; @@ -151,7 +153,7 @@ What: $pg .= '#'; $pg .= 'Key'; $pg .= 'ID'; - $pg .= 'IDName'; + $pg .= 'IDName'; $pg .= 'Hour UTC'; $pg .= 'Count'; $pg .= "\n"; @@ -172,7 +174,7 @@ What: $pg .= "$j"; $pg .= ''.$ans['key:'.$i].''; $pg .= ''.$ans['id:'.$i].''; - $pg .= ''.$ans['idname:'.$i].''; + $pg .= ''.$ans['idname:'.$i].''; $pg .= ''.gmdate('j/M H:i:s',$ans['hour:'.$i]*3600).''; $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);