diff --git a/appinfo/info.xml b/appinfo/info.xml index 64b103334ad414ffa2518f7ef7ffdcd67511b0ad..f948d7d64bed5ec0a419405ff7bb4b7f9eebf43c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Murena dashboard Murena Cloud Dashboard - 1.4.0 + 1.4.1 agpl Murena EcloudDashboard diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index e5156dfc1df68468c77d5334417e53ba8514ea69..c81441fa6cfe8147d184e087bdadc96add6a26a5 100755 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -20,6 +20,8 @@ class PageController extends Controller { /** @var IUserSession */ private $userSession; + private $util; + public function __construct($appName, IRequest $request, IInitialState $initialState, IConfig $config, IUserSession $userSession, Util $util) { $this->initialState = $initialState; $this->config = $config; diff --git a/lib/Util.php b/lib/Util.php index 13839c088656ae95a831a656fc2abc39964d3e27..8fb2cb51c3989f884b4442794877f5c26158e2fa 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -28,7 +28,7 @@ class Util { /** @var IUserSession */ private $userSession; - private const DEFAULT_ORDER = array("/apps/files/", "/apps/rainloop/", "/apps/contacts/", "/apps/calendar/", "/apps/notes/", "/apps/tasks/", "/apps/photos/"); + private const DEFAULT_ORDER = array("/apps/files/", "/apps/snappymail/", "/apps/contacts/", "/apps/calendar/", "/apps/notes/", "/apps/tasks/", "/apps/photos/"); public function __construct( IConfig $config, INavigationManager $navigationManager, @@ -83,21 +83,9 @@ class Util { $order_raw = !$order_raw ? $this->config->getUserValue($this->userId, 'apporder', 'order') : $order_raw; // If order raw is still empty, return empty array if (!$order_raw) { - $order = self::DEFAULT_ORDER; - } else { - $order = json_decode($order_raw); + return self::DEFAULT_ORDER; } - - $isBeta = $this->isBetaUser(); - // Replace rainloop entry with snappymail at same position - if ($isBeta && $this->appManager->isEnabledForUser("snappymail")) { - if (array_keys($order, '/apps/snappymail/')) { - unset($order['/apps/rainloop/']); - } else { - $order[array_search('/apps/rainloop/', $order)] = '/apps/snappymail/'; - } - } - return $order; + return json_decode($order_raw); } public function getAppEntries() { $entries = array_values($this->navigationManager->getAll()); @@ -110,10 +98,6 @@ class Util { $betaGroupName = $this->config->getSystemValue("beta_group_name"); $isBeta = $this->isBetaUser(); foreach ($entries as &$entry) { - // skip rainloop entry if snappymail is enabled - if ($entry["id"] === "rainloop" && $isBeta && $this->appManager->isEnabledForUser("snappymail")) { - continue; - } if (strpos($entry["id"], "external_index") !== 0) { $entry["style"] = ""; $entry["target"] = ""; diff --git a/package.json b/package.json index 411b66582686599c2dcb6ad064577da091378378..059c6cf39e252fc2de12f969bfb522cc10cc8b36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecloud-dashboard", - "version": "1.0.1", + "version": "1.4.1", "private": true, "description": "Place this app in **nextcloud/custom_apps/**", "main": "js/main.js",