rearrange content/init

diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php
index b02cce3ef16a8543badb09271f0a0b63d25b1636..d31de2cdda3cb04a7a2775d2e3925d5f674ba0c5 100644 (file)
--- a/src/Module/Notifications/Notify.php
+++ b/src/Module/Notifications/Notify.php
@@ -18,23 +18,6 @@ class Notify extends BaseModule
                if (!local_user()) {
                        throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.'));
                }
-
-               $a = self::getApp();
-
-               // @TODO: Replace with parameter from router
-               if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
-                       $notificationsManager = new NotificationsManager();
-                       // @TODO: Replace with parameter from router
-                       $note = $notificationsManager->getByID($a->argv[2]);
-                       if (!empty($note)) {
-                               $notificationsManager->setSeen($note);
-                               if (!empty($note['link'])) {
-                                       System::externalRedirect($note['link']);
-                               }
-                       }
-
-                       $a->internalRedirect();
-               }
        }
 
        public static function rawContent()
@@ -55,7 +38,7 @@ class Notify extends BaseModule
        }
 
        /**
-        * Redirect to the notifications main page
+        * Redirect to the notifications main page or to the url for the chosen notify
         *
         * @return string|void
         * @throws HTTPException\InternalServerErrorException
@@ -64,6 +47,21 @@ class Notify extends BaseModule
        {
                $a = self::getApp();
 
+               // @TODO: Replace with parameter from router
+               if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
+                       $notificationsManager = new NotificationsManager();
+                       // @TODO: Replace with parameter from router
+                       $note = $notificationsManager->getByID($a->argv[2]);
+                       if (!empty($note)) {
+                               $notificationsManager->setSeen($note);
+                               if (!empty($note['link'])) {
+                                       System::externalRedirect($note['link']);
+                               }
+                       }
+
+                       $a->internalRedirect();
+               }
+
                // @TODO: Replace with parameter from router
                $a->internalRedirect('notifications/system');
        }