Commit 182fb355 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

feat(core) Base SystemsAttribute upon ObjectsAttribute

issue #5965
parent 990c67f0
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
Copyright (C) 2011-2016 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*!
* \brief filterLDAP backend with blacklist/whitelist handling
*/
class filterLDAPBlacklist
{
static function query ($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
{
$result = filterLDAP::query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage);
return filterLDAPBlacklist::filterByBlacklist($result);
}
static function filterByBlacklist ($entries)
{
if (session::is_set('filterWhitelist')) {
$wlist = session::get('filterWhitelist');
if (!empty($wlist)) {
foreach ($entries as $id => $entry) {
if (in_array($entry['dn'], $wlist['dn'])) {
continue;
}
foreach ($wlist['branches'] as $branch) {
if (preg_match('/'.preg_quote($branch, '/').'$/', $entry['dn'])) {
continue 2;
}
}
unset($entries[$id]);
}
}
}
if (session::is_set('filterBlacklist')) {
$blist = session::get('filterBlacklist');
foreach ($blist as $attr_name => $attr_values) {
foreach ($attr_values as $match) {
foreach ($entries as $id => $entry) {
if (isset($entry[$attr_name])) {
$test = $entry[$attr_name];
if (!is_array($test)) {
$test = [$test];
}
if (in_array($match, $test)) {
unset($entries[$id]);
}
}
}
}
}
}
return array_values($entries);
}
}
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2013-2016 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*!
* \brief System selection
*/
class systemSelect extends simpleSelectManagement
{
protected $autoFilterAttributes = ['dn', 'cn', 'ipHostNumber', 'macAddress'];
protected $objectTypes = [
'terminal', 'workstation', 'server'
];
}
......@@ -93,9 +93,24 @@ class GenericSelectDialog extends GenericDialog
}
}
/*! \brief System selection dialog
/*!
* \brief System selection
*/
class SystemSelectDialog extends GenericSelectDialog
class systemSelect extends selectManagement
{
/* Default columns */
public static $columns = [
['ObjectTypeColumn', []],
['LinkColumn', ['attributes' => 'nameAttr', 'label' => 'Name']],
['IpColumn', ['attributes' => 'ipHostNumber', 'label' => 'IP']],
['Column', ['attributes' => 'macAddress', 'label' => 'Mac']],
['LinkColumn', ['attributes' => 'description', 'label' => 'Description']],
];
}
/*! \brief System selection dialog
*/
class SystemSelectDialog extends GenericSelectManagementDialog
{
protected $dialogClass = 'systemSelect';
}
......@@ -652,21 +667,13 @@ class MailsAttribute extends DialogAttribute
/*!
* \brief Attribute storing a system list
*/
class SystemsAttribute extends DialogAttribute
class SystemsAttribute extends ObjectsAttribute
{
protected $dialogClass = 'SystemSelectDialog';
protected $dialogClass = 'SystemSelectDialog';
function addValue ($dn, $entry)
{
$value = $entry['cn'][0];
if (!in_array($value, $this->value)) {
$this->value[] = $value;
}
}
function getFilterBlackList ()
function __construct (string $label, string $description, string $ldapName, bool $required, array $objectTypes = ['terminal', 'workstation', 'server'], array $defaultValue = [], string $store_attr = 'cn', string $display_attr = 'cn', string $acl = '')
  • 🔽 Remove this method "__construct" to simply inherit it. 📘

Please register or sign in to reply
{
return ['cn' => $this->getValue()];
parent::__construct($label, $description, $ldapName, $required, $objectTypes, $defaultValue, $store_attr, $display_attr, $acl);
}
}
......
  • SonarQube analysis reported 1 issue

    • 🔽 1 minor

    Watch the comments in this conversation to review them.

Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment