[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: admin/inc class.uiaccounts.inc.php,1.29,1.30
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: admin/inc class.uiaccounts.inc.php,1.29,1.30 |
|
Date: |
Sun, 06 Apr 2003 18:30:00 -0400 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv31842
Modified Files:
class.uiaccounts.inc.php
Log Message:
fixed ACL-labels and group-ACL
Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.uiaccounts.inc.php 22 Mar 2003 12:29:42 -0000 1.29
--- class.uiaccounts.inc.php 6 Apr 2003 22:29:57 -0000 1.30
***************
*** 52,58 ****
}
! $query =
(isset($GLOBALS['HTTP_POST_VARS']['query'])?$GLOBALS['HTTP_POST_VARS']['query']:'');
! $GLOBALS['cd'] =
($GLOBALS['HTTP_GET_VARS']['cd']?$GLOBALS['HTTP_GET_VARS']['cd']:0);
unset($GLOBALS['phpgw_info']['flags']['noheader']);
--- 52,58 ----
}
! $query = (isset($_POST['query'])?$_POST['query']:'');
! $GLOBALS['cd'] = ($_GET['cd']?$_GET['cd']:0);
unset($GLOBALS['phpgw_info']['flags']['noheader']);
***************
*** 183,186 ****
--- 183,204 ----
$GLOBALS['query'] =
(isset($GLOBALS['HTTP_POST_VARS']['query'])?$GLOBALS['HTTP_POST_VARS']['query']:'');
$start =
(isset($GLOBALS['HTTP_POST_VARS']['start'])?intval($GLOBALS['HTTP_POST_VARS']['start']):'');
+ =======
+ if(isset($_GET['order']))
+ {
+ $order = $_GET['order'];
+ }
+ else
+ {
+ $order = 'account_lid';
+ }
+
+ if(isset($_GET['sort']))
+ {
+ $sort = $_GET['sort'];
+ }
+ else
+ {
+ $sort = 'ASC';
+ }
unset($GLOBALS['phpgw_info']['flags']['noheader']);
***************
*** 316,320 ****
$group_info = Array(
! 'account_id' =>
$GLOBALS['HTTP_GET_VARS']['account_id'],
'account_name' => '',
'account_user' => Array(),
--- 334,338 ----
$group_info = Array(
! 'account_id' => $_GET['account_id'],
'account_name' => '',
'account_user' => Array(),
***************
*** 338,343 ****
function delete_group()
{
! if
(address@hidden($GLOBALS['HTTP_GET_VARS']['account_id']) ||
address@hidden'HTTP_GET_VARS']['account_id'] ||
$GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
{
$this->list_groups();
return False;
--- 356,365 ----
function delete_group()
{
! if ($_POST['no'] || $_POST['yes'] ||
address@hidden($_GET['account_id']) || address@hidden'account_id'] ||
$GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
{
+ if ($_POST['yes'])
+ {
+ $this->bo->delete_group();
+ }
$this->list_groups();
return False;
***************
*** 360,368 ****
$p->parse('messages','message_row');
! $old_group_list =
$GLOBALS['phpgw']->acl->get_ids_for_location(intval($GLOBALS['HTTP_GET_VARS']['account_id']),1,'phpgw_group');
if($old_group_list)
{
! $group_name =
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['HTTP_GET_VARS']['account_id']);
$p->set_var('message_display','<br>');
--- 382,390 ----
$p->parse('messages','message_row');
! $old_group_list =
$GLOBALS['phpgw']->acl->get_ids_for_location(intval($_GET['account_id']),1,'phpgw_group');
if($old_group_list)
{
! $group_name =
$GLOBALS['phpgw']->accounts->id2name($_GET['account_id']);
$p->set_var('message_display','<br>');
***************
*** 388,398 ****
$var = Array(
! 'submit_button' => lang('Submit'),
! 'action_url_button' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.delete_group'),
! 'action_text_button' => lang('Yes'),
! 'action_confirm_button' => '',
! 'action_extra_field' => '<input type="hidden"
name="account_id" value="'.$GLOBALS['HTTP_GET_VARS']['account_id'].'">'."\n"
);
$p->set_var($var);
$p->parse('yes','form_button');
--- 410,420 ----
$var = Array(
! 'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group'),
! 'hidden_vars' => '<input type="hidden"
name="account_id" value="'.$_GET['account_id'].'">',
! 'yes' => lang('Yes'),
! 'no' => lang('No')
);
$p->set_var($var);
+ /*
$p->parse('yes','form_button');
***************
*** 407,417 ****
$p->set_var($var);
$p->parse('no','form_button');
!
! $p->pparse('out','body');
}
function delete_user()
{
! if
($GLOBALS['phpgw']->acl->check('account_access',32,'admin') ||
$GLOBALS['phpgw_info']['user']['account_id'] ==
$GLOBALS['HTTP_GET_VARS']['account_id'])
{
$this->list_users();
--- 429,439 ----
$p->set_var($var);
$p->parse('no','form_button');
! */
! $p->pparse('phpgw_body','body');
}
function delete_user()
{
! if
($GLOBALS['phpgw']->acl->check('account_access',32,'admin') ||
$GLOBALS['phpgw_info']['user']['account_id'] == $_GET['account_id'])
{
$this->list_users();
***************
*** 431,439 ****
$var = Array(
'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.delete_user'),
! 'account_id' =>
$GLOBALS['HTTP_GET_VARS']['account_id']
);
// the account can have special chars/white spaces, if
it is a ldap dn
! $account_id =
rawurlencode($GLOBALS['HTTP_GET_VARS']['account_id']);
// Find out who the new owner is of the deleted users
records...
--- 453,461 ----
$var = Array(
'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.delete_user'),
! 'account_id' => $_GET['account_id']
);
// the account can have special chars/white spaces, if
it is a ldap dn
! $account_id = rawurlencode($_GET['account_id']);
// Find out who the new owner is of the deleted users
records...
***************
*** 463,471 ****
$cdid = $cd;
settype($cd,'integer');
! $cd =
($GLOBALS['HTTP_GET_VARS']['cd']?$GLOBALS['HTTP_GET_VARS']['cd']:intval($cdid));
$accountid = $account_id;
settype($account_id,'integer');
! $account_id =
($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:intval($accountid));
// todo
--- 485,493 ----
$cdid = $cd;
settype($cd,'integer');
! $cd = ($_GET['cd']?$_GET['cd']:intval($cdid));
$accountid = $account_id;
settype($account_id,'integer');
! $account_id =
($_GET['account_id']?$_GET['account_id']:intval($accountid));
// todo
***************
*** 478,485 ****
{
$group_info = Array(
! 'account_id' =>
intval($GLOBALS['HTTP_GET_VARS']['account_id']),
! 'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['HTTP_GET_VARS']['account_id']),
! 'account_user' =>
$this->bo->load_group_users($GLOBALS['HTTP_GET_VARS']['account_id']),
! 'account_apps' =>
$this->bo->load_group_apps($GLOBALS['HTTP_GET_VARS']['account_id'])
);
--- 500,507 ----
{
$group_info = Array(
! 'account_id' =>
intval($_GET['account_id']),
! 'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($_GET['account_id']),
! 'account_user' =>
$this->bo->load_group_users($_GET['account_id']),
! 'account_apps' =>
$this->bo->load_group_apps($_GET['account_id'])
);
***************
*** 498,506 ****
$cdid = $cd;
settype($cd,'integer');
! $cd =
($GLOBALS['HTTP_GET_VARS']['cd']?$GLOBALS['HTTP_GET_VARS']['cd']:intval($cdid));
$accountid = $account_id;
settype($account_id,'integer');
! $account_id =
($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:intval($accountid));
// todo
--- 520,528 ----
$cdid = $cd;
settype($cd,'integer');
! $cd = ($_GET['cd']?$_GET['cd']:intval($cdid));
$accountid = $account_id;
settype($account_id,'integer');
! $account_id =
($_GET['account_id']?$_GET['account_id']:intval($accountid));
// todo
***************
*** 519,523 ****
function view_user()
{
! if
($GLOBALS['phpgw']->acl->check('account_access',8,'admin') || !
$GLOBALS['HTTP_GET_VARS']['account_id'])
{
$this->list_users();
--- 541,545 ----
function view_user()
{
! if
($GLOBALS['phpgw']->acl->check('account_access',8,'admin') || !
$_GET['account_id'])
{
$this->list_users();
***************
*** 555,559 ****
$t->parse('password_fields','form_logininfo',True);
! $account =
CreateObject('phpgwapi.accounts',intval($GLOBALS['HTTP_GET_VARS']['account_id']),'u');
$userData = $account->read_repository();
--- 577,581 ----
$t->parse('password_fields','form_logininfo',True);
! $account =
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
$userData = $account->read_repository();
***************
*** 602,606 ****
// Find out which groups they are members of
! $usergroups =
$account->membership(intval($GLOBALS['HTTP_GET_VARS']['account_id']));
if (gettype($usergroups) != 'array')
{
--- 624,628 ----
// Find out which groups they are members of
! $usergroups =
$account->membership(intval($_GET['account_id']));
if (gettype($usergroups) != 'array')
{
***************
*** 637,641 ****
// create apps output
! $apps =
CreateObject('phpgwapi.applications',intval($GLOBALS['HTTP_GET_VARS']['account_id']));
$db_perms = $apps->read_account_specific();
--- 659,663 ----
// create apps output
! $apps =
CreateObject('phpgwapi.applications',intval($_GET['account_id']));
$db_perms = $apps->read_account_specific();
***************
*** 683,691 ****
$cdid = $cd;
settype($cd,'integer');
! $cd =
($GLOBALS['HTTP_GET_VARS']['cd']?$GLOBALS['HTTP_GET_VARS']['cd']:intval($cdid));
$accountid = $account_id;
settype($account_id,'integer');
! $account_id =
($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:intval($accountid));
// todo
--- 705,713 ----
$cdid = $cd;
settype($cd,'integer');
! $cd = ($_GET['cd']?$_GET['cd']:intval($cdid));
$accountid = $account_id;
settype($account_id,'integer');
! $account_id =
($_GET['account_id']?$_GET['account_id']:intval($accountid));
// todo
***************
*** 698,705 ****
{
$group_info = Array(
! 'account_id' =>
intval($GLOBALS['HTTP_GET_VARS']['account_id']),
! 'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['HTTP_GET_VARS']['account_id']),
! 'account_user' =>
$GLOBALS['phpgw']->accounts->member($GLOBALS['HTTP_GET_VARS']['account_id']),
! 'account_managers' =>
$this->bo->load_group_managers($GLOBALS['HTTP_GET_VARS']['account_id'])
);
--- 720,727 ----
{
$group_info = Array(
! 'account_id' =>
intval($_GET['account_id']),
! 'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($_GET['account_id']),
! 'account_user' =>
$GLOBALS['phpgw']->accounts->member($_GET['account_id']),
! 'account_managers' =>
$this->bo->load_group_managers($_GET['account_id'])
);
***************
*** 718,722 ****
'phonelog' => True,
'infolog' => True,
! 'filemanager' => True
);
--- 740,750 ----
'phonelog' => True,
'infolog' => True,
! 'filemanager' => True,
! 'phpwebhosting' => True,
! 'tts' => True,
! 'bookmarks' => True,
! 'img' => True,
! 'netsaint' => True,
! 'inv' => True
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: admin/inc class.uiaccounts.inc.php,1.29,1.30,
Ralf Becker <address@hidden> <=