X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=04de2dae2c5cb13fce48ef21f3638fe6ce823937;hb=c9bd6c4d92532063a9dd8df3cfd20740d43e5841;hp=a8bb6fa3ecdd3dd02b19557087a13d0c6213ec43;hpb=46e8d0682395266578eff08d391f36ee9c4f0f48;p=gosa.git
diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index a8bb6fa3e..04de2dae2 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -22,20 +22,20 @@
class filter {
- var $xmlData;
- var $elements= array();
- var $elementValues= array();
- var $alphabetElements= array();
- var $autocompleter= array();
+ var $searches= array();
+ var $xmlSearches= array();
+ var $attributes= array();
+ var $search;
+ var $defaultSearch;
var $category= "";
var $objectStorage= array();
var $base= "";
var $scope= "";
var $query;
+ var $value= "";
var $initial= false;
var $scopeMode= "auto";
- var $alphabet= null;
- var $converter= array();
+ var $converter= null;
var $pid;
@@ -55,100 +55,108 @@ 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($this->xmlData['search']['query'][0])){
- $this->xmlData['search']['query']= array($this->xmlData['search']['query']);
- }
+ if (isset($xmlData['search'])) {
- // Move information
- $entry= $this->xmlData['search'];
- $this->scopeMode= $entry['scope'];
- if ($entry['scope'] == "auto") {
- $this->scope= "one";
+ // Array conversion
+ if (!isset($xmlData['search'][0])) {
+ $searches= array($xmlData['search']);
} else {
- $this->scope= $entry['scope'];
+ $searches= $xmlData['search'];
+ }
+
+ /* Store available searches */
+ foreach ($searches as $search) {
+
+ /* Do multi conversation */
+ if (!isset($search['query'][0])){
+ $search['query']= array($search['query']);
+ }
+
+ /* Store search */
+ $this->xmlSearches[$search['tag']]= $search;
+
}
- $this->query= $entry['query'];
} else {
return false;
}
+ // Transfer 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);
}
- // Generate formular data
- if (isset($this->xmlData['element'])) {
- if (!isset($this->xmlData['element'][0])){
- $this->xmlData['element']= array($this->xmlData['element']);
- }
- foreach ($this->xmlData['element'] as $element) {
-
- // Ignore elements without type
- if (!isset($element['type']) || !isset($element['tag'])) {
- next;
- }
-
- $tag= $element['tag'];
+ // Initialize searches and default search mode
+ $this->defaultSearch= $xmlData['definition']['default'];
+ $this->reloadFilters();
+ $this->setSearch($this->defaultSearch);
- // Fix arrays
- if (isset($element['value']) && !isset($element['value'][0])) {
- $element['value']= array($element['value']);
- }
+ return true;
+ }
- // Store element for quick access
- $this->elements[$tag] = $element;
- // Preset elementValues with default values if exist
- if (isset($element['default']) && !is_array($element['default'])) {
- $this->elementValues[$tag] = $element['default'];
- } else {
- $this->elementValues[$tag] = "";
- }
+ function reloadFilters()
+ {
+ $this->searches= array_merge($this->xmlSearches, userFilter::getFilter($this->category));
+ $this->setSearch($this->search);
+ }
- // Does this element react on alphabet links?
- if (isset($element['alphabet']) && $element['alphabet'] == "true") {
- $this->alphabetElements[]= $tag;
- }
- }
- uasort($this->elements, 'strlenSort');
- $this->elements= array_reverse($this->elements);
+ function setSearch($method= null)
+ {
+ $patch= null;
+ // Maybe our search method has gone?
+ if (!isset($this->searches[$method])) {
+ $method= $this->defaultSearch;
}
- return true;
+ // Try to use it, but bail out if there's no help...
+ if (isset($this->searches[$method])) {
+ $this->query= $this->searches[$method]['query'];
+ $this->search= $method;
+ } else {
+ die ("Invalid search module!");
+ }
}
- 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'])) {
@@ -158,74 +166,16 @@ class filter {
$characters= $element['autocomplete']['characters'];
}
$result.= "
".
- "";
-
- $this->autocompleters[$tag]= $element['autocomplete'];
- }
- return $result;
- }
+ "";
-
- function getCheckbox($element)
- {
- $tag= $element['tag'];
- $checked= "";
- if ($this->elementValues[$tag] == "true") {
- $checked= " checked";
+ $this->autocompleters[$tag]= $element;
}
-
- $result= "";
return $result;
}
- function getCombobox($element)
- {
- $result= "";
-
- return $result;
- }
-
-
- function setComboBoxOptions($tag, $options)
- {
- if (isset($this->elements[$tag]) && $this->elements[$tag]['type'] == "combobox") {
-
- $this->elements[$tag]['value']= array();
- foreach ($options as $key => $label) {
- $this->elements[$tag]['value'][]= array('label' => $label, 'key' => $key);
- }
- }
- }
-
-
function getCurrentBase()
{
if (isset($this->search->base) && (string)$this->search->scope != "auto") {
@@ -246,9 +196,9 @@ class filter {
}
- function setConverter($field, $hook)
+ function setConverter($hook)
{
- $this->converter[$field]= $hook;
+ $this->converter= $hook;
}
@@ -270,97 +220,15 @@ class filter {
}
- function renderAlphabet($columns= 10)
- {
- // Return pre-rendered alphabet if available
- if ($this->alphabet) {
- return ($this->alphabet);
- }
-
- $characters= _("*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
- $alphabet= "";
- $c= 0;
-
- /* Fill cells with charaters */
- for ($i= 0, $l= mb_strlen($characters, 'UTF8'); $i<$l; $i++){
- if ($c == 0){
- $alphabet.= "";
- }
-
- $ch = mb_substr($characters, $i, 1, "UTF8");
- $alphabet.= " ".$ch." | ";
-
- if ($c++ == $columns){
- $alphabet.= "
";
- $c= 0;
- }
- }
-
- /* Fill remaining cells */
- while ($c++ <= $columns){
- $alphabet.= " | ";
- }
-
- /* Save alphabet */
- $this->alphabet= "";
-
- return ($this->alphabet);
- }
-
-
- function renderApply()
- {
- return ("");
- }
-
-
- function renderScope()
- {
- $checked= $this->scope == "sub"?" checked":"";
- return " ";
- }
-
function render()
{
- $smarty= get_smarty();
- $smarty->assign("ALPHABET", $this->renderAlphabet());
- $smarty->assign("APPLY", $this->renderApply());
- $smarty->assign("SCOPE", $this->renderScope());
-
- // Load template and replace elementsHtml[]
- foreach ($this->elements as $tag => $element) {
- $htmlCode= "";
- switch ($element['type']) {
- case "textfield":
- $htmlCode = $this->getTextfield($element);
- break;
-
- case "checkbox":
- $htmlCode = $this->getCheckbox($element);
- break;
-
- case "combobox":
- $htmlCode = $this->getCombobox($element);
- break;
-
- default:
- die ("Unknown element type specified!");
- }
- $smarty->assign("$tag", $htmlCode);
- }
+ $content= "".$this->renderFilterMenu()." | ";
+ $content.= " ".$this->getTextfield('search_filter', $this->value, $this->searches[$this->search])." ".
+ " |
";
- // Try to load template from plugin the folder first...
- $file = get_template_path($this->xmlData['definition']['template'], true);
-
- // ... if this fails, try to load the file from the theme folder.
- if(!file_exists($file)){
- $file = get_template_path($this->xmlData['definition']['template']);
- }
-
- // Load template
- return ("".$smarty->fetch($file));
+ // Return meta data
+ return ("".$content);
}
@@ -374,10 +242,9 @@ class filter {
$this->initial= true;
return $result;
}
-
// Go thru all queries and merge results
foreach ($this->query as $query) {
- if (!isset($query['backend']) || !isset($query['filter']) || !isset($query['attribute'])) {
+ if (!isset($query['backend']) || !isset($query['filter'])) {
die("No backend specified in search config.");
}
@@ -389,111 +256,87 @@ class filter {
// Load filter and attributes
$filter= $query['filter'];
- $attributes= $query['attribute'];
-
- // Generate final filter
- foreach ($this->elements as $tag => $element) {
- if (!isset($element['set']) || !isset($element['unset'])) {
- continue;
- }
- // Handle converters if present
- if (isset($this->converter[$tag])) {
- preg_match('/([^:]+)::(.*)$/', $this->converter[$tag], $m);
- $e_set= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['set'])?"":$element['set']));
- $e_unset= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['unset'])?"":$element['unset']));
+ // Handle converters if present
+ if ($this->converter) {
+ preg_match('/([^:]+)::(.*)$/', $this->converter, $m);
+ if ($this->value == "") {
+ $filter= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', "*", $filter));
} else {
- $e_set= is_array($element['set'])?"":$element['set'];
- $e_unset= is_array($element['unset'])?"":$element['unset'];
+ $filter= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->value, $filter));
}
+ }
- if ($this->elementValues[$tag] == "") {
- $e_unset= preg_replace('/([^\\\\])\$/', "\\1".normalizeLdap($this->elementValues[$tag]), $e_unset);
- $e_unset= preg_replace('/\\\\\$/','$', $e_unset);
- $filter= preg_replace("/\\$$tag/", $e_unset, $filter);
- } else {
- $e_set= preg_replace('/([^\\\\])\$/', "\\1".normalizeLdap($this->elementValues[$tag]), $e_set);
- $e_set= preg_replace('/\\\\\$/','$', $e_set);
- $filter= preg_replace("/\\$$tag/", $e_set, $filter);
- }
+ // Do not replace escaped \$ - This is required to be able to search for e.g. windows machines.
+ if ($this->value == "") {
+ $filter= preg_replace("/\\$/", '*', $filter);
+ } else {
+ $filter= preg_replace("/\\$/", "*".normalizeLdap($this->value)."*", $filter);
}
- $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
+ $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $this->attributes, $this->category, $this->objectStorage));
}
-
- return ($result);
- }
-
- function isValid()
- {
- foreach ($this->elements as $tag => $element) {
- if (isset($element->regex)){
- if (!preg_match('/'.(string)$element->regex.'/', $this->elementValues[$tag])){
- return false;
- }
- }
- }
- return true;
+ return ($result);
}
function update()
{
- /* React on alphabet links if needed */
- if (isset($_GET['filter'])){
- $s= mb_substr(validate($_GET['filter']), 0, 1, "UTF8");
- foreach ($this->alphabetElements as $tag) {
- $this->elementValues[$tag]= $s;
- }
- }
-
if (isset($_POST['FILTER_PID']) && $_POST['FILTER_PID'] == $this->pid) {
- // Load post values and adapt filter, base and scope accordingly - but
- // only if we didn't get a _GET
- foreach ($this->elements as $tag => $element) {
- if (isset($_POST[$tag])){
- $this->elementValues[$tag]= validate($_POST[$tag]);
- } else {
- $this->elementValues[$tag]= "";
- }
+ // Save input field
+ if (isset($_POST['search_filter'])) {
+ $this->value= validate($_POST['search_filter']);
}
// Save scope if needed
- if ($this->scopeMode == "auto") {
- $this->scope= isset($_POST['SCOPE'])?"sub":"one";
+ if ($this->scopeMode == "auto" && isset($_POST['act']) && $_POST['act'] == "toggle-subtree") {
+ $this->scope= ($this->scope == "one")?"sub":"one";
+ }
+
+ // Switch filter?
+ if (isset($_POST['act'])) {
+ foreach ($this->searches as $tag => $cfg) {
+ if ($_POST['act'] == "filter-$tag") {
+ $this->setSearch($tag);
+ break;
+ }
+ }
}
}
}
- function getCompletitionList($config, $tag, $value="*")
+ function getCompletitionList($config, $value="*")
{
global $class_mapping;
$res= array();
- // Is backend available?
- $backend= "filter".$config['backend'];
- if (!isset($class_mapping["$backend"])) {
- die("Invalid backend specified in search config.");
- }
-
- // Load filter and attributes
- $filter= $config['filter'];
- $attributes= $config['attribute'];
+ // Load result attributes
+ $attributes= $config['autocomplete']['attribute'];
if (!is_array($attributes)) {
$attributes= array($attributes);
}
- // Make filter
- $filter= preg_replace("/\\$$tag/", normalizeLdap($value), $filter);
- if (isset($config['base']) && isset($config['scope']) && isset($config['category'])) {
- $result= call_user_func(array($backend, 'query'), $config['base'], $config['scope'], $filter, $attributes,
- $config["category"], $config["objectStorage"]);
- } else {
- $result= call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes,
- $this->category, $this->objectStorage);
+ // Do the query
+ $result= array();
+
+ // Is backend available?
+ # FIXME
+ $queries= $config['query'];
+ if (!isset($queries[0])){
+ $queries= array($queries);
+ }
+ foreach ($queries as $query) {
+ $backend= "filter".$query['backend'];
+ if (!isset($class_mapping["$backend"])) {
+ die("Invalid backend specified in search config.");
+ }
+ $filter= preg_replace("/\\$/", "*".normalizeLdap($value)."*", $query['filter']);
+
+ $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes,
+ $this->category, $this->objectStorage));
}
foreach ($result as $entry) {
@@ -522,22 +365,20 @@ class filter {
// Introduce maximum number of entries
$max= 25;
- foreach ($this->autocompleters as $tag => $config) {
- if(isset($_POST[$tag])){
- $result= $this->getCompletitionList($config, $tag, $_POST[$tag]);
- $result= array_unique($result);
- asort($result);
+ if(isset($this->searches[$this->search]['autocomplete'])){
+ $result= $this->getCompletitionList($this->searches[$this->search], $_POST['search_filter']);
+ $result= array_unique($result);
+ asort($result);
- echo '';
- foreach ($result as $entry) {
- echo '- '.$entry.'
';
- if ($max-- == 0) {
- break;
- }
+ echo '';
+ foreach ($result as $entry) {
+ echo '- '.mark($_POST['search_filter'], $entry).'
';
+ if ($max-- == 0) {
+ break;
}
-
- echo '
';
}
+
+ echo '
';
}
}
@@ -566,14 +407,62 @@ class filter {
}
-}
-// Sort elements for element length to allow proper replacing later on
-function strlenSort($a, $b) {
- if (strlen($a['tag']) == strlen($b['tag'])) {
- return 0;
+ function renderFilterMenu()
+ {
+ // Load shortcut
+ $result= "- ".image("images/filter.png").image("images/lists/sort-down.png")."";
+
+ // Build ul/li list
+ $separator= " style='border-top:1px solid #AAA' ";
+ $result.= "";
+
+ $script= '';
+
+ return "$script";
+ }
+
+
+ function getFixedFilters()
+ {
+ return array_keys($this->searches);
}
- return (strlen($a['tag']) < strlen($b['tag']) ? -1 : 1);
-}
+}
+
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>