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

if DHCP main settings, check if entry is valid

This commit is contained in:
Roland Gruber 2009-01-10 17:37:09 +00:00
parent 3e9ca1d030
commit 340366c6ee
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lam/lib/modules/ddns.inc
View File

@ -126,7 +126,11 @@ class ddns extends baseModule {
* @return boolean true if LDAP operation can be done
*/
public function module_complete() {
if ($_SESSION['account']->getAccountModule('dhcp_settings')->dn==$_SESSION['config']->get_suffix('dhcp')) {
if ($this->getAccountContainer()->dn_orig==$_SESSION['config']->get_suffix('dhcp')) {
// check if DHCP main settings and valid DHCP entry
if (!in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
return false;
}
//Main settings
if ($this->isDynDNSActivated() && (($this->getUpdateKey() == null) || ($this->getUpdateKey() == ''))) {
return false;
@ -194,6 +198,9 @@ class ddns extends baseModule {
* Process for mainsettings
*/
public function process_attributes_mainSettings() {
if (!in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
return array();
}
$errors = array();
// Is DDNS active?
@ -281,6 +288,13 @@ class ddns extends baseModule {
* @return array HTML meta data
*/
public function display_html_attributes() {
// check if DHCP main settings and valid DHCP entry
if ($_SESSION['config']->get_suffix('dhcp') == $this->getAccountContainer()->dn_orig) {
if (!in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
StatusMessage("ERROR", _('Please set your LDAP suffix to an LDAP entry with object class "dhcpServer".'));
return array();
}
}
if ($_SESSION['account']->getAccountModule('dhcp_settings')->dn==$_SESSION['config']->get_suffix('dhcp')) {
// DHCP main settings
$return[] = array(

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

@ -259,12 +259,11 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
* @return boolean true if LDAP operation can be done
*/
public function module_complete() {
if ($_SESSION['account']->getAccountModule('dhcp_settings')->dn!=$_SESSION['config']->get_suffix('dhcp')) {
if (!check_ip($this->attributes['cn'][0],true)) return false;
if (array_pop(explode(".", $this->attributes['cn'][0]))!=0) return false;
if ($_SESSION['cache']->in_cache($this->attributes['cn'][0],'cn', array('dhcp')) && $this->orig['cn']['0']!=$this->attributes['cn'][0]) return false;
if (!check_ip($this->subnet, true)) return false;
if ($this->getAccountContainer()->dn_orig==$_SESSION['config']->get_suffix('dhcp')) {
// check if DHCP main settings and valid DHCP entry
if (!in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
return false;
}
}
if (!empty($this->dhcpSettings['domainname']) && (strlen($this->dhcpSettings['domainname'])>15 ||
@ -350,7 +349,6 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
* @param array $attr list of attributes
*/
function load_attributes($attr) {
parent::load_attributes($attr);
// Load DHCP Options:
$this->dn = $this->getAccountContainer()->dn_orig;
@ -419,6 +417,12 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
* @return array list of info/error messages
*/
public function process_attributes() {
// check if DHCP main settings and valid DHCP entry
if ($_SESSION['config']->get_suffix('dhcp') == $this->getAccountContainer()->dn_orig) {
if (!in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
return array();
}
}
$errors = array();
// Check if cn is not empty
@ -639,9 +643,13 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
* It will output a complete html-table
*/
public function display_html_attributes() {
// user name if no posixAccount
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
// check if DHCP main settings and valid DHCP entry
if ($_SESSION['config']->get_suffix('dhcp') == $this->getAccountContainer()->dn_orig) {
if (!in_array_ignore_case('dhcpServer', $this->attributes['objectClass'])) {
StatusMessage("ERROR", _('Please set your LDAP suffix to an LDAP entry with object class "dhcpServer".'));
return array();
}
}
// Subnetz name
if ($_SESSION['config']->get_suffix('dhcp') == $this->getAccountContainer()->dn_orig) {
$return[] = array(
@ -649,8 +657,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
array('kind' => 'text', 'text' => $this->attributes['cn'][0]),
array('kind' => 'help', 'value' => 'subnet', 'scope' => 'user'));
}
else
{
else {
$return[] = array(
array('kind' => 'text', 'text' => _('Subnet') . ":* "),
array('kind' => 'input', 'name' => 'cn', 'value' => $this->attributes['cn'][0]),