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

some more changes to create mail accounts via setup

Browse Source
This commit is contained in:
Ralf Becker 2014-04-15 20:03:16 +00:00
parent 147fe01d38
commit 90218092c2
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup/inc/class.setup_cmd_config.inc.php
View File

@ -15,6 +15,11 @@
*/
class setup_cmd_config extends setup_cmd
{
/**
* Allow to run this command via setup-cli
*/
const SETUP_CLI_CALLABLE = true;
/**
* Constructor
*
@ -149,7 +154,7 @@ class setup_cmd_config extends setup_cmd
'userId@domain eg. u123@domain' => 'uidNumber',
'email (Standard Maildomain should be set)' => 'email',
),'default'=>'standard'),
array('name' => 'acc_imap_ssl','allowed' => array('no','starttls','ssl','tls')),
array('name' => 'acc_imap_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
),
'--imap' => array(
'acc_admin_username',
@ -163,7 +168,7 @@ class setup_cmd_config extends setup_cmd
array('name' => 'acc_sieve_host'),
array('name' => 'acc_sieve_port','default' => 4192),
array('name' => 'acc_sieve_enabled','default' => 'yes'), // null or yes
array('name' => 'acc_sieve_ssl','allowed' => array('no','starttls','ssl','tls')),
array('name' => 'acc_sieve_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
),
'--smtp' => array(
array('name' => 'editforwardingaddress','allowed' => array('yes',null)),
@ -171,7 +176,7 @@ class setup_cmd_config extends setup_cmd
),
'--smtpserver' => array( //smtp server,[smtp port],[smtp user],[smtp password],[no|starttls|ssl|tls]
'acc_smtp_host',array('name' => 'acc_smtp_port','default' => 25),'acc_smtp_username','acc_smtp_passwd',
array('name' => 'acc_smtp_ssl','allowed' => array('no','starttls','ssl','tls')),
array('name' => 'acc_smtp_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
),
'--account-auth' => array(
array('name' => 'account_repository','allowed' => array('sql','ldap','ads'),'default'=>'sql'),
@ -208,6 +213,7 @@ class setup_cmd_config extends setup_cmd
'imapAdminUsername' => 'acc_admin_username',
'imapAdminPW' => 'acc_admin_password',
'imapType' => 'acc_imap_type',
'imapTLSEncryption' => 'acc_imap_ssl',
'imapSieveServer' => 'acc_sieve_host',
'imapSievePort' => 'acc_sieve_port',
'imapEnableSieve' => 'acc_sieve_enabled',
@ -218,6 +224,7 @@ class setup_cmd_config extends setup_cmd
'smtp_auth_user' => 'acc_smtp_username',
'smtp_auth_passwd' => 'acc_smtp_password',
'smtpAuth' => null,
'organisationName' => 'ident_org',
);
/**
@ -242,6 +249,7 @@ class setup_cmd_config extends setup_cmd
if (!isset($this->$name) && $oldname && isset($this->$oldname))
{
$this->$name = $this->$oldname;
unset($this->$oldname);
}
if (isset($this->$name))
{
@ -271,7 +279,7 @@ class setup_cmd_config extends setup_cmd
}
$options = is_array(self::$options[$arg]) ? explode(',',array_shift($args)) : array(array_shift($args));
if ($arg == '--config')
if ($arg == '--config' || $arg == '--setup_cmd_config')
{
foreach($options as $option)
{

2
setup/setup-cli.php
View File

@ -17,6 +17,8 @@ if (php_sapi_name() !== 'cli') // security precaution: forbit calling setup-cli
{
die('<h1>setup-cli.php must NOT be called as web-page --> exiting !!!</h1>');
}
error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
$dry_run = false;
array_shift($_SERVER['argv']);