Commit 10fc6f17 authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix(email): set the correct url in the activation and forgot emails 

- add default values for Config/Email properties
- set mariadb to the minimal required version for development

fixes #204
parent 029804b9

app/Config/Email.php

+5 −5
Original line number Diff line number Diff line
@@ -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

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ services: 
      - castopod



  mariadb:

    image: mariadb:latest

    image: mariadb:10.2

    container_name: castopod_mariadb

    ports:

      - 3306:3306

modules/Auth/Config/Auth.php

+0 −11
Original line number Diff line number Diff line
@@ -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

themes/cp_auth/emails/activation.php

+1 −1
Original line number Diff line number Diff line
@@ -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>

themes/cp_auth/emails/forgot.php

+1 −1
Original line number Diff line number Diff line
@@ -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>