Merge pull request #7334 from piwik/anonymous_user_menu_fix

fix various issues with user menu.

4 files changed, 29 insertions, 11 deletions

diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php
index 311fa6dda1..7994979450 100644
--- a/plugins/CoreAdminHome/Menu.php
+++ b/plugins/CoreAdminHome/Menu.php
@@ -57,14 +57,16 @@ class Menu extends \Piwik\Plugin\Menu
 
     public function configureUserMenu(MenuUser $menu)
     {
-        $menu->addManageItem('CoreAdminHome_TrackingCode',
-            $this->urlForAction('trackingCodeGenerator'),
-            $order = 10);
+        if (!Piwik::isUserIsAnonymous()) {
+            $menu->addManageItem('CoreAdminHome_TrackingCode',
+                $this->urlForAction('trackingCodeGenerator'),
+                $order = 10);
 
-        if (SettingsManager::hasUserPluginsSettingsForCurrentUser()) {
-            $menu->addPersonalItem('CoreAdminHome_PluginSettings',
-                $this->urlForAction('userPluginSettings'),
-                $order = 15);
+            if (SettingsManager::hasUserPluginsSettingsForCurrentUser()) {
+                $menu->addPersonalItem('CoreAdminHome_PluginSettings',
+                    $this->urlForAction('userPluginSettings'),
+                    $order = 15);
+            }
         }
     }
 
diff --git a/plugins/CoreHome/Menu.php b/plugins/CoreHome/Menu.php
index 6881b689da..b2c239885e 100644
--- a/plugins/CoreHome/Menu.php
+++ b/plugins/CoreHome/Menu.php
@@ -12,6 +12,7 @@ use Piwik\Db;
 use Piwik\Menu\MenuTop;
 use Piwik\Menu\MenuUser;
 use Piwik\Piwik;
+use Piwik\Plugin;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 
 class Menu extends \Piwik\Plugin\Menu
@@ -25,7 +26,15 @@ class Menu extends \Piwik\Plugin\Menu
             $login = $user['alias'];
         }
 
-        $menu->addItem($login, null, array('module' => 'UsersManager', 'action' => 'userSettings'), 998);
+        if (Piwik::isUserIsAnonymous()) {
+            if (Plugin\Manager::getInstance()->isPluginActivated('Feedback')) {
+                $menu->addItem($login, null, array('module' => 'Feedback', 'action' => 'index'), 998);
+            } else {
+                $menu->addItem($login, null, array('module' => 'API', 'action' => 'listAllAPI'), 998);
+            }
+        } else {
+            $menu->addItem($login, null, array('module' => 'UsersManager', 'action' => 'userSettings'), 998);
+        }
 
         $module = $this->getLoginModule();
         if (Piwik::isUserIsAnonymous()) {
diff --git a/plugins/MobileMessaging/Menu.php b/plugins/MobileMessaging/Menu.php
index 4612c79d21..8a17e42517 100644
--- a/plugins/MobileMessaging/Menu.php
+++ b/plugins/MobileMessaging/Menu.php
@@ -23,6 +23,8 @@ class Menu extends \Piwik\Plugin\Menu
 
     public function configureUserMenu(MenuUser $menu)
     {
-        $menu->addPersonalItem('MobileMessaging_SettingsMenu', $this->urlForAction('userSettings'), $order = 12);
+        if (!Piwik::isUserIsAnonymous()) {
+            $menu->addPersonalItem('MobileMessaging_SettingsMenu', $this->urlForAction('userSettings'), $order = 12);
+        }
     }
 }
diff --git a/plugins/Morpheus/templates/user.twig b/plugins/Morpheus/templates/user.twig
index 8a1bb23976..4234f07296 100644
--- a/plugins/Morpheus/templates/user.twig
+++ b/plugins/Morpheus/templates/user.twig
@@ -5,8 +5,13 @@
 {% set bodyClass = postEvent('Template.bodyClass', 'admin') %}
 
 {% block body %}
-    {% set topMenuModule = 'UsersManager' %}
-    {% set topMenuAction = 'userSettings' %}
+    {% if userIsAnonymous %}
+        {% set topMenuModule = 'Feedback' %}
+        {% set topMenuAction = 'index' %}
+    {% else %}
+        {% set topMenuModule = 'UsersManager' %}
+        {% set topMenuAction = 'userSettings' %}
+    {% endif %}
     {{ parent() }}
 {% endblock %}