WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new type API

This commit is contained in:
Roland Gruber 2017-04-22 11:57:57 +02:00
parent 7d4dd7bda2
commit a844d4d06d
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lam/lib/modules/dhcp_settings.inc
View File

@ -4,7 +4,7 @@ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2008 Thomas Manninger Copyright (C) 2008 Thomas Manninger
2008 - 2015 Roland Gruber 2008 - 2017 Roland Gruber
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -358,7 +358,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
*/ */
public function save_attributes() { public function save_attributes() {
// remove dhcpSubnet object class if only the DHCP settings were changed // remove dhcpSubnet object class if only the DHCP settings were changed
if ($this->getAccountContainer()->dn_orig == $_SESSION['config']->get_suffix('dhcp')) { if ($this->isRootNode()) {
if (!in_array_ignore_case("dhcpSubnet", $this->orig['objectClass']) && in_array_ignore_case("dhcpSubnet", $this->attributes['objectClass'])) { if (!in_array_ignore_case("dhcpSubnet", $this->orig['objectClass']) && in_array_ignore_case("dhcpSubnet", $this->attributes['objectClass'])) {
$this->attributes['objectClass'] = array_delete(array("dhcpSubnet"), $this->attributes['objectClass']); $this->attributes['objectClass'] = array_delete(array("dhcpSubnet"), $this->attributes['objectClass']);
} }
@ -375,7 +375,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
*/ */
public function process_attributes() { public function process_attributes() {
// check if DHCP main settings and valid DHCP entry // check if DHCP main settings and valid DHCP entry
if ($_SESSION['config']->get_suffix('dhcp') == $this->getAccountContainer()->dn_orig) { if ($this->isRootNode()) {
if (!in_array_ignore_case('dhcpService', $this->attributes['objectClass']) && !in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) { if (!in_array_ignore_case('dhcpService', $this->attributes['objectClass']) && !in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
return array(); return array();
} }
@ -383,7 +383,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
$errors = array(); $errors = array();
// Check if cn is not empty // Check if cn is not empty
if ($_SESSION['config']->get_suffix('dhcp') != $this->getAccountContainer()->dn_orig) { if (!$this->isRootNode()) {
if (!empty($_POST['cn'])) $_POST['cn'] = trim($_POST['cn']); if (!empty($_POST['cn'])) $_POST['cn'] = trim($_POST['cn']);
$this->attributes['cn'][0] = $_POST['cn']; $this->attributes['cn'][0] = $_POST['cn'];
if (empty($_POST['cn'])) { if (empty($_POST['cn'])) {
@ -486,7 +486,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
$this->setDHCPOption('netbios-node-type', $_POST['netbios_node_type']); $this->setDHCPOption('netbios-node-type', $_POST['netbios_node_type']);
if ($this->getAccountContainer()->dn_orig!=$_SESSION['config']->get_suffix('dhcp')) { if (!$this->isRootNode()) {
// Check subnet // Check subnet
$_POST['subnet'] = trim($_POST['subnet']); $_POST['subnet'] = trim($_POST['subnet']);
if (!$this->checkSubnetMask($_POST['subnet'])) { if (!$this->checkSubnetMask($_POST['subnet'])) {
@ -548,14 +548,14 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
public function display_html_attributes() { public function display_html_attributes() {
$return = new htmlTable(); $return = new htmlTable();
// check if DHCP main settings and valid DHCP entry // check if DHCP main settings and valid DHCP entry
if ($_SESSION['config']->get_suffix('dhcp') == $this->getAccountContainer()->dn_orig) { if ($this->isRootNode()) {
if (!in_array_ignore_case('dhcpService', $this->attributes['objectClass']) && !in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) { if (!in_array_ignore_case('dhcpService', $this->attributes['objectClass']) && !in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
$return->addElement(new htmlStatusMessage('ERROR', _('Please set your LDAP suffix to an LDAP entry with object class "dhcpService" or "dhcpServer".'))); $return->addElement(new htmlStatusMessage('ERROR', _('Please set your LDAP suffix to an LDAP entry with object class "dhcpService" or "dhcpServer".')));
return $return; return $return;
} }
} }
// Subnet name // Subnet name
if ($_SESSION['config']->get_suffix('dhcp') != $this->getAccountContainer()->dn_orig) { if (!$this->isRootNode()) {
$cn = ''; $cn = '';
if (isset($this->attributes['cn'][0])) { if (isset($this->attributes['cn'][0])) {
$cn = $this->attributes['cn'][0]; $cn = $this->attributes['cn'][0];
@ -594,7 +594,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
$nodeSelect->setHasDescriptiveElements(true); $nodeSelect->setHasDescriptiveElements(true);
$return->addElement($nodeSelect, true); $return->addElement($nodeSelect, true);
if ($this->getAccountContainer()->dn_orig!=$_SESSION['config']->get_suffix('dhcp')) { if (!$this->isRootNode()) {
// unknown clients // unknown clients
$unknownClients = $this->getUnknownClients(); $unknownClients = $this->getUnknownClients();
if (empty($unknownClients)) { if (empty($unknownClients)) {
@ -642,7 +642,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
$this->setDHCPOption('netbios-name-servers', $profile['netbios'][0]); $this->setDHCPOption('netbios-name-servers', $profile['netbios'][0]);
$this->setDHCPOption('netbios-node-type', $profile['netbios_node_type'][0]); $this->setDHCPOption('netbios-node-type', $profile['netbios_node_type'][0]);
if ($this->getAccountContainer()->dn_orig!=$_SESSION['config']->get_suffix('dhcp')) { if (!$this->isRootNode()) {
$this->setDHCPOption('subnet-mask', $profile['subnet'][0]); $this->setDHCPOption('subnet-mask', $profile['subnet'][0]);
// calc the netmask: // calc the netmask:
@ -1007,6 +1007,15 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
return $messages; return $messages;
} }
/**
* Returns if the current DN is the root entry.
*
* @return bool is root
*/
private function isRootNode() {
$rootSuffix = $this->getAccountContainer()->get_type()->getSuffix();
return $this->getAccountContainer()->dn_orig == $rootSuffix;
}
} }