[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.nextmatchs.inc.php,1.43.2.2,1
From: |
Mark A Peters <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.nextmatchs.inc.php,1.43.2.2,1.43.2.3 |
Date: |
Fri, 05 Apr 2002 09:07:26 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv25866/phpgwapi/inc
Modified Files:
Tag: Version-0_9_14-branch
class.nextmatchs.inc.php
Log Message:
GNU Patch #202.
Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -C2 -r1.43.2.2 -r1.43.2.3
*** class.nextmatchs.inc.php 17 Mar 2002 19:50:57 -0000 1.43.2.2
--- class.nextmatchs.inc.php 5 Apr 2002 14:07:23 -0000 1.43.2.3
***************
*** 697,701 ****
@param $old_sort : the current sort value
@param $new_sort : the sort value you want if you click on this
! @param $default_order : user's preference for ordering list
items (force this when a new [different] sorting is requested)
@param $order : the current order (will be flipped if old_sort
= new_sort)
@param $program : script file name
--- 697,701 ----
@param $old_sort : the current sort value
@param $new_sort : the sort value you want if you click on this
! @param $default_order : users preference for ordering list
items (force this when a new [different] sorting is requested)
@param $order : the current order (will be flipped if old_sort
= new_sort)
@param $program : script file name
***************
*** 705,720 ****
function
show_sort_order_imap($old_sort,$new_sort,$default_order,$order,$program,$text,$extra='')
{
! if (is_array($extra))
{
$extra = $this->extras_to_string($extra);
}
! if ($old_sort == $new_sort)
{
// alternate order, like on outkrook, click on
present sorting reverses order
! if ((int)$order == 1)
{
$our_order = 0;
}
! elseif ((int)$order == 0)
{
$our_order = 1;
--- 705,720 ----
function
show_sort_order_imap($old_sort,$new_sort,$default_order,$order,$program,$text,$extra='')
{
! if(is_array($extra))
{
$extra = $this->extras_to_string($extra);
}
! if($old_sort == $new_sort)
{
// alternate order, like on outkrook, click on
present sorting reverses order
! if((int)$order == 1)
{
$our_order = 0;
}
! elseif((int)$order == 0)
{
$our_order = 1;
***************
*** 728,732 ****
else
{
! //user has selected a new sort scheme, reset
the order to user's default
$our_order = $default_order;
}
--- 728,732 ----
else
{
! //user has selected a new sort scheme, reset
the order to users default
$our_order = $default_order;
}
***************
*** 765,774 ****
$out_vars['start'] = $feed_vars['start'];
// things that stay the same
$out_vars['total'] = $feed_vars['total'];
- $out_vars['cmd_prefix'] = $feed_vars['cmd_prefix'];
- $out_vars['cmd_suffix'] = $feed_vars['cmd_suffix'];
// first page
! if (($feed_vars['start'] != 0) &&
($feed_vars['start'] > $this->maxmatches))
{
--- 765,773 ----
$out_vars['start'] = $feed_vars['start'];
// things that stay the same
+ $out_vars['common_uri'] = $feed_vars['common_uri'];
$out_vars['total'] = $feed_vars['total'];
// first page
! if(($feed_vars['start'] != 0) &&
($feed_vars['start'] > $this->maxmatches))
{
***************
*** 781,788 ****
}
// previous page
! if ($feed_vars['start'] != 0)
{
// Changing the sorting order screaws up the
starting number
! if (($feed_vars['start'] - $this->maxmatches) <
0)
{
$out_vars['start'] = 0;
--- 780,787 ----
}
// previous page
! if($feed_vars['start'] != 0)
{
// Changing the sorting order screaws up the
starting number
! if(($feed_vars['start'] - $this->maxmatches) <
0)
{
$out_vars['start'] = 0;
***************
*** 803,807 ****
$out_vars['start'] = $feed_vars['start'];
// next page
! if (($feed_vars['total'] > $this->maxmatches) &&
($feed_vars['total'] > $feed_vars['start'] +
$this->maxmatches))
{
--- 802,806 ----
$out_vars['start'] = $feed_vars['start'];
// next page
! if(($feed_vars['total'] > $this->maxmatches) &&
($feed_vars['total'] > $feed_vars['start'] +
$this->maxmatches))
{
***************
*** 814,818 ****
}
// last page
! if (($feed_vars['start'] != $feed_vars['total'] -
$this->maxmatches) &&
(($feed_vars['total'] - $this->maxmatches) >
($feed_vars['start'] + $this->maxmatches)))
{
--- 813,817 ----
}
// last page
! if(($feed_vars['start'] != $feed_vars['total'] -
$this->maxmatches) &&
(($feed_vars['total'] - $this->maxmatches) >
($feed_vars['start'] + $this->maxmatches)))
{
***************
*** 838,843 ****
{
$img_full =
$GLOBALS['phpgw']->common->image('phpgwapi',$img);
! $js_cmd =
$out_vars['cmd_prefix'].$out_vars['start'].$out_vars['cmd_suffix'];
! return '<img src="'.$img_full.'" border="0"
alt="'.$alt_text.'" width="12" height="12" onclick="'.$js_cmd.'">'."\r\n";
}
--- 837,842 ----
{
$img_full =
$GLOBALS['phpgw']->common->image('phpgwapi',$img);
! $image_part = '<img src="'.$img_full.'" border="0"
alt="'.$alt_text.'" width="12" height="12">';
! return '<a
href="'.$out_vars['common_uri'].'&start='.$out_vars['start'].'">'.$image_part.'</a>';
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.nextmatchs.inc.php,1.43.2.2,1.43.2.3,
Mark A Peters <address@hidden> <=