Removed FAX formats from config.

They are now class members of class faxaccount

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

diff --git a/include/class_config.inc b/include/class_config.inc
index 85c63b7be5f6bf0bd800624df2a8d7c531b7a3ac..92c87511716d8da745d968cd700fa5d413b3c131 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -38,7 +38,7 @@ class config  {
 
   /* Configuration data */
   var $data= array( 'TABS' => array(), 'LOCATIONS' => array(), 'SERVERS' => array(),
-      'MAIN' => array( 'FAXFORMATS' => array() ),
+      'MAIN' => array(),
       'MENU' => array(), 'SERVICE' => array());
   var $basedir= "";
 
@@ -176,14 +176,6 @@ class config  {
                   }
                   break;
 
-                  /* Handle faxformat */
-      case 'FAXFORMAT':        
-                  if ($this->tags[$this->level-2] == 'MAIN'){
-                    /* Add fax formats */
-                    $this->data['MAIN']['FAXFORMATS'][]= $attrs['TYPE'];
-                  }
-                  break;
-
                   /* Load main parameters */
       case 'MAIN':
                   $this->data['MAIN']= array_merge ($this->data['MAIN'], $attrs);

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index a36811e035ac35ddb006181ba7cac7445d2aa384..1376d088e2075bda5603cacfbc6811576497e3d1 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -29,6 +29,7 @@ class gofaxAccount extends plugin
   var $goFaxSBlockgroups= array();
   var $mail= "";
   var $facsimileAlternateTelephoneNumber= array();
+  var $fax_formats = array("pdf","ps","png","mtiff","tiff");  
 
   /* Internal variables */
   var $printerList= array();
@@ -572,7 +573,7 @@ class gofaxAccount extends plugin
     /* Show main page */
     $smarty->assign("languages", get_languages(TRUE));
 
-    $smarty->assign("formats", $this->config->data['MAIN']['FAXFORMATS']);
+    $smarty->assign("formats",  $this->fax_formats);
     $smarty->assign("printers", $this->printerList);
 
     /* Load attributes */