extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix to allow nextmatchs to maintain cquery, also stretched the top bar to 95 like the rest of the page

Browse Source
This commit is contained in:
Miles Lott 2004-01-17 03:33:58 +00:00
parent 63d80f2fcd
commit 73f11d4481
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.boaddressbook.inc.php
View File

@ -84,7 +84,7 @@
/* Might change this to '' at the end---> */ /* Might change this to '' at the end---> */
$_start = get_var('start',array('POST','GET')); $_start = get_var('start',array('POST','GET'));
$_query = get_var('query',array('POST','GET')); $_query = get_var('query',array('POST','GET'));
$_cquery = get_var('cquery', array('GET')); $_cquery = get_var('cquery', array('GET','POST'));
$_sort = get_var('sort',array('POST','GET')); $_sort = get_var('sort',array('POST','GET'));
$_order = get_var('order',array('POST','GET')); $_order = get_var('order',array('POST','GET'));
$_filter = get_var('filter',array('POST','GET')); $_filter = get_var('filter',array('POST','GET'));

18
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -310,7 +310,8 @@
$cols .= ' <td height="21">' . "\n"; $cols .= ' <td height="21">' . "\n";
$cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">'; $cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">';
$cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort, $cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort,
$column[0],$this->order,'/index.php',$showcol,'&menuaction=addressbook.uiaddressbook.index'); $column[0],$this->order,'/index.php',$showcol,'&menuaction=addressbook.uiaddressbook.index'
);
$cols .= "</font>\n </td>"; $cols .= "</font>\n </td>";
$cols .= "\n"; $cols .= "\n";
@ -362,8 +363,11 @@
$showcol = $this->display_name($col); $showcol = $this->display_name($col);
$cols .= ' <td height="21">' . "\n"; $cols .= ' <td height="21">' . "\n";
$cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">'; $cols .= ' <font size="-1" face="Arial, Helvetica, sans-serif">';
$cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort, $cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order(
$col,$this->order,"/index.php",$showcol,'&menuaction=addressbook.uiaddressbook.index&cat_id='.$this->cat_id); $this->sort,$col,$this->order,
"/index.php",$showcol,
'&menuaction=addressbook.uiaddressbook.index&cat_id=' . $this->cat_id . '&cquery=' . $this->cquery
);
$cols .= "</font>\n </td>"; $cols .= "</font>\n </td>";
$cols .= "\n"; $cols .= "\n";
@ -457,9 +461,11 @@
$GLOBALS['filter'] = $this->filter; $GLOBALS['filter'] = $this->filter;
$search_filter = $GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php', $search_filter = $GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php',
$this->start, $total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%', $this->start, $total_records,
$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,array('filter'=>$this->filter,'yours'=>1), '&menuaction=addressbook.uiaddressbook.index&fcat_id=' . $this->cat_id . '&cquery=' . $this->cquery,'95%',
$this->cat_id); $GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,array('filter' => $this->filter,'yours' => 1),
$this->cat_id
);
$query = $filter = ''; $query = $filter = '';
$lang_showing = $GLOBALS['phpgw']->nextmatchs->show_hits($total_records,$this->start); $lang_showing = $GLOBALS['phpgw']->nextmatchs->show_hits($total_records,$this->start);