smokephil/landestreffen-webseite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

(Grav GitSync) Automatic Commit from smokephil

Browse source
This commit is contained in:
smokephil 2024-06-09 22:35:15 +02:00 • committed by GitSync
parent b2cdb7f301
commit f5636adc16
7 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pages/01.home/04._programm/text.md
View file

@ -24,7 +24,7 @@ publish_date: '01-06-2024 00:00'
</div> </div>
<div class="columns"> <div class="columns">
<div class="column col-2"><p>11.00 Uhr</p></div> <div class="column col-2"><p>11.00 Uhr</p></div>
<div class="column"><p>Begrüßung und Organisatorisches</p></div> <div class="column"><p>Singen und Begrüßen</p></div>
</div> </div>
<div class="columns"> <div class="columns">
<div class="column col-2"><p>12.00 Uhr</p></div> <div class="column col-2"><p>12.00 Uhr</p></div>
@ -36,7 +36,7 @@ publish_date: '01-06-2024 00:00'
<p> <p>
<strong>Nachmittagsprogramm</strong> <strong>Nachmittagsprogramm</strong>
<ul> <ul>
<li>Zeit zum Gedankenaustausch</li> <li>Zeit für Begegnung</li>
<li>Sportprogramm</li> <li>Sportprogramm</li>
<li>Musizieren / Singen</li> <li>Musizieren / Singen</li>
<li>Kinderprogramm</li> <li>Kinderprogramm</li>
@ -50,7 +50,7 @@ publish_date: '01-06-2024 00:00'
</div> </div>
<div class="columns"> <div class="columns">
<div class="column col-2"><p>16.30 Uhr</p></div> <div class="column col-2"><p>16.30 Uhr</p></div>
<div class="column"><p>Gruppenaktion</p></div> <div class="column"><p>Lasst Euch überraschen</p></div>
</div> </div>
<div class="columns"> <div class="columns">
<div class="column col-2"><p>18.00 Uhr</p></div> <div class="column col-2"><p>18.00 Uhr</p></div>

6
plugins/admin/CHANGELOG.md
View file

@ -1,3 +1,9 @@
# v1.10.46
## 05/15/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

4
plugins/admin/blueprints.yaml
View file

@ -1,7 +1,7 @@
name: Admin Panel name: Admin Panel
slug: admin slug: admin
type: plugin type: plugin
version: 1.10.45 version: 1.10.46
description: Adds an advanced administration panel to manage your site description: Adds an advanced administration panel to manage your site
icon: empire icon: empire
author: author:
@ -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
plugins/admin/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));

6
plugins/login/CHANGELOG.md
View file

@ -1,3 +1,9 @@
# v3.7.9
## 05/15/2024
1. [](#improved)
* Added default `site_host:` entry to `login.yaml` configuration file
# v3.7.8.1 # v3.7.8.1
## 04/19/2024 ## 04/19/2024

2
plugins/login/blueprints.yaml
View file

@ -1,7 +1,7 @@
name: Login name: Login
slug: login slug: login
type: plugin type: plugin
version: 3.7.8.1 version: 3.7.9
testing: false testing: false
description: Enables user authentication and login screen. description: Enables user authentication and login screen.
icon: sign-in icon: sign-in

1
plugins/login/login.yaml
View file

@ -4,6 +4,7 @@ redirect_to_login: false # If you try to access a page you do
redirect_after_login: false # Path to redirect to after a successful login redirect_after_login: false # Path to redirect to after a successful login
redirect_after_logout: true # Path to redirect to after a successful logout redirect_after_logout: true # Path to redirect to after a successful logout
session_user_sync: false # Sync session user with changes in stored user file session_user_sync: false # Sync session user with changes in stored user file
site_host: # Site host to use for email links. Enhances security by ensuring links are to the correct host (e.g. https://foo.com)
route: '/login' # Specific route for Login page (default is '/login') route: '/login' # Specific route for Login page (default is '/login')
route_after_login: '/' # Route to go to after login if enabled route_after_login: '/' # Route to go to after login if enabled