[Phpgroupware-cvs] CVS: bookmarks/inc class.bo.inc.php,1.1.2.1,1.1.2.2 class.ui.inc.php,1.1.2.1,1.1.2.2

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/bookmarks/inc
In directory subversions:/tmp/cvs-serv11384/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.bo.inc.php class.ui.inc.php 
Log Message:
move nextmatch object fom bo to ui


Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.bo.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.bo.inc.php    8 Apr 2003 04:46:15 -0000       1.1.2.1
--- class.bo.inc.php    8 Apr 2003 18:43:38 -0000       1.1.2.2
***************
*** 23,27 ****
                var $url_format_check;
                var $validate;
-               var $nextmatchs;
                var $categories;
                //following two are used by the export function
--- 23,26 ----
***************
*** 34,38 ****
                        $this->db          = $GLOBALS['phpgw']->db;
                        $this->grants      = 
$GLOBALS['phpgw']->acl->get_grants('bookmarks');
-                       $this->nextmatchs = createobject('phpgwapi.nextmatchs');
                        $this->categories = 
createobject('phpgwapi.categories','','bookmarks');
                        $GLOBALS['phpgw']->config     = 
createobject('phpgwapi.config');
--- 33,36 ----
***************
*** 407,410 ****
--- 405,409 ----
                        $this->type = $type;
                        $this->expanded = $expanded;
+ 
                        $t = 
CreateObject('phpgwapi.Template',PHPGW_INCLUDE_ROOT . 
'/bookmarks/templates/export');
                        $t->set_file('export','export_' . $this->type . '.tpl');

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/bookmarks/inc/class.ui.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** class.ui.inc.php    8 Apr 2003 04:46:15 -0000       1.1.2.1
--- class.ui.inc.php    8 Apr 2003 18:43:38 -0000       1.1.2.2
***************
*** 27,30 ****
--- 27,31 ----
                var $img;
                var $expandedcats;
+               var $nextmatchs;
  
                var $public_functions = array
***************
*** 57,60 ****
--- 58,63 ----
                        $this->expandedcats = array();
                        $this->location_info = $this->bo->read_session_data();
+                       $this->nextmatchs = createobject('phpgwapi.nextmatchs');
+ 
                }
  
***************
*** 455,460 ****
  
                        $this->t->set_var(array(
!                               'next_matchs_left' =>  
$this->bo->nextmatchs->left('/index.php',$start,$total_bookmarks,$link_data),
!                               'next_matchs_right' => 
$this->bo->nextmatchs->right('/index.php',$start,$total_bookmarks,$link_data),
                                'showing' => $total_matchs
                        ));
--- 458,463 ----
  
                        $this->t->set_var(array(
!                               'next_matchs_left' =>  
$this->nextmatchs->left('/index.php',$start,$total_bookmarks,$link_data),
!                               'next_matchs_right' => 
$this->nextmatchs->right('/index.php',$start,$total_bookmarks,$link_data),
                                'showing' => $total_matchs
                        ));
***************
*** 561,566 ****
  
                        $this->t->set_var(array(
!                               'next_matchs_left' =>  
$GLOBALS['phpgw']->nextmatchs->left('/index.php',$start,$total_bookmarks,$link_data),
!                               'next_matchs_right' => 
$GLOBALS['phpgw']->nextmatchs->right('/index.php',$start,$total_bookmarks,$link_data),
                                'showing' => $total_matchs
                        ));
--- 564,569 ----
  
                        $this->t->set_var(array(
!                               'next_matchs_left' =>  
$this->nextmatchs->left('/index.php',$start,$total_bookmarks,$link_data),
!                               'next_matchs_right' => 
$this->nextmatchs->right('/index.php',$start,$total_bookmarks,$link_data),
                                'showing' => $total_matchs
                        ));