From: Timo Sirainen <tss@iki.fi>
Date: Wed, 19 Aug 2015 11:33:09 +0000 (+0300)
Subject: pop3: Added %{deleted_bytes} variable to pop3_logout_format
X-Git-Tag: 2.2.19.rc1~215
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb464f79a131e13bb1d10ef0c7640dd1496a86a6;p=thirdparty%2Fdovecot%2Fcore.git

pop3: Added %{deleted_bytes} variable to pop3_logout_format
---

diff --git a/doc/example-config/conf.d/20-pop3.conf b/doc/example-config/conf.d/20-pop3.conf
index 50470e901d..e0ba55229f 100644
--- a/doc/example-config/conf.d/20-pop3.conf
+++ b/doc/example-config/conf.d/20-pop3.conf
@@ -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 --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index 32f1fd8929..36d863b6bb 100644
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -523,6 +523,7 @@ static const char *client_stats(struct client *client)
 		{ '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 @@ static const char *client_stats(struct client *client)
 	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);