[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.24, 1.1.2.25 class.a
|
From: |
Joseph Engo <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.24, 1.1.2.25 class.acl_mgr.php, 1.1.2.1, 1.1.2.2 class.admin.php, 1.1.2.11, 1.1.2.12 class.auth.php, 1.1.1.1.2.4, 1.1.1.1.2.5 class.base.php, 1.1.1.1.2.23, 1.1.1.1.2.24 class.history.php, 1.1.2.4, 1.1.2.5 class.msgbox.php, 1.1.1.1.2.4, 1.1.1.1.2.5 core_functions.inc.php, 1.1.1.1.2.12, 1.1.1.1.2.13 |
|
Date: |
Mon, 17 Nov 2003 23:39:09 +0000 |
Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv11410/api
Modified Files:
Tag: proposal-branch
class.account_mgr.php class.acl_mgr.php class.admin.php
class.auth.php class.base.php class.history.php
class.msgbox.php core_functions.inc.php
Log Message:
- The ACL manager is going to be split into 2 different styles. Basic and
advanced. Basic is for normal adverage installs. Advanced allows you to
better define WHAT the user does or doesn't have access to. The basic mode
just grants you access to <app>.base
- Started making changes to the admin screens for new ACL manager
- View account is going to change quite a bit
Index: class.base.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.base.php,v
retrieving revision 1.1.1.1.2.23
retrieving revision 1.1.1.1.2.24
diff -C2 -d -r1.1.1.1.2.23 -r1.1.1.1.2.24
*** class.base.php 15 Nov 2003 04:09:06 -0000 1.1.1.1.2.23
--- class.base.php 17 Nov 2003 23:39:06 -0000 1.1.1.1.2.24
***************
*** 77,81 ****
'discussion' => 'This is used by all apps to present
preferences choices to users.',
'params' => array(
! 'appname' => array('type'=>'string', 'default' =>
'##REQUIRD##', 'desc' => 'app to display prefs for'),
'form_submit' => array('type'=>'any', 'default' =>
'##NOTSET##', 'desc' => 'Set if the user is submitting'),
'new_prefs' => array('type'=>'any', 'default' =>
'##NOTSET##', 'desc' => 'Values submitted from the form')
--- 77,81 ----
'discussion' => 'This is used by all apps to present
preferences choices to users.',
'params' => array(
! 'appname' => array('type'=>'string', 'default' =>
'##REQUIRED##', 'desc' => 'app to display prefs for'),
'form_submit' => array('type'=>'any', 'default' =>
'##NOTSET##', 'desc' => 'Set if the user is submitting'),
'new_prefs' => array('type'=>'any', 'default' =>
'##NOTSET##', 'desc' => 'Values submitted from the form')
***************
*** 239,243 ****
{
$args = new safe_args();
! $args->set('position_id','##REQUIRD##','int');
$args->set('set_state_values','##NOTSET##','any');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
--- 239,243 ----
{
$args = new safe_args();
! $args->set('position_id','##REQUIRED##','int');
$args->set('set_state_values','##NOTSET##','any');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
***************
*** 283,287 ****
{
$args = new safe_args();
! $args->set('appname','##REQUIRD##','string');
$args->set('form_submit','##NOTSET##','any');
if
(isset($GLOBALS['phpgw_session']['form_state_vales'][$methodname]))
--- 283,287 ----
{
$args = new safe_args();
! $args->set('appname','##REQUIRED##','string');
$args->set('form_submit','##NOTSET##','any');
if
(isset($GLOBALS['phpgw_session']['form_state_vales'][$methodname]))
Index: class.msgbox.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.msgbox.php,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -C2 -d -r1.1.1.1.2.4 -r1.1.1.1.2.5
*** class.msgbox.php 3 Nov 2003 17:31:20 -0000 1.1.1.1.2.4
--- class.msgbox.php 17 Nov 2003 23:39:06 -0000 1.1.1.1.2.5
***************
*** 42,46 ****
$args->set('text', '##NOTSET##', 'string');
$args->set('line', '##REQUIRED##', 'number');
! $args->set('file',' ##REQUIRED##', 'file');
$args->set('type','notice', 'text');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
--- 42,46 ----
$args->set('text', '##NOTSET##', 'string');
$args->set('line', '##REQUIRED##', 'number');
! $args->set('file', '##REQUIRED##', 'file');
$args->set('type','notice', 'text');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
Index: class.account_mgr.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.account_mgr.php,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -C2 -d -r1.1.2.24 -r1.1.2.25
*** class.account_mgr.php 15 Nov 2003 04:09:06 -0000 1.1.2.24
--- class.account_mgr.php 17 Nov 2003 23:39:05 -0000 1.1.2.25
***************
*** 164,167 ****
--- 164,168 ----
$GLOBALS['phpgw']->add_xsl('api.account_mgr');
+ $GLOBALS['phpgw']->add_xsl('api.acl_mgr');
$result = array(
***************
*** 247,250 ****
--- 248,252 ----
else
{
+ $result['acl_options'] =
execMethod('api.acl_mgr.basic');
$GLOBALS['phpgw']->form_lock();
}
***************
*** 266,270 ****
$GLOBALS['phpgw_xml_apinode']->add_node('Edit user
account','title');
!
if (!
$GLOBALS['phpgw']->accounts->cross_reference((int)$args['account_id']))
{
--- 268,272 ----
$GLOBALS['phpgw_xml_apinode']->add_node('Edit user
account','title');
!
if (!
$GLOBALS['phpgw']->accounts->cross_reference((int)$args['account_id']))
{
***************
*** 276,279 ****
--- 278,283 ----
$GLOBALS['phpgw']->add_xsl('api.account_mgr');
$GLOBALS['phpgw']->add_xsl('api.widgets');
+ $GLOBALS['phpgw']->add_xsl('api.acl_mgr');
+
$account =
createObject('api_accounts',(int)$args['account_id']);
$result = array(
***************
*** 376,379 ****
--- 380,385 ----
$GLOBALS['phpgw']->add_xsl('api.widgets');
+ $GLOBALS['phpgw']->add_xsl('api.acl_mgr');
+
$args['account'] = $args['account_id'];
$accounts =
CreateObject('api_accounts',$args);
***************
*** 397,400 ****
--- 403,407 ----
$obj->field_execmethod['account_status'] =
'api.account_mgr.account_status';
$result['history_data'] = $obj->get('api.accounts.' .
$args['account_id']);
+ $result['acl_options'] =
execMethod('api.acl_mgr.basic');
return $result;
***************
*** 458,462 ****
{
$args = new safe_args();
! $args->set('account_id', '##REQUIRED##', 'int');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
--- 465,469 ----
{
$args = new safe_args();
! $args->set('account_id','##REQUIRED##','int');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
Index: core_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/core_functions.inc.php,v
retrieving revision 1.1.1.1.2.12
retrieving revision 1.1.1.1.2.13
diff -C2 -d -r1.1.1.1.2.12 -r1.1.1.1.2.13
*** core_functions.inc.php 3 Nov 2003 17:31:21 -0000 1.1.1.1.2.12
--- core_functions.inc.php 17 Nov 2003 23:39:06 -0000 1.1.1.1.2.13
***************
*** 358,362 ****
$args->set('account_status', '##NOTSET##', 'any');
$args->set('account_expires', '##NOTSET##', 'any'
$args = new safe_args();
! $args->set('prevop','##REQUIRD##','string');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
--- 358,362 ----
$args->set('account_status', '##NOTSET##', 'any');
$args->set('account_expires', '##NOTSET##', 'any'
$args = new safe_args();
! $args->set('prevop','##REQUIRED##','string');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
Index: class.auth.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.auth.php,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -C2 -d -r1.1.1.1.2.4 -r1.1.1.1.2.5
*** class.auth.php 3 Nov 2003 17:31:20 -0000 1.1.1.1.2.4
--- class.auth.php 17 Nov 2003 23:39:06 -0000 1.1.1.1.2.5
***************
*** 23,51 ****
/* $Source$ */
! $functions = array();
$functions['authenticate'] = array(
! 'type'=>'public',
! 'abstract'=>'Authenticate user against the selected data store',
! 'discussion'=>'The data store is determined by the driver being
used such as SQL or LDAP.',
! 'params'=>array(
! 'username'=>array('type'=>'string',
'default'=>'##REQUIRD##', 'desc'=>'users username'),
! 'passwd'=>array('type'=>'any',
'default'=>'##REQUIRD##', 'desc'=>'users password')
)
);
$functions['change_password'] = array(
! 'type'=>'public',
! 'abstract'=>'Change the users password',
! 'discussion'=>'With some data stores this may not be possible.',
! 'params'=>array(
! 'current_passwd'=>array('type'=>'any',
'default'=>'##REQUIRD##', 'desc'=>'users current password'),
! 'new_passwd'=>array('type'=>'any',
'default'=>'##REQUIRD##', 'desc'=>'users new password'),
! 'username'=>array('type'=>'string',
'default'=>'##REQUIRD##', 'desc'=>'users username')
)
);
$GLOBALS['docs']['api']['classes']['api_auth'] = array(
! 'abstract'=>'Authentication system',
! 'functions'=>$functions
);
--- 23,51 ----
/* $Source$ */
! $functions = array();
$functions['authenticate'] = array(
! 'type' => 'public',
! 'abstract' => 'Authenticate user against the selected
data store',
! 'discussion' => 'The data store is determined by the
driver being used such as SQL or LDAP.',
! 'params' => array(
! 'username' => array('type' => 'string', 'default' =>
'##REQUIRED##', 'desc' => 'users username'),
! 'passwd' => array('type' => 'any', 'default' =>
'##REQUIRED##', 'desc' => 'users password')
)
);
$functions['change_password'] = array(
! 'type' => 'public',
! 'abstract' => 'Change the users password',
! 'discussion' => 'With some data stores this may not be
possible.',
! 'params' => array(
! 'current_passwd' => array('type' => 'any', 'default'
=> '##REQUIRED##', 'desc' => 'users current password'),
! 'new_passwd' => array('type' => 'any', 'default'
=> '##REQUIRED##', 'desc' => 'users new password'),
! 'username' => array('type' => 'string', 'default'
=> '##REQUIRED##', 'desc' => 'users username')
)
);
$GLOBALS['docs']['api']['classes']['api_auth'] = array(
! 'abstract' => 'Authentication system',
! 'functions' => $functions
);
***************
*** 55,56 ****
--- 55,57 ----
}
include_once(PHPGW_API.SEP.'auth'.SEP.'class.auth_'.$GLOBALS['phpgw_data']['server']['auth_type'].'.php');
+
Index: class.history.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.history.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.history.php 15 Nov 2003 04:09:06 -0000 1.1.2.4
--- class.history.php 17 Nov 2003 23:39:06 -0000 1.1.2.5
***************
*** 56,60 ****
while ($this->db->next_record())
{
! if
($this->field_execmethod[$this->db->f('history_field')])
{
$old_value =
execMethod($this->field_execmethod[$this->db->f('history_field')],$this->db->f('history_o_value'));
--- 56,60 ----
while ($this->db->next_record())
{
! if
(strlen($this->field_execmethod[$this->db->f('history_field')]))
{
$old_value =
execMethod($this->field_execmethod[$this->db->f('history_field')],$this->db->f('history_o_value'));
Index: class.admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.admin.php,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** class.admin.php 9 Nov 2003 19:27:04 -0000 1.1.2.11
--- class.admin.php 17 Nov 2003 23:39:06 -0000 1.1.2.12
***************
*** 38,42 ****
'abstract' => 'Debug function to show data stored in a
session',
'params' => array(
! 'vsid' => array('type' => 'string', 'default' =>
'##REQUIRD##', 'desc' => 'Session ID you want to view')
)
--- 38,42 ----
'abstract' => 'Debug function to show data stored in a
session',
'params' => array(
! 'vsid' => array('type' => 'string', 'default' =>
'##REQUIRED##', 'desc' => 'Session ID you want to view')
)
Index: class.acl_mgr.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.acl_mgr.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** class.acl_mgr.php 17 Nov 2003 20:43:54 -0000 1.1.2.1
--- class.acl_mgr.php 17 Nov 2003 23:39:06 -0000 1.1.2.2
***************
*** 228,232 ****
)
);
! $result['action'] = 'acl_mgr_account';
return $result;
}
--- 228,241 ----
)
);
! $result['action'] = 'acl_mgr_account_advanced';
! return $result;
! }
!
! // This is just a temp function for now
! function basic()
! {
! $_result = $this->account();
! $result = $_result['acl_options'];
!
return $result;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.24, 1.1.2.25 class.acl_mgr.php, 1.1.2.1, 1.1.2.2 class.admin.php, 1.1.2.11, 1.1.2.12 class.auth.php, 1.1.1.1.2.4, 1.1.1.1.2.5 class.base.php, 1.1.1.1.2.23, 1.1.1.1.2.24 class.history.php, 1.1.2.4, 1.1.2.5 class.msgbox.php, 1.1.1.1.2.4, 1.1.1.1.2.5 core_functions.inc.php, 1.1.1.1.2.12, 1.1.1.1.2.13,
Joseph Engo <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default tts.xsl, 1.18, 1.19 nextmatchs.xsl, 1.5, 1.6 wo_hour.xsl, 1.19, 1.20 project.xsl, 1.20, 1.21
- Next by Date:
[Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.16, 1.1.2.17 acl_mgr.xsl, 1.1.2.3, 1.1.2.4
- Previous by thread:
[Phpgroupware-cvs] property/templates/default tts.xsl, 1.18, 1.19 nextmatchs.xsl, 1.5, 1.6 wo_hour.xsl, 1.19, 1.20 project.xsl, 1.20, 1.21
- Next by thread:
[Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.16, 1.1.2.17 acl_mgr.xsl, 1.1.2.3, 1.1.2.4
- Index(es):