[Phpgroupware-cvs] admin/inc class.uiaclmanager.inc.php, 1.5.2.2.2.10

[skwashd]

Update of admin/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uiaclmanager.inc.php lines: +18 -13

Log Message:
fix it so you can make any group an addressmaster - which makes a lot more 
sense and some E_NOTICE fixes

====================================================
Index: admin/inc/class.uiaclmanager.inc.php
diff -u admin/inc/class.uiaclmanager.inc.php:1.5.2.2.2.9 
admin/inc/class.uiaclmanager.inc.php:1.5.2.2.2.10
--- admin/inc/class.uiaclmanager.inc.php:1.5.2.2.2.9    Sat Nov  6 16:13:47 2004
+++ admin/inc/class.uiaclmanager.inc.php        Tue Dec  6 22:59:49 2005
@@ -253,7 +253,7 @@
                                'account_id'    => 
$GLOBALS['phpgw_info']['user']['account_id']
                        );

-                       if ($_POST['save'])
+                       if ( isset($_POST['save']) && $_POST['save'] )
                        {
                                $error = 
$this->boacl->check_values($_POST['account_addressmaster'],$_POST['group_addressmaster']);
                                if(is_array($error))
@@ -309,9 +309,10 @@
                                
$GLOBALS['phpgw']->template->set_var('lang_select_users',lang('Select users'));
                                
$GLOBALS['phpgw']->template->set_var('lang_select_groups',lang('Select 
groups'));

-                               $app_user = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'addressbook');
+                               $app_user = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run', 1, 'addressbook');

                                $add_users = 
$GLOBALS['phpgw']->accounts->return_members($app_user);
+                               $add_users['groups'] = 
$GLOBALS['phpgw']->accounts->get_list('groups');

                                $usel = $this->boacl->get_addressmaster_ids();

@@ -321,7 +322,7 @@
                                        $user_list .= '<option value="' . 
$add_users['users'][$i] . '"';
                                        if (is_array($usel) && 
in_array($add_users['users'][$i],$usel))
                                        {
-                                               $user_list .= ' SELECTED';
+                                               $user_list .= ' 
selected="selected"';
                                        }
                                        $user_list .= '>';
                                        $user_list .= 
$GLOBALS['phpgw']->common->grab_owner_name($add_users['users'][$i])
@@ -332,21 +333,25 @@
                                
$GLOBALS['phpgw']->template->set_var('u_select_size',($add_user_num < 
7?$add_user_num:7));
                                
$GLOBALS['phpgw']->template->set_var('user_list',$user_list);

-                               for($i=0;$i<count($add_users['groups']);$i++)
+                               $group_list = '';
+
+                               if ( is_array($add_users['groups']) && 
count($add_users['groups']) )
                                {
-                                       $group_list .= '<option value="' . 
$add_users['groups'][$i] . '"';
-                                       if (is_array($usel) && 
in_array($add_users['groups'][$i],$usel))
+                                       foreach ( $add_users['groups'] as 
$group )
                                        {
-                                               $group_list .= ' selected';
+                                               $group_list .= '<option 
value="' . $group['account_id'] . '"';
+                                               if ( is_array($usel) && 
in_array($group['account_id'], $usel))
+                                               {
+                                                       $group_list .= ' 
selected="selected"';
+                                               }
+                                               $group_list .= '>';
+                                               $group_list .= 
$GLOBALS['phpgw']->common->grab_owner_name($group['account_id']) . '</option>' 
. "\n";
                                        }
-                                       $group_list .= '>';
-                                       $group_list .= 
$GLOBALS['phpgw']->common->grab_owner_name($add_users['groups'][$i])
-                                                       . '</option>' . "\n";
                                }

                                $add_group_num = count($add_users['groups']);
-                               
$GLOBALS['phpgw']->template->set_var('g_select_size',($add_group_num < 
7?$add_group_num:7));
-                               
$GLOBALS['phpgw']->template->set_var('group_list',$group_list);
+                               
$GLOBALS['phpgw']->template->set_var('g_select_size', ($add_group_num < 7 ? 
$add_group_num : 7));
+                               
$GLOBALS['phpgw']->template->set_var('group_list', $group_list);

                                
$GLOBALS['phpgw']->template->fp('accounts','select',True);
                        }