X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadmin%2Fsystems%2Fclass_servDNSeditZone.inc;h=7fcef3aa0e0f1e601189aed6e9f507385ac5fdaa;hb=bcd990bd4ee1bbd8abfd2093f0879e8afdd8ca0b;hp=e3770a5e402715afe7365d995e6967530e8d3724;hpb=e80e67b6a327a73ee7eed941e401936341f729f6;p=gosa.git diff --git a/plugins/admin/systems/class_servDNSeditZone.inc b/plugins/admin/systems/class_servDNSeditZone.inc index e3770a5e4..7fcef3aa0 100644 --- a/plugins/admin/systems/class_servDNSeditZone.inc +++ b/plugins/admin/systems/class_servDNSeditZone.inc @@ -13,13 +13,11 @@ class servdnseditZone extends plugin "sOAprimary","sOAmail","sOAserial","sOArefresh","sOAretry","sOAexpire","sOAttl"); var $objectclasses = array("whatever"); - var $RecordTypes = array(); + var $RecordTypes = array(); var $ReverseZone = ""; - var $ReverseDN = ""; var $zoneName = ""; var $dNSClass = "IN"; - var $status = "new"; var $sOAprimary = ""; var $sOAmail = ""; @@ -32,42 +30,57 @@ class servdnseditZone extends plugin var $Records = array(); var $mXRecords = array(); - var $InitiallyZoneName = ""; - var $InitiallyReverseZone = ""; - var $isNew = true; + var $OldZoneName = ""; // To detect changes made with this edit + var $OldReverseZone = ""; + + var $InitialReverseZone = ""; + var $InitialzoneName = ""; var $dialog = false; - function servdnseditZone ($config, $dn= NULL,$recordtypes,$attrs = array()) + var $isNew = true; + + var $ZoneObject = array(); + + function servdnseditZone ($config, $dn= NULL,$attrs = array()) { plugin::plugin ($config, $dn); /* All types with required attrs */ - $this->RecordTypes = $recordtypes; + $this->RecordTypes = getDnsRecordTypes(true); if(!count($attrs)){ - $this->InitiallyZoneName = ""; - $this->InitiallyReverseZone = ""; - $this->isNew = true; - $this->sOAserial = date("Ymd")."1"; + $this->OldZoneName = ""; + $this->OldReverseZone = ""; + $this->isNew = true; + $this->sOAserial = date("Ymd")."1"; + + $this->InitialzoneName = "";//$attrs['InitialzoneName']; + $this->InitialReverseZone = "";//$attrs['InitialReverseZone']; }else{ - $this->InitiallyZoneName = $attrs['zoneName']; - $this->InitiallyReverseZone = $attrs['ReverseZone']; + $this->ZoneObject = $attrs; + + $this->OldZoneName = $attrs['zoneName']; + $this->OldReverseZone = $attrs['ReverseZone']; + + $this->InitialzoneName = $attrs['InitialzoneName']; + $this->InitialReverseZone = $attrs['InitialReverseZone']; + $this->isNew = false; foreach($this->attributes as $value){ $this->$value = $attrs[$value]; } - if(isset($attrs['Records'])){ - $this->Records = $attrs['Records']; + if(isset($attrs['RECORDS'])){ + $this->Records = $attrs['RECORDS']; $tmp2 = array(); $usedPrio = array(); foreach($this->Records as $key => $rec){ if($rec['type'] == "mXRecord"){ $tmp = split(" ",$rec['value']); - $rec['value'] = $tmp[0]; - $tmp2[$tmp[1]] = $rec; + $rec['value'] = $tmp[1]; + $tmp2[$tmp[0]] = $rec; unset($this->Records[$key]); } } @@ -80,6 +93,7 @@ class servdnseditZone extends plugin $this->mXRecords = array(); $this->Records = array(); } + $str = date("Ymd"); if(preg_match("/^".$str."/",$this->sOAserial)){ $this->sOAserial = $this->sOAserial + 1; @@ -164,11 +178,15 @@ class servdnseditZone extends plugin $smarty= get_smarty(); $display= ""; - /* Open Zone Entry Edit Dialog */ - if(isset($_POST['EditZoneEntries'])){ - $this->dialog= new servDNSeditZoneEntries($this->config,$this->dn); + if(!count($this->ZoneObject)){ + $smarty->assign("AllowZoneEdit" , false); + }else{ + $smarty->assign("AllowZoneEdit" , true); + if(isset($_POST['EditZoneEntries'])){ + $this->dialog= new servDNSeditZoneEntries($this->config,$this->dn,$this->ZoneObject); + } } /* Save Zone Entry Edit Dialog @@ -238,7 +256,7 @@ class servdnseditZone extends plugin } if((isset($_POST['AddMXRecord'])) && (!empty($_POST['StrMXRecord']))){ - $this->mXRecords[] = array("type"=>"mXRecord","inittype"=>"","value"=>trim($_POST['StrMXRecord']),"status"=>"new"); + $this->mXRecords[] = array("type"=>"mXRecord","value"=>trim($_POST['StrMXRecord'])); } /* Handle Post events */ @@ -249,17 +267,13 @@ class servdnseditZone extends plugin if((preg_match("/RemoveRecord_/",$name))&&($once)){ $once = false; $id= preg_replace("/RemoveRecord_/","",$name); - if($this->Records[$id]['status']!= "new"){ - $this->Records[$id]['status']= "deleted"; - }else{ - unset($this->Records[$id]); - } + unset($this->Records[$id]); } } /* Add new Zonerecord */ if(isset($_POST['AddNewRecord'])){ - $this->Records[] = array("type"=>"aRecord","inittype"=>"","value"=>"","status"=>"new"); + $this->Records[] = array("type"=>"aRecord","value"=>""); } /* Fill in values */ @@ -289,6 +303,8 @@ class servdnseditZone extends plugin /* Assign records list */ + $smarty->assign("NotNew", false); + $smarty->assign("Mxrecords", $div->DrawList()); $smarty->assign("records" , $this->generateRecordsList()); @@ -325,18 +341,28 @@ class servdnseditZone extends plugin /* Check supplied data */ function check() { - $message= array(); + /* Call common method to give check the hook */ + $message= plugin::check(); + /* Check if zoneName is already in use */ $usedZones = $this->getUsedZoneNames(); - if(($this->isNew == true)||($this->zoneName != $this->InitiallyZoneName)||($this->ReverseZone != $this->InitiallyReverseZone)){ - if((isset($usedZones[$this->zoneName]))&&($this->zoneName != $this->InitiallyZoneName)){ + if(($this->isNew == true)||($this->zoneName != $this->InitialzoneName)||($this->ReverseZone != $this->InitialReverseZone)){ + if((isset($usedZones[$this->zoneName]))&&($this->zoneName != $this->InitialzoneName)){ $message[] =_("This zoneName is already in use"); } - if((in_array($this->ReverseZone,$usedZones))&&($this->ReverseZone != $this->InitiallyReverseZone)){ + if((in_array($this->ReverseZone,$usedZones))&&($this->ReverseZone != $this->InitialReverseZone)){ $message[] =_("This reverse zone is already in use"); } } + if(empty($this->zoneName)){ + $message[] =sprintf(_("Please choose a valid zone name.")); + } + + if(empty($this->ReverseZone)){ + $message[] =sprintf(_("Please choose a valid reverse zone name.")); + } + if(!preg_match("/\.$/",$this->sOAprimary)){ $message[] = _("Primary dns server must end with '.' to be a valid entry."); } @@ -397,7 +423,7 @@ class servdnseditZone extends plugin if(preg_match("/in-addr\.arpa/",$attr['zoneName'][0])){ if(isset($attr['tXTRecord'][0])){ $zn = preg_replace("/zoneName\=/","",$attr['tXTRecord'][0]); - $ret[$zn] = $this->FlipIp(preg_replace("/\.in-addr\.arpa/","",$attr['zoneName'][0])); + $ret[$zn] =FlipIp(preg_replace("/\.in-addr\.arpa/","",$attr['zoneName'][0])); } }else{ $ret[$attr['zoneName'][0]]=""; @@ -406,22 +432,6 @@ class servdnseditZone extends plugin return($ret); } - /* this is used to flip the ip address for example - 12.3.45 -> 54.3.12 - Because some entries (like zones) are store like that 54.3.12.in-addr.arpa - but we want to display 12.3.45. - */ - function FlipIp($ip) - { - $tmp = array_reverse(split("\.",$ip)); - $new = ""; - foreach($tmp as $section){ - $new .= $section."."; - } - return(preg_replace("/.$/","",$new)); - } - - /* Save to LDAP */ function save() { @@ -430,12 +440,17 @@ class servdnseditZone extends plugin $ret[$name] = $this->$name; } + /* Create mx records + */ foreach($this->mXRecords as $key => $rec){ - $rec['value'].= " ".$key; + $rec['value']= $key." ".$rec['value']; $this->Records [] = $rec; } - $ret['Records'] = $this->Records; + $ret['RECORDS'] = $this->Records; + + $ret['InitialReverseZone']= $this->InitialReverseZone; + $ret['InitialzoneName'] = $this->InitialzoneName; return($ret); } @@ -455,8 +470,6 @@ class servdnseditZone extends plugin if($entry['type'] == "mXRecord") continue; - if($entry['status'] == "deleted") continue; - $changeStateForRecords.= "changeState('RecordTypeSelectedFor_".$key."');\n"; $changeStateForRecords.= "changeState('RecordValue_".$key."');\n"; $changeStateForRecords.= "changeState('RemoveRecord_".$key."');\n";