diff --git a/Events.php b/Events.php
index 1a4ab55..990c089 100644
--- a/Events.php
+++ b/Events.php
@@ -9,6 +9,7 @@
namespace humhub\modules\mail;
use humhub\commands\IntegrityController;
+use humhub\helpers\ControllerHelper;
use humhub\modules\mail\helpers\Url;
use humhub\modules\mail\models\Config;
use humhub\modules\mail\models\Message;
@@ -22,6 +23,7 @@
use humhub\modules\ui\menu\MenuLink;
use humhub\modules\user\widgets\HeaderControlsMenu;
use humhub\widgets\MetaSearchWidget;
+use humhub\widgets\TopMenu;
use Yii;
/**
@@ -156,16 +158,19 @@ public static function onTopMenuInit($event)
return;
}
+ /* @var TopMenu $menu */
+ $menu = $event->sender;
+
$module = Config::getModule();
// See https://github.com/humhub/humhub-modules-mail/issues/201
if (method_exists($module, 'hideInTopNav') && !$module->hideInTopNav()) {
- $event->sender->addItem([
+ $menu->addEntry(new MenuLink([
'label' => Yii::t('MailModule.base', 'Messages'),
'url' => Url::toMessenger(),
- 'icon' => '',
- 'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'mail'),
+ 'icon' => 'envelope',
+ 'isActive' => ControllerHelper::isActivePath('mail'),
'sortOrder' => 300,
- ]);
+ ]));
}
} catch (\Throwable $e) {
Yii::error($e);
@@ -179,7 +184,7 @@ public static function onNotificationAddonInit($event)
return;
}
- $event->sender->addWidget(NotificationInbox::className(), [], ['sortOrder' => 90]);
+ $event->sender->addWidget(NotificationInbox::class, [], ['sortOrder' => 90]);
} catch (\Throwable $e) {
Yii::error($e);
}
diff --git a/controllers/ConfigController.php b/controllers/ConfigController.php
index 64b34cd..629903c 100644
--- a/controllers/ConfigController.php
+++ b/controllers/ConfigController.php
@@ -8,9 +8,8 @@
namespace humhub\modules\mail\controllers;
-use Yii;
use humhub\modules\mail\models\Config;
-use humhub\models\Setting;
+use Yii;
/**
* ConfigController handles the configuration requests.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d49419b..a456f81 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
Changelog
=========
+3.4.0 (Unreleased)
+------------------
+- Enh #483: Update for HumHub 1.19
+
3.3.9 (Unreleased)
-----------------------
- Enh #68: Make "subject" optional
diff --git a/module.json b/module.json
index 8056954..6e55e9f 100644
--- a/module.json
+++ b/module.json
@@ -8,9 +8,9 @@
"messenger",
"communication"
],
- "version": "3.3.9",
+ "version": "3.4.0",
"humhub": {
- "minVersion": "1.18.0-beta.6"
+ "minVersion": "1.19"
},
"homepage": "https://github.com/humhub/mail",
"authors": [
diff --git a/widgets/ConversationStateBadge.php b/widgets/ConversationStateBadge.php
index 0cacb8f..4c64e42 100644
--- a/widgets/ConversationStateBadge.php
+++ b/widgets/ConversationStateBadge.php
@@ -12,7 +12,6 @@
use humhub\helpers\Html;
use humhub\modules\mail\models\AbstractMessageEntry;
use humhub\modules\mail\models\MessageEntry;
-use humhub\modules\user\models\User;
use Yii;
/**
diff --git a/widgets/ConversationView.php b/widgets/ConversationView.php
index 127ad7c..ce69bc6 100644
--- a/widgets/ConversationView.php
+++ b/widgets/ConversationView.php
@@ -9,7 +9,6 @@
namespace humhub\modules\mail\widgets;
-use Yii;
use humhub\widgets\JsWidget;
use humhub\modules\mail\helpers\Url;
diff --git a/widgets/ManageTagsLink.php b/widgets/ManageTagsLink.php
deleted file mode 100644
index c9b569d..0000000
--- a/widgets/ManageTagsLink.php
+++ /dev/null
@@ -1,20 +0,0 @@
-setType(static::TYPE_NONE)
- ->setText(Yii::t('MailModule.base', 'Manage Tags'))
- ->link(Url::toManageTags())
- ->icon('gear')->right()->cssClass('manage-tags-link');
- }
-
-}
diff --git a/widgets/Notifications.php b/widgets/Notifications.php
deleted file mode 100644
index fc4213d..0000000
--- a/widgets/Notifications.php
+++ /dev/null
@@ -1,12 +0,0 @@
-action('ui.modal.load', Url::toConversationUserList($this->message));
+ return Link::to($userList)->action('ui.modal.load', Url::toConversationUserList($this->message));
}
private function renderUserList(): string
diff --git a/widgets/views/inboxFilter.php b/widgets/views/inboxFilter.php
index 2158a88..72ef363 100644
--- a/widgets/views/inboxFilter.php
+++ b/widgets/views/inboxFilter.php
@@ -2,9 +2,9 @@
use humhub\components\View;
use humhub\helpers\Html;
+use humhub\modules\mail\helpers\Url;
use humhub\modules\mail\models\forms\InboxFilterForm;
use humhub\modules\mail\widgets\ConversationTagPicker;
-use humhub\modules\mail\widgets\ManageTagsLink;
use humhub\modules\ui\filter\widgets\PickerFilterInput;
use humhub\modules\ui\filter\widgets\TextFilterInput;
use humhub\modules\user\widgets\UserPickerField;
@@ -52,7 +52,10 @@
'pickerOptions' => ['id' => 'inbox-tag-picker', 'name' => 'tags', 'placeholder' => Yii::t('MailModule.base', 'Tags'), 'placeholderMore' => Yii::t('MailModule.base', 'Tags')]]) ?>
- = ManageTagsLink::widget() ?>
+ = Link::to(Yii::t('MailModule.base', 'Manage Tags'), Url::toManageTags())
+ ->icon('gear')
+ ->right()
+ ->cssClass('manage-tags-link') ?>