From 4d769306f30298d255af1ae14c211273c0f5eef9 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 4 Sep 2005 17:45:30 +0000
Subject: [PATCH] updated documentation and check email on old accounts, too

---
 lam/docs/README.Kolab.txt     | 21 ++++++++++++++++++---
 lam/lib/modules/kolabUser.inc |  8 ++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lam/docs/README.Kolab.txt b/lam/docs/README.Kolab.txt
index f37d5f6b..d5630009 100644
--- a/lam/docs/README.Kolab.txt
+++ b/lam/docs/README.Kolab.txt
@@ -2,7 +2,15 @@
 Some notes on managing Kolab accounts with LAM: 
 
 
-1. Deleting accounts
+1. Creating accounts
+  
+  The mailbox server cannot be changed after the account has been saved. Please
+  make sure that the value is correct.
+  The email address ("Personal" page) must match your Kolab domain, otherwise the
+  account will not work.
+
+
+2. Deleting accounts
 
   If you want to cleanly delete accounts use the "Mark for deletion" button on the
   Kolab subpage of an account. This will also remove the user's mailbox.
@@ -10,7 +18,7 @@ Some notes on managing Kolab accounts with LAM:
   then no cleanup actions are made.
 
 
-2. Managing accounts with both LAM and Kolab Admin GUI
+3. Managing accounts with both LAM and Kolab Admin GUI
 
   The Kolab GUI has some restrictions that LAM does not have.
   Please pay attention to the following restrictions:
@@ -26,8 +34,15 @@ Some notes on managing Kolab accounts with LAM:
     violation. This is caused by a bug in the Kolab GUI.
 
 
-3. Installing LAM on the Kolab server
+4. Adding a Kolab part to existing accounts
+
+  If you upgrade existing non-Kolab accounts please make sure that the account
+  has a Unix password.
+
+
+5. Installing LAM on the Kolab server
 
   You can install LAM in the directory "/kolab/var/kolab/www" which is
   the root directory for Apache.
   The PHP installation already includes all required packages.
+
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index c146f956..160a78f6 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -300,9 +300,9 @@ class kolabUser extends baseModule {
 			elseif (isset($_SESSION[$this->base]->module['inetOrgPerson']) && !$_SESSION[$this->base]->module['inetOrgPerson']->attributes['userPassword'][0]) {
 				StatusMessage('ERROR', _("Please enter a user password on this page: %s"), '', array($_SESSION[$this->base]->module['inetOrgPerson']->get_alias()));
 			}
-			if (!$_SESSION[$this->base]->module['inetOrgPerson']->attributes['mail'][0]) {
-				StatusMessage('ERROR', _("Please enter an email address on this page: %s"), '', array($_SESSION[$this->base]->module['inetOrgPerson']->get_alias()));
-			}
+		}
+		if (!$_SESSION[$this->base]->module['inetOrgPerson']->attributes['mail'][0]) {
+			StatusMessage('ERROR', _("Please enter an email address on this page: %s"), '', array($_SESSION[$this->base]->module['inetOrgPerson']->get_alias()));
 		}
 		$return = array();
 		// check if account is marked for deletion
@@ -621,10 +621,10 @@ class kolabUser extends baseModule {
 	* @return true, if account can be saved
 	*/
 	function module_complete() {
+		if (!$_SESSION[$this->base]->module['inetOrgPerson']->attributes['mail'][0]) return false;
 		if ($_SESSION[$this->base]->isNewAccount) {
 			if (isset($_SESSION[$this->base]->module['posixAccount']) && !$_SESSION[$this->base]->module['posixAccount']->attributes['userPassword'][0]) return false;
 			elseif (isset($_SESSION[$this->base]->module['inetOrgPerson']) && !$_SESSION[$this->base]->module['inetOrgPerson']->attributes['userPassword'][0]) return false;
-			if (!$_SESSION[$this->base]->module['inetOrgPerson']->attributes['mail'][0]) return false;
 			return $this->inputCorrect;
 		}
 		else {