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

new approach to fieldNames concept

Browse Source
This commit is contained in:
Klaus Leithoff 2012-11-20 15:44:29 +00:00
parent 2ac7877047
commit f1be692986
3 changed files with 71 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,100 +54,23 @@ class emailadmin_bo extends so_sql
var $LDAPData;
//var $SMTPServerType = array(); // holds a list of config options
static $SMTPServerType = array(
'emailadmin_smtp' => array(
'fieldNames' => array(
static $supportedSMTPFields = array(
'smtpServer',
'smtpPort',
'smtpAuth',
'ea_smtp_auth_username',
'ea_smtp_auth_password',
'smtpType'
),
'smtpType',
'editforwardingaddress',
);
static $SMTPServerType = array(
'emailadmin_smtp' => array(
'description' => 'standard SMTP-Server',
'classname' => 'emailadmin_smtp'
),
'postfixldap' => array(
'fieldNames' => array(
'smtpServer',
'smtpPort',
'smtpAuth',
'ea_smtp_auth_username',
'ea_smtp_auth_password',
'smtpType',
'editforwardingaddress',
'smtpLDAPServer',
'smtpLDAPAdminDN',
'smtpLDAPAdminPW',
'smtpLDAPBaseDN',
'smtpLDAPUseDefault'
),
'description' => 'Postfix (qmail Schema)',
'classname' => 'postfixldap'
),
'postfixinetorgperson' => array(
'fieldNames' => array(
'smtpServer',
'smtpPort',
'smtpAuth',
'ea_smtp_auth_username',
'ea_smtp_auth_password',
'smtpType',
),
'description' => 'Postfix (inetOrgPerson Schema)',
'classname' => 'postfixinetorgperson'
),
'smtpplesk' => array(
'fieldNames' => array(
'smtpServer',
'smtpPort',
'smtpAuth',
'ea_smtp_auth_username',
'ea_smtp_auth_password',
'smtpType',
'editforwardingaddress',
),
'description' => 'Plesk SMTP-Server (Qmail)',
'classname' => 'smtpplesk'
),
'postfixdbmailuser' => array(
'fieldNames' => array(
'smtpServer',
'smtpPort',
'smtpAuth',
'ea_smtp_auth_username',
'ea_smtp_auth_password',
'smtpType',
'editforwardingaddress',
'smtpLDAPServer',
'smtpLDAPAdminDN',
'smtpLDAPAdminPW',
'smtpLDAPBaseDN',
'smtpLDAPUseDefault'
),
'description' => 'Postfix (dbmail Schema)',
'classname' => 'postfixdbmailuser'
),
);
//var $IMAPServerType = array(); // holds a list of config options
static $IMAPServerType = array(
'defaultimap' => array(
'fieldNames' => array(
'imapServer',
'imapPort',
'imapType',
'imapLoginType',
'imapTLSEncryption',
'imapTLSAuthentication',
'imapAuthUsername',
'imapAuthPassword'
),
'description' => 'standard IMAP server',
'protocol' => 'imap',
'classname' => 'defaultimap'
),
'cyrusimap' => array(
'fieldNames' => array(
static $supportedIMAPFields = array(
'imapServer',
'imapPort',
'imapType',
@ -162,62 +85,13 @@ class emailadmin_bo extends so_sql
'imapSievePort',
'imapAuthUsername',
'imapAuthPassword'
),
'description' => 'Cyrus IMAP Server',
);
static $IMAPServerType = array(
'defaultimap' => array(
'description' => 'standard IMAP server',
'protocol' => 'imap',
'classname' => 'cyrusimap'
),
'dbmailqmailuser' => array(
'fieldNames' => array(
'imapServer',
'imapPort',
'imapType',
'imapLoginType',
'imapTLSEncryption',
'imapTLSAuthentication',
'imapEnableSieve',
'imapSieveServer',
'imapSievePort',
'imapAuthUsername',
'imapAuthPassword',
),
'description' => 'DBMail (qmailUser schema)',
'protocol' => 'imap',
'classname' => 'dbmailqmailuser'
),
'pleskimap' => array(
'fieldNames' => array(
'imapServer',
'imapPort',
'imapType',
'imapLoginType',
'imapTLSEncryption',
'imapTLSAuthentication',
'imapAuthUsername',
'imapAuthPassword'
),
'description' => 'Plesk IMAP Server (Courier)',
'protocol' => 'imap',
'classname' => 'pleskimap'
),
'dbmaildbmailuser' => array(
'fieldNames' => array(
'imapServer',
'imapPort',
'imapType',
'imapLoginType',
'imapTLSEncryption',
'imapTLSAuthentication',
'imapEnableSieve',
'imapSieveServer',
'imapSievePort',
'imapAuthUsername',
'imapAuthPassword'
),
'description' => 'DBMail (dbmailUser schema)',
'protocol' => 'imap',
'classname' => 'dbmaildbmailuser'
),
'classname' => 'defaultimap'
)
);
var $imapClass; // holds the imap/pop3 class
@ -401,11 +275,11 @@ class emailadmin_bo extends so_sql
switch($_class)
{
case 'imap':
return (isset(self::$IMAPServerType[$_serverTypeID]['fieldNames'])?self::$IMAPServerType[$_serverTypeID]['fieldNames']:array());
return (isset(self::$IMAPServerType[$_serverTypeID]['fieldNames'])?self::$IMAPServerType[$_serverTypeID]['fieldNames']:self::$supportedIMAPFields);
break;
case 'smtp':
if ($_serverTypeID=='defaultsmtp') $_serverTypeID='emailadmin_smtp';
return (isset(self::$SMTPServerType[$_serverTypeID]['fieldNames'])?self::$SMTPServerType[$_serverTypeID]['fieldNames']:array());
return (isset(self::$SMTPServerType[$_serverTypeID]['fieldNames'])?self::$SMTPServerType[$_serverTypeID]['fieldNames']:self::$supportedSMTPFields);
break;
}
}
@ -481,8 +355,8 @@ class emailadmin_bo extends so_sql
if (isset($profileData[$found]))
{
if ($profileData[$found]['smtpType']=='defaultsmtp') $profileData[$found]['smtpType'] = 'emailadmin_smtp';
$smtpFields = array();
$imapFields = array();
$smtpFields = self::$supportedSMTPFields;
$imapFields = self::$supportedIMAPFields;
if (isset(self::$SMTPServerType[$profileData[$found]['smtpType']]['fieldNames'])) $smtpFields = self::$SMTPServerType[$profileData[$found]['smtpType']]['fieldNames'];
if (isset(self::$IMAPServerType[$profileData[$found]['imapType']]['fieldNames'])) $imapFields = self::$IMAPServerType[$profileData[$found]['imapType']]['fieldNames'];
$fieldNames = array_merge($smtpFields,$imapFields);
@ -535,7 +409,7 @@ class emailadmin_bo extends so_sql
{
if ($extended)
{
$retData[$key]['fieldNames'] = isset($value['fieldNames'])?$value['fieldNames']:array();
$retData[$key]['fieldNames'] = isset($value['fieldNames'])?$value['fieldNames']:self::$supportedSMTPFields;
$retData[$key]['description'] = isset($value['description'])?$value['description']:$key;
$retData[$key]['classname'] = isset($value['classname'])?$value['classname']:$key;
}
@ -565,7 +439,7 @@ class emailadmin_bo extends so_sql
{
if ($extended)
{
$retData[$key]['fieldNames'] = isset($value['fieldNames'])?$value['fieldNames']:array();
$retData[$key]['fieldNames'] = isset($value['fieldNames'])?$value['fieldNames']:self::$supportedIMAPFields;
$retData[$key]['description'] = isset($value['description'])?$value['description']:$key;
$retData[$key]['protocol'] = isset($value['protocol'])?$value['protocol']:'imap';
$retData[$key]['classname'] = isset($value['classname'])?$value['classname']:$key;

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

@ -133,18 +133,65 @@ class emailadmin_hooks
{
case 'imap_server_types':
return array(
'defaultimap' => $extended ? array(
'description' => 'standard IMAP server',
'protocol' => 'imap',
'classname' => 'defaultimap'
) : 'standard IMAP server',
'emailadmin_dovecot' => $extended ? array(
'description' => 'Dovecot',
'classname' => 'emailadmin_dovecot',
'protocol' => 'imap',
) : 'Dovecot',
'cyrusimap' => $extended ? array(
'description' => 'Cyrus IMAP Server',
'protocol' => 'imap',
'classname' => 'cyrusimap'
) : 'Cyrus IMAP Server',
'dbmailqmailuser' => $extended ? array(
'description' => 'DBMail (qmailUser schema)',
'protocol' => 'imap',
'classname' => 'dbmailqmailuser'
) : 'DBMail (qmailUser schema)',
'pleskimap' => $extended ? array(
'description' => 'Plesk IMAP Server (Courier)',
'protocol' => 'imap',
'classname' => 'pleskimap'
) : 'Plesk IMAP Server (Courier)',
'dbmaildbmailuser' => $extended ? array(
'description' => 'DBMail (dbmailUser schema)',
'protocol' => 'imap',
'classname' => 'dbmaildbmailuser'
) : 'DBMail (dbmailUser schema)',
);
case 'smtp_server_types': // nothing yet
return array('emailadmin_smtp_sql' => $extended ? array(
return array(
'emailadmin_smtp' => $extended ? array(
'description' => 'standard SMTP-Server',
'classname' => 'emailadmin_smtp'
) : 'standard SMTP-Server',
'emailadmin_smtp_sql' => $extended ? array(
'description' => 'Postfix (SQL)',
'classname' => 'emailadmin_smtp_sql',
) : 'Postfix (SQL)');
) : 'Postfix (SQL)',
'postfixldap' => $extended ? array(
'description' => 'Postfix (qmail Schema)',
'classname' => 'postfixldap'
) : 'Postfix (qmail Schema)',
'postfixinetorgperson' => $extended ? array(
'description' => 'Postfix (inetOrgPerson Schema)',
'classname' => 'postfixinetorgperson'
) : 'Postfix (inetOrgPerson Schema)',
'smtpplesk' => $extended ? array(
'description' => 'Plesk SMTP-Server (Qmail)',
'classname' => 'smtpplesk'
) : 'Plesk SMTP-Server (Qmail)',
'postfixdbmailuser' => $extended ? array(
'description' => 'Postfix (dbmail Schema)',
'classname' => 'postfixdbmailuser'
) : 'Postfix (dbmail Schema)',
);
break;
}
}

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

@ -286,6 +286,7 @@ class emailadmin_ui extends emailadmin_bo
$content['ea_active'] = 'yes';
$content['ea_imap_login_type'] = 'admin';
$content['ea_description'] = common::display_fullname($lid,$fname,$lname,intval($_GET['account_id']));
$content['ea_smtp_type'] = 'emailadmin_smtp';
}
if (!empty($_GET['profileid']))
{
@ -296,6 +297,7 @@ class emailadmin_ui extends emailadmin_bo
else
{
$content['ea_user_defined_accounts'] = "yes";
$content['ea_smtp_type'] = 'emailadmin_smtp';
}
}
else
@ -382,6 +384,7 @@ class emailadmin_ui extends emailadmin_bo
}
}
if ($rowfound) $content = array_merge($this->data,array());
$content['ea_smtp_type'] = ($content['ea_smtp_type']=='defaultsmtp'?'emailadmin_smtp':$content['ea_smtp_type']);
$preserv['smtpcapabilities'] = $content['smtpcapabilities'] =
constant((!empty($content['ea_smtp_type'])?$content['ea_smtp_type']:'emailadmin_smtp').'::CAPABILITIES');
$preserv['imapcapabilities'] = $content['imapcapabilities'] =