X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=efd72574e18683c237523fd59872278ea2f73ec6;hb=fa919250554e64617662c2e07e569263a53a1ee3;hp=108eb8ee04c7bfced1787595cf943f2b02d3fcd5;hpb=f926687f254ba9d2da8e89665afe01e3356a9e42;p=gosa.git
diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index 108eb8ee0..efd72574e 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -29,13 +29,14 @@ class filter {
var $autocompleter= array();
var $category= "";
var $objectStorage= array();
- var $objectBase= "";
var $base= "";
var $scope= "";
var $query;
var $initial= false;
var $scopeMode= "auto";
var $alphabet= null;
+ var $converter= array();
+ var $pid;
function filter($filename)
@@ -46,6 +47,8 @@ class filter {
if (!$this->load($filename)) {
die("Cannot parse $filename!");
}
+
+ $this->pid= preg_replace("/[^0-9]/", "", microtime(TRUE));
}
@@ -54,11 +57,11 @@ class filter {
$contents = file_get_contents($filename);
$this->xmlData= xml::xml2array($contents, 1);
- if (!isset($this->xmlData['filter'])) {
+ if (!isset($this->xmlData['filterdef'])) {
return false;
}
- $this->xmlData= $this->xmlData["filter"];
+ $this->xmlData= $this->xmlData["filterdef"];
// Load filter
if (isset($this->xmlData['search'])) {
@@ -123,6 +126,10 @@ class filter {
$this->alphabetElements[]= $tag;
}
}
+
+ uasort($this->elements, 'strlenSort');
+ $this->elements= array_reverse($this->elements);
+
}
return true;
@@ -132,7 +139,15 @@ class filter {
function getTextfield($element)
{
$tag= $element['tag'];
- $result= "";
+ $size= 30;
+ if (isset($element['size'])){
+ $size= $element['size'];
+ }
+ $maxlength= 30;
+ if (isset($element['maxlength'])){
+ $maxlength= $element['maxlength'];
+ }
+ $result= "";
if (isset($element['autocomplete'])) {
$frequency= "0.5";
$characters= "1";
@@ -161,14 +176,14 @@ class filter {
$checked= " checked";
}
- $result= "";
+ $result= "";
return $result;
}
function getCombobox($element)
{
- $result= "