dovecot-2.2: pop3: Added %{deleted_bytes} variable to pop3_logou...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/06351f47a15c
changeset: 18979:06351f47a15c
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 19 14:33:09 2015 +0300
description:
pop3: Added %{deleted_bytes} variable to pop3_logout_format

diffstat:

 doc/example-config/conf.d/20-pop3.conf |  1 +
 src/pop3/pop3-client.c                 |  3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diffs (31 lines):

diff -r ff9a9ffcd2af -r 06351f47a15c doc/example-config/conf.d/20-pop3.conf
--- a/doc/example-config/conf.d/20-pop3.conf	Wed Aug 19 14:30:09 2015 +0300
+++ b/doc/example-config/conf.d/20-pop3.conf	Wed Aug 19 14:33:09 2015 +0300
@@ -73,6 +73,7 @@
 #  %r - number of RETR commands
 #  %b - number of bytes sent to client as a result of RETR command
 #  %d - number of deleted messages
+#  %{deleted_bytes} - number of bytes in deleted messages
 #  %m - number of messages (before deletion)
 #  %s - mailbox size in bytes (before deletion)
 #  %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
diff -r ff9a9ffcd2af -r 06351f47a15c src/pop3/pop3-client.c
--- a/src/pop3/pop3-client.c	Wed Aug 19 14:30:09 2015 +0300
+++ b/src/pop3/pop3-client.c	Wed Aug 19 14:33:09 2015 +0300
@@ -523,6 +523,7 @@
 		{ 'o', NULL, "output" },
 		{ 'u', NULL, "uidl_change" },
 		{ '\0', NULL, "session" },
+		{ 'd', NULL, "deleted_bytes" },
 		{ '\0', NULL, NULL }
 	};
 	struct var_expand_table *tab;
@@ -547,6 +548,8 @@
 	else
 		tab[9].value = "";
 	tab[10].value = client->session_id;
+	tab[11].value = client->delete_success ?
+		dec2str(client->deleted_size) : 0;
 
 	str = t_str_new(128);
 	var_expand(str, client->set->pop3_logout_format, tab);