From a3bdea8eefd41fd51c777480a2226fc354fe5127 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 7 Oct 2005 05:14:32 +0000 Subject: [PATCH] Renamed 'searchStr' to 'searchStrPKG' to avoid setting the search string on faiManagement git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1518 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/class_faiPackageEntry.inc | 12 ++++++------ plugins/admin/fai/faiPackageEntry.tpl | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/admin/fai/class_faiPackageEntry.inc b/plugins/admin/fai/class_faiPackageEntry.inc index 76722a2e1..dbfd58951 100644 --- a/plugins/admin/fai/class_faiPackageEntry.inc +++ b/plugins/admin/fai/class_faiPackageEntry.inc @@ -15,7 +15,7 @@ class faiPackageEntry extends plugin var $buffer = array(); var $categories = array(); - var $searchStr = "*"; + var $searchStrPKG = "Please enter your search string here"; var $selected = array(); /* Array with available class names */ @@ -44,16 +44,16 @@ class faiPackageEntry extends plugin array("string"=>"Description","attach"=>"style='border-right:0px;'"))); if(isset($_GET['search'])){ - $this->searchStr= $_GET['search']."*"; + $this->searchStrPKG= $_GET['search']."*"; } $pkgs = $this->genPkgs(); foreach($pkgs as $cat => $entries){ if(!isset($this->categories[$cat])){ - $this->categories[$cat] = false; + $this->categories[$cat] = true; } if(isset($_POST['chkchange'])){ - $this->searchStr = $_POST['searchStr']; + $this->searchStrPKG = $_POST['searchStrPKG']; if(isset($_POST['CAT'.$cat])){ $this->categories[$cat]=true; }else{ @@ -102,7 +102,7 @@ class faiPackageEntry extends plugin } foreach($packages as $pkg){ - if(preg_match("/^".str_replace("*",".*",$this->searchStr)."/i",$pkg[0])){ + if(preg_match("/^".str_replace("*",".*",$this->searchStrPKG)."/i",$pkg[0])){ if(in_array($pkg[0],$this->selected)){ $check = " checked "; }else{ @@ -118,7 +118,7 @@ class faiPackageEntry extends plugin } $smarty->assign("CHKS" , $CHKS); - $smarty->assign("searchStr" , $this->searchStr); + $smarty->assign("searchStrPKG" , $this->searchStrPKG); $smarty->assign("faihead" , ""); $smarty->assign("failist" , $divlist->DrawList()); $smarty->assign("infoimage" , get_template_path('images/info.png')); diff --git a/plugins/admin/fai/faiPackageEntry.tpl b/plugins/admin/fai/faiPackageEntry.tpl index 454e018b9..e2edeff86 100644 --- a/plugins/admin/fai/faiPackageEntry.tpl +++ b/plugins/admin/fai/faiPackageEntry.tpl @@ -51,7 +51,7 @@ - -- 2.30.2