R34190 - in /trunk/emailadmin: inc/class.emailadmin_bo.inc.php inc/class.emailadmin_sieve.inc.php setup/etemplates.inc.php

[leithoff]

Author: leithoff
New Revision: 34190

URL: http://www.egroupware.org/viewvc/egroupware?rev=34190&view=rev
Log:

• emailadmin: allow to specify (configure) a different sieveHost than your imapServer

Modified:
trunk/emailadmin/inc/class.emailadmin_bo.inc.php
trunk/emailadmin/inc/class.emailadmin_sieve.inc.php
trunk/emailadmin/setup/etemplates.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_bo.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_bo.inc.php?rev=34190&r1=34189&r2=34190&view=diff

— trunk/emailadmin/inc/class.emailadmin_bo.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_bo.inc.php Thu Mar 17 11:07:38 2011
@@ -580,6 +580,10 @@
$icServer->adminUsername = $data[‘imapAdminUsername’];
$icServer->adminPassword = $data[‘imapAdminPW’];
$icServer->enableSieve = ($data[‘imapEnableSieve’] == ‘yes’);

•   	if (!empty($data['imapSieveServer']))
  

•   	{
  

•   		$icServer->sieveHost = $data['imapSieveServer'];
  

•   	}
    	$icServer->sievePort	= $data['imapSievePort'];
    	if ($imapAuthType == 'admin') {
    		if (!empty($data['imapAuthUsername'])) $icServer->username = $icServer->loginName = $data['imapAuthUsername'];
  

Modified: trunk/emailadmin/inc/class.emailadmin_sieve.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_sieve.inc.php?rev=34190&r1=34189&r2=34190&view=diff

— trunk/emailadmin/inc/class.emailadmin_sieve.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_sieve.inc.php Thu Mar 17 11:07:38 2011
@@ -69,7 +69,15 @@
{
if ($this->debug) error_log(CLASS.’::’.METHOD.array2string($euser));
if(is_a($_icServer,‘defaultimap’) && $_icServer->enableSieve) {

•   	$sieveHost		= $_icServer->host;
  

•   	if (!empty($_icServer->sieveHost))
  

•   	{
  

•   		$sieveHost = $_icServer->sieveHost;
  

•   	}
  

•   	else
  

•   	{
  

•   		$sieveHost = $_icServer->host;
  

•   	}
  

•   	//error_log(__METHOD__.__LINE__.'->'.$sieveHost);
    	$sievePort		= $_icServer->sievePort;
    	$useTLS			= $_icServer->encryption > 0;
    	if ($euser) {
  

Modified: trunk/emailadmin/setup/etemplates.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/emailadmin/setup/etemplates.inc.php?rev=34190&r1=34189&r2=34190&view=diff

— trunk/emailadmin/setup/etemplates.inc.php (original)
+++ trunk/emailadmin/setup/etemplates.inc.php Thu Mar 17 11:07:38 2011
@@ -2,7 +2,7 @@
/**
* eGroupWare - eTemplates for Application emailadmin
* http://www.egroupware.org

• • generated by soetemplate::dump4setup() 2010-09-07 15:19

• • generated by soetemplate::dump4setup() 2011-03-17 09:42
  • @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  • @package emailadmin
    @@ -18,7 +18,7 @@

$templ_data[] = array(‘name’ => ‘emailadmin.edit.history’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘1.9.001’,‘data’ => ‘a:1:{i:0;a:6:{s:4:“type”;s:4:“grid”;s:4:“data”;a:2:{i:0;a:0:{}i:1;a:1:{s:1:“A”;a:2:{s:4:“type”;s:10:“historylog”;s:4:“name”;s:7:“history”;}}}s:4:“rows”;i:1;s:4:“cols”;i:1;s:4:“size”;s:17:“100%,400,auto”;s:7:“options”;a:3:{i:0;s:4:“100%”;i:1;s:3:“400”;i:6;s:4:“auto”;}}}’,‘size’ => ‘100%,400,auto’,‘style’ => ‘’,‘modified’ => ‘1283865538’,);

-$templ_data[] = array(‘name’ => ‘emailadmin.edit.IMAP’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘1.7.005’,‘data’ => ‘a:1:{i:0;a:6:{s:4:“type”;s:4:“grid”;s:4:“data”;a:7:{i:0;a:3:{s:2:“h3”;s:27:",!@ea_imap_login_type=admin";s:2:“h5”;s:27:",!@imapcapabilities=/sieve/";s:2:“h6”;s:27:",!@imapcapabilities=/admin/";}i:1;a:1:{s:1:“A”;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:1:“2”;i:1;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:26:“select type of IMAP server”;}i:2;a:4:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:“ea_imap_type”;s:5:“align”;s:5:“right”;s:8:“onchange”;i:1;}}}i:2;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;s:5:“label”;s:15:“server settings”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:4:{i:0;a:0:{}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:34:“IMAP server hostname or ip address”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:14:“ea_imap_server”;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:1
6:“IMAP server port”;}s:1:“B”;a:2:{s:4:“type”;s:3:“int”;s:4:“name”;s:12:“ea_imap_port”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:20:“imap server logintyp”;}s:1:“B”;a:3:{s:4:“type”;s:6:“select”;s:4:“name”;s:18:“ea_imap_login_type”;s:8:“onchange”;i:1;}}}s:4:“rows”;i:3;s:4:“cols”;i:2;}}}i:3;a:1:{s:1:“A”;a:3:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:4:{i:0;a:0:{}i:1;a:2:{s:1:“A”;a:3:{s:4:“type”;s:5:“label”;s:4:“span”;s:1:“2”;s:5:“label”;s:42:“Use predefined username and password below”;}s:1:“B”;a:1:{s:4:“type”;s:5:“label”;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:8:“username”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:21:“ea_imap_auth_username”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:8:“password”;}s:1:“B”;a:2:{s:4:“type”;s:6:“passwd”;s:4:“name”;s:21:“ea_imap_auth_password”;}}}s:4:“rows”;i:3;s:4:“cols”;i:2;}}}i:4;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“gr
oupbox”;s:4:“size”;s:1:“1”;s:5:“label”;s:19:“encryption settings”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:3:{i:0;a:0:{}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:20:“encrypted connection”;}s:1:“B”;a:6:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:1:“4”;i:1;a:4:{s:4:“type”;s:5:“radio”;s:4:“size”;s:1:“1”;s:5:“label”;s:8:“STARTTLS”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;}i:2;a:4:{s:4:“type”;s:5:“radio”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;s:4:“size”;s:1:“2”;s:5:“label”;s:3:“TLS”;}i:3;a:4:{s:4:“type”;s:5:“radio”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;s:4:“size”;s:1:“3”;s:5:“label”;s:3:“SSL”;}i:4;a:4:{s:4:“type”;s:5:“radio”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;s:4:“size”;s:1:“0”;s:5:“label”;s:13:“no encryption”;}}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:27:“do not validate certificate”;}s:1:“B”;a:3:{s:4:“type”;s:8:“checkbox”;s:4:“name”;s:16:“ea_imap_tsl_auth”;s:4:“size”;s:6:“yes,no”;}}}s:4:“rows”;i:2;s:4:“cols”;i:2;}}}i
:5;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;s:5:“label”;s:14:“sieve settings”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:5:{i:0;a:1:{s:2:“h1”;s:2:",1";}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:26:“Sieve server or ip address”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:20:“ea_imap_sieve_server”;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:12:“enable Sieve”;}s:1:“B”;a:3:{s:4:“type”;s:8:“checkbox”;s:4:“name”;s:20:“ea_imap_enable_sieve”;s:4:“size”;s:6:“yes,no”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:17:“Sieve server port”;}s:1:“B”;a:2:{s:4:“type”;s:3:“int”;s:4:“name”;s:18:“ea_imap_sieve_port”;}}i:4;a:2:{s:1:“A”;a:3:{s:4:“type”;s:5:“label”;s:4:“span”;s:1:“2”;s:5:“label”;s:78:“Vacation messages with start- and end-date require an admin account to be set”;}s:1:“B”;a:1:{s:4:“type”;s:5:“label”;}}}s:4:“rows”;i:4;s:4:“cols”;i:2;}}}i:6;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“groupbox”;s:4:“
size”;s:1:“1”;s:5:“label”;s:32:“Cyrus IMAP server administration”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:4:{i:0;a:2:{s:2:“h2”;s:27:",!@ea_imap_enable_cyrus=yes";s:2:“h3”;s:27:",!@ea_imap_enable_cyrus=yes";}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:39:“enable Cyrus IMAP server administration”;}s:1:“B”;a:4:{s:4:“type”;s:8:“checkbox”;s:4:“size”;s:6:“yes,no”;s:4:“name”;s:20:“ea_imap_enable_cyrus”;s:8:“onchange”;i:1;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:14:“admin username”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:18:“ea_imap_admin_user”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:14:“admin password”;}s:1:“B”;a:2:{s:4:“type”;s:6:“passwd”;s:4:“name”;s:16:“ea_imap_admin_pw”;}}}s:4:“rows”;i:3;s:4:“cols”;i:2;}}}}s:4:“rows”;i:6;s:4:“cols”;i:1;s:4:“size”;s:17:“100%,400,auto”;s:7:“options”;a:3:{i:0;s:4:“100%”;i:1;s:3:“400”;i:6;s:4:“auto”;}}}’,‘size’ => ‘100%,400,auto’,‘style’ => ‘’,‘modified
’ => ‘1274773039’,);
+$templ_data[] = array(‘name’ => ‘emailadmin.edit.IMAP’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘1.9.001’,‘data’ => ‘a:1:{i:0;a:6:{s:4:“type”;s:4:“grid”;s:4:“data”;a:7:{i:0;a:3:{s:2:“h3”;s:27:",!@ea_imap_login_type=admin";s:2:“h5”;s:27:",!@imapcapabilities=/sieve/";s:2:“h6”;s:27:",!@imapcapabilities=/admin/";}i:1;a:1:{s:1:“A”;a:4:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:1:“2”;i:1;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:26:“select type of IMAP server”;}i:2;a:4:{s:4:“type”;s:6:“select”;s:4:“name”;s:12:“ea_imap_type”;s:5:“align”;s:5:“right”;s:8:“onchange”;i:1;}}}i:2;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;s:5:“label”;s:15:“server settings”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:4:{i:0;a:0:{}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:34:“IMAP server hostname or ip address”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:14:“ea_imap_server”;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:1
6:“IMAP server port”;}s:1:“B”;a:2:{s:4:“type”;s:3:“int”;s:4:“name”;s:12:“ea_imap_port”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:20:“imap server logintyp”;}s:1:“B”;a:3:{s:4:“type”;s:6:“select”;s:4:“name”;s:18:“ea_imap_login_type”;s:8:“onchange”;i:1;}}}s:4:“rows”;i:3;s:4:“cols”;i:2;}}}i:3;a:1:{s:1:“A”;a:3:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:4:{i:0;a:0:{}i:1;a:2:{s:1:“A”;a:3:{s:4:“type”;s:5:“label”;s:4:“span”;s:1:“2”;s:5:“label”;s:42:“Use predefined username and password below”;}s:1:“B”;a:1:{s:4:“type”;s:5:“label”;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:8:“username”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:21:“ea_imap_auth_username”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:8:“password”;}s:1:“B”;a:2:{s:4:“type”;s:6:“passwd”;s:4:“name”;s:21:“ea_imap_auth_password”;}}}s:4:“rows”;i:3;s:4:“cols”;i:2;}}}i:4;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“gr
oupbox”;s:4:“size”;s:1:“1”;s:5:“label”;s:19:“encryption settings”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:3:{i:0;a:0:{}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:20:“encrypted connection”;}s:1:“B”;a:6:{s:4:“type”;s:4:“hbox”;s:4:“size”;s:1:“4”;i:1;a:4:{s:4:“type”;s:5:“radio”;s:4:“size”;s:1:“1”;s:5:“label”;s:8:“STARTTLS”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;}i:2;a:4:{s:4:“type”;s:5:“radio”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;s:4:“size”;s:1:“2”;s:5:“label”;s:3:“TLS”;}i:3;a:4:{s:4:“type”;s:5:“radio”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;s:4:“size”;s:1:“3”;s:5:“label”;s:3:“SSL”;}i:4;a:4:{s:4:“type”;s:5:“radio”;s:4:“name”;s:22:“ea_imap_tsl_encryption”;s:4:“size”;s:1:“0”;s:5:“label”;s:13:“no encryption”;}}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:27:“do not validate certificate”;}s:1:“B”;a:3:{s:4:“type”;s:8:“checkbox”;s:4:“name”;s:16:“ea_imap_tsl_auth”;s:4:“size”;s:6:“yes,no”;}}}s:4:“rows”;i:2;s:4:“cols”;i:2;}}}i
:5;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;s:5:“label”;s:14:“sieve settings”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:5:{i:0;a:2:{s:2:“h2”;s:27:",!@ea_imap_enable_sieve=yes";s:2:“h3”;s:27:",!@ea_imap_enable_sieve=yes";}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:12:“enable Sieve”;}s:1:“B”;a:4:{s:4:“type”;s:8:“checkbox”;s:4:“name”;s:20:“ea_imap_enable_sieve”;s:4:“size”;s:6:“yes,no”;s:8:“onchange”;i:1;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:26:“Sieve server or ip address”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:20:“ea_imap_sieve_server”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:17:“Sieve server port”;}s:1:“B”;a:2:{s:4:“type”;s:3:“int”;s:4:“name”;s:18:“ea_imap_sieve_port”;}}i:4;a:2:{s:1:“A”;a:3:{s:4:“type”;s:5:“label”;s:4:“span”;s:1:“2”;s:5:“label”;s:78:“Vacation messages with start- and end-date require an admin account to be set”;}s:1:“B”;a:1:{s:4:“type”;s:5:“label”;
}}}s:4:“rows”;i:4;s:4:“cols”;i:2;}}}i:6;a:1:{s:1:“A”;a:4:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;s:5:“label”;s:32:“Cyrus IMAP server administration”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:4:{i:0;a:2:{s:2:“h2”;s:27:",!@ea_imap_enable_cyrus=yes";s:2:“h3”;s:27:",!@ea_imap_enable_cyrus=yes";}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:39:“enable Cyrus IMAP server administration”;}s:1:“B”;a:4:{s:4:“type”;s:8:“checkbox”;s:4:“size”;s:6:“yes,no”;s:4:“name”;s:20:“ea_imap_enable_cyrus”;s:8:“onchange”;i:1;}}i:2;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:14:“admin username”;}s:1:“B”;a:2:{s:4:“type”;s:4:“text”;s:4:“name”;s:18:“ea_imap_admin_user”;}}i:3;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:14:“admin password”;}s:1:“B”;a:2:{s:4:“type”;s:6:“passwd”;s:4:“name”;s:16:“ea_imap_admin_pw”;}}}s:4:“rows”;i:3;s:4:“cols”;i:2;}}}}s:4:“rows”;i:6;s:4:“cols”;i:1;s:4:“size”;s:17:“100%,400,auto”;s:7:“options”;a:3:{i:0;s:4:“100%
”;i:1;s:3:“400”;i:6;s:4:“auto”;}}}’,‘size’ => ‘100%,400,auto’,‘style’ => ‘’,‘modified’ => ‘1300350962’,);

$templ_data[] = array(‘name’ => ‘emailadmin.edit.signature’,‘template’ => ‘’,‘lang’ => ‘’,‘group’ => ‘0’,‘version’ => ‘1.7.004’,‘data’ => ‘a:1:{i:0;a:6:{s:4:“type”;s:4:“grid”;s:4:“data”;a:2:{i:0;a:0:{}i:1;a:1:{s:1:“A”;a:3:{s:4:“type”;s:8:“groupbox”;s:4:“size”;s:1:“1”;i:1;a:5:{s:4:“type”;s:4:“grid”;s:7:“options”;a:0:{}s:4:“data”;a:3:{i:0;a:0:{}i:1;a:2:{s:1:“A”;a:2:{s:4:“type”;s:5:“label”;s:5:“label”;s:37:“users can define their own signatures”;}s:1:“B”;a:3:{s:4:“type”;s:8:“checkbox”;s:4:“name”;s:26:“ea_user_defined_signatures”;s:4:“size”;s:6:“yes,no”;}}i:2;a:2:{s:1:“A”;a:4:{s:4:“type”;s:8:“htmlarea”;s:4:“span”;s:1:“2”;s:4:“name”;s:20:“ea_default_signature”;s:4:“size”;s:17:“advanced,700,180”;}s:1:“B”;a:1:{s:4:“type”;s:5:“label”;}}}s:4:“rows”;i:2;s:4:“cols”;i:2;}}}}s:4:“rows”;i:1;s:4:“cols”;i:1;s:4:“size”;s:17:“100%,400,auto”;s:7:“options”;a:3:{i:0;s:4:“100%”;i:1;s:3:“400”;i:6;s:4:“auto”;}}}’,‘size’ => ‘100%,400,auto’,‘style’ => ‘’,‘modified’ => ‘1270799878’,);

---

Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs