From b8a99ec1e31b4e68365d67d52725d010907b4b8a Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Mon, 2 May 2005 18:14:58 +0000
Subject: [PATCH] count entries are now removed in modules.inc:load_account()

---
 lam/lib/baseModule.inc                     | 6 ------
 lam/lib/modules/ieee802device.inc          | 2 --
 lam/lib/modules/inetLocalMailRecipient.inc | 4 ----
 lam/lib/modules/nisMailAlias.inc           | 3 ---
 4 files changed, 15 deletions(-)

diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index 0c23fb9c..b3c53743 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -109,13 +109,7 @@ class baseModule {
 	function load_attributes($attr) {
 		// Load attributes which are displayed
 		$objectClassName = $this->attributes['objectClass'];
-		// unset count entries
-		unset ($attr['count']);
 		$attributes = array_keys($attr);
-		foreach ($attributes as $attribute) unset ($attr[$attribute]['count']);
-		// unset double entries
-		for ($i=0; $i<count($attr); $i++)
-		if (isset($attr[$i])) unset($attr[$i]);
 		foreach ($attributes as $attribute) {
 			if (isset($this->attributes[$attribute])) {
 				// decode as unicode
diff --git a/lam/lib/modules/ieee802device.inc b/lam/lib/modules/ieee802device.inc
index e20b3fb8..bd60da86 100644
--- a/lam/lib/modules/ieee802device.inc
+++ b/lam/lib/modules/ieee802device.inc
@@ -95,12 +95,10 @@ class ieee802Device extends baseModule {
 		$this->orig['objectClass'] = array();
 		$this->orig['macAddress'] = array();
 		if (isset($attr['objectClass'])) {
-			unset($attr['objectClass']['count']);
 			$this->attributes['objectClass'] = $attr['objectClass'];
 			$this->orig['objectClass'] = $attr['objectClass'];
 		}
 		if (isset($attr['macAddress'])) {
-			unset($attr['macAddress']['count']);
 			$this->attributes['macAddress'] = $attr['macAddress'];
 			$this->orig['macAddress'] = $attr['macAddress'];
 		}
diff --git a/lam/lib/modules/inetLocalMailRecipient.inc b/lam/lib/modules/inetLocalMailRecipient.inc
index cb3d4baf..210951cd 100644
--- a/lam/lib/modules/inetLocalMailRecipient.inc
+++ b/lam/lib/modules/inetLocalMailRecipient.inc
@@ -139,22 +139,18 @@ class inetLocalMailRecipient extends baseModule {
 		$this->orig['mailRoutingAddress'] = array();
 		$this->orig['mailHost'] = array();
 		if (isset($attr['objectClass'])) {
-			unset($attr['objectClass']['count']);
 			$this->attributes['objectClass'] = $attr['objectClass'];
 			$this->orig['objectClass'] = $attr['objectClass'];
 		}
 		if (isset($attr['mailLocalAddress'])) {
-			unset($attr['mailLocalAddress']['count']);
 			$this->attributes['mailLocalAddress'] = $attr['mailLocalAddress'];
 			$this->orig['mailLocalAddress'] = $attr['mailLocalAddress'];
 		}
 		if (isset($attr['mailRoutingAddress'])) {
-			unset($attr['mailRoutingAddress']['count']);
 			$this->attributes['mailRoutingAddress'] = $attr['mailRoutingAddress'];
 			$this->orig['mailRoutingAddress'] = $attr['mailRoutingAddress'];
 		}
 		if (isset($attr['mailHost'])) {
-			unset($attr['mailHost']['count']);
 			$this->attributes['mailHost'] = $attr['mailHost'];
 			$this->orig['mailHost'] = $attr['mailHost'];
 		}
diff --git a/lam/lib/modules/nisMailAlias.inc b/lam/lib/modules/nisMailAlias.inc
index b512af23..29907b0b 100644
--- a/lam/lib/modules/nisMailAlias.inc
+++ b/lam/lib/modules/nisMailAlias.inc
@@ -114,17 +114,14 @@ class nisMailAlias extends baseModule {
 		$this->orig['rfc822MailMember'] = array();
 		$this->orig['cn'] = array();
 		if (isset($attr['objectClass'])) {
-			unset($attr['objectClass']['count']);
 			$this->attributes['objectClass'] = $attr['objectClass'];
 			$this->orig['objectClass'] = $attr['objectClass'];
 		}
 		if (isset($attr['cn'])) {
-			unset($attr['cn']['count']);
 			$this->attributes['cn'] = $attr['cn'];
 			$this->orig['cn'] = $attr['cn'];
 		}
 		if (isset($attr['rfc822MailMember'])) {
-			unset($attr['rfc822MailMember']['count']);
 			$this->attributes['rfc822MailMember'] = $attr['rfc822MailMember'];
 			$this->orig['rfc822MailMember'] = $attr['rfc822MailMember'];
 		}