From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 17 Sep 2009 13:45:32 +0000 (+0000)
Subject: Updated exporter class
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b44428eb823cce2dfde905bfd42a49ec1cf47b89;p=gosa.git

Updated exporter class


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

diff --git a/gosa-core/include/exporter/class_pdfExporter.inc b/gosa-core/include/exporter/class_pdfExporter.inc
index 93b1127e8..f1c5f8918 100644
--- a/gosa-core/include/exporter/class_pdfExporter.inc
+++ b/gosa-core/include/exporter/class_pdfExporter.inc
@@ -1,12 +1,7 @@
 <?php
 
-// Try to load PDF library
-define('FPDF_FONTPATH', '/usr/share/php/fpdf/font/');
-@include('fpdf/fpdf.php');
-
 // Load supporter class only if FPDF is loaded
-$classes= get_declared_classes();
-if(in_array('FPDF', $classes)) {
+if(class_exists('FPDF')) {
   include('class_PDF.inc');
 }
 
@@ -15,6 +10,11 @@ class pdfExporter
   var $result;
 
   function pdfExporter($headline, $header, $entries, $columns= array()) {
+    // Bail out if no FPDF available
+    if(!class_exists('FPDF')) {
+      die(_("No PDF export possible: there is no FPDF library installed."));
+    }
+
     // If no preset, render all columns
     if (!count($columns)) {
       foreach ($header as $index => $dummy) {
diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index 920a7fe5b..9ba0e4dac 100644
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -291,6 +291,9 @@ $smarty->template_dir = $BASE_DIR.'/ihtml/';
 $smarty->caching= false;
 $smarty->php_handling= SMARTY_PHP_REMOVE;
 
+// Try to load PDF library
+define('FPDF_FONTPATH', '/usr/share/php/fpdf/font/');
+@include('fpdf/fpdf.php');
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>