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

[nomail]

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

date: 2004/06/29 11:02:44;  author: fipsfuchs;  state: Exp;  lines: +7 -27

Log Message:
more to see for menuaction viewuser
=====================================================================
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.45 
admin/inc/class.uiaccounts.inc.php:1.46
--- admin/inc/class.uiaccounts.inc.php:1.45     Fri Jun 25 12:27:44 2004
+++ admin/inc/class.uiaccounts.inc.php  Tue Jun 29 11:02:44 2004
@@ -729,32 +729,11 @@
                        $account = 
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
                        $userData = $account->read_repository();
                        
-                       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');
-                       }
+                       $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['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))
@@ -786,13 +765,14 @@
                        $userData['l_action']           = lang('View user 
account');
                        $userData['l_loginid']          = lang('LoginID');
                        $userData['l_account_active']   = lang('Account 
active');
-                       $userData['l_password']         = lang('Password');
+                       $userData['l_pwchange']         = lang('Last password 
change');
                        $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