From: hickert Date: Mon, 26 Jul 2010 15:46:40 +0000 (+0000) Subject: Updated several service dialogs, fixed typos, string, html, post handling and more. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e2d026eef1c17dfc8353dede4b70d72096a2cc97;p=gosa.git Updated several service dialogs, fixed typos, string, html, post handling and more. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19122 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc index 0a54481d7..147ace8f1 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc @@ -2,549 +2,549 @@ class servdnseditZone extends plugin { - /* attribute list for save action */ - var $ignore_account= TRUE; - var $attributes = array("zoneName","ReverseZone","dNSClass", - "sOAprimary","sOAmail","sOAserial","sOArefresh","sOAretry","sOAexpire","sOAttl"); - var $objectclasses = array("whatever"); - - var $RecordTypes = array(); - - var $ReverseZone = ""; - var $zoneName = ""; - var $dNSClass = "IN"; - - var $sOAprimary = ""; - var $sOAmail = ""; - var $sOAserial = ""; - var $sOArefresh = "3600"; - var $sOAretry = "1800"; - var $sOAexpire = "720000"; - var $sOAttl = "6400"; - - var $Records = array(); - var $mXRecords = array(); - - var $OldZoneName = ""; // To detect changes made with this edit - var $OldReverseZone = ""; - - var $InitialReverseZone = ""; - var $InitialzoneName = ""; - var $NetworkClass = "A" ; // One out of A,B,C - - var $dialog = false; - - var $zoneEditor = NULL; - - var $isNew = true; - - var $ZoneObject = array(); - var $Zone_is_used = FALSE; - - function servdnseditZone (&$config, $dn= NULL,$attrs = array()) - { - plugin::plugin ($config, $dn); - - /* All types with required attrs */ - $this->RecordTypes = DNS::getDnsRecordTypes(true); - - if(!count($attrs)){ - $this->OldZoneName = ""; - $this->OldReverseZone = ""; - $this->isNew = true; - $this->sOAserial = date("Ymd")."1"; - - $this->InitialzoneName = "";//$attrs['InitialzoneName']; - $this->InitialReverseZone = "";//$attrs['InitialReverseZone']; - }else{ - $this->ZoneObject = $attrs; - - if(isset($attrs['zoneEditor'])){ - $this->zoneEditor = $attrs['zoneEditor']; - } - $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]; - } - - $this->sOAmail = preg_replace("/\./","@",$this->sOAmail,1); - $this->sOAmail = preg_replace("/\.$/","",$this->sOAmail); - $this->sOAprimary = preg_replace("/\.$/","",$this->sOAprimary); - $this->zoneName = preg_replace("/\.$/","",$this->zoneName); - - if(isset($attrs['RECORDS'])){ - $this->Records = $attrs['RECORDS']; - - $tmp2 = array(); - $usedPrio = array(); - foreach($this->Records as $key => $rec){ - if($rec['type'] == "mXRecord"){ - $tmp = explode(" ",$rec['value']); - $rec['value'] = $rec['value']; - $tmp2[$tmp[0]] = $rec; - unset($this->Records[$key]); - } - if($rec['type'] == "nSRecord" && preg_match("/".preg_quote($this->sOAprimary, '/')."/",$rec['value'])){ - unset($this->Records[$key]); - } - } - if(count($tmp2) != 0){ - reset($tmp2); - ksort($tmp2); - } - $this->mXRecords = $tmp2; - }else{ - $this->mXRecords = array(); - $this->Records = array(); - } - - $str = date("Ymd"); - if(preg_match("/^".$str."/",$this->sOAserial)){ - $this->sOAserial = $this->sOAserial + 1; - }else{ - $this->sOAserial = date("Ymd")."01"; - } - - /* Check if this used, in this case disable forward and reverse configuration */ - $tmp = $this->getUsedZoneNames(); - $this->Zone_is_used = FALSE; - if(isset($tmp[DNS::FlipIp($this->InitialReverseZone).".in-addr.arpa."])){ - $this->Zone_is_used = TRUE; - } - } + /* attribute list for save action */ + var $ignore_account= TRUE; + var $attributes = array("zoneName","ReverseZone","dNSClass", + "sOAprimary","sOAmail","sOAserial","sOArefresh","sOAretry","sOAexpire","sOAttl"); + var $objectclasses = array("whatever"); - /* Detect Network class */ - if(!empty($this->ReverseZone)){ - - $dots = count(explode(".",$this->ReverseZone)); - if($dots == 1){ - $this->NetworkClass = "A"; - $this->ReverseZone .= ".0.0.0"; - }elseif($dots == 2){ - $this->NetworkClass = "B"; - $this->ReverseZone .= ".0.0"; - }else{ - $this->NetworkClass = "C"; - $this->ReverseZone .= ".0"; - } - } + var $RecordTypes = array(); - // Prepare lists - $this->mxList = new sortableListing(); - $this->mxList->setDeleteable(true); - $this->mxList->setInstantDelete(true); - $this->mxList->setEditable(false); - $this->mxList->setWidth("100%"); - $this->mxList->setHeight("100px"); - $this->mxList->setHeader(array(_("Priority"),_("Record"))); - $this->mxList->setColspecs(array('40px','*','20px')); - $this->mxList->setDefaultSortColumn(0); + var $ReverseZone = ""; + var $zoneName = ""; + var $dNSClass = "IN"; - } + var $sOAprimary = ""; + var $sOAmail = ""; + var $sOAserial = ""; + var $sOArefresh = "3600"; + var $sOAretry = "1800"; + var $sOAexpire = "720000"; + var $sOAttl = "6400"; + var $Records = array(); + var $mXRecords = array(); - function execute() - { - /* Call parent execute */ - plugin::execute(); + var $OldZoneName = ""; // To detect changes made with this edit + var $OldReverseZone = ""; - /* Fill templating stuff */ - $smarty= get_smarty(); + var $InitialReverseZone = ""; + var $InitialzoneName = ""; + var $NetworkClass = "A" ; // One out of A,B,C - $smarty->assign("Zone_is_used",$this->Zone_is_used); - $ui = get_userinfo(); + var $dialog = false; - /* Assign ACLs - All acls are defined in our parent class. - */ - $tmp = $this->parent->plInfo(); - foreach($tmp['plProvidedAcls'] as $name => $desc){ - $smarty->assign($name."ACL", $this->parent->getacl($name)); - } - - $display= ""; + var $zoneEditor = NULL; + + var $isNew = true; + + var $ZoneObject = array(); + var $Zone_is_used = FALSE; + + function servdnseditZone (&$config, $dn= NULL,$attrs = array()) + { + plugin::plugin ($config, $dn); + + /* All types with required attrs */ + $this->RecordTypes = DNS::getDnsRecordTypes(true); + + if(!count($attrs)){ + $this->OldZoneName = ""; + $this->OldReverseZone = ""; + $this->isNew = true; + $this->sOAserial = date("Ymd")."1"; + + $this->InitialzoneName = "";//$attrs['InitialzoneName']; + $this->InitialReverseZone = "";//$attrs['InitialReverseZone']; + }else{ + $this->ZoneObject = $attrs; + + if(isset($attrs['zoneEditor'])){ + $this->zoneEditor = $attrs['zoneEditor']; + } + $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]; + } + + $this->sOAmail = preg_replace("/\./","@",$this->sOAmail,1); + $this->sOAmail = preg_replace("/\.$/","",$this->sOAmail); + $this->sOAprimary = preg_replace("/\.$/","",$this->sOAprimary); + $this->zoneName = preg_replace("/\.$/","",$this->zoneName); + + if(isset($attrs['RECORDS'])){ + $this->Records = $attrs['RECORDS']; + + $tmp2 = array(); + $usedPrio = array(); + foreach($this->Records as $key => $rec){ + if($rec['type'] == "mXRecord"){ + $tmp = explode(" ",$rec['value']); + $rec['value'] = $rec['value']; + $tmp2[$tmp[0]] = $rec; + unset($this->Records[$key]); + } + if($rec['type'] == "nSRecord" && preg_match("/".preg_quote($this->sOAprimary, '/')."/",$rec['value'])){ + unset($this->Records[$key]); + } + } + if(count($tmp2) != 0){ + reset($tmp2); + ksort($tmp2); + } + $this->mXRecords = $tmp2; + }else{ + $this->mXRecords = array(); + $this->Records = array(); + } + + $str = date("Ymd"); + if(preg_match("/^".$str."/",$this->sOAserial)){ + $this->sOAserial = $this->sOAserial + 1; + }else{ + $this->sOAserial = date("Ymd")."01"; + } + + /* Check if this used, in this case disable forward and reverse configuration */ + $tmp = $this->getUsedZoneNames(); + $this->Zone_is_used = FALSE; + if(isset($tmp[DNS::FlipIp($this->InitialReverseZone).".in-addr.arpa."])){ + $this->Zone_is_used = TRUE; + } + } + + /* Detect Network class */ + if(!empty($this->ReverseZone)){ + + $dots = count(explode(".",$this->ReverseZone)); + if($dots == 1){ + $this->NetworkClass = "A"; + $this->ReverseZone .= ".0.0.0"; + }elseif($dots == 2){ + $this->NetworkClass = "B"; + $this->ReverseZone .= ".0.0"; + }else{ + $this->NetworkClass = "C"; + $this->ReverseZone .= ".0"; + } + } + + // Prepare lists + $this->mxList = new sortableListing(); + $this->mxList->setDeleteable(true); + $this->mxList->setInstantDelete(true); + $this->mxList->setEditable(false); + $this->mxList->setWidth("100%"); + $this->mxList->setHeight("100px"); + $this->mxList->setHeader(array(_("Priority"),_("Record"))); + $this->mxList->setColspecs(array('40px','*','20px')); + $this->mxList->setDefaultSortColumn(0); - /* Open Zone Entry Edit Dialog - */ - if(!count($this->ZoneObject)){ - $smarty->assign("AllowZoneEdit" , false); - }else{ - $smarty->assign("AllowZoneEdit" , true); - - if(isset($_POST['EditZoneEntries']) && $this->parent->acl_is_readable("zoneEditor")){ - if($this->zoneEditor == NULL){ - $this->zoneEditor= new servDNSeditZoneEntries($this->config,$this->dn,$this->ZoneObject); - $this->zoneEditor->acl = $this->parent->getacl("zoneEditor"); - $this->zoneEditor->parent = $this; - } - $this->dialog = $this->zoneEditor; - } } - /* Save Zone Entry Edit Dialog - */ - if(isset($_POST['SaveZoneEntryChanges'])){ - $this->dialog->save_object(); - if(count($this->dialog->check())){ - $msgs = $this->dialog->check(); - foreach($msgs as $msg){ - msg_dialog::display(_("Error"), $msg , ERROR_DIALOG); - } - }else{ - $this->zoneEditor = clone $this->dialog; - $this->dialog = FALSE; + + function execute() + { + /* Call parent execute */ + plugin::execute(); + + /* Fill templating stuff */ + $smarty= get_smarty(); + + $smarty->assign("Zone_is_used",$this->Zone_is_used); + $ui = get_userinfo(); + + /* Assign ACLs + All acls are defined in our parent class. + */ + $tmp = $this->parent->plInfo(); + foreach($tmp['plProvidedAcls'] as $name => $desc){ + $smarty->assign($name."ACL", $this->parent->getacl($name)); + } + + $display= ""; + + /* Open Zone Entry Edit Dialog + */ + if(!count($this->ZoneObject)){ + $smarty->assign("AllowZoneEdit" , false); + }else{ + $smarty->assign("AllowZoneEdit" , true); + + if(isset($_POST['EditZoneEntries']) && $this->parent->acl_is_readable("zoneEditor")){ + if($this->zoneEditor == NULL){ + $this->zoneEditor= new servDNSeditZoneEntries($this->config,$this->dn,$this->ZoneObject); + $this->zoneEditor->acl = $this->parent->getacl("zoneEditor"); + $this->zoneEditor->parent = $this; + } + $this->dialog = $this->zoneEditor; + } + } + + /* Save Zone Entry Edit Dialog + */ + if(isset($_POST['SaveZoneEntryChanges'])){ + $this->dialog->save_object(); + if(count($this->dialog->check())){ + $msgs = $this->dialog->check(); + foreach($msgs as $msg){ + msg_dialog::display(_("Error"), $msg , ERROR_DIALOG); + } + }else{ + $this->zoneEditor = clone $this->dialog; + $this->dialog = FALSE; # $rev = DNS::FlipIp(DNS::getNameFromMix($this->InitialReverseZone)).".in-addr.arpa"; # $for = DNS::getNameFromMix($this->InitialzoneName); # # $this->parent->handle_post_events("modify",array("dn" => $this->dn,"zoneName" => $rev)); # $this->parent->handle_post_events("modify",array("dn" => $this->dn,"zoneName" => $for)); # $this->dialog = false; - } - } + } + } - /* Cancel Zone Entrie Edit Dialog - */ - if(isset($_POST['CancelZoneEntryChanges'])){ - $this->dialog = false; - } + /* Cancel Zone Entrie Edit Dialog + */ + if(isset($_POST['CancelZoneEntryChanges'])){ + $this->dialog = false; + } - /* Display any type of open dialogs - */ - if(is_object($this->dialog)){ - $this->dialog->save_object(); - return($this->dialog->execute()); - } + /* Display any type of open dialogs + */ + if(is_object($this->dialog)){ + $this->dialog->save_object(); + return($this->dialog->execute()); + } - $this->mxList->save_object(); - $action = $this->mxList->getAction(); - if($action['action'] == 'delete' || $action['action'] == 'reorder'){ - $this->mXRecords = $this->mxList->getMaintainedData(); - } + $this->mxList->save_object(); + $action = $this->mxList->getAction(); + if($action['action'] == 'delete' || $action['action'] == 'reorder'){ + $this->mXRecords = $this->mxList->getMaintainedData(); + } - if($this->parent->acl_is_writeable("mXRecord")){ - if((isset($_POST['AddMXRecord'])) && (!empty($_POST['StrMXRecord']))){ - $rec = get_post('StrMXRecord'); - if(preg_match("/^[0-9]* /", $rec) && count(preg_split("/ /", $rec)) == 2){ - list($prio,$value) = preg_split("/ /", $rec); - $this->mXRecords[$prio] = array("type"=>"mXRecord","value"=>trim($rec)); - }else{ - msg_dialog::display(_("Warning"), msgPool::invalid(_("MxRecord"), "","", "20 mx.record.entry"), WARNING_DIALOG); + if($this->parent->acl_is_writeable("mXRecord")){ + if((isset($_POST['AddMXRecord'])) && (!empty($_POST['StrMXRecord']))){ + $rec = get_post('StrMXRecord'); + if(preg_match("/^[0-9]* /", $rec) && count(preg_split("/ /", $rec)) == 2){ + list($prio,$value) = preg_split("/ /", $rec); + $this->mXRecords[$prio] = array("type"=>"mXRecord","value"=>trim($rec)); + }else{ + msg_dialog::display(_("Warning"), msgPool::invalid(_("MxRecord"), "","", "20 mx.record.entry"), WARNING_DIALOG); + } + } + + /* Handle Post events */ + $once = true; + foreach($_POST as $name => $value){ + + /* Delete record if requested */ + if((preg_match("/RemoveRecord_/",$name))&&($once)){ + $once = false; + $id= preg_replace("/RemoveRecord_/","",$name); + unset($this->Records[$id]); + } + } + + /* Add new Zonerecord */ + if(isset($_POST['AddNewRecord'])){ + $this->Records[] = array("type"=>"aRecord","value"=>""); + } + } + + /* Fill in values */ + foreach($this->attributes as $name){ + $smarty->assign($name, set_post($this->$name)); } - } - /* Handle Post events */ - $once = true; - foreach($_POST as $name => $value){ - /* Delete record if requested */ - if((preg_match("/RemoveRecord_/",$name))&&($once)){ - $once = false; - $id= preg_replace("/RemoveRecord_/","",$name); - unset($this->Records[$id]); + $this->mxList->setAcl($this->parent->getacl("mXRecord")); + $lData = array(); + foreach($this->mXRecords as $key => $record){ + list($prio, $value) = preg_split("/ /", $record['value']); + $lData[$prio] = array('data'=>array($prio, $value)); } - } + $this->mxList->setListData($this->mXRecords, $lData); + $this->mxList->update(); + + /* Assign records list */ + $smarty->assign("NotNew", false); + $smarty->assign("Mxrecords", $this->mxList->render()); + $smarty->assign("records" , $this->generateRecordsList()); + $smarty->assign("NetworkClass", set_post($this->NetworkClass)); + $smarty->assign("NetworkClasses", array("A"=>"255.0.0.0 (Class A)","B"=>"255.255.0.0 (Class B)","C"=>"255.255.255.0 (Class C)")); - /* Add new Zonerecord */ - if(isset($_POST['AddNewRecord'])){ - $this->Records[] = array("type"=>"aRecord","value"=>""); - } + /* Display tempalte */ + $display.= $smarty->fetch(get_template_path('servdnseditzone.tpl', TRUE, dirname(__FILE__))); + return($display); } - /* Fill in values */ - foreach($this->attributes as $name){ - $smarty->assign($name,$this->$name); + function remove_from_parent() + { } + /* Save data to object */ + function save_object() + { + plugin::save_object(); - $this->mxList->setAcl($this->parent->getacl("mXRecord")); - $lData = array(); - foreach($this->mXRecords as $key => $record){ - list($prio, $value) = preg_split("/ /", $record['value']); - $lData[$prio] = array('data'=>array($prio, $value)); + if(!is_object($this->parent)) return; + + if($this->parent->acl_is_writeable("zoneRecords")){ + foreach($this->Records as $id => $value){ + if(isset($_POST['RecordTypeSelectedFor_'.$id])){ + $this->Records[$id]['type'] = get_post('RecordTypeSelectedFor_'.$id); + } + if(isset($_POST['RecordValue_'.$id])){ + $this->Records[$id]['value'] = get_post('RecordValue_'.$id); + } + } + } + if(isset($_POST['NetworkClass']) && !$this->Zone_is_used && $this->parent->acl_is_writeable("NetworkClass")){ + $this->NetworkClass = get_post('NetworkClass'); + } } - $this->mxList->setListData($this->mXRecords, $lData); - $this->mxList->update(); - /* Assign records list */ - $smarty->assign("NotNew", false); - $smarty->assign("Mxrecords", $this->mxList->render()); - $smarty->assign("records" , $this->generateRecordsList()); - $smarty->assign("NetworkClass", $this->NetworkClass); - $smarty->assign("NetworkClasses", array("A"=>"255.0.0.0 (Class A)","B"=>"255.255.0.0 (Class B)","C"=>"255.255.255.0 (Class C)")); - /* Display tempalte */ - $display.= $smarty->fetch(get_template_path('servdnseditzone.tpl', TRUE, dirname(__FILE__))); - return($display); - } + /* Check supplied data */ + function check() + { + /* Call common method to give check the hook */ + $message= plugin::check(); - function remove_from_parent() - { - } + /* Check if zoneName is already in use */ + $usedZones = $this->getUsedZoneNames(); + if($this->OldZoneName == "" && !empty($this->zoneName)){ + $tmp = trim($this->zoneName,".")."."; + if(isset($usedZones[$tmp])){ + $message[] = msgPool::duplicated(_("Zone name")); + } + } - /* Save data to object */ - function save_object() - { - plugin::save_object(); + if(empty($this->zoneName)){ + $message[] = msgPool::required(_("Zone name")); + } - if(!is_object($this->parent)) return; + if(empty($this->ReverseZone)){ + $message[] = msgPool::required(_("Reverse zone")); + } - if($this->parent->acl_is_writeable("zoneRecords")){ - foreach($this->Records as $id => $value){ - if(isset($_POST['RecordTypeSelectedFor_'.$id])){ - $this->Records[$id]['type'] = $_POST['RecordTypeSelectedFor_'.$id]; + if($this->zoneName != strtolower($this->zoneName)){ + $message[] = msgPool::invalid(_("Zone name"),"","",_("Only lowercase allowed")); } - if(isset($_POST['RecordValue_'.$id])){ - $this->Records[$id]['value'] = get_post('RecordValue_'.$id); + + if(!is_numeric($this->sOAserial)){ + $message[] = msgPool::invalid(_("Serial"),$this->sOAserial,"/[0-9]/"); } - } - } - if(isset($_POST['NetworkClass']) && !$this->Zone_is_used && $this->parent->acl_is_writeable("NetworkClass")){ - $this->NetworkClass = $_POST['NetworkClass']; - } - } - - - /* Check supplied data */ - function check() - { - /* Call common method to give check the hook */ - $message= plugin::check(); - - /* Check if zoneName is already in use */ - $usedZones = $this->getUsedZoneNames(); - if($this->OldZoneName == "" && !empty($this->zoneName)){ - $tmp = trim($this->zoneName,".")."."; - if(isset($usedZones[$tmp])){ - $message[] = msgPool::duplicated(_("Zone name")); - } - } - if(empty($this->zoneName)){ - $message[] = msgPool::required(_("Zone name")); - } + if(!is_numeric($this->sOArefresh)){ + $message[] = msgPool::invalid(_("Refresh"),$this->sOArefresh,"/[0-9]/"); + } - if(empty($this->ReverseZone)){ - $message[] = msgPool::required(_("Reverse zone")); - } + if(!is_numeric($this->sOAttl)){ + $message[] = msgPool::invalid(_("Time to life"),$this->sOAttl,"/[0-9]/"); + } - if($this->zoneName != strtolower($this->zoneName)){ - $message[] = msgPool::invalid(_("Zone name"),"","",_("Only lowercase allowed")); - } + if(!is_numeric($this->sOAexpire)){ + $message[] = msgPool::invalid(_("Expire"),$this->sOAexpire,"/[0-9]/"); + } - if(!is_numeric($this->sOAserial)){ - $message[] = msgPool::invalid(_("Serial"),$this->sOAserial,"/[0-9]/"); - } + if(!is_numeric($this->sOAretry)){ + $message[] = msgPool::invalid(_("Retry"),$this->sOAretry,"/[0-9]/"); + } - if(!is_numeric($this->sOArefresh)){ - $message[] = msgPool::invalid(_("Refresh"),$this->sOArefresh,"/[0-9]/"); - } + foreach($this->Records as $name => $values){ + /* only lower-case is allowed in record entries ... */ + if($values['value'] != strtolower($values['value'])){ + $message[] = msgPool::invalid($values['type'],"","",_("Only lowercase allowed")); + } + } - if(!is_numeric($this->sOAttl)){ - $message[] = msgPool::invalid(_("Time to life"),$this->sOAttl,"/[0-9]/"); - } + /* Check class for given Zone Address */ + $addr = preg_replace("/^[^\/]*+\//","",$this->ReverseZone); - if(!is_numeric($this->sOAexpire)){ - $message[] = msgPool::invalid(_("Expire"),$this->sOAexpire,"/[0-9]/"); - } + /* Check for valid&complete IP address */ + if(!tests::is_ip($addr)){ + $message[] = msgPool::invalid(_("Network address")); + } - if(!is_numeric($this->sOAretry)){ - $message[] = msgPool::invalid(_("Retry"),$this->sOAretry,"/[0-9]/"); - } + // Ensure that we do not use reverse zones twice. + // this currently not supported by GOsa. + $zones = DNS::getDNSZoneEntries($this->config,$this->dn); + switch($this->NetworkClass){ + case 'C' : $test = preg_replace("/\.[0-9]*$/","",$this->ReverseZone);break; + case 'B' : $test = preg_replace("/\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; + case 'A' : $test = preg_replace("/\.[0-9]*\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; + default : trigger_error("Invalid network class given '".$this->NetworkClass."'"); + } + foreach($zones as $name => $data){ + if($data['ReverseZone'] == $test && $data['zoneName'] != $this->InitialzoneName){ + $message[] = msgPool::duplicated(_("Network address")); + } + } - foreach($this->Records as $name => $values){ - /* only lower-case is allowed in record entries ... */ - if($values['value'] != strtolower($values['value'])){ - $message[] = msgPool::invalid($values['type'],"","",_("Only lowercase allowed")); - } - } + /* Check if given address matches selected network class */ + switch($this->NetworkClass){ + case 'A': { + if(!preg_match("/^[0-9]*\.0\.0\.0$/",$addr)){ + $message[] = sprintf(_("The specified network address and the network class (%s/%s) do not match!"), $this->NetworkClass, "255.0.0.0"); + } + } + break; + case 'B': { + if(!preg_match("/^[0-9]*\.[0-9]*\.0\.0$/",$addr)){ + $message[] = sprintf(_("The specified network address and the network class (%s/%s) do not match!"), $this->NetworkClass, "255.255.0.0"); + } + } + break; + case 'C': { + if(!preg_match("/^[0-9]*\.[0-9]*\.[0-9]*\.0$/",$addr)){ + $message[] = sprintf(_("The specified network address and the network class (%s/%s) do not match!"), $this->NetworkClass, "255.255.255.0"); + } + } + break; + default : $message[] = msgPool::invalid(_("Network class"),$this->NetworkClass); + } - /* Check class for given Zone Address */ - $addr = preg_replace("/^[^\/]*+\//","",$this->ReverseZone); - - /* Check for valid&complete IP address */ - if(!tests::is_ip($addr)){ - $message[] = msgPool::invalid(_("Network address")); + return ($message); } - // Ensure that we do not use reverse zones twice. - // this currently not supported by GOsa. - $zones = DNS::getDNSZoneEntries($this->config,$this->dn); - switch($this->NetworkClass){ - case 'C' : $test = preg_replace("/\.[0-9]*$/","",$this->ReverseZone);break; - case 'B' : $test = preg_replace("/\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; - case 'A' : $test = preg_replace("/\.[0-9]*\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; - default : trigger_error("Invalid network class given '".$this->NetworkClass."'"); - } - foreach($zones as $name => $data){ - if($data['ReverseZone'] == $test && $data['zoneName'] != $this->InitialzoneName){ - $message[] = msgPool::duplicated(_("Network address")); - } - } - - /* Check if given address matches selected network class */ - switch($this->NetworkClass){ - case 'A': { - if(!preg_match("/^[0-9]*\.0\.0\.0$/",$addr)){ - $message[] = sprintf(_("The specified network address and the network class (%s/%s) do not match!"), $this->NetworkClass, "255.0.0.0"); - } - } - break; - case 'B': { - if(!preg_match("/^[0-9]*\.[0-9]*\.0\.0$/",$addr)){ - $message[] = sprintf(_("The specified network address and the network class (%s/%s) do not match!"), $this->NetworkClass, "255.255.0.0"); - } - } - break; - case 'C': { - if(!preg_match("/^[0-9]*\.[0-9]*\.[0-9]*\.0$/",$addr)){ - $message[] = sprintf(_("The specified network address and the network class (%s/%s) do not match!"), $this->NetworkClass, "255.255.255.0"); - } - } - break; - default : $message[] = msgPool::invalid(_("Network class"),$this->NetworkClass); + + /* This funtion returns all used Zonenames + */ + function getUsedZoneNames() + { + $ret = array(); + $ldap = $this->config->get_ldap_link(); + $ldap->cd($this->config->current['BASE']); + $ldap->search("(&(objectClass=dNSZone)(!(relativeDomainName=@))(zoneName=*))",array("zoneName","relativeDomainName")); + while($attr = $ldap->fetch()){ + $ret[$attr['zoneName'][0]][] = $attr['dn']; + } + return($ret); } - return ($message); - } + /* Save to LDAP */ + function save() + { + $ret =array(); + foreach($this->attributes as $name){ + $ret[$name] = $this->$name; + } - /* This funtion returns all used Zonenames - */ - function getUsedZoneNames() - { - $ret = array(); - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $ldap->search("(&(objectClass=dNSZone)(!(relativeDomainName=@))(zoneName=*))",array("zoneName","relativeDomainName")); - while($attr = $ldap->fetch()){ - $ret[$attr['zoneName'][0]][] = $attr['dn']; - } - return($ret); - } + /* Create mx records + */ + foreach($this->mXRecords as $key => $rec){ + $this->Records[] = $rec; + } + $ret['RECORDS'] = $this->Records; - /* Save to LDAP */ - function save() - { - $ret =array(); - foreach($this->attributes as $name){ - $ret[$name] = $this->$name; - } + switch($this->NetworkClass){ + case 'C' : $ret['ReverseZone']= preg_replace("/\.[0-9]*$/","",$this->ReverseZone);break; + case 'B' : $ret['ReverseZone']= preg_replace("/\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; + case 'A' : $ret['ReverseZone']= preg_replace("/\.[0-9]*\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; + default : trigger_error("Invalid network class given '".$this->NetworkClass."'"); + } - /* Create mx records - */ - foreach($this->mXRecords as $key => $rec){ - $this->Records[] = $rec; - } + $ret['InitialReverseZone']= $this->InitialReverseZone; + $ret['InitialzoneName'] = $this->InitialzoneName; - $ret['RECORDS'] = $this->Records; - - switch($this->NetworkClass){ - case 'C' : $ret['ReverseZone']= preg_replace("/\.[0-9]*$/","",$this->ReverseZone);break; - case 'B' : $ret['ReverseZone']= preg_replace("/\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; - case 'A' : $ret['ReverseZone']= preg_replace("/\.[0-9]*\.[0-9]*\.[0-9]*$/","",$this->ReverseZone);break; - default : trigger_error("Invalid network class given '".$this->NetworkClass."'"); - } + $ret['sOAmail'] = preg_replace("/\@/",".",$this->sOAmail); - $ret['InitialReverseZone']= $this->InitialReverseZone; - $ret['InitialzoneName'] = $this->InitialzoneName; + foreach(array("sOAprimary","zoneName","sOAmail") as $attr){ - $ret['sOAmail'] = preg_replace("/\@/",".",$this->sOAmail); + // Append trailing dots if we've full qualified host names. + if(!preg_match("/\.$/",$ret[$attr])){ + if(!tests::is_ip($ret[$attr]) && preg_match("/\./",$ret[$attr])){ + $ret[$attr] = $ret[$attr]."."; + } + } + } - foreach(array("sOAprimary","zoneName","sOAmail") as $attr){ + $ret['RECORDS'][] = array("type" => "nSRecord","value" => $ret['sOAprimary']) ; - // Append trailing dots if we've full qualified host names. - if(!preg_match("/\.$/",$ret[$attr])){ - if(!tests::is_ip($ret[$attr]) && preg_match("/\./",$ret[$attr])){ - $ret[$attr] = $ret[$attr]."."; - } - } + $ret['zoneEditor'] = $this->zoneEditor; + return($ret); } - $ret['RECORDS'][] = array("type" => "nSRecord","value" => $ret['sOAprimary']) ; - - $ret['zoneEditor'] = $this->zoneEditor; - return($ret); - } - - - /* This function generate a table row for each used record. - This table row displays the recordtype in a select box - and the specified value for the record, and a remove button. - The last element of the table also got an 'add' button. - */ - function generateRecordsList($changeStateForRecords="") - { - $changeStateForRecords = ""; - - $str = ""; - foreach($this->Records as $key => $entry){ - - if($entry['type'] == "mXRecord") continue; - - $changeStateForRecords.= "changeState('RecordTypeSelectedFor_".$key."');\n"; - $changeStateForRecords.= "changeState('RecordValue_".$key."');\n"; - $changeStateForRecords.= "changeState('RemoveRecord_".$key."');\n"; - - $str.= - " ". - " ". - " ". - " ". - ""; + + /* This function generate a table row for each used record. + This table row displays the recordtype in a select box + and the specified value for the record, and a remove button. + The last element of the table also got an 'add' button. + */ + function generateRecordsList($changeStateForRecords="") + { + $changeStateForRecords = ""; + + $str = "
".$this->generateRecordListBox($entry['type'],"RecordTypeSelectedFor_".$key)."". - " ". - " ". - " ". - "
"; + foreach($this->Records as $key => $entry){ + + if($entry['type'] == "mXRecord") continue; + + $changeStateForRecords.= "changeState('RecordTypeSelectedFor_".$key."');\n"; + $changeStateForRecords.= "changeState('RecordValue_".$key."');\n"; + $changeStateForRecords.= "changeState('RemoveRecord_".$key."');\n"; + + $str.= + " ". + " ". + " ". + " ". + ""; + } + + $str.= + " ". + " ". + " ". + "
".$this->generateRecordListBox($entry['type'],"RecordTypeSelectedFor_".$key)."". + " ". + " ". + " ". + "
". + " ". + "
"; + return($str); } - $str.= - " ". - " ". - " ". - " ". - " ". - ""; - return($str); - } - - /* This function generates a select box out of $this->RecordTypes options. - The Parameter $selected is used to predefine an attribute. - $name is used to specify a post name - */ - function generateRecordListBox($selected,$name) - { - $str = ""; + foreach($this->RecordTypes as $type => $value){ + + if(preg_match("/^mXRecord$/i",$value)) continue; + + $use = ""; + if($type == $selected){ + $use = " selected "; + } + $str.="\n "; + } + $str.=""; + return($str); } - $str.=""; - return($str); - } - function acl_is_writeable($attribute,$skip_write = FALSE) - { - if($this->read_only) return(FALSE); - $ui= get_userinfo(); - return preg_match('/w/', $ui->get_permissions($this->acl_base, $this->acl_category."servdns", $attribute, $skip_write)); - } + function acl_is_writeable($attribute,$skip_write = FALSE) + { + if($this->read_only) return(FALSE); + $ui= get_userinfo(); + return preg_match('/w/', $ui->get_permissions($this->acl_base, $this->acl_category."servdns", $attribute, $skip_write)); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: