|
| From: | Sigurd Nes |
| Subject: | [Phpgroupware-cvs] property/inc class.acl2.inc.php class.soadmin.i... |
| Date: | Wed, 04 Oct 2006 08:19:03 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/04 08:19:03
Modified files:
inc : class.acl2.inc.php class.soadmin.inc.php
class.uiadmin.inc.php
Log message:
E_NOTICES
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.acl2.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiadmin.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
Patches:
Index: class.acl2.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.acl2.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.acl2.inc.php 18 Sep 2006 18:26:43 -0000 1.13
+++ class.acl2.inc.php 4 Oct 2006 08:19:03 -0000 1.14
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.acl2.inc.php,v 1.13 2006/09/18 18:26:43 sigurdne
Exp $
+ * @version $Id: class.acl2.inc.php,v 1.14 2006/10/04 08:19:03 sigurdne
Exp $
*/
/**
@@ -40,27 +40,9 @@
$recieved_args = func_get_args();
$args = safe_args($expected_args,
$recieved_args,__LINE__,__FILE__);
-
$this->db =& $GLOBALS['phpgw']->db;
-
- /* $this->db = CreateObject('phpgwapi.db');
- $this->db->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
- $this->db->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
- $this->db->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
- $this->db->User =
$GLOBALS['phpgw_info']['server']['db_user'];
- $this->db->Password =
$GLOBALS['phpgw_info']['server']['db_pass'];
-
- $this->db2 = CreateObject('phpgwapi.db');
- $this->db2->Host =
$GLOBALS['phpgw_info']['server']['db_host'];
- $this->db2->Type =
$GLOBALS['phpgw_info']['server']['db_type'];
- $this->db2->Database =
$GLOBALS['phpgw_info']['server']['db_name'];
- $this->db2->User =
$GLOBALS['phpgw_info']['server']['db_user'];
- $this->db2->Password =
$GLOBALS['phpgw_info']['server']['db_pass'];
- */
$this->db2 = clone($GLOBALS['phpgw']->db);
-
$this->account_id = $args['account_id'];
-
$this->host_id = $args['host_id'];
$this->app_id = $args['app_id'];
@@ -193,6 +175,12 @@
}
$this->cache_rights($args['location'],$args['app_id'],$args['account_id'],$args['grantor'],$args['no_effective']);
+
+ if (
!isset($this->rights_cache[$args['app_id']][$args['account_id']][$args['location']])
)
+ {
+ return false;
+ }
+
if($args['acl_type']==0)
{
return
$this->bit_check($this->rights_cache[$args['app_id']][$args['account_id']][$args['location']],$args['required']);
@@ -231,6 +219,12 @@
}
$this->cache_rights($args['location'],$args['app_id'],$args['account_id'],False,$args['no_effective']);
+
+ if (
!isset($this->rights_cache[$args['app_id']][$args['account_id']][$args['location']])
)
+ {
+ return false;
+ }
+
if($args['acl_type']==0)
{
return
$this->bit_check($this->rights_cache[$args['app_id']][$args['account_id']][$args['location']],$args['required']);
@@ -301,6 +295,7 @@
else
{
$grantor =
$GLOBALS['phpgw_info']['user']['account_id'];
+ $grantor_type = '';
}
$sql = "SELECT acl_rights, acl_location FROM fm_acl2
WHERE (acl_appid = '".$args['app_id']."' ";
@@ -331,7 +326,7 @@
$add_locations[]=$this->db->f('id');
}
- if($updated_locations)
+ if( isset($updated_locations) &&
is_array($updated_locations))
{
$add_locations = array_diff($add_locations,
$updated_locations);
}
@@ -415,7 +410,7 @@
$add_locations[]=$this->db->f('id');
}
- if($updated_locations)
+ if(isset($updated_locations) &&
is_array($updated_locations))
{
$add_locations = array_diff($add_locations,
$updated_locations);
}
Index: class.soadmin.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.soadmin.inc.php 30 Jan 2006 22:14:19 -0000 1.7
+++ class.soadmin.inc.php 4 Oct 2006 08:19:03 -0000 1.8
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.soadmin.inc.php,v 1.7 2006/01/30 22:14:19
sigurdne Exp $
+ * @version $Id: class.soadmin.inc.php,v 1.8 2006/10/04 08:19:03
sigurdne Exp $
*/
/**
@@ -18,7 +18,6 @@
class soadmin
{
-
function soadmin()
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -56,6 +55,7 @@
function select_location($grant='')
{
+ $filter = '';
if($grant)
{
$filter = ' WHERE allow_grant=1';
Index: class.uiadmin.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.uiadmin.inc.php 14 Sep 2006 13:53:52 -0000 1.15
+++ class.uiadmin.inc.php 4 Oct 2006 08:19:03 -0000 1.16
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.uiadmin.inc.php,v 1.15 2006/09/14 13:53:52
sigurdne Exp $
+ * @version $Id: class.uiadmin.inc.php,v 1.16 2006/10/04 08:19:03
sigurdne Exp $
*/
/**
@@ -111,6 +111,8 @@
$user_list =
$this->bo->get_user_list('accounts',$app_id);
}
+ if(isset($user_list) && is_array($user_list))
+ {
while (is_array($user_list) && list(,$user) =
each($user_list))
{
$processed[] = $user['account_id'];
@@ -119,18 +121,18 @@
'account_id'
=> $user['account_id'],
'lid'
=> $user['account_lid'],
'name'
=> $user['account_firstname'] . ' ' . $user['account_lastname'],
- 'read_right'
=> $user['right'][1],
- 'add_right'
=> $user['right'][2],
- 'edit_right'
=> $user['right'][4],
- 'delete_right'
=> $user['right'][8],
- 'read_mask'
=> $user['mask'][1],
- 'add_mask'
=> $user['mask'][2],
- 'edit_mask'
=> $user['mask'][4],
- 'delete_mask'
=> $user['mask'][8],
- 'read_result'
=> $user['result'][1],
- 'add_result'
=> $user['result'][2],
- 'edit_result'
=> $user['result'][4],
- 'delete_result'
=> $user['result'][8],
+ 'read_right'
=> (isset($user['right'][1])?$user['right'][1]:''),
+ 'add_right'
=> (isset($user['right'][2])?$user['right'][2]:''),
+ 'edit_right'
=> (isset($user['right'][4])?$user['right'][4]:''),
+ 'delete_right'
=> (isset($user['right'][8])?$user['right'][8]:''),
+ 'read_mask'
=> (isset($user['mask'][1])?$user['mask'][1]:''),
+ 'add_mask'
=> (isset($user['mask'][2])?$user['mask'][2]:''),
+ 'edit_mask'
=> (isset($user['mask'][4])?$user['mask'][4]:''),
+ 'delete_mask'
=> (isset($user['mask'][8])?$user['mask'][8]:''),
+ 'read_result'
=> (isset($user['result'][1])?$user['result'][1]:''),
+ 'add_result'
=> (isset($user['result'][2])?$user['result'][2]:''),
+ 'edit_result'
=> (isset($user['result'][4])?$user['result'][4]:''),
+ 'delete_result'
=> (isset($user['result'][8])?$user['result'][8]:''),
'lang_right'
=> lang('right'),
'lang_mask'
=> lang('mask'),
'lang_result'
=> lang('result'),
@@ -141,6 +143,7 @@
'type'
=> 'users'
);
}
+ }
if(!$this->cat_id || $this->cat_id=='groups')
{
@@ -148,6 +151,8 @@
}
+ if(isset($group_list) && is_array($group_list))
+ {
while (is_array($group_list) && list(,$group) =
each($group_list))
{
$processed[] = $group['account_id'];
@@ -156,18 +161,18 @@
'account_id'
=> $group['account_id'],
'lid'
=> $group['account_lid'],
'name'
=> $group['account_firstname'],
- 'read_right'
=> $group['right'][1],
- 'add_right'
=> $group['right'][2],
- 'edit_right'
=> $group['right'][4],
- 'delete_right'
=> $group['right'][8],
- 'read_mask'
=> $group['mask'][1],
- 'add_mask'
=> $group['mask'][2],
- 'edit_mask'
=> $group['mask'][4],
- 'delete_mask'
=> $group['mask'][8],
- 'read_result'
=> $group['result'][1],
- 'add_result'
=> $group['result'][2],
- 'edit_result'
=> $group['result'][4],
- 'delete_result'
=> $group['result'][8],
+ 'read_right'
=> (isset($group['right'][1])?$group['right'][1]:''),
+ 'add_right'
=> (isset($group['right'][2])?$group['right'][2]:''),
+ 'edit_right'
=> (isset($group['right'][4])?$group['right'][4]:''),
+ 'delete_right'
=> (isset($group['right'][8])?$group['right'][8]:''),
+ 'read_mask'
=> (isset($group['mask'][1])?$group['mask'][1]:''),
+ 'add_mask'
=> (isset($group['mask'][2])?$group['mask'][2]:''),
+ 'edit_mask'
=> (isset($group['mask'][4])?$group['mask'][4]:''),
+ 'delete_mask'
=> (isset($group['mask'][8])?$group['mask'][8]:''),
+ 'read_result'
=> (isset($group['result'][1])?$group['result'][1]:''),
+ 'add_result'
=> (isset($group['result'][2])?$group['result'][2]:''),
+ 'edit_result'
=> (isset($group['result'][4])?$group['result'][4]:''),
+ 'delete_result'
=> (isset($group['result'][8])?$group['result'][8]:''),
'lang_right'
=> lang('right'),
'lang_mask'
=> lang('mask'),
'lang_result'
=> lang('result'),
@@ -178,11 +183,11 @@
'type'
=> 'groups'
);
}
+ }
address@hidden("_", $processed);
}
-
$table_header[] = array
(
'lang_read' =>
lang('Read'), //1
@@ -202,7 +207,8 @@
'filter' => $this->filter,
'query' => $this->query,
'module' => $this->location,
- 'granting_group' => $this->granting_group
+ 'granting_group' =>
$this->granting_group,
+ 'acl_app' => $acl_app
);
if(!$this->location)
@@ -210,7 +216,17 @@
$receipt['error'][] = array('msg' =>
lang('select a location!'));
}
- $msgbox_data = $this->bocommon->msgbox_data($receipt);
+ $msgbox_data =
(isset($receipt)?$this->bocommon->msgbox_data($receipt):'');
+
+ $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);
+ }
$data = array
(
@@ -219,14 +235,14 @@
'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,
- 'links'
=> $links,
+
'allow_allrows'
=> false,
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
- 'num_records'
=> count($user_list)+count($group_list),
- 'all_records'
=> $this->bo->total_records,
+ 'num_records'
=> $num_records,
+ 'all_records'
=> (isset($this->bo->total_records)?$this->bo->total_records:''),
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiadmin.aclprefs')),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
@@ -246,8 +262,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',
@@ -292,7 +308,7 @@
{
if($this->cat_id=='accounts')
{
- $user_list =
$this->bo->get_user_list2('accounts',$app_id);
+ $user_list =
$this->bo->get_user_list2('accounts');
}
if (isSet($user_list) AND is_array($user_list))
@@ -305,30 +321,30 @@
'account_id'
=> $user['account_id'],
'lid'
=> $user['account_lid'],
'name'
=> $user['account_firstname'] . ' ' . $user['account_lastname']
. ' [' . $user['account_lid'] . ']',
- 'read_right'
=> $user['right'][1],
- 'add_right'
=> $user['right'][2],
- 'edit_right'
=> $user['right'][4],
- 'delete_right'
=> $user['right'][8],
- 'manage_right'
=> $user['right'][16],
- 'janitor_right'
=> $user['right'][32],
- 'supervisor_right'
=> $user['right'][64],
-
'budget_responsible_right' => $user['right'][128],
- 'read_mask'
=> $user['mask'][1],
- 'add_mask'
=> $user['mask'][2],
- 'edit_mask'
=> $user['mask'][4],
- 'delete_mask'
=> $user['mask'][8],
- 'manage_mask'
=> $user['mask'][16],
- 'janitor_mask'
=> $user['mask'][32],
- 'supervisor_mask'
=> $user['mask'][64],
-
'budget_responsible_mask' => $user['mask'][128],
- 'read_result'
=> $user['result'][1],
- 'add_result'
=> $user['result'][2],
- 'edit_result'
=> $user['result'][4],
- 'delete_result'
=> $user['result'][8],
- 'manage_result'
=> $user['result'][16],
- 'janitor_result'
=> $user['result'][32],
- 'supervisor_result'
=> $user['result'][64],
-
'budget_responsible_result' => $user['result'][128],
+ 'read_right'
=> (isset($user['right'][1])?$user['right'][1]:''),
+ 'add_right'
=> (isset($user['right'][2])?$user['right'][2]:''),
+ 'edit_right'
=> (isset($user['right'][4])?$user['right'][4]:''),
+ 'delete_right'
=> (isset($user['right'][8])?$user['right'][8]:''),
+ 'manage_right'
=> (isset($user['right'][16])?$user['right'][16]:''),
+ 'janitor_right'
=> (isset($user['right'][32])?$user['right'][32]:''),
+ 'supervisor_right'
=> (isset($user['right'][64])?$user['right'][64]:''),
+
'budget_responsible_right' =>
(isset($user['right'][128])?$user['right'][128]:''),
+ 'read_mask'
=> (isset($user['mask'][1])?$user['mask'][1]:''),
+ 'add_mask'
=> (isset($user['mask'][2])?$user['mask'][2]:''),
+ 'edit_mask'
=> (isset($user['mask'][4])?$user['mask'][4]:''),
+ 'delete_mask'
=> (isset($user['mask'][8])?$user['mask'][8]:''),
+ 'manage_mask'
=> (isset($user['mask'][16])?$user['mask'][16]:''),
+ 'janitor_mask'
=> (isset($user['mask'][32])?$user['mask'][32]:''),
+ 'supervisor_mask'
=> (isset($user['mask'][64])?$user['mask'][64]:''),
+
'budget_responsible_mask' =>
(isset($user['mask'][128])?$user['mask'][128]:''),
+ 'read_result'
=> (isset($user['result'][1])?$user['result'][1]:''),
+ 'add_result'
=> (isset($user['result'][2])?$user['result'][2]:''),
+ 'edit_result'
=> (isset($user['result'][4])?$user['result'][4]:''),
+ 'delete_result'
=> (isset($user['result'][8])?$user['result'][8]:''),
+ 'manage_result'
=> (isset($user['result'][16])?$user['result'][16]:''),
+ 'janitor_result'
=> (isset($user['result'][32])?$user['result'][32]:''),
+ 'supervisor_result'
=> (isset($user['result'][64])?$user['result'][64]:''),
+
'budget_responsible_result' =>
(isset($user['result'][128])?$user['result'][128]:''),
'initials'
=> $user['initials'],
'lang_right'
=> lang('right'),
'lang_mask'
=> lang('mask'),
@@ -349,7 +365,7 @@
if($this->cat_id=='groups')
{
- $group_list =
$this->bo->get_user_list2('groups',$app_id);
+ $group_list =
$this->bo->get_user_list2('groups');
}
if (isSet($group_list) AND
is_array($group_list))
@@ -362,21 +378,21 @@
'account_id'
=> $group['account_id'],
'lid'
=> $group['account_lid'],
'name'
=> $group['account_firstname'],
- 'read_right'
=> $group['right'][1],
- 'add_right'
=> $group['right'][2],
- 'edit_right'
=> $group['right'][4],
- 'delete_right'
=> $group['right'][8],
- 'manage_right'
=> $group['right'][16],
- 'read_mask'
=> $group['mask'][1],
- 'add_mask'
=> $group['mask'][2],
- 'edit_mask'
=> $group['mask'][4],
- 'delete_mask'
=> $group['mask'][8],
- 'manage_mask'
=> $group['mask'][16],
- 'read_result'
=> $group['result'][1],
- 'add_result'
=> $group['result'][2],
- 'edit_result'
=> $group['result'][4],
- 'delete_result'
=> $group['result'][8],
- 'manage_result'
=> $group['result'][16],
+ 'read_right'
=> (isset($group['right'][1])?$group['right'][1]:''),
+ 'add_right'
=> (isset($group['right'][2])?$group['right'][2]:''),
+ 'edit_right'
=> (isset($group['right'][4])?$group['right'][4]:''),
+ 'delete_right'
=> (isset($group['right'][8])?$group['right'][8]:''),
+ 'manage_right'
=> (isset($group['right'][16])?$group['right'][16]:''),
+ 'read_mask'
=> (isset($group['mask'][1])?$group['mask'][1]:''),
+ 'add_mask'
=> (isset($group['mask'][2])?$group['mask'][2]:''),
+ 'edit_mask'
=> (isset($group['mask'][4])?$group['mask'][4]:''),
+ 'delete_mask'
=> (isset($group['mask'][8])?$group['mask'][8]:''),
+ 'manage_mask'
=> (isset($group['mask'][16])?$group['mask'][16]:''),
+ 'read_result'
=> (isset($group['result'][1])?$group['result'][1]:''),
+ 'add_result'
=> (isset($group['result'][2])?$group['result'][2]:''),
+ 'edit_result'
=> (isset($group['result'][4])?$group['result'][4]:''),
+ 'delete_result'
=> (isset($group['result'][8])?$group['result'][8]:''),
+ 'manage_result'
=> (isset($group['result'][16])?$group['result'][16]:''),
'initials'
=> $group['initials'],
'lang_right'
=> lang('right'),
'lang_mask'
=> lang('mask'),
@@ -475,7 +491,7 @@
$record_limit = $this->bo->total_records;
}
- $msgbox_data = $this->bocommon->msgbox_data($receipt);
+ $msgbox_data =
(isset($receipt)?$this->bocommon->msgbox_data($receipt):'');
$data = array
(
@@ -489,12 +505,11 @@
'done_action'
=> $GLOBALS['phpgw']->link('/admin/index.php'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
- 'processed'
=> $processed,
+ 'processed'
=> (isset($processed)?$processed:''),
'location'
=> $this->location,
- 'links'
=> $links,
- 'num_records'
=> count($user_list),
- 'all_records'
=> $this->bo->total_records,
+ 'num_records'
=> (isset($user_list)?count($user_list):''),
+ 'all_records'
=> (isset($this->bo->total_records)?$this->bo->total_records:''),
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
@@ -513,8 +528,8 @@
'table_header_permission'
=> $table_header,
// 'table_header_acl2'
=> $table_header,
// 'values_acl2'
=> $content,
- 'values_groups'
=> $groups,
- 'values_users'
=> $users,
+ 'values_groups'
=> (isset($groups)?$groups:''),
+ 'values_users'
=> (isset($users)?$users:''),
'lang_groups'
=> lang('groups'),
'lang_users'
=> lang('users'),
| [Prev in Thread] | Current Thread | [Next in Thread] |