[Phpgroupware-cvs] CVS: infolog/inc hook_projects_view.inc.php,1.3,1.4 hook_calendar_view.inc.php,1.1,1.2 hook_addressbook_view.inc.php,1.9,1.10

[Ralf Becker <address@hidden>]

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

Modified Files:
        hook_projects_view.inc.php hook_calendar_view.inc.php 
        hook_addressbook_view.inc.php 
Log Message:
fixes to get the hooks working again


Index: hook_projects_view.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_projects_view.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hook_projects_view.inc.php  1 Sep 2002 18:11:34 -0000       1.3
--- hook_projects_view.inc.php  23 Nov 2002 20:45:07 -0000      1.4
***************
*** 1,25 ****
! <?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$ */
! 
!       global $phpgw_info,$phpgw;
!       $save_app = $phpgw_info['flags']['currentapp']; 
!       $phpgw_info['flags']['currentapp'] = 'infolog'; 
! 
!       $phpgw->translation->add_app('infolog');
! 
!       //echo "<p>hook_projects_view($GLOBALS['project_id'])</p>";
! 
!       $infolog = CreateObject('infolog.uiinfolog');
!       $infolog->get_list(True,'proj',$GLOBALS['project_id']);
! 
!       $phpgw_info['flags']['currentapp'] = $save_app; 
--- 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$ */
! 
!       global $phpgw_info,$phpgw;
!       $save_app = $phpgw_info['flags']['currentapp']; 
!       $phpgw_info['flags']['currentapp'] = 'infolog'; 
! 
!       $phpgw->translation->add_app('infolog');
! 
!       $GLOBALS['phpgw_info']['etemplate']['hooked'] = True;
! 
!       $infolog = CreateObject('infolog.uiinfolog');
!       $infolog->index(0,'calendar',$GLOBALS['project_id'],array(
!               'menuaction' => 'projects.uiprojects.view',
!               'project_id' => $GLOBALS['project_id']
!       ));
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
!       unset($GLOBALS['phpgw_info']['etemplate']['hooked']); 

Index: hook_calendar_view.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_calendar_view.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** hook_calendar_view.inc.php  12 May 2002 07:13:09 -0000      1.1
--- hook_calendar_view.inc.php  23 Nov 2002 20:45:07 -0000      1.2
***************
*** 1,22 ****
! <?php
!       
/**************************************************************************\
!       * phpGroupWare - Info Log                                               
   *
!       * 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$ */
! 
!       $save_app = $GLOBALS['phpgw_info']['flags']['currentapp']; 
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog'; 
! 
!       $GLOBALS['phpgw']->translation->add_app('infolog');
! 
!       $infolog = CreateObject('infolog.uiinfolog');
!       $infolog->get_list(True,'event',$GLOBALS['cal_id']);
! 
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app; 
--- 1,27 ----
! <?php
!       
/**************************************************************************\
!       * phpGroupWare - Info Log                                               
   *
!       * 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$ */
! 
!       $save_app = $GLOBALS['phpgw_info']['flags']['currentapp']; 
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog'; 
! 
!       $GLOBALS['phpgw']->translation->add_app('infolog');
! 
!       $GLOBALS['phpgw_info']['etemplate']['hooked'] = True;
! 
!       $infolog = CreateObject('infolog.uiinfolog');
!       $infolog->index(0,'calendar',$GLOBALS['cal_id'],array(
!               'menuaction' => 'calendar.uicalendar.view',
!               'cal_id' => $GLOBALS['cal_id']
!       ));
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
!       unset($GLOBALS['phpgw_info']['etemplate']['hooked']);

Index: hook_addressbook_view.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_addressbook_view.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** hook_addressbook_view.inc.php       17 Oct 2002 23:31:24 -0000      1.9
--- hook_addressbook_view.inc.php       23 Nov 2002 20:45:07 -0000      1.10
***************
*** 17,29 ****
        $GLOBALS['phpgw']->translation->add_app('infolog');
  
-       //echo "<p>hook_addressbook_view(ab_id=$GLOBALS[ab_id])</p>\n";
- /*
-       $link = CreateObject('infolog.uilink');
-       $out = 
'<table>'.$link->getEntry('entry','addressbook',$GLOBALS['ab_id'])."\n".
-                        
$link->showLinks('links','addressbook',$GLOBALS['ab_id'],'!infolog')."</table>\n";
-       $html = CreateObject('etemplate.html');
-       $out = 
$html->form($out,'','/index.php',array('menuaction'=>'addressbook.uiaddressbook.view','ab_id'=>$GLOBALS['ab_id']));
-       $GLOBALS['phpgw']->template->set_var('phpgw_body',$out,True);
- */
        $GLOBALS['phpgw_info']['etemplate']['hooked'] = True;
  
--- 17,20 ----
***************
*** 33,37 ****
                'ab_id' => $GLOBALS['ab_id']
        ));
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app; 
        unset($GLOBALS['phpgw_info']['etemplate']['hooked']);
  
--- 24,28 ----
                'ab_id' => $GLOBALS['ab_id']
        ));
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
        unset($GLOBALS['phpgw_info']['etemplate']['hooked']);