[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.14, 1.1.2.15 class.admin.php, 1.1.2.7, 1.1.2.8 class.base.php, 1.1.1.1.2.17, 1.1.1.1.2.18 class.phpgw.php, 1.1.1.1.2.26, 1.1.1.1.2.27

[Joseph Engo <address@hidden>]

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

Modified Files:
      Tag: proposal-branch
        class.account_mgr.php class.admin.php class.base.php 
        class.phpgw.php 
Log Message:
op history looks like its finally working correctly


Index: class.account_mgr.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.account_mgr.php,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -d -r1.1.2.14 -r1.1.2.15
*** class.account_mgr.php       3 Nov 2003 12:16:10 -0000       1.1.2.14
--- class.account_mgr.php       3 Nov 2003 13:20:35 -0000       1.1.2.15
***************
*** 70,73 ****
--- 70,78 ----
        );
  
+       $GLOBALS['docs']['api']['classes']['api_account_mgr'] = array(
+               'abstract'  => 'User account management',
+               'functions' => $functions
+       );
+ 
        $GLOBALS['api_account_mgr_menus_loaded'] = False;
        class api_account_mgr

Index: class.base.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.base.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
*** class.base.php      3 Nov 2003 12:16:11 -0000       1.1.1.1.2.17
--- class.base.php      3 Nov 2003 13:20:36 -0000       1.1.1.1.2.18
***************
*** 72,77 ****
  
        $GLOBALS['docs']['api']['classes']['api_base'] = array(
!               'abstract'=>'Default class for the api ops',
!               'functions'=>$functions
        );
  
--- 72,77 ----
  
        $GLOBALS['docs']['api']['classes']['api_base'] = array(
!               'abstract'  => 'Default class for the api ops',
!               'functions' => $functions
        );
  

Index: class.admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.admin.php,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** class.admin.php     3 Nov 2003 10:52:37 -0000       1.1.2.7
--- class.admin.php     3 Nov 2003 13:20:36 -0000       1.1.2.8
***************
*** 15,26 ****
        /* $Source$ */
  
        class api_admin
        {
-               var $method_titles  = array();
-               var $history_params = array();
- 
                function api_admin()
                {
!                       $this->method_titles['start'] = 'Admin';
                }
  
--- 15,35 ----
        /* $Source$ */
  
+       $functions             = array();
+       $functions['start']    = array(
+               'type'         => 'public',
+               'title'        => 'Admin',
+               'abstract'     => 'Admin page main screen'
+       );
+ 
+       $GLOBALS['docs']['api']['classes']['api_admin'] = array(
+               'abstract'  => 'General admin',
+               'functions' => $functions
+       );
+ 
        class api_admin
        {
                function api_admin()
                {
! 
                }
  

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.26
retrieving revision 1.1.1.1.2.27
diff -C2 -d -r1.1.1.1.2.26 -r1.1.1.1.2.27
*** class.phpgw.php     3 Nov 2003 12:16:11 -0000       1.1.1.1.2.26
--- class.phpgw.php     3 Nov 2003 13:20:37 -0000       1.1.1.1.2.27
***************
*** 277,283 ****
                        {
                                list($appname,$classname,$method) = 
explode(".",$GLOBALS['phpgw_data']['api']['op']);
!                               if 
(isset($GLOBALS['docs']['classes'][$appname.'_'.$classname]['functions'][$method]['title']))
                                {
!                                       $_title = 
lang($GLOBALS['docs']['classes'][$appname.'_'.$classname]['functions'][$method]['title']);
                                }
                                else
--- 277,285 ----
                        {
                                list($appname,$classname,$method) = 
explode(".",$GLOBALS['phpgw_data']['api']['op']);
!                               require_once(PHPGW_ROOT . SEP . $appname . SEP 
. 'class.' . $classname . '.php');
! 
!                               if 
(isset($GLOBALS['docs'][$appname]['classes'][$appname . '_' . 
$classname]['functions'][$method]['title']))
                                {
!                                       $_title = 
lang($GLOBALS['docs'][$appname]['classes'][$appname.'_'.$classname]['functions'][$method]['title']);
                                }
                                else
***************
*** 286,294 ****
                                }
  
!                               foreach ($obj->history_params[$method] as 
$param)
                                {
!                                       $data[$param] = 
get_var($param,'any','any','##NOTSET##');
                                }
  
                                if ($GLOBALS['phpgw_data']['api']['op'] != 
'api.base.op_history_redirect')
                                {
--- 288,299 ----
                                }
  
!                               foreach 
($GLOBALS['docs'][$appname]['classes'][$appname . '_' . 
$classname]['functions'][$method]['params'] as $key => $params)
                                {
! //                                    print_r($params);
!                                       $data[$key] = 
get_var($key,'any',$params['type'],$params['default']);
! //                                    echo "$key - " . 
get_var($key,'any',$params['type'],$params['default']) . "\n";
                                }
  
+ 
                                if ($GLOBALS['phpgw_data']['api']['op'] != 
'api.base.op_history_redirect')
                                {
***************
*** 300,312 ****
                                }
  
-                               // Remove the data element, we don't want this 
in the XML, it can get way too big (jengo)
-                               $xml_history = 
$GLOBALS['phpgw_session']['phpgw_data']['op_history'];
-                               $total       = count($xml_history);
-                               for ($i=0; $i<$total; $i++)
-                               {
-                                       unset($xml_history[$i]['data']);
-                               }
-                               
$GLOBALS['phpgw_xml_apinode']->add_node($xml_history,'op_history');
- 
                                if 
(count($GLOBALS['phpgw_session']['phpgw_data']['op_history']) > 5 && 
$GLOBALS['phpgw_data']['api']['op'] != 'api.base.op_history_redirect')
                                {
--- 305,308 ----
***************
*** 314,317 ****
--- 310,322 ----
                                }
                        }
+ 
+                       // Remove the data element, we don't want this in the 
XML, it can get way too big (jengo)
+                       $xml_history = 
$GLOBALS['phpgw_session']['phpgw_data']['op_history'];
+                       $total       = count($xml_history);
+                       for ($i=0; $i<$total; $i++)
+                       {
+                               unset($xml_history[$i]['data']);
+                       }
+                       
$GLOBALS['phpgw_xml_apinode']->add_node($xml_history,'op_history');
  
                        if (! $GLOBALS['missing_critical'])