Fixed typo

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2678 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/getldif.php b/html/getldif.php
index 63d9636967b885d31642292083b2ce64b12af7fd..21817d1b537157a657d0b2c86a717029fa6b8e0e 100644 (file)
--- 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 0987675e5db99a3fdf7173002b5556051f6f17f6..4e8096d6fbd10850f0d4905906b0ff9870395034 100644 (file)
--- 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 5a44052333167114324dcd279159b63be6af772a..2a15513042c0f5d903b800a54893eddb28919890 100644 (file)
--- 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 d1eecf77eb57691e558c353c3eebbf076a45d6b8..bcbd2d14c63dc078d8668492909404a18d311ec7 100644 (file)
--- 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 5b5098e509d07d50ed89a96a74bac369d9121fd3..73ce759dfd631d174a0bb96bec300d6b4a3cbf98 100644 (file)
--- 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]);