From 13aa17f463a42eecb919857934a27f9a6d1263cf Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 30 Apr 2009 12:00:26 +0000 Subject: [PATCH] templates/search.php: - fix several "stristr(): Empty delimiter" warnings when empty search field is submitted git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@647 a1433add-5e2c-0410-b055-b7f2511e0802 --- templates/search.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/search.php b/templates/search.php index 8f9b2244..09cf5cc8 100644 --- a/templates/search.php +++ b/templates/search.php @@ -63,14 +63,14 @@ if (sizeof ($tAlias) > 0) print " \n"; //highlight search string $tAlias[$i]['display_address'] = $tAlias[$i]['address']; - if (stristr($tAlias[$i]['display_address'],$fSearch)) + if ($fSearch != "" && stristr($tAlias[$i]['display_address'],$fSearch)) { $new_address = str_ireplace($fSearch, "" . $fSearch . "", $tAlias[$i]['display_address']); $tAlias[$i]['display_address'] = $new_address; } print " " . $tAlias[$i]['display_address'] . "\n"; - if (stristr($tAlias[$i]['goto'],$fSearch)) + if ($fSearch != "" && stristr($tAlias[$i]['goto'],$fSearch)) { $new_goto = str_ireplace($fSearch, "" . $fSearch . "", $tAlias[$i]['goto']); @@ -137,14 +137,14 @@ if (sizeof ($tMailbox) > 0) { print " \n"; $tMailbox[$i]['display_username'] = $tMailbox[$i]['username']; - if (stristr($tMailbox[$i]['display_username'],$fSearch)) + if ($fSearch != "" && stristr($tMailbox[$i]['display_username'],$fSearch)) { $new_name = str_ireplace($fSearch, "" . $fSearch . "", $tMailbox[$i]['display_username']); $tMailbox[$i]['display_username'] = $new_name; } print " " . $tMailbox[$i]['display_username'] . "\n"; - if (stristr($tMailbox[$i]['name'],$fSearch)) + if ($fSearch != "" && stristr($tMailbox[$i]['name'],$fSearch)) { $new_name = str_ireplace($fSearch, "" . $fSearch . "", $tMailbox[$i]['name']);