[Phpgroupware-cvs] CVS: infolog/inc class.uiinfolog.inc.php,1.72,1.73 hook_home.inc.php,1.7,1.8

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.uiinfolog.inc.php hook_home.inc.php 
Log Message:
fix to get hook_home working for .14 and HEAD

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** class.uiinfolog.inc.php     6 Jul 2003 08:56:21 -0000       1.72
--- class.uiinfolog.inc.php     6 Jul 2003 20:12:27 -0000       1.73
***************
*** 148,152 ****
                }
  
!               function index($values = 
0,$action='',$action_id='',$referer=0,$extra_app_header=False)
                {
                        $referer = is_array($values) ? $values['referer'] : 
$referer;
--- 148,152 ----
                }
  
!               function index($values = 
0,$action='',$action_id='',$referer=0,$extra_app_header=False,$return_html=False)
                {
                        $referer = is_array($values) ? $values['referer'] : 
$referer;
***************
*** 237,241 ****
                        $persist['referer'] = $referer;
  
!                       
$this->tmpl->exec('infolog.uiinfolog.index',$values,'',$readonlys,$persist);
                }
  
--- 237,241 ----
                        $persist['referer'] = $referer;
  
!                       return 
$this->tmpl->exec('infolog.uiinfolog.index',$values,'',$readonlys,$persist,'',$return_html);
                }
  

Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_home.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** hook_home.inc.php   24 Nov 2002 20:30:55 -0000      1.7
--- hook_home.inc.php   6 Jul 2003 20:12:27 -0000       1.8
***************
*** 1,34 ****
! <?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$ */
! 
!       if 
($GLOBALS['phpgw_info']['user']['preferences']['infolog']['homeShowEvents'])
!       {
!               $save_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
!               $GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog';
! 
!               $GLOBALS['phpgw']->translation->add_app('infolog');
! 
!               $app_id = $GLOBALS['phpgw']->applications->name2id('infolog');
!               $GLOBALS['portal_order'][] = $app_id;
! 
!               $GLOBALS['phpgw']->portalbox->set_params(array('app_id' => 
$app_id,
!                                                                               
                                'title' => lang('infolog')));
! 
!               $GLOBALS['HTTP_POST_VARS']['filter'] = $GLOBALS['filter'] = 
'own-open-today';
!               $infolog = CreateObject('infolog.uiinfolog');
! 
!               $GLOBALS['phpgw']->portalbox->draw($infolog->index());
! 
!               unset($infolog);
!               $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
!       }
! ?>
--- 1,66 ----
! <?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$ */
! 
!       if 
($GLOBALS['phpgw_info']['user']['preferences']['infolog']['homeShowEvents'])
!       {
!               $save_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
!               $GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog';
! 
!               $GLOBALS['phpgw']->translation->add_app('infolog');
! 
!               $app_id = $GLOBALS['phpgw']->applications->name2id('infolog');
!               $GLOBALS['portal_order'][] = $app_id;
! 
!               $infolog = CreateObject('infolog.uiinfolog');
!               $html = $infolog->index(array('nm' => array('filter' => 
'own-open-today')),'','',0,False,True);
!               $title = lang('InfoLog').' - 
'.lang($infolog->filters['own-open-today']);
!               $stable = $infolog->tmpl->stable;
!               unset($infolog);
! 
!               if ($stable)    // .14/6
!               {
!                       $portalbox = CreateObject('phpgwapi.listbox',array(
!                               'title'     => $title,
!                               'primary'   => 
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
!                               'secondary' => 
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
!                               'tertiary'  => 
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
!                               'width'     => '100%',
!                               'outerborderwidth' => '0',
!                               'header_background_image' => 
$GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler')
!                       ));
!                       foreach(array(
!                               'up'       => Array('url' => '/set_box.php', 
'app' => $app_id),
!                               'down'     => Array('url' => '/set_box.php', 
'app' => $app_id),
!                               'close'    => Array('url' => '/set_box.php', 
'app' => $app_id),
!                               'question' => Array('url' => '/set_box.php', 
'app' => $app_id),
!                               'edit'     => Array('url' => '/set_box.php', 
'app' => $app_id)
!                       ) as $key => $value)
!                       {
!                               $portalbox->set_controls($key,$value);
!                       }
!                       $portalbox->data = $data;
! 
!                       echo "\n<!-- BEGIN InfoLog info 
-->\n".$portalbox->draw($html)."\n<!-- END InfoLog info -->\n";
!                       unset($portalbox);
!               }
!               else    // HEAD / XSLT
!               {
!                       $GLOBALS['phpgw']->portalbox->set_params(array(
!                               'app_id' => $app_id,
!                               'title'  => $title
!                       ));
!                       $GLOBALS['phpgw']->portalbox->draw($html);
!               }
!               unset($html);
!               $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
!       }
! ?>