[Phpgroupware-cvs] CVS: infolog/inc hook_admin.inc.php,1.6,1.7 hook_preferences.inc.php,1.8,1.9

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv7904

Modified Files:
        hook_admin.inc.php hook_preferences.inc.php 
Log Message:
different calls to display_section to work in HEAD and 0.9.14

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_admin.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** hook_admin.inc.php  3 Nov 2002 01:03:05 -0000       1.6
--- hook_admin.inc.php  17 Nov 2002 01:34:36 -0000      1.7
***************
*** 1,24 ****
! <?php
!       
/**************************************************************************\
!       * phpGroupWare - Info Log administration                                
   *
!       * http://www.phpgroupware.org                                           
   *
!       * --------------------------------------------                          
   *
!       *  This program is free software; you can redistribute it and/or modify 
it *
!       *  under the terms of the GNU General Public License as published by 
the   *
!       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
!       *  option) any later version.                                           
   *
!       
\**************************************************************************/
!       /* $Id$ */
  
!       {
                $file = Array
!               (
!                       'Site configuration' => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'infolog.uiinfolog.admin' )),
!                       'Global Categories'  => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname . '&global_cats=True'),
!                       'CSV-Import' => 
$GLOBALS['phpgw']->link('/infolog/csv_import.php')
!               );
  
! //Do not modify below this line
!               display_section($appname,$file);
!       }
! ?>
\ No newline at end of file
--- 1,28 ----
! <?php
!       
/**************************************************************************\
!       * phpGroupWare - Info Log administration                                
   *
!       * http://www.phpgroupware.org                                           
   *
!       * --------------------------------------------                          
   *
!       *  This program is free software; you can redistribute it and/or modify 
it *
!       *  under the terms of the GNU General Public License as published by 
the   *
!       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
!       *  option) any later version.                                           
   *
!       
\**************************************************************************/
!       /* $Id$ */
  
!       {
                $file = Array
!               (
!                       'Site configuration' => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction' => 
'infolog.uiinfolog.admin' )),
!                       'Global Categories'  => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname . '&global_cats=True'),
!                       'CSV-Import' => 
$GLOBALS['phpgw']->link('/infolog/csv_import.php')
!               );
  
! //Do not modify below this line
!               list($ver,$mayor,$minor,$ref) = 
explode('.',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
!               if ($minor > 14)
!                       display_section($appname,$file);
!               else
!                       display_section($appname,$appname,$file);
!       }
! ?>

Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_preferences.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** hook_preferences.inc.php    12 Jan 2002 15:46:46 -0000      1.8
--- hook_preferences.inc.php    17 Nov 2002 01:34:36 -0000      1.9
***************
*** 15,19 ****
  {
  // Only Modify the $file and $title variables.....
-       $title = $appname;
        $file = array(
                'Preferences'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=infolog.uiinfolog.preferences'),
--- 15,18 ----
***************
*** 22,26 ****
        );
  //Do not modify below this line
!       display_section($appname,$title,$file);
  }
  
--- 21,29 ----
        );
  //Do not modify below this line
!       list($ver,$mayor,$minor,$ref) = 
explode('.',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
!       if ($minor > 14)
!               display_section($appname,$file);
!       else
!               display_section($appname,$appname,$file);
  }