[Fmsystem-commits] [16417] more on eventplanner

[sigurdne]

Revision: 16417
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16417
Author:   sigurdne
Date:     2017-03-09 06:54:54 -0500 (Thu, 09 Mar 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.uipermission.inc.php

Modified: trunk/eventplanner/inc/class.uipermission.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uipermission.inc.php   2017-03-09 10:33:46 UTC 
(rev 16416)
+++ trunk/eventplanner/inc/class.uipermission.inc.php   2017-03-09 11:54:54 UTC 
(rev 16417)
@@ -214,13 +214,28 @@
 
                public function get_subjet($selected = 0)
                {
-                       $users = 
(array)$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 
'eventplanner');
+                       $users_frontend = 
(array)$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 
'eventplannerfrontend');
+                       $users_backend = 
(array)$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 
'eventplanner');
 
+                       $users = array();
+                       foreach ($users_frontend as $user)
+                       {
+                               $users[$user['account_id']] = $user;
+                       }
+                       unset($user);
+
+                       foreach ($users_backend as $user)
+                       {
+                               $users[$user['account_id']] = $user;
+                       }
+                       unset($user);
+
                        $user_list = array();
-                       $user_list[] = array('id' => '','name' => 
lang('select'));
+                       $account_name = array();
                        foreach ($users as $user)
                        {
                                $name = (isset($user['account_lastname']) ? 
$user['account_lastname'] . ' ' : '') . $user['account_firstname'];
+                               $account_name[] = $name;
                                $user_list[] = array
                                (
                                        'id' => $user['account_id'],
@@ -228,6 +243,11 @@
                                        'selected' => $user['account_id'] == 
$selected ? 1 : 0
                                );
                        }
+
+                       array_multisort($account_name, SORT_ASC, $user_list);
+
+                       array_unshift($user_list, array('id' => '','name' => 
lang('select')));
+
                        return $user_list;
                }
        }
\ No newline at end of file