Issue summary

MailWatch configured for IMAP authentication does not work with an IMAP server that does not use the full email address as the login.

Steps to reproduce

1. Configure IMAP server to use username rather than username@maildomain.tld for the login
2. Configure MailWatch to use IMAP authentication with that IMAP server
3. Attempt to login

Expected result

User should be logged in stripping the @maildomain.tld if necessary for IMAP authentication (automatically or configurable).

Actual result

Using only username: No attempted login - https://github.com/mailwatch/MailWatch/blob/1.2/mailscanner/functions.php#L3208

Using username@maildomain.tld: imap_open(): Couldn't open stream ...

Installation

Version and method

• MailWatch Version: 1.2.16
• Install type: Zip/tarball install
• Updated from an older MailWatch or fresh install: Fresh install