Moved fax formats from config to class fax account

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 2018dd81600e8d108f7fbfdd34889dfd64a91b78..c5071848194a8b5cd87062fa6a83e33f427c66cd 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -529,11 +529,5 @@
                                admin="{$cv.admin}"
                                password="{$cv.password}" />
                </location>
-
-               <faxformat type="pdf" />
-               <faxformat type="ps" />
-               <faxformat type="png" />
-               <faxformat type="mtiff" />
-               <faxformat type="tiff" />
        </main>
 </conf>

diff --git a/include/class_config.inc b/include/class_config.inc
index a60ae8e243ce2ccc5f85fdd7334e7ccf0a810c9f..a9897f349c052205608353d18e4828a6936049db 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= "";
 
@@ -143,14 +143,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 42ab729cecd4b5f0765cdff8aa5efdd74e300ad2..6fbb08dabeaef6f9e8113b919b99100d3ee73df5 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -23,6 +23,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();
@@ -574,7 +575,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 */