refs #4179 save notifications until delivered

matomo-org · Oct 27, 2013 · c877300 · c877300
1 parent 442185c
commit c877300
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/core/Notification/Manager.php b/core/Notification/Manager.php
@@ -34,17 +34,13 @@ public static function notify($id, Notification $notification)
     {
         self::checkId($id);
 
-        $session = static::getSession();
+        $session      = static::getSession();
         $session->$id = $notification;
-
-        if (Notification::TYPE_PERSISTENT != $notification->type) {
-            $session->setExpirationHops(1, $id);
-        }
     }
 
     public static function getAllNotificationsToDisplay()
     {
-        $session = static::getSession();
+        $session       = static::getSession();
         $notifications = $session->getIterator();
 
         $notifications->uasort(function ($n1, $n2) {
@@ -58,6 +54,17 @@ public static function getAllNotificationsToDisplay()
         return $notifications;
     }
 
+    public static function cancelAllNonPersistent()
+    {
+        $session = static::getSession();
+
+        foreach ($session->getIterator() as $key => $notification) {
+            if (Notification::TYPE_PERSISTENT != $notification->type) {
+                unset($session->$key);
+            }
+        }
+    }
+
     /**
      * Cancel a previously registered (or persistent) notification.
      * @param $id

diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
@@ -491,6 +491,7 @@ protected function setGeneralVariablesView($view)
 
             $view->topMenu       = MenuTop::getInstance()->getMenu();
             $view->notifications = NotificationManager::getAllNotificationsToDisplay();
+            NotificationManager::cancelAllNonPersistent();
         } catch (Exception $e) {
             Piwik_ExitWithMessage($e->getMessage(), $e->getTraceAsString());
         }

diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
@@ -81,6 +81,7 @@ static public function setBasicVariablesAdminView(View $view)
 
         $view->topMenu = MenuTop::getInstance()->getMenu();
         $view->notifications = NotificationManager::getAllNotificationsToDisplay();
+        NotificationManager::cancelAllNonPersistent();
         $view->currentAdminMenuName = MenuAdmin::getInstance()->getCurrentAdminMenuName();
 
         $view->enableFrames = PiwikConfig::getInstance()->General['enable_framed_settings'];