[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: sitemgr/inc class.ACL_BO.inc.php,1.4,1.5 class.M
From: |
Michael Totschnig <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: sitemgr/inc class.ACL_BO.inc.php,1.4,1.5 class.Modules_UI.inc.php,1.6,1.7 class.Sites_BO.inc.php,1.5,1.6 |
Date: |
Mon, 02 Jun 2003 22:44:47 -0400 |
Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv11196
Modified Files:
class.ACL_BO.inc.php class.Modules_UI.inc.php
class.Sites_BO.inc.php
Log Message:
Modules_UI: forgotten to compare cat_id with CURRENT_SITE_ID
other cleanups
Index: class.ACL_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.ACL_BO.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.ACL_BO.inc.php 23 May 2003 03:37:25 -0000 1.4
--- class.ACL_BO.inc.php 3 Jun 2003 02:44:44 -0000 1.5
***************
*** 14,21 ****
class ACL_BO
{
- var $acct;
var $acl;
var $acl_so;
- var $pages_so;
var $logged_in_user;
--- 14,19 ----
***************
*** 23,28 ****
{
$this->logged_in_user =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->acct =
CreateObject('phpgwapi.accounts',$this->logged_in_user);
- $this->pages_so = CreateObject('sitemgr.Pages_SO');
$this->acl =
CreateObject('phpgwapi.acl',$this->logged_in_user);
$this->acl_so = CreateObject('sitemgr.ACL_SO');
--- 21,24 ----
***************
*** 47,68 ****
}
- function get_adminlist($site_id)
- {
- $users = $this->acct->get_list($acct_type);
-
- $adminlist = Array();
-
- reset($users);
- while(list($k,$v) = each($users))
- {
- $account_id = $v['account_id'];
- if ($this->is_admin($site_id,$account_id))
- {
- $adminlist[] = $account_id;
- }
- }
- return $adminlist;
- }
-
function remove_location($category_id)
{
--- 43,46 ----
***************
*** 116,120 ****
and get_specific_rights and other lookup functions
DON'T WORK.
*/
! $users = $this->acct->get_list($acct_type);
$permissions = Array();
--- 94,98 ----
and get_specific_rights and other lookup functions
DON'T WORK.
*/
! $users =
$GLOBALS['phpgw']->accounts->get_list($acct_type);
$permissions = Array();
Index: class.Modules_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Modules_UI.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.Modules_UI.inc.php 30 May 2003 04:01:43 -0000 1.6
--- class.Modules_UI.inc.php 3 Jun 2003 02:44:44 -0000 1.7
***************
*** 124,129 ****
}
$cat_id = $_GET['cat_id'];
- $scopename = lang(($cat_id) ? 'Category' :
'Site');
-
if ($btnSaveProperties)
--- 124,127 ----
***************
*** 142,146 ****
$this->common_ui->DisplayHeader();
! if ($cat_id)
{
$cat =
$this->catbo->getCategory($cat_id);
--- 140,144 ----
$this->common_ui->DisplayHeader();
! if ($cat_id != CURRENT_SITE_ID)
{
$cat =
$this->catbo->getCategory($cat_id);
***************
*** 179,183 ****
$module['module_name'],
($inputarea == '__PAGE__' ?
lang('the whole page') : (lang('Contentarea') . $inputarea)),
! ($cat_id ? ('category ' .
$cat_name) : ' the whole site')
),
'module_id' => $inputmodule_id,
--- 177,181 ----
$module['module_name'],
($inputarea == '__PAGE__' ?
lang('the whole page') : (lang('Contentarea') . $inputarea)),
! (($cat_id != CURRENT_SITE_ID) ?
('category ' . $cat_name) : ' the whole site')
),
'module_id' => $inputmodule_id,
Index: class.Sites_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Sites_BO.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.Sites_BO.inc.php 30 May 2003 04:01:43 -0000 1.5
--- class.Sites_BO.inc.php 3 Jun 2003 02:44:44 -0000 1.6
***************
*** 21,25 ****
var $so = '';
- var $acl;
var $start = 0;
var $query = '';
--- 21,24 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: sitemgr/inc class.ACL_BO.inc.php,1.4,1.5 class.Modules_UI.inc.php,1.6,1.7 class.Sites_BO.inc.php,1.5,1.6,
Michael Totschnig <address@hidden> <=