index 341661ba0ed141901d780f1f8861ce70968b1931..a96e1b877347184d76cb14eb71f2d1cb4cc16fb0 100644 (file)
class userFilter extends plugin
{
- protected $fitlers = array();
+ public $pathTitle= "Filter";
+
+ public $filters = array();
protected $availableCategories = array();
- public $objectClass = array('gosaProperties');
+ public $objectclasses = array('gosaProperties');
public $attributes = array('gosaUserDefinedFilter');
public $gosaUserDefinedFilter = array();
+ private $listing = NULL;
+ private $fixedFilter = NULL;
/*! \brief Returns true if we are able to read and write userFilters
* (schema has to be present, gosaProperties)
/*! \brief Initiates the filter editing dialog.
*/
- function __construct($config, $categories)
+ function __construct($config, $listing)
{
// Initialize this plugin with the users dn to gather user defined filters.
$ui = get_userinfo();
plugin::plugin($config, $ui->dn);
+ $this->listing = &$listing;
+ $filter= $this->listing->getFilter();
+ $this->fixedFilter = $filter->getFixedFilters();
// Keep list of currently managed categories.
- $this->availableCategories = array_unique($categories);
+ $this->availableCategories = array_unique($this->listing->categories);
// Load list of filters
if(isset($this->attrs['gosaUserDefinedFilter'])){
}
// Create the filter list
- $this->filterWidget= new sortableListing();
+ $this->filterWidget= new sortableListing($this->filters, $this->convertFilterList());
$this->filterWidget->setDeleteable(true);
$this->filterWidget->setEditable(true);
$this->filterWidget->setWidth("100%");
$this->filterWidget->setHeight("270px");
- $this->filterWidget->setColspecs(array('100px', '200px', '100px', '70px','150px'));
+ $this->filterWidget->setHeader(array(_("Parent filter"),_("Name"),_("Description"),_("Category"),_("Options"),""));
+ $this->filterWidget->setColspecs(array('80px', '100px', '200px', '120px','150px'));
$this->filterWidget->setAcl($ui->get_permissions($ui->dn,'users/user','gosaUserDefinedFilter'));
- $this->filterWidget->setListData($this->filters, $this->convertFilterList());
}
/*! \brief Parses a filter string into an array.
*/
- static function explodeFilterString($filter)
+ static function explodeFilterString($filterStr)
{
- list($categories, $name, $description, $filter, $flags) = split(";", $filter);
+ list($parent,$categories, $name, $description, $filterList, $flags) = split(";", $filterStr);
// Ensure that we no empty category in our category list.
if(empty($categories)){
if(empty($flags)){
$flags = array();
}else{
- $flags = split(',', $flags);
+ $flags = preg_split('/,/', $flags);
+ }
+
+ // Get filters and their backends
+ $queries = array();
+ foreach(split(",", $filterList) as $data){
+ list($filter, $backend) = preg_split('/:/', $data);
+ $queries[] = array('backend' => $backend, 'filter' => base64_decode($filter));
}
// build up filter entry.
$tmp = array(
+ 'parent' => $parent,
'name' => $name,
'categories' => $categories,
'description' => base64_decode($description),
- 'filter' => base64_decode($filter),
+ 'queries' => $queries,
'flags' => $flags);
return($tmp);
foreach($this->filters as $name => $filter){
$data[$name] = array('data' =>
array(
+ $filter['parent'],
$filter['name'],
$filter['description'],
implode(", ",$filter['categories']),
function execute()
{
plugin::execute();
+
+ // Let the filter widget update itself
+ $this->filterWidget->update();
// Cancel filter modifications (edit dialog)
if(isset($_POST['cancelFilterSettings'])){
if($action['action'] == 'edit' && count($action['targets']) == 1){
$key= $this->filterWidget->getKey($action['targets'][0]);
if(isset($this->filters[$key])){
- $this->dialog=new userFilterEditor($this->filters[$key], $this->availableCategories);
+ $this->dialog=new userFilterEditor($this->filters[$key], $this->availableCategories, $this->fixedFilter);
}
}
// Act on new requests
if(isset($_POST['addFilter'])){
- $this->dialog=new userFilterEditor(array(), $this->availableCategories);
+ $this->dialog=new userFilterEditor(array(), $this->availableCategories, $this->fixedFilter);
}
// Act on remove requests
// Build up new list of filters
$attrs = array();
foreach($this->filters as $filter){
- $tmp = implode(',', $filter['categories']).";";
+ $tmp = $filter['parent'].";";
+ $tmp.= implode(',', $filter['categories']).";";
$tmp.= $filter['name'].";";
$tmp.= base64_encode($filter['description']).";";
- $tmp.= base64_encode($filter['filter']).";";
+
+ // Add queries
+ foreach($filter['queries'] as $query){
+ $tmp.= base64_encode($query['filter']).":".$query['backend'].",";
+ }
+ $tmp = trim($tmp,",").";";
$tmp.= implode(',', $filter['flags']);
$attrs[] = $tmp;
}