- Bug dans le précédent commit

This commit is contained in:
Benjamin Renard 2009-04-10 17:36:09 +00:00
parent c1e7664313
commit 8e5a5cb6f0
2 changed files with 33 additions and 23 deletions

View file

@ -87,27 +87,32 @@ if(LSsession :: startLSsession()) {
if (isset($_REQUEST['LSview_recur'])) { if (isset($_REQUEST['LSview_recur'])) {
$recur = true; $recur = true;
$params['scope'] = 'sub';
if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) {
$topDn = $_REQUEST['LSselect_topDn'];
$selectedTopDn = $topDn;
}
else {
$topDn = LSsession :: getTopDn();
$selectedTopDn = $topDn;
}
} }
else { else {
$recur = false; $recur = false;
$params['scope'] = 'one'; }
if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) { }
$topDn = $object -> config['container_dn'].','.$_REQUEST['LSselect_topDn'];
$selectedTopDn = $_REQUEST['LSselect_topDn']; if ($recur) {
} $params['scope'] = 'sub';
else { if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) {
$topDn = $object -> config['container_dn'].','.LSsession :: getTopDn(); $topDn = $_REQUEST['LSselect_topDn'];
$selectedTopDn = LSsession :: getTopDn(); $selectedTopDn = $topDn;
} }
else {
$topDn = LSsession :: getTopDn();
$selectedTopDn = $topDn;
}
}
else {
$params['scope'] = 'one';
if (LSsession :: validSubDnLdapServer($_REQUEST['LSselect_topDn'])) {
$topDn = $object -> config['container_dn'].','.$_REQUEST['LSselect_topDn'];
$selectedTopDn = $_REQUEST['LSselect_topDn'];
}
else {
$topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
$selectedTopDn = LSsession :: getTopDn();
} }
} }

View file

@ -141,16 +141,21 @@ if(LSsession :: startLSsession()) {
if (isset($_REQUEST['LSview_recur'])) { if (isset($_REQUEST['LSview_recur'])) {
$recur = true; $recur = true;
$params['scope'] = 'sub';
$topDn = LSsession :: getTopDn();
} }
else { else {
$recur = false; $recur = false;
$params['scope'] = 'one';
$topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
} }
} }
if ($recur) {
$params['scope'] = 'sub';
$topDn = LSsession :: getTopDn();
}
else {
$params['scope'] = 'one';
$topDn = $object -> config['container_dn'].','.LSsession :: getTopDn();
}
$sort=false; $sort=false;
if ((isset($_REQUEST['orderby']))) { if ((isset($_REQUEST['orderby']))) {
$possible_values= array('displayName','subDn'); $possible_values= array('displayName','subDn');
@ -180,7 +185,7 @@ if(LSsession :: startLSsession()) {
'ordersense' => $ordersense, 'ordersense' => $ordersense,
'doSubDn' => $doSubDn 'doSubDn' => $doSubDn
); );
$GLOBALS['Smarty']->assign('LSview_search_pattern',$pattern); $GLOBALS['Smarty']->assign('LSview_search_pattern',$pattern);
if ($recur) { if ($recur) {