From 6994c296f58c99bddc79b3439e186b32eeb2259a Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 27 Jul 2010 09:17:29 +0000 Subject: [PATCH] Updated several service dialogs, fixed typos, string, html, post handling and more. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19150 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/services/dhcp/class_dhcpPool.inc | 278 +++++++++--------- 1 file changed, 139 insertions(+), 139 deletions(-) diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc index d1037df5d..ecb2ecacb 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc @@ -1,186 +1,186 @@ new){ - $this->dhcpRange= $attrs['dhcpRange'][0]; - list($this->range_start, $this->range_stop)= preg_split('/\s+/', $this->dhcpRange); + /* Used attributes */ + var $dhcpRange= ""; + var $range_start= ""; + var $range_stop= ""; + + /* attribute list for save action */ + var $objectclasses= array('top', 'dhcpPool'); + + function dhcpPool($parent,$attrs) + { + dhcpPlugin::dhcpPlugin($parent,$attrs); + + /* Load attributes */ + if (!$this->new){ + $this->dhcpRange= $attrs['dhcpRange'][0]; + list($this->range_start, $this->range_stop)= preg_split('/\s+/', $this->dhcpRange); + } + + $this->advanced->setAutoOptions(array("host-name")); + $this->advanced->setAutoStatements(array("fixed-address")); } - $this->advanced->setAutoOptions(array("host-name")); - $this->advanced->setAutoStatements(array("fixed-address")); - } + function execute() + { + $smarty= get_smarty(); + $smarty->assign("cn", set_post($this->cn)); + $smarty->assign("range_start", set_post($this->range_start)); + $smarty->assign("range_stop", set_post($this->range_stop)); - function execute() - { - $smarty= get_smarty(); - $smarty->assign("cn", $this->cn); - $smarty->assign("range_start", $this->range_start); - $smarty->assign("range_stop", $this->range_stop); + /* Assign ACLs */ + $smarty->assign("acl",$this->parent->getacl("")); - /* Assign ACLs */ - $smarty->assign("acl",$this->parent->getacl("")); + /* Show main page */ + $display= $smarty->fetch(get_template_path('dhcp_pool.tpl', TRUE, dirname(__FILE__))).$this->network->execute(); - /* Show main page */ - $display= $smarty->fetch(get_template_path('dhcp_pool.tpl', TRUE, dirname(__FILE__))).$this->network->execute(); + $display.= $this->advanced->execute(); - $display.= $this->advanced->execute(); + /* Add footer */ + $display.= "
"; + if(preg_match("/w/",$this->parent->getacl(""))){ + $display.= " "; + } + $display.= ""; + $display.= "
"; - /* Add footer */ - $display.= "
"; - if(preg_match("/w/",$this->parent->getacl(""))){ - $display.= " "; + return ($display); } - $display.= ""; - $display.= "
"; - return ($display); - } - - function remove_from_parent() - { - } + function remove_from_parent() + { + } - /* Save data to object */ - function save_object() - { - if (isset($_POST['cn'])){ - $this->cn= validate(get_post('cn')); - $this->range_start= validate(get_post('range_start')); - $this->range_stop= validate(get_post('range_stop')); - } + /* Save data to object */ + function save_object() + { + if (isset($_POST['cn'])){ + $this->cn= get_post('cn'); + $this->range_start= get_post('range_start'); + $this->range_stop= get_post('range_stop'); + } - dhcpPlugin::save_object(); + dhcpPlugin::save_object(); - /* Move range to internal variable */ - $this->dhcpRange= $this->range_start." ".$this->range_stop; - } + /* Move range to internal variable */ + $this->dhcpRange= $this->range_start." ".$this->range_stop; + } - /* Check values */ - function check() - { - $message= array(); + /* Check values */ + function check() + { + $message= array(); - $cache = $this->parent->dhcpObjectCache; + $cache = $this->parent->dhcpObjectCache; - /* All required fields are set? */ - if ($this->cn == ""){ - $message[]= msgPool::required(_("Name")); - } + /* All required fields are set? */ + if ($this->cn == ""){ + $message[]= msgPool::required(_("Name")); + } - /* cn already used? */ - if ($this->orig_cn != $this->cn || $this->new){ + /* cn already used? */ + if ($this->orig_cn != $this->cn || $this->new){ - foreach($cache as $dn => $dummy){ - if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){ - $message[]= msgPool::duplicated(_("Name")); - break; + foreach($cache as $dn => $dummy){ + if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){ + $message[]= msgPool::duplicated(_("Name")); + break; + } + } } - } - } - if ($this->dhcpRange == ""){ - $message[]= msgPool::required(_("Range")); - } + if ($this->dhcpRange == ""){ + $message[]= msgPool::required(_("Range")); + } - if (!tests::is_ip($this->range_start) || !tests::is_ip($this->range_stop)){ - $message[]= msgPool::invalid(_("Range")); - } + if (!tests::is_ip($this->range_start) || !tests::is_ip($this->range_stop)){ + $message[]= msgPool::invalid(_("Range")); + } - if(!tests::is_ip_range($this->range_start,$this->range_stop)){ - $message[]= msgPool::invalid(_("Range")); - } + if(!tests::is_ip_range($this->range_start,$this->range_stop)){ + $message[]= msgPool::invalid(_("Range")); + } - /* Check if range is in the network */ - $dn= $this->dn; - while (preg_match('/,/', $dn)){ - $type= $this->objectType($cache, $dn); - - /* Check for subnet */ - if ($type == 'dhcpSubnet'){ - $network= $cache[$dn]['cn'][0]; - $netmask= normalize_netmask($cache[$dn]['dhcpNetMask'][0]); - if (!tests::is_in_network($network, $netmask, $this->range_start) || - !tests::is_in_network($network, $netmask, $this->range_stop)){ - $message[] = _("'Range' is not inside the configured network."); + /* Check if range is in the network */ + $dn= $this->dn; + while (preg_match('/,/', $dn)){ + $type= $this->objectType($cache, $dn); + + /* Check for subnet */ + if ($type == 'dhcpSubnet'){ + $network= $cache[$dn]['cn'][0]; + $netmask= normalize_netmask($cache[$dn]['dhcpNetMask'][0]); + if (!tests::is_in_network($network, $netmask, $this->range_start) || + !tests::is_in_network($network, $netmask, $this->range_stop)){ + $message[] = _("'Range' is not inside the configured network."); + } + } + + /* Stop if we've examined the service base object */ + if ($type == 'dhcpService'){ + break; + } + $dn= preg_replace('/^[^,]+,/', '', $dn); } - } - /* Stop if we've examined the service base object */ - if ($type == 'dhcpService'){ - break; - } - $dn= preg_replace('/^[^,]+,/', '', $dn); - } + /* Check external plugins */ + $net= $this->network->check(); + $adv= $this->advanced->check(); + $message= array_merge($message, $net, $adv); - /* Check external plugins */ - $net= $this->network->check(); - $adv= $this->advanced->check(); - $message= array_merge($message, $net, $adv); + return $message; + } - return $message; - } + /* Save to LDAP */ + function save() + { + dhcpPlugin::save(); + $this->attrs['dhcpRange']= array($this->dhcpRange); - /* Save to LDAP */ - function save() - { - dhcpPlugin::save(); - $this->attrs['dhcpRange']= array($this->dhcpRange); + return ($this->attrs); + } - return ($this->attrs); - } + function objectType($cache, $dn) + { + $type= ""; + $types= array("dhcpService", "dhcpClass", "dhcpSubClass", "dhcpHost", + "dhcpGroup", "dhcpPool", "dhcpSubnet", "dhcpSharedNetwork"); - function objectType($cache, $dn) - { - $type= ""; - $types= array("dhcpService", "dhcpClass", "dhcpSubClass", "dhcpHost", - "dhcpGroup", "dhcpPool", "dhcpSubnet", "dhcpSharedNetwork"); + foreach ($cache[$dn]['objectClass'] as $oc){ + if (in_array($oc, $types)){ + $type= $oc; + break; + } + } - foreach ($cache[$dn]['objectClass'] as $oc){ - if (in_array($oc, $types)){ - $type= $oc; - break; - } + return ($type); } - return ($type); - } - } ?> -- 2.30.2