Updated several service dialogs, fixed typos, string, html, post handling and more.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19153 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
index 17ce449c4ce07228e26d1aeba5a74035e4495af6..05cf799428f61cedf89294d1d645ac1151310096 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
@@ -1,118 +1,118 @@
 <?php
 /*
-  This code is part of GOsa (https://gosa.gonicus.de)
-  Copyright (C) 2003  Cajus Pollmeier
+   This code is part of GOsa (https://gosa.gonicus.de)
+   Copyright (C) 2003  Cajus Pollmeier
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 class dhcpSubClass extends dhcpPlugin
 {
-  /* attribute list for save action */
-  var $objectclasses= array('top', 'dhcpSubClass', 'dhcpOptions');
-
-  function dhcpSubClass($parent,&$attrs)
-  {
-    /* Load statements / options */
-    dhcpPlugin::dhcpPlugin($parent,$attrs);
-  }
-
-  function execute()
-  {
-    $smarty= get_smarty();
-    $smarty->assign("cn", $this->cn);
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Show main page */
-    $display= $smarty->fetch (get_template_path('dhcp_group.tpl', TRUE, 
-      dirname(__FILE__))).$this->network->execute();
-    $display.= $this->advanced->execute();
-
-    /* Add footer */
-    $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
-    if(preg_match("/w/",$this->parent->getacl(""))){
-      $display.=        "<button type='submit' name='save_dhcp'>".msgPool::saveButton()."</button>&nbsp;";
+    /* attribute list for save action */
+    var $objectclasses= array('top', 'dhcpSubClass', 'dhcpOptions');
+
+    function dhcpSubClass($parent,&$attrs)
+    {
+        /* Load statements / options */
+        dhcpPlugin::dhcpPlugin($parent,$attrs);
     }
-    $display.=   "<button type='submit' name='cancel_dhcp'>".msgPool::cancelButton()."</button>";
-    $display.= "</div>";
 
-    return ($display);
-  }
+    function execute()
+    {
+        $smarty= get_smarty();
+        $smarty->assign("cn", set_post($this->cn));
 
+        /* Assign ACLs */
+        $smarty->assign("acl",$this->parent->getacl(""));
 
-  function remove_from_parent()
-  {
-  }
+        /* Show main page */
+        $display= $smarty->fetch (get_template_path('dhcp_group.tpl', TRUE, 
+                    dirname(__FILE__))).$this->network->execute();
+        $display.= $this->advanced->execute();
 
+        /* Add footer */
+        $display.= "<div style='width:100%;text-align:right;margin-top:5px;'>";
+        if(preg_match("/w/",$this->parent->getacl(""))){
+            $display.=          "<button type='submit' name='save_dhcp'>".msgPool::saveButton()."</button>&nbsp;";
+        }
+        $display.=   "<button type='submit' name='cancel_dhcp'>".msgPool::cancelButton()."</button>";
+        $display.= "</div>";
 
-  /* Save data to object */
-  function save_object()
-  {
-    /* Save cn */
-    if (preg_match("/w/",$this->parent->getacl("")) && isset($_POST['cn'])){
-      $this->cn= validate(get_post('cn'));
+        return ($display);
     }
 
-    /* Handle global saving */
-    dhcpPlugin::save_object();
-  }
 
+    function remove_from_parent()
+    {
+    }
 
-  /* Check values */
-  function check()
-  {
-    $message= array();
 
-    $cache = $this->parent->dhcpObjectCache;
+    /* Save data to object */
+    function save_object()
+    {
+        /* Save cn */
+        if (preg_match("/w/",$this->parent->getacl("")) && isset($_POST['cn'])){
+            $this->cn= get_post('cn');
+        }
 
-    /* All required fields are set? */
-    if ($this->cn == ""){
-      $message[]= msgPool::required(_("Name"));
-    }
-    if (!preg_match('/^[a-z0-9_-]*$/i', $this->cn)){
-      $message[]= msgPool::invalid(_("Name"),$this->cn,"/[a-z0-9_-]/i");
+        /* Handle global saving */
+        dhcpPlugin::save_object();
     }
 
-    /* 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;
+    /* Check values */
+    function check()
+    {
+        $message= array();
+
+        $cache = $this->parent->dhcpObjectCache;
+
+        /* All required fields are set? */
+        if ($this->cn == ""){
+            $message[]= msgPool::required(_("Name"));
+        }
+        if (!preg_match('/^[a-z0-9_-]*$/i', $this->cn)){
+            $message[]= msgPool::invalid(_("Name"),$this->cn,"/[a-z0-9_-]/i");
         }
-      }
-    }
 
-    /* Check external plugins */
-    $net= $this->network->check();
-    $adv= $this->advanced->check();
-    $message= array_merge($message, $net, $adv);
+        /* cn already used? */
+        if ($this->orig_cn != $this->cn || $this->new){
 
-    return $message;
-  }
+            foreach($cache as $dn => $dummy){
+                if (preg_match("/^cn=".$this->cn.",/", $dn) && count($dummy)){
+                    $message[]= msgPool::duplicated(_("Name"));
+                    break;
+                }
+            }
+        }
 
+        /* Check external plugins */
+        $net= $this->network->check();
+        $adv= $this->advanced->check();
+        $message= array_merge($message, $net, $adv);
 
-  /* Save to LDAP */
-  function save()
-  {
-    dhcpPlugin::save();
-    return ($this->attrs);
-  }
+        return $message;
+    }
+
+
+    /* Save to LDAP */
+    function save()
+    {
+        dhcpPlugin::save();
+        return ($this->attrs);
+    }
 
 
 }