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

[sigurdne]

Update of admin/inc

Modified Files:
     Branch: MAIN
            class.uiaccounts.inc.php lines: +9 -2

Log Message:
Uncheck inactive user and list users status - whether 'Active' (A) or 
'Inactive' (I) in Admin->User accounts.

====================================================
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.50 
admin/inc/class.uiaccounts.inc.php:1.51
--- admin/inc/class.uiaccounts.inc.php:1.50     Wed May 11 07:23:07 2005
+++ admin/inc/class.uiaccounts.inc.php  Thu Sep 29 08:38:51 2005
@@ -253,6 +253,7 @@
                                'lang_loginid'       => 
$this->nextmatchs->show_sort_order($sort,'account_lid',$order,$url,lang('LoginID')),
                                'lang_lastname'      => 
$this->nextmatchs->show_sort_order($sort,'account_lastname',$order,$url,lang('last
 name')),
                                'lang_firstname'     => 
$this->nextmatchs->show_sort_order($sort,'account_firstname',$order,$url,lang('first
 name')),
+                               'lang_status'     => 
$this->nextmatchs->show_sort_order($sort,'account_status',$order,$url,lang('status')),
                                'lang_edit'    => lang('edit'),
                                'lang_delete'  => lang('delete'),
                                'lang_view'    => lang('view'),
@@ -301,7 +302,8 @@
                                        $var = array(
                                                'row_loginid'   => 
$account['account_lid'],
                                                'row_firstname' => 
(!$account['account_firstname']?'&nbsp':$account['account_firstname']),
-                                               'row_lastname'  => 
(!$account['account_lastname']?'&nbsp':$account['account_lastname'])
+                                               'row_lastname'  => 
(!$account['account_lastname']?'&nbsp':$account['account_lastname']),
+                                               'row_status'    => 
$account['account_status']
                                        );
                                        $p->set_var($var);

@@ -1192,6 +1194,11 @@
                        }
                        //End

+                       if($userData['status']=='I')
+                       {
+                               unset($userData['status']);
+                       }
+
                        $var = Array(
                                'input_expires' => 
$GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True),
                                'lang_never'    => lang('Never'),