[Phpgroupware-cvs] api class.base.php, 1.1.1.1.2.5, 1.1.1.1.2.6 class.phpgw.php, 1.1.1.1.2.10, 1.1.1.1.2.11 starter.inc.php, 1.1.1.1.2.9, 1.1.1.1.2.10

[Dan Kuykendall <address@hidden>]

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

Modified Files:
      Tag: proposal-branch
        class.base.php class.phpgw.php starter.inc.php 
Log Message:
finished up xmlrpc support. At least for the moment it appears to be working 
well. It needs more error handling routines, but its pretty decent

Index: starter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/starter.inc.php,v
retrieving revision 1.1.1.1.2.9
retrieving revision 1.1.1.1.2.10
diff -C2 -d -r1.1.1.1.2.9 -r1.1.1.1.2.10
*** starter.inc.php     28 Oct 2003 04:28:44 -0000      1.1.1.1.2.9
--- starter.inc.php     28 Oct 2003 08:52:07 -0000      1.1.1.1.2.10
***************
*** 242,257 ****
        else
        {
!               $msg = 'You do not have access to';
!               if(function_exists('lang'))
!               {
!                       $msg = lang($msg);
!               }
! 
!               $GLOBALS['msgbox']->add(lang($msg.' 
').$methodname,__LINE__,__FILE__, 'access');
!               foreach($inputs as $key=>$val)                          
!               {
!                       $input_list[] = array('name'=>$key, 'val'=>$val);
!               }
!               
$GLOBALS['phpgw_xml_apinode']->add_node($input_list,'input_list');
        }
        /* Now send the result to the XML */
--- 242,246 ----
        else
        {
!               $GLOBALS['phpgw']->rpc->access_denied($methodname, $inputs);
        }
        /* Now send the result to the XML */

Index: class.base.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.base.php,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -C2 -d -r1.1.1.1.2.5 -r1.1.1.1.2.6
*** class.base.php      28 Oct 2003 04:28:44 -0000      1.1.1.1.2.5
--- class.base.php      28 Oct 2003 08:52:07 -0000      1.1.1.1.2.6
***************
*** 37,40 ****
--- 37,41 ----
                {
                        $result['text'] = 'This is where the home page will get 
its data and be loaded.';
+                       $result['inputs'] = func_get_args();
                        $GLOBALS['phpgw']->add_xsl('api.start');
                        
$GLOBALS['phpgw']->hooks->execute(array('hook'=>'api.base.start', 
'fname'=>'test_firstname', 'lname'=>'test_lastname'));
***************
*** 49,54 ****
                function login()
                {
!                       $GLOBALS['phpgw']->add_xsl('api.login');
!                       $GLOBALS['phpgw']->finish(False);
                }
  
--- 50,54 ----
                function login()
                {
!                       $GLOBALS['phpgw']->rpc->login();
                }
  
***************
*** 59,64 ****
                function logout()
                {
!                       $GLOBALS['phpgw']->session->destroy();
!                       $GLOBALS['phpgw_data']['api']['op'] = 'api.base.login';
                }
  
--- 59,63 ----
                function logout()
                {
!                       $GLOBALS['phpgw']->rpc->logout();
                }
  

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.10
retrieving revision 1.1.1.1.2.11
diff -C2 -d -r1.1.1.1.2.10 -r1.1.1.1.2.11
*** class.phpgw.php     28 Oct 2003 04:28:44 -0000      1.1.1.1.2.10
--- class.phpgw.php     28 Oct 2003 08:52:07 -0000      1.1.1.1.2.11
***************
*** 89,102 ****
                                                
unset($GLOBALS['phpgw_data']['api']['phpgw_pass']);
                                                $this->check_op();
                                        }
                                        else
                                        {
!                                               $GLOBALS['msgbox']->add('Login 
failed!',__LINE__,__FILE__, 'notice');
!                                               execmethod('api.base.login');
                                        }
                                }
                                else
                                {
!                                       execmethod('api.base.login');
                                }
                        }
--- 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');
                                }
                        }