[Phpgroupware-cvs] api class.phpgw.php,1.1.1.1.2.27,1.1.1.1.2.28

[Joseph Engo <address@hidden>]

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

Modified Files:
      Tag: proposal-branch
        class.phpgw.php 
Log Message:
If a file doesn't exist, it was spitting out PHP warnings and not giving the 
API to return a "nice" error message


Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.27
retrieving revision 1.1.1.1.2.28
diff -C2 -d -r1.1.1.1.2.27 -r1.1.1.1.2.28
*** class.phpgw.php     3 Nov 2003 13:20:37 -0000       1.1.1.1.2.27
--- class.phpgw.php     3 Nov 2003 13:27:38 -0000       1.1.1.1.2.28
***************
*** 277,311 ****
                        {
                                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
                                {
!                                       $_title = 
$GLOBALS['phpgw_data']['api']['op'];
!                               }
  
!                               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')
!                               {
!                                       
$GLOBALS['phpgw_session']['phpgw_data']['op_history'][] = array(
!                                               'title' => $_title,
!                                               'op'    => 
$GLOBALS['phpgw_data']['api']['op'],
!                                               'data'  => $data
!                                       );
!                               }
  
!                               if 
(count($GLOBALS['phpgw_session']['phpgw_data']['op_history']) > 5 && 
$GLOBALS['phpgw_data']['api']['op'] != 'api.base.op_history_redirect')
!                               {
!                                       
array_shift($GLOBALS['phpgw_session']['phpgw_data']['op_history']);
                                }
                        }
--- 277,313 ----
                        {
                                list($appname,$classname,$method) = 
explode(".",$GLOBALS['phpgw_data']['api']['op']);
  
!                               // If it doesn't exist, don't spit out any 
errors or PHP warnings, the API handles that later on
!                               if (file_exists(PHPGW_ROOT . SEP . $appname . 
SEP . 'class.' . $classname . '.php'))
                                {
!                                       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
!                                       {
!                                               $_title = 
$GLOBALS['phpgw_data']['api']['op'];
!                                       }
  
+                                       foreach 
($GLOBALS['docs'][$appname]['classes'][$appname . '_' . 
$classname]['functions'][$method]['params'] as $key => $params)
+                                       {
+                                               $data[$key] = 
get_var($key,'any',$params['type'],$params['default']);
+                                       }
  
!                                       if ($GLOBALS['phpgw_data']['api']['op'] 
!= 'api.base.op_history_redirect')
!                                       {
!                                               
$GLOBALS['phpgw_session']['phpgw_data']['op_history'][] = array(
!                                                       'title' => $_title,
!                                                       'op'    => 
$GLOBALS['phpgw_data']['api']['op'],
!                                                       'data'  => $data
!                                               );
!                                       }
  
!                                       if 
(count($GLOBALS['phpgw_session']['phpgw_data']['op_history']) > 5 && 
$GLOBALS['phpgw_data']['api']['op'] != 'api.base.op_history_redirect')
!                                       {
!                                               
array_shift($GLOBALS['phpgw_session']['phpgw_data']['op_history']);
!                                       }
                                }
                        }