diff --git a/app/Config/Email.php b/app/Config/Email.php index 68f787a92b2cb275070b469d57b8c6d5e67f1aff..3cf247b51e651f73ab715421e9ba43fdd9197f74 100644 --- a/app/Config/Email.php +++ b/app/Config/Email.php @@ -8,9 +8,9 @@ use CodeIgniter\Config\BaseConfig; class Email extends BaseConfig { - public string $fromEmail; + public string $fromEmail = 'hello@castopod.local'; - public string $fromName; + public string $fromName = 'Castopod'; public string $recipients; @@ -32,17 +32,17 @@ class Email extends BaseConfig /** * SMTP Server Address */ - public string $SMTPHost; + public string $SMTPHost = ''; /** * SMTP Username */ - public string $SMTPUser; + public string $SMTPUser = ''; /** * SMTP Password */ - public string $SMTPPass; + public string $SMTPPass = ''; /** * SMTP Port diff --git a/docker-compose.yml b/docker-compose.yml index 40109536f4ed61ac30c001e686b892344c4937c9..52a712c7dde3ab55b6b7a628151b9581570925cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - castopod mariadb: - image: mariadb:latest + image: mariadb:10.2 container_name: castopod_mariadb ports: - 3306:3306 diff --git a/modules/Auth/Config/Auth.php b/modules/Auth/Config/Auth.php index 1794d8f86100ccf0f09c9e1cb132ee9fa3b1ed83..11ffea8aa91600b6b3f99370df91555053224de5 100644 --- a/modules/Auth/Config/Auth.php +++ b/modules/Auth/Config/Auth.php @@ -45,17 +45,6 @@ class Auth extends MythAuthConfig */ public $allowRegistration = false; - /** - * -------------------------------------------------------------------------- - * Require confirmation registration via email - * -------------------------------------------------------------------------- - * When enabled, every registered user will receive an email message - * with a special link he have to confirm to activate his account. - * - * @var bool - */ - public $requireActivation = false; - /** * -------------------------------------------------------------------------- * Auth gateway diff --git a/themes/cp_auth/emails/activation.php b/themes/cp_auth/emails/activation.php index 82a2032ff78ca273536477e2880b8ce569103925..4dc506c60ba255ce5daf98fecdd0be1b3b014d83 100644 --- a/themes/cp_auth/emails/activation.php +++ b/themes/cp_auth/emails/activation.php @@ -2,7 +2,7 @@ <p>To activate your account use this URL.</p> -<p><a href="<?= base_url('activate-account') . +<p><a href="<?= url_to('activate-account') . '?token=' . $hash ?>">Activate account</a>.</p> diff --git a/themes/cp_auth/emails/forgot.php b/themes/cp_auth/emails/forgot.php index f6509c83c1cf70b4ea9f4e15fcbb964176d92569..e6f199aa01a1c075797a334f3963dca95c72f605 100644 --- a/themes/cp_auth/emails/forgot.php +++ b/themes/cp_auth/emails/forgot.php @@ -4,7 +4,7 @@ <p>Your Code: <?= $hash ?></p> -<p>Visit the <a href="<?= base_url('reset-password') . +<p>Visit the <a href="<?= url_to('reset-password') . '?token=' . $hash ?>">Reset Form</a>.</p>