Skip to content

[IMP] Add multi tenant support in config #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ofonseca-pyming wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[IMP] Add multi tenant support in config #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions banner_warn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ function init()
$RCMAIL = rcmail::get_instance();

// Get config
$host = $RCMAIL->config->get('org_email_regex');
$this->org_mail_regex = rcube_utils::parse_host($host);
$this->org_mail_regex = $RCMAIL->config->get('org_email_regex');
Copy link
Copy Markdown
Owner

@pulsejet pulsejet Jan 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm very confused. Doesn't the value of $this->org_mail_regex just get overwritten here?

$this->x_spam_status_header = $RCMAIL->config->get('x_spam_status_header');
$this->x_spam_level_header = $RCMAIL->config->get('x_spam_level_header');
Expand Down
8 changes: 7 additions & 1 deletion config.inc.php.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
$config = array();

// Regex to match against the email to determine if from your organization
$config['org_email_regex'] = "/@(.*\.|)iitb\.ac\.in/i";
// Supported replacement variables:
// %n - hostname ($_SERVER['SERVER_NAME'])
// %t - hostname without the first part
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
// %s - domain name after the '@' from e-mail address provided at login screen
// For example %n = mail.domain.tld, %t = domain.tld
$config['org_email_regex'] = '/@(.*\.|)%t/i';

// Turn on letter avatars
$config['avatars'] = true;
Expand Down