gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user deliver.php.in, 1.8, 1.9 forward.php.in, 1.7, 1.8 vacation.php.in, 1.9, 1.10

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
Log Message:
Add check for unknown script.

Index: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- deliver.php.in	6 Apr 2010 17:56:33 -0000	1.8
+++ deliver.php.in	7 Apr 2010 03:52:27 -0000	1.9
@@ -61,6 +61,12 @@
 		} else {
 		  $messages[] =  sprintf(_("Delivery to '%s' successfully deactivated"), $_REQUEST['inbox']);
 		}
+	  } else {
+		$result = $handler->checkUnknownScript();
+		if ($result) {
+		  $errors[] = sprintf(_("Warning: You currently have a sieve script named %s active for your account."), $result);
+		  $errors[] = _("Warning: This script will be overwritten without further warnings if you press \"Update\"!");
+		}
 	  }
 	} catch (Exception $e) {
 	  $errors[] = $e->getMessage();

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- forward.php.in	6 Apr 2010 17:56:33 -0000	1.7
+++ forward.php.in	7 Apr 2010 03:52:27 -0000	1.8
@@ -63,6 +63,12 @@
 		} else {
 		  $messages[] = sprintf(_("Forwarding to '%s' successfully deactivated"), $_REQUEST['address']);
 		}
+	  } else {
+		$result = $handler->checkUnknownScript();
+		if ($result) {
+		  $errors[] = sprintf(_("Warning: You currently have a sieve script named %s active for your account."), $result);
+		  $errors[] = _("Warning: This script will be overwritten without further warnings if you press \"Update\"!");
+		}
 	  }
 	} catch (Exception $e) {
 	  $errors[] = $e->getMessage();

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vacation.php.in	6 Apr 2010 17:56:33 -0000	1.9
+++ vacation.php.in	7 Apr 2010 03:52:27 -0000	1.10
@@ -58,6 +58,12 @@
 		  $messages[] = _('Vacation message successfully deactivated');
 		}
 	  } else {
+		$result = $handler->checkUnknownScript();
+		if ($result) {
+		  $errors[] = sprintf(_("Warning: You currently have a sieve script named %s active for your account."), $result);
+		  $errors[] = _("Warning: This script will be overwritten without further warnings if you press \"Update\"!");
+		}
+
 		$addresses = $handler->fetchVacationSegment()->getRecipientAddresses();
 		if (empty($addresses)) {
 		  $object = $ldap->read($auth->dn());