[Fmsystem-commits] [12539] property: include inactive users for history

[Sigurd Nes]

Revision: 12539
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12539
Author:   sigurdne
Date:     2015-01-06 13:38:11 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
property: include inactive users for history

Modified Paths:
--------------
    trunk/property/inc/class.bocommon.inc.php

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2015-01-05 23:35:38 UTC (rev 
12538)
+++ trunk/property/inc/class.bocommon.inc.php   2015-01-06 13:38:11 UTC (rev 
12539)
@@ -388,6 +388,7 @@
                        }
 
                        $user_list = array();
+                       $selected_found = false;
 
                        foreach ($users as $user)
                        {
@@ -410,6 +411,12 @@
                                                        'lastname'              
=> $user['account_lastname'],
                                                );
                                }
+
+                               if(!$selected_found)
+                               {
+                                       $selected_found = $user['account_lid'] 
== $selected ? true : false;
+                               }
+
                        }
 
                        foreach ($user_list as &$user)
@@ -417,7 +424,25 @@
                                $user['id'] = $user['lid'];
                                $user['name'] = ltrim("{$user['lastname']}, 
{$user['firstname']}",', ');
                        }
+                       unset($user);
 
+                       if($selected && !$selected_found)
+                       {
+                               $user_id = 
$GLOBALS['phpgw']->accounts->name2id($selected);
+
+                               $_user = 
$GLOBALS['phpgw']->accounts->get($user_id);
+
+                               $user_list[] = array
+                               (
+                                       'lid'           => $_user->lid,
+                                       'firstname'     => $_user->firstname,
+                                       'lastname'      => $_user->lastname,
+                                       'id'            => $selected,
+                                       'name'          => $_user->__toString(),
+                                       'selected'      => 'selected'
+                               );
+                       }
+
                        return $user_list;
                }