extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug regarding Certificate Check (if you wanted it switched of, all applicable emailadmin profiles had to switch it off); fix bug regarding missing but assumed existing default profile resulted in wrong LoginType method choosen

Browse Source
This commit is contained in:
Klaus Leithoff 2013-06-14 11:26:30 +00:00
parent 2ae0d83800
commit d926e7c954
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,7 @@ class emailadmin_bo extends so_sql
//echo "<p>eGW configuration update: ".print_r($new_config,true)."</p>\n";
}
}
if (empty($this->data['ea_stationery_active_templates'])) $this->data['ea_stationery_active_templates']='';
//error_log(__METHOD__.__LINE__.' Content to save:'.array2string($this->data));
if (is_numeric($this->data['ea_profile_id'])) self::unsetCachedObjects($this->data['ea_profile_id']*-1);
if (!($result = parent::save()))
@ -476,7 +477,7 @@ class emailadmin_bo extends so_sql
static function unsetCachedObjects($_profileID=null)
{
if (is_null($_profileID)) $_profileID = self::getUserDefaultProfileID();
//error_log(__METHOD__.__LINE__.' called with ProfileID:'.$_profileID.' from '.function_backtrace());
if (!is_array($_profileID) && is_numeric($_profileID))
{
felamimail_bo::resetConnectionErrorCache($_profileID);
@ -607,6 +608,8 @@ class emailadmin_bo extends so_sql
// restore the default loginType and check if there are forced/predefined user access Data ($imapAuthType may be set to admin)
//error_log(__METHOD__.__LINE__.' ServerID:'.$icServer->ImapServerId.' Logintype:'.array2string($data['imapLoginType']));
list($data['imapLoginType'],$imapAuthType) = explode('#',$data['imapLoginType'],2);
if (empty($data['imapLoginType'])) $data['imapLoginType'] = 'standard';
if (empty($imapAuthType)) $imapAuthType = $data['imapLoginType'];
//error_log(__METHOD__.__LINE__.' ServerID:'.$icServer->ImapServerId.' Logintype:'.array2string($data['imapLoginType']).' AuthType:'.$imapAuthType);
$icServer->loginType = $data['imapLoginType'];
$icServer->domainName = $data['defaultDomain'];
@ -783,6 +786,7 @@ class emailadmin_bo extends so_sql
//error_log(__METHOD__.__LINE__.' '.$class);
include_once(EGW_INCLUDE_ROOT.'/activesync/backend/egw.php');
}
}
}

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

@ -242,7 +242,7 @@
// take the first value found by explode, which is assumed the default value
list($mergeInTo[$key],$rest) = explode('#',$mergeInTo[$key],2);
$mergeInTo[$key] = $mergeInTo[$key].'#'.$toMerge[$key];
#error_log($mergeInTo[$key]);
//error_log($mergeInTo[$key]);
break;
}
case 'imapServer':
@ -250,6 +250,14 @@
case 'imapPort':
case 'imapTLSEncryption':
case 'imapTLSAuthentication':
// whatever it is, if the server is set and the imapTLSAuthentication option is checked,
// then the user wanted that (checked results in a value "no")
if (strlen($toMerge['imapServer'])>0 && $toMerge[$key]=='no')
{
//error_log(__METHOD__.__LINE__." $key $mergeInTo[$key] = $toMerge[$key]");
$mergeInTo[$key]=$toMerge[$key];
break;
}
case 'imapEnableCyrusAdmin':
case 'imapAdminUsername':
case 'imapAdminPW':