[Phpgroupware-cvs] phpgwapi/inc/class.accounts_ldap.inc.php, 1.101.2.13.2.33

[nomail]

Update of /phpgwapi/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.accounts_ldap.inc.php

date: 2004/07/29 07:35:24;  author: fipsfuchs;  state: Exp;  lines: +3 -3

Log Message:
naming problems fixed
=====================================================================
Index: phpgwapi/inc/class.accounts_ldap.inc.php
diff -u phpgwapi/inc/class.accounts_ldap.inc.php:1.101.2.13.2.32 
phpgwapi/inc/class.accounts_ldap.inc.php:1.101.2.13.2.33
--- phpgwapi/inc/class.accounts_ldap.inc.php:1.101.2.13.2.32    Wed Jul 28 
08:22:52 2004
+++ phpgwapi/inc/class.accounts_ldap.inc.php    Thu Jul 29 07:35:24 2004
@@ -717,10 +717,10 @@
                        // phpgw attributes
                        $entry['objectclass'][]       = 'phpgwAccount';
                        $entry['phpgwaccountid']      = 
$account_info['account_id'];
-                       $entry['phpgwaccountexpires'] = 
$account_info['account_expires'];
-                       if ($account_info['account_status'])
+                       $entry['phpgwaccountexpires'] = 
isset($account_info['account_expires'])  ? $account_info['account_expires'] : 
$account_info['expires'];
+                       if ($account_info['account_status'] || 
$account_info['status'])
                        {
-                               $entry['phpgwaccountstatus'] = 
$account_info['account_status'];
+                               $entry['phpgwaccountstatus'] = 
isset($account_info['account_status']) ? $account_info['account_status'] : 
$account_info['status'];
                        }
                        else
                        {