extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-24 15:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

new EMailAdmin class to administrate mail-accounts in sql

Browse Source 
r40841: fixed typo
r40845: always allow username@domain
This commit is contained in:
Ralf Becker 2012-11-19 12:40:26 +00:00
parent e1d06c0e59
commit e8ff9540e5
9 changed files with 602 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
emailadmin/inc/class.defaultsmtp.inc.php
View File

@ -1,97 +1,138 @@
<?php <?php
/***************************************************************************\ /***************************************************************************\
* EGroupWare - EMailAdmin * * EGroupWare - EMailAdmin *
* http://www.egroupware.org * * http://www.egroupware.org *
* Written by : Lars Kneschke [lkneschke@linux-at-work.de] * * Written by : Lars Kneschke [lkneschke@linux-at-work.de] *
* ------------------------------------------------- * * ------------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the * * under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your * * Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. * * option) any later version. *
\***************************************************************************/ \***************************************************************************/
/* $Id$ */ /* $Id$ */
class defaultsmtp class defaultsmtp
{
/**
* Capabilities of this class (pipe-separated): default, forward
*/
const CAPABILITIES = 'default';
/**
* SmtpServerId
*
* @var int
*/
var $SmtpServerId;
var $smtpAuth = false;
var $editForwardingAddress = false;
var $host;
var $port;
var $username;
var $password;
var $defaultDomain;
// the constructor
function defaultsmtp($defaultDomain=null)
{ {
/** $this->defaultDomain = $defaultDomain ? $defaultDomain : $GLOBALS['egw_info']['server']['mail_suffix'];
* Capabilities of this class (pipe-separated): default, forward
*/
const CAPABILITIES = 'default';
/**
* SmtpServerId
*
* @var int
*/
var $SmtpServerId;
var $smtpAuth = false;
var $editForwardingAddress = false;
var $host;
var $port;
var $username;
var $password;
var $defaultDomain;
// the constructor
function defaultsmtp($defaultDomain=null)
{
$this->defaultDomain = $defaultDomain ? $defaultDomain : $GLOBALS['egw_info']['server']['mail_suffix'];
}
// add a account
function addAccount($_hookValues)
{
return true;
}
// delete a account
function deleteAccount($_hookValues)
{
return true;
}
function getAccountEmailAddress($_accountName)
{
$accountID = $GLOBALS['egw']->accounts->name2id($_accountName);
$emailAddress = $GLOBALS['egw']->accounts->id2name($accountID,'account_email');
if(empty($emailAddress))
$emailAddress = $_accountName.'@'.$this->defaultDomain;
$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
return array(
array(
'name' => $realName,
'address' => $emailAddress,
'type' => 'default'
)
);
}
function getUserData($_uidnumber) {
$userData = array();
return $userData;
}
function saveSMTPForwarding($_accountID, $_forwardingAddress, $_keepLocalCopy) {
return true;
}
function setUserData($_uidnumber, $_mailAlternateAddress, $_mailForwardingAddress, $_deliveryMode) {
return true;
}
// update a account
function updateAccount($_hookValues) {
return true;
}
} }
?>
// add a account
function addAccount($_hookValues)
{
return true;
}
// delete a account
function deleteAccount($_hookValues)
{
return true;
}
function getAccountEmailAddress($_accountName)
{
$accountID = $GLOBALS['egw']->accounts->name2id($_accountName);
$emailAddress = $GLOBALS['egw']->accounts->id2name($accountID,'account_email');
if(empty($emailAddress))
$emailAddress = $_accountName.'@'.$this->defaultDomain;
$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
return array(
array(
'name' => $realName,
'address' => $emailAddress,
'type' => 'default'
)
);
}
function getUserData($_uidnumber) {
$userData = array();
return $userData;
}
function saveSMTPForwarding($_accountID, $_forwardingAddress, $_keepLocalCopy) {
return true;
}
function setUserData($_uidnumber, $_mailAlternateAddress, $_mailForwardingAddress, $_deliveryMode) {
return true;
}
// update a account
function updateAccount($_hookValues) {
return true;
}
/**
* Build mailbox address for given account and mail_addr_type
*
* If $account is an array (with values for keys account_(id|lid|email), it does NOT call accounts class
*
* @param int|array $account account_id or whole account array with values for keys
* @param string $domain=null domain, default use $this->defaultDomain
* @param string $mail_login_type=null standard(uid), vmailmgr(uid@domain), email or uidNumber,
* default use $GLOBALS['egw_info']['server']['mail_login_type']
* @return string
*/
/*static*/ public function mailbox_addr($account,$domain=null,$mail_login_type=null)
{
if (is_null($domain)) $domain = $this->defaultDomain;
if (is_null($mail_login_type)) $mail_login_type = $GLOBALS['egw_info']['server']['mail_login_type'];
switch($mail_login_type)
{
case 'email':
$mbox = is_array($account) ? $account['account_email'] : $GLOBALS['egw']->accounts->id2name($account,'account_email');
break;
case 'uidNumber':
if (is_array($account)) $account = $account['account_id'];
$mbox = 'u'.$account.'@'.$domain;
break;
case 'standard':
$mbox = is_array($account) ? $account['account_lid'] : $GLOBALS['egw']->accounts->id2name($account);
break;
case 'vmailmgr':
default:
$mbox = is_array($account) ? $account['account_lid'] : $GLOBALS['egw']->accounts->id2name($account);
$mbox .= '@'.$domain;
break;
}
//error_log(__METHOD__."(".array2string($account).",'$domain','$mail_login_type') = '$mbox'");
return $mbox;
}
}

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

@ -995,4 +995,21 @@ class emailadmin_bo extends so_sql
self::$sessionData = array(); self::$sessionData = array();
$this->saveSessionData(); $this->saveSessionData();
} }
/**
* Get ID of default profile
*
* ID is negative for FMail, which used positive ID's for user profiles!
*
* @return int
*/
function getDefaultProfileID()
{
if (($profiles = $this->soemailadmin->getProfileList(0, true)))
{
$default_profile = array_shift($profiles);
return -$default_profile['profileID'];
}
}
} }

7
emailadmin/inc/class.emailadmin_hooks.inc.php
View File

@ -27,7 +27,7 @@ class emailadmin_hooks
//Do not modify below this line //Do not modify below this line
display_section($appname,$title,$file); display_section($appname,$title,$file);
} }
/** /**
* Hook called if account emailadim settings has to be modified * Hook called if account emailadim settings has to be modified
* *
@ -93,7 +93,7 @@ class emailadmin_hooks
} }
} }
} }
} }
/** /**
@ -139,7 +139,8 @@ class emailadmin_hooks
) : 'Dovecot', ) : 'Dovecot',
); );
case 'smtp_server_type': // nothing yet case 'smtp_server_types': // nothing yet
return array('emailadmin_smtp_sql' => 'Postfix (SQL)');
break; break;
} }
} }

44
emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
View File

@ -363,7 +363,7 @@ class emailadmin_smtp_ldap extends defaultsmtp
// does schema support an explicit mailbox name --> set it with $uid@$domain // does schema support an explicit mailbox name --> set it with $uid@$domain
if ($this->config['mailbox_attr']) if ($this->config['mailbox_attr'])
{ {
$newData[$this->config['mailbox_attr']] = self::mailbox_addr(array( $newData[$this->config['mailbox_attr']] = $this->mailbox_addr(array(
'account_id' => $_uidnumber, 'account_id' => $_uidnumber,
'account_lid' => $uid, 'account_lid' => $uid,
'account_email' => $_mailLocalAddress, 'account_email' => $_mailLocalAddress,
@ -439,46 +439,4 @@ class emailadmin_smtp_ldap extends defaultsmtp
return ldap_modify ($ds, $allValues[0]['dn'], $newData); return ldap_modify ($ds, $allValues[0]['dn'], $newData);
} }
} }
/**
* Build mailbox address for given account and mail_addr_type
*
* If $account is an array (with values for keys account_(id|lid|email), it does NOT call accounts class
*
* @param int|array $account account_id or whole account array with values for keys
* @param string $domain=null domain, default use $this->defaultDomain
* @param string $mail_login_type=null standard(uid), vmailmgr(uid@domain), email or uidNumber,
* default use $GLOBALS['egw_info']['server']['mail_login_type']
* @return string
*/
/*static*/ public function mailbox_addr($account,$domain=null,$mail_login_type=null)
{
if (is_null($domain)) $domain = $this->defaultDomain;
if (is_null($mail_login_type)) $mail_login_type = $GLOBALS['egw_info']['server']['mail_login_type'];
switch($mail_login_type)
{
case 'email':
$mbox = is_array($account) ? $account['account_email'] : $GLOBALS['egw']->accounts->id2name($account,'account_email');
break;
case 'uidNumber':
if (is_array($account)) $account = $account['account_id'];
$mbox = 'u'.$account.'@'.$domain;
break;
case 'standard':
$mbox = is_array($account) ? $account['account_lid'] : $GLOBALS['egw']->accounts->id2name($account);
break;
case 'vmailmgr':
default:
$mbox = is_array($account) ? $account['account_lid'] : $GLOBALS['egw']->accounts->id2name($account);
$mbox .= '@'.$domain;
break;
}
//error_log(__METHOD__."(".array2string($account).",'$domain','$mail_login_type') = '$mbox'");
return $mbox;
}
} }

362
emailadmin/inc/class.emailadmin_smtp_sql.inc.php Normal file
View File

@ -0,0 +1,362 @@
<?php
/**
* EGroupware EMailAdmin: SMTP configuration / mail accounts via SQL
*
* @link http://www.stylite.de
* @package emailadmin
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2012 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/
include_once(EGW_INCLUDE_ROOT.'/emailadmin/inc/class.defaultsmtp.inc.php');
/**
* SMTP configuration / mail accounts via SQL
*/
class emailadmin_smtp_sql extends defaultsmtp
{
/**
* Capabilities of this class (pipe-separated): default, forward
*/
const CAPABILITIES = 'default|forward';
/**
* Reference to global db object
*
* @var egw_db
*/
protected $db;
/**
* Reference to global account object
*
* @var accounts
*/
protected $accounts;
/**
* Name of table
*/
const TABLE = 'egw_mailaccounts';
/**
* Name of app our table belongs to
*/
const APP = 'emailadmin';
/**
* Values for mail_type column
*
* enabled and delivery must have smaller values then alias, forward or mailbox (getUserData depend on it)!
*/
const TYPE_ENABLED = 0;
const ENABLED = 'active';
const TYPE_DELIVERY = 1;
const FORWARD_ONLY = 'forwardOnly';
const TYPE_QUOTA = 2;
const TYPE_ALIAS = 3;
const TYPE_FORWARD = 4;
const TYPE_MAILBOX = 5;
/**
* Constructor
*
* @param string $defaultDomain=null
*/
function __construct($defaultDomain=null)
{
parent::__construct($defaultDomain);
$this->db = $GLOBALS['egw']->db;
$this->accounts = $GLOBALS['egw']->accounts;
}
/**
* Hook called on account creation
*
* @param array $_hookValues values for keys 'account_email', 'account_firstname', 'account_lastname', 'account_lid'
* @return boolean true on success, false on error writing to ldap
*/
function addAccount($_hookValues)
{
$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] :
common::email_address($_hookValues['account_firstname'],
$_hookValues['account_lastname'],$_hookValues['account_lid'],$this->defaultDomain);
$account_id = !empty($_hookValues['account_id']) ? $_hookValues['account_id'] :
$this->accounts->name2id($_hookValues['account_lid'], 'account_lid', 'u');
if ($this->accounts->exists($account_id) != 1)
{
throw new egw_exception_assertion_failed("Account #$account_id ({$_hookValues['account_lid']}) does NOT exist!");
}
return $this->setUserData($account_id, array(), array(), null, self::ENABLED, $mailLocalAddress, null);
}
/**
* Get all email addresses of an account
*
* @param string $_accountName
* @return array
*/
function getAccountEmailAddress($_accountName)
{
$emailAddresses = array();
if (($account_id = $this->accounts->name2id($_accountName, 'account_lid', 'u')))
{
$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
$emailAddresses[] = $emailAddresses[] = array (
'name' => $realName,
'address' => $this->accounts->id2name($account_id, 'account_email'),
'type' => 'default',
);
foreach($this->db->select(self::TABLE, 'mail_value', array(
'account_id' => $account_id,
'mail_type' => self::TYPE_ALIAS,
), __LINE__, __FILE__, false, 'ORDER BY mail_value', self::APP) as $row)
{
$emailAddresses[] = $emailAddresses[] = array (
'name' => $realName,
'address' => $row['mail_value'],
'type' => 'alternate',
);
}
}
if ($this->debug) error_log(__METHOD__."('$_acountName') returning ".array2string($emailAddresses));
return $emailAddresses;
}
/**
* Get the data of a given user
*
* Multiple accounts may match, if an email address is specified.
* In that case only mail routing fields "uid", "mailbox" and "forward" contain values
* from all accounts!
*
* @param int|string $user numerical account-id, account-name or email address
* @return array with values for keys 'mailLocalAddress', 'mailAlternateAddress' (array), 'mailForwardingAddress' (array),
* 'accountStatus' ("active"), 'quotaLimit' and 'deliveryMode' ("forwardOnly")
*/
function getUserData($user)
{
$userData = array();
if (is_numeric($user) && $this->accounts->exists($user))
{
$account_id = $user;
}
elseif (strpos($user, '@') === false)
{
$account_id = $this->accounts->name2id($user, 'account_lid', 'u');
}
else // email address
{
// check with primary email address
if (($account_id = $this->accounts->name2id($user, 'account_email')))
{
$account_id = array($account_id);
}
else
{
$account_id = array();
}
// always allow username@domain
list($account_lid) = explode('@', $user);
if (($id = $this->accounts->name2id($account_lid, 'account_lid')) && !in_array($id, $account_id))
{
$account_id[] = $id;
}
foreach($this->db->select(self::TABLE, 'account_id', array(
'mail_type' => array(self::TYPE_ALIAS, self::TYPE_FORWARD),
'mail_value' => $user,
), __LINE__, __FILE__, false, '', self::APP) as $row)
{
if (!in_array($row['account_id'], $account_id)) $account_id[] = $row['account_id'];
}
//error_log(__METHOD__."('$user') account_id=".array2string($account_id));
}
if ($account_id)
{
if (!is_array($account_id))
{
$userData['mailLocalAddress'] = $this->accounts->id2name($account_id, 'account_email');
}
$enabled = $forwardOnly = array();
foreach($this->db->select(self::TABLE, '*', array(
'account_id' => $account_id,
), __LINE__, __FILE__, false, 'ORDER BY mail_type,mail_value', self::APP) as $row)
{
switch($row['mail_type'])
{
case self::TYPE_ENABLED:
$userData['accountStatus'] = $row['mail_value'];
$enabled[$row['account_id']] = $row['mail_value'] == self::ENABLED;
break;
case self::TYPE_DELIVERY:
$userData['deliveryMode'] = $row['mail_value'];
$forwardOnly[$row['account_id']] = $row['mail_value'] == self::FORWARD_ONLY;
break;
case self::TYPE_QUOTA:
$userData['quotaLimit'] = $row['mail_value'];
break;
case self::TYPE_ALIAS:
$userData['mailAlternateAddress'][] = $row['mail_value'];
break;
case self::TYPE_FORWARD:
$userData['mailForwardingAddress'][] = $row['mail_value'];
if ($row['account_id'] < 0 || $enabled[$row['account_id']])
{
$userData['forward'][] = $row['mail_value'];
}
break;
case self::TYPE_MAILBOX:
$userData['mailmessagestore'] = $row['mail_value'];
//error_log(__METHOD__."('$user') row=".array2string($row).', enabled[$row[account_id]]='.array2string($enabled[$row['account_id']]).', forwardOnly[$row[account_id]]='.array2string($forwardOnly[$row['account_id']]));
if ($row['account_id'] > 0 && $enabled[$row['account_id']] && !$forwardOnly[$row['account_id']])
{
$userData['uid'][] = $this->accounts->id2name($row['account_id'], 'account_lid');
$userData['mailbox'][] = $row['mail_value'];
}
break;
}
}
}
if ($this->debug) error_log(__METHOD__."('$user') returning ".array2string($userData));
return $userData;
}
/**
* Set the data of a given user
*
* @param int $_uidnumber numerical user-id
* @param array $_mailAlternateAddress
* @param array $_mailForwardingAddress
* @param string $_deliveryMode
* @param string $_accountStatus
* @param string $_mailLocalAddress
* @param int $_quota in MB
* @param boolean $_forwarding_only=false true: store only forwarding info, used internally by saveSMTPForwarding
* @return boolean true on success, false on error writing to ldap
*/
function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false)
{
if ($this->debug) error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
if (!$_forwarding_only && $this->accounts->id2name($_uidnumber, 'account_email') !== $_mailLocalAddress)
{
$account = $this->accounts->read($_uidnumber);
$account['account_email'] = $_mailLocalAddress;
$this->accounts->save($account);
}
$flags = array(
self::TYPE_DELIVERY => $_deliveryMode,
self::TYPE_ENABLED => $_accountStatus,
self::TYPE_QUOTA => $_quota,
);
$where = array('account_id' => $_uidnumber);
if ($_forwarding_only) $where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
// find all invalid values: either delete or update them
$delete_ids = array();
foreach($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
{
switch($row['mail_type'])
{
case self::TYPE_ALIAS:
$new_addresses =& $_mailAlternateAddress;
// fall-throught
case self::TYPE_FORWARD:
if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses =& $_mailForwardingAddress;
if (($key = array_search($row['mail_value'], $new_addresses)) === false)
{
$delete_ids[] = $row['mail_id'];
}
else
{
unset($new_addresses[$key]); // no need to store
}
break;
case self::TYPE_MAILBOX:
$mailbox = $row['mail_value'];
break;
case self::TYPE_QUOTA:
case self::TYPE_DELIVERY:
case self::TYPE_ENABLED:
//error_log(__METHOD__.": ".__LINE__." row=".array2string($row).", flags['$row[mail_type]']=".array2string($flags[$row['mail_type']]));
if ($row['mail_value'] != $flags[$row['mail_type']])
{
if ($flags[$row['mail_type']])
{
$this->db->update(self::TABLE, array(
'mail_value' => $flags[$row['mail_type']],
), array(
'mail_id' => $row['mail_id'],
), __LINE__, __FILE__, self::APP);
}
else
{
$delete_ids[] = $row['mail_id'];
}
}
unset($flags[$row['mail_type']]);
break;
}
}
if ($delete_ids)
{
$this->db->delete(self::TABLE, array('mail_id' => $delete_ids), __LINE__, __FILE__, self::APP);
}
// set mailbox address, if not yet set
if (!$_forwarding_only && empty($mailbox))
{
$flags[self::TYPE_MAILBOX] = $this->mailbox_addr(array(
'account_id' => $_uidnumber,
'account_lid' => $this->accounts->id2name($_uidnumber, 'account_lid'),
'account_email' => $_mailLocalAddress,
));
}
// store all new values
foreach($flags+array(
self::TYPE_ALIAS => $_mailAlternateAddress,
self::TYPE_FORWARD => $_mailForwardingAddress,
) as $type => $values)
{
if ($values && (!$_forwarding_only || in_array($type, array(self::TYPE_FORWARD, self::TYPE_DELIVERY))))
{
foreach((array)$values as $value)
{
$this->db->insert(self::TABLE, array(
'account_id' => $_uidnumber,
'mail_type' => $type,
'mail_value' => $value,
), false, __LINE__, __FILE__, self::APP);
}
}
}
return true;
}
/**
* Saves the forwarding information
*
* @param int $_accountID
* @param string $_forwardingAddress
* @param string $_keepLocalCopy 'yes'
* @return boolean true on success, false on error writing
*/
function saveSMTPForwarding($_accountID, $_forwardingAddress, $_keepLocalCopy)
{
return $this->setUserData($_accountID, array(), $_forwardingAddress,
$_keepLocalCopy != 'yes' ? self::FORWARD_ONLY : null, null, null, null, true);
}
}

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

@ -12,7 +12,7 @@
$setup_info['emailadmin']['name'] = 'emailadmin'; $setup_info['emailadmin']['name'] = 'emailadmin';
$setup_info['emailadmin']['title'] = 'EMailAdmin'; $setup_info['emailadmin']['title'] = 'EMailAdmin';
$setup_info['emailadmin']['version'] = '1.9.003'; $setup_info['emailadmin']['version'] = '1.9.006';
$setup_info['emailadmin']['app_order'] = 10; $setup_info['emailadmin']['app_order'] = 10;
$setup_info['emailadmin']['enable'] = 2; $setup_info['emailadmin']['enable'] = 2;
$setup_info['emailadmin']['index'] = 'emailadmin.emailadmin_ui.listProfiles'; $setup_info['emailadmin']['index'] = 'emailadmin.emailadmin_ui.listProfiles';
@ -29,6 +29,7 @@ $setup_info['emailadmin']['maintainer'] = array(
); );
$setup_info['emailadmin']['tables'][] = 'egw_emailadmin'; $setup_info['emailadmin']['tables'][] = 'egw_emailadmin';
$setup_info['emailadmin']['tables'][] = 'egw_mailaccounts';
/* The hooks this app includes, needed for hooks registration */ /* The hooks this app includes, needed for hooks registration */
#$setup_info['emailadmin']['hooks'][] = 'preferences'; #$setup_info['emailadmin']['hooks'][] = 'preferences';
@ -72,3 +73,4 @@ $setup_info['emailadmin']['check_install'] = array(
'from' => 'EMailAdmin', 'from' => 'EMailAdmin',
), ),
); );

12
emailadmin/setup/tables_current.inc.php
View File

@ -59,5 +59,17 @@ $phpgw_baseline = array(
'fk' => array(), 'fk' => array(),
'ix' => array('ea_appname','ea_group'), 'ix' => array('ea_appname','ea_group'),
'uc' => array() 'uc' => array()
),
'egw_mailaccounts' => array(
'fd' => array(
'mail_id' => array('type' => 'auto','nullable' => False),
'account_id' => array('type' => 'int','precision' => '4','nullable' => False),
'mail_type' => array('type' => 'int','precision' => '1','nullable' => False,'comment' => '0=active, 1=alias, 2=forward, 3=forwardOnly, 4=quota'),
'mail_value' => array('type' => 'varchar','precision' => '128','nullable' => False)
),
'pk' => array('mail_id'),
'fk' => array(),
'ix' => array('mail_value',array('account_id','mail_type')),
'uc' => array()
) )
); );

40
emailadmin/setup/tables_update.inc.php
View File

@ -305,10 +305,10 @@ function emailadmin_upgrade1_7_003()
function emailadmin_upgrade1_8() function emailadmin_upgrade1_8()
{ {
emailadmin_upgrade1_7_003(); emailadmin_upgrade1_7_003();
return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001'; return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001';
} }
function emailadmin_upgrade1_7_004() function emailadmin_upgrade1_7_004()
{ {
return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001'; return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001';
@ -380,6 +380,40 @@ function emailadmin_upgrade1_9_002()
} }
unset($templates); unset($templates);
} }
return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.003'; return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.003';
} }
function emailadmin_upgrade1_9_003()
{
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin','ea_smtp_auth_username',array(
'type' => 'varchar',
'precision' => '128',
));
return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.004';
}
function emailadmin_upgrade1_9_004()
{
return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.005';
}
function emailadmin_upgrade1_9_005()
{
$GLOBALS['egw_setup']->oProc->CreateTable('egw_mailaccounts',array(
'fd' => array(
'mail_id' => array('type' => 'auto','nullable' => False),
'account_id' => array('type' => 'int','precision' => '4','nullable' => False),
'mail_type' => array('type' => 'int','precision' => '1','nullable' => False,'comment' => '0=active, 1=alias, 2=forward, 3=forwardOnly, 4=quota'),
'mail_value' => array('type' => 'varchar','precision' => '128','nullable' => False)
),
'pk' => array('mail_id'),
'fk' => array(),
'ix' => array('mail_value',array('account_id','mail_type')),
'uc' => array()
));
return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.006';
}

59
felamimail/inc/class.felamimail_hooks.inc.php
View File

@ -20,24 +20,23 @@ class felamimail_hooks
*/ */
static public function accountHooks($hookData) static public function accountHooks($hookData)
{ {
$profileID = 0; $emailadmin = new emailadmin_bo();
if (isset($GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID'])) if (($default_profile_id = $emailadmin->getDefaultProfileID()))
$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID'];
$bofelamimail = felamimail_bo::getInstance(true,$profileID);
$profileID = $GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID'] = $bofelamimail->profileID;
switch(is_array($hookData) ? $hookData['location'] : $hookData)
{ {
case 'addaccount': $bofelamimail = felamimail_bo::getInstance(true, $default_profile_id);
$bofelamimail->addAccount($hookData);
break; switch(is_array($hookData) ? $hookData['location'] : $hookData)
case 'deleteaccount': {
$bofelamimail->deleteAccount($hookData); case 'addaccount':
break; $bofelamimail->addAccount($hookData);
case 'editaccount': break;
$bofelamimail->updateAccount($hookData); case 'deleteaccount':
break; $bofelamimail->deleteAccount($hookData);
break;
case 'editaccount':
$bofelamimail->updateAccount($hookData);
break;
}
} }
} }
@ -46,19 +45,25 @@ class felamimail_hooks
*/ */
static public function adminMenu() static public function adminMenu()
{ {
if ($GLOBALS['egw_info']['server']['account_repository'] == "ldap") $emailadmin = new emailadmin_bo();
if (($default_profile_id = $emailadmin->getDefaultProfileID()))
{ {
$data = Array $bofelamimail = felamimail_bo::getInstance(true, $default_profile_id);
(
'description' => 'email settings',
'url' => '/index.php',
'extradata' => 'menuaction=emailadmin.uiuserdata.editUserData'
);
//Do not modify below this line $ogServer = $bofelamimail->mailPreferences->getOutgoingServer($default_profile_id);
global $menuData; //error_log(__METHOD__."() default_profile_id = $default_profile_id, get_class(ogServer)=".get_class($ogServer));
$menuData[] = $data; if (get_class($ogServer) != 'defaultsmtp')
{
global $menuData;
$menuData[] = Array
(
'description' => 'email settings',
'url' => '/index.php',
'extradata' => 'menuaction=emailadmin.uiuserdata.editUserData'
);
}
} }
} }