holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a problem where the level parameters were not being set correctly whe using cookie based sessions.

Browse Source
This commit is contained in:
skeeter 2001-06-17 04:23:35 +00:00
parent 986ab702c5
commit 83c2195f27
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
phpgwapi/inc/class.menutree.inc.php
View File

@ -297,10 +297,10 @@ var $last_column_size;
$params='';
}
if($params != '')
{
$params = '&'.$params;
}
// if($params != '')
// {
// $params = '&'.$params;
// }
/****************************************/
/* Always display the extreme top level */
@ -360,20 +360,28 @@ var $last_column_size;
if($tree[$cnt+1][0]>$tree[$cnt][0])
{
$src = $REQUEST_URI;
if(strpos($src,'&p=') != 0)
if(ereg('[\?\&]p=',$src) != 0)
{
$src = str_replace(substr($REQUEST_URI,strpos($src,'&p=')),'',$REQUEST_URI);
$src = ereg_replace('[\?\&]p=([0-9\|])','',$REQUEST_URI);
}
// echo 'Src = '.$src."<br>\n";
if(strpos(' '.$src,'?'))
{
$extra_param = '&';
}
else
{
$extra_param = '?';
}
if($expand[$cnt]==0)
{
// $str .= '<td><a href="'.$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/'.basename($SCRIPT_FILENAME),$params).'"><img src="'.$img_expand.'" border="no" alt="+"></a></td>';
$str .= '<td><a href="'.$src.$params.'"><img src="'.$img_expand.'" border="no" alt="+"></a></td>';
$str .= '<td><a href="'.$src.$extra_param.$params.'"><img src="'.$img_expand.'" border="no" alt="+"></a></td>';
}
else
{
// $str .= '<td><a href="'.$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/'.basename($SCRIPT_FILENAME),$params).'"><img src="'.$img_collapse.'" border="no" alt="-"></a></td>';
$str .= '<td><a href="'.$src.$params.'"><img src="'.$img_collapse.'" border="no" alt="-"></a></td>';
$str .= '<td><a href="'.$src.$extra_param.$params.'"><img src="'.$img_collapse.'" border="no" alt="-"></a></td>';
}
}
elseif(isset($tree[$cnt+1][0]))
@ -396,7 +404,15 @@ var $last_column_size;
}
else
{
$str .= '<a href="'.$tree[$cnt][2].$params.'" target="'.$tree[$cnt][3].'">'.$tree[$cnt][1].'</a>';
if(strpos(' '.$tree[$cnt][2],'?'))
{
$extra_param = '&';
}
else
{
$extra_param = '?';
}
$str .= '<a href="'.$tree[$cnt][2].$extra_param.$params.'" target="'.$tree[$cnt][3].'">'.$tree[$cnt][1].'</a>';
}
}
else