[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.uiaclmanager.inc.php class.boac...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.uiaclmanager.inc.php class.boac... |
|
Date: |
Wed, 27 Dec 2006 05:41:34 +0000 |
CVSROOT: /sources/phpgroupware
Module name: admin
Changes by: Dave Hall <skwashd> 06/12/27 05:41:34
Modified files:
inc : class.uiaclmanager.inc.php
class.boaclmanager.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiaclmanager.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.boaclmanager.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
Patches:
Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uiaclmanager.inc.php 14 Feb 2006 08:48:21 -0000 1.17
+++ class.uiaclmanager.inc.php 27 Dec 2006 05:41:34 -0000 1.18
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.uiaclmanager.inc.php,v 1.17 2006/02/14 08:48:21 skwashd
Exp $ */
+ /* $Id: class.uiaclmanager.inc.php,v 1.18 2006/12/27 05:41:34 skwashd
Exp $ */
class uiaclmanager
{
@@ -191,6 +191,10 @@
//_debug_array($admins);
//exit;
+
+ //initialize the arrays
+ $users = array();
+ $groups = array();
if(is_array($admins))
{
foreach($admins as $admin)
@@ -260,14 +264,17 @@
if ( isset($_POST['save']) && $_POST['save'] )
{
- $error =
$this->boacl->check_values($_POST['account_addressmaster'],$_POST['group_addressmaster']);
+ $account_addressmaster =
isset($_POST['account_addressmaster']) ? $_POST['account_addressmaster'] :
array();
+ $group_addressmaster =
isset($_POST['group_addressmaster']) ? $_POST['group_addressmaster'] : array();
+
+ $error =
$this->boacl->check_values($account_addressmaster, $group_addressmaster);
if(is_array($error))
{
$error_message =
$GLOBALS['phpgw']->common->error_list($error);
}
else
{
-
$this->boacl->edit_addressmasters($_POST['account_addressmaster'],$_POST['group_addressmaster']);
+
$this->boacl->edit_addressmasters($account_addressmaster, $group_addressmaster);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
}
@@ -280,7 +287,9 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('edit addressmaster list');
$GLOBALS['phpgw']->xslttpl->add_file('addressmaster');
- if
($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection']
== 'popup')
+ $popwin_user = array();
+ if (
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection'])
+ &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection'] ==
'popup')
{
$usel = $this->boacl->list_addressmasters();
while(is_array($usel) && list(,$acc) =
each($usel))
@@ -314,27 +323,27 @@
$usel = $this->boacl->get_addressmaster_ids();
//_debug_array($usel);
- for($i=0;$i<count($add_users['users']);$i++)
+ foreach ( $add_users['users'] as $user )
{
- if (is_array($usel) &&
in_array($add_users['users'][$i],$usel))
+ $select_value = '';
+ if (is_array($usel) && in_array($user,
$usel) )
{
$select_value = 'yes';
}
$user_list[] = array
(
- 'account_id' =>
$add_users['users'][$i],
+ 'account_id' => $user,
'select_value' =>
$select_value,
- 'fullname' =>
$GLOBALS['phpgw']->common->grab_owner_name($add_users['users'][$i])
+ 'fullname' =>
$GLOBALS['phpgw']->common->grab_owner_name($user)
);
}
- $add_user_num = count($add_users['users']);
-
if ( is_array($add_users['groups']) &&
count($add_users['groups']) )
{
foreach( $add_users['groups'] as $group
)
{
+ $select_value = '';
if (is_array($usel) &&
in_array($group, $usel))
{
$select_value = 'yes';
@@ -349,14 +358,12 @@
}
}
- $add_group_num = count($add_users['groups']);
-
$select_user = array
(
'lang_select_users' =>
lang('Select users'),
'lang_select_groups' => lang('Select
groups'),
- 'u_select_size' =>
($add_user_num < 7?$add_user_num:7),
- 'g_select_size' =>
($add_group_num < 7?$add_group_num:7),
+ 'u_select_size' => 7,
+ 'g_select_size' => 7,
'group_list' =>
$group_list,
'user_list'
=> $user_list
);
Index: class.boaclmanager.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.boaclmanager.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.boaclmanager.inc.php 14 Feb 2006 08:48:21 -0000 1.7
+++ class.boaclmanager.inc.php 27 Dec 2006 05:41:34 -0000 1.8
@@ -8,7 +8,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.boaclmanager.inc.php,v 1.7 2006/02/14 08:48:21 skwashd
Exp $ */
+ /* $Id: class.boaclmanager.inc.php,v 1.8 2006/12/27 05:41:34 skwashd
Exp $ */
class boaclmanager
{
@@ -74,13 +74,14 @@
function check_values($users = 0, $groups = 0)
{
- if(!is_array($users) && !is_array($groups))
+ $errors = array();
+ if ( !count($users) && !count($groups) )
{
- $error[] = lang('please choose at least one
addressmaster');
+ $errors[] = lang('please choose at least one
addressmaster');
}
- if (is_array($error))
+ if ( count($errors) )
{
- return $error;
+ return $errors;
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.uiaclmanager.inc.php class.boac...,
Dave Hall <=