X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=04de2dae2c5cb13fce48ef21f3638fe6ce823937;hb=c9bd6c4d92532063a9dd8df3cfd20740d43e5841;hp=e8b65ac78b4810013f8d70ef4973834fe57d57ac;hpb=8ae8745c45a91ec8d98216398721ccadab3ac65a;p=gosa.git diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc index e8b65ac78..04de2dae2 100644 --- a/gosa-core/include/class_filter.inc +++ b/gosa-core/include/class_filter.inc @@ -22,9 +22,11 @@ class filter { - var $xmlData; var $searches= array(); + var $xmlSearches= array(); + var $attributes= array(); var $search; + var $defaultSearch; var $category= ""; var $objectStorage= array(); var $base= ""; @@ -53,34 +55,34 @@ class filter { function load($filename) { $contents = file_get_contents($filename); - $this->xmlData= xml::xml2array($contents, 1); + $xmlData= xml::xml2array($contents, 1); - if (!isset($this->xmlData['filterdef'])) { + if (!isset($xmlData['filterdef'])) { return false; } - $this->xmlData= $this->xmlData["filterdef"]; + $xmlData= $xmlData["filterdef"]; // Load filter - if (isset($this->xmlData['search'])) { + if (isset($xmlData['search'])) { // Array conversion - if (!is_array($this->xmlData['search'])) { - $searches= array($this->xmlData['search']); + if (!isset($xmlData['search'][0])) { + $searches= array($xmlData['search']); } else { - $searches= $this->xmlData['search']; + $searches= $xmlData['search']; } /* Store available searches */ - foreach ($this->xmlData['search'] as $search) { + foreach ($searches as $search) { /* Do multi conversation */ - if (!is_array($search['query'])){ + if (!isset($search['query'][0])){ $search['query']= array($search['query']); } /* Store search */ - $this->searches[$search['label']]= $search; + $this->xmlSearches[$search['tag']]= $search; } } else { @@ -88,38 +90,60 @@ class filter { } // Transfer scope - $this->scopeMode= $this->xmlData['definition']['scope']; + $this->scopeMode= $xmlData['definition']['scope']; if ($this->scopeMode == "auto") { $this->scope= "one"; } else { $this->scope= $this->scopeMode; } + // Transfer attributes + $this->attributes= $xmlData['definition']['attribute']; + if (!is_array($this->attributes)) { + $this->attributes= array($this->attributes); + } + // Transfer initial value - if (isset($this->xmlData['definition']['initial']) && $this->xmlData['definition']['initial'] == "true"){ + if (isset($xmlData['definition']['initial']) && $xmlData['definition']['initial'] == "true"){ $this->initial= true; } // Transfer category - if (isset($this->xmlData['definition']['category'])){ - $this->category= $this->xmlData['definition']['category']; + if (isset($xmlData['definition']['category'])){ + $this->category= $xmlData['definition']['category']; + } + if (!is_array($this->category)) { + $this->category= array($this->category); } - // Set default search mode - $this->setSearch($this->xmlData['definition']['default']); + // Initialize searches and default search mode + $this->defaultSearch= $xmlData['definition']['default']; + $this->reloadFilters(); + $this->setSearch($this->defaultSearch); return true; } - function setSearch($method) + function reloadFilters() + { + $this->searches= array_merge($this->xmlSearches, userFilter::getFilter($this->category)); + $this->setSearch($this->search); + } + + + function setSearch($method= null) { - // Move information + $patch= null; + + // Maybe our search method has gone? + if (!isset($this->searches[$method])) { + $method= $this->defaultSearch; + } + + // Try to use it, but bail out if there's no help... if (isset($this->searches[$method])) { $this->query= $this->searches[$method]['query']; - if (!isset($this->query[0])) { - $this->query= array($this->query); - } $this->search= $method; } else { die ("Invalid search module!"); @@ -127,19 +151,12 @@ class filter { } - function getTextfield($element) + function getTextfield($tag, $value= "", $element= null) { - $tag= $element['tag']; $size= 30; - if (isset($element['size'])){ - $size= $element['size']; - } $maxlength= 30; - if (isset($element['maxlength'])){ - $maxlength= $element['maxlength']; - } - $result= ""; - if (isset($element['autocomplete'])) { + $result= ""; + if ($element && isset($element['autocomplete'])) { $frequency= "0.5"; $characters= "1"; if (isset($element['autocomplete']['frequency'])) { @@ -149,11 +166,11 @@ class filter { $characters= $element['autocomplete']['characters']; } $result.= "
". - ""; + ""; - $this->autocompleters[$tag]= $element['autocomplete']; + $this->autocompleters[$tag]= $element; } return $result; } @@ -203,24 +220,12 @@ class filter { } - function renderApply() - { - return (""); - } - - - function renderScope() - { - $checked= $this->scope == "sub"?" checked":""; - return " "; - } - function render() { - $content= "".$this->renderFilterMenu()." | "; - $content.= "". - " |
".$this->renderFilterMenu()." | ";
+ $content.= " ".$this->getTextfield('search_filter', $this->value, $this->searches[$this->search])." ".
+ " |