GC dangling compose data on logout in IMP

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index c5a013a..dba02fa 100644 (file)
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -145,6 +145,19 @@ class IMP_Application extends Horde_Registry_Application
         }
     }
 
+    /**
+     * Tasks to perform at logout.
+     */
+    public function logout()
+    {
+        /* Clean up dangling IMP_Compose objects. */
+        if (!empty($_SESSION['imp']['cache']['compose'])) {
+            foreach (array_keys($_SESSION['imp']['cache']['compose']) as $key) {
+                $GLOBALS['injector']->getInstance('IMP_Compose')->getOb($key)->destroy('cancel');
+            }
+        }
+    }
+
     /* Horde permissions. */
 
     /**

diff --git a/imp/lib/Injector/Factory/Compose.php b/imp/lib/Injector/Factory/Compose.php
index 571ddac..363a06b 100644 (file)
--- a/imp/lib/Injector/Factory/Compose.php
+++ b/imp/lib/Injector/Factory/Compose.php
@@ -89,10 +89,13 @@ class IMP_Injector_Factory_Compose
             case 'changed':
                 $val->changed = '';
                 $obs->overwrite($key, $val, false);
+
+                $_SESSION['imp']['cache']['compose'][$key] = 1;
                 break;
 
             case 'deleted':
                 $obs->prune($key);
+                unset($_SESSION['imp']['cache']['compose'][$key]);
                 break;
             }
         }