update showing number of items

This commit is contained in:
bettina 2001-06-28 20:10:52 +00:00
parent 15f2a238e7
commit 94592679c0
2 changed files with 5 additions and 49 deletions

View File

@ -12,7 +12,7 @@
/* $Id$ */ /* $Id$ */
$phpgw_info['flags'] = array('currentapp' => 'admin', $phpgw_info['flags'] = array('currentapp' => 'admin',
'enable_nextmatchs_class' => True); 'enable_nextmatchs_class' => True);
include('../header.inc.php'); include('../header.inc.php');
@ -39,15 +39,6 @@
if (! $start) { $start = 0; } if (! $start) { $start = 0; }
if($phpgw_info['user']['preferences']['common']['maxmatchs'] && $phpgw_info['user']['preferences']['common']['maxmatchs'] > 0)
{
$limit = $phpgw_info['user']['preferences']['common']['maxmatchs'];
}
else
{
$limit = 15;
}
$c = CreateObject('phpgwapi.categories'); $c = CreateObject('phpgwapi.categories');
$c->app_name = 'phpgw'; $c->app_name = 'phpgw';
$categories = $c->return_array('all',$start,True,$query,$sort,$order,True); $categories = $c->return_array('all',$start,True,$query,$sort,$order,True);
@ -59,19 +50,7 @@
$t->set_var('left',$left); $t->set_var('left',$left);
$t->set_var('right',$right); $t->set_var('right',$right);
if (($start + $limit) > $c->total_records) $t->set_var('lang_showing',$phpgw->nextmatchs->show_hits($c->total_records,$start));
{
$lang_showing = lang('showing x - x of x',($start + 1),$c->total_records,$c->total_records);
}
elseif ($c->total_records > $limit)
{
$lang_showing=lang('showing x - x of x',($start + 1),($start + $limit),$c->total_records);
}
else
{
$lang_showing=lang('showing x',$c->total_records);
}
$t->set_var('lang_showing',$lang_showing);
// ------------------------------ end nextmatch ------------------------------------------ // ------------------------------ end nextmatch ------------------------------------------

View File

@ -9,13 +9,10 @@
* Free Software Foundation; either version 2 of the License, or (at your * * Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. * * option) any later version. *
\***************************************************************************/ \***************************************************************************/
/* $Id$ */ /* $Id$ */
$phpgw_info['flags'] = array( $phpgw_info['flags'] = array('currentapp' => $cats_app,
'currentapp' => $cats_app, 'enable_nextmatchs_class' => True);
'enable_nextmatchs_class' => True
);
if (! $appheader) if (! $appheader)
{ {
@ -60,15 +57,6 @@
if (! $start) { $start = 0; } if (! $start) { $start = 0; }
if($phpgw_info['user']['preferences']['common']['maxmatchs'] && $phpgw_info['user']['preferences']['common']['maxmatchs'] > 0)
{
$limit = $phpgw_info['user']['preferences']['common']['maxmatchs'];
}
else
{
$limit = 15;
}
$c = CreateObject('phpgwapi.categories'); $c = CreateObject('phpgwapi.categories');
$c->app_name = $cats_app; $c->app_name = $cats_app;
@ -90,18 +78,7 @@
$t->set_var('left',$left); $t->set_var('left',$left);
$t->set_var('right',$right); $t->set_var('right',$right);
if (($start + $limit) > $c->total_records) $t->set_var('lang_showing',$phpgw->nextmatchs->show_hits($c->total_records,$start));
{
$t->set_var('lang_showing',lang('showing x - x of x',($start + 1),$c->total_records,$c->total_records));
}
elseif ($c->total_records > $limit)
{
$t->set_var('lang_showing',lang('showing x - x of x',($start + 1),($start + $limit),$c->total_records));
}
else
{
$t->set_var('lang_showing',lang('showing x',$c->total_records));
}
// ------------------------------ end nextmatch ------------------------------------------ // ------------------------------ end nextmatch ------------------------------------------