From 20615a402153a427b440422f29292010e978608a Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 8 Feb 2011 03:29:39 -0500
Subject: [PATCH] Add missing name and expiry info to :cookies list.

---
 common/modules/sanitizer.jsm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 4fe875f9..4e4945ea 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -497,10 +497,13 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
 
                         case "list":
                             modules.commandline.commandOutput(template.tabular(
-                                ["Host", "Session", "Path", "Value"], ["padding-right: 1em", "padding-right: 1em", "padding-right: 1em"],
+                                ["Host", "Expiry (UTC)", "Path", "Name", "Value"],
+                                ["padding-right: 1em", "padding-right: 1em", "padding-right: 1em", "max-width: 12em; overflow: hidden;", "padding-left: 1ex;"],
                                 ([c.host,
-                                  <span highlight={c.isSession ? "Enabled" : "Disabled"}>{c.isSession ? "session" : "persistent"}</span>,
+                                  c.isSession ? <span highlight="Enabled">session</span>
+                                              : (new Date(c.expiry * 1000).toJSON() || "Never").replace(/:\d\d\.000Z/, "").replace("T", " ").replace(/-/g, "/"),
                                   c.path,
+                                  c.name,
                                   c.value]
                                   for (c in Sanitizer.iterCookies(host)))));
                             return;