From c9f63fa5e952a6332b21b16a90811c4259987005 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Tue, 23 Feb 2021 20:03:04 +0100 Subject: [PATCH] Fix some PHP warnings --- src/includes/class/class.LSsearch.php | 3 ++- src/templates/default/viewSearch.tpl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/includes/class/class.LSsearch.php b/src/includes/class/class.LSsearch.php index 73db7a5d..30633670 100644 --- a/src/includes/class/class.LSsearch.php +++ b/src/includes/class/class.LSsearch.php @@ -566,6 +566,7 @@ class LSsearch extends LSlog_staticLoggerClass { // Following parameters are allowed from request but need additional checks 'filter', 'basedn', 'subDn', 'scope', 'attributes', 'displayFormat', ); + $data = array(); foreach($_REQUEST as $key => $value) { if (!in_array($key, $allowedParams)) @@ -640,7 +641,7 @@ class LSsearch extends LSlog_staticLoggerClass { } } - return $this -> setParams($data); + return (empty($data)?true:$this -> setParams($data)); } /** diff --git a/src/templates/default/viewSearch.tpl b/src/templates/default/viewSearch.tpl index ef18c511..1f6c00bc 100644 --- a/src/templates/default/viewSearch.tpl +++ b/src/templates/default/viewSearch.tpl @@ -65,7 +65,7 @@ {/if} {if $LSsearch->extraDisplayedColumns} {foreach from=$LSsearch->visibleExtraDisplayedColumns item=conf key=cid} - + {if $LSsearch->sort} {if $LSsearch->sortBy == $cid} @@ -89,7 +89,7 @@ {if $LSsearch->displaySubDn}{$object->subDn|escape:"htmlall"}{/if} {if $LSsearch->extraDisplayedColumns} {foreach from=$LSsearch->visibleExtraDisplayedColumns item=conf key=cid} - {if !isset($conf.escape) || $conf.escape}{$object->$cid|escape:"htmlall"}{else}{$object->$cid}{/if} + {if !isset($conf.escape) || $conf.escape}{$object->$cid|escape:"htmlall"}{else}{$object->$cid}{/if} {/foreach} {/if}