[Phpgroupware-cvs] CVS: infolog/inc class.uiinfolog.inc.php,1.50,1.51

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.uiinfolog.inc.php 
Log Message:
- no empty data-line shown, if no data
- added option to disable nextmatch, if total entries <= nextmatch-max and no 
search, filter or cat set


Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** class.uiinfolog.inc.php     16 Oct 2002 00:23:39 -0000      1.50
--- class.uiinfolog.inc.php     16 Oct 2002 14:09:40 -0000      1.51
***************
*** 109,113 ****
                {
                        //echo 
"<p>uiinfolog.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]')</p>\n";
! 
                        $ids = 
$this->bo->search($query['order'],$query['sort'],$query['filter'],$query['cat_id'],
                                
$query['search'],$query['action'],$query['action_id'],$query['ordermethod'],
--- 109,118 ----
                {
                        //echo 
"<p>uiinfolog.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]')</p>\n";
!                       
$GLOBALS['phpgw']->session->appsession('session_data','infolog',array(
!                               'search' => $query['search'],
!                               'start'  => $query['start'],
!                               'filter' => $query['filter'],
!                               'cat_id' => $query['cat_id']
!                       ));
                        $ids = 
$this->bo->search($query['order'],$query['sort'],$query['filter'],$query['cat_id'],
                                
$query['search'],$query['action'],$query['action_id'],$query['ordermethod'],
***************
*** 141,147 ****
                        else
                        {
!                               $data = $values['nm'];
!                               unset($data['rows']);
!                               
$GLOBALS['phpgw']->session->appsession('session_data','infolog',$data);
                        }
                        $action = $action ? $action : $values['action'];
--- 146,155 ----
                        else
                        {
!                               
$GLOBALS['phpgw']->session->appsession('session_data','infolog',array(
!                                       'search' => $values['nm']['search'],
!                                       'start'  => $values['nm']['start'],
!                                       'filter' => $values['nm']['filter'],
!                                       'cat_id' => $values['nm']['cat_id']
!                               ));
                        }
                        $action = $action ? $action : $values['action'];
***************
*** 160,164 ****
                                        list($do,$do_id) = 
isset($values['main']) ? each($values['main']) : @each($values['nm']['rows']);
                                        list($do_id) = @each($do_id);
!                                       //echo "<p>infolog::index: 
do='$do/$do_id', referer="; _debug_array($referer);
                                        switch($do)
                                        {
--- 168,172 ----
                                        list($do,$do_id) = 
isset($values['main']) ? each($values['main']) : @each($values['nm']['rows']);
                                        list($do_id) = @each($do_id);
!                                       echo "<p>infolog::index: 
do='$do/$do_id', referer="; _debug_array($referer);
                                        switch($do)
                                        {