[Phpgroupware-cvs] CVS: infolog/inc class.bolink.inc.php,1.5,1.6 class.uiinfolog.inc.php,1.44,1.45 class.uilink.inc.php,1.5,1.6 hook_addressbook_view.inc.php,1.6,1.7

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.bolink.inc.php class.uiinfolog.inc.php 
        class.uilink.inc.php hook_addressbook_view.inc.php 
Log Message:
using include_once now to include the class we extend and exclusivly the 
etemplate.html class

Index: class.bolink.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.bolink.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.bolink.inc.php        29 Sep 2002 08:06:00 -0000      1.5
--- class.bolink.inc.php        29 Sep 2002 08:40:51 -0000      1.6
***************
*** 13,17 ****
        /* $Id$ */
  
!       include_once(PHPGW_API_INC . '/../../infolog/inc/class.solink.inc.php');
  
        /*!
--- 13,17 ----
        /* $Id$ */
  
!       include_once(PHPGW_INCLUDE_ROOT . '/infolog/inc/class.solink.inc.php');
  
        /*!

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** class.uiinfolog.inc.php     3 Sep 2002 23:08:00 -0000       1.44
--- class.uiinfolog.inc.php     29 Sep 2002 08:40:51 -0000      1.45
***************
*** 70,74 ****
                        );
  
!                       $this->html = CreateObject('infolog.html');
                        $this->categories = CreateObject('phpgwapi.categories');
                        $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
--- 70,74 ----
                        );
  
!                       $this->html = CreateObject('etemplate.html');
                        $this->categories = CreateObject('phpgwapi.categories');
                        $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');

Index: class.uilink.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uilink.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uilink.inc.php        29 Sep 2002 08:06:00 -0000      1.5
--- class.uilink.inc.php        29 Sep 2002 08:40:51 -0000      1.6
***************
*** 13,17 ****
        /* $Id$ */
  
!       include_once(PHPGW_API_INC . '/../../infolog/inc/class.bolink.inc.php');
  
        /*!
--- 13,17 ----
        /* $Id$ */
  
!       include_once(PHPGW_INCLUDE_ROOT . '/infolog/inc/class.bolink.inc.php');
  
        /*!
***************
*** 66,70 ****
                                );
                                $etemplate = 
CreateObject('etemplate.etemplate','infolog.linkto_widget.create');
!                               $html = CreateObject('infolog.html');
                                $out = 
$etemplate->show($value,'','',$name)."\n".$html->input_hidden($name.'[app]',$value['app']);
                        }
--- 66,70 ----
                                );
                                $etemplate = 
CreateObject('etemplate.etemplate','infolog.linkto_widget.create');
!                               $html = CreateObject('etemplate.html');
                                $out = 
$etemplate->show($value,'','',$name)."\n".$html->input_hidden($name.'[app]',$value['app']);
                        }
***************
*** 144,148 ****
                                return False;
                        }
!                       $html = CreateObject('infolog.html');
                        return $content == '' ? $html->link('/index.php',$view) 
: $html->a_href($content,'/index.php',$view);
                }
--- 144,148 ----
                                return False;
                        }
!                       $html = CreateObject('etemplate.html');
                        return $content == '' ? $html->link('/index.php',$view) 
: $html->a_href($content,'/index.php',$view);
                }

Index: hook_addressbook_view.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/hook_addressbook_view.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** hook_addressbook_view.inc.php       3 Sep 2002 23:08:00 -0000       1.6
--- hook_addressbook_view.inc.php       29 Sep 2002 08:40:51 -0000      1.7
***************
*** 22,26 ****
        $out = 
'<table>'.$link->getEntry('entry','addressbook',$GLOBALS['ab_id'])."\n".
                         
$link->showLinks('links','addressbook',$GLOBALS['ab_id'],'!infolog')."</table>\n";
!       $html = CreateObject('infolog.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);
--- 22,26 ----
        $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);