Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-03 03:46:30 +01:00
Code Issues Packages Projects Releases Activity

use login’s site_host functionality

Browse Source
This commit is contained in:
Andy Miller
2024-05-06 12:38:46 +01:00
parent d5eea54aca
commit 8cc7fb4393
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.10.46
## mm/dd/2024
1. [](#improved)
* Used Login's new `site_host` security setting for Admin password reset. Requires Login version `3.7.8+`
# v1.10.45 # v1.10.45
## 03/18/2024 ## 03/18/2024

2
blueprints.yaml
View File

@@ -17,7 +17,7 @@ license: MIT
dependencies: dependencies:
- { name: grav, version: '>=1.7.42' } - { name: grav, version: '>=1.7.42' }
- { name: form, version: '>=6.0.1' } - { name: form, version: '>=6.0.1' }
- { name: login, version: '>=3.7.0' } - { name: login, version: '>=3.7.8' }
- { name: email, version: '>=3.1.6' } - { name: email, version: '>=3.1.6' }
- { name: flex-objects, version: '>=1.2.0' } - { name: flex-objects, version: '>=1.2.0' }

10
classes/plugin/Controllers/Login/LoginController.php
View File

@@ -469,7 +469,15 @@ class LoginController extends AdminController
$fullname = $user->fullname ?: $username; $fullname = $user->fullname ?: $username;
$author = $config->get('site.author.name', ''); $author = $config->get('site.author.name', '');
$sitename = $config->get('site.title', 'Website'); $sitename = $config->get('site.title', 'Website');
$reset_link = $this->getAbsoluteAdminUrl("/reset/u/{$username}/{$token}"); $reset_route = "/reset/u/{$username}/{$token}";
$site_host = $config->get('plugins.login.site_host');
if (!empty($site_host)) {
$admin = $this->getAdmin();
$reset_link = rtrim($site_host, '/') . '/' . trim($admin->base, '/') . '/' . ltrim($reset_route, '/');
} else {
$reset_link = $this->getAbsoluteAdminUrl($reset_route);
}
// For testing only! // For testing only!
//Admin::DEBUG && Admin::addDebugMessage(sprintf('Reset link: %s', $reset_link)); //Admin::DEBUG && Admin::addDebugMessage(sprintf('Reset link: %s', $reset_link));