X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fsystems%2Fadmin%2Fsystems%2Fclass_termDNS.inc;h=e08e9afddb7c0dde791fc1c558a1654b362fd9e8;hb=f12547c4b6640b7de58b3474ba5c42e756233de0;hp=f40e6d5d2f9892c5536b9442d4d641e33d3cbaf0;hpb=cccf70442af008a1c43cc3ac832a5023d41f8ac4;p=gosa.git
diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index f40e6d5d2..e08e9afdd 100644
--- a/gosa-plugins/systems/admin/systems/class_termDNS.inc
+++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc
@@ -59,16 +59,17 @@ class termDNS extends plugin
/* DNS attributes
*/
- var $DNSattributes = array("dNSClass","zoneName","dNSTTL");
+ var $DNSattributes = array("zoneName","dNSTTL");
var $DNS_is_account = false;
var $initially_was_account = false;
var $dnsEntry = array();
var $DNSenabled = false;
var $hide_dns_check_box = FALSE;
+ var $namingAttr = "cn";
/* Terminal dns
*/
- function termDNS (&$config, $parent,$objectClasses,$IPisMust = false)
+ function termDNS (&$config, $parent,$objectClasses,$IPisMust = false,$namingAttr = "cn")
{
/* We need to know which objectClasses are used, to store the ip/mac
* Because of different type of devices
@@ -76,15 +77,19 @@ class termDNS extends plugin
$this->parent = $parent;
$this->objectclasses = $objectClasses;
$this->IPisMust = $IPisMust;
+ $this->namingAttr = $namingAttr;
- plugin::plugin ($config, $parent->dn);
+ plugin::plugin ($config, $parent->dn, $this->parent);
+
+ $this->attrs = &$this->parent->attrs;
- if(isset($this->attrs['cn'][0])){
- $this->OrigCn = preg_replace("/\\\$\$/","",$this->attrs['cn'][0]);
- $this->cn = preg_replace("/\\\$\$/","",$this->attrs['cn'][0]);
+ if(isset($this->attrs[$namingAttr][0])){
+ $this->OrigCn = preg_replace("/\\\$\$/","",$this->attrs[$namingAttr][0]);
+ $this->cn = preg_replace("/\\\$\$/","",$this->attrs[$namingAttr][0]);
}
-
+ /* Create list of additional ipHostNumber.
+ */
$this->additionalHostNumbers = array();
if(isset($this->attrs['ipHostNumber']) && $this->attrs['ipHostNumber']['count'] > 1){
for($i = 1 ; $i < $this->attrs['ipHostNumber']['count']; $i ++){
@@ -97,10 +102,15 @@ class termDNS extends plugin
************/
/* Hide all dhcp specific code, if dhcp plugin is not present in config */
- $dhcpEnabled = FALSE;
+ $this->dhcpEnabled = FALSE;
if($this->config->search("servdhcp","class",array("tabs"))){
$this->dhcpEnabled = TRUE;
}
+
+ if(!class_available("dhcpHost")){
+ $this->dhcpEnabled = FALSE;
+ }
+
if($this->dhcpEnabled){
$this->dhcpParentNodes = $this->get_dhcp_parent_nodes();
$this->dhcpParentNode = $this->get_dhcp_parent_node();
@@ -126,6 +136,11 @@ class termDNS extends plugin
$this->DNSenabled = true;
}
}
+
+ if(!class_available("DNS")){
+ $this->DNSenabled = FALSE;
+ }
+
if(!$this->DNSenabled){
$this->DNS_is_account = false;
return;
@@ -141,9 +156,10 @@ class termDNS extends plugin
*/
$this->dnsEntry = DNS::getDNSHostEntries($config,$this->OrigCn);
+ $ptr = DNS::FlipIp($this->get_pTRRecord());
+
/* Remove A record which equals $this->ipHostNumber
*/
- $ptr = $this->get_pTRRecord();
foreach($this->dnsEntry['RECORDS'] as $key => $rec){
if(($rec['type'] == "aRecord") && ($rec['value'] == $this->ipHostNumber)){
unset($this->dnsEntry['RECORDS'][$key]);
@@ -173,13 +189,13 @@ class termDNS extends plugin
over the whole ldap server was 10 to 20 times slower.
*/
$deps = array();
- $ou = preg_replace("/,.*$/","",get_ou("systemsou"));
- $a_ous = array(get_ou("serverou"),
- get_ou("terminalou"),
- get_ou("workstationou"),
- get_ou("printerou"),
- get_ou("phoneou"),
- get_ou("componentou"));
+ $ou = preg_replace("/,.*$/","",get_ou("systemRDN"));
+ $a_ous = array(get_ou("serverRDN"),
+ get_ou("terminalRDN"),
+ get_ou("workstationRDN"),
+ get_ou("printerRDN"),
+ get_ou("phoneRDN"),
+ get_ou("componentRDN"));
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
@@ -243,6 +259,7 @@ class termDNS extends plugin
{
/* Call parent execute */
$smarty= get_smarty();
+ $smarty->assign("autonetACL",$this->acl_is_writeable("macAddress") && $this->acl_is_writeable("ipHostNumber")?"rw":"");
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $translation){
@@ -251,37 +268,66 @@ class termDNS extends plugin
$display= "";
+ /**********
+ * Additional ipHostNumber handling
+ **********/
+
+ /* Add a new one */
+ if($this->acl_is_writeable("ipHostNumber")){
+ foreach($_POST as $name => $value){
+ if(preg_match("/^additionalHostNumbers_add/",$name)){
+ $this->additionalHostNumbers[] = "";
+ break;
+ }
+
+ /* Delete given entry */
+ if(preg_match("/^additionalHostNumbers_del_/",$name)){
+ $id = preg_replace("/^^additionalHostNumbers_del_([0-9]*)_.*/","\\1",$name);
+ if(isset($this->additionalHostNumbers[$id])){
+ unset($this->additionalHostNumbers[$id]);
+ $this->additionalHostNumbers = array_values($this->additionalHostNumbers);
+ }
+ break;
+ }
+ }
+ }
+
$smarty->assign("additionalHostNumbers",$this->additionalHostNumbers);
$smarty->assign("staticAddress", "");
+ /**********
+ * Autonet completion
+ **********/
+
/* Check for autonet button */
- if (isset($_POST['autonet'])){
- $d= new gosaSupportDaemon(TRUE, 0.5);
- $res= $d->_send("gosa_network_completitionGOSAGOSA".$this->cn."", TRUE);
- if (isset($res['XML']['IP'])){
- $this->ipHostNumber= $res['XML']['IP'];
- }
- if (isset($res['XML']['MAC'])){
- $this->macAddress= $res['XML']['MAC'];
- }
+ if (isset($_POST['autonet']) && ($this->acl_is_writeable("ipHostNumber") || $this->acl_is_writeable("macAddress"))){
+ $d= new gosaSupportDaemon(TRUE, 0.5);
+ $res= $d->_send("gosa_network_completition".
+ "GOSAGOSA".$this->cn."", TRUE);
+ if (isset($res['XML']['IP']) && $this->acl_is_writeable("ipHostNumber")){
+ $this->ipHostNumber= $res['XML']['IP'];
+ }
+ if (isset($res['XML']['MAC']) && $this->acl_is_writeable("macAddress")){
+ $this->macAddress= $res['XML']['MAC'];
+ }
}
-
+
/**********
* DHCP Handling
**********/
- if(isset($_POST['dhcpEditOptions'])){
-
+ if(isset($_POST['dhcpEditOptions']) && $this->acl_is_readable("dhcpSetup")){
if(count($this->dhcpHostEntry) == 0){
- $this->dialog = new dhcpHost($this->dhcpParentNode,TRUE);
+ $this->dialog = new dhcpHost($this->parent,$this->dhcpParentNode,TRUE);
}else{
- $this->dialog = new dhcpHost($this->dhcpHostEntry,TRUE);
+ $this->dialog = new dhcpHost($this->parent,$this->dhcpHostEntry,TRUE);
}
- $this->dialog->cn = $this->cn;
+ $this->dialog->cn = $this->cn;
+ $this->dialog->read_only = !$this->acl_is_writeable("dhcpSetup");
$this->dialog->dhcpHWAddress = "ethernet ".$this->macAddress;
if(!empty($this->ipHostNumber)){
- $this->dialog->statements['fixed-address'] = $this->ipHostNumber;
+ $this->dialog->statements->set('fixed-address', $this->ipHostNumber);
}
}
@@ -289,9 +335,8 @@ class termDNS extends plugin
$this->dialog = FALSE;
}
- if(isset($_POST['save_dhcp'])){
+ if(isset($_POST['save_dhcp']) && $this->acl_is_writeable("dhcpSetup") && is_object($this->dialog)){
$this->dialog->save_object();
-
$msgs = $this->dialog->check(array());
if(count($msgs)){
foreach($msgs as $msg){
@@ -308,13 +353,12 @@ class termDNS extends plugin
return($this->dialog->execute());
}
- $smarty->assign("dhcpEnabled", $this->dhcpEnabled);
+ $smarty->assign("dhcpEnabled", $this->dhcpEnabled && $this->acl_is_readable("dhcpSetup"));
$smarty->assign("dhcp_is_Account",$this->dhcp_is_Account);
$smarty->assign("dhcpParentNode", $this->dhcpParentNode);
$smarty->assign("dhcpParentNodes",$this->dhcpParentNodes);
$smarty->assign("dhcpParentNodeCnt",count($this->dhcpParentNodes));
-
/**********
* DNS Handling
**********/
@@ -322,7 +366,8 @@ class termDNS extends plugin
/* There is no dns available
*/
$smarty->assign("DNS_is_account",$this->DNS_is_account);
- $smarty->assign("DNSenabled",$this->DNSenabled);
+ $smarty->assign("DNSenabled",$this->DNSenabled && $this->acl_is_readable("dnsSetup"));
+
if($this->DNSenabled == false){
/* Is IP address must ? */
@@ -340,37 +385,39 @@ class termDNS extends plugin
# $smarty->assign("DNS_is_account",true);
/* Add new empty array to our record list */
- if(isset($_POST['AddNewRecord'])){
+ if(isset($_POST['AddNewRecord']) && $this->acl_is_writeable("dnsSetup")){
$this->dnsEntry['RECORDS'][] =array("type"=>"aRecord","value"=>"");
}
/* propose_ip */
- if(isset($_POST['propose_ip'])){
+ if(isset($_POST['propose_ip']) && $this->acl_is_writeable("ipHostNumber")){
foreach($this->Zones as $key => $name){
if($name == $this->dnsEntry['zoneName']){
$net = DNS::FlipIp(str_replace(".in-addr.arpa","",DNS::getNameFromMix($key)));
- $this->ipHostNumber = $this->generateRandomIp($net);
+ $this->ipHostNumber = $this->generateRandomIP($net);
}
}
}
/* Handle all posts */
$only_once =true;
- foreach($_POST as $name => $value){
+ if($this->acl_is_writeable("dnsSetup")){
+ foreach($_POST as $name => $value){
- /* Check if we have to delete a record entry */
- if((preg_match("/RemoveRecord_/",$name))&&($only_once)) {
+ /* Check if we have to delete a record entry */
+ if((preg_match("/RemoveRecord_/",$name))&&($only_once)) {
- /* Avoid performing this once again */
- $only_once = false;
+ /* Avoid performing this once again */
+ $only_once = false;
- /* Extract id for specified entry */
- $id = preg_replace("/RemoveRecord_/","",$name);
- $id = preg_replace("/_.*$/","",$id);
+ /* Extract id for specified entry */
+ $id = preg_replace("/RemoveRecord_/","",$name);
+ $id = preg_replace("/_.*$/","",$id);
- /* Delete this record, mark edited entries to be able to delete them */
- if(isset($this->dnsEntry['RECORDS'][$id])){
- unset($this->dnsEntry['RECORDS'][$id]);
+ /* Delete this record, mark edited entries to be able to delete them */
+ if(isset($this->dnsEntry['RECORDS'][$id])){
+ unset($this->dnsEntry['RECORDS'][$id]);
+ }
}
}
}
@@ -381,7 +428,7 @@ class termDNS extends plugin
/* Assign smarty all DNS attributes */
foreach($this->DNSattributes as $attr){
- $smarty->assign($attr,$this->dnsEntry[$attr]);
+ $smarty->assign($attr,htmlentities($this->dnsEntry[$attr]));
}
/* Assign all needed vars */
@@ -413,6 +460,8 @@ class termDNS extends plugin
$smarty->assign("changeStateForRecords",$changeStateForRecords);
$smarty->assign("staticAddress","*");
+ $smarty->assign("autonetACL",$this->acl_is_writeable("macAddress") && $this->acl_is_writeable("ipHostNumber")?"rw":"");
+
$display.= $smarty->fetch(get_template_path('network.tpl', TRUE));
}
@@ -422,7 +471,7 @@ class termDNS extends plugin
function remove_from_parent()
{
- if($this->initially_was_account){
+ if($this->DNS_is_account){
$ldap = $this->config->get_ldap_link();
@@ -452,8 +501,25 @@ class termDNS extends plugin
/* Save all posted vars */
plugin::save_object();
- /* Handle DHCP Posts*/
- if($this->dhcpEnabled && isset($_POST['network_tpl_posted'])){
+ /******
+ Additional IP Host Numbers
+ ******/
+
+ /* Get posts for all additionally added ipHostNumbers */
+ if($this->acl_is_writeable("ipHostNumber")){
+ foreach($this->additionalHostNumbers as $id => $value){
+ if(isset($_POST['additionalHostNumbers_'.$id])){
+ $this->additionalHostNumbers[$id] = get_post('additionalHostNumbers_'.$id);
+ }
+ }
+ }
+
+
+ /******
+ DHCP posts
+ ******/
+
+ if($this->acl_is_writeable("dhcpSetup") && $this->dhcpEnabled && isset($_POST['network_tpl_posted'])){
foreach($this->dhcpAttributes as $attr){
if(isset($_POST[$attr])){
$this->$attr = $_POST[$attr];
@@ -473,18 +539,27 @@ class termDNS extends plugin
}
}
- /* Check if DNS should be enabled / disabled */
- if($this->DNS_is_account && $this->acl_is_removeable() && !isset($_POST['DNS_is_account'])){
- $this->DNS_is_account = false;
- }elseif(!$this->DNS_is_account && $this->acl_is_createable() && isset($_POST['DNS_is_account'])){
- $this->DNS_is_account = true;
+
+ /******
+ DNS posts
+ ******/
+
+ /* Check if DNS should be enabled / disabled
+ * -skip this, if the dns account is enforced.
+ */
+ if(!$this->hide_dns_check_box){
+ if($this->DNS_is_account && $this->acl_is_writeable("dnsSetup") && !isset($_POST['DNS_is_account'])){
+ $this->DNS_is_account = false;
+ }elseif(!$this->DNS_is_account && $this->acl_is_writeable("dnsSetup") && isset($_POST['DNS_is_account'])){
+ $this->DNS_is_account = true;
+ }
}
/* Get dns attributes */
- if(($this->DNSenabled) && (isset($_POST['network_tpl_posted']))){
+ if(($this->DNSenabled) && (isset($_POST['network_tpl_posted'])) && $this->acl_is_writeable("dnsSetup")){
/* Check for posted record changes */
- if(is_array($this->dnsEntry['RECORDS']) && $this->acl_is_writeable("Records")){
+ if(is_array($this->dnsEntry['RECORDS'])){
foreach($this->dnsEntry['RECORDS'] as $key => $value){
/* Check if type has changed */
@@ -493,18 +568,17 @@ class termDNS extends plugin
}
/* Check if value has changed */
if(isset($_POST['RecordValue_'.$key])){
- $this->dnsEntry['RECORDS'][$key]['value'] = $_POST['RecordValue_'.$key];
+ $this->dnsEntry['RECORDS'][$key]['value'] = get_post('RecordValue_'.$key);
}
}
}
+
/* Get all basic DNS attributes (TTL, Clas ..)*/
foreach($this->DNSattributes as $attr){
- if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){
- $this->dnsEntry[$attr] = $_POST[$attr];
+ if(isset($_POST[$attr])){
+ $this->dnsEntry[$attr] = get_post($attr);
}
}
-
-
}
if($this->hide_dns_check_box){
$this->DNS_is_account = true;
@@ -519,6 +593,17 @@ class termDNS extends plugin
/* Call common method to give check the hook */
$message= plugin::check();
+ /******
+ check additional IP Host Numbers
+ ******/
+
+ foreach($this->additionalHostNumbers as $id => $value){
+ if(!tests::is_ip($value)){
+ $message[]= msgPool::invalid(sprintf(_("IP address %s"),($id +2)), "", "", "192.168.1.10");
+ }
+ }
+
+
/* Check if mac and ip are already used */
if(!empty($this->ipHostNumber) && $this->DNS_is_account &&
$this->ipHostNumber != $this->orig_ipHostNumber &&
@@ -536,20 +621,19 @@ class termDNS extends plugin
if(($this->IPisMust)||($this->DNS_is_account)){
if (empty($this->ipHostNumber)){
$message[]= msgPool::required(_("IP address"));
- }
-
- if (!tests::is_ip($this->ipHostNumber)){
+ }elseif (!tests::is_ip($this->ipHostNumber)){
$message[]= msgPool::invalid(_("IP address"), "", "", "192.168.1.10");
}
}
/* Check if mac is empty
*/
- if ($this->macAddress == "" ){
- $message[]= msgPool::required(_("IP address"));
- }
- if(!tests::is_mac($this->macAddress)){
- $message[]= msgPool::invalid(_("MAC address"), "", "", "00:0C:7F:31:33:F1");
+ if($this->MACisMust || $this->dhcp_is_Account){
+ if ($this->macAddress == "" ){
+ $message[]= msgPool::required(_("MAC address"));
+ }elseif(!tests::is_mac($this->macAddress)){
+ $message[]= msgPool::invalid(_("MAC address"), "", "", "00:0C:7F:31:33:F1");
+ }
}
/* only perfrom this checks if this is a valid DNS account */
@@ -628,6 +712,20 @@ class termDNS extends plugin
/* Save DNS setting & ip/Mac*/
plugin::save();
+ /* Add all additional ipHostNumbers now
+ */
+ if(!empty($this->ipHostNumber)){
+ $this->attrs['ipHostNumber'] = array($this->ipHostNumber);
+ }
+ foreach($this->additionalHostNumbers as $value){
+ $this->attrs['ipHostNumber'][] = $value;
+ }
+
+ /* Do not add the objectClass ipHost if no ip address is given */
+ if(!isset($this->attrs['ipHostNumber'])){
+ $this->attrs['objectClass'] = array_remove_entries(array("ipHost"),$this->attrs['objectClass']);
+ }
+
/* Write back to ldap */
$ldap->cd($this->dn);
$this->cleanup();
@@ -638,14 +736,14 @@ class termDNS extends plugin
/****************/
/* New entry */
- if($this->dhcpEnabled){
+ if($this->dhcpEnabled && $this->acl_is_writeable("dhcpSetup")) {
if(count($this->dhcpHostEntry) == 0){
- $this->dialog = new dhcpHost($this->dhcpParentNode,TRUE);
+ $this->dialog = new dhcpHost($this->parent,$this->dhcpParentNode,TRUE);
$this->dialog->cn = $this->cn;
$this->dialog->dhcpHWAddress = "ethernet ".$this->macAddress;
if(!empty($this->ipHostNumber)){
- $this->dialog->statements['fixed-address'] = $this->ipHostNumber;
+ $this->dialog->statements->set('fixed-address', $this->ipHostNumber);
}
$this->dialog->execute();
$this->dialog->save_object();
@@ -653,6 +751,15 @@ class termDNS extends plugin
if(count($this->dhcpHostEntry['dhcpOption']) == 0){
$this->dhcpHostEntry['dhcpOption']= array("host-name ".$this->cn);
}
+ }else{
+
+ // Updated Host-Name entry
+ foreach($this->dhcpHostEntry['dhcpOption'] as $key => $entry){
+ if(preg_match("/^host-name/", $entry)){
+ $this->dhcpHostEntry['dhcpOption'][$key] = "host-name ".$this->cn;
+ break;
+ }
+ }
}
/* Write mac address to dhcp settings */
@@ -665,7 +772,7 @@ class termDNS extends plugin
}
/* Updated IP host number */
- if($this->dhcp_is_Account){
+ if($this->dhcp_is_Account && $this->dhcpHostEntry['dhcpStatements']){
foreach($this->dhcpHostEntry['dhcpStatements'] as $id => $value){
if(preg_match("/^fixed-address/",$value)){
$this->dhcpHostEntry['dhcpStatements'][$id] = "fixed-address ".$this->ipHostNumber;
@@ -714,7 +821,7 @@ class termDNS extends plugin
if(($this->initial_dhcpParentNode != $this->dhcpParentNode) ||
($this->cn != $this->OrigCn)){
$attrs = $this->dhcpHostEntry;
- $attrs['cn'] = $this->cn;
+ $attrs[$this->namingAttr] = $this->cn;
unset($attrs['dn']);
unset($attrs['MODIFIED']);
$ldap->cd("cn=".$this->cn.",".$this->dhcpParentNode);
@@ -763,7 +870,7 @@ class termDNS extends plugin
*/
if((!$this->DNSenabled) || ((!$this->DNS_is_account)&&(!$this->initially_was_account))){
return;
- }else{
+ }elseif($this->acl_is_writeable("dnsSetup")){
/* Add ipHostNumber to aRecords
*/
@@ -849,7 +956,7 @@ class termDNS extends plugin
$str.=" ".
" | ".$this->generateRecordListBox($entry['type'],"RecordTypeSelectedFor_".$key)." | ".
- " | ".
+ " | ".
" | ".
"
";
}
@@ -861,6 +968,7 @@ class termDNS extends plugin
" ".
"";
$ret = array("str" => $str, "changeStateForRecords" => $changeStateForRecords);
+
return($ret);
}
@@ -899,16 +1007,13 @@ class termDNS extends plugin
"macAddress" => _("MAC address"))
);
- /* Hide all dns specific code, if dns is not available
+ /* Hide all dns/dhcp configurations if not available
*/
- $config = session::get('config');
- foreach($config->data['TABS']['SERVERSERVICE'] as $tab){
- if(preg_match("/^servdns$/",$tab['CLASS'])){
- $tmp['plProvidedAcls']["Records"] = _("DNS records");
- $tmp['plProvidedAcls']["zoneName"] = _("Zone name");
- $tmp['plProvidedAcls']["dNSTTL"] = _("TTL");
- break;
- }
+ if(class_available("servdns")){
+ $tmp['plProvidedAcls']["dnsSetup"] = _("DNS configuration");
+ }
+ if(class_available("servdhcp")){
+ $tmp['plProvidedAcls']["dhcpSetup"] = _("DHCP configuration");
}
return($tmp);
}
@@ -942,7 +1047,7 @@ class termDNS extends plugin
{
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->search ("(&(objectClass=dhcpHost)(cn=".$this->cn."))",array("cn","dn"));
+ $ldap->search ("(&(objectClass=dhcpHost)(cn=".$this->cn."))",array("uid","cn","dn"));
if($ldap->count()){
$attr = $ldap->fetch();
@@ -955,7 +1060,7 @@ class termDNS extends plugin
function get_dhcp_parent_node()
{
- return(preg_replace("/^cn=".normalizePreg($this->cn).",/","",$this->get_dhcp_host_entry_dn()));
+ return(preg_replace("/^cn=".preg_quote($this->cn, '/').",/","",$this->get_dhcp_host_entry_dn()));
}
@@ -1004,7 +1109,7 @@ class termDNS extends plugin
$tmp = array_flip($this->Zones);
$tmp = preg_replace("/^[^\/]*+\//","",$tmp[$this->dnsEntry['zoneName']]);
$tmp = trim(preg_replace("/\.in-addr.arpa$/","",$tmp));
- $ptr = preg_replace("/^".normalizePreg(DNS::FlipIp($tmp))."\./","",$this->ipHostNumber);
+ $ptr = preg_replace("/^".preg_quote(DNS::FlipIp($tmp), '/')."\./","",$this->ipHostNumber);
return($ptr);
}else{
return(FALSE);
@@ -1016,13 +1121,50 @@ class termDNS extends plugin
{
$str = $net;
$cnt = 4;
- while(substr_count($str,".") < 3 && $cnt > 0){
- $str .= ".".rand(0,255);
- $str = preg_replace("/\.\.*/",".",$str);
- $str = trim($str,". ");
- $cnt --;
+
+ // first gather all IPs
+ $ldap = $this->config->get_ldap_link();
+ $ocs =
+ "(objectClass=goFonHardware)".
+ "(objectClass=goServer)".
+ "(objectClass=GOhard)".
+ "(objectClass=gotoTerminal)".
+ "(objectClass=gotoWorkstation)".
+ "(objectClass=gotoPrinter)".
+ "(objectClass=ipHost)";
+ $list = array();
+ $ldap->search("(&(|{$ocs})(ipHostNumber=*))",array("ipHostNumber"));
+ while($attrs = $ldap->fetch()){
+ if (preg_match("/^$net\./", $attrs['ipHostNumber'][0])) {
+ $list[] = $attrs['ipHostNumber'][0];
+ }
}
- return($str);
+
+ // Set starting ip.
+ $ip_data = preg_split("/\./",$net);
+ for($i=0;$i<4;$i++){
+ if(!isset($ip_data[$i])) $ip_data[$i] = 0;
+ }
+
+ // Search the next free and valid ip.
+ while(in_array(implode(".",$ip_data),$list) || $ip_data[3] <= 1){
+ $ip_data[3] ++ ;
+ if($ip_data[3] > 255){
+ $ip_data[3] = 1 ;
+ $ip_data[2] ++ ;
+ }
+ if($ip_data[2] > 255){
+ $ip_data[2] = 1 ;
+ $ip_data[1] ++ ;
+ }
+ if($ip_data[1] > 255){
+ $ip_data[1] = 1 ;
+ $ip_data[0] ++ ;
+ }
+ if($ip_data[0] > 255) break;
+ }
+
+ return(implode(".",$ip_data));
}
@@ -1031,7 +1173,7 @@ class termDNS extends plugin
$ret = array();
foreach($arr as $r => $name){
$base_part = str_replace($base,"",$r);
- if(preg_match("/^[a-z]*=".normalizePreg($name)."(|,)$/i",$base_part)){
+ if(preg_match("/^[a-z]*=".preg_quote($name, '/')."(|,)$/i",$base_part)){
$ret[$r] = $current.$name;
$tmp = $this->create_tree($arr,$r,$current.". ");
foreach($tmp as $sub_key => $sub_name){