From 5f305cccde524d528bff44b9c3d51fe4822f0cf4 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 13 Feb 2006 13:35:56 +0000
Subject: [PATCH] Fixed typo

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2678 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/getldif.php                            | 2 +-
 html/getxls.php                             | 2 +-
 include/functions_setup.inc                 | 4 ++--
 plugins/personal/generic/class_user.inc     | 4 ++--
 plugins/personal/mail/class_mailAccount.inc | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/getldif.php b/html/getldif.php
index 63d963696..21817d1b5 100644
--- a/html/getldif.php
+++ b/html/getldif.php
@@ -37,7 +37,7 @@ function dump_ldap ($mode= 0)
 	}
 	elseif($mode == 4){ // IVBB LDIF Export
 	$dn =  base64_decode($_GET['dn']);
-	$display= $ldap->gen_ldif($dn,"(objectClass=ivbbEntry)",array(
+	$display= $ldap->gen_ldif($dn,"(objectClass=ivbbentry)",array(
 	      "GouvernmentOrganizationalUnit","houseIdentifier","vocation",
 	      "ivbbLastDeliveryCollective","gouvernmentOrganizationalPersonLocality",
 	      "gouvernmentOrganizationalUnitDescription","gouvernmentOrganizationalUnitSubjectArea",
diff --git a/html/getxls.php b/html/getxls.php
index 0987675e5..4e8096d6f 100644
--- a/html/getxls.php
+++ b/html/getxls.php
@@ -378,7 +378,7 @@ function dump_ldap ($mode= 0)
   }
   elseif($mode == 4){ // IVBB LDIF Export
     $dn =  base64_decode($_GET['dn']);
-    /*$display= $ldap->gen_ldif($dn,"(objectClass=ivbbEntry)",array(
+    /*$display= $ldap->gen_ldif($dn,"(objectClass=ivbbentry)",array(
       "GouvernmentOrganizationalUnit","houseIdentifier","vocation",
       "ivbbLastDeliveryCollective","gouvernmentOrganizationalPersonLocality",
       "gouvernmentOrganizationalUnitDescription","gouvernmentOrganizationalUnitSubjectArea",
diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index 5a4405233..2a1551304 100644
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -600,7 +600,7 @@ function parse_contrib_conf()
     }
 
     /* Data readed, types replaced, samba version detected and checked if
-       we need to add SID and RIDBASE. Check if there is an ivbbEntry in
+       we need to add SID and RIDBASE. Check if there is an ivbbentry in
        the LDAP tree, in this case we will set the governmentmode to true.
        Create LDAP connection, to check if theres a domain Objekt definen
        in the LDAP schema. */
@@ -609,7 +609,7 @@ function parse_contrib_conf()
     }
 
     /* Try to find a Samba Domain Objekt */
-    $ldap->search("(objectClass=ivbbEntry)");
+    $ldap->search("(objectClass=ivbbentry)");
 
     /* Something found ??? so we need to define ridbase an SID by ourselfs */
     if($ldap->count()> 0) {
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index d1eecf77e..bcbd2d14c 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -614,7 +614,7 @@ class user extends plugin
     $tmp= array();
     foreach ($this->attrs['objectClass'] as $key => $set){
       $found= false;
-      foreach (array("ivbbEntry", "gosaUserTemplate") as $val){
+      foreach (array("ivbbentry", "gosaUserTemplate") as $val){
         if (preg_match ("/^$set$/i", $val)){
           $found= true;
           break;
@@ -636,7 +636,7 @@ class user extends plugin
 
     /* Hard coded government mode? */
     if ($this->config->current['GOVERNMENTMODE'] != 'false'){
-      $this->attrs['objectClass'][]= "ivbbEntry";
+      $this->attrs['objectClass'][]= "ivbbentry";
 
       /* Copy standard attributes */
       foreach ($this->govattrs as $val){
diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 5b5098e50..73ce759df 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -56,7 +56,7 @@ class mailAccount extends plugin
   /* attribute list for save action */
   var $attributes= array("mail", "gosaMailServer", "gosaMailQuota", "gosaMailMaxSize","gosaMailForwardingAddress",
       "gosaMailDeliveryMode", "gosaSpamSortLevel", "gosaSpamMailbox","gosaMailAlternateAddress",
-      "gosaVacationMessage", "uid");
+      "gosaVacationMessage", "uid", "gosaMailAlternateAddress", "gosaMailForwardingAddress");
   var $objectclasses= array("gosaMailAccount");
 
 
@@ -92,7 +92,7 @@ class mailAccount extends plugin
 
       /* Load attributes containing arrays */
       foreach (array("gosaMailAlternateAddress", "gosaMailForwardingAddress") as $val){
-        $this->$val = array();
+        $this->$val= array();
         if (isset($this->attrs["$val"]["count"])){
           for ($i= 0; $i<$this->attrs["$val"]["count"]; $i++){
             array_push($this->$val, $this->attrs["$val"][$i]);
-- 
2.30.2