extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 19:33:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

missing stuff

Browse Source
This commit is contained in:
Klaus Leithoff 2009-09-15 13:07:01 +00:00
parent b2df948560
commit a5039b3636
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emailadmin/inc/class.cyrusimap.inc.php
View File

@ -89,7 +89,7 @@
$_username = $this->getMailBoxUserName($_username);
$mailboxString = $nameSpaces['others'][0]['name'] . strtolower($_username) . (!empty($_folderName) ? $nameSpaces['others'][0]['delimiter'] . $_folderName : '');
if($this->loginType == 'vmailmgr') {
if($this->loginType == 'vmailmgr' || $this->loginType == 'email') {
$mailboxString .= '@'.$this->domainName;
}

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

@ -518,6 +518,9 @@
if (!empty($data['imapAuthUsername'])) $icServer->username = $icServer->loginName = $data['imapAuthUsername'];
if (!empty($data['imapAuthPassword'])) $icServer->password = $data['imapAuthPassword'];
}
if ($imapAuthType == 'email' || $icServer->loginType == 'email') {
$icServer->username = $icServer->loginName = $GLOBALS['egw_info']['user']['account_email'];
}
$eaPreferences->setIncomingServer($icServer);
// fetch the SMTP / outgoing server data

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

@ -232,7 +232,7 @@
switch ($key) {
case 'imapLoginType':
// if the logintype is admin, it will be added to the default value
if ($toMerge[$key] =='admin') {
if ($toMerge[$key] =='admin' || $toMerge[$key] =='email') {
// 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];

2
emailadmin/inc/class.emailadmin_ui.inc.php
View File

@ -646,7 +646,6 @@
{
# skeleton
# $this->t->set_var('',lang(''));
$this->t->set_var('lang_server_name',lang('server name'));
$this->t->set_var('lang_server_description',lang('description'));
$this->t->set_var('lang_edit',lang('edit'));
@ -718,6 +717,7 @@
$this->t->set_var('lang_profile_isactive',lang('profile is active'));
$this->t->set_var('lang_defined_by_admin',lang('Username/Password defined by admin'));
$this->t->set_var('lang_Use_IMAP_auth', lang('Use predefined username and password defined below'));
$this->t->set_var('lang_email',lang('use Users eMail-Address (as seen in Useraccount)'));
$this->t->set_var('',lang(''));
# $this->t->set_var('',lang(''));