Skip to content

Remove deprecations #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luke- merged 1 commit into from
Feb 27, 2026
Merged

Remove deprecations #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Events.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace humhub\modules\twofa;

use humhub\components\Controller;
use humhub\helpers\ControllerHelper;
use humhub\modules\admin\controllers\UserController as AdminUserController;
use humhub\modules\admin\permissions\ManageUsers;
use humhub\modules\twofa\events\BeforeCheck;
Expand All @@ -18,6 +19,7 @@
use humhub\modules\user\controllers\AuthController;
use humhub\modules\user\events\UserEvent;
use humhub\modules\user\widgets\AccountMenu;
use humhub\modules\user\widgets\AccountSettingsMenu;
use Yii;

class Events
Expand Down Expand Up @@ -118,14 +120,17 @@ public static function onProfileSettingMenuInit($event)
}

$menuRoute = explode('/', trim(TwofaUrl::ROUTE_USER_SETTINGS, '/'));
$isActiveMenu = MenuLink::isActiveState($menuRoute[0], $menuRoute[1]);
$isActiveMenu = ControllerHelper::isActivePath($menuRoute[0], $menuRoute[1]);

$event->sender->addItem([
/* @var AccountSettingsMenu $menu */
$menu = $event->sender;

$menu->addEntry(new MenuLink([
'label' => Yii::t('TwofaModule.base', 'Two-Factor Authentication'),
'url' => Yii::$app->user->identity->createUrl(TwofaUrl::ROUTE_USER_SETTINGS),
'isActive' => $isActiveMenu,
'sortOrder' => 300,
]);
]));

if ($isActiveMenu) {
AccountMenu::markAsActive('account-settings-settings');
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changelog
- Enh #86: Improved Module Test GitHub Actions
- Enh #87: Implemented `module-coding-standards`
- Fix #90: Use `MailStyleHelper` for safe email inline styling
- Fix #98: Remove deprecations

1.2.0 (August 27, 2025)
-----------------------
Expand Down
2 changes: 1 addition & 1 deletion drivers/BaseDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function renderUserSettingsFile($params = [])
], $params);

echo '<div data-driver-fields="' . static::class . '"'
. ($params['activeDriverClassName'] == static::class ? '' : ' style="display:none"') . '>';
. ($params['activeDriverClassName'] == static::class ? '' : ' class="d-none"') . '>';

echo $this->renderFile($params);

Expand Down
4 changes: 2 additions & 2 deletions views/config/module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<?php $form = ActiveForm::begin(['id' => 'configure-form']); ?>

<div id="disabledDriversInfo"
class="alert alert-warning"<?= empty($model->enabledDrivers) ? '' : ' style="display:none"' ?>>
<i class="fa fa-info-circle"></i>
class="alert alert-warning<?= empty($model->enabledDrivers) ? '' : ' d-none' ?>">
<i class="fa fa-info-circle" aria-hidden="true"></i>
<?= Yii::t('TwofaModule.base', 'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.', [
'defaultDriverName' => $defaultDriverName
]) ?>
Expand Down
6 changes: 3 additions & 3 deletions views/config/userGoogleAuthenticator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

use humhub\modules\twofa\drivers\GoogleAuthenticatorDriver;
use humhub\modules\twofa\models\GoogleAuthenticatorUserSettings;
use humhub\widgets\bootstrap\Button;
use humhub\widgets\bootstrap\Link;
use humhub\widgets\form\ActiveForm;

/* @var $driver GoogleAuthenticatorDriver */
Expand All @@ -20,13 +20,13 @@
<?= $driver->getQrCodeSecretKeyFile(['requirePinCode' => $requirePinCode]) ?>
</div>

<div id="twofaGoogleAuthPinCode"<?= $requirePinCode ? '' : ' style="display:none"' ?>>
<div id="twofaGoogleAuthPinCode"<?= $requirePinCode ? '' : ' class="d-none"' ?>>
<?= $form->field($model, 'pinCode') ?>
<?= $form->field($model, 'changeSecretCode')->hiddenInput()->label(false) ?>
</div>

<div class="mb-3">
<?= Button::asLink(Yii::t('TwofaModule.base', 'Request new code'))
<?= Link::to(Yii::t('TwofaModule.base', 'Request new code'))
->icon('fa-qrcode')
->right()
->action('twofa.callDriverAction', Yii::$app->user->identity->createUrl('/twofa/user-settings/driver-action'))
Expand Down