![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index 940da119d8d0a9bfaa0d6e82b66ed036019ca4d6..e0a6e7960c7418e96c6cc5186f8f5453671e348b 100644 (file)
/* 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();
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();
$this->DNSenabled = true;
}
}
+
+ if(!class_available("DNS")){
+ $this->DNSenabled = FALSE;
+ }
+
if(!$this->DNSenabled){
$this->DNS_is_account = false;
return;
**********/
/* Add a new one */
- 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);
+ if($this->acl_is_writeable("ipHostNumber")){
+ foreach($_POST as $name => $value){
+ if(preg_match("/^additionalHostNumbers_add/",$name)){
+ $this->additionalHostNumbers[] = "";
+ break;
}
- 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);
**********/
/* Check for autonet button */
- if (isset($_POST['autonet'])){
+ if (isset($_POST['autonet']) && ($this->acl_is_writeable("ipHostNumber") || $this->acl_is_writeable("macAddress"))){
$d= new gosaSupportDaemon(TRUE, 0.5);
- $res= $d->_send("<xml><header>gosa_network_completition</header><source>GOSA</source><target>GOSA</target><hostname>".$this->cn."</hostname></xml>", TRUE);
- if (isset($res['XML']['IP'])){
+ $res= $d->_send("<xml><header>gosa_network_completition</header>".
+ "<source>GOSA</source><target>GOSA</target><hostname>".$this->cn."</hostname></xml>", TRUE);
+ if (isset($res['XML']['IP']) && $this->acl_is_writeable("ipHostNumber")){
$this->ipHostNumber= $res['XML']['IP'];
}
- if (isset($res['XML']['MAC'])){
+ 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 = FALSE;
}
- if(isset($_POST['save_dhcp'])){
+ if(isset($_POST['save_dhcp']) && $this->acl_is_writeable("dhcpSetup")){
$this->dialog->save_object();
-
$msgs = $this->dialog->check(array());
if(count($msgs)){
foreach($msgs as $msg){
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
**********/
/* 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 ? */
# $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)));
/* 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]);
+ }
}
}
}
function remove_from_parent()
{
- if($this->initially_was_account){
+ if($this->DNS_is_account){
$ldap = $this->config->get_ldap_link();
/******
Additional IP Host Numbers
******/
-
+
/* Get posts for all additionally added ipHostNumbers */
- foreach($this->additionalHostNumbers as $id => $value){
- if(isset($_POST['additionalHostNumbers_'.$id])){
- $this->additionalHostNumbers[$id] = get_post('additionalHostNumbers_'.$id);
- }
+ 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->dhcpEnabled && isset($_POST['network_tpl_posted'])){
+ 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];
******/
/* Check if DNS should be enabled / disabled */
- if($this->DNS_is_account && $this->acl_is_removeable() && !isset($_POST['DNS_is_account'])){
+ 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_createable() && isset($_POST['DNS_is_account'])){
+ }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 */
}
}
}
+
/* Get all basic DNS attributes (TTL, Clas ..)*/
foreach($this->DNSattributes as $attr){
- if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){
+ if(isset($_POST[$attr])){
$this->dnsEntry[$attr] = $_POST[$attr];
}
}
-
-
}
if($this->hide_dns_check_box){
$this->DNS_is_account = true;
foreach($this->additionalHostNumbers as $id => $value){
if(!tests::is_ip($value)){
- $message[]= msgPool::invalid(sprintf(_("IP address #%s"),($id +2)), "", "", "192.168.1.10");
+ $message[]= msgPool::invalid(sprintf(_("IP address %s"),($id +2)), "", "", "192.168.1.10");
}
}
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 */
/****************/
/* 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)){
*/
if((!$this->DNSenabled) || ((!$this->DNS_is_account)&&(!$this->initially_was_account))){
return;
- }else{
+ }elseif($this->acl_is_writeable("dnsSetup")){
/* Add ipHostNumber to aRecords
*/
"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);
}