More phone plugin cleanup

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

diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index ec60c6e03e151ab8105d9cb435db6b1c43a6fa38..dd0ca0ed08ae50b12edf6616943b5bbf7ca180ac 100644 (file)
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -165,10 +165,10 @@ class phoneGeneric extends plugin
     $smarty->assign("bases", $this->config->idepartments);
 
     /* Create Arrays for samrty select boxes */
-    $smarty->assign("categories",     array("SIP - phones","IAX - phones","CAPI - phones"));
+    $smarty->assign("categories",     array("SIP","IAX","CAPI"));
     $smarty->assign("goFonTypes",     array("peer"      =>"peer"      ,"user"   =>"user"    ,"friend" =>"friend"));
     $smarty->assign("goFonDmtfModes", array("inband"    =>"inband"    ,"rfc2833"=>"rfc2833" ,"info"   =>"info"));
-    $smarty->assign("goFonAuths",     array("plaintext" =>"plaintext" ,"md5"    =>"md5"     ,"rsa"    =>"rsa"));
+    $smarty->assign("goFonAuths",     array("plaintext" =>"plaintext" ,"md5"    =>"md5"     /*,"rsa"    =>"rsa"*/));
     $smarty->assign("goFonTrunks",    array("yes" =>_("yes") ,"no" => _("no")));
 
     /* deativate all fields that are not used by the specified type */

diff --git a/plugins/admin/systems/phonesettings.tpl b/plugins/admin/systems/phonesettings.tpl
index 65e853a02a07cf13bccbb205a24e8f4f3a6a0277..78c6a6ccf3fde0c703200a88b58f3f06230ab432 100644 (file)
--- a/plugins/admin/systems/phonesettings.tpl
+++ b/plugins/admin/systems/phonesettings.tpl
@@ -7,7 +7,7 @@
                        <tr>
                                <td>
                                        {t}Phone type{/t}{$staticAddress}
-                                       <select size="1" name="selected_categorie" title="{t}Choose a phone type{/t}" style="width:200px;" onchange="mainform.submit();">
+                                       <select size="1" name="selected_categorie" title="{t}Choose a phone type{/t}" onchange="mainform.submit();">
                                                {html_options options=$categories selected=$selected_categorie}
                                        </select>
                                        <input type="submit" value="{t}refresh{/t}" name="refresh">