mathieu: server/kolab-webadmin/kolab-webadmin/www/admin/user deliver.php.in, 1.2, 1.3 forward.php.in, 1.2, 1.3 vacation.php.in, 1.4, 1.5

[cvs at kolab.org]

Author: mathieu

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv27576/kolab-webadmin/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
kolab/issue991 (Better error message when connecting to sieve fails)


Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- deliver.php.in	21 Nov 2007 13:32:42 -0000	1.2
+++ deliver.php.in	27 Aug 2009 21:33:01 -0000	1.3
@@ -53,8 +53,11 @@
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   
+  if( $sieve->getError() ) {
+    $errors[] = _('Error while connecting to Sieve service:');
+    $errors[] = $sieve->getError();
   // Update sieve script on server in case we have submit data
-  if( $_REQUEST['submit'] ) {
+  } elseif( $_REQUEST['submit'] ) {
 	$inbox  = trim($_REQUEST['inbox']);
 	$active = isset($_REQUEST['active']);
 

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- forward.php.in	21 Nov 2007 13:32:42 -0000	1.2
+++ forward.php.in	27 Aug 2009 21:33:01 -0000	1.3
@@ -54,8 +54,11 @@
   $obj = $ldap->read( $auth->dn() );
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   
+  if( $sieve->getError() ) {
+    $errors[] = _('Error while connecting to Sieve service:');
+    $errors[] = $sieve->getError();
   // Update sieve script on server in case we have submit data
-  if( $_REQUEST['submit'] ) {
+  } elseif( $_REQUEST['submit'] ) {
 	$address = trim($_REQUEST['address']);
 	$keep = isset($_REQUEST['keep']);
 	$active = isset($_REQUEST['active']);

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vacation.php.in	21 Nov 2007 13:32:42 -0000	1.4
+++ vacation.php.in	27 Aug 2009 21:33:01 -0000	1.5
@@ -33,8 +33,11 @@
   $sieve =& new Net_Sieve( $auth->uid(), $auth->password(), $obj['kolabHomeServer'][0] );
   //$sieve->setDebug(true);
 
+  if( $sieve->getError() ) {
+    $errors[] = _('Error while connecting to Sieve service:');
+    $errors[] = $sieve->getError();
   // Update sieve script on server in case we have submit data
-  if( $_REQUEST['submit'] ) {
+  } elseif( $_REQUEST['submit'] ) {
 	$addresses = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_REQUEST['addresses'] ) ), 'strlen') );
 	$maildomain = trim( $_REQUEST['maildomain'] );
 	$reacttospam = isset( $_REQUEST['reacttospam'] );