From 0f018671af7c383b7e1f23a9e85189d231afb352 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 3 Jul 2010 13:17:50 +0000
Subject: [PATCH] fixed self service

---
 lam/lib/modules/kolabUser.inc    | 10 ++++------
 lam/lib/modules/posixAccount.inc |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index f542861a..fd10d088 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -876,7 +876,7 @@ class kolabUser extends baseModule {
 				$delegateContainer->addElement(new htmlTableExtendedInputCheckbox('delDelegate_' . $i, false, $kolabDelegate[$i]));
 				$delegateContainer->addElement(new htmlOutputText(_('Delete')), true);
 			}
-			$delegateContainer->addElement(new htmlSelect('new_delegate_value', $delegates, null));
+			$delegateContainer->addElement(new htmlSelect('new_delegate_value', $delegates));
 			$delegateContainer->addElement(new htmlTableExtendedInputCheckbox('new_delegate', false, _("Add"), null, false), true);
 			$delegateLabel = new htmlOutputText(_('Delegates'));
 			$delegateLabel->alignment = htmlElement::ALIGN_TOP;
@@ -909,11 +909,9 @@ class kolabUser extends baseModule {
 				}
 			}
 			// input box for new invitation policy
-			$returnPol[] = array(
-				array('kind' => 'input', 'name' => 'invPol1', 'type' => 'text', 'value' => ''),
-				array('kind' => 'select', 'name' => 'invPol2', 'options' => array_values($this->invitationPolicies)),
-				array('kind' => 'input', 'type' => 'checkbox', 'name' => 'addInvPol'),
-				array('kind' => 'text', 'text' => _("Add")));
+			$invitationContainer->addElement(new htmlInputField('invPol1', ''));
+			$invitationContainer->addElement(new htmlSelect('invPol2', array_values($this->invitationPolicies)));
+			$invitationContainer->addElement(new htmlTableExtendedInputCheckbox('addInvPol', false, _("Add"), null, false), true);
 			$invitationLabel = new htmlOutputText(_('Invitation policy'));
 			$invitationLabel->alignment = htmlElement::ALIGN_TOP;
 			$return['kolabInvitationPolicy'] = new htmlTableRow(array(
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index 5a2d37e1..5ae343a6 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -1705,7 +1705,9 @@ class posixAccount extends baseModule implements passwordService {
 		$return = array();
 		if (in_array('password', $fields)) {
 			$pwd1 = new htmlTableExtendedInputField(_('New password'), 'posixAccount_password');
+			$pwd1->setIsPassword(true);
 			$pwd2 = new htmlTableExtendedInputField(_('Reenter password'), 'posixAccount_password2');
+			$pwd2->setIsPassword(true);
 			$return['password'] = new htmlTableRow(array(
 				$pwd1, $pwd2
 			));