From c815d75c2305b6174ab257590e945423e2f2c9bf Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 7 Jun 2006 08:20:49 +0000
Subject: [PATCH] Added status "" none

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3668 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/admin/systems/class_goCupsServer.inc     |  1 +
 plugins/admin/systems/class_goFaxServer.inc      |  1 +
 plugins/admin/systems/class_goFonServer.inc      |  1 +
 plugins/admin/systems/class_goGlpiServer.inc     |  1 +
 plugins/admin/systems/class_goImapServer.inc     |  1 +
 plugins/admin/systems/class_goKrbServer.inc      |  1 +
 plugins/admin/systems/class_goLdapServer.inc     |  1 +
 plugins/admin/systems/class_goLogDBServer.inc    |  1 +
 plugins/admin/systems/class_goMailServer.inc     |  8 +++++---
 plugins/admin/systems/class_goNtpServer.inc      |  1 +
 plugins/admin/systems/class_goShareServer.inc    |  1 +
 plugins/admin/systems/class_goSyslogServer.inc   |  1 +
 plugins/admin/systems/class_goTerminalServer.inc |  1 +
 plugins/admin/systems/goImapServer.tpl           |  3 ++-
 plugins/admin/systems/goMailServer.tpl           | 11 +++++++++--
 15 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index 85b90c7a3..82fc0528f 100644
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -89,6 +89,7 @@ class goCupsServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass"));
diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index ac3c09724..3fca69e1d 100644
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -91,6 +91,7 @@ class goFaxServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goFaxAdmin", "goFaxPassword"));
diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 13bd59ec3..221b5c714 100644
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -94,6 +94,7 @@ class goFonServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goFonAdmin", "goFonAreaCode", "goFonCountryCode","goFonPassword"));
diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index 39fe8990c..c532e3523 100644
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -93,6 +93,7 @@ class goGlpiServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goGlpiAdmin","goGlpiDatabase"));
diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index 3b794ecb5..ebf9fbb4c 100644
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -125,6 +125,7 @@ class goImapServer extends plugin{
    /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goImapName","goImapConnect","goImapAdmin","goImapPassword"));
diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc
index d4e32eeee..eaed327bc 100644
--- a/plugins/admin/systems/class_goKrbServer.inc
+++ b/plugins/admin/systems/class_goKrbServer.inc
@@ -92,6 +92,7 @@ class goKrbServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goKrbRealm","goKrbAdmin","goKrbPassword"));
diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc
index 07b0dcebd..eb29ad2c9 100644
--- a/plugins/admin/systems/class_goLdapServer.inc
+++ b/plugins/admin/systems/class_goLdapServer.inc
@@ -90,6 +90,7 @@ class goLdapServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goLdapBase"));
diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index f1adc9dc8..20785cd7c 100644
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -92,6 +92,7 @@ class goLogDBServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goLogAdmin","goLogPassword"));
diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index cdab67ce1..49a2eb2c6 100644
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -338,7 +338,7 @@ class goMailServer extends plugin{
 
     /* Create divList for translation tables */
     $divTranslation = new divSelectBox("TransportProtocols");
-    $divTranslation->SetHeight(110);
+    $divTranslation->SetHeight(90);
     foreach($this->postfixTransportTable as $key => $entry){
       $img = "";
 
@@ -365,7 +365,7 @@ class goMailServer extends plugin{
 
     /* Create divList for sender restrictions */
     $DivSenderRestrict = new divSelectBox("postfixSenderRestrictions");
-    $DivSenderRestrict->SetHeight(110);
+    $DivSenderRestrict->SetHeight(90);
     foreach($this->postfixSenderRestrictions as $key => $entry){
       $img ="";
 
@@ -393,7 +393,8 @@ class goMailServer extends plugin{
 
     /* Create divList for translation tables */
     $DivRecipientRestrict = new divSelectBox("postfixRecipientRestrictions");
-    $DivRecipientRestrict->SetHeight(110);
+    $DivRecipientRestrict->SetHeight(90);
+
     foreach($this->postfixRecipientRestrictions as $key => $entry){
       $img = "";
       if($key != 0){
@@ -571,6 +572,7 @@ class goMailServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass"));
diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index bea2dc1af..694f6e694 100644
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -117,6 +117,7 @@ class goNtpServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass"));
diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc
index 7c35e429c..f960acdc9 100644
--- a/plugins/admin/systems/class_goShareServer.inc
+++ b/plugins/admin/systems/class_goShareServer.inc
@@ -207,6 +207,7 @@ class goShareServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass"));
diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc
index 585b3d8a5..66fafcbe2 100644
--- a/plugins/admin/systems/class_goSyslogServer.inc
+++ b/plugins/admin/systems/class_goSyslogServer.inc
@@ -89,6 +89,7 @@ class goSyslogServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass"));
diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index 55c1b2d56..9c8a2af2e 100644
--- a/plugins/admin/systems/class_goTerminalServer.inc
+++ b/plugins/admin/systems/class_goTerminalServer.inc
@@ -92,6 +92,7 @@ class goTerminalServer extends plugin{
   /* Directly save new status flag */
   function setStatus($value)
   {
+    if($value == "none") return;
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $ldap->cat($this->dn,array("objectClass","goXdmcpIsEnabled", "goFontPath"));
diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/goImapServer.tpl
index 50f39f9e7..41b6331ab 100644
--- a/plugins/admin/systems/goImapServer.tpl
+++ b/plugins/admin/systems/goImapServer.tpl
@@ -77,7 +77,8 @@
 {/if}
 <br>
 <select name="action" title='{t}{/t}' {if $is_new =="new"} disabled {/if}>
-    {html_options options=$Actions selected=$goImapServerStatus}
+	<option value="none">&nbsp;</option>
+    {html_options options=$Actions}
 </select>
 <input type='submit' name='ExecAction' title='{t}Set status{/t}' value='{t}Execute{/t}' {if $is_new == "new"} disabled {/if}>
 
diff --git a/plugins/admin/systems/goMailServer.tpl b/plugins/admin/systems/goMailServer.tpl
index 94d64ac83..cedb73e1c 100644
--- a/plugins/admin/systems/goMailServer.tpl
+++ b/plugins/admin/systems/goMailServer.tpl
@@ -1,10 +1,16 @@
 <img src='images/mail.png'><b>{t}Generic{/t}</b>
 <br><br>
-{t}Visible full qualified hostname{/t}&nbsp;<input type="text" name='postfixMyhostname' value='{$postfixMyhostname}' title='{t}The full qualified host name.{/t}'>
 <table  style="width:100%;">
 	<tr>
 		<td width="50%">
 			<table >
+				<tr>
+					<td>{t}Visible full qualified hostname{/t}
+					</td>
+					<td>
+						<input type="text" name='postfixMyhostname' value='{$postfixMyhostname}' title='{t}The full qualified host name.{/t}'>
+					</td>
+				</tr>
 				<tr>
 					<td>{t}Max mail header size{/t}
 					</td>
@@ -142,7 +148,8 @@
 {/if}
 <br>
 <select name="action" title='{t}{/t}' {if $is_new == "new"} disabled {/if}>
-	{html_options options=$Actions selected=$goMailServerStatus}	
+	<option value="none">&nbsp;</option>
+	{html_options options=$Actions}	
 </select>
 <input type='submit' name='ExecAction' title='{t}Set status{/t}' value='{t}Execute{/t}' {if $is_new == "new"} disabled {/if}>
 
-- 
2.30.2