fix lando redirect and add mailhog+phpmyadmin services

This commit is contained in:
Mike Macgirvin 2022-07-18 17:54:10 +10:00
parent d085e65bd1
commit 791f7875fe
2 changed files with 6 additions and 1 deletions

View file

@ -3,3 +3,8 @@ recipe: lamp
config:
webroot: .
php: 8.1
services:
mailservice:
type: mailhog
sqlservice:
type: phpmyadmin

View file

@ -1653,7 +1653,7 @@ function login($register = false, $form_id = 'main-login', $hiddens = false, $lo
// If the site supports SSL and this isn't a secure connection, reload the page using https
if (intval($_SERVER['SERVER_PORT']) === 80 && strpos(z_root(), 'https://') !== false) {
if ((empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] === 'off') && strpos(z_root(), 'https://') !== false) {
goaway(z_root() . '/' . App::$query_string);
}