Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

auto-domain-grab use MX record for Host #1802

Merged
merged 2 commits into from
Mar 27, 2019
Merged

auto-domain-grab use MX record for Host #1802

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2898ecc
auto-domain-grab use MX record for Host
Nov 29, 2018
134c996
update comment
Nov 29, 2018
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
24 changes: 20 additions & 4 deletions plugins/auto-domain-grab/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function Init()
}

/**
* This function detects the IMAP Host, and if it is set to "auto", replaces it with the email domain.
* This function detects the IMAP Host, and if it is set to "auto", replaces it with the MX or email domain.
*
* @param \RainLoop\Model\Account $oAccount
* @param array $aImapCredentials
Expand All @@ -36,13 +36,21 @@ public function FilterImapCredentials($oAccount, &$aImapCredentials)
if (!empty($aImapCredentials['Host']) && 'auto' === $aImapCredentials['Host'])
{
$domain = substr(strrchr($oAccount->Email(), "@"), 1);
$aImapCredentials['Host'] = $this->imap_prefix.$domain;
$mxhosts = array();
if(getmxrr($domain, $mxhosts) && sizeof($mxhosts) > 0)
{
$aImapCredentials['Host'] = $mxhosts[0];
}
else
{
$aImapCredentials['Host'] = $this->imap_prefix.$domain;
}
}
}
}

/**
* This function detects the SMTP Host, and if it is set to "auto", replaces it with the email domain.
* This function detects the SMTP Host, and if it is set to "auto", replaces it with the MX or email domain.
*
* @param \RainLoop\Model\Account $oAccount
* @param array $aSmtpCredentials
Expand All @@ -55,7 +63,15 @@ public function FilterSmtpCredentials($oAccount, &$aSmtpCredentials)
if (!empty($aSmtpCredentials['Host']) && 'auto' === $aSmtpCredentials['Host'])
{
$domain = substr(strrchr($oAccount->Email(), "@"), 1);
$aSmtpCredentials['Host'] = $this->smtp_prefix.$domain;
$mxhosts = array();
if(getmxrr($domain, $mxhosts) && sizeof($mxhosts) > 0)
{
$aSmtpCredentials['Host'] = $mxhosts[0];
}
else
{
$aSmtpCredentials['Host'] = $this->smtp_prefix.$domain;
}
}
}
}
Expand Down