holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* emailadmin: allow to specify (configure) a different sieveHost than your imapServer

Browse Source
This commit is contained in:
Klaus Leithoff 2011-03-17 10:23:36 +00:00
parent 765864c89b
commit a78a3d43d6
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emailadmin/inc/class.emailadmin_bo.inc.php
View File

@ -616,6 +616,10 @@ class emailadmin_bo extends so_sql
$icServer->adminUsername = $data['imapAdminUsername'];
$icServer->adminPassword = $data['imapAdminPW'];
$icServer->enableSieve = ($data['imapEnableSieve'] == 'yes');
if (!empty($data['imapSieveServer']))
{
$icServer->sieveHost = $data['imapSieveServer'];
}
$icServer->sievePort = $data['imapSievePort'];
if ($imapAuthType == 'admin') {
if (!empty($data['imapAuthUsername'])) $icServer->username = $icServer->loginName = $data['imapAuthUsername'];

10
emailadmin/inc/class.emailadmin_sieve.inc.php
View File

@ -69,7 +69,15 @@ class emailadmin_sieve extends Net_Sieve
{
if ($this->debug) error_log(__CLASS__.'::'.__METHOD__.array2string($euser));
if(is_a($_icServer,'defaultimap') && $_icServer->enableSieve) {
$sieveHost = $_icServer->host;
if (!empty($_icServer->sieveHost))
{
$sieveHost = $_icServer->sieveHost;
}
else
{
$sieveHost = $_icServer->host;
}
//error_log(__METHOD__.__LINE__.'->'.$sieveHost);
$sievePort = $_icServer->sievePort;
$useTLS = $_icServer->encryption > 0;
if ($euser) {

4
emailadmin/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long