Update for HumHub 1.19

Author: yurabakhtin

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' => '<i class="fa fa-envelope"></i>',
-                    '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);
         }

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.

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

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": [

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;
 
 /**

widgets/ConversationView.php

@@ -9,7 +9,6 @@
 
 namespace humhub\modules\mail\widgets;
 
-use Yii;
 use humhub\widgets\JsWidget;
 use humhub\modules\mail\helpers\Url;
 

widgets/ManageTagsLink.php

@@ -33,7 +33,7 @@ public function run()
             return '';
         }
 
-        return Link::asLink($userList)->action('ui.modal.load', Url::toConversationUserList($this->message));
+        return Link::to($userList)->action('ui.modal.load', Url::toConversationUserList($this->message));
     }
 
     private function renderUserList(): string

widgets/Notifications.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')]]) ?>
 
         <small>
-            <?= ManageTagsLink::widget() ?>
+            <?= Link::to(Yii::t('MailModule.base', 'Manage Tags'), Url::toManageTags())
+                ->icon('gear')
+                ->right()
+                ->cssClass('manage-tags-link') ?>
         </small>
     </div>
     <?php ActiveForm::end() ?>