[Phpgroupware-cvs] api class.base.php, 1.1.1.1.2.11, 1.1.1.1.2.12 class.phpgw.php, 1.1.1.1.2.15, 1.1.1.1.2.16 class.rpc.php, 1.1.2.1, 1.1.2.2 starter.inc.php, 1.1.1.1.2.13, 1.1.1.1.2.14

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv14460/api

Modified Files:
      Tag: proposal-branch
        class.base.php class.phpgw.php class.rpc.php starter.inc.php 
Log Message:
switched from rpc to interface

Index: starter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/starter.inc.php,v
retrieving revision 1.1.1.1.2.13
retrieving revision 1.1.1.1.2.14
diff -C2 -d -r1.1.1.1.2.13 -r1.1.1.1.2.14
*** starter.inc.php     31 Oct 2003 02:52:52 -0000      1.1.1.1.2.13
--- starter.inc.php     31 Oct 2003 04:33:46 -0000      1.1.1.1.2.14
***************
*** 49,55 ****
        * Make sure we have a valid client type                                 
     *
        
\****************************************************************************/
!       if(!isset($GLOBALS['phpgw_client']) || 
!preg_match("/^(browser|xmlrpc)$/i", $GLOBALS['phpgw_client'] ))
        {
!               $GLOBALS['phpgw_client'] = 'browser';
        }
        
--- 49,55 ----
        * Make sure we have a valid client type                                 
     *
        
\****************************************************************************/
!       if(!isset($GLOBALS['phpgw_interface']) || 
!preg_match("/^(browser|xmlrpc)$/i", $GLOBALS['phpgw_interface'] ))
        {
!               $GLOBALS['phpgw_interface'] = 'browser';
        }
        
***************
*** 127,133 ****
  
        
/****************************************************************************\
!       * Register op, which is done by the rpc constructor                     
     *
        
\****************************************************************************/
!       $GLOBALS['phpgw']->rpc = createobject('api_rpc');
  
        $new_session = $GLOBALS['phpgw']->session = 
createobject('api_sessions');
--- 127,133 ----
  
        
/****************************************************************************\
!       * Register op, which is done by the interface constructor               
           *
        
\****************************************************************************/
!       $GLOBALS['phpgw']->interface = createobject('api_interface');
  
        $new_session = $GLOBALS['phpgw']->session = 
createobject('api_sessions');
***************
*** 200,204 ****
        * Also remove the stuff we know is for api use only                     
   *
        
\**************************************************************************/
!       $inputs = $GLOBALS['phpgw']->rpc->get_inputs();
  
        
/**************************************************************************\
--- 200,204 ----
        * Also remove the stuff we know is for api use only                     
   *
        
\**************************************************************************/
!       $inputs = $GLOBALS['phpgw']->interface->get_inputs();
  
        
/**************************************************************************\
***************
*** 245,250 ****
        else
        {
!               $GLOBALS['phpgw']->rpc->access_denied($methodname, $inputs);
        }
        /* Now send the result to the XML */
!       $GLOBALS['phpgw']->rpc->handle_result($result);
--- 245,250 ----
        else
        {
!               $GLOBALS['phpgw']->interface->access_denied($methodname, 
$inputs);
        }
        /* Now send the result to the XML */
!       $GLOBALS['phpgw']->interface->handle_result($result);

Index: class.base.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.base.php,v
retrieving revision 1.1.1.1.2.11
retrieving revision 1.1.1.1.2.12
diff -C2 -d -r1.1.1.1.2.11 -r1.1.1.1.2.12
*** class.base.php      30 Oct 2003 21:18:14 -0000      1.1.1.1.2.11
--- class.base.php      31 Oct 2003 04:33:46 -0000      1.1.1.1.2.12
***************
*** 63,67 ****
                function login()
                {
!                       $GLOBALS['phpgw']->rpc->login();
                }
  
--- 63,67 ----
                function login()
                {
!                       $GLOBALS['phpgw']->interface->login();
                }
  
***************
*** 72,76 ****
                function logout()
                {
!                       $GLOBALS['phpgw']->rpc->logout();
                }
  
--- 72,76 ----
                function logout()
                {
!                       $GLOBALS['phpgw']->interface->logout();
                }
  
***************
*** 83,87 ****
                        $GLOBALS['phpgw']->add_xsl('api.about');
                        
$GLOBALS['phpgw_xml_apinode']->add_node('About','title');
!                       return array('blah');
                }
  
--- 83,88 ----
                        $GLOBALS['phpgw']->add_xsl('api.about');
                        
$GLOBALS['phpgw_xml_apinode']->add_node('About','title');
!                       return array(lang('This new phpGroupWare framework was 
brought to you by the outstanding and brilliant work of Dan Kuykendall (Seek3r) 
and Joseph Engo (jengo).
! Details can be found at http://www.kuykendall.org/phpgroupware'));
                }
  

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.15
retrieving revision 1.1.1.1.2.16
diff -C2 -d -r1.1.1.1.2.15 -r1.1.1.1.2.16
*** class.phpgw.php     31 Oct 2003 02:44:08 -0000      1.1.1.1.2.15
--- class.phpgw.php     31 Oct 2003 04:33:46 -0000      1.1.1.1.2.16
***************
*** 33,37 ****
                var $session;
                var $db; 
!               var $rpc;
                var $auth;
                var $accounts;
--- 33,37 ----
                var $session;
                var $db; 
!               var $interface;
                var $auth;
                var $accounts;
***************
*** 89,102 ****
                                                
unset($GLOBALS['phpgw_data']['api']['phpgw_pass']);
                                                $this->check_op();
!                                               
$GLOBALS['phpgw']->rpc->good_login();
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->rpc->failed_login('invalid');
                                        }
                                }
                                else
                                {
!                                       
$GLOBALS['phpgw']->rpc->failed_login('missing');
                                }
                        }
--- 89,102 ----
                                                
unset($GLOBALS['phpgw_data']['api']['phpgw_pass']);
                                                $this->check_op();
!                                               
$GLOBALS['phpgw']->interface->good_login();
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw']->interface->failed_login('invalid');
                                        }
                                }
                                else
                                {
!                                       
$GLOBALS['phpgw']->interface->failed_login('missing');
                                }
                        }
***************
*** 232,236 ****
                /*!
                @function finish
!               @abstract This is a the primary function used for adding the 
final stuff to the XML result. It then hands off to the rpc for the last step.
                @discussion This function collects everything to be packaged 
into the XML, and what needs to be send to the XSLT class.
                */
--- 232,236 ----
                /*!
                @function finish
!               @abstract This is a the primary function used for adding the 
final stuff to the XML result. It then hands off to the interface for the last 
step.
                @discussion This function collects everything to be packaged 
into the XML, and what needs to be send to the XSLT class.
                */
***************
*** 350,354 ****
  
                        /* Now pass back to the RPC for final packaging. */
!                       $this->rpc->sendtoclient();
                        $GLOBALS['performance_timer']->stop('phpgw');
                        $GLOBALS['performance_timer']->save();
--- 350,354 ----
  
                        /* Now pass back to the RPC for final packaging. */
!                       $this->interface->sendtoclient();
                        $GLOBALS['performance_timer']->stop('phpgw');
                        $GLOBALS['performance_timer']->save();

Index: class.rpc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.rpc.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.rpc.php       28 Oct 2003 04:30:01 -0000      1.1.2.1
--- class.rpc.php       31 Oct 2003 04:33:46 -0000      1.1.2.2
***************
*** 1,6 ****
  <?php 
!       if (empty($GLOBALS['phpgw_client']))
        {
!               $GLOBALS['phpgw_client'] = 'xmlrpc';
        }
!       
include_once(PHPGW_API.SEP.'rpc'.SEP.'class.rpc_'.$GLOBALS['phpgw_client'].'.php');
 
--- 1,6 ----
  <?php 
!       if (empty($GLOBALS['phpgw_interface']))
        {
!               $GLOBALS['phpgw_interface'] = 'browser';
        }
!       
include_once(PHPGW_API.SEP.'interface'.SEP.'class.interface_'.$GLOBALS['phpgw_interface'].'.php');