From 0475ac886fcb7f9b1caacb4e9371234a2d2e5101 Mon Sep 17 00:00:00 2001
From: katagia <katagia>
Date: Sat, 28 Jun 2003 13:48:15 +0000
Subject: [PATCH] small ug. pwdallowlogin wasn't deleted

---
 lam/lib/account.inc       | 4 ++--
 lam/templates/account.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index f1e4c683..7ffca7be 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -1098,9 +1098,9 @@ function modifyuser($values,$values_old) { // Will modify the LDAP-Account
 		$attr['shadowWarning'] = $values->unix_pwdwarn; // shadowAccount_may
 	if (($values->unix_pwdwarn != $values_old->unix_pwdwarn) && ($values->general_pwdwarn ==''))
 		$attr_rem['shadowWarning'] = $values_old->unix_pwdwarn; // shadowAccount_may
-	if (($values->general_pwdallowlogin != $values_old->general_pwdallowlogin) && ($values->general_pwdallowlogin !=''))
+	if (($values->unix_pwdallowlogin != $values_old->unix_pwdallowlogin) && ($values->unix_pwdallowlogin !=''))
 		$attr['shadowInactive'] = $values->unix_pwdallowlogin; // shadowAccount_may
-	if (($values->general_pwdallowlogin != $values_old->general_pwdallowlogin) && ($values->general_pwdallowlogin ==''))
+	if (($values->unix_pwdallowlogin != $values_old->unix_pwdallowlogin) && ($values->unix_pwdallowlogin ==''))
 		$attr_rem['shadowInactive'] = $values_old->unix_pwdallowlogin; // shadowAccount_may
 	if (($date != $date_old) && $date) $attr['shadowExpire'] =  $date ; // shadowAccount_may
 	if (($date != $date_old) && !$date) $attr_rem['shadowExpire'] =  $date_old ; // shadowAccount_may
diff --git a/lam/templates/account.php b/lam/templates/account.php
index 382dd899..bd15b3b0 100644
--- a/lam/templates/account.php
+++ b/lam/templates/account.php
@@ -377,6 +377,7 @@ if ($select_local != 'pdf') {
 		for ($i=0; $i<sizeof($errors); $i++) StatusMessage($errors[$i][0], $errors[$i][1], $errors[$i][2]);
 	}
 
+
 switch ($select_local) { // Select which part of page will be loaded
 	// general = startpage, general account paramters
 	// unix = page with all shadow-options and password