Added status "" none

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

diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index 85b90c7a33f82a02d9c83c675f8fcc2a8333ca60..82fc0528f2f782c29cb17afe6c664204bc447428 100644 (file)
--- 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 ac3c097245b1263726eea14e90715f45bd427110..3fca69e1d06e1133920fd73e1ffe115baf58e8ad 100644 (file)
--- 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 13bd59ec33a1c437c87356475c5f50c718a9c6c1..221b5c714501c86500954e48f2450fd2fcf333a2 100644 (file)
--- 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 39fe8990c077fd7b5557e631e01482f9e96c20b2..c532e3523803e9e097b302cd8ba939ce67bc0664 100644 (file)
--- 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 3b794ecb5faf9788f4842af58b320d6b0b37eee7..ebf9fbb4c8860e959c5dbb66d543facaeafa6293 100644 (file)
--- 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 d4e32eeeefbec99c1ac7d192fa06f3cd3ee883dc..eaed327bcc2da330542126ab7104023bbbbf1714 100644 (file)
--- 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 07b0dcebdc33727c9b0d670e04680b5efba7a0c0..eb29ad2c9c9f5dbc07f4ddf21722aeacc357b19e 100644 (file)
--- 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 f1adc9dc889475e660b66f491ea781dee690eb40..20785cd7c9f6ef4d176c0ad304e55bb0f1fe5d6a 100644 (file)
--- 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 cdab67ce1b1e651d019d5ab147693405cec7f894..49a2eb2c6ce224776518b58116c1b934f3cbac55 100644 (file)
--- 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 bea2dc1af1070aa826e775cf49a8887a5cd801c9..694f6e6943b0fef8456b358da14530863d599ee8 100644 (file)
--- 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 7c35e429ca0f3431a7b1d5051c45ba8f8951cad2..f960acdc9343111dfe5e95ad1f6a419438ac22d1 100644 (file)
--- 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 585b3d8a582cf18203496a593e4be57ab8e96ad6..66fafcbe24d223990e6c2b7610fecef6f5fbd410 100644 (file)
--- 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 55c1b2d5637333917c1d38436d24569467cbf49f..9c8a2af2e59ba07e17127fb3e5ab6bca6a0c3ffc 100644 (file)
--- 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 50f39f9e78c84825769b22ea51150e33c2022c27..41b6331ab73ae63b605c25b7f237a81c82f55213 100644 (file)
--- 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 94d64ac83d0530010636036ef9234633a26e91f9..cedb73e1c8cba18a8a20167cb56b9c872f52aa42 100644 (file)
--- 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}>