Fax clean, no more SELECT_

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

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index d5751bbe07ccc79cf2bd674ff34f6edbf97fa620..83fdbbd6279e636fb85938c63076eb821b7c1304 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -354,19 +354,6 @@ class gofaxAccount extends plugin
         $smarty->assign("department", "");
       }
 
-      if(count($this->current_blocklist))   {
-        $smarty->assign("SELECT_cblocklist",true);
-      }else {
-        $smarty->assign("SELECT_cblocklist",false);
-      }
-
-      if(count($list))   {
-        $smarty->assign("SELECT_list",true);
-      }else {
-        $smarty->assign("SELECT_list",false);
-      }
-
-
 
 
       $display.= $smarty->fetch (get_template_path('lists.tpl', TRUE, dirname(__FILE__)));
@@ -396,17 +383,6 @@ class gofaxAccount extends plugin
         $smarty->assign("department", "");
       }
  
-      if(count($this->current_blocklist))   {
-        $smarty->assign("SELECT_cblocklist",true);
-      }else {
-        $smarty->assign("SELECT_cblocklist",false);
-      }
-
-      if(count($list))   {
-        $smarty->assign("SELECT_list",true);
-      }else {
-        $smarty->assign("SELECT_list",false);
-      }
 
       $display.= $smarty->fetch (get_template_path('lists.tpl', TRUE, dirname(__FILE__)));
       return ($display);
@@ -447,12 +423,6 @@ class gofaxAccount extends plugin
       $smarty->assign("fax_to_printer", "");
     }
 
-    if(count($this->facsimileAlternateTelephoneNumber))   {
-      $smarty->assign("SELECT_facsimileAlternateTelephoneNumber",true);
-    }else {
-      $smarty->assign("SELECT_facsimileAlternateTelephoneNumber",false);
-    }
-
 
     $display.= $smarty->fetch (get_template_path('generic.tpl', TRUE, dirname(__FILE__)));
     return ($display);

diff --git a/plugins/gofax/faxaccount/generic.tpl b/plugins/gofax/faxaccount/generic.tpl
index c802f5ff070635b82462f68ed4e1fa68d4d794df..674a28b61e3cd5e8686ad01fb572a120e77e1458 100644 (file)
--- a/plugins/gofax/faxaccount/generic.tpl
+++ b/plugins/gofax/faxaccount/generic.tpl
@@ -54,6 +54,7 @@
      {t}Deliver fax to printer{/t} 
      <select size="1" name="goFaxPrinter" {$goFaxPrinterACL}>
       {html_options options=$printers selected=$goFaxPrinter}
+               <option disabled></option>
      </select>
 
    </td>
@@ -67,11 +68,8 @@
     <td style="width:50%;">
     <h2><img alt="" align="middle" src="images/fax_small.png"> {t}Alternate fax numbers{/t}</h2>
      <select style="width:350px; height:100px;" name="alternate_list[]" size=15 multiple {$facsimileAlternateTelephoneNumberACL}>
-       {if $SELECT_facsimileAlternateTelephoneNumber==true}
                        {html_options values=$facsimileAlternateTelephoneNumber output=$facsimileAlternateTelephoneNumber}
-               {else}
-                       <option>
-        {/if}
+                       <option disabled></option>
      </select><br>
      <input name="forward_address" size=20 align="middle" maxlength=65 {$facsimileAlternateTelephoneNumberACL} value="">
      <input type=submit value="{t}Add{/t}" name="add_alternate" {$facsimileAlternateTelephoneNumberACL}>&nbsp;

diff --git a/plugins/gofax/faxaccount/lists.tpl b/plugins/gofax/faxaccount/lists.tpl
index 5ac02918f2179cc73768b8a88d741d0e5020f4c7..cb6df29d2f15b1e69dbd8d88b54bb6b0fd823c03 100644 (file)
--- a/plugins/gofax/faxaccount/lists.tpl
+++ b/plugins/gofax/faxaccount/lists.tpl
@@ -4,11 +4,8 @@
    <b>{t}Blocked numbers/lists{/t}</b>
    <br> 
    <select style="width:350px; height:300px;" name="block_list[]" size=15 multiple>
-       {if $SELECT_cblocklist==true}
            {html_options values=$cblocklist output=$cblocklist}
-       {else}
-               <option disabled>
-       {/if}
+               <option disabled></option>
    </select>
    <br>
    <input name="block_number" size=25 align="middle" maxlength=30 {$goFaxBlockListACL} value="">
@@ -29,11 +26,8 @@
 
    <b>{t}List of predefined blocklists{/t}</b>
    <select style="width:350px; height:250px;" name="predefined_list[]" size=15 multiple>
-    {if $SELECT_list==true}
         {html_options values=$list}
-    {else}
-        <option>
-    {/if}
+               <option disabled></option>
    </select>
   </td>
  </tr>