From 58890aaf9c882bc9836d0899391907e32be554d5 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 10 Sep 2009 12:16:29 +0000 Subject: [PATCH] added email as mail Login Type --- setup/inc/class.setup_cmd_config.inc.php | 6 ++++-- setup/lang/egw_de.lang | 2 +- setup/lang/egw_en.lang | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php index 667af306bd..a4bd6a9b49 100644 --- a/setup/inc/class.setup_cmd_config.inc.php +++ b/setup/inc/class.setup_cmd_config.inc.php @@ -131,12 +131,14 @@ class setup_cmd_config extends setup_cmd '--backup-dir' => 'backup_dir', '--temp-dir' => 'temp_dir', '--webserver-url' => 'webserver_url', - '--mailserver' => array( //server,{IMAP|IMAPS|POP|POPS},[domain],[{standard(default)|vmailmgr = add domain for mailserver login}] + '--mailserver' => array( //server,{IMAP|IMAPS|POP|POPS},[domain],[{standard(default)|vmailmgr = add domain for mailserver login|email = use email of user (Standard Maildomain should be set)}] 'mail_server', array('name' => 'mail_server_type','allowed' => array('imap','imaps','pop3','pop3s'),'default'=>'imap'), 'mail_suffix', array('name' => 'mail_login_type','allowed' => array( - 'username (standard)' => 'standard','username@domain (virtual mail manager)' => 'vmailmgr', + 'username (standard)' => 'standard', + 'username@domain (virtual mail manager)' => 'vmailmgr', + 'email (Standard Maildomain should be set)' => 'email', ),'default'=>'standard'), ), '--cyrus' => array( diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang index c4e098165a..ead54432e6 100644 --- a/setup/lang/egw_de.lang +++ b/setup/lang/egw_de.lang @@ -292,7 +292,7 @@ hooks deregistered setup de Haken nicht mehr aktiv hooks registered setup de Haken registriert host information setup de Host Informationen host,[smtp port],[smtp user],[smtp password] setup de Host,[SMTP Port],[SMTP Benutzer],[SMTP Passwort] -host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add domain for mailserver login}] setup de Host,{imap | pop3 | imaps | pop3s},[Domain],[{standard(Vorgabe)|vmailmgr = Domain für Mailserver Anmeldung anhängen}] +host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add domain for mailserver login}] setup de Host,{imap | pop3 | imaps | pop3s},[Domain],[{standard(Vorgabe)|vmailmgr = Domain für Mailserver Anmeldung anhängen|email = eMail Adresse der Benutzer (Default MailDomain sollte gesetzt sein)}] host/ip domain controler setup de Hostname / IP des Domain Controler hostname/ip of database server setup de Hostname/IP des Datenbank-Servers hour (0-24) setup de Stunde (0-24) diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang index d0ea8ad9f3..4f29f56383 100644 --- a/setup/lang/egw_en.lang +++ b/setup/lang/egw_en.lang @@ -290,7 +290,7 @@ hooks deregistered setup en hooks deregistered hooks registered setup en hooks registered host information setup en Host information host,[smtp port],[smtp user],[smtp password] setup en host,[smtp port],[smtp user],[smtp password] -host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add domain for mailserver login}] setup en host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add domain for mailserver login}] +host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add domain for mailserver login}] setup en host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add domain for mailserver login|email = use email of user (Standard Maildomain should be set)}] host/ip domain controler setup en Host/IP Domain controler hostname/ip of database server setup en Hostname/IP of database server hour (0-24) setup en hour (0-24)