beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Email Forwarder / Inbox Additioanl Validation

Browse source
This commit is contained in:
earnolmartin 2023-11-22 18:01:28 -07:00
parent fd72dab6b0
commit 26508518fc
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ehcp/classapp.php
View file

@ -3859,6 +3859,13 @@ $gateway="206.51.230.1";
function addEmailForwardingDirect($panelusername, $domainname, $fromemail, $forwardto) function addEmailForwardingDirect($panelusername, $domainname, $fromemail, $forwardto)
{ {
// Check to see if email address being added has already been setup as a forwarder (if so, return an error)
$SQL = "SELECT * FROM " . $this->conf['emailuserstable']['tablename'] . " WHERE email='$fromemail';";
$rs = $this->query($SQL);
if (count($rs) > 0) {
return $this->ok_err_text(false, "", 'Email address ' . $email . ' is already configured as normal inbox. Use a different source address or delete the existing email account first.');
}
return $this->executeQuery("insert into forwardings (panelusername,domainname,source,destination)values('$panelusername','$domainname','$fromemail','$forwardto')", $opname); return $this->executeQuery("insert into forwardings (panelusername,domainname,source,destination)values('$panelusername','$domainname','$fromemail','$forwardto')", $opname);
} }
@ -9091,6 +9098,13 @@ email2@domain2.com:password2<br>
$this->output .= "Adding email user:"; $this->output .= "Adding email user:";
$mailusername = getFirstPart($mailusername, '@'); # make sure does not include @ sign $mailusername = getFirstPart($mailusername, '@'); # make sure does not include @ sign
$email = "$mailusername@$domainname"; $email = "$mailusername@$domainname";
// Check to see if email address being added has already been setup as a forwarder (if so, return an error)
$SQL = "SELECT * FROM " . $this->conf['emailforwardingstable']['tablename'] . " WHERE source='$email';";
$rs = $this->query($SQL);
if (count($rs) > 0) {
return $this->ok_err_text(false, "", 'Email address ' . $email . ' is already configured as a forwarded email setup. Use a different address or delete the existing forwarder first.');
}
$success = $success && $this->executeQuery("insert into " . $this->conf['emailuserstable']['tablename'] . " (panelusername,domainname,mailusername,email,password,quota,status,autoreplysubject,autoreplymessage) values ('$this->activeuser','$domainname','$mailusername','$email',encrypt('$password','ehcp'),$quota,'" . $this->status_active . "','$autoreplysubject','$autoreplymessage')", 'add mail user'); $success = $success && $this->executeQuery("insert into " . $this->conf['emailuserstable']['tablename'] . " (panelusername,domainname,mailusername,email,password,quota,status,autoreplysubject,autoreplymessage) values ('$this->activeuser','$domainname','$mailusername','$email',encrypt('$password','ehcp'),$quota,'" . $this->status_active . "','$autoreplysubject','$autoreplymessage')", 'add mail user');
#$success=$success && $this->executeQuery("insert into ".$this->conf['emailuserstable']['tablename']." (panelusername,domainname,mailusername,email,password,quota,status,autoreplysubject,autoreplymessage) values ('$this->activeuser','$domainname','$mailusername','$email',encrypt('$password','ehcp'),'".($quota*1000000)."','".$this->status_active."','$autoreplysubject','$autoreplymessage')",'add mail user'); #$success=$success && $this->executeQuery("insert into ".$this->conf['emailuserstable']['tablename']." (panelusername,domainname,mailusername,email,password,quota,status,autoreplysubject,autoreplymessage) values ('$this->activeuser','$domainname','$mailusername','$email',encrypt('$password','ehcp'),'".($quota*1000000)."','".$this->status_active."','$autoreplysubject','$autoreplymessage')",'add mail user');