Merge branch '2013.10' into 2014.11
[tine20] / tine20 / Tinebase / User / ActiveDirectory.php
index 57a1b3d..5a1c2d8 100644 (file)
@@ -161,7 +161,7 @@ class Tinebase_User_ActiveDirectory extends Tinebase_User_Ldap
         // add user to primary group and set primary group
         Tinebase_Group::getInstance()->addGroupMemberInSyncBackend($_user->accountPrimaryGroup, $userId);
         
-        // set primary goup id
+        // set primary group id
         $this->_ldap->updateProperty($dn, array('primarygroupid' => $primaryGroupId));
         
 
@@ -567,7 +567,7 @@ class Tinebase_User_ActiveDirectory extends Tinebase_User_Ldap
             }
             $ldapData['gidnumber'] = Tinebase_Group::getInstance()->resolveGidNumber($_user->accountPrimaryGroup);
             
-            $ldapData['msSFU30NisDomain'] = array_value(0, explode('.', $this->_domainName));
+            $ldapData['msSFU30NisDomain'] = Tinebase_Helper::array_value(0, explode('.', $this->_domainName));
         }
         
         if (isset($_user->sambaSAM) && $_user->sambaSAM instanceof Tinebase_Model_SAMUser) {