[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php |
Date: |
Wed, 04 Oct 2006 10:37:06 +0000 |
CVSROOT: /sources/phpgroupware
Module name: preferences
Changes by: Sigurd Nes <sigurdne> 06/10/04 10:37:06
Modified files:
inc : class.uiadmin_acl.inc.php
Log message:
E_NOTICES
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/preferences/inc/class.uiadmin_acl.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
Patches:
Index: class.uiadmin_acl.inc.php
===================================================================
RCS file: /sources/phpgroupware/preferences/inc/class.uiadmin_acl.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.uiadmin_acl.inc.php 4 Oct 2006 10:25:59 -0000 1.6
+++ class.uiadmin_acl.inc.php 4 Oct 2006 10:37:06 -0000 1.7
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage admin
- * @version $Id: class.uiadmin_acl.inc.php,v 1.6 2006/10/04 10:25:59
sigurdne Exp $
+ * @version $Id: class.uiadmin_acl.inc.php,v 1.7 2006/10/04 10:37:06
sigurdne Exp $
*/
/**
@@ -101,6 +101,8 @@
$user_list =
$this->bo->get_user_list('accounts',true);
}
+ if(isset($user_list) && is_array($user_list))
+ {
while (is_array($user_list) && list(,$user) =
each($user_list))
{
$processed[] = $user['account_id'];
@@ -131,12 +133,15 @@
'type' =>
'users'
);
}
+ }
if($this->cat_id=='groups')
{
$group_list =
$this->bo->get_user_list('groups',true);
}
+ if(isset($group_list) && is_array($group_list))
+ {
while (is_array($group_list) && list(,$group) =
each($group_list))
{
$processed[] = $group['account_id'];
@@ -167,6 +172,7 @@
'type' =>
'groups'
);
}
+ }
//_debug_array($groups);
address@hidden("_", $processed);
@@ -201,9 +207,17 @@
$receipt['error'][] = array('msg' =>
lang('select a location!'));
}
- $num_records = count($user_list) + count($group_list);
+ $num_records = 0;
+ if(isset($user_list) && is_array($user_list))
+ {
+ $num_records = count($user_list);
+ }
+ if(isset($group_list) && is_array($group_list))
+ {
+ $num_records = $num_records +
count($group_list);
+ }
- $msgbox_data = $this->bocommon->msgbox_data($receipt);
+ $msgbox_data =
(isset($receipt)?$this->bocommon->msgbox_data($receipt):'');
$data = array
(
@@ -212,7 +226,7 @@
'done_action'
=> $GLOBALS['phpgw']->link('/preferences/index.php'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
- 'processed'
=> $processed,
+ 'processed'
=> (isset($processed)?$processed:''),
'location'
=> $this->location,
'allow_allrows'
=> false,
'start_record'
=> $this->start,
@@ -238,8 +252,8 @@
'query'
=> $this->query,
'lang_search'
=> lang('search'),
'table_header_permission'
=> $table_header,
- 'values_groups'
=> $groups,
- 'values_users'
=> $users,
+ 'values_groups'
=> (isset($groups)?$groups:''),
+ 'values_users'
=> (isset($users)?$users:''),
'lang_no_location'
=> lang('No location'),
'lang_location_statustext'
=> lang('Select submodule'),
'select_name_location'
=> 'module',
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php,
Sigurd Nes <=
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Dave Hall, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Dave Hall, 2006/10/04
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/22
- [Phpgroupware-cvs] preferences/inc class.uiadmin_acl.inc.php, Sigurd Nes, 2006/10/23