Cleanupts in phone and fax accounts

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

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 7a2296292233f3dfd352a07f314238fadce2d70e..41a5f5876863f211c32f1064f639ae2867a1be3f 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -96,6 +96,8 @@ class gofaxAccount extends plugin
     } elseif ( !$this->parent->by_object['mailAccount']->is_account){
       $smarty->assign("has_mailaccount", "false");
       $this->has_mailAccount= false;
+    } else {
+      $smarty->assign("has_mailaccount", "true");
     }
 
     /* Do we need to flip is_account state? */
@@ -347,6 +349,8 @@ class gofaxAccount extends plugin
       $smarty->assign("list", $list);
       if (isset($_POST['department'])){
         $smarty->assign("department", $_POST['department']);
+      } else {
+        $smarty->assign("department", "");
       }
       $display.= $smarty->fetch (get_template_path('lists.tpl', TRUE, dirname(__FILE__)));
       return ($display);
@@ -371,6 +375,8 @@ class gofaxAccount extends plugin
       $smarty->assign("list", $list);
       if (isset($_POST['department'])){
         $smarty->assign("department", $_POST['department']);
+      } else {
+        $smarty->assign("department", "");
       }
       $display.= $smarty->fetch (get_template_path('lists.tpl', TRUE, dirname(__FILE__)));
       return ($display);

diff --git a/plugins/gofax/faxaccount/lists.tpl b/plugins/gofax/faxaccount/lists.tpl
index a03020446a429fa1390e12dd94be95ce6f19a154..eaa3961852f1b1bf8568ac0084fe061cdb8fcb8c 100644 (file)
--- a/plugins/gofax/faxaccount/lists.tpl
+++ b/plugins/gofax/faxaccount/lists.tpl
@@ -7,7 +7,7 @@
     {html_options values=$cblocklist output=$cblocklist}
    </select>
    <br>
-   <input name="block_number" size=30 align=center maxlength=30 {$goFaxBlockListACL} value="">
+   <input name="block_number" size=25 align=center maxlength=30 {$goFaxBlockListACL} value="">
    <input type=submit value="{t}Add{/t}" name="add_blocklist_number" {$goFaxBlockListACL}>&nbsp;
    <input type=submit value="{t}Delete{/t}" name="delete_blocklist_number" {$goFaxBlockListACL}>
   </td>
@@ -21,9 +21,7 @@
    </select>
    <br>
    <br>
-   {if $have_js ne ""}
    <input type=submit name="goButton" value="{t}Choose{/t}">
-   {/if}
 
    <b>{t}List of predefined blocklists{/t}</b>
    <select style="width:350px; height:250px;" name="predefined_list[]" size=15 multiple>

diff --git a/plugins/gofax/faxaccount/locals.tpl b/plugins/gofax/faxaccount/locals.tpl
index 0c286f02438332d29ce4490975d3433aa90574af..e3a1ace5cb9390e83977287163b05043897a235a 100644 (file)
--- a/plugins/gofax/faxaccount/locals.tpl
+++ b/plugins/gofax/faxaccount/locals.tpl
@@ -18,7 +18,7 @@
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]"><b>{t}Filters{/t}</b></p>
    </div>
-   <div class="contentboxb">
+   <div class="contentboxb"  style="background-color:#F8F8F8">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0; background-color:#F8F8F8">
      <table style="width:100%;">
       {$alphabet}

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 7f66c29da6b445ee6f23070b03a28e4dc2196646..c1a81694d92c95c5bb21ad45bcd34a622d41e333 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -194,7 +194,11 @@ class phoneAccount extends plugin
     $forwarder_list="";
     $acl= chkacl($this->acl, "goFonForwaring");
     foreach ($this->forwarders as $nr => $fw){
-      @list($number, $timeout)= split(";", $fw);
+      if ($fw == ""){
+        $number= ""; $timeout= "";
+      } else {
+        list($number, $timeout)= split(";", $fw);
+      }
       $forwarder_list.= "<tr><td>";
       $forwarder_list.= "<input name=\"fwn$nr\" size=25 align=center maxlength=60 value=\"$number\" $acl>";
       $forwarder_list.= "</td><td>";
@@ -225,6 +229,8 @@ class phoneAccount extends plugin
     } elseif ( !$this->parent->by_object['mailAccount']->is_account){
       $smarty->assign("has_mailaccount", "false");
       $this->has_mailAccount= false;
+    } else {
+      $smarty->assign("has_mailaccount", "true");
     }
 
     /* Show main page */