better sorting and auto-completion for hosts

This commit is contained in:
Roland Gruber 2014-01-28 20:00:47 +00:00
parent 6a8f3e5c4e
commit dccabdaacf
4 changed files with 93 additions and 21 deletions

View File

@ -1636,10 +1636,12 @@ class htmlOutputText extends htmlElement {
* *
* @param String $string output text * @param String $string output text
* @param boolean $escapeHTML escape HTML code (default yes) * @param boolean $escapeHTML escape HTML code (default yes)
* @param boolean $markAsRequired mark text like a required field
*/ */
function __construct($string, $escapeHTML = true) { function __construct($string, $escapeHTML = true, $markAsRequired = false) {
$this->string = $string; $this->string = $string;
$this->escapeHTML = $escapeHTML; $this->escapeHTML = $escapeHTML;
$this->markAsRequired = $markAsRequired;
} }
/** /**

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 - 2013 Roland Gruber 2008 - 2014 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
@ -54,6 +54,8 @@ class fixed_ip extends baseModule {
/** LDAP attributes */ /** LDAP attributes */
public $attributes; public $attributes;
private $hostCache = null;
/** /**
* Returns meta data that is interpreted by parent class * Returns meta data that is interpreted by parent class
@ -212,7 +214,7 @@ class fixed_ip extends baseModule {
function load_attributes($attr) { function load_attributes($attr) {
if ($this->getAccountContainer()->dn_orig!=$_SESSION['config']->get_suffix('dhcp')) { if ($this->getAccountContainer()->dn_orig!=$_SESSION['config']->get_suffix('dhcp')) {
$entries = searchLDAP($this->getAccountContainer()->dn_orig, '(objectClass=dhcpHost)', array('cn', 'dhcphwaddress', 'dhcpstatements')); $entries = searchLDAP($this->getAccountContainer()->dn_orig, '(objectClass=dhcpHost)', array('cn', 'dhcphwaddress', 'dhcpstatements'));
for ($i=0; $i < sizeof($entries); $i++) { for ($i = 0; $i < sizeof($entries); $i++) {
$dhcphwaddress = explode(" ", $entries[$i]['dhcphwaddress'][0]); $dhcphwaddress = explode(" ", $entries[$i]['dhcphwaddress'][0]);
$dhcphwaddress = array_pop($dhcphwaddress); $dhcphwaddress = array_pop($dhcphwaddress);
$dhcpstatements = array(); $dhcpstatements = array();
@ -231,9 +233,29 @@ class fixed_ip extends baseModule {
$this->orig_ips[$i]['active'] = self::isActive($dhcpstatements); $this->orig_ips[$i]['active'] = self::isActive($dhcpstatements);
$this->orig_ips[$i]['dhcpstatements'] = $dhcpstatements; $this->orig_ips[$i]['dhcpstatements'] = $dhcpstatements;
} }
$this->orderByIP();
} }
} }
/**
* Orders the host entries by IP address.
*/
private function orderByIP() {
// sort by IP
$order = array();
foreach ($this->fixed_ip as $key => $value) {
$order[$key] = '';
if (!empty($value['dhcpstatements'])) {
$order[$key] = fixed_ip::extractIP($value['dhcpstatements']);
}
}
natcasesort($order);
$newVal = array();
foreach ($order as $index => $sortval) {
$newVal[] = $this->fixed_ip[$index];
}
$this->fixed_ip = $newVal;
}
/** /**
* Processes user input of the primary module page. * Processes user input of the primary module page.
@ -331,6 +353,7 @@ class fixed_ip extends baseModule {
'dhcpstatements' => array(), 'dhcpstatements' => array(),
'active' => (isset($_POST['active_add']) && ($_POST['active_add'] == 'on')), 'active' => (isset($_POST['active_add']) && ($_POST['active_add'] == 'on')),
); );
$this->orderByIP();
} }
} }
@ -349,19 +372,30 @@ class fixed_ip extends baseModule {
return $return; return $return;
} }
else { else {
$this->initCache();
// auto-completion for host names
$autoNames = array();
if (!empty($this->hostCache) && (sizeof($this->hostCache) < 200)) {
foreach ($this->hostCache as $index => $attrs) {
if (!empty($attrs['cn'][0])) {
$autoNames[] = $attrs['cn'][0];
}
}
$autoNames = array_values(array_unique($autoNames));
}
// caption // caption
$pcContainer = new htmlTable();
$pcContainer->addElement(new htmlOutputText(_('PC name') . "*"));
$pcContainer->addElement(new htmlHelpLink('pc'));
$return->addElement($pcContainer);
$macContainer = new htmlTable();
$macContainer->addElement(new htmlOutputText(_('MAC address') . "*"));
$macContainer->addElement(new htmlHelpLink('mac'));
$return->addElement($macContainer);
$ipContainer = new htmlTable(); $ipContainer = new htmlTable();
$ipContainer->addElement(new htmlOutputText(_('IP address'))); $ipContainer->addElement(new htmlOutputText(_('IP address')));
$ipContainer->addElement(new htmlHelpLink('ip')); $ipContainer->addElement(new htmlHelpLink('ip'));
$return->addElement($ipContainer); $return->addElement($ipContainer);
$pcContainer = new htmlTable();
$pcContainer->addElement(new htmlOutputText(_('PC name'), true, true));
$pcContainer->addElement(new htmlHelpLink('pc'));
$return->addElement($pcContainer);
$macContainer = new htmlTable();
$macContainer->addElement(new htmlOutputText(_('MAC address'), true, true));
$macContainer->addElement(new htmlHelpLink('mac'));
$return->addElement($macContainer);
$activeContainer = new htmlTable(); $activeContainer = new htmlTable();
$activeContainer->addElement(new htmlOutputText(_('Active'))); $activeContainer->addElement(new htmlOutputText(_('Active')));
$activeContainer->addElement(new htmlHelpLink('active')); $activeContainer->addElement(new htmlHelpLink('active'));
@ -429,18 +463,26 @@ class fixed_ip extends baseModule {
if ($ipError != '') { if ($ipError != '') {
$error .= ' ' . $ipError; $error .= ' ' . $ipError;
} }
$return->addElement(new htmlInputField('pc_'.$id, $this->fixed_ip[$id]['cn']));
$return->addElement(new htmlInputField('mac_'.$id, $this->fixed_ip[$id]['mac']));
$return->addElement(new htmlInputField('ip_'.$id, $this->fixed_ip[$id]['ip'])); $return->addElement(new htmlInputField('ip_'.$id, $this->fixed_ip[$id]['ip']));
$pcInput = new htmlInputField('pc_'.$id, $this->fixed_ip[$id]['cn']);
if (!empty($autoNames)) {
$pcInput->enableAutocompletion($autoNames);
}
$return->addElement($pcInput);
$return->addElement(new htmlInputField('mac_'.$id, $this->fixed_ip[$id]['mac']));
$return->addElement(new htmlInputCheckbox('active', $this->fixed_ip[$id]['active'])); $return->addElement(new htmlInputCheckbox('active', $this->fixed_ip[$id]['active']));
$return->addElement(new htmlButton('drop_ip_'.$id, 'del.png', true)); $return->addElement(new htmlButton('drop_ip_'.$id, 'del.png', true));
$return->addElement(new htmlOutputText($error), true); $return->addElement(new htmlOutputText($error), true);
} }
$return->addElement(new htmlSpacer(null, '10px'), true); $return->addElement(new htmlSpacer(null, '10px'), true);
// add fixed ip: // add host:
$return->addElement(new htmlInputField('pc_add', ''));
$return->addElement(new htmlInputField('mac_add', ''));
$return->addElement(new htmlInputField('ip_add', '')); $return->addElement(new htmlInputField('ip_add', ''));
$newPCInput = new htmlInputField('pc_add', '');
if (!empty($autoNames)) {
$newPCInput->enableAutocompletion($autoNames);
}
$return->addElement($newPCInput);
$return->addElement(new htmlInputField('mac_add', ''));
$return->addElement(new htmlInputCheckbox('active_add', true)); $return->addElement(new htmlInputCheckbox('active_add', true));
$return->addElement(new htmlButton('add_ip', 'add.png', true)); $return->addElement(new htmlButton('add_ip', 'add.png', true));
} }
@ -654,6 +696,21 @@ class fixed_ip extends baseModule {
} }
} }
/**
* Loads cached host data from LDAP.
*/
private function initCache() {
if ($this->hostCache != null) {
return;
}
$attrs = array('cn', 'iphostnumber', 'macaddress');
$this->hostCache = array();
$result = searchLDAPByAttribute('cn', '*', null, $attrs, array('host'));
foreach ($result as $attributes) {
$this->hostCache[] = $attributes;
}
}
} }
?> ?>

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 - 2013 Roland Gruber 2008 - 2014 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
@ -222,6 +222,7 @@ class range extends baseModule {
// Load DHCP Options: // Load DHCP Options:
if (isset($attr['dhcpRange']) && is_array($attr['dhcpRange'])) { if (isset($attr['dhcpRange']) && is_array($attr['dhcpRange'])) {
natcasesort($attr['dhcpRange']);
foreach($attr['dhcpRange'] AS $id=>$value) { foreach($attr['dhcpRange'] AS $id=>$value) {
$ex = explode(" ", $value); $ex = explode(" ", $value);

View File

@ -186,8 +186,17 @@ class lamDHCPList extends lamList {
// find all fixed addresses: // find all fixed addresses:
$entries = searchLDAP($entry['dn'], 'objectClass=dhcpHost', array('dhcpstatements', 'dhcphwaddress', 'cn')); $entries = searchLDAP($entry['dn'], 'objectClass=dhcpHost', array('dhcpstatements', 'dhcphwaddress', 'cn'));
if (sizeof($entries) > 0) { if (sizeof($entries) > 0) {
echo "<table border=\"0\" width=\"100%\">"; // sort by IP
$order = array();
for ($i = 0; $i < sizeof($entries); $i++) { for ($i = 0; $i < sizeof($entries); $i++) {
$order[$i] = '';
if (!empty($entries[$i]['dhcpstatements'])) {
$order[$i] = fixed_ip::extractIP($entries[$i]['dhcpstatements']);
}
}
natcasesort($order);
echo "<table border=\"0\" width=\"100%\">";
foreach ($order as $i => $sortval) {
$dhcpstatements = array(); $dhcpstatements = array();
if (isset($entries[$i]['dhcpstatements'][0])) { if (isset($entries[$i]['dhcpstatements'][0])) {
$dhcpstatements = $entries[$i]['dhcpstatements']; $dhcpstatements = $entries[$i]['dhcpstatements'];
@ -210,7 +219,7 @@ class lamDHCPList extends lamList {
elseif ($attribute=="dhcpstatements") { elseif ($attribute=="dhcpstatements") {
// Search after the fixed ip entry // Search after the fixed ip entry
if (is_array($entry['dhcpstatements'])) { if (is_array($entry['dhcpstatements'])) {
foreach($entry['dhcpstatements'] AS $id=>$value) { foreach($entry['dhcpstatements'] AS $id => $value) {
if (!is_array($value) && array_shift( explode(" ", $value) ) == "fixed-address") { if (!is_array($value) && array_shift( explode(" ", $value) ) == "fixed-address") {
$ip = explode(" ", $value); $ip = explode(" ", $value);
@ -222,12 +231,15 @@ class lamDHCPList extends lamList {
elseif ($attribute=="dhcprange") { // DHCP Range elseif ($attribute=="dhcprange") { // DHCP Range
if (isset($entry['dhcprange'])) { if (isset($entry['dhcprange'])) {
echo"<table cellspacing=\"0\">"; echo"<table cellspacing=\"0\">";
foreach($entry['dhcprange'] AS $id=>$value) { $ranges = array();
foreach($entry['dhcprange'] AS $id => $value) {
if (!empty($value) && !is_numeric($value)) { if (!empty($value) && !is_numeric($value)) {
$ex = explode(" ", $value); $ex = explode(" ", $value);
echo "<tr><td>".$ex[0]."</td><td width=\"20\"><center>-</center></td><td>".$ex[1]."</td></tr>"; $ranges[] = "<tr><td>".$ex[0]."</td><td width=\"20\"><center>-</center></td><td>".$ex[1]."</td></tr>";
} }
} }
natcasesort($ranges);
echo implode('', $ranges);
echo"</table>"; echo"</table>";
} }
} }