From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 27 Jul 2010 09:17:05 +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=105086358bb8c51d7f7d2fde7b7c945446a5bd4d;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@19141 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
index 76bd53790..1c801721e 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
@@ -1,165 +1,165 @@
 <?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 dhcpAdvanced extends plugin
 {
-  /* Used attributes */
-  var $options= null;
-  var $statements= null;
-  var $show_advanced= FALSE;
-  var $autoStatements= array();
-  var $autoOptions= array();
-
-  /* attribute list for save action */
-  var $attributes= array();
-  var $objectclasses= array();
-  var $parent;
-
-  function dhcpAdvanced()
-  {
-    /* This is always an account */
-    $this->is_account= TRUE;
-    $this->setAutoStatements();
-    $this->setAutoOptions();
-  }
-
-  function execute()
-  {
-    plugin::execute();
-
-  	$acl_writeable = preg_match("/w/",$this->parent->getacl(""));
-
-    /* Check for interaction */
-    if ($acl_writeable && isset($_POST['add_statement']) && $_POST['addstatement'] != ""){
-      $key= preg_replace('/^([a-z0-9-]+)\s(.*)$/', '\\1', get_post('addstatement'));
-      $val= preg_replace("/^$key\s*/", '', get_post('addstatement'));
-      $this->statements->add($key,$val);
-    }
-    if ($acl_writeable && isset($_POST['delete_statement']) && isset($_POST['dhcpstatements'])){
-      $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpstatements'));
-      $key  = preg_replace('/^.*_/', '', get_post('dhcpstatements'));
-      if (in_array($name, $this->autoStatements)){
-        msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG);
-      } else {
-        $this->statements->remove($name,$key);	
-      }
-    }
-    if ($acl_writeable && isset($_POST['add_option']) && $_POST['addoption'] != ""){
-      $key= preg_replace('/^([a-z0-9-]+)\s(.*)$/', '\\1', get_post('addoption'));
-      $val= preg_replace("/^$key\s*/", '', get_post('addoption'));
-      $this->options->add($key,$val);
-    }
-    if ($acl_writeable && isset($_POST['delete_option']) && isset($_POST['dhcpoptions'])){
-      $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpoptions'));
-      $key  = preg_replace('/^.*_/', '', get_post('dhcpoptions'));
-      if (in_array($name, $this->autoOptions)){
-        msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG);
-      } else {
-        $this->options->remove($name,$key);	
-      }
+    /* Used attributes */
+    var $options= null;
+    var $statements= null;
+    var $show_advanced= FALSE;
+    var $autoStatements= array();
+    var $autoOptions= array();
+
+    /* attribute list for save action */
+    var $attributes= array();
+    var $objectclasses= array();
+    var $parent;
+
+    function dhcpAdvanced()
+    {
+        /* This is always an account */
+        $this->is_account= TRUE;
+        $this->setAutoStatements();
+        $this->setAutoOptions();
     }
 
-    $smarty= get_smarty();
-
-    /* Assign ACLs */
-    $smarty->assign("acl",$this->parent->getacl(""));
-
-    /* Assign statements  */
-    $statements= array();
-    foreach ($this->statements->getAll() as $key => $val){
-      if (in_array($key, $this->autoStatements)){
-        foreach($val as $id => $entry){
-          $statements[$key."_".$id]= "$key $entry ["._("automatic")."]";
-        }       
-      } else {
-        foreach($val as $id => $entry){
-          $statements[$key."_".$id]= "$key $entry";
-        }       
-      }
+    function execute()
+    {
+        plugin::execute();
+
+        $acl_writeable = preg_match("/w/",$this->parent->getacl(""));
+
+        /* Check for interaction */
+        if ($acl_writeable && isset($_POST['add_statement']) && $_POST['addstatement'] != ""){
+            $key= preg_replace('/^([a-z0-9-]+)\s(.*)$/', '\\1', get_post('addstatement'));
+            $val= preg_replace("/^$key\s*/", '', get_post('addstatement'));
+            $this->statements->add($key,$val);
+        }
+        if ($acl_writeable && isset($_POST['delete_statement']) && isset($_POST['dhcpstatements'])){
+            $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpstatements'));
+            $key  = preg_replace('/^.*_/', '', get_post('dhcpstatements'));
+            if (in_array($name, $this->autoStatements)){
+                msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG);
+            } else {
+                $this->statements->remove($name,$key);	
+            }
+        }
+        if ($acl_writeable && isset($_POST['add_option']) && $_POST['addoption'] != ""){
+            $key= preg_replace('/^([a-z0-9-]+)\s(.*)$/', '\\1', get_post('addoption'));
+            $val= preg_replace("/^$key\s*/", '', get_post('addoption'));
+            $this->options->add($key,$val);
+        }
+        if ($acl_writeable && isset($_POST['delete_option']) && isset($_POST['dhcpoptions'])){
+            $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpoptions'));
+            $key  = preg_replace('/^.*_/', '', get_post('dhcpoptions'));
+            if (in_array($name, $this->autoOptions)){
+                msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG);
+            } else {
+                $this->options->remove($name,$key);	
+            }
+        }
+
+        $smarty= get_smarty();
+
+        /* Assign ACLs */
+        $smarty->assign("acl",$this->parent->getacl(""));
+
+        /* Assign statements  */
+        $statements= array();
+        foreach ($this->statements->getAll() as $key => $val){
+            if (in_array($key, $this->autoStatements)){
+                foreach($val as $id => $entry){
+                    $statements[$key."_".$id]= "$key $entry ["._("automatic")."]";
+                }       
+            } else {
+                foreach($val as $id => $entry){
+                    $statements[$key."_".$id]= "$key $entry";
+                }       
+            }
+        }
+        $smarty->assign("dhcpstatements", set_post($statements));
+
+        /* Assign options  */
+        $options= array();
+        foreach ($this->options->getAll() as $key => $val){
+            if (in_array($key, $this->autoOptions)){
+                foreach($val as $id => $entry){
+                    $options[$key."_".$id]= "$key $entry ["._("automatic")."]";
+                }       
+            } else {
+                foreach($val as $id => $entry){
+                    $options[$key."_".$id]= "$key $entry";
+                }       
+            }
+        }
+        $smarty->assign("dhcpoptions", set_post($options));
+
+        /* Show main page */
+        $smarty->assign("show_advanced", $this->show_advanced);
+        return ($smarty->fetch (get_template_path('dhcp_advanced.tpl', TRUE,dirname(__FILE__))));
     }
-    $smarty->assign("dhcpstatements", $statements);
-
-    /* Assign options  */
-    $options= array();
-    foreach ($this->options->getAll() as $key => $val){
-      if (in_array($key, $this->autoOptions)){
-        foreach($val as $id => $entry){
-          $options[$key."_".$id]= "$key $entry ["._("automatic")."]";
-        }       
-      } else {
-        foreach($val as $id => $entry){
-          $options[$key."_".$id]= "$key $entry";
-        }       
-      }
-    }
-    $smarty->assign("dhcpoptions", $options);
-
-    /* Show main page */
-    $smarty->assign("show_advanced", $this->show_advanced);
-    return ($smarty->fetch (get_template_path('dhcp_advanced.tpl', TRUE,dirname(__FILE__))));
-  }
 
-  function remove_from_parent()
-  {
-  }
+    function remove_from_parent()
+    {
+    }
 
 
-  /* Save data to object */
-  function save_object()
-  {
-    if (isset($_POST['show_advanced'])){
-      $this->show_advanced= TRUE;
+    /* Save data to object */
+    function save_object()
+    {
+        if (isset($_POST['show_advanced'])){
+            $this->show_advanced= TRUE;
+        }
+        if (isset($_POST['hide_advanced'])){
+            $this->show_advanced= FALSE;
+        }
     }
-    if (isset($_POST['hide_advanced'])){
-      $this->show_advanced= FALSE;
-    }
-  }
 
 
-  /* Check values */
-  function check()
-  {
-    /* Nothing to check here */
-    $message= array();
-    return $message;
-  }
+    /* Check values */
+    function check()
+    {
+        /* Nothing to check here */
+        $message= array();
+        return $message;
+    }
 
 
-  /* Save to LDAP */
-  function save()
-  {
-  }
+    /* Save to LDAP */
+    function save()
+    {
+    }
 
 
-  function setAutoOptions($addopt= array())
-  {
-    $options= array("routers", "domain-name", "domain-name-servers", "subnet-mask", "broadcast-address");
-    $this->autoOptions= array_merge($options, $addopt);
-  }
+    function setAutoOptions($addopt= array())
+    {
+        $options= array("routers", "domain-name", "domain-name-servers", "subnet-mask", "broadcast-address");
+        $this->autoOptions= array_merge($options, $addopt);
+    }
 
 
-  function setAutoStatements($addstat= array())
-  {
-    $statements= array("filename", "next-server", "get-lease-hostnames", "use-host-decl-names");
-    $this->autoStatements= array_merge($statements, $addstat);
-  }
+    function setAutoStatements($addstat= array())
+    {
+        $statements= array("filename", "next-server", "get-lease-hostnames", "use-host-decl-names");
+        $this->autoStatements= array_merge($statements, $addstat);
+    }
 
 }