index 974e133910723406f7d8743bde2207da36c887a3..cb678cbccdff2900cf757a87e80b5298bd66a738 100644 (file)
class termDNS extends plugin
{
class termDNS extends plugin
{
- /* CLI vars */
- var $cli_summary = "Manage server basic objects";
- var $cli_description = "Some longer text\nfor help";
- var $cli_parameters = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
/* attribute list for save action */
var $ignore_account = true;
var $autonet = false;
/* attribute list for save action */
var $ignore_account = true;
var $autonet = false;
/* DNS attributes
*/
var $DNSattributes = array("dNSClass","zoneName","dNSTTL");
/* DNS attributes
*/
var $DNSattributes = array("dNSClass","zoneName","dNSTTL");
- var $DNS_is_Account = false;
+ var $DNS_is_account = false;
var $initially_was_account = false;
var $dnsEntry = array();
var $DNSenabled = false;
var $initially_was_account = false;
var $dnsEntry = array();
var $DNSenabled = false;
plugin::plugin ($config, $dn);
if(isset($this->attrs['cn'][0])){
plugin::plugin ($config, $dn);
if(isset($this->attrs['cn'][0])){
- $this->OrigCn = $this->attrs['cn'][0];
- $this->cn = $this->attrs['cn'][0];
+ $this->OrigCn = preg_replace("/\\\$\$/","",$this->attrs['cn'][0]);
+ $this->cn = preg_replace("/\\\$\$/","",$this->attrs['cn'][0]);
}
}
-
+
/* Do we have autonet support? */
if (isset($this->config->data['MAIN']['AUTO_NETWORK_HOOK'])){
$this->autonet= true;
/* Do we have autonet support? */
if (isset($this->config->data['MAIN']['AUTO_NETWORK_HOOK'])){
$this->autonet= true;
}else{
$this->DNS_is_account = false;
}
}else{
$this->DNS_is_account = false;
}
-
}
/* Store initally account settings
}
/* Store initally account settings
}
}
+ function netmaskIsCoherent($idZone)
+ {
+ $netmask = FlipIp(str_replace(".in-addr.arpa","",getNameFromMix($idZone)));
+ if(!strstr($this->ipHostNumber, $netmask)){
+ return false;
+ }else{
+ return true;
+ }
+ }
+
+
function getVarsForSaving($attrs)
{
foreach($this->attributes as $attr){
function getVarsForSaving($attrs)
{
foreach($this->attributes as $attr){
if($this->DNSenabled == false){
/* Is IP address must ? */
if($this->DNSenabled == false){
/* Is IP address must ? */
- $smarty->assign("DNS_is_account",false);
+ $smarty->assign("DNS_enabled",false);
$smarty->assign("IPisMust",(($this->IPisMust)||($this->DNS_is_account)));
/* Assign smarty all non DNs attributes */
$smarty->assign("IPisMust",(($this->IPisMust)||($this->DNS_is_account)));
/* Assign smarty all non DNs attributes */
$display.= $smarty->fetch(get_template_path('network.tpl', TRUE));
return($display);
}else{
$display.= $smarty->fetch(get_template_path('network.tpl', TRUE));
return($display);
}else{
- $smarty->assign("DNS_is_account",true);
+ $smarty->assign("DNS_enabled",true);
}
$accountACL = false;
}
$accountACL = false;
- if($this->DNSenabled && $this->acl_is_removeable()){
+ if($this->DNS_is_account && $this->acl_is_removeable()){
$accountACL = true;
$accountACL = true;
- }elseif(!$this->DNSenabled && $this->acl_is_createable()){
+ }elseif(!$this->DNS_is_account && $this->acl_is_createable()){
$accountACL = true;
}
$smarty->assign("accountACL",$accountACL);
$accountACL = true;
}
$smarty->assign("accountACL",$accountACL);
}
/* Assign all needed vars */
}
/* Assign all needed vars */
- $smarty->assign("DNSAccount",$this->DNS_is_account);
+ $smarty->assign("DNS_is_account",$this->DNS_is_account);
$smarty->assign("Zones",$this->Zones);
$smarty->assign("ZoneKeys",($this->Zones));
$smarty->assign("IPisMust",(($this->IPisMust)||($this->DNS_is_account)));
$smarty->assign("Zones",$this->Zones);
$smarty->assign("ZoneKeys",($this->Zones));
$smarty->assign("IPisMust",(($this->IPisMust)||($this->DNS_is_account)));
-
+
+ /* Create zone array */
+ $idZones = array();
+ foreach($this->Zones as $id => $zone){
+ if($this->netmaskIsCoherent($id)) {
+ $idZones[$id] = $zone;
+ }else{
+ $idZones[$id] = $zone." ("._("Not matching").")";
+ }
+ }
+ $smarty->assign("Zones",$idZones);
+ $smarty->assign("ZoneKeys", $this->Zones);
+
$tmp = $this->generateRecordsList();
$changeStateForRecords = $tmp['changeStateForRecords'];
$tmp = $this->generateRecordsList();
$changeStateForRecords = $tmp['changeStateForRecords'];
return($display);
}
return($display);
}
+
function remove_from_parent()
{
function remove_from_parent()
{
- /*
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->orig_dn);
- $ldap->search("(&(objectClass=dNSZone)(zoneName=*)(!(relativeDomainName=@)))",array("relativeDomainName","zoneName"));
- while($attr = $ldap->fetch()){
- $ldap->cd($attr['dn']);
- $ldap->rmDir($attr['dn']);
- show_ldap_error($ldap->get_error(), sprintf(_("Removing of terminal/dns acoount with dn '%s' failed."),$this->dn));
+ if($this->initially_was_account){
+
+ $ldap = $this->config->get_ldap_link();
+
+ $tmp = array();
+ $this->dnsEntry['exists'] = false;
+ $tmp = getDNSHostEntriesDiff($this->config,$this->OrigCn,$this->dnsEntry,$this->cn);
+
+ /* Delete dns */
+ foreach($tmp['del'] as $dn => $del){
+ $ldap->cd($dn);
+ $ldap->rmdir_recursive($dn);
+ }
}
}
- */
}
}
+
/* Save data to object */
function save_object()
{
/* Save all posted vars */
plugin::save_object();
/* Save data to object */
function save_object()
{
/* Save all posted vars */
plugin::save_object();
-
- /* Ge all non dns attributes (IP/MAC)*/
- foreach($this->attributes as $attr){
- if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){
- $this->$attr = $_POST[$attr];
- }
- }
-
- /* Get dns attributes */
- if(($this->DNSenabled) && (isset($_POST['network_tpl_posted']))){
- /* Check for posted record changes */
- if(is_array($this->dnsEntry['RECORDS']) && $this->acl_is_writeable("Records")){
- foreach($this->dnsEntry['RECORDS'] as $key => $value){
+ if(isset($_POST['network_tpl_posted'])){
- /* Check if type has changed */
- if(isset($_POST['RecordTypeSelectedFor_'.$key])){
- $this->dnsEntry['RECORDS'][$key]['type'] = $_POST['RecordTypeSelectedFor_'.$key];
- }
- /* Check if value has changed */
- if(isset($_POST['RecordValue_'.$key])){
- $this->dnsEntry['RECORDS'][$key]['value'] = $_POST['RecordValue_'.$key];
- }
- }
- }
- /* Get all basic DNS attributes (TTL, Clas ..)*/
- foreach($this->DNSattributes as $attr){
+ /* Ge all non dns attributes (IP/MAC)*/
+ foreach($this->attributes as $attr){
if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){
if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){
- $this->dnsEntry[$attr] = $_POST[$attr];
+ $this->$attr = $_POST[$attr];
}
}
}
}
- if($this->DNSenabled && $this->acl_is_removeable() && !isset($_POST['enableDNS'])){
+ /* 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;
$this->DNS_is_account = false;
- }elseif(!$this->DNSenabled && $this->acl_is_createable() && isset($_POST['enableDNS'])){
+ }elseif(!$this->DNS_is_account && $this->acl_is_createable() && isset($_POST['DNS_is_account'])){
$this->DNS_is_account = true;
}
$this->DNS_is_account = true;
}
+
+ /* Get dns attributes */
+ if(($this->DNSenabled) && (isset($_POST['network_tpl_posted']))){
+
+ /* Check for posted record changes */
+ if(is_array($this->dnsEntry['RECORDS']) && $this->acl_is_writeable("Records")){
+ foreach($this->dnsEntry['RECORDS'] as $key => $value){
+
+ /* Check if type has changed */
+ if(isset($_POST['RecordTypeSelectedFor_'.$key])){
+ $this->dnsEntry['RECORDS'][$key]['type'] = $_POST['RecordTypeSelectedFor_'.$key];
+ }
+ /* Check if value has changed */
+ if(isset($_POST['RecordValue_'.$key])){
+ $this->dnsEntry['RECORDS'][$key]['value'] = $_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];
+ }
+ }
+
+
+ }
}
}
}
}
/* Check if ip must be given
*/
if(($this->IPisMust)||($this->DNS_is_account)){
/* Check if ip must be given
*/
if(($this->IPisMust)||($this->DNS_is_account)){
-
- /* Check if ip is empty
- */
- if ($this->ipHostNumber == "" && $this->acl_is_writeable("ipHostNumber")){
+ if (empty($this->ipHostNumber)){
$message[]= _("The required field 'IP-address' is not set.");
}
$message[]= _("The required field 'IP-address' is not set.");
}
- }
-
- /* check if given ip is valid ip */
- if ($this->ipHostNumber != "" && !is_ip($this->ipHostNumber)){
- $message[]= _("Wrong IP format in field IP-address.");
+ if (!is_ip($this->ipHostNumber)){
+ $message[]= _("Wrong IP format in field IP-address.");
+ }
}
/* Check if mac is empty
*/
}
/* Check if mac is empty
*/
- if ($this->macAddress == "" && $this->acl_is_writeable("macAddress")){
+ if ($this->macAddress == "" ){
$message[]= _("The required field 'MAC-address' is not set.");
}
$message[]= _("The required field 'MAC-address' is not set.");
}
-
- /* Check if given mac is valid mac
- */
- $tr = count(split(":",$this->macAddress));
if(!is_mac($this->macAddress)){
$message[]=(_("The given macaddress is invalid. There must be 6 2byte segments seperated by ':'."));
}
if(!is_mac($this->macAddress)){
$message[]=(_("The given macaddress is invalid. There must be 6 2byte segments seperated by ':'."));
}
$checkArray = array();
$onlyOnce = array();
$checkArray = array();
$onlyOnce = array();
- // $onlyOnce['cNAMERecord'] = 0;
+ // $onlyOnce['cNAMERecord'] = 0;
+ $tmp = array_flip($this->Zones);
+ $tmp2 = $tmp[$this->dnsEntry['zoneName']];
+ if(!$this->netmaskIsCoherent($tmp2)){ //this->dnsEntry['zoneName'])){
+ $tmp2 = preg_replace("/^.*\//","",$tmp2);
+ $message[] =sprintf(_("The specified IP address '%s' is not matching the selected reverse zone entry '%s'."),$this->ipHostNumber,$tmp2);
+ }
/* Walk through all entries and detect duplicates or mismatches
*/
/* Walk through all entries and detect duplicates or mismatches
*/
/* If isn't DNS account but initially was DNS account
remove all DNS entries
*/
/* If isn't DNS account but initially was DNS account
remove all DNS entries
*/
- if(!$this->DNSenabled){
+ if((!$this->DNSenabled) || ((!$this->DNS_is_account)&&(!$this->initially_was_account))){
return;
}else{
/* Add ipHostNumber to aRecords
*/
return;
}else{
/* Add ipHostNumber to aRecords
*/
+ $backup_dnsEntry = $this->dnsEntry;
$this->dnsEntry['RECORDS'][] = array("type"=>"aRecord","value"=>$this->ipHostNumber);
/* Create diff and follow instructions
$this->dnsEntry['RECORDS'][] = array("type"=>"aRecord","value"=>$this->ipHostNumber);
/* Create diff and follow instructions
if($ldap->get_error() != "Success"){
show_ldap_error($ldap->get_error(), sprintf(_("Saving of terminal/dns account with dn '%s' failed."),$this->dn));
}
if($ldap->get_error() != "Success"){
show_ldap_error($ldap->get_error(), sprintf(_("Saving of terminal/dns account with dn '%s' failed."),$this->dn));
}
+
+ $this->dnsEntry = $backup_dnsEntry;
}
}
}
}