Skip to content
GitLab
Commit e1b87d69 authored by Côme Chilliet's avatar Côme Chilliet Committed by Benoit Mortier
Browse files

Avoid PHP errors when loading a dn from management class 

Conflicts:
	include/class_management.inc
parent e26455f4
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 10 deletions
+12 -10
ihtml/themes/breezy/simple-filter.tpl
+ 5
− 3
View file @ e1b87d69
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
</div> </div>
<div class="contentboxb"> <div class="contentboxb">
{foreach from=$objectFilters item="ofilter"} {if isset($objectFilters)}
{${$ofilter.id}}<label for="{$ofilter.id}">&nbsp;{$ofilter.label}</label><br/> {foreach from=$objectFilters item="ofilter"}
{/foreach} {${$ofilter.id}}<label for="{$ofilter.id}">&nbsp;{$ofilter.label}</label><br/>
{/foreach}
{/if}
<hr/> <hr/>
{$SCOPE} {$SCOPE}
......
include/class_listing.inc
+ 7
− 0
View file @ e1b87d69
...@@ -1218,6 +1218,8 @@ class listing ...@@ -1218,6 +1218,8 @@ class listing
*/ */
function getAction() function getAction()
{ {
global $config;
// Do not do anything if this is not our PID, or there's even no PID available... // Do not do anything if this is not our PID, or there's even no PID available...
if (!isset($_REQUEST['dn']) && (!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->pid)) { if (!isset($_REQUEST['dn']) && (!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->pid)) {
return; return;
...@@ -1241,6 +1243,11 @@ class listing ...@@ -1241,6 +1243,11 @@ class listing
$result['targets'][] = $this->entries[$target]['dn']; $result['targets'][] = $this->entries[$target]['dn'];
} }
} elseif (isset($_REQUEST['dn']) && preg_match('/^listing_([a-zA-Z_]+)$/', $key, $m)) { } elseif (isset($_REQUEST['dn']) && preg_match('/^listing_([a-zA-Z_]+)$/', $key, $m)) {
/* Pre-render list to init things if a dn is gonna be opened on first load */
$this->setBase($config->current['BASE']);
$this->filter->setCurrentScope('sub');
$this->update();
$this->render();
$dn = urldecode($_REQUEST['dn']); $dn = urldecode($_REQUEST['dn']);
$result['action'] = $m[1]; $result['action'] = $m[1];
$result['targets'][] = $dn; $result['targets'][] = $dn;
......
include/class_management.inc
+ 0
− 7
View file @ e1b87d69
...@@ -167,13 +167,6 @@ class management ...@@ -167,13 +167,6 @@ class management
} }
} }
// Pre-render list to init things if a dn is gonna be opened on first load
if (isset($_REQUEST['dn'])) {
$this->headpage->setBase($config->current['BASE']);
$this->headpage->filter->setCurrentScope('sub');
$this->renderList();
}
// Handle actions (POSTs and GETs) // Handle actions (POSTs and GETs)
$str = $this->handleActions($this->detectPostActions()); $str = $this->handleActions($this->detectPostActions());
if ($str) { if ($str) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment