[Phpgroupware-cvs] admin/inc/class.uiaccounts.inc.php, 1.47

[nomail]

Update of /admin/inc
Modified Files:
        Branch: 
          class.uiaccounts.inc.php

date: 2004/07/27 13:09:38;  author: fipsfuchs;  state: Exp;  lines: +38 -16

Log Message:
more to see in view_user
=====================================================================
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.46 
admin/inc/class.uiaccounts.inc.php:1.47
--- admin/inc/class.uiaccounts.inc.php:1.46     Tue Jun 29 11:02:44 2004
+++ admin/inc/class.uiaccounts.inc.php  Tue Jul 27 13:09:38 2004
@@ -729,50 +729,72 @@
                        $account = 
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
                        $userData = $account->read_repository();
                        
-                       $userData['status'] = $userData['status'] ? 
lang('Enabled') : lang('Disabled'); 
-                       $userData['lastlogin'] = $userData['lastlogin'] ? 
$GLOBALS['phpgw']->common->show_date($userData['lastlogin']) : lang('Never');
-                       $userData['expires'] = ($userData['expires'] != -1) ? 
$GLOBALS['phpgw']->common->show_date($userData['expires']) : lang('Never'); 
-                       $userData['lastpasswd_change'] = 
$userData['lastpasswd_change'] ? 
$GLOBALS['phpgw']->common->show_date($userData['lastpasswd_change']) : 
lang('Never');
+                       if ($userData['status'])
+                       {
+                               $userData['account_status'] = lang('Enabled');
+                       }
+                       else
+                       {
+                               $userData['account_status'] = lang('Disabled');
+                       }
+                       
+                       if ($userData['lastlogin'])
+                       {
+                               $userData['account_lastlogin'] = 
$GLOBALS['phpgw']->common->show_date($userData['lastlogin']);
+                       }
+                       else
+                       {
+                               $userData['account_lastlogin'] = lang('Never');
+                       }
                        
+                       if ($userData['expires'] != -1)
+                       {
+                               $userData['input_expires'] = 
$GLOBALS['phpgw']->common->show_date($userData['expires']);
+                       }
+                       else
+                       {
+                               $userData['input_expires'] = lang('Never');
+                       }
                        // Find out which groups they are members of
                        $usergroups = 
$account->membership(intval($_GET['account_id']));
                        while (list(,$group) = each($usergroups))
                        {
                                $userData['groups'][] = $group['account_name'];
                        }
+
                        //Permissions
                        $availableApps = $GLOBALS['phpgw_info']['apps'];
                        $apps  = 
CreateObject('phpgwapi.applications',intval($_GET['account_id']));
                        $perms = array_keys($apps->read_account_specific());
-                       
-                       @asort($availableApps);
-                       @reset($availableApps);
-                       $i = 0;
-                       while ($application = each($availableApps)) 
+                       if(is_array($availableApps) && count($availableApps))
                        {
-                               if ($application[1]['enabled'] && 
$application[1]['status'] != 2) 
+                               asort($availableApps);
+                               $i = 0;
+                               while ($application = each($availableApps)) 
                                {
-                                       $userData['permissions'][$i]['name'] = 
$application[1]['title'];
-                                       if(in_array($application[1]['name'], 
$perms))
+                                       if ($application[1]['enabled'] && 
$application[1]['status'] != 2) 
                                        {
-                                               
$userData['permissions'][$i]['enabled'] = true;
+                                               
$userData['permissions'][$i]['name'] = $application[1]['title'];
+                                               
if(in_array($application[1]['name'], $perms))
+                                               {
+                                                       
$userData['permissions'][$i]['enabled'] = true;
+                                               }
                                        }
+                                       $i++;
                                }
-                               $i++;
                        }
 
                        // Labels
                        $userData['l_action']           = lang('View user 
account');
                        $userData['l_loginid']          = lang('LoginID');
                        $userData['l_account_active']   = lang('Account 
active');
-                       $userData['l_pwchange']         = lang('Last password 
change');
+                       $userData['l_password']         = lang('Password');
                        $userData['l_lastname']         = lang('Last Name');
                        $userData['l_groups']           = lang('Groups');
                        $userData['l_firstname']        = lang('First Name');
                        $userData['l_lastlogin']        = lang('Last login');
                        $userData['l_lastloginfrom']    = lang('Last login 
from');
                        $userData['l_expires']          = lang('Expires');
-                       $userData['l_status']           = lang('Status');
                        $userData['l_back']             = lang('Back');
 
                        // Interactions