From 146304494fb3e727cd8ee2c4fcd89a455ddf85d7 Mon Sep 17 00:00:00 2001
From: katagia <katagia>
Date: Mon, 2 Jun 2003 17:48:02 +0000
Subject: [PATCH] Removed small bug, Modify didn't work Remvoed Session-Vars if
 not longer needed

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

diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index d35f117f..c55bc7ad 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -116,6 +116,7 @@ function initvars($type=false,$DN=false) { // This function registers all needes
 					}
 			}
 		 else {
+			if (session_is_registered("account_old")) session_unregister("account_old");
 			if ( (($type=='user')||($type=='group')) && ($_SESSION['config']->scriptServer)) $_SESSION['account'] = getquotas($type);
 			switch ($type) {
 				case 'user':
@@ -500,7 +501,7 @@ function checkid($values, $type, $values_old=false) { // if value is empty will
 	if ($entry) { // Entry with same ID found
 		$dn = (ldap_get_dn($_SESSION['ldap']->server(), $entry));
 		if (!$values_old) return _('ID is used from ' . $dn . ' !');
-		 else if ($dn!=$values_old->general_uidNumber) return _('ID is used from ' . $dn . ' !');
+		 else if ($dn!=$values_old->general_dn) return _('ID is used from ' . $dn . ' !');
 		 }
 	if ( $values->general_uidNumber < $minID || $values->general_uidNumber > $maxID) return _('Please enter a value between '. $minID . ' and ' . $maxID . '!');
 	return intval($values->general_uidNumber);
diff --git a/lam/templates/account.php b/lam/templates/account.php
index c11ac661..ed14c3ea 100644
--- a/lam/templates/account.php
+++ b/lam/templates/account.php
@@ -850,14 +850,20 @@ switch ($select_local) {
 			}
 		break;
 	case 'backmain':
+		if (session_is_registered("shelllist")) session_unregister("shelllist");
+		if (session_is_registered("account")) session_unregister("account");
+		if (session_is_registered("account_old")) session_unregister("account_old");
 		switch ( $_SESSION['type2'] ) {
 			case 'user' :
+				if (session_is_registered("type2")) session_unregister("type2");
 				echo '<meta http-equiv="refresh" content="0; URL=lists/listusers.php">';
 				break;
 			case 'group' :
+				if (session_is_registered("type2")) session_unregister("type2");
 				echo '<meta http-equiv="refresh" content="0; URL=lists/listgroups.php">';
 				break;
 			case 'host' :
+				if (session_is_registered("type2")) session_unregister("type2");
 				echo '<meta http-equiv="refresh" content="0; URL=lists/listhosts.php">';
 				break;
 			}