[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] api/interface class.interface_xmlrpc.php, 1.1.2.6, 1
From: |
Dan Kuykendall <address@hidden> |
Subject: |
[Phpgroupware-cvs] api/interface class.interface_xmlrpc.php, 1.1.2.6, 1.1.2.7 |
Date: |
Mon, 03 Nov 2003 11:01:39 +0000 |
Update of /cvsroot/phpgroupware/api/interface
In directory subversions:/tmp/cvs-serv18262/api/interface
Modified Files:
Tag: proposal-branch
class.interface_xmlrpc.php
Log Message:
changed the inline doc format. updated xmlrpc introspection to match
Index: class.interface_xmlrpc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/interface/Attic/class.interface_xmlrpc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** class.interface_xmlrpc.php 3 Nov 2003 09:20:00 -0000 1.1.2.6
--- class.interface_xmlrpc.php 3 Nov 2003 11:01:36 -0000 1.1.2.7
***************
*** 495,516 ****
{
$GLOBALS['phpgw']->load_docs();
! foreach($GLOBALS['docs']['classes'] as
$class=>$class_data)
{
! $pos = strpos($class,'_');
! $appname = substr($class,0,$pos);
! $classname = substr($class,($pos + 1));
!
! if(is_array($class_data['functions']))
{
! foreach($class_data['functions'] as
$function=>$function_data)
{
! $method =
$appname.'.'.$classname.'.'.$function;
!
if($GLOBALS['phpgw']->acl->check($method, 1)
! || $method ==
'api.base.login'
! || $method ==
'api.base.logout'
! || $method ==
'api.base.about'
! )
{
! $allow_methods[$method]
= $function_data;
}
}
--- 495,518 ----
{
$GLOBALS['phpgw']->load_docs();
! foreach($GLOBALS['docs']['classes'] as
$appname=>$app_data)
{
! foreach($app_data as $class=>$class_data)
{
! $pos = strpos($class,'_');
! $classname = substr($class,($pos + 1));
!
! if(is_array($class_data['functions']))
{
!
foreach($class_data['functions'] as $function=>$function_data)
{
! $method =
$appname.'.'.$classname.'.'.$function;
!
if($GLOBALS['phpgw']->acl->check($method, 1)
! || $method ==
'api.base.login'
! || $method ==
'api.base.logout'
! || $method ==
'api.base.about'
! )
! {
!
$allow_methods[$method] = $function_data;
! }
}
}
***************
*** 552,562 ****
list($app,$class,$func) = explode('.',$methodname);
!
if(isset($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]) &&
$GLOBALS['phpgw']->acl->check($methodname, 1))
{
$result = "<?xml
version=\"1.0\"?>\n<methodResponse>\n";
!
if(is_array($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]['params']))
{
$result .=
"<params>\n<param>\n<value><array>\n<data>\n<value><array>\n<data>\n";
!
foreach($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]['params']
as $paramname=>$paramname_data)
{
$result .=
"<value><string>".$paramname_data['type']."</string></value>\n";
--- 554,564 ----
list($app,$class,$func) = explode('.',$methodname);
!
if(isset($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func])
&& $GLOBALS['phpgw']->acl->check($methodname, 1))
{
$result = "<?xml
version=\"1.0\"?>\n<methodResponse>\n";
!
if(is_array($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func]['params']))
{
$result .=
"<params>\n<param>\n<value><array>\n<data>\n<value><array>\n<data>\n";
!
foreach($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func]['params']
as $paramname=>$paramname_data)
{
$result .=
"<value><string>".$paramname_data['type']."</string></value>\n";
***************
*** 568,576 ****
exit;
}
!
elseif(isset($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func])
&& !$GLOBALS['phpgw']->acl->check($methodname, 1))
{
$this->xmlrpc_fault('1', 'Access Denied. Your
account does not have rights to this function.');
}
!
elseif(!isset($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]))
{
$this->xmlrpc_fault('1', 'No such method
exists.');
--- 570,578 ----
exit;
}
!
elseif(isset($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func])
&& !$GLOBALS['phpgw']->acl->check($methodname, 1))
{
$this->xmlrpc_fault('1', 'Access Denied. Your
account does not have rights to this function.');
}
!
elseif(!isset($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func]))
{
$this->xmlrpc_fault('1', 'No such method
exists.');
***************
*** 596,606 ****
list($app,$class,$func) = explode('.',$methodname);
!
if(isset($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]) &&
$GLOBALS['phpgw']->acl->check($methodname, 1))
{
$result = "<?xml
version=\"1.0\"?>\n<methodResponse>\n";
!
if(isset($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]['abstract']))
{
$result .= "<params>\n<param>\n";
! $result .=
"<value><string>".$GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]['abstract']."</string></value>\n";
$result .= "</param>\n</params>\n";
}
--- 598,608 ----
list($app,$class,$func) = explode('.',$methodname);
!
if(isset($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func])
&& $GLOBALS['phpgw']->acl->check($methodname, 1))
{
$result = "<?xml
version=\"1.0\"?>\n<methodResponse>\n";
!
if(isset($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func]['abstract']))
{
$result .= "<params>\n<param>\n";
! $result .=
"<value><string>".$GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func]['abstract']."</string></value>\n";
$result .= "</param>\n</params>\n";
}
***************
*** 609,617 ****
exit;
}
!
elseif(isset($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func])
&& !$GLOBALS['phpgw']->acl->check($methodname, 1))
{
$this->xmlrpc_fault('1', 'Access Denied. Your
account does not have rights to this function.');
}
!
elseif(!isset($GLOBALS['docs']['classes'][$app.'_'.$class]['functions'][$func]))
{
$this->xmlrpc_fault('1', 'No such method
exists.');
--- 611,619 ----
exit;
}
!
elseif(isset($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func])
&& !$GLOBALS['phpgw']->acl->check($methodname, 1))
{
$this->xmlrpc_fault('1', 'Access Denied. Your
account does not have rights to this function.');
}
!
elseif(!isset($GLOBALS['docs']['classes'][$app][$app.'_'.$class]['functions'][$func]))
{
$this->xmlrpc_fault('1', 'No such method
exists.');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] api/interface class.interface_xmlrpc.php, 1.1.2.6, 1.1.2.7,
Dan Kuykendall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.12, 1.1.2.13 class.admin.php, 1.1.2.6, 1.1.2.7 class.base.php, 1.1.1.1.2.13, 1.1.1.1.2.14 class.phpgw.php, 1.1.1.1.2.22, 1.1.1.1.2.23 class.prefs.php, 1.1.1.1.2.7, 1.1.1.1.2.8 starter.inc.php, 1.1.1.1.2.16, 1.1.1.1.2.17
- Next by Date:
[Phpgroupware-cvs] wcm class.base.php,1.1.1.1.2.2,1.1.1.1.2.3
- Previous by thread:
[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.12, 1.1.2.13 class.admin.php, 1.1.2.6, 1.1.2.7 class.base.php, 1.1.1.1.2.13, 1.1.1.1.2.14 class.phpgw.php, 1.1.1.1.2.22, 1.1.1.1.2.23 class.prefs.php, 1.1.1.1.2.7, 1.1.1.1.2.8 starter.inc.php, 1.1.1.1.2.16, 1.1.1.1.2.17
- Next by thread:
[Phpgroupware-cvs] wcm class.base.php,1.1.1.1.2.2,1.1.1.1.2.3
- Index(es):