[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.13, 1.1.2.14 class.base.php, 1.1.1.1.2.16, 1.1.1.1.2.17 class.phpgw.php, 1.1.1.1.2.25, 1.1.1.1.2.26 starter.inc.php, 1.1.1.1.2.17, 1.1.1.1.2.18

[Joseph Engo <address@hidden>]

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

Modified Files:
      Tag: proposal-branch
        class.account_mgr.php class.base.php class.phpgw.php 
        starter.inc.php 
Log Message:
More work on the state caching, it should be working correctly now


Index: class.account_mgr.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.account_mgr.php,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** class.account_mgr.php       3 Nov 2003 10:52:37 -0000       1.1.2.13
--- class.account_mgr.php       3 Nov 2003 12:16:10 -0000       1.1.2.14
***************
*** 73,88 ****
        class api_account_mgr
        {
-               var $method_titles  = array();
-               var $history_params = array();
- 
                function api_account_mgr()
                {
-                       $this->method_titles['show']     = 'List users';
-                       $this->method_titles['create']   = 'Create user';
-                       $this->method_titles['view']     = 'View user';
-                       $this->method_titles['delete']   = 'Delete user';
-                       $this->history_params['view']    = array('account_id');
-                       $this->history_params['create']  = 
array('account_lid','account_firstname','account_lastname','account_password','account_password_confirm');
- 
                        if (! $GLOBALS['api_account_mgr_menus_loaded'])
                        {
--- 73,78 ----
***************
*** 119,123 ****
                {
                        $args = new safe_args();
!                       $args->set('create_account_submit', '##NOTSET##', 
'string');
                        $args->set('account_lid', '##NOTSET##', 'any');
                        $args->set('account_firstname', '##NOTSET##', 'any');
--- 109,113 ----
                {
                        $args = new safe_args();
!                       $args->set('create_account_submit', '##NOTSET##', 
'any');
                        $args->set('account_lid', '##NOTSET##', 'any');
                        $args->set('account_firstname', '##NOTSET##', 'any');

Index: starter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/starter.inc.php,v
retrieving revision 1.1.1.1.2.17
retrieving revision 1.1.1.1.2.18
diff -C2 -d -r1.1.1.1.2.17 -r1.1.1.1.2.18
*** starter.inc.php     3 Nov 2003 10:52:38 -0000       1.1.1.1.2.17
--- starter.inc.php     3 Nov 2003 12:16:11 -0000       1.1.1.1.2.18
***************
*** 216,222 ****
                $GLOBALS['performance_timer']->start($methodname);              
        
                $result = ExecMethod($methodname,$inputs);
!               if 
(isset($GLOBALS['phpgw_session']['form_state_vales'][$methodname]))
                {
!                       $result['form_state_values'] = 
$GLOBALS['phpgw_session']['form_state_vales'][$methodname];
                }
  
--- 216,222 ----
                $GLOBALS['performance_timer']->start($methodname);              
        
                $result = ExecMethod($methodname,$inputs);
!               if 
(isset($GLOBALS['phpgw_session']['form_state_values'][$methodname]))
                {
!                       $result['form_state_values'] = 
$GLOBALS['phpgw_session']['form_state_values'][$methodname];
                }
  

Index: class.base.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.base.php,v
retrieving revision 1.1.1.1.2.16
retrieving revision 1.1.1.1.2.17
diff -C2 -d -r1.1.1.1.2.16 -r1.1.1.1.2.17
*** class.base.php      3 Nov 2003 11:19:02 -0000       1.1.1.1.2.16
--- class.base.php      3 Nov 2003 12:16:11 -0000       1.1.1.1.2.17
***************
*** 78,90 ****
        class api_base
        {
-               var $method_titles  = array();
-               var $history_params = array();
- 
                function api_base()
                {
!                       $this->method_titles['start']  = 'Home';
!                       $this->method_titles['about']  = 'About';
!                       $this->method_titles['prefs']  = 'Preferences';
!                       $this->history_params['prefs'] = array('appname');
                }
  
--- 78,84 ----
        class api_base
        {
                function api_base()
                {
! 
                }
  
***************
*** 96,100 ****
                {
                        $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'));
--- 90,94 ----
                {
                        $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'));
***************
*** 107,115 ****
                {
                        list($app,$class,$method) = 
explode('.',$GLOBALS['phpgw_data']['api']['prevop']);
                        require_once(PHPGW_ROOT . SEP . $app . SEP . 'class.' . 
$class . '.php');
-                               if 
(isset($GLOBALS['phpgw_session']['form_state_vales'][$methodname]))
-                               {
-                                       
$GLOBALS['phpgw_xml_appnode']->add_node($GLOBALS['phpgw_session']['form_state_vales'][$methodname],'form_state_values');
-                               }
  
                        if (! is_array($functions[$method]['params']))
--- 101,110 ----
                {
                        list($app,$class,$method) = 
explode('.',$GLOBALS['phpgw_data']['api']['prevop']);
+                       if (! $app || ! $class || ! $method)
+                       {
+                               $GLOBALS['msgbox']->add(lang('Previous op 
missing'),__LINE__,__FILE__, 'warning');
+                               return;
+                       }
                        require_once(PHPGW_ROOT . SEP . $app . SEP . 'class.' . 
$class . '.php');
  
                        if (! is_array($functions[$method]['params']))
***************
*** 124,131 ****
                        }
  
!                       
$GLOBALS['phpgw_session']['form_state_vales'][$GLOBALS['phpgw_data']['api']['prevop']]
 = $params;
                }
  
!               // This will just call up the op WITHOUT adding the 
form_state_values node
                function form_clear()
                {
--- 119,126 ----
                        }
  
!                       
$GLOBALS['phpgw_session']['form_state_values'][$GLOBALS['phpgw_data']['api']['prevop']]
 = $params;
                }
  
!               // This will just call up the op WITHOUT adding the 
form_state_values node, and clear that part out of the array
                function form_clear()
                {
***************
*** 137,140 ****
--- 132,136 ----
                        }
  
+                       
$GLOBALS['phpgw_session']['form_state_values'][$GLOBALS['phpgw_data']['api']['prevop']]
 = array();
                        return 
ExecMethod($GLOBALS['phpgw_data']['api']['prevop'],'',False);
                }

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.25
retrieving revision 1.1.1.1.2.26
diff -C2 -d -r1.1.1.1.2.25 -r1.1.1.1.2.26
*** class.phpgw.php     3 Nov 2003 11:19:02 -0000       1.1.1.1.2.25
--- class.phpgw.php     3 Nov 2003 12:16:11 -0000       1.1.1.1.2.26
***************
*** 412,420 ****
                        if(!isset($GLOBALS['phpgw_data']['api']['op']))
                        {
!                               
if(isset($GLOBALS['phpgw_data']['api']['nextop']))
                                {
                                        $GLOBALS['phpgw_data']['api']['op'] = 
$GLOBALS['phpgw_data']['api']['nextop'];
                                }
!                               
elseif(isset($GLOBALS['phpgw_data']['api']['prevop']))
                                {
                                        $GLOBALS['phpgw_data']['api']['op'] = 
$GLOBALS['phpgw_data']['api']['prevop'];
--- 412,420 ----
                        if(!isset($GLOBALS['phpgw_data']['api']['op']))
                        {
!                               if 
(isset($GLOBALS['phpgw_data']['api']['nextop']))
                                {
                                        $GLOBALS['phpgw_data']['api']['op'] = 
$GLOBALS['phpgw_data']['api']['nextop'];
                                }
!                               elseif 
(isset($GLOBALS['phpgw_data']['api']['prevop']))
                                {
                                        $GLOBALS['phpgw_data']['api']['op'] = 
$GLOBALS['phpgw_data']['api']['prevop'];
***************
*** 453,458 ****
  
                        $GLOBALS['phpgw_data']['api']['req_app'] = 
$GLOBALS['phpgw_data']['flags']['req_app'];
!                       $GLOBALS['phpgw_session']['prevop'] = 
$GLOBALS['phpgw_data']['api']['op'];
!                       
                }
  
--- 453,458 ----
  
                        $GLOBALS['phpgw_data']['api']['req_app'] = 
$GLOBALS['phpgw_data']['flags']['req_app'];
!                       $GLOBALS['phpgw_data']['api']['prevop']  = 
$GLOBALS['phpgw_session']['prevop'];
!                       $GLOBALS['phpgw_session']['prevop']      = 
$GLOBALS['phpgw_data']['api']['op'];
                }