[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.22, 1.1.2.23 class.base.php, 1.1.1.1.2.21, 1.1.1.1.2.22 class.phpgw.php, 1.1.1.1.2.33, 1.1.1.1.2.34

[Joseph Engo <address@hidden>]

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

Modified Files:
      Tag: proposal-branch
        class.account_mgr.php class.base.php class.phpgw.php 
Log Message:
- If an app doesn't set the title, the API now attempts to detect what the 
title is based on the "doc array"
- New experimental layout for view account, this is mostly just tests
- Changed some cancel buttons to call api.statecache.cancel


Index: class.account_mgr.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.account_mgr.php,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -C2 -d -r1.1.2.22 -r1.1.2.23
*** class.account_mgr.php       14 Nov 2003 03:29:41 -0000      1.1.2.22
--- class.account_mgr.php       14 Nov 2003 08:23:57 -0000      1.1.2.23
***************
*** 420,424 ****
                                        'question' => lang('Are you sure you 
want to delete the user %s ?',$account_lid),
                                        'yes_op'   => 'api.account_mgr.delete',
!                                       'no_op'    => 'api.account_mgr.show',
                                        'current_inputs' => array(
                                                0 => array(
--- 420,424 ----
                                        'question' => lang('Are you sure you 
want to delete the user %s ?',$account_lid),
                                        'yes_op'   => 'api.account_mgr.delete',
!                                       'no_op'    => 'api.statecache.cancel',
                                        'current_inputs' => array(
                                                0 => array(

Index: class.base.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.base.php,v
retrieving revision 1.1.1.1.2.21
retrieving revision 1.1.1.1.2.22
diff -C2 -d -r1.1.1.1.2.21 -r1.1.1.1.2.22
*** class.base.php      10 Nov 2003 00:36:04 -0000      1.1.1.1.2.21
--- class.base.php      14 Nov 2003 08:23:57 -0000      1.1.1.1.2.22
***************
*** 105,109 ****
                        $GLOBALS['phpgw']->add_xsl('api.start');
                        
$GLOBALS['phpgw']->hooks->execute(array('hook'=>'api.base.start', 
'fname'=>'test_firstname', 'lname'=>'test_lastname'));
!                       $GLOBALS['phpgw_xml_apinode']->add_node('Home','title');
  
                        return $result;
--- 105,109 ----
                        $GLOBALS['phpgw']->add_xsl('api.start');
                        
$GLOBALS['phpgw']->hooks->execute(array('hook'=>'api.base.start', 
'fname'=>'test_firstname', 'lname'=>'test_lastname'));
!                       
//$GLOBALS['phpgw_xml_apinode']->add_node('Home','title');
  
                        return $result;
***************
*** 189,193 ****
  
                        $GLOBALS['phpgw']->add_xsl('api.profile');
!                       $GLOBALS['phpgw_xml_apinode']->add_node('Update your 
profile','title');
  
                        return $result;
--- 189,193 ----
  
                        $GLOBALS['phpgw']->add_xsl('api.profile');
!                       //$GLOBALS['phpgw_xml_apinode']->add_node('Update your 
profile','title');
  
                        return $result;
***************
*** 219,223 ****
                {
                        $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'));
--- 219,223 ----
                {
                        $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'));
***************
*** 281,285 ****
  
                        $GLOBALS['phpgw']->add_xsl('api.widgets');
!                       
$GLOBALS['phpgw_xml_apinode']->add_node('Preferences','title');
  
                        if ($args['appname'] == 'api')
--- 281,285 ----
  
                        $GLOBALS['phpgw']->add_xsl('api.widgets');
!                       
//$GLOBALS['phpgw_xml_apinode']->add_node('Preferences','title');
  
                        if ($args['appname'] == 'api')

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.33
retrieving revision 1.1.1.1.2.34
diff -C2 -d -r1.1.1.1.2.33 -r1.1.1.1.2.34
*** class.phpgw.php     10 Nov 2003 00:36:04 -0000      1.1.1.1.2.33
--- class.phpgw.php     14 Nov 2003 08:23:57 -0000      1.1.1.1.2.34
***************
*** 289,292 ****
--- 289,320 ----
                        }
  
+                       // If the app developer doesn't specify a title for 
there method, this will attempt
+                       // to detect the title in the "doc array".  If it 
can't, it will fall back to the application name.
+                       // FIXME: It appears that the xmltool search sections 
aren't complete, once they are, recode this section (jengo)
+                       $found_title = False;
+                       foreach ($GLOBALS['phpgw_xml_apinode']->data as $node)
+                       {
+                               if ($node['name'] == 'title' && 
strlen($node['data']))
+                               {
+                                       $found_title = True;
+                               }
+                       }
+ 
+                       if (! $found_title)
+                       {
+                               $app    = 
$GLOBALS['phpgw_data']['flags']['req_app'];
+                               $class  = 
$GLOBALS['phpgw_data']['flags']['req_class'];
+                               $method = 
$GLOBALS['phpgw_data']['flags']['req_method'];
+ 
+                               if ($GLOBALS['docs']['api']['classes'][$app . 
'_' . $class]['functions'][$method]['title'])
+                               {
+                                       
$GLOBALS['phpgw_xml_apinode']->add_node(lang($GLOBALS['docs']['api']['classes'][$app
 . '_' . $class]['functions'][$method]['title']),'title');
+                               }
+                               else
+                               {
+                                       
$GLOBALS['phpgw_xml_apinode']->add_node(lang($GLOBALS['phpgw']->apps->allapps[$app]['title']),'title');
+                               }
+                       }
+ 
                        // Don't add login, or if the last op is a duplicate
                        if ($GLOBALS['phpgw_data']['api']['op'] != 
'api.base.login'