count entries are now removed in modules.inc:load_account()
This commit is contained in:
parent
b63b876aba
commit
b8a99ec1e3
|
@ -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
|
||||
|
|
|
@ -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'];
|
||||
}
|
||||
|
|
|
@ -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'];
|
||||
}
|
||||
|
|
|
@ -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'];
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue