X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=9b2fed5458381bcf79bba4e76752ac552e2b6042;hb=ae725dfb9dbf8a8765de0c3854329b2e9edf3512;hp=bde9b17266dc19626f0e9a42c3f8b58b20aec2ec;hpb=ce382410d752f2aa4abb3855016f9cc00de17a8c;p=gosa.git
diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index bde9b1726..9b2fed545 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -1,4 +1,24 @@
load($filename)) {
die("Cannot parse $filename!");
}
+
+ $this->pid= preg_replace("/[^0-9]/", "", microtime(TRUE));
}
@@ -33,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'])) {
@@ -47,8 +71,12 @@ class filter {
// Move information
$entry= $this->xmlData['search'];
- $this->baseMode= $entry['base'];
$this->scopeMode= $entry['scope'];
+ if ($entry['scope'] == "auto") {
+ $this->scope= "one";
+ } else {
+ $this->scope= $entry['scope'];
+ }
$this->query= $entry['query'];
} else {
return false;
@@ -98,6 +126,10 @@ class filter {
$this->alphabetElements[]= $tag;
}
}
+
+ uasort($this->elements, 'strlenSort');
+ $this->elements= array_reverse($this->elements);
+
}
return true;
@@ -107,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";
@@ -136,14 +176,14 @@ class filter {
$checked= " checked";
}
- $result= "";
+ $result= "";
return $result;
}
function getCombobox($element)
{
- $result= "